diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt
index ac5e492bf2..1e098de8bb 100644
--- a/ApplicationExeCode/CMakeLists.txt
+++ b/ApplicationExeCode/CMakeLists.txt
@@ -277,9 +277,10 @@ if(RESINSIGHT_ENABLE_GRPC)
   list(APPEND LINK_LIBRARIES GrpcInterface)
 endif()
 
+list(APPEND LINK_LIBRARIES RigGeoMechDataModel)
+
 if(RESINSIGHT_USE_ODB_API)
   add_definitions(-DUSE_ODB_API)
-  list(APPEND LINK_LIBRARIES RigGeoMechDataModel)
   list(APPEND LINK_LIBRARIES RifOdbReader)
 endif()
 
diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp
index 5792111454..e2abf28170 100644
--- a/ApplicationLibCode/Application/RiaApplication.cpp
+++ b/ApplicationLibCode/Application/RiaApplication.cpp
@@ -39,7 +39,6 @@
 #include "RicfCommandFileExecutor.h"
 #include "RicfCommandObject.h"
 
-#include "CommandRouter/RimCommandRouter.h"
 #include "PlotTemplates/RimPlotTemplateFolderItem.h"
 #include "Rim2dIntersectionViewCollection.h"
 #include "RimAnnotationCollection.h"
@@ -47,6 +46,7 @@
 #include "RimAnnotationTextAppearance.h"
 #include "RimCellFilterCollection.h"
 #include "RimCommandObject.h"
+#include "RimCommandRouter.h"
 #include "RimCompletionTemplateCollection.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseView.h"
diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt
index 89b7fd39d9..8846c0aa8d 100644
--- a/ApplicationLibCode/CMakeLists.txt
+++ b/ApplicationLibCode/CMakeLists.txt
@@ -71,64 +71,6 @@ if(MSVC)
   add_definitions(-D_USE_MATH_DEFINES)
 endif()
 
-include_directories(
-  # required for compilation of gtest, should be refactored
-  ${ResInsight_SOURCE_DIR}/ThirdParty
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/Adm
-  ${CMAKE_CURRENT_SOURCE_DIR}/Application
-  ${CMAKE_CURRENT_SOURCE_DIR}/Application/Tools
-  ${CMAKE_CURRENT_SOURCE_DIR}/Application/Tools/WellPathTools
-  ${CMAKE_CURRENT_SOURCE_DIR}/Commands
-  ${CMAKE_CURRENT_SOURCE_DIR}/Commands/EclipseCommands
-  ${CMAKE_CURRENT_SOURCE_DIR}/FileInterface
-  ${CMAKE_CURRENT_SOURCE_DIR}/SocketInterface
-  ${CMAKE_CURRENT_SOURCE_DIR}/Measurement
-  ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization
-  ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/GridBox
-  ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Intersections
-  ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Seismic
-  ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Streamlines
-  ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Surfaces
-  ${CMAKE_CURRENT_SOURCE_DIR}/UserInterface
-  ${CMAKE_CURRENT_SOURCE_DIR}/UserInterface/AnalysisPlots
-  ${CMAKE_CURRENT_SOURCE_DIR}/CommandFileInterface
-  ${CMAKE_CURRENT_SOURCE_DIR}/CommandFileInterface/Core
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/AnalysisPlots
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CorrelationPlots
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Annotations
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Completions
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Faults
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Flow
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GridCrossPlots
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GeoMech
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Parameters
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Measurement
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/StimPlanModel
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Surfaces
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Intersections
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Streamlines
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Seismic
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CellFilters
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/ProcessControl
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/WellLog
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/WellMeasurement
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/WellPath
-  ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModelCommands
-  ${CMAKE_CURRENT_SOURCE_DIR}/ResultStatisticsCache
-  ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel
-  ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/Completions
-  ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/ResultAccessors
-  ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/ResultCalculators
-  ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/OdbReader
-  ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechDataModel
-  ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechVisualization
-  ${CMAKE_BINARY_DIR}/Generated
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 # ##############################################################################
 # Eigen
 # ##############################################################################
@@ -238,27 +180,17 @@ list(APPEND CPP_SOURCES ${CODE_SOURCE_FILES})
 # Sub-directory projects
 # ##############################################################################
 
-add_subdirectory(ResultStatisticsCache)
-add_subdirectory(Commands)
-
-set(RI_LIBRARIES ResultStatisticsCache Commands)
-
 #
 # Odb api
 #
 if(RESINSIGHT_USE_ODB_API)
-  add_subdirectory(GeoMech/OdbReader)
   add_definitions(-DUSE_ODB_API)
-  list(APPEND RI_LIBRARIES RifOdbReader)
 endif()
 
-add_subdirectory(GeoMech/GeoMechDataModel)
-list(APPEND RI_LIBRARIES RigGeoMechDataModel)
-
 #
 # OpenVDS
 #
-include_directories(${RESINSIGHT_OPENVDS_API_DIR}/include)
+list(APPEND RI_PRIVATE_INCLUDES ${RESINSIGHT_OPENVDS_API_DIR}/include)
 
 #
 # HDF5
@@ -284,13 +216,12 @@ if(RESINSIGHT_FOUND_HDF5)
 
   if(MSVC)
     add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
+    list(APPEND RI_PRIVATE_INCLUDES ${RESINSIGHT_HDF5_DIR}/include)
 
-    include_directories(${RESINSIGHT_HDF5_DIR}/include)
   else()
     add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
     add_definitions(${HDF5_DEFINITIONS})
-
-    include_directories(${HDF5_INCLUDE_DIRS})
+    list(APPEND RI_PRIVATE_INCLUDES ${HDF5_INCLUDE_DIRS})
   endif() # MSVC
 
   source_group("FileInterface\\HDF5" FILES ${HDF5_FILES})
@@ -427,24 +358,63 @@ target_link_libraries(
 
 target_include_directories(
   ${PROJECT_NAME}
-  PRIVATE ${CMAKE_BINARY_DIR}/Generated
-  PUBLIC
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/Application
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/Application/Tools
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/CommandFileInterface
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/CommandFileInterface/Core
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/FileInterface
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/GeoMech
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ModelVisualization
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel/Flow
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel/Intersections
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ReservoirDataModel
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ReservoirDataModel/ResultAccessors
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ReservoirDataModel/ResultCalculators
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/SocketInterface
-    ${CMAKE_SOURCE_DIR}/ApplicationLibCode/UserInterface
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Commands
+          ${CMAKE_CURRENT_SOURCE_DIR}/Commands/EclipseCommands
+          ${CMAKE_CURRENT_SOURCE_DIR}/ResultStatisticsCache
+          ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModelCommands/CommandRouter
+          ${CMAKE_CURRENT_SOURCE_DIR}/UserInterface/AnalysisPlots
+          ${RI_PRIVATE_INCLUDES}
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+         ${CMAKE_CURRENT_SOURCE_DIR}/Adm
+         ${CMAKE_CURRENT_SOURCE_DIR}/Application
+         ${CMAKE_CURRENT_SOURCE_DIR}/Application/Tools
+         ${CMAKE_CURRENT_SOURCE_DIR}/Application/Tools/WellPathTools
+         ${CMAKE_CURRENT_SOURCE_DIR}/CommandFileInterface
+         ${CMAKE_CURRENT_SOURCE_DIR}/CommandFileInterface/Core
+         ${CMAKE_CURRENT_SOURCE_DIR}/FileInterface
+         ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech
+         ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization
+         ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/GridBox
+         ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Intersections
+         ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Seismic
+         ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Streamlines
+         ${CMAKE_CURRENT_SOURCE_DIR}/ModelVisualization/Surfaces
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/AnalysisPlots
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CorrelationPlots
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Annotations
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Completions
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Faults
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Flow
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GridCrossPlots
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GeoMech
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Parameters
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Measurement
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/StimPlanModel
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Summary
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Surfaces
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Intersections
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Streamlines
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Seismic
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CellFilters
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/ProcessControl
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/WellLog
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/WellMeasurement
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/WellPath
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModelCommands
+         ${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModelCommands/CommandRouter
+         ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel
+         ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/Completions
+         ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/ResultAccessors
+         ${CMAKE_CURRENT_SOURCE_DIR}/ReservoirDataModel/ResultCalculators
+         ${CMAKE_CURRENT_SOURCE_DIR}/SocketInterface
+         ${CMAKE_CURRENT_SOURCE_DIR}/UserInterface
+         ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechDataModel
+         ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechVisualization
+         ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/OdbReader
+         ${CMAKE_CURRENT_SOURCE_DIR}/Measurement
+         ${ResInsight_SOURCE_DIR}/ThirdParty
+         ${CMAKE_BINARY_DIR}/Generated
 )
 
 # ##############################################################################
diff --git a/ApplicationLibCode/Commands/CMakeLists.txt b/ApplicationLibCode/Commands/CMakeLists.txt
index 2145d2c1ef..509e4cc40e 100644
--- a/ApplicationLibCode/Commands/CMakeLists.txt
+++ b/ApplicationLibCode/Commands/CMakeLists.txt
@@ -60,12 +60,8 @@ add_library(
 )
 
 target_include_directories(
-  ${PROJECT_NAME}
-  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-         ${CMAKE_SOURCE_DIR}/ThirdParty
-         ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/generated-opm-common
-         ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common
-         ${CMAKE_SOURCE_DIR}/ThirdParty/qtadvanceddocking/src
+  ${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+                          ${CMAKE_CURRENT_SOURCE_DIR}/EclipseCommands
 )
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -115,21 +111,7 @@ if(MSVC)
 
 endif()
 
-set(LINK_LIBRARIES
-    LibCore
-    cafCommand
-    cafPdmCvf
-    cafPdmScripting
-    cafTensor
-    cafViewer
-    cafVizExtensions
-    ecl
-    nightcharts
-    qwt
-    ${QT_LIBRARIES}
-    Eigen3::Eigen
-    roffcpp
-)
+set(LINK_LIBRARIES ApplicationLibCode ResultStatisticsCache)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES})
 
diff --git a/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.cpp b/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.cpp
index c3bcda7f39..f9e3bbe6c9 100644
--- a/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.cpp
+++ b/ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.cpp
@@ -21,12 +21,12 @@
 #include "RiaApplication.h"
 #include "RiaLogging.h"
 
-#include "CommandRouter/RimcExtractSurfaces.h"
 #include "RicCreateEnsembleSurfaceUi.h"
 #include "RicImportEnsembleSurfaceFeature.h"
 #include "RicRecursiveFileSearchDialog.h"
 #include "RimDialogData.h"
 #include "RimProject.h"
+#include "RimcExtractSurfaces.h"
 
 #include "Riu3DMainWindowTools.h"
 #include "RiuPropertyViewTabWidget.h"
diff --git a/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt b/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt
index ee5362f407..4996891386 100644
--- a/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt
+++ b/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt
@@ -38,13 +38,15 @@ else()
   add_definitions(-DABQ_MPI_PMPI)
 endif(MSVC)
 
-include_directories(${RESINSIGHT_ODB_API_DIR}/include)
-
 add_library(
   ${PROJECT_NAME} RifOdbReader.h RifOdbReader.cpp RifGeoMechReaderInterface.h
                   RifGeoMechReaderInterface.cpp OdbSetup.cmake
 )
 
+target_include_directories(
+  ${PROJECT_NAME} PRIVATE ${RESINSIGHT_ODB_API_DIR}/include
+)
+
 if(MSVC)
   list(
     APPEND
diff --git a/ApplicationLibCode/ProjectDataModel/ProcessControl/CMakeLists_files.cmake b/ApplicationLibCode/ProjectDataModel/ProcessControl/CMakeLists_files.cmake
index c31e5d13da..e0dfb8e9fa 100644
--- a/ApplicationLibCode/ProjectDataModel/ProcessControl/CMakeLists_files.cmake
+++ b/ApplicationLibCode/ProjectDataModel/ProcessControl/CMakeLists_files.cmake
@@ -10,9 +10,7 @@ list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
-list(APPEND COMMAND_QT_MOC_HEADERS
-     ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.h
-)
+list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.h)
 
 source_group(
   "ProjectDataModel\\ProcessControl"
diff --git a/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt b/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt
index 843fbb5d2c..7d8c5acd3d 100644
--- a/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt
+++ b/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(ResultStatisticsCache)
 
-include_directories(${LibCore_SOURCE_DIR})
-
 add_library(
   ${PROJECT_NAME}
   RigStatisticsCalculator.h RigStatisticsCalculator.cpp
@@ -11,6 +9,6 @@ add_library(
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(${PROJECT_NAME} LibCore)
+target_link_libraries(${PROJECT_NAME} LibCore ApplicationLibCode)
 
 source_group("" FILES ${PROJECT_FILES})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e6e61b0e..1e01683e4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -828,6 +828,13 @@ endif()
 # Application
 # ##############################################################################
 add_subdirectory(ApplicationLibCode)
+add_subdirectory(ApplicationLibCode/Commands)
+add_subdirectory(ApplicationLibCode/ResultStatisticsCache)
+add_subdirectory(ApplicationLibCode/GeoMech/GeoMechDataModel)
+if(RESINSIGHT_USE_ODB_API)
+  add_subdirectory(ApplicationLibCode/GeoMech/OdbReader)
+endif()
+
 if(RESINSIGHT_ENABLE_GRPC)
   add_subdirectory(GrpcInterface)
 endif()
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
index 9c9365e159..91fa8faeed 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
@@ -20,8 +20,6 @@ find_package(
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
-include_directories(..)
-
 add_definitions(-DCVF_USING_CMAKE)
 
 set(PROJECT_FILES
@@ -86,7 +84,9 @@ set(QRC_FILES
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
 
-target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
+target_link_libraries(
+  ${PROJECT_NAME} cafPdmCore cafProjectDataModel ${QT_LIBRARIES}
+)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
index 4954ad8497..2ef313e3dd 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
@@ -14,8 +14,6 @@ find_package(
 )
 set(QT_LIBRARIES Qt5::Core Qt5::Xml)
 
-include_directories(..)
-
 set(PROJECT_FILES
     cafInternalPdmFieldIoHelper.cpp
     cafInternalPdmFieldIoHelper.h
diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt b/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt
index d92f1079aa..a1fe491d03 100644
--- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt
+++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt
@@ -19,18 +19,7 @@ qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
 
 option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
 
-include_directories(
-  ${LibCore_SOURCE_DIR}
-  ${LibGeometry_SOURCE_DIR}
-  ${LibGuiQt_SOURCE_DIR}
-  ${LibRender_SOURCE_DIR}
-  ${LibViewing_SOURCE_DIR}
-  ${cafProjectDataModel_SOURCE_DIR}
-  ${cafUserInterface_SOURCE_DIR}
-)
-
 if(USE_COMMAND_FRAMEWORK)
-  include_directories(${cafCommand_SOURCE_DIR})
   add_definitions(-DTAP_USE_COMMAND_FRAMEWORK)
 endif(USE_COMMAND_FRAMEWORK)
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
index d22efbb782..22bbc636fa 100644
--- a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
@@ -9,7 +9,8 @@ find_package(
 )
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL Qt5::Svg)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
+)
 
 set(PROJECT_FILES cafUserInterface_UnitTests.cpp cafPdmUiTreeViewModelTest.cpp
                   cafPdmUiTreeSelectionQModelTest.cpp gtest/gtest-all.cpp