diff --git a/src/thermophysicalModels/solids/C/C.C b/src/thermophysicalModels/solids/C/C.C
index bc701872b76382487d792168f6904dd315bec87b..1dbcfd2eed25f46a5948eef699d2717d5c5a0169 100644
--- a/src/thermophysicalModels/solids/C/C.C
+++ b/src/thermophysicalModels/solids/C/C.C
@@ -27,16 +27,14 @@ License
 #include "C.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(C, 0);
-addToRunTimeSelectionTable(solid, C,);
-addToRunTimeSelectionTable(solid, C, Istream);
+    defineTypeNameAndDebug(C, 0);
+    addToRunTimeSelectionTable(solid, C,);
+    addToRunTimeSelectionTable(solid, C, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,15 +70,11 @@ void Foam::C::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const C& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const C& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.C b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
index 36dcdd3d5c907f2ecf8b2e8f3731850a61d34e2e..77a4398322a48c74123ed77f490721d16ced4751 100644
--- a/src/thermophysicalModels/solids/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
@@ -27,16 +27,14 @@ License
 #include "CaCO3.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(CaCO3, 0);
-addToRunTimeSelectionTable(solid, CaCO3,);
-addToRunTimeSelectionTable(solid, CaCO3, Istream);
+    defineTypeNameAndDebug(CaCO3, 0);
+    addToRunTimeSelectionTable(solid, CaCO3,);
+    addToRunTimeSelectionTable(solid, CaCO3, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,15 +70,11 @@ void Foam::CaCO3::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const CaCO3& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const CaCO3& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/ash/ash.C b/src/thermophysicalModels/solids/ash/ash.C
index 42da228d2c17168f474323522dd18a0b84f999e0..c904131aab258699500b7aee1175dc63bd96c71b 100644
--- a/src/thermophysicalModels/solids/ash/ash.C
+++ b/src/thermophysicalModels/solids/ash/ash.C
@@ -27,16 +27,14 @@ License
 #include "ash.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(ash, 0);
-addToRunTimeSelectionTable(solid, ash,);
-addToRunTimeSelectionTable(solid, ash, Istream);
+    defineTypeNameAndDebug(ash, 0);
+    addToRunTimeSelectionTable(solid, ash,);
+    addToRunTimeSelectionTable(solid, ash, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,15 +70,11 @@ void Foam::ash::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const ash& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const ash& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/solid/solid.C b/src/thermophysicalModels/solids/solid/solid.C
index 8d617154651995bce9961bb3b32acd55b7037fec..5a9da6b875131714701557fecddd1569584bf8da 100644
--- a/src/thermophysicalModels/solids/solid/solid.C
+++ b/src/thermophysicalModels/solids/solid/solid.C
@@ -26,16 +26,14 @@ License
 
 #include "solid.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(solid, 0);
-defineRunTimeSelectionTable(solid,);
-defineRunTimeSelectionTable(solid, Istream);
+    defineTypeNameAndDebug(solid, 0);
+    defineRunTimeSelectionTable(solid,);
+    defineRunTimeSelectionTable(solid, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -80,15 +78,11 @@ void Foam::solid::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const solid& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const solid& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //