diff --git a/Applications/FileIO/GocadIO/CMakeLists.txt b/Applications/FileIO/GocadIO/CMakeLists.txt
deleted file mode 100644
index 82f8dd1bce426741eba253a52eccec1f4156c4d9..0000000000000000000000000000000000000000
--- a/Applications/FileIO/GocadIO/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}/BaseLib ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/GeoLib ${CMAKE_SOURCE_DIR}/MeshLib
-)
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index 9603ac9db5c161acc73977ba98bde54a2711e773..3aca6eb85d37a98c5eb0a2fb9be4ea3a7b64fc82 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -8,5 +8,4 @@ target_link_libraries(
     SwmmInterface
     tclap
 )
-include_directories(${PROJECT_SOURCE_DIR}/Applications/FileIO)
 install(TARGETS SWMMConverter RUNTIME DESTINATION bin)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d609cd275f93df221c02aab7ed6e6716930a69..1a10760fb25858afa4fbbc412c6b31dac04a2a4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,7 +191,7 @@ option(OGS_USE_MFRONT
 include(scripts/cmake/packaging/Pack.cmake)
 
 # ---- Subdirectories ----
-
+include_directories(${PROJECT_SOURCE_DIR})
 # xdmfdiff
 if(OGS_USE_XDMF AND OGS_BUILD_TESTING)
     add_subdirectory(Tests/xdmfdiff)
diff --git a/InfoLib/CMakeLists.txt b/InfoLib/CMakeLists.txt
index c969ed7358d5c4a5a0815b8b78c95ced28a66535..4d1d1f6a86bbbcac617a31ba78d6a3f08849b3b9 100644
--- a/InfoLib/CMakeLists.txt
+++ b/InfoLib/CMakeLists.txt
@@ -7,6 +7,4 @@ foreach(lib Git CMake Test)
     ogs_add_library(
         ${lib}InfoLib ${CMAKE_CURRENT_BINARY_DIR}/${lib}Info.cpp ${lib}Info.h
     )
-
-    target_include_directories(${lib}InfoLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 endforeach(lib)
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index 0e3586107755bef08b6de12691477974ed77c7c7..b846cf5cc004a3b26d3ff1a940df7abd72986fc9 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -15,7 +15,6 @@ append_source_files(SOURCES Extrapolation)
 
 # Create the library
 ogs_add_library(NumLib ${SOURCES})
-target_include_directories(NumLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 if(OGS_USE_PETSC)
     target_compile_definitions(NumLib PUBLIC USE_PETSC)
 endif()
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index 3cc5260cbe1177e4954a1053c95e166bed7b616f..06d3bdc273e552ff58af3c1a9c5327586891c65d 100644
--- a/scripts/cmake/ProjectSetup.cmake
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -30,8 +30,6 @@ set(Data_BINARY_DIR ${PROJECT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
 # Enable Visual Studio project folder grouping
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 # RPATH setup
 if(APPLE)
     set(BASEPOINT @loader_path)