diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/writeDimFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/writeDimFields.H
index 6c48eed728845da67840706ab6d3498a20a56cda..4c981f3d30819ed3e0f9db9f8f65386c0d832821 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/writeDimFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/writeDimFields.H
@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef writeDimFields_H
-#define writeDimFields_H
+#ifndef ensightParts_writeDimFields_H
+#define ensightParts_writeDimFields_H
 
 #include "writeVolFields.H"
 
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
index 6dd28752dba88321cd25b53b3ef400c9386d3b86..465046f0efe1824e171b43aab0a4f61d379698e5 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cut_H
-#define cut_H
+#ifndef searchableSurfaceModifiers_cut_H
+#define searchableSurfaceModifiers_cut_H
 
 #include "searchableSurfaceModifier.H"
 #include "wordRes.H"
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
index 7341b025b8722f558b670fee0cd7263b482436db..0847ceede7c38f330d38fe2792cf2e36833d25a0 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
@@ -61,8 +61,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
-#define alphatJayatillekeWallFunctionFvPatchScalarField_H
+#ifndef compressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
+#define compressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 #include "turbulentFluidThermoModel.H"
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
index 809c0e817008cba2708d15a96068c77e6af58cd3..4cfba5ed5946d392f70be8a630ed7ed2585b5cb4 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
@@ -60,8 +60,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H
-#define alphatJayatillekeWallFunctionFvPatchScalarField_H
+#ifndef incompressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
+#define incompressible_alphatJayatillekeWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 #include "turbulenceModel.H"
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
index bc633024f3ee3466ea177cfba8313a52125ab8d1..357d9995c40859c7acec978ef1f7844d8e17bc08 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
@@ -51,8 +51,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DarcyForchheimer_H
-#define DarcyForchheimer_H
+#ifndef porosityModels_DarcyForchheimer_H
+#define porosityModels_DarcyForchheimer_H
 
 #include "porosityModel.H"
 #include "dimensionedTensor.H"
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
index 0a11692e64fb66ec5dea3d54b3b45552ae398a23..30ba83df05635b25544d1534f161db1aecc5fd71 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
@@ -41,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedCoeff_H
-#define fixedCoeff_H
+#ifndef porosityModels_fixedCoeff_H
+#define porosityModels_fixedCoeff_H
 
 #include "porosityModel.H"
 #include "dimensionedTensor.H"
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
index 8c4bd45fee9a5852cd37afb8f75972dd48f0344f..c9fb8a7f748f86bf09fa5a47a74f59995d6e8044 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
@@ -45,8 +45,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef powerLaw_H
-#define powerLaw_H
+#ifndef porosityModels_powerLaw_H
+#define porosityModels_powerLaw_H
 
 #include "porosityModel.H"
 
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
index 2fce316ed7adfb864d9c651f654e844e50ea7a8c..76e7452834b15b801ccef0f0548366b90f1de549 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
@@ -78,8 +78,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef solidification_H
-#define solidification_H
+#ifndef porosityModels_solidification_H
+#define porosityModels_solidification_H
 
 #include "porosityModel.H"
 #include "Function1.H"
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index c738d0038fb6d6e6803fb78f37fec800c92ad0ee..3f8e0d788fd5c434b184d6b7f4a738a489a189f1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef LaunderSharmaKE_H
-#define LaunderSharmaKE_H
+#ifndef incompressible_RASVariables_LaunderSharmaKE_H
+#define incompressible_RASVariables_LaunderSharmaKE_H
 
 #include "RASModelVariables.H"
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.H
index 08b1a8b327e25b77b708a7e010ab7db21f8e9ec5..5d3965d5ae92606fd6311bf95ce5d63b3919c7ad 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SpalartAllmaras_H
-#define SpalartAllmaras_H
+#ifndef incompressible_RASVariables_SpalartAllmaras_H
+#define incompressible_RASVariables_SpalartAllmaras_H
 
 #include "RASModelVariables.H"
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kEpsilon/kEpsilon.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kEpsilon/kEpsilon.H
index 2d54ba2879ee6c9682b6c538464c3673f07a2d0a..d029354648120d82543b025d4b79505e3cb679ad 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kEpsilon/kEpsilon.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kEpsilon/kEpsilon.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kEpsilon_H
-#define kEpsilon_H
+#ifndef incompressible_RASVariables_kEpsilon_H
+#define incompressible_RASVariables_kEpsilon_H
 
 #include "RASModelVariables.H"
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.H
index 8eee8da85406e63b989d9b581f083fb83a3f087d..895ce443566730e31e7aacfca1e2fdb4470a6eff 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef kOmegaSST_H
-#define kOmegaSST_H
+#ifndef incompressible_RASVariables_kOmegaSST_H
+#define incompressible_RASVariables_kOmegaSST_H
 
 #include "RASModelVariables.H"
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/laminar/laminar.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/laminar/laminar.H
index 68db1cd91b0f98d4bcfbe746f157e842aaed2bd4..50ee370b039e6609a9c70243cea15a3fa27d56c2 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/laminar/laminar.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/laminar/laminar.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
-#define laminar_H
+#ifndef incompressible_RASVariables_laminar_H
+#define incompressible_RASVariables_laminar_H
 
 #include "RASModelVariables.H"
 
diff --git a/src/regionModels/pyrolysisModels/thermo/thermo.H b/src/regionModels/pyrolysisModels/thermo/thermo.H
index 45f182feb5fdcc2b39132a09439a1875ea84b4af..86737f957f5b0271ae090ea7c731d4caf16dbec7 100644
--- a/src/regionModels/pyrolysisModels/thermo/thermo.H
+++ b/src/regionModels/pyrolysisModels/thermo/thermo.H
@@ -32,8 +32,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef thermo_H
-#define thermo_H
+#ifndef regionModels_pyrolysisModels_thermo_H
+#define regionModels_pyrolysisModels_thermo_H
 
 #include "pyrolysisModel.H"
 #include "volFieldsFwd.H"
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
index f9b6009f528a74215f433502d4a1af6d08e8f093..e49b6aac2a43f091a3344851381fb1e8045c9d88 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef heatTransferModel_H
-#define heatTransferModel_H
+#ifndef regionModels_surfaceFilmModels_heatTransferModel_H
+#define regionModels_surfaceFilmModels_heatTransferModel_H
 
 #include "filmSubModelBase.H"
 #include "runTimeSelectionTables.H"
diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
index 4c37f59f02e5c44a146c13dee3e5484eb9d6bbb3..ac6971851c914c5d3b33c06c2c96f61dc653fa36 100644
--- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
+++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef powerLaw_H
-#define powerLaw_H
+#ifndef viscosityModels_powerLaw_H
+#define viscosityModels_powerLaw_H
 
 #include "viscosityModel.H"
 #include "dimensionedScalar.H"