diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index c92320d415..f0dc99eb20 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -198,8 +198,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef functionObject_H
-#define functionObject_H
+#ifndef Foam_functionObject_H
+#define Foam_functionObject_H
 
 #include "typeInfo.H"
 #include "autoPtr.H"
diff --git a/src/OpenFOAM/include/setRootCaseListOptions.H b/src/OpenFOAM/include/setRootCaseListOptions.H
index 853cf8ebbd..0636398df5 100644
--- a/src/OpenFOAM/include/setRootCaseListOptions.H
+++ b/src/OpenFOAM/include/setRootCaseListOptions.H
@@ -25,7 +25,7 @@ argList::addBoolOption
     true // advanced
 );
 
-#ifdef fvPatchField_H
+#ifdef Foam_fvPatchField_H
 argList::addBoolOption
 (
     "listScalarBCs",
@@ -40,7 +40,7 @@ argList::addBoolOption
 );
 #endif
 
-#ifdef functionObject_H
+#ifdef Foam_functionObject_H
 argList::addBoolOption
 (
     "listFunctionObjects",
@@ -49,7 +49,7 @@ argList::addBoolOption
 );
 #endif
 
-#ifdef fvOption_H
+#ifdef Foam_fvOption_H
 argList::addBoolOption
 (
     "listFvOptions",
@@ -58,7 +58,7 @@ argList::addBoolOption
 );
 #endif
 
-#if defined(turbulentTransportModel_H) || defined(turbulentFluidThermoModel_H)
+#if defined(Foam_turbulentTransportModel_H) || defined(Foam_turbulentFluidThermoModel_H)
 argList::addBoolOption
 (
     "listTurbulenceModels",
diff --git a/src/OpenFOAM/include/setRootCaseListOutput.H b/src/OpenFOAM/include/setRootCaseListOutput.H
index 3943f6f2e2..c12596d017 100644
--- a/src/OpenFOAM/include/setRootCaseListOutput.H
+++ b/src/OpenFOAM/include/setRootCaseListOutput.H
@@ -19,7 +19,7 @@
         listOptions = true;
     }
 
-    #ifdef fvPatchField_H
+    #ifdef Foam_fvPatchField_H
     if (args.found("listScalarBCs"))
     {
         Info<< "scalarBCs"
@@ -39,7 +39,7 @@
     }
     #endif
 
-    #ifdef functionObject_H
+    #ifdef Foam_functionObject_H
     if (args.found("listFunctionObjects"))
     {
         Info<< "functionObjects"
@@ -49,7 +49,7 @@
     }
     #endif
 
-    #ifdef fvOption_H
+    #ifdef Foam_fvOption_H
     if (args.found("listFvOptions"))
     {
         Info<< "fvOptions"
@@ -59,13 +59,13 @@
     }
     #endif
 
-    #ifdef turbulentTransportModel_H
+    #if defined(Foam_turbulentTransportModel_H)
     if (args.found("listTurbulenceModels"))
     {
-        Info<< "Turbulence models"
+        Info<< "Turbulence models" << nl
             << incompressible::turbulenceModel::
                dictionaryConstructorTablePtr_->sortedToc()
-            << endl;
+            << nl << endl;
 
         Info<< "RAS models"
             << incompressible::RASModel::
@@ -78,13 +78,13 @@
             << endl;
         listOptions = true;
     }
-    #elif defined(turbulentFluidThermoModel_H)
+    #elif defined(Foam_turbulentFluidThermoModel_H)
     if (args.found("listTurbulenceModels"))
     {
-        Info<< "Turbulence models"
+        Info<< "Turbulence models" << nl
             << compressible::turbulenceModel::
                dictionaryConstructorTablePtr_->sortedToc()
-            << endl;
+            << nl << endl;
 
         Info<< "RAS models"
             << compressible::RASModel::
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index e0c064d626..96aec2839a 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentFluidThermoModel_H
-#define turbulentFluidThermoModel_H
+#ifndef Foam_turbulentFluidThermoModel_H
+#define Foam_turbulentFluidThermoModel_H
 
 #include "CompressibleTurbulenceModel.H"
 #include "ThermalDiffusivity.H"
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
index 169de37e68..f5fd26d823 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentTransportModel_H
-#define turbulentTransportModel_H
+#ifndef Foam_turbulentTransportModel_H
+#define Foam_turbulentTransportModel_H
 
 #include "IncompressibleTurbulenceModel.H"
 #include "laminarModel.H"