diff --git a/src/basics/Core/DataTypes.h b/src/basics/Core/DataTypes.h
index b65f3344c2788ee3e2af04bf3b2813f5a055c52d..67a17fa765514c41247c480709864b4dae1b28ba 100644
--- a/src/basics/Core/DataTypes.h
+++ b/src/basics/Core/DataTypes.h
@@ -3,7 +3,6 @@
 
 #include <string>
 
-#include "VirtualFluidsDefinitions.h"
 
 #ifdef VF_DOUBLE_ACCURACY
 typedef double real;
diff --git a/src/basics/Core/RealConstants.h b/src/basics/Core/RealConstants.h
index a555d7ee27ba5427ac673473def7ed9b57f0d817..b63ff444f5d86dd67accaf83611ebeb6410f036b 100644
--- a/src/basics/Core/RealConstants.h
+++ b/src/basics/Core/RealConstants.h
@@ -1,7 +1,7 @@
 #ifndef REAL_CONSTANT_H
 #define REAL_CONSTANT_H
 
-#include "VirtualFluidsDefinitions.h"
+
 
 #ifdef VF_DOUBLE_ACCURACY
 #define c1o2		0.5
diff --git a/src/basics/Core/Timer/Timer.h b/src/basics/Core/Timer/Timer.h
index 53c79e76102c922bc1bca4a28ec79c77c2351bcd..9607cc5f9a72873e1da226b4d071e000777073a1 100644
--- a/src/basics/Core/Timer/Timer.h
+++ b/src/basics/Core/Timer/Timer.h
@@ -1,7 +1,6 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-//#include "VirtualFluidsDefinitions.h"
 #include "basics_export.h"
 
 #include "DataTypes.h"
diff --git a/src/basics/Core/Timer/TimerImp.h b/src/basics/Core/Timer/TimerImp.h
index d45691079efb5688a4574f17e157fdf7710c608a..20a11968005f88bebbc1e481149a6c9d939306a8 100644
--- a/src/basics/Core/Timer/TimerImp.h
+++ b/src/basics/Core/Timer/TimerImp.h
@@ -5,7 +5,6 @@
 
 #include <chrono>
 
-//#include "VirtualFluidsDefinitions.h"
 
 #include "DataTypes.h"
 
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
index de72e4e1e551f1bcc3646bb133c2f370d019eab1..76094ba5bbc4c1abc1c6d602eedd5acaf55ae88c 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
@@ -232,4 +232,5 @@ void BCArray3D::deleteBC(std::size_t x1, std::size_t x2, std::size_t x3)
 
       //"delete" element
       bcvector[index] = SPtr<BoundaryConditions>();
-   }
\ No newline at end of file
+   }
+   
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h
index af9a63031803ab964ffa7c63c161e479170b2ea4..96102f82a3a9c426b9ad669058b5b8ec75058032 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h
@@ -71,7 +71,7 @@ public:
    void setFunction(const std::string& functionstring) { this->function.SetExpr(functionstring); }
    void setFunction(const double& constVelocity) { std::stringstream dummy; dummy<<constVelocity; function.SetExpr(dummy.str());  }
    void setStartTime(const double& starttime) {this->starttime = starttime; }
-   void setEndTime(const double& starttime) {this->endtime = endtime; }
+   void setEndTime(const double& endtime) {this->endtime = endtime; }
 
    mu::Parser&        getFunction()        { return function;  }
    const mu::Parser&  getFunction()  const { return function;  }
diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
index c17c6fba35e864b44f99c80e6be99bdc18e4919d..cc25a66d6e6773005ddd173963691c58cd4633d9 100644
--- a/src/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -1,16 +1,6 @@
 
-IF(${USE_GCC})
-   SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} rt)
-   SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} gomp)
-ENDIF()
 
-IF(${USE_INTEL})
-   SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} irc)
-   SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} parallel)
-ENDIF()
-
-
-vf_add_library(BUILDTYPE static DEPENDS basics muparser ${CAB_ADDITIONAL_LINK_LIBRARIES})
+vf_add_library(BUILDTYPE static DEPENDS basics muparser)
 
 vf_get_library_name(library_name)