diff --git a/applications/test/HashTable2/Test-HashTable2.C b/applications/test/HashTable2/Test-HashTable2.C
index 8d6e110fad..0bad52fa61 100644
--- a/applications/test/HashTable2/Test-HashTable2.C
+++ b/applications/test/HashTable2/Test-HashTable2.C
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
         << "toc: " << table4.toc() << endl;
 
     HashPtrTable<label, Foam::string> ptable1(0);
-    ptable1.insert("kjhkjh", new label(10));
+    ptable1.insert("kjhkjh", autoPtr<label>::New(10));
 
     Info<< "PtrTable toc: " << ptable1.toc() << endl;
 
diff --git a/applications/test/PackedList/Test-PackedList.C b/applications/test/PackedList/Test-PackedList.C
index 0b82de4591..f8a314923a 100644
--- a/applications/test/PackedList/Test-PackedList.C
+++ b/applications/test/PackedList/Test-PackedList.C
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
 
         if (args.found("info"))
         {
-            packLst.printInfo(Info);
+            Info<< packLst.info();
         }
 
         Info<< nl;
diff --git a/applications/test/PackedList1/Test-PackedList1.C b/applications/test/PackedList1/Test-PackedList1.C
index 53bfcb0b79..9d72454728 100644
--- a/applications/test/PackedList1/Test-PackedList1.C
+++ b/applications/test/PackedList1/Test-PackedList1.C
@@ -185,13 +185,13 @@ int main(int argc, char *argv[])
     list1.resize(8, list1.max_value);
     report(list1);
 
-    Info<< "\ntest flip() function\n";
-    list1.flip();
-    report(list1);
+    //Info<< "\ntest flip() function\n";
+    //list1.flip();
+    //report(list1);
 
-    Info<< "\nre-flip()\n";
-    list1.flip();
-    report(list1);
+    //Info<< "\nre-flip()\n";
+    //list1.flip();
+    //report(list1);
 
     Info<< "\ntest set() function\n";
     list1.set(1, 5);
diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
index 1438e3b32c..03033e4210 100644
--- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
+++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C
@@ -29,10 +29,10 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "fvMesh.H"
-#include "volFields.H"
 #include "PatchEdgeFaceWave.H"
 #include "patchEdgeFaceInfo.H"
 #include "patchPatchDist.H"
+#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index adab0d98bb..6da444cbe4 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    #include "createMesh.H"
+    #include "createPolyMesh.H"
 
     const word patchName = args[1];
     label patchi = mesh.boundaryMesh().findPatchID(patchName);
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C
index 6374014b9e..ddb0a421df 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil.C
+++ b/applications/test/extendedStencil/Test-ExtendedStencil.C
@@ -33,7 +33,7 @@ Description
 #include "fvMesh.H"
 #include "volFields.H"
 #include "Time.H"
-//#include "mapDistribute.H"
+#include "fvCFD.H"
 #include "OFstream.H"
 #include "meshTools.H"
 //#include "FECCellToFaceStencil.H"
diff --git a/applications/test/fieldDependency/Make/options b/applications/test/fieldDependency/Make/options
index fa15f12452..b733f6ac04 100644
--- a/applications/test/fieldDependency/Make/options
+++ b/applications/test/fieldDependency/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume
diff --git a/applications/test/fieldDependency/Test-fieldDependency.C b/applications/test/fieldDependency/Test-fieldDependency.C
index 17364b7026..ff744dbf21 100644
--- a/applications/test/fieldDependency/Test-fieldDependency.C
+++ b/applications/test/fieldDependency/Test-fieldDependency.C
@@ -29,6 +29,7 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "volFields.H"
+#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index d714616623..0ea8147e8c 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -38,7 +38,7 @@ Description
 #include "removeFaces.H"
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
-#include "fvcDiv.H"
+#include "fvCFD.H"
 #include "zeroGradientFvPatchFields.H"
 #include "Random.H"
 
diff --git a/applications/test/findCell-octree/Test-findCell-octree.C b/applications/test/findCell-octree/Test-findCell-octree.C
index de15a98aac..71c9ff270f 100644
--- a/applications/test/findCell-octree/Test-findCell-octree.C
+++ b/applications/test/findCell-octree/Test-findCell-octree.C
@@ -29,6 +29,7 @@ License
 #include "indexedOctree.H"
 #include "treeDataCell.H"
 #include "OFstream.H"
+#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
index f616b3a48c..a189a20453 100644
--- a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
+++ b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
@@ -30,6 +30,7 @@ License
 #include "treeDataEdge.H"
 #include "OFstream.H"
 #include "extendedFeatureEdgeMesh.H"
+#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/graph/Test-graph.C b/applications/test/graph/Test-graph.C
index ba9ce9e5be..5cfea035a4 100644
--- a/applications/test/graph/Test-graph.C
+++ b/applications/test/graph/Test-graph.C
@@ -55,11 +55,13 @@ int main()
     graph phi("@f! (R = 5)", "@a!", "@f!", alpha);
     phi.insert
     (
-        "@f!&e!", new curve("@f!&e!", curve::curveStyle::CONTINUOUS, phie)
+        "@f!&e!",
+        autoPtr<curve>::New("@f!&e!", curve::curveStyle::CONTINUOUS, phie)
     );
     phi.insert
     (
-        "@f!&c!", new curve("@f!&c!", curve::curveStyle::CONTINUOUS, phic)
+        "@f!&c!",
+        autoPtr<curve>::New("@f!&c!", curve::curveStyle::CONTINUOUS, phic)
     );
     phi.write("phi", "xmgr");
 
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 0b606525d1..a9459148a7 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -42,7 +42,7 @@ Description
 #include "zeroGradientFvPatchFields.H"
 #include "calculatedPointPatchFields.H"
 #include "pointConstraints.H"
-#include "fvcDiv.H"
+#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
index a52f312b2c..4d14ce9bd6 100644
--- a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
+++ b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createPolyMesh.H"
 
     Info<< "Reading distribute map\n" << endl;
 
diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C
index 0657729226..0e67afd525 100644
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@@ -38,6 +38,7 @@ Description
 #include "OFstream.H"
 #include "mappedPolyPatch.H"
 #include "mappedFixedValueFvPatchFields.H"
+#include "fvCFD.H"
 
 using namespace Foam;
 
diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C
index 4f47c80b63..bb9fa0a95a 100644
--- a/applications/test/router/Test-processorRouter.C
+++ b/applications/test/router/Test-processorRouter.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createPolyMesh.H"
 
     word procLabel = '[' + word(name(Pstream::myProcNo())) + "]-";
 
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 718063dfd7..5dfef2fcf2 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -412,7 +412,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
         {
             if (isMasterPoint.test(pointi))
             {
-                nMasters.set(pointi);
+                nMasters[pointi] = 1;
             }
         }
 
@@ -488,7 +488,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
         {
             if (isMasterEdge.test(edgeI))
             {
-                nMasters.set(edgeI);
+                nMasters[edgeI] = 1;
             }
         }
 
@@ -551,13 +551,13 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
     {
         labelList nMasters(mesh.nFaces(), 0);
 
-        Bitset isMasterFace(syncTools::getMasterFaces(mesh));
+        bitSet isMasterFace(syncTools::getMasterFaces(mesh));
 
         forAll(isMasterFace, facei)
         {
             if (isMasterFace.test(facei))
             {
-                nMasters.set(facei);
+                nMasters[facei] = 1;
             }
         }
 
diff --git a/applications/test/wallDist/Test-wallDist.C b/applications/test/wallDist/Test-wallDist.C
index d25bffc006..831c312005 100644
--- a/applications/test/wallDist/Test-wallDist.C
+++ b/applications/test/wallDist/Test-wallDist.C
@@ -30,6 +30,7 @@ Description
 #include "Time.H"
 #include "fvMesh.H"
 #include "wallDist.H"
+#include "fvCFD.H"
 
 using namespace Foam;