diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H
index dd98f7e52..575e06a7d 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/boundaryLayers.H
@@ -35,6 +35,8 @@ SourceFiles
 #ifndef boundaryLayers_H
 #define boundaryLayers_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "meshSurfaceEngine.H"
 #include "meshSurfacePartitioner.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H
index 70548df6b..46daa3601 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/extrudeLayer.H
@@ -36,6 +36,8 @@ SourceFiles
 #ifndef extrudeLayer_H
 #define extrudeLayer_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "VRWGraphList.H"
 #include "labelPair.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H
index 1e8535ea2..81d0bf60f 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers.H
@@ -36,6 +36,8 @@ SourceFiles
 #ifndef refineBoundaryLayers_H
 #define refineBoundaryLayers_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "meshSurfaceEngine.H"
 #include "DynList.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.C b/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.C
index 4be7ce3e5..9d0604fa3 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.C
+++ b/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.C
@@ -866,14 +866,19 @@ void checkMeshDict::updateBoundaryLayers
 
                 const std::map<word, wordList>::const_iterator it =
                     patchesFromPatch.find(pName);
-                const wordList& newNames = it->second;
 
-                forAll(newNames, i)
+                //- patch name may be a regex
+                if( it != patchesFromPatch.end() )
                 {
-                    patchBndLayers.add(newNames[i], dict);
-                }
+                    const wordList& newNames = it->second;
 
-                patchBndLayers.remove(pName);
+                    forAll(newNames, i)
+                    {
+                        patchBndLayers.add(newNames[i], dict);
+                    }
+
+                    patchBndLayers.remove(pName);
+                }
             }
         }
     }
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H b/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H
index f89c60435..18cc172a7 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/checkMeshDict/checkMeshDict.H
@@ -35,6 +35,8 @@ SourceFiles
 #ifndef checkMeshDict_H
 #define checkMeshDict_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "IOdictionary.H"
 
 #include <map>
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C b/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C
index 05ba461d5..4a8caf736 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C
+++ b/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.C
@@ -27,8 +27,6 @@ License
 #include "Ostream.H"
 #include "token.H"
 
-#include "Time.H"
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, Foam::label Offset>
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H b/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H
index 68e72e63f..caf34a5ae 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/containers/LongList/LongList.H
@@ -42,6 +42,7 @@ SourceFiles
 
 #include "label.H"
 #include "bool.H"
+#include "IOstreams.H"
 #include "error.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H b/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H
index 1274a36b0..7d655282c 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H
@@ -37,6 +37,7 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "objectRegistry.H"
 #include "Time.H"
 #include "meshSubset.H"
 #include "pointFieldPMG.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C b/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C
index 1d2891679..cc1dd6596 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C
+++ b/src/mesh/cfMesh/meshLibrary/utilities/meshes/triSurf/triSurf.C
@@ -29,10 +29,7 @@ Description
 #include "demandDrivenData.H"
 #include "IFstream.H"
 #include "OFstream.H"
-#include "Time.H"
-
 #include "gzstream.h"
-
 #include "triSurface.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H b/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H
index 218ee09bf..1b8a9f6f8 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeAutomaticRefinement/meshOctreeAutomaticRefinement.H
@@ -37,6 +37,7 @@ SourceFiles
 #define meshOctreeAutomaticRefinement_H
 
 #include "meshOctreeModifier.H"
+#include "IOdictionary.H"
 //#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H b/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H
index 099037fa8..2698948cd 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/meshOctreeCreator/meshOctreeCreator.H
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "boolList.H"
 #include "DynList.H"
+#include "IOdictionary.H"
 #include "meshOctreeModifier.H"
 //#include "volFields.H"
 #include "patchRefinementList.H"
@@ -49,7 +50,6 @@ namespace Foam
 {
 
 // Forward declarations
-class IOdictionary;
 class meshOctreeCube;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
index 233a133a6..804fb5135 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
+++ b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
@@ -26,6 +26,8 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "edgeExtractor.H"
 #include "meshSurfaceEngine.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H
index 4998bc85d..3f4c92c30 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H
@@ -38,6 +38,8 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "labelList.H"
 #include "labelLongList.H"
 #include "VRWGraph.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H
index e35707ad6..f656b4018 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H
@@ -37,6 +37,8 @@ SourceFiles
 #ifndef meshSurfaceCheckEdgeTypes_H
 #define meshSurfaceCheckEdgeTypes_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H
index 9448dc489..e65cf8a0a 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H
@@ -37,6 +37,8 @@ SourceFiles
 #ifndef meshSurfaceCheckInvertedVertices_H
 #define meshSurfaceCheckInvertedVertices_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "HashSet.H"
 
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H
index e0759b4c6..1a907203c 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H
@@ -35,6 +35,8 @@ SourceFiles
 #ifndef meshSurfaceEngine_H
 #define meshSurfaceEngine_H
 
+#include "objectRegistry.H"
+#include "Time.H"
 #include "polyMeshGenModifier.H"
 #include "SubList.H"
 #include "boolList.H"
diff --git a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H b/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H
index 0258cadb6..3096610de 100644
--- a/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H
+++ b/src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfacePatchManipulator/triSurfacePatchManipulator.H
@@ -37,6 +37,7 @@ SourceFiles
 #ifndef triSurfacePatchManipulator_H
 #define triSurfacePatchManipulator_H
 
+#include "IOdictionary.H"
 #include "triSurf.H"
 #include "VRWGraph.H"