diff --git a/cpu.cmake b/cpu.cmake
index 3740f1bce59d7f3c97af33c9e24bf6229c031a87..1b8d3b383be9c11fb17886396ae0d2ff5f78bd46 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -39,10 +39,6 @@ SET(USE_GCC OFF CACHE BOOL "include gcc compiler support") #TODO: why do we need
 SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
 SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
 
-<<<<<<< HEAD
-
-=======
->>>>>>> feature/clean_3rd_cmake_macros
 #CAB
 include("CMake/CMakeCABMacros.cmake") #TODO: Currently we have to include the CABMacros also here, so that the USE_* are defined in the config files for the cpu version
 #include("CMake/FileUtilities.cmake")
diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt
index 0b643212ad9c5da74e711d72da085c1fe670704e..ff6c0c122ee9d2fc738e0fe67bba48ba621a95e1 100644
--- a/src/basics/CMakeLists.txt
+++ b/src/basics/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include(Core/buildInfo.cmake)
 
-vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp)
+vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp VirtualFluidsDefinitions.in.h)
 
 vf_get_library_name (library_name)
 target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Core)