diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index 1177f49dee479579a5693fcc8fa5a099446dcf47..464f2f401546ed3eb9a44135d8a11f5168c9d997 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -1,14 +1,4 @@
 
-include_directories(
-    ${CMAKE_SOURCE_DIR}/Utils/FileConverter
-    ${CMAKE_SOURCE_DIR}/BaseLib
-    ${CMAKE_SOURCE_DIR}/GeoLib
-    ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/MathLib
-    ${CMAKE_SOURCE_DIR}/MeshLib
-    ${CMAKE_SOURCE_DIR}/Gui/OpenSG
-)
-
 if (QT4_FOUND AND Shapelib_FOUND)
     add_executable(ConvertSHPToGLI ConvertSHPToGLI.cpp)
     set_target_properties(ConvertSHPToGLI PROPERTIES FOLDER Utilities)
diff --git a/Applications/Utils/FileConverter/GMSH2OGS.cpp b/Applications/Utils/FileConverter/GMSH2OGS.cpp
index 0fa07708d33d12cd7dffe35691136c56748a727a..74e5b5532d19f24345d08b03a3c5be2d8b7603ca 100644
--- a/Applications/Utils/FileConverter/GMSH2OGS.cpp
+++ b/Applications/Utils/FileConverter/GMSH2OGS.cpp
@@ -22,10 +22,10 @@
 #include "Applications/ApplicationsLib/LogogSetup.h"
 
 // BaseLib
-#include "FileTools.h"
-#include "RunTime.h"
+#include "BaseLib/FileTools.h"
+#include "BaseLib/RunTime.h"
 #ifndef WIN32
-#include "MemWatch.h"
+#include "BaseLib/MemWatch.h"
 #endif
 
 #include "MeshLib/IO/GmshReader.h"
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index cd61b9540de4126878f08d73d30d652e3c0a349b..8144402f4494add9729445d0544b621065596639 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -1,10 +1,3 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}/BaseLib
-    ${CMAKE_SOURCE_DIR}/GeoLib
-    ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/MathLib
-)
-
 if(QT4_FOUND)
     add_executable(TriangulatePolyline TriangulatePolyline.cpp)
     target_link_libraries(TriangulatePolyline GeoLib)
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 0d90cbe2f2f61c890558679275a274b47cb803df..ab14a7dc8510fa9c1f25bacd408ff0f3479dbae4 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -1,13 +1,4 @@
 
-include_directories(
-    ${CMAKE_SOURCE_DIR}/BaseLib
-    ${CMAKE_SOURCE_DIR}/GeoLib
-    ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/FileIO/Gmsh
-    ${CMAKE_SOURCE_DIR}/MathLib
-    ${CMAKE_SOURCE_DIR}/MeshLib
-)
-
 add_executable(moveMeshNodes moveMeshNodes.cpp)
 target_link_libraries(moveMeshNodes MeshLib)
 ADD_VTK_DEPENDENCY(moveMeshNodes)
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 63109648082047442f3303689c8e194df9938a14..6a81a133ae9b1e33da3c5b891a8c29d0351e443c 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -1,14 +1,4 @@
 
-include_directories(
-    ${CMAKE_SOURCE_DIR}/BaseLib
-    ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/MeshLib/IO/Legacy
-    ${CMAKE_SOURCE_DIR}/GeoLib
-    ${CMAKE_SOURCE_DIR}/MathLib
-    ${CMAKE_SOURCE_DIR}/MeshLib
-    ${CMAKE_SOURCE_DIR}/Gui/VtkVis
-)
-
 if(OGS_BUILD_GUI)
     add_executable(createMeshElemPropertiesFromASCRaster createMeshElemPropertiesFromASCRaster.cpp)
     set_target_properties(createMeshElemPropertiesFromASCRaster PROPERTIES FOLDER Utilities)