diff --git a/src/regionFaModels/KirchhoffShell/KirchhoffShell.C b/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
index 7d0102f910..0b8cfd0a98 100644
--- a/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
+++ b/src/regionFaModels/KirchhoffShell/KirchhoffShell.C
@@ -27,8 +27,6 @@ License
 
 #include "KirchhoffShell.H"
 #include "addToRunTimeSelectionTable.H"
-#include "fvPatchFields.H"
-#include "zeroGradientFaPatchFields.H"
 #include "subCycle.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionFaModels/KirchhoffShell/KirchhoffShell.H b/src/regionFaModels/KirchhoffShell/KirchhoffShell.H
index b29a48820c..38460fb83e 100644
--- a/src/regionFaModels/KirchhoffShell/KirchhoffShell.H
+++ b/src/regionFaModels/KirchhoffShell/KirchhoffShell.H
@@ -69,7 +69,6 @@ SourceFiles
 
 #include "volFieldsFwd.H"
 #include "vibrationShellModel.H"
-#include "faMesh.H"
 #include "faCFD.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.H b/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.H
index f0c22c58b8..a24587a23d 100644
--- a/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.H
+++ b/src/regionFaModels/derivedFvPatchFields/filmShell/velocityFilmShellFvPatchVectorField.H
@@ -116,7 +116,6 @@ SourceFiles
 #ifndef velocityFilmShellFvPatchVectorField_H
 #define velocityFilmShellFvPatchVectorField_H
 
-#include "autoPtr.H"
 #include "liquidFilmBase.H"
 #include "mixedFvPatchFields.H"
 
diff --git a/src/regionFaModels/derivedFvPatchFields/thermalShell/thermalShellFvPatchScalarField.H b/src/regionFaModels/derivedFvPatchFields/thermalShell/thermalShellFvPatchScalarField.H
index bb5b48bc99..a229a43666 100644
--- a/src/regionFaModels/derivedFvPatchFields/thermalShell/thermalShellFvPatchScalarField.H
+++ b/src/regionFaModels/derivedFvPatchFields/thermalShell/thermalShellFvPatchScalarField.H
@@ -71,7 +71,6 @@ SourceFiles
 #ifndef Foam_thermalShellFvPatchScalarField_H
 #define Foam_thermalShellFvPatchScalarField_H
 
-#include "autoPtr.H"
 #include "thermalShellModel.H"
 #include "fixedValueFvPatchFields.H"
 
diff --git a/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.H b/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.H
index 64158eb555..7a41512e1e 100644
--- a/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.H
+++ b/src/regionFaModels/derivedFvPatchFields/vibrationShell/vibrationShellFvPatchScalarField.H
@@ -64,7 +64,6 @@ SourceFiles
 #ifndef vibrationShellFvPatchScalarField_H
 #define vibrationShellFvPatchScalarField_H
 
-#include "autoPtr.H"
 #include "vibrationShellModel.H"
 #include "mixedFvPatchFields.H"
 
diff --git a/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.C b/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.C
index f12e655ddd..f066339a04 100644
--- a/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.C
+++ b/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.C
@@ -27,7 +27,6 @@ License
 
 #include "kinematicThinFilm.H"
 #include "addToRunTimeSelectionTable.H"
-#include "uniformDimensionedFields.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.H b/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.H
index b198b2e40d..9847757f2b 100644
--- a/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.H
+++ b/src/regionFaModels/liquidFilm/kinematicThinFilm/kinematicThinFilm.H
@@ -60,8 +60,6 @@ SourceFiles
 
 #include "volFieldsFwd.H"
 #include "liquidFilmModel.H"
-#include "faMesh.H"
-#include "filmTurbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/liquidFilmBase.C b/src/regionFaModels/liquidFilm/liquidFilmBase.C
index ea492e9687..8675df546d 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmBase.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmBase.C
@@ -26,12 +26,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "liquidFilmBase.H"
-#include "faMesh.H"
 #include "gravityMeshObject.H"
 #include "movingWallVelocityFvPatchVectorField.H"
 #include "turbulentFluidThermoModel.H"
 #include "turbulentTransportModel.H"
-#include "calculatedFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/liquidFilmBase.H b/src/regionFaModels/liquidFilm/liquidFilmBase.H
index 4202ee6232..acd16f6080 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmBase.H
+++ b/src/regionFaModels/liquidFilm/liquidFilmBase.H
@@ -74,8 +74,6 @@ SourceFiles
 #ifndef Foam_liquidFilmBase_H
 #define Foam_liquidFilmBase_H
 
-#include "runTimeSelectionTables.H"
-#include "autoPtr.H"
 #include "faCFD.H"
 #include "volFieldsFwd.H"
 #include "uniformDimensionedFields.H"
diff --git a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
index ff5fd9ed50..00f0d1b682 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
@@ -27,8 +27,6 @@ License
 
 #include "liquidFilmModel.H"
 #include "addToRunTimeSelectionTable.H"
-#include "uniformDimensionedFields.H"
-#include "gravityMeshObject.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.H b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.H
index e7542a414b..43300fb3bd 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.H
+++ b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.H
@@ -68,7 +68,6 @@ SourceFiles
 
 #include "volFieldsFwd.H"
 #include "liquidFilmBase.H"
-#include "faMesh.H"
 #include "filmTurbulenceModel.H"
 #include "liquidMixtureProperties.H"
 #include "injectionModelList.H"
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
index 93b54a3ce0..bece312678 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
@@ -29,7 +29,6 @@ License
 #include "gravityMeshObject.H"
 #include "turbulentTransportModel.H"
 #include "turbulentFluidThermoModel.H"
-#include "PtrMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
index 199cf53664..c6d0fe743b 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
@@ -102,11 +102,7 @@ SourceFiles
 #define regionFaModels_filmTurbulenceModel_H
 
 #include "areaFieldsFwd.H"
-#include "runTimeSelectionTables.H"
-#include "faMatrices.H"
 #include "liquidFilmBase.H"
-#include "fvMesh.H"
-#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/laminar/laminar.H b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/laminar/laminar.H
index 64488aa23a..6dfb3ef759 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/laminar/laminar.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/filmTurbulenceModel/laminar/laminar.H
@@ -37,8 +37,7 @@ SourceFiles
 #ifndef regionFaModels_surfaceFilmModels_laminar_H
 #define regionFaModels_surfaceFilmModels_laminar_H
 
-#include "liquidFilm/subModels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H"
-#include "faCFD.H"
+#include "filmTurbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
index dfe9dad388..5f5ddaeaac 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
@@ -27,9 +27,7 @@ License
 
 #include "contactAngleForce.H"
 #include "addToRunTimeSelectionTable.H"
-#include "faCFD.H"
 #include "unitConversion.H"
-#include "meshWavePatchDistMethod.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.C b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.C
index 559dbab3b7..f09e8a6cd8 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.C
@@ -27,6 +27,8 @@ License
 
 #include "dynamicContactAngleForce.H"
 #include "addToRunTimeSelectionTable.H"
+#include "Function1.H"
+#include "distributionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.H b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.H
index 8f2ec84b88..b1db31df72 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/dynamicContactAngleForce/dynamicContactAngleForce.H
@@ -86,14 +86,17 @@ SourceFiles
 #define areaSurfaceFilmModels_dynamicContactAngleForce_H
 
 #include "contactAngleForce.H"
-#include "Function1.H"
-#include "distributionModel.H"
 #include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+
+// Forward Declarations
+template<class Type> class Function1;
+class distributionModel;
+
 namespace regionModels
 {
 namespace areaSurfaceFilmModels
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/force/forceList/forceList.H b/src/regionFaModels/liquidFilm/subModels/kinematic/force/forceList/forceList.H
index f22f2d2331..58b9860aae 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/force/forceList/forceList.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/force/forceList/forceList.H
@@ -65,9 +65,7 @@ SourceFiles
 #ifndef forceList_H
 #define forceList_H
 
-#include "PtrList.H"
 #include "force.H"
-#include "faCFD.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 69e33a08f3..de6effd2c9 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -28,9 +28,6 @@ License
 
 #include "curvatureSeparation.H"
 #include "addToRunTimeSelectionTable.H"
-#include "Time.H"
-#include "stringListOps.H"
-#include "cyclicPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
index e451a70b01..07dbef9e18 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
@@ -87,7 +87,6 @@ SourceFiles
 #define curvatureSeparation_H
 
 #include "injectionModel.H"
-#include "faCFD.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModel/injectionModel.H b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModel/injectionModel.H
index 5bf117f7a9..fe6a86363d 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModel/injectionModel.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModel/injectionModel.H
@@ -40,8 +40,6 @@ SourceFiles
 #define injectionModel_H
 
 #include "filmSubModelBase.H"
-#include "runTimeSelectionTables.H"
-#include "scalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModelList/injectionModelList.H b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModelList/injectionModelList.H
index 0e42c9059d..b57bb02bce 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModelList/injectionModelList.H
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/injectionModel/injectionModelList/injectionModelList.H
@@ -65,10 +65,8 @@ SourceFiles
 #ifndef injectionModelList_H
 #define injectionModelList_H
 
-#include "PtrList.H"
 #include "injectionModel.H"
 #include "filmSubModelBase.H"
-#include "scalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/regionFaModel/regionFaModel.H b/src/regionFaModels/regionFaModel/regionFaModel.H
index 7911df0463..2a36c2c174 100644
--- a/src/regionFaModels/regionFaModel/regionFaModel.H
+++ b/src/regionFaModels/regionFaModel/regionFaModel.H
@@ -69,11 +69,6 @@ SourceFiles
 #define Foam_regionFaModel_H
 
 #include "volMesh.H"
-#include "IOdictionary.H"
-#include "Switch.H"
-#include "labelList.H"
-#include "areaFields.H"
-#include "faMesh.H"
 #include "volSurfaceMapping.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionFaModels/thermalShell/thermalShell.C b/src/regionFaModels/thermalShell/thermalShell.C
index 0bcded7219..7d625ecfe4 100644
--- a/src/regionFaModels/thermalShell/thermalShell.C
+++ b/src/regionFaModels/thermalShell/thermalShell.C
@@ -28,7 +28,6 @@ License
 #include "thermalShell.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFields.H"
-#include "zeroGradientFaPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/thermalShell/thermalShell.H b/src/regionFaModels/thermalShell/thermalShell.H
index f509aa2db0..caf0574803 100644
--- a/src/regionFaModels/thermalShell/thermalShell.H
+++ b/src/regionFaModels/thermalShell/thermalShell.H
@@ -78,7 +78,6 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "thermalShellModel.H"
 #include "solidProperties.H"
-#include "faMesh.H"
 #include "faCFD.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionFaModels/thermalShellModel/thermalShellModel.C b/src/regionFaModels/thermalShellModel/thermalShellModel.C
index 4e9274a78d..dab5d08c60 100644
--- a/src/regionFaModels/thermalShellModel/thermalShellModel.C
+++ b/src/regionFaModels/thermalShellModel/thermalShellModel.C
@@ -26,9 +26,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "thermalShellModel.H"
-#include "faMesh.H"
-#include "fvMesh.H"
-#include "fvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/thermalShellModel/thermalShellModel.H b/src/regionFaModels/thermalShellModel/thermalShellModel.H
index 80ea70bfa8..a56a48b3af 100644
--- a/src/regionFaModels/thermalShellModel/thermalShellModel.H
+++ b/src/regionFaModels/thermalShellModel/thermalShellModel.H
@@ -65,8 +65,6 @@ SourceFiles
 #ifndef Foam_regionModels_thermalShellModel_H
 #define Foam_regionModels_thermalShellModel_H
 
-#include "runTimeSelectionTables.H"
-#include "autoPtr.H"
 #include "areaFieldsFwd.H"
 #include "volFieldsFwd.H"
 #include "regionFaModel.H"
diff --git a/src/regionFaModels/vibrationShellModel/vibrationShellModel.C b/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
index d6a989c444..bc952ad3a7 100644
--- a/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
+++ b/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
@@ -26,9 +26,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "vibrationShellModel.H"
-#include "faMesh.H"
-#include "fvMesh.H"
-#include "fvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionFaModels/vibrationShellModel/vibrationShellModel.H b/src/regionFaModels/vibrationShellModel/vibrationShellModel.H
index cc9e875990..c21c928d5f 100644
--- a/src/regionFaModels/vibrationShellModel/vibrationShellModel.H
+++ b/src/regionFaModels/vibrationShellModel/vibrationShellModel.H
@@ -68,8 +68,6 @@ SourceFiles
 #ifndef Foam_regionModels_vibrationShellModel_H
 #define Foam_regionModels_vibrationShellModel_H
 
-#include "runTimeSelectionTables.H"
-#include "autoPtr.H"
 #include "areaFieldsFwd.H"
 #include "volFieldsFwd.H"
 #include "regionFaModel.H"