diff --git a/CMake/FileUtilities.cmake b/CMake/FileUtilities.cmake
index 7b39fb79f47f8eccf02922648efda7179423aed6..2cd8e1ac0b0ceb58d6dcd45794f025861f26e040 100644
--- a/CMake/FileUtilities.cmake
+++ b/CMake/FileUtilities.cmake
@@ -109,7 +109,7 @@ macro(generateExportHeader libName)
 		GENERATE_EXPORT_HEADER	(${libName}
 				#BASE_NAME ${libName}
 				#EXPORT_MACRO_NAME ${libName}_EXPORT
-				EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/${libName}_export.h
+				EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/${libName}_export.h
 				#STATIC_DEFINE ${libName}_BUILT_AS_STATIC
 				)
 	#endif()
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index 9e0c891242f810ff28c4afaf3e682d826c69d4ba..c8153cea36fb41f46cc15e5f8a875351b8ca3a1b 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -165,8 +165,10 @@ function(vf_add_library)
     MESSAGE(STATUS "configuring ${library_name} (type=${ARG_BUILDTYPE})... done")
 
     if (NOT ${ARG_BUILDTYPE} MATCHES binary)
-    generateExportHeader (${library_name})
-        endif()
+      generateExportHeader (${library_name})
+    endif()
+
+    target_include_directories(${library_name} PRIVATE ${CMAKE_BINARY_DIR})
 
 endfunction(vf_add_library)
 
diff --git a/cpu/Applications/IncludsList.cmake b/cpu/Applications/IncludsList.cmake
index 811c04789adfaadf74fd67175ba84ed1fdb42cb7..34feefc56496f2961d6a52fc163d908bfad9ad33 100644
--- a/cpu/Applications/IncludsList.cmake
+++ b/cpu/Applications/IncludsList.cmake
@@ -1,3 +1,13 @@
 INCLUDE_DIRECTORIES(${APPS_ROOT})
-INCLUDE(${SOURCE_DIR}/VirtualFluidsBasic/IncludsList.cmake)
 INCLUDE(${SOURCE_DIR}/VirtualFluidsCore/IncludsList.cmake)
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/Creator)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/KdTree)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/container)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/memory)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/objects)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/transmiitter)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/utilities)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/basics/writer)
\ No newline at end of file
diff --git a/cpu/VirtualFluidsCore/CMakeLists.txt b/cpu/VirtualFluidsCore/CMakeLists.txt
index 4c9736addd1dfc55b70b3253085d53fbf0ce7dfc..415006db7fe59b51a689a0e3ef3a3fec37c80e62 100644
--- a/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -98,13 +98,13 @@ include (${CMAKE_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
 vf_add_library(BUILDTYPE static DEPENDS basics MuParser ${MPI_LIBRARY})
 
 vf_get_library_name(library_name)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d/Creator)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/numerics/geometry3d/KdTree)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/container)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/memory)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/objects)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/transmiitter)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/utilities)
-target_include_directories(${library_name} PRIVATE ${SOURCE_DIR}/VirtualFluidsBasic/basics/writer)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/Creator)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d/KdTree)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/container)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/memory)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/objects)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/transmiitter)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/utilities)
+target_include_directories(${library_name} PRIVATE ${CMAKE_SOURCE_DIR}/src/basics/basics/writer)
diff --git a/src/basics/basics/container/CbArray4D.h b/src/basics/basics/container/CbArray4D.h
index a26ede67709c5ea96a23e49379cf3a764670d330..aa91844d034d888badc632c3d5ebfbab45efc61e 100644
--- a/src/basics/basics/container/CbArray4D.h
+++ b/src/basics/basics/container/CbArray4D.h
@@ -32,7 +32,7 @@
 #include <typeinfo>
 #include "PointerDefinitions.h"
 
-#include "basics_export"
+#include "basics_export.h"
 
 #ifdef CAB_RCF
    #include <3rdParty/rcf/RcfSerializationIncludes.h>