diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index c243c07e3d6b7cbf68de798641ddc286485b6622..d4d30a98d462a51f548987b984e39c65e81c4fe6 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -52,4 +52,5 @@ EXE_LIBS = \
     -lpyrolysisModels \
     -lregionCoupling \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lODE
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index 8a4d6cc23b9220e4937da68a44c3d8ef09bb59a7..e9524dfc2beafae2ccb910c7904a6474a9e7416e 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -14,7 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 85cd3a4713a8745ba72b995f0262f66a7e9288c4..4f85279a69770a1fc2495d0417c6ead246950a99 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -35,6 +35,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lcoalCombustion\
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index cb0f90524a56003c87aa192cba3889fca575eac3..13f3b20206ec58b51fd4163b80ced2413dd8f420 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -16,6 +16,7 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index 942c217fa48310294f823887ffaab0db0460a303..2474917002178e43a5c8c18332c7be5e28918a92 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -20,6 +20,7 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index e0aac8c5dbb8e4011de1fb0da9e8a2b1348d7978..64d1d962ba4213ea6cd92951b84d42ad990d7cac 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -44,5 +44,6 @@ EXE_LIBS = \
     -lradiationModels \
     -lsurfaceFilmModels \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lODE \
     -lcombustionModels
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
index 9aa1847960966e57ec60a341e92fded3ef701f49..2cc7dfa1e7825fea2774eb3bf5893e03acd3a6e3 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 705cfc9433f4f9e47764f0f7d26e59cb0d82ff2c..ce479be6b6c14779f6e72986b69db511db3299e4 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index 705cfc9433f4f9e47764f0f7d26e59cb0d82ff2c..ce479be6b6c14779f6e72986b69db511db3299e4 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 9dce65d02351332ef2934207d713b6636640e8a8..bbae7d499bf96de56e71f83682e4a55d9aa9256f 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -35,6 +35,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -llagrangianSpray \
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index 77034c9ef3b992e83ba612a970b62f32e0ba8b32..e516ea3f108fadc78c20e08047a09fa19717d0b4 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -37,6 +37,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -llagrangianSpray \
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 12c7c1c551124077ff728b972778e9c0a303b38c..dd86faf2ab293fd8fba46396d4aadb2f52380d59 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -14,6 +14,7 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index f4e774028ee458a334ce664a39deecb2ca0aff55..79cbc346255fa00a82724a0afa228787f9d334b7 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -12,7 +12,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -33,13 +32,6 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
index c0b418fd0a432fec76fb59daf3caf0cb7024f42d..584dc186302bc572fe5e6a6046b7befa60ecafcf 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
@@ -27,8 +27,8 @@ License
 
 #include "makeParcelCloudFunctionObjects.H"
 
-#include "GradientDispersionRAS.H"                                              
-#include "StochasticDispersionRAS.H"                                            
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index a35eeaef2b315ae465986a08ede3bb4bb7d5750d..119de86cc63d13e0c56db4a2446068e7c8aacbb8 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -27,8 +27,8 @@ License
 
 #include "makeParcelCloudFunctionObjects.H"
 
-#include "GradientDispersionRAS.H"                                              
-#include "StochasticDispersionRAS.H"                                            
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index 2ed2123cd1a6c45ee53ba8bcc03612e57e43beb3..08720bbc764cf02b8fa933f0acd8d265eb3fb4f7 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -27,8 +27,8 @@ License
 
 #include "makeParcelCloudFunctionObjects.H"
 
-#include "GradientDispersionRAS.H"                                              
-#include "StochasticDispersionRAS.H"                                            
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
 
 #include "BrownianMotionForce.H"
 
diff --git a/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
index f81c6e73b48abac8196b49594cd32b20246836ab..da13ed2e1e7d9ffdc3c822a0aae7eee711f27b90 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -27,8 +27,8 @@ License
 
 #include "makeParcelCloudFunctionObjects.H"
 
-#include "GradientDispersionRAS.H"                                              
-#include "StochasticDispersionRAS.H"                                            
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
 
 #include "BrownianMotionForce.H"
 
diff --git a/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index b2de96ae39f6f61f521fb53e780d7ca833a33488..5c71da29f5dfd95481dad6a141a59e71546afbab 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -27,8 +27,8 @@ License
 
 #include "makeParcelCloudFunctionObjects.H"
 
-#include "GradientDispersionRAS.H"                                              
-#include "StochasticDispersionRAS.H"                                            
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
 
 #include "BrownianMotionForce.H"