diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt
index 519d8f01ec..b219faf7b6 100644
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(FreeCADApp SHARED)
+
 if(WIN32)
     add_definitions(-DFCApp)
     add_definitions(-DBOOST_DYN_LINK)
@@ -59,16 +61,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-)
-
 set(FreeCADApp_LIBS
     FreeCADBase
     ${Boost_LIBRARIES}
@@ -350,7 +342,7 @@ if(FREECAD_USE_PCH)
     ADD_MSVC_PRECOMPILED_HEADER(FreeCADApp PreCompiled.h PreCompiled.cpp FreeCADApp_CPP_SRCS)
 endif(FREECAD_USE_PCH)
 
-add_library(FreeCADApp SHARED ${FreeCADApp_SRCS})
+target_sources(FreeCADApp PRIVATE ${FreeCADApp_SRCS})
 target_link_libraries(FreeCADApp ${FreeCADApp_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(FreeCADApp)
diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
index 5f894d5be8..c23998c101 100644
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(FreeCADBase SHARED)
+
 if(WIN32)
     add_definitions(-DFCBase)
     add_definitions(-DPYCXX_DLL)
@@ -16,14 +18,15 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
+target_include_directories(
+    FreeCADBase
     SYSTEM
+    PUBLIC
     ${Boost_INCLUDE_DIRS}
     ${PYCXX_INCLUDE_DIR}
     ${Python3_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
     ${ZIPIOS_INCLUDES}
 )
 
@@ -353,8 +356,7 @@ if(FREECAD_USE_PCH)
     ADD_MSVC_PRECOMPILED_HEADER(FreeCADBase PreCompiled.h PreCompiled.cpp FreeCADBase_CPP_SRCS)
 endif(FREECAD_USE_PCH)
 
-add_library(FreeCADBase SHARED ${FreeCADBase_SRCS})
-
+target_sources(FreeCADBase PRIVATE ${FreeCADBase_SRCS})
 target_link_libraries(FreeCADBase ${FreeCADBase_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(FreeCADBase)
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index d03efec9f4..a98cee9f14 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(FreeCADGui SHARED)
+
 add_subdirectory(Stylesheets)
 add_subdirectory(PreferencePacks)
 add_subdirectory(PreferencePackTemplates)
@@ -63,15 +65,11 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/DAGView
 )
 
-include_directories(
+target_include_directories(
+    FreeCADGui
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
+    PRIVATE
     ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
     ${3DCONNEXION_INCLUDE_DIR}
 )
 
@@ -109,8 +107,8 @@ endif()
 if (TARGET Coin::Coin)
     list(APPEND FreeCADGui_LIBS Coin::Coin)
 else()
-    include_directories(SYSTEM ${COIN3D_INCLUDE_DIRS})
-    link_directories(${COIN3D_LIB_DIRS})
+    target_include_directories(FreeCADGui SYSTEM PUBLIC ${COIN3D_INCLUDE_DIRS})
+    target_link_directories(FreeCADGui PUBLIC ${COIN3D_LIB_DIRS})
     list(APPEND FreeCADGui_LIBS ${COIN3D_LIBRARIES})
 endif()
 
@@ -122,8 +120,10 @@ if (WIN32)
     endif()
 endif()
 
-include_directories(
+target_include_directories(
+    FreeCADGui
     SYSTEM
+    PUBLIC
     ${QtCore_INCLUDE_DIRS}
     ${QtWidgets_INCLUDE_DIRS}
     ${QtOpenGL_INCLUDE_DIRS}
@@ -146,8 +146,10 @@ list(APPEND FreeCADGui_LIBS
 )
 
 if(${Qt5WinExtras_FOUND})
-    include_directories(
+    target_include_directories(
+        FreeCADGui
         SYSTEM
+        PUBLIC
         ${Qt5WinExtras_INCLUDE_DIRS}
     )
     list(APPEND FreeCADGui_LIBS
@@ -1434,8 +1436,8 @@ if (EIGEN3_NO_DEPRECATED_COPY)
         PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
 endif ()
 
-add_library(FreeCADGui SHARED ${FreeCADGui_SRCS})
-target_link_libraries(FreeCADGui ${FreeCADGui_LIBS})
+target_sources(FreeCADGui PRIVATE ${FreeCADGui_SRCS})
+target_link_libraries(FreeCADGui PUBLIC ${FreeCADGui_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(FreeCADGui)
 endif()
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 6be6868503..3f1331a530 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -3,30 +3,6 @@ configure_file(freecad.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/freecad.rc)
 configure_file(freecadCmd.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/freecadCmd.rc)
 file(COPY icon.ico DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-if(BUILD_GUI)
-    include_directories(
-        SYSTEM
-        ${Boost_INCLUDE_DIRS}
-        ${COIN3D_INCLUDE_DIRS}
-        ${ZLIB_INCLUDE_DIR}
-        ${QtWidgets_INCLUDE_DIRS}
-        ${QT_INCLUDE_DIR}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-    )
-else(BUILD_GUI)
-    include_directories(
-        SYSTEM
-        ${Boost_INCLUDE_DIRS}
-        ${ZLIB_INCLUDE_DIR}
-        ${QT_INCLUDE_DIR}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-    )
-endif(BUILD_GUI)
-
 ######################## FreeCADMain ########################
 if(BUILD_GUI)
 
diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
index 34f6e7cf0a..fd9a79116c 100644
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -6,14 +6,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Assembly_LIBS
     Part
     PartDesign
diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt
index 9d3ec1c17e..0965952d18 100644
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -3,15 +3,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(AssemblyGui_LIBS
     Assembly
     PartDesign
diff --git a/src/Mod/CAM/App/CMakeLists.txt b/src/Mod/CAM/App/CMakeLists.txt
index 91ee10f7ea..7aea97cc19 100644
--- a/src/Mod/CAM/App/CMakeLists.txt
+++ b/src/Mod/CAM/App/CMakeLists.txt
@@ -11,16 +11,9 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
     ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
-link_directories(${OCC_LIBRARY_DIR})
 
 set(Path_LIBS
     Part
diff --git a/src/Mod/CAM/Gui/CMakeLists.txt b/src/Mod/CAM/Gui/CMakeLists.txt
index 46a5eaafcd..6fd6a164df 100644
--- a/src/Mod/CAM/Gui/CMakeLists.txt
+++ b/src/Mod/CAM/Gui/CMakeLists.txt
@@ -4,20 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(PathGui_LIBS
     Path
     PartGui
diff --git a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
index 1c01dff7fd..a097bd62ba 100644
--- a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
+++ b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
@@ -6,18 +6,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(PathSimulator_LIBS
     Path
     Part
diff --git a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
index e1932e81a7..3d7308ea31 100644
--- a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
+++ b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
@@ -5,21 +5,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(CAMSimulator_LIBS
     Path
     Part
diff --git a/src/Mod/CAM/libarea/CMakeLists.txt b/src/Mod/CAM/libarea/CMakeLists.txt
index 8ec30b5cff..a7ba5e801c 100644
--- a/src/Mod/CAM/libarea/CMakeLists.txt
+++ b/src/Mod/CAM/libarea/CMakeLists.txt
@@ -8,13 +8,6 @@ if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS /wd4244)
 endif(MSVC)
 
-include_directories(
-    SYSTEM
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-)
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/Mod/Import/App/dxf
diff --git a/src/Mod/Cloud/App/CMakeLists.txt b/src/Mod/Cloud/App/CMakeLists.txt
index bdb18ff345..88e1ee186c 100644
--- a/src/Mod/Cloud/App/CMakeLists.txt
+++ b/src/Mod/Cloud/App/CMakeLists.txt
@@ -4,13 +4,6 @@ endif()
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIR}
     ${CURL_INCLUDE_DIR}
 )
diff --git a/src/Mod/Cloud/Gui/CMakeLists.txt b/src/Mod/Cloud/Gui/CMakeLists.txt
index c592cd523b..c773ea7df3 100644
--- a/src/Mod/Cloud/Gui/CMakeLists.txt
+++ b/src/Mod/Cloud/Gui/CMakeLists.txt
@@ -4,15 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
 set(CloudGui_LIBS
     Cloud
     FreeCADGui
diff --git a/src/Mod/Draft/App/CMakeLists.txt b/src/Mod/Draft/App/CMakeLists.txt
index b01b3a13ba..a5854cb211 100644
--- a/src/Mod/Draft/App/CMakeLists.txt
+++ b/src/Mod/Draft/App/CMakeLists.txt
@@ -10,18 +10,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${QT_QTCORE_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(DraftUtils_LIBS
     Part
     FreeCADApp
diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt
index a2a83c674b..03fb1747f7 100644
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -2,17 +2,6 @@ include_directories(
     ${CMAKE_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Drawing_LIBS
     Part
     Spreadsheet
diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt
index 45e5ed2fdb..39dbf5a61c 100644
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -4,18 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(DrawingGui_LIBS
     Drawing
     FreeCADGui
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 118493e062..ad10535cb9 100644
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -24,19 +24,12 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
     ${SMESH_INCLUDE_DIR}
     ${NETGEN_INCLUDE_DIRS}
     ${VTK_INCLUDE_DIRS}
 )
 
 
-link_directories(${OCC_LIBRARY_DIR})
 link_directories(${SMESH_LIB_PATH})
 
 
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index 8f343f3008..fbeac0d06a 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -21,17 +21,10 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
     ${SMESH_INCLUDE_DIR}
     ${VTK_INCLUDE_DIRS}
 )
 
-link_directories(${OCC_LIBRARY_DIR})
 link_directories(${SMESH_LIB_PATH})
 
 set(FemGui_LIBS
diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt
index 4dfae3961d..55ef13e6ae 100644
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -4,18 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Import_LIBS
     Part
     ${OCC_OCAF_LIBRARIES}
diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt
index f3bd2e0d78..ea2c730d72 100644
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -3,19 +3,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(ImportGui_LIBS
     FreeCADGui
     PartGui
diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt
index af4e123296..dee10ef828 100644
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -4,19 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Inspection_LIBS
     FreeCADApp
     Mesh
diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt
index 428d46aa99..2fb4046592 100644
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -3,19 +3,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(InspectionGui_LIBS
     Inspection
     FreeCADGui
diff --git a/src/Mod/JtReader/App/CMakeLists.txt b/src/Mod/JtReader/App/CMakeLists.txt
index 027cdefc34..7202a7d06b 100644
--- a/src/Mod/JtReader/App/CMakeLists.txt
+++ b/src/Mod/JtReader/App/CMakeLists.txt
@@ -6,17 +6,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(JtReader_LIBS
     Mesh
     ${OCC_LIBRARIES}
diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt
index 51a23400a4..9775acfec5 100644
--- a/src/Mod/Material/App/CMakeLists.txt
+++ b/src/Mod/Material/App/CMakeLists.txt
@@ -16,18 +16,11 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
     ${YAML_CPP_INCLUDE_DIR}
 )
 link_directories(${YAML_CPP_LIBRARY_DIR})
 
 set(Materials_LIBS
-    ${Boost_LIBRARIES}
     FreeCADApp
 )
 
diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt
index 3da7d37435..a466a6f988 100644
--- a/src/Mod/Material/Gui/CMakeLists.txt
+++ b/src/Mod/Material/Gui/CMakeLists.txt
@@ -11,19 +11,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(MatGui_LIBS
     Materials
     FreeCADGui
diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt
index 88f880a98e..95e762229a 100644
--- a/src/Mod/Measure/App/CMakeLists.txt
+++ b/src/Mod/Measure/App/CMakeLists.txt
@@ -5,17 +5,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Measure_LIBS
     Part
     FreeCADApp
diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt
index 679dae4139..ef1909afc1 100644
--- a/src/Mod/Measure/Gui/CMakeLists.txt
+++ b/src/Mod/Measure/Gui/CMakeLists.txt
@@ -5,20 +5,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
-link_directories(${OCC_LIBRARY_DIR})
-
 set(MeasureGui_LIBS
     Measure
     #Part
diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt
index e50866df11..d8b34dab47 100644
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Mesh SHARED)
+
 if(WIN32)
     add_definitions(-DFCAppMesh -DWM4_FOUNDATION_DLL_EXPORT)
 endif(WIN32)
@@ -8,19 +10,14 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/3rdParty/libkdtree
 )
 
-include_directories(
+target_include_directories(
+    Mesh
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
+    PUBLIC
     ${EIGEN3_INCLUDE_DIR}
 )
 
 set(Mesh_LIBS
-    ${Boost_LIBRARIES}
     FreeCADBase
     FreeCADApp
 )
@@ -417,7 +414,7 @@ if (EIGEN3_NO_DEPRECATED_COPY)
         PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
 endif ()
 
-add_library(Mesh SHARED ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
+target_sources(Mesh PRIVATE ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
 target_link_libraries(Mesh ${Mesh_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(Mesh)
diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt
index c031c1f01e..0c3506cd26 100644
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -2,18 +2,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}/Inventor/annex
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 if(MSVC)
     include_directories(
         ${CMAKE_SOURCE_DIR}/src/3rdParty/OpenGL/api
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index 3d1d34da7f..d113d6e6c1 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(MeshPart SHARED)
+
 if (SMESH_FOUND)
     add_definitions(-DHAVE_SMESH)
     if(SMESH_VERSION_MAJOR LESS_EQUAL 9 AND SMESH_VERSION_MINOR LESS 10 )
@@ -14,22 +16,22 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src
 )
 
-include_directories(
+target_include_directories(
+    MeshPart
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
+    PUBLIC
     ${SMESH_INCLUDE_DIR}
     ${VTK_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
+)
+
+target_include_directories(
+    MeshPart
+    SYSTEM
+    PRIVATE
     ${pybind11_INCLUDE_DIR}
 )
 
-
-link_directories(${OCC_LIBRARY_DIR})
-link_directories(${SMESH_LIB_PATH})
+target_link_directories(MeshPart PUBLIC ${SMESH_LIB_PATH})
 
 set(MeshPart_LIBS
     Part
@@ -79,7 +81,7 @@ if (MINGW AND CMAKE_COMPILER_IS_CLANGXX)
     endif()
 endif()
 
-add_library(MeshPart SHARED ${MeshPart_SRCS} ${MeshPart_Scripts})
+target_sources(MeshPart PRIVATE ${MeshPart_SRCS} ${MeshPart_Scripts})
 target_link_libraries(MeshPart ${MeshPart_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(MeshPart)
diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
index f5f2b4b963..12e26f3ba3 100644
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -15,17 +15,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
 link_directories(${SMESH_LIB_PATH})
 
 set(MeshPartGui_LIBS
diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
index 9049ad51c2..aaa3d4c600 100644
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -1,6 +1,4 @@
-if(FREETYPE_FOUND)
-    add_definitions(-DFCUseFreeType)
-endif(FREETYPE_FOUND)
+add_library(Part SHARED)
 
 include_directories(
     ${CMAKE_BINARY_DIR}
@@ -9,20 +7,13 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
+target_include_directories(
+    Part
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
+    PUBLIC
     ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${FREETYPE_INCLUDE_DIRS}
 )
 
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Part_LIBS
     ${OCC_LIBRARIES}
     ${OCC_DEBUG_LIBRARIES}
@@ -30,7 +21,15 @@ set(Part_LIBS
     Materials
 )
 
+target_link_directories(Part PUBLIC ${OCC_LIBRARY_DIR})
+
 if(FREETYPE_FOUND)
+    add_definitions(-DFCUseFreeType)
+
+    include_directories(
+        ${FREETYPE_INCLUDE_DIRS}
+    )
+
     set(Part_LIBS
         ${Part_LIBS}
         ${FREETYPE_LIBRARIES}
@@ -606,7 +605,7 @@ if(EIGEN3_NO_DEPRECATED_COPY)
         PROPERTIES COMPILE_FLAGS ${EIGEN3_NO_DEPRECATED_COPY})
 endif()
 
-add_library(Part SHARED ${Part_SRCS} ${FCBRepAlgoAPI_SRCS})
+target_sources(Part PRIVATE ${Part_SRCS} ${FCBRepAlgoAPI_SRCS})
 target_link_libraries(Part ${Part_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(Part)
diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt
index a802d7911b..57569603b0 100644
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -5,19 +5,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(PartGui_LIBS
     Part
     FreeCADGui
diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt
index 9f08b749c4..bf7a35fcac 100644
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -7,15 +7,6 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
 )
 link_directories(${OCC_LIBRARY_DIR})
diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt
index a485f8848d..dfcb9273f1 100644
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -6,18 +6,8 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
     ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
 )
-link_directories(${OCC_LIBRARY_DIR})
 
 generate_from_xml(ViewProviderPy)
 
diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt
index 48f9a8f6a6..fee35a31fa 100644
--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Points SHARED)
+
 if(WIN32)
     add_definitions(-DFCAppPoints)
 endif(WIN32)
@@ -7,15 +9,11 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
+target_include_directories(
+    Points
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
+    PUBLIC
     ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
     ${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format
     ${CMAKE_SOURCE_DIR}/src/3rdParty/libE57Format/include
 )
@@ -68,8 +66,7 @@ if(FREECAD_USE_PCH)
     ADD_MSVC_PRECOMPILED_HEADER(Points PreCompiled.h PreCompiled.cpp PCH_SRCS)
 endif(FREECAD_USE_PCH)
 
-add_library(Points SHARED ${Points_SRCS} ${Points_Scripts})
-
+target_sources(Points PRIVATE ${Points_SRCS} ${Points_Scripts})
 link_directories(${CMAKE_BINARY_DIR}/src/3rdParty/libE57Format)
 
 target_link_libraries(Points E57Format ${Points_LIBS})
diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt
index e0e19fbbad..e0480cf558 100644
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -2,18 +2,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(PointsGui_LIBS
     Points
     FreeCADGui
diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt
index 1297c88eb7..c7d5bfbcdd 100644
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -24,20 +24,10 @@ include_directories(
 
 include_directories(
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
     ${PCL_INCLUDE_DIRS}
     ${FLANN_INCLUDE_DIRS}
 )
 
-link_directories(${OCC_LIBRARY_DIR})
-
 set(Reen_LIBS
     Part
     Mesh
diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
index bf3f2715c2..82ad6bda65 100644
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -4,19 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(ReenGui_LIBS
     ReverseEngineering
     MeshGui
diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt
index 62161595ff..c776773191 100644
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Robot SHARED)
+
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
@@ -5,18 +7,12 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
+target_include_directories(
+    Robot
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
+    PUBLIC
     ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
-link_directories(${OCC_LIBRARY_DIR})
 
 set(Robot_LIBS
     Part
@@ -127,7 +123,7 @@ endif(FREECAD_USE_PCH)
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 SOURCE_GROUP("Module" FILES ${Mod_SRCS})
 
-add_library(Robot SHARED ${Robot_SRCS})
+target_sources(Robot PRIVATE ${Robot_SRCS})
 target_link_libraries(Robot ${Robot_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(Robot)
diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt
index 6283f10e23..3cdf6d0a17 100644
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -4,19 +4,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(RobotGui_LIBS
     Robot
     FreeCADGui
diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt
index 2fe8ef802d..316faed310 100644
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -7,15 +7,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
 if (BUILD_QT5)
     include_directories(
         SYSTEM
diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt
index a352d0378e..9838a1be62 100644
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -3,18 +3,6 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/Gui
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 if(BUILD_QT5)
     include_directories(
         SYSTEM
diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt
index fec02c6214..bd75cfb0c2 100644
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_library(Sketcher SHARED)
+
 # Uncomment this code if you want to try Eigen's multithread
 #find_package(OpenMP)
 #if (OPENMP_FOUND)
@@ -16,18 +18,12 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/..
 )
 
-include_directories(
+target_include_directories(
+    Sketcher
     SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
+    PUBLIC
     ${EIGEN3_INCLUDE_DIR}
 )
-link_directories(${OCC_LIBRARY_DIR})
 
 set(Sketcher_LIBS
     Part
@@ -149,7 +145,7 @@ SET(Sketcher_PCH_SRCS
     ${Datatypes_SRCS}
 )
 
-add_library(Sketcher SHARED ${Sketcher_SRCS})
+target_sources(Sketcher PRIVATE ${Sketcher_SRCS})
 target_link_libraries(Sketcher ${Sketcher_LIBS})
 if (FREECAD_WARN_ERROR)
     target_compile_warn_error(Sketcher)
diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt
index 12d0477e86..0b7b27ad7c 100644
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -5,20 +5,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-    ${EIGEN3_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
 set(SketcherGui_LIBS
     Sketcher
     PartGui
diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt
index fcbf9fe9a9..55d5f7a539 100644
--- a/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -7,16 +7,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(Spreadsheet_LIBS
     FreeCADApp
 )
diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
index 979399ccc6..1035ac55f4 100644
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -3,17 +3,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 generate_from_xml(ViewProviderSpreadsheetPy)
 
 # The XML files
diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt
index 387f5ea827..3aa8f6585d 100644
--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -21,14 +21,6 @@
 #  *                                                                          *
 #  ***************************************************************************/
 
-include_directories(
-        SYSTEM
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${QtCore_INCLUDE_DIRS}
-        ${ZIPIOS_INCLUDES}
-)
-
 set(Start_LIBS
         FreeCADApp
         )
diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt
index 98706d562c..30d21b550b 100644
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -25,20 +25,6 @@ include_directories(
         ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-        SYSTEM
-        ${Boost_INCLUDE_DIRS}
-        ${COIN3D_INCLUDE_DIRS}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${QtCore_INCLUDE_DIRS}
-        ${QtSvg_INCLUDE_DIRS}
-        ${QtUiTools_INCLUDE_DIRS}
-        ${QtWidgets_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-        ${ZLIB_INCLUDE_DIR}
-)
-
 set(StartGui_LIBS
         Start
         FreeCADGui
diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt
index be9e676005..5e966da6aa 100644
--- a/src/Mod/Surface/App/CMakeLists.txt
+++ b/src/Mod/Surface/App/CMakeLists.txt
@@ -8,17 +8,9 @@ include_directories(
 
 include_directories(
   SYSTEM
-  ${Boost_INCLUDE_DIRS}
-  ${OCC_INCLUDE_DIR}
-  ${PYCXX_INCLUDE_DIR}
-  ${Python3_INCLUDE_DIRS}
-  ${ZLIB_INCLUDE_DIR}
-  ${XercesC_INCLUDE_DIRS}
   ${FREETYPE_INCLUDE_DIRS}
 )
 
-link_directories(${OCC_LIBRARY_DIR})
-
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Blending)
 
 generate_from_xml(Blending/BlendPointPy)
diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt
index 3ab45e6793..a32f3500b2 100644
--- a/src/Mod/Surface/Gui/CMakeLists.txt
+++ b/src/Mod/Surface/Gui/CMakeLists.txt
@@ -6,17 +6,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
 set(SurfaceGui_LIBS
     Surface
     PartGui
diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt
index 9968f333cd..d1dfb37415 100644
--- a/src/Mod/TechDraw/App/CMakeLists.txt
+++ b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -7,17 +7,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(TechDrawLIBS
     Measure
     Part
@@ -43,8 +32,6 @@ list(APPEND TechDrawLIBS
     ${QtWidgets_LIBRARIES}
 )
 
-link_directories(${OCC_LIBRARY_DIR})
-
 generate_from_xml(DrawPagePy)
 generate_from_xml(DrawViewPy)
 generate_from_xml(DrawViewPartPy)
diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt
index 6f2de3410e..83ebaf38c7 100644
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -18,24 +18,10 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZIPIOS_INCLUDES}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 # The XML files
 set(TechDrawGui_XML_SRCS
 )
 
-link_directories(${OCC_LIBRARY_DIR})
-
 set(TechDrawGui_LIBS
     TechDraw
     FreeCADGui
diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt
index 1d44e0abd6..59c8be83c9 100644
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -3,14 +3,6 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(TestGui_LIBS
     FreeCADGui
 )
diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt
index 390596168c..ed26a6f1b2 100644
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -1,17 +1,7 @@
-
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-)
-
 include_directories(
     SYSTEM
     ${QtNetwork_INCLUDE_DIRS}
diff --git a/src/Tools/_TEMPLATE_/App/CMakeLists.txt b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
index fc40ab2b67..9c1a787b09 100644
--- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(_TEMPLATE__LIBS
     FreeCADApp
 )
diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
index fc8fa5710f..986d3de041 100644
--- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
@@ -1,19 +1,8 @@
-
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-include_directories(
-    SYSTEM
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 set(_TEMPLATE_Gui_LIBS
     _TEMPLATE_
     FreeCADGui
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dd306ce4ee..f66475e0ba 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,19 +69,10 @@ function(setup_qt_test)
 
         target_include_directories(${_testname}_Tests_run PUBLIC
             SYSTEM
-            ${PYCXX_INCLUDE_DIR}
-            ${Python3_INCLUDE_DIRS}
-            ${XercesC_INCLUDE_DIRS}
-            ${ZIPIOS_INCLUDES}
-            ${QtGui_INCLUDE_DIRS}
-            ${QtWidgets_INCLUDE_DIRS}
-            ${QtTest_INCLUDE_DIRS}
-            ${COIN3D_INCLUDE_DIRS})
+            ${QtTest_INCLUDE_DIRS})
         target_link_libraries(${_testname}_Tests_run
             FreeCADApp
             FreeCADGui
-            ${QtCore_LIBRARIES}
-            ${QtWidgets_LIBRARIES}
             ${QtTest_LIBRARIES}
             ${${_testname}_LIBS})
     endforeach()
@@ -135,12 +126,6 @@ if ( EXISTS "${CMAKE_SOURCE_DIR}/tests/lib/googletest" )
 endif()
 add_subdirectory(src)
 
-target_include_directories(Tests_run SYSTEM PUBLIC
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-)
 target_link_libraries(Tests_run
     gtest_main
     gmock_main
diff --git a/tests/src/Mod/Assembly/CMakeLists.txt b/tests/src/Mod/Assembly/CMakeLists.txt
index 3d4314f551..ea1936eb89 100644
--- a/tests/src/Mod/Assembly/CMakeLists.txt
+++ b/tests/src/Mod/Assembly/CMakeLists.txt
@@ -1,17 +1,9 @@
 
-target_include_directories(Assembly_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
 if (NOT FREECAD_USE_EXTERNAL_ONDSELSOLVER)
 	target_include_directories(Assembly_tests_run PUBLIC
 		${CMAKE_SOURCE_DIR}/src/3rdParty/OndselSolver
 	)
 endif ()
-target_link_directories(Assembly_tests_run PUBLIC ${OCC_LIBRARY_DIR})
 
 target_link_libraries(Assembly_tests_run
     gtest_main
diff --git a/tests/src/Mod/Material/CMakeLists.txt b/tests/src/Mod/Material/CMakeLists.txt
index a9ad17f7b7..b592fcd16d 100644
--- a/tests/src/Mod/Material/CMakeLists.txt
+++ b/tests/src/Mod/Material/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Material_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Material_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Material_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/Measure/CMakeLists.txt b/tests/src/Mod/Measure/CMakeLists.txt
index cb17c1de25..5c3bffe472 100644
--- a/tests/src/Mod/Measure/CMakeLists.txt
+++ b/tests/src/Mod/Measure/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Measure_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Measure_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Measure_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/Mesh/CMakeLists.txt b/tests/src/Mod/Mesh/CMakeLists.txt
index e044f94020..8892bc2af4 100644
--- a/tests/src/Mod/Mesh/CMakeLists.txt
+++ b/tests/src/Mod/Mesh/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-target_include_directories(Mesh_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-)
-target_link_directories(Mesh_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Mesh_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/MeshPart/CMakeLists.txt b/tests/src/Mod/MeshPart/CMakeLists.txt
index 47602eec6b..9b5cddaf2f 100644
--- a/tests/src/Mod/MeshPart/CMakeLists.txt
+++ b/tests/src/Mod/MeshPart/CMakeLists.txt
@@ -1,15 +1,3 @@
-
-target_include_directories(MeshPart_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${SMESH_INCLUDE_DIR}
-    ${VTK_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(MeshPart_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(MeshPart_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/Part/App/FeatureExtrusion.cpp b/tests/src/Mod/Part/App/FeatureExtrusion.cpp
index 0d14aa7c73..4529d7def6 100644
--- a/tests/src/Mod/Part/App/FeatureExtrusion.cpp
+++ b/tests/src/Mod/Part/App/FeatureExtrusion.cpp
@@ -7,7 +7,6 @@
 #include "BRepBuilderAPI_MakeEdge.hxx"
 
 #include "PartTestHelpers.h"
-#include "Mod/Sketcher/App/SketchObject.h"
 
 class FeatureExtrusionTest: public ::testing::Test, public PartTestHelpers::PartTestHelperClass
 {
diff --git a/tests/src/Mod/Part/CMakeLists.txt b/tests/src/Mod/Part/CMakeLists.txt
index 4e6a35b52b..82e7f5b12b 100644
--- a/tests/src/Mod/Part/CMakeLists.txt
+++ b/tests/src/Mod/Part/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Part_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Part_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Part_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/PartDesign/CMakeLists.txt b/tests/src/Mod/PartDesign/CMakeLists.txt
index bf21365c0a..a4b6aa366d 100644
--- a/tests/src/Mod/PartDesign/CMakeLists.txt
+++ b/tests/src/Mod/PartDesign/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(PartDesign_tests_run SYSTEM PUBLIC
-        ${EIGEN3_INCLUDE_DIR}
-        ${OCC_INCLUDE_DIR}
-        ${PYCXX_INCLUDE_DIR}
-        ${Python3_INCLUDE_DIRS}
-        ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(PartDesign_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(PartDesign_tests_run
         gtest_main
         ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/Points/CMakeLists.txt b/tests/src/Mod/Points/CMakeLists.txt
index 9d3a3fbee0..1620a16aae 100644
--- a/tests/src/Mod/Points/CMakeLists.txt
+++ b/tests/src/Mod/Points/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-target_include_directories(Points_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZIPIOS_INCLUDES}
-)
-target_link_directories(Points_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Points_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/Sketcher/CMakeLists.txt b/tests/src/Mod/Sketcher/CMakeLists.txt
index 201ee118f8..38271f56c0 100644
--- a/tests/src/Mod/Sketcher/CMakeLists.txt
+++ b/tests/src/Mod/Sketcher/CMakeLists.txt
@@ -1,13 +1,3 @@
-
-target_include_directories(Sketcher_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-target_link_directories(Sketcher_tests_run PUBLIC ${OCC_LIBRARY_DIR})
-
 target_link_libraries(Sketcher_tests_run
     gtest_main
     ${Google_Tests_LIBS}
diff --git a/tests/src/Mod/Spreadsheet/CMakeLists.txt b/tests/src/Mod/Spreadsheet/CMakeLists.txt
index ec78e021b7..4f46689b85 100644
--- a/tests/src/Mod/Spreadsheet/CMakeLists.txt
+++ b/tests/src/Mod/Spreadsheet/CMakeLists.txt
@@ -1,14 +1,3 @@
-
-target_include_directories(Spreadsheet_tests_run SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
-    ${OCC_INCLUDE_DIR}
-    ${PYCXX_INCLUDE_DIR}
-    ${Python3_INCLUDE_DIRS}
-    ${SMESH_INCLUDE_DIR}
-    ${VTK_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
 target_link_libraries(Spreadsheet_tests_run
     gtest_main
     ${Google_Tests_LIBS}