diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 49f7990f5..a910bd17c 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -12,6 +12,7 @@ EXE_LIBS = \
     -lerrorEstimation \
     -lfiniteVolume \
     -lfiniteArea \
+    -lfoam \
     -ltetFiniteElement \
     -ltetMotionSolver \
     -lforces \
@@ -30,7 +31,6 @@ EXE_LIBS = \
     -lliquids \
     -lmeshTools \
     -lODE \
-    -lOpenFOAM \
     -lpdf \
     -lphaseModel \
     -lradiation \
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options b/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options
index 7a5a2e9b1..d7a1d431e 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 LIB_LIBS = \
-    -lOpenFOAM \
     -lfiniteVolume \
     -llagrangian \
     $(PROJECT_LIBS)
diff --git a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/Make/options b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/Make/options
index f60d6b750..e83e9e286 100644
--- a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/Make/options
+++ b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/Make/options
@@ -6,7 +6,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteArea/lnInclude
 
 LIB_LIBS = \
-    -lOpenFOAM \
     -lfiniteVolume \
     -llagrangian \
     -lfiniteArea
diff --git a/applications/utilities/thermophysical/IFCLookUpTableGen/Make/options b/applications/utilities/thermophysical/IFCLookUpTableGen/Make/options
index c76d4c4f2..efec35d46 100644
--- a/applications/utilities/thermophysical/IFCLookUpTableGen/Make/options
+++ b/applications/utilities/thermophysical/IFCLookUpTableGen/Make/options
@@ -9,5 +9,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lspecie \
     -lmeshTools \
-    -lOpenFOAM \
     -lfiniteVolume
diff --git a/src/Allwmake b/src/Allwmake
index ac8978609..85aed2c24 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -13,7 +13,7 @@ set -x
 
 # update foam version strings if required
 wmakePrintBuild -check || /bin/rm -f foam/Make/$WM_OPTIONS/global.? 2>/dev/null
-penFOAM
+
 wmakeLnInclude foam
 wmakeLnInclude meshTools
 wmakeLnInclude OSspecific/$WM_OSTYPE
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C
index 4e506f7c4..d4b2f8771 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/backwardD2dt2Scheme/backwardD2dt2Scheme.C
@@ -21,6 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
+\*---------------------------------------------------------------------------*/
+
 #include "backwardD2dt2Scheme.H"
 #include "fvcDiv.H"
 #include "fvMatrices.H"
diff --git a/src/solidModels/constitutiveModel/constitutiveModel.C b/src/solidModels/constitutiveModel/constitutiveModel.C
index 97957f25b..053ffea2b 100644
--- a/src/solidModels/constitutiveModel/constitutiveModel.C
+++ b/src/solidModels/constitutiveModel/constitutiveModel.C
@@ -21,6 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
+\*---------------------------------------------------------------------------*/
+
 #include "constitutiveModel.H"
 #include "volFields.H"
 #include "fvc.H"
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
index b4dcb5dd7..322018d78 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
@@ -21,6 +21,8 @@ License
     You should have received a copy of the GNU General Public License
     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
+\*---------------------------------------------------------------------------*/
+
 inline Foam::scalar Foam::C3H6O::rho(scalar p, scalar T) const
 {
     return rho_.f(p, T);