diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt
index e10456fbeb7274fd898839e9c26fdd1130f2d42e..3fa9ceb7d0431feca9aad77b041cbe1daa23dc2f 100644
--- a/src/basics/CMakeLists.txt
+++ b/src/basics/CMakeLists.txt
@@ -1,52 +1,15 @@
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/geometry3d)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/geometry3d/KdTree)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/container)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/memory)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/objects)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/transmiitter)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/utilities)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/basics/writer)
-
-
-include (${CMAKE_SOURCE_DIR}/CMake/VirtualFluidsMacros.cmake)
-#SET(CAB_ADDITIONAL_LINK_LIBRARIES ${MPI_CXX_LIBRARIES})
-
 include(Core/buildInfo.cmake)
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/VirtualFluidsCore)
-INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-
-
-
-vf_add_library(BUILDTYPE static
-               FOLDER
-        ${CMAKE_CURRENT_LIST_DIR}/geometry3d
-        ${CMAKE_CURRENT_LIST_DIR}/geometry3d/KdTree
-        ${CMAKE_CURRENT_LIST_DIR}/basics/container
-        ${CMAKE_CURRENT_LIST_DIR}/basics/memory
-        ${CMAKE_CURRENT_LIST_DIR}/basics/objects
-        ${CMAKE_CURRENT_LIST_DIR}/basics/transmiitter
-        ${CMAKE_CURRENT_LIST_DIR}/basics/utilities
-        ${CMAKE_CURRENT_LIST_DIR}/basics/writer
-        ${CMAKE_CURRENT_LIST_DIR}/Core
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Logger
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Logger/implementations
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Input
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Input/ConfigData
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Input/ConfigFileReader
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Input/ConfigInput
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Input/JsonInput
-        ${CMAKE_CURRENT_LIST_DIR}/Core/StringUtilities
-        ${CMAKE_CURRENT_LIST_DIR}/Core/Timer
-
-        EXCLUDE buildInfo.in.cpp
-        )
+vf_add_library(BUILDTYPE static EXCLUDE buildInfo.in.cpp)
 
 vf_get_library_name (library_name)
 target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Core)
-target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/geometry3d)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/basics/container)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/basics/objects)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/utilities)
+target_include_directories(${library_name} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/basics/writer)
 
 IF(MSVC)
     target_compile_definitions(${library_name} PUBLIC NOMINMAX) # Disable Min/Max-Macros
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
index 4738e1c0101928fa540a62b8b90812cc381cd30a..dc9549c205beacbaa931913def35c5e10b79a90f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
@@ -166,7 +166,7 @@ void WriteBoundaryConditionsCoProcessor::addDataGeo(SPtr<Block3D> block)
    SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
 
    //knotennummerierung faengt immer bei 0 an!
-   int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
+   unsigned int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
 
    int minX1 = 0;
    int minX2 = 0;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
index e35868af0d9a6a86592a34849283314ae960e99e..5786f038989f455236ff79b075219bea66fcd1e2 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
@@ -74,7 +74,7 @@ protected:
 
 private:
    std::vector<UbTupleFloat3> nodes;
-   std::vector<UbTupleInt8> cells;
+   std::vector<UbTupleUInt8> cells;
    std::vector<std::string> datanames;
    std::vector<std::vector<double> > data;
    std::string path;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
index 59782e680a6f2922322344b941ea8fd4d7942363..6789ff59e0dc115c36a229253def15326d39fede 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
@@ -168,7 +168,7 @@ void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
    LBMReal vx1,vx2,vx3,drho,press;
 
    //node numbering always starts at 0!
-   int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
+   unsigned int SWB,SEB,NEB,NWB,SWT,SET,NET,NWT;
 
    if(block->getKernel()->getCompressible())
    {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
index 0b113ffe40f5e03d5fb9b1a50310c905e8f5592b..67a1c61f3be38a91d2feb01657492508d523aa83 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
@@ -82,7 +82,7 @@ protected:
 private:
    void init();
    std::vector<UbTupleFloat3> nodes;
-   std::vector<UbTupleInt8> cells;
+   std::vector<UbTupleUInt8> cells;
    std::vector<std::string> datanames;
    std::vector<std::vector<double> > data; 
    std::string path;