diff --git a/applications/solvers/CMakeLists.txt b/applications/solvers/CMakeLists.txt
index 2f716e153..960a075d3 100644
--- a/applications/solvers/CMakeLists.txt
+++ b/applications/solvers/CMakeLists.txt
@@ -29,23 +29,23 @@
 #
 # --------------------------------------------------------------------------
 
-#add_subdirectory(engine)
-#add_subdirectory(solidMechanics)
-#add_subdirectory(multiphase)
-#add_subdirectory(lagrangian)
-#add_subdirectory(financial)
-#add_subdirectory(discreteMethods)
-#add_subdirectory(coupled)
-#add_subdirectory(compressible)
-#add_subdirectory(multiSolver)
+add_subdirectory(engine)
+add_subdirectory(solidMechanics)
+add_subdirectory(multiphase)
+add_subdirectory(lagrangian)
+add_subdirectory(financial)
+add_subdirectory(discreteMethods)
+add_subdirectory(coupled)
+add_subdirectory(compressible)
+add_subdirectory(multiSolver)
 add_subdirectory(incompressible)
-#add_subdirectory(equationReaderDemo)
-#add_subdirectory(heatTransfer)
-#add_subdirectory(electromagnetics)
-#add_subdirectory(combustion)
-#add_subdirectory(finiteArea)
-#add_subdirectory(DNS)
+add_subdirectory(equationReaderDemo)
+add_subdirectory(heatTransfer)
+add_subdirectory(electromagnetics)
+add_subdirectory(combustion)
+add_subdirectory(finiteArea)
+add_subdirectory(DNS)
 add_subdirectory(basic)
-#add_subdirectory(immersedBoundary)
-#add_subdirectory(surfaceTracking)
-#add_subdirectory(viscoelastic)
+add_subdirectory(immersedBoundary)
+add_subdirectory(surfaceTracking)
+add_subdirectory(viscoelastic)
diff --git a/applications/solvers/DNS/dnsFoam/CMakeLists.txt b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
index 7b48964fe..97189c2a6 100644
--- a/applications/solvers/DNS/dnsFoam/CMakeLists.txt
+++ b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dnsFoam
-#   DEPENDS finiteVolume
+  DEPENDS randomProcesses
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/PDRFoam/CMakeLists.txt b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
index 81ff53fad..5210f86b9 100644
--- a/applications/solvers/combustion/PDRFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
@@ -63,6 +63,14 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(PDRFoam
-#   DEPENDS finiteVolume
+  DEPENDS engine compressibleRASModels laminarFlameSpeedModels dynamicFvMesh
   SOURCES ${SOURCES}
 )
+
+target_include_directories(PDRFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/XiModels/XiModel>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/XiModels/XiEqModels/XiEqModel>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/XiModels/XiGModels/XiGModel>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PDRModels/dragModels/PDRDragModel>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/laminarFlameSpeed/SCOPE>
+)
diff --git a/applications/solvers/combustion/XiFoam/CMakeLists.txt b/applications/solvers/combustion/XiFoam/CMakeLists.txt
index 4918638b8..11f4ff1d8 100644
--- a/applications/solvers/combustion/XiFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/XiFoam/CMakeLists.txt
@@ -41,6 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(XiFoam
-#   DEPENDS finiteVolume
+  DEPENDS reactionThermophysicalModels engine compressibleTurbulenceModel
+  DEPENDS laminarFlameSpeedModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
index 8cf7679bd..f7bfd34a2 100644
--- a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
@@ -41,6 +41,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(coldEngineFoam
-#   DEPENDS finiteVolume
+  DEPENDS engine compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(coldEngineFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../engineFoam>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../XiFoam>
+)
diff --git a/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt b/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
index 8c195d391..fa835766a 100644
--- a/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dieselEngineFoam
-#   DEPENDS finiteVolume
+  DEPENDS engine dieselSpray chemistryModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(dieselEngineFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../engineFoam>
+)
diff --git a/applications/solvers/combustion/dieselFoam/CMakeLists.txt b/applications/solvers/combustion/dieselFoam/CMakeLists.txt
index 59f96a42f..c3a034763 100644
--- a/applications/solvers/combustion/dieselFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/dieselFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dieselFoam
-#   DEPENDS finiteVolume
+  DEPENDS chemistryModel dieselSpray
   SOURCES ${SOURCES}
 )
+
+target_include_directories(dieselFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dieselEngineFoam>
+)
diff --git a/applications/solvers/combustion/engineFoam/CMakeLists.txt b/applications/solvers/combustion/engineFoam/CMakeLists.txt
index 3f2398763..fece520e3 100644
--- a/applications/solvers/combustion/engineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/engineFoam/CMakeLists.txt
@@ -41,6 +41,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(engineFoam
-#   DEPENDS finiteVolume
+  DEPENDS reactionThermophysicalModels engine compressibleTurbulenceModel
+  DEPENDS laminarFlameSpeedModels
   SOURCES ${SOURCES}
 )
+
+target_include_directories(engineFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../XiFoam>
+)
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt b/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
index 578a54d34..9e51acbf1 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
+++ b/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
@@ -39,4 +39,11 @@ list(APPEND SOURCES
 
 add_foam_library(combustionModels SHARED ${SOURCES})
 
-#target_link_libraries(combustionModels finiteVolume)
+target_link_libraries(combustionModels finiteVolume)
+
+target_include_directories(combustionModels PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/basic/lnInclude>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/reactionThermo/lnInclude>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/specie/lnInclude>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/turbulenceModels/compressible/turbulenceModel>
+)
diff --git a/applications/solvers/combustion/reactingFoam/CMakeLists.txt b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
index bbaea60ea..8497390a3 100644
--- a/applications/solvers/combustion/reactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(reactingFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
index a392166ea..f62fdb133 100644
--- a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoReactingFoam
-#   DEPENDS finiteVolume
+  DEPENDS chemistryModel compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/CMakeLists.txt b/applications/solvers/compressible/CMakeLists.txt
index 5bf82cbd5..473be5284 100644
--- a/applications/solvers/compressible/CMakeLists.txt
+++ b/applications/solvers/compressible/CMakeLists.txt
@@ -40,11 +40,11 @@ add_subdirectory(rhoPorousMRFPimpleFoam)
 add_subdirectory(rhopSonicFoam)
 add_subdirectory(rhoPisoFoam)
 add_subdirectory(steadyCompressibleFoam)
-add_subdirectory(dbnsFoam)
+#add_subdirectory(dbnsFoam)
 add_subdirectory(steadyUniversalFoam)
 add_subdirectory(steadyCompressibleMRFFoam)
 add_subdirectory(rhoSimpleFoam)
 add_subdirectory(sonicLiquidFoam)
 add_subdirectory(rhoCentralFoam)
 add_subdirectory(rhoPorousSimpleFoam)
-add_subdirectory(dbnsTurbFoam)
\ No newline at end of file
+#add_subdirectory(dbnsTurbFoam)
diff --git a/applications/solvers/compressible/dbnsFoam/CMakeLists.txt b/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
index d71153783..ad9a93677 100644
--- a/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dbnsFoam
-#   DEPENDS finiteVolume
+  DEPENDS basicThermophysicalModels dbns
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt b/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
index 7997ca8b6..39215ebb8 100644
--- a/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(realFluidPisoFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
index 6729595f7..40bfaf524 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
@@ -39,4 +39,4 @@ list(APPEND SOURCES
 
 add_foam_library(rhoCentralFoam SHARED ${SOURCES})
 
-#target_link_libraries(rhoCentralFoam finiteVolume)
+target_link_libraries(rhoCentralFoam finiteVolume)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
index c0e5572be..cf8c4ab9c 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
index 18f08fbb5..7441bb2d7 100644
--- a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPisoFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
index 3aafc1900..afade899b 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPorousMRFPimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(rhoPorousMRFPimpleFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../rhoPimpleFoam>
+)
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
index 49b4e72c1..e9625d07a 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoPorousSimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
+
+target_include_directories(rhoPorousSimpleFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/finiteVolume/cfdTools>
+)
diff --git a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
index f90f09149..148a64140 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoSimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
+
+target_include_directories(rhoSimpleFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/finiteVolume/cfdTools>
+)
diff --git a/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
index 66c33dd12..45e6ec03b 100644
--- a/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(rhoSonicFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
index 1c519a14b..dbaf8e29b 100644
--- a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
@@ -41,4 +41,4 @@ list(APPEND SOURCES
 
 add_foam_library(rhopSonicFoam SHARED ${SOURCES})
 
-#target_link_libraries(rhopSonicFoam finiteVolume)
+target_link_libraries(rhopSonicFoam PUBLIC finiteVolume)
diff --git a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
index 49ac038c6..189772b7b 100644
--- a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicDyMFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel dynamicFvMesh
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/sonicFoam/CMakeLists.txt b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
index 231e3fc06..7938c1d97 100644
--- a/applications/solvers/compressible/sonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt b/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
index b5556ca55..59192f0ce 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicLiquidFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt b/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt
index 6b6bf38b1..fbf7296e7 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(steadyCompressibleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt b/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt
index 8eaf88a91..4f18b1b82 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(steadyCompressibleMRFFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt b/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt
index ec68a7217..09b33acb1 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(steadyCompressibleSRFFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt b/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt
index 725aa4451..b7a12a314 100644
--- a/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(steadyUniversalFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt b/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt
index 519642616..6022bd014 100644
--- a/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(steadyUniversalMRFFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt b/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt
index 170684545..a5b933258 100644
--- a/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(MRFPorousFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt b/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt
index f18b8a255..b864688ac 100644
--- a/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(blockCoupledScalarTransportFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt b/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt
index 7a1c20e41..2029752d6 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(conjugateHeatFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleRASModels coupledLduMatrix conjugateHeatTransfer
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt b/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt
index 68fe48014..703c0de35 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(conjugateHeatSimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleRASModels coupledLduMatrix conjugateHeatTransfer
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt b/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt
index 50b97a440..300b3a9f4 100644
--- a/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt
+++ b/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt
@@ -89,4 +89,4 @@ list(APPEND SOURCES
 
 add_foam_library(conjugateHeatTransfer SHARED ${SOURCES})
 
-#target_link_libraries(conjugateHeatTransfer finiteVolume)
+target_link_libraries(conjugateHeatTransfer PUBLIC radiation)
diff --git a/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt b/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt
index 76c480b61..b8bab942a 100644
--- a/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(pUCoupledFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt b/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
index e8b1c2ce5..0549453c0 100644
--- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dsmcFoam
-#   DEPENDS finiteVolume
+  DEPENDS dsmc
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
index 1dc638fd6..daa72a99c 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(mdEquirationFoam
-#   DEPENDS finiteVolume
+  DEPENDS molecule molecularMeasurements
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
index 19fc7931c..9a8e8e757 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(mdFoam
-#   DEPENDS finiteVolume
+  DEPENDS molecule molecularMeasurements
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt b/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
index f7639cca3..d7cddbeef 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(electrostaticFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt b/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
index b4b13e321..c62f7dc23 100644
--- a/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(mhdFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt
index fb18a098a..460dae831 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(icoDyMEngineFoam
-#   DEPENDS finiteVolume
+  DEPENDS engine
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
index 5e83c7857..43b571200 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicTurbDyMEngineFoam
-#   DEPENDS finiteVolume
+  DEPENDS basicThermophysicalModels compressibleTurbulenceModel engine
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt
index 8b3ceb2d2..79ee5c146 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(turbDyMEngineFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleTurbulenceModel engine
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/equationReaderDemo/CMakeLists.txt b/applications/solvers/equationReaderDemo/CMakeLists.txt
index fa0838428..b35eee27f 100644
--- a/applications/solvers/equationReaderDemo/CMakeLists.txt
+++ b/applications/solvers/equationReaderDemo/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(equationReaderDemo
-#   DEPENDS finiteVolume
+  DEPENDS equationReader incompressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/financial/financialFoam/CMakeLists.txt b/applications/solvers/financial/financialFoam/CMakeLists.txt
index 4b78839e9..16da86f20 100644
--- a/applications/solvers/financial/financialFoam/CMakeLists.txt
+++ b/applications/solvers/financial/financialFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(financialFoam
-#   DEPENDS finiteVolume
+  DEPENDS sampling
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt b/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt
index ae7dc9265..85b38b44f 100644
--- a/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt
+++ b/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(liquidFilmFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume finiteArea
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt b/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt
index 1769dc04b..20dfd2556 100644
--- a/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt
+++ b/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(surfactantFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume finiteArea
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt
index a5988da66..6c8436b36 100644
--- a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(boussinesqBuoyantFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
index 27c6ff919..465ddddb4 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(buoyantBoussinesqPisoFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(buoyantBoussinesqPisoFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../buoyantBoussinesqSimpleFoam>
+)
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
index 113baa1bf..122ce4eea 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(buoyantBoussinesqSimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS incompressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
index 25f922bdf..5ea3057d3 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(buoyantPisoFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
index e42430922..377028834 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(buoyantSimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
index 1d2d3eaf3..22e628f47 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(buoyantSimpleRadiationFoam
-#   DEPENDS finiteVolume
+  DEPENDS radiation compressibleRASModels
   SOURCES ${SOURCES}
 )
+
+target_include_directories(buoyantSimpleRadiationFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../buoyantSimpleFoam>
+)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
index 894430d35..9f99eb816 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
@@ -46,6 +46,13 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(chtMultiRegionFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(chtMultiRegionFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fluid>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/solid>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/regionProperties>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
index 3cc3b000a..26c0711e7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
@@ -42,6 +42,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(chtMultiRegionSimpleFoam
-#   DEPENDS finiteVolume
+  DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
+
+target_include_directories(chtMultiRegionSimpleFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fluid>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/solid>
+)
diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt
index 4f08b7e28..c46ec3330 100644
--- a/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(icoDyMIbFoam
-#   DEPENDS finiteVolume
+  DEPENDS immersedBoundary dynamicFvMesh
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt
index 627967ea0..a5afe5a3b 100644
--- a/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(icoIbFoam
-#   DEPENDS finiteVolume
+  DEPENDS immersedBoundary
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt
index 43472e250..0aa7219b6 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interIbFoam
-#   DEPENDS finiteVolume
+  DEPENDS immersedBoundary interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt
index 95cef4f61..718305c62 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(porousSimpleIbFoam
-#   DEPENDS finiteVolume
+  DEPENDS immersedBoundaryTurbulence
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt
index 17ec20f55..17fddb272 100644
--- a/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(potentialIbFoam
-#   DEPENDS finiteVolume
+  DEPENDS immersedBoundary
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt
index 23e449a1f..1f782001f 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(simpleIbFoam
-#   DEPENDS finiteVolume
+  DEPENDS immersedBoundaryTurbulence
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
index 83b524a4d..510e55707 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
@@ -41,6 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(coalChemistryFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
+  DEPENDS chemistryModel coalCombustion
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
index 71f7c48c8..faebf55b2 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
@@ -41,6 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(porousExplicitSourceReactingParcelFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
+  DEPENDS chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
index 2c2636879..6e921c2eb 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
@@ -41,6 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(reactingParcelFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
+  DEPENDS chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
index 78291584b..f91f5bb36 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(uncoupledKinematicParcelFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt b/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
index 1ff23bbd8..67751f8d4 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
+++ b/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(multiSolverDemo
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume multiSolverLib
   SOURCES ${SOURCES}
 )
+
+target_include_directories(multiSolverDemo PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/multiSolver/lnInclude>
+)
diff --git a/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt b/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
index 45bb31fa6..70c2118b2 100644
--- a/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(MRFInterFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(MRFInterFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
+)
diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt b/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt
index dfae93e0a..5d0f3fedd 100644
--- a/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(barotropicCavitatingFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt b/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
index 3aa131b09..4fad7047c 100644
--- a/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(bubbleFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
index 2ce310d09..1fca950a8 100644
--- a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
@@ -41,6 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(cavitatingFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS barotropicCompressibilityModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
index 87a91c4c0..17b9c3329 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
@@ -41,6 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(compressibleInterDyMFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS dynamicFvMesh
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
index 678f237a5..d4c9b8661 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(compressibleInterFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
index 4c1c523c2..55006de8e 100644
--- a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
@@ -41,6 +41,12 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interDyMFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS dynamicFvMesh
   SOURCES ${SOURCES}
 )
+
+target_include_directories(interDyMFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
+)
+
diff --git a/applications/solvers/multiphase/interFoam/CMakeLists.txt b/applications/solvers/multiphase/interFoam/CMakeLists.txt
index fd2e0b8b2..57279ebaf 100644
--- a/applications/solvers/multiphase/interFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
index a6e27125b..e486a4064 100644
--- a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
@@ -43,6 +43,12 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interMixingFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(interMixingFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/incompressibleThreePhaseMixture>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/threePhaseInterfaceProperties>
+)
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
index a7d80254a..d239ee1b6 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
@@ -46,6 +46,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interPhaseChangeFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(interPhaseChangeFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture>
+)
+
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
index 488b99c71..5ca6c6b3a 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
@@ -44,6 +44,13 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(multiphaseInterFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(multiphaseInterFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/multiphaseMixture>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/multiphaseMixture/phase>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/multiphaseMixture/multiphaseAlphaContactAngle>
+)
diff --git a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
index 1409915cd..a64ab896b 100644
--- a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
@@ -41,6 +41,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(porousInterFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
+
+target_include_directories(porousInterFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
+)
+
diff --git a/applications/solvers/multiphase/settlingFoam/CMakeLists.txt b/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
index f936b5f40..41e3482cc 100644
--- a/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(settlingFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
index ac531cd5d..91f28caa5 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(twoLiquidMixingFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
index c4619742e..5acc11844 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
@@ -44,4 +44,8 @@ list(APPEND SOURCES
 
 add_foam_library(EulerianInterfacialModels SHARED ${SOURCES})
 
-#target_link_libraries(EulerianInterfacialModels finiteVolume)
+target_link_libraries(EulerianInterfacialModels PUBLIC finiteVolume phaseModel)
+
+target_include_directories(EulerianInterfacialModels PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../phaseModel>
+)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
index b609a4c13..e496cf16c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
@@ -61,4 +61,10 @@ list(APPEND SOURCES
 
 add_foam_library(kineticTheoryModel SHARED ${SOURCES})
 
-#target_link_libraries(kineticTheoryModel finiteVolume)
+target_link_libraries(kineticTheoryModel PUBLIC finiteVolume phaseModel)
+
+target_include_directories(kineticTheoryModel PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels/dragModels/dragModel>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../phaseModel>
+)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
index db288e4c2..1a6563c48 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
@@ -36,4 +36,4 @@ list(APPEND SOURCES
 
 add_foam_library(phaseModel SHARED ${SOURCES})
 
-#target_link_libraries(phaseModel finiteVolume)
+target_link_libraries(phaseModel PUBLIC finiteVolume incompressibleTransportModels)
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt
index ec3c3b757..d8c665ea7 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt
@@ -44,6 +44,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(contactStressFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt
index 0ac795db1..307382a9b 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt
@@ -42,6 +42,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(icoFsiFoam
-#   DEPENDS finiteVolume
+  DEPENDS dynamicFvMesh
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt
index ad5ec3095..bf9219730 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt
@@ -68,4 +68,4 @@ list(APPEND SOURCES
 
 add_foam_library(materialModels SHARED ${SOURCES})
 
-#target_link_libraries(materialModels finiteVolume)
+target_link_libraries(materialModels PUBLIC finiteVolume)
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt
index bed60d313..f07b2251b 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt
@@ -43,6 +43,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(newContactStressFoam
-#   DEPENDS finiteVolume
+  DEPENDS materialModels
   SOURCES ${SOURCES}
 )
+
+target_include_directories(newContactStressFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../newStressedFoam>
+)
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt
index 438787650..aae5294b6 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(newStressedFoam
-#   DEPENDS finiteVolume
+  DEPENDS materialModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt
index 22333d16b..abe1e9019 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt
@@ -42,6 +42,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(solidDisplacementFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt
index 61bc95f70..38969cf50 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt
@@ -42,6 +42,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(solidEquiriumDisplacementFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
+
+target_include_directories(solidEquiriumDisplacementFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../solidDisplacementFoam>
+)
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt
index 2b7caf2c5..944430980 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt
@@ -42,6 +42,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(stressedFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt
index 1c1ca746d..f8c24aab5 100644
--- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticAcpSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt
index 0bac43415..3702d92fa 100644
--- a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticIncrAcpSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt
index e69869502..2357fa38f 100644
--- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticIncrSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt
index 5712f2a0a..46eacc587 100644
--- a/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticNonLinIncrTLSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt
index 72073b7bb..7a07d9833 100644
--- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticNonLinTLSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt
index d01e22a7d..5a82900f2 100644
--- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticNonLinULSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt
index 7bfddc035..b589ccfeb 100644
--- a/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticOrthoAcpSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt
index 5550ba1e1..28421f58a 100644
--- a/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticOrthoNonLinULSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt
index 0eb6a67d2..fff0694cd 100644
--- a/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticOrthoSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt
index 8f89455f7..6f91548ba 100644
--- a/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticPlasticNonLinTLSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt
index 68a3e2a87..e8395c54a 100644
--- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticPlasticNonLinULSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt
index 208a9cb51..da68608c1 100644
--- a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticPlasticSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt
index 882e9cebb..b102b65b1 100644
--- a/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
index aefe0ae52..0d79413cb 100644
--- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(elasticThermalSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt
index f879d1832..f7be29266 100644
--- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(icoFsiElasticNonLinULSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt b/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt
index acd231a46..cecdd350c 100644
--- a/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt
@@ -42,6 +42,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(stressFemFoam
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume tetFiniteElement
   SOURCES ${SOURCES}
 )
+
+target_include_directories(stressFemFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/femStress/Traction>
+)
+
diff --git a/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt
index 047af9267..83a30b820 100644
--- a/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(calculateCourantNumber
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt
index 0ba39540f..03cc1cdcb 100644
--- a/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(forceDisp
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt
index 2897e58f9..1473c9eca 100644
--- a/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(patchStressIntegrate
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt
index e8919fb6a..c31490e81 100644
--- a/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(smoothMesh
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt
index 1c9d604db..b96200730 100644
--- a/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(surfaceTractions
-#   DEPENDS finiteVolume
+  DEPENDS finiteVolume
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt
index 4d48176e4..5095215cc 100644
--- a/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(viscoElasticSolidFoam
-#   DEPENDS finiteVolume
+  DEPENDS solidModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
index aa714c49d..e5ed8cb74 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
@@ -41,6 +41,11 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(bubbleInterTrackFoam
-#   DEPENDS finiteVolume
+  DEPENDS freeSurface
   SOURCES ${SOURCES}
 )
+
+target_include_directories(bubbleInterTrackFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../freeSurface/lnInclude>
+)
diff --git a/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt b/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt
index 2742c3fd0..3e6c9982c 100644
--- a/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt
@@ -49,4 +49,4 @@ list(APPEND SOURCES
 
 add_foam_library(freeSurface SHARED ${SOURCES})
 
-#target_link_libraries(freeSurface finiteVolume)
+target_link_libraries(freeSurface PUBLIC finiteArea dynamicFvMesh)
diff --git a/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt b/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt
index 25ee05e89..e7ebd934d 100644
--- a/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt
@@ -41,6 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interTrackFoam
-#   DEPENDS finiteVolume
+  DEPENDS freeSurface
   SOURCES ${SOURCES}
 )
+
+target_include_directories(interTrackFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+)
diff --git a/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt b/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt
index 41b6070cb..bd941785e 100644
--- a/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(setFluidIndicator
-#   DEPENDS finiteVolume
+  DEPENDS freeSurface
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt b/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt
index 2dc7e5836..ca10bd5e6 100644
--- a/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt
+++ b/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(viscoelasticFluidFoam
-#   DEPENDS finiteVolume
+  DEPENDS viscoelasticTransportModels
   SOURCES ${SOURCES}
 )