diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 91287cdf42..0d7679c36c 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -120,6 +120,25 @@ $(math)/invIncGamma.C
 
 primitives/subModelBase/subModelBase.C
 
+csys = primitives/coordinate/systems
+$(csys)/coordinateSystem.C
+$(csys)/coordinateSystemNew.C
+$(csys)/coordinateSystemTransform.C
+$(csys)/coordinateSystems.C
+$(csys)/cartesianCS.C
+$(csys)/cylindricalCS.C
+$(csys)/indirectCS.C
+
+crot = primitives/coordinate/rotation
+$(crot)/axesRotation.C
+$(crot)/axisAngleRotation.C
+$(crot)/coordinateRotation.C
+$(crot)/cylindricalRotation.C
+$(crot)/identityRotation.C
+$(crot)/specifiedRotation.C
+$(crot)/EulerCoordinateRotation.C
+$(crot)/STARCDCoordinateRotation.C
+
 strings = primitives/strings
 $(strings)/string/string.C
 $(strings)/string/stringIO.C
diff --git a/src/OpenFOAM/containers/Circulators/CirculatorBase.H b/src/OpenFOAM/containers/Circulators/CirculatorBase.H
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/containers/Circulators/CirculatorBase.H
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/OpenFOAM/containers/Circulators/ConstCirculatorI.H b/src/OpenFOAM/containers/Circulators/ConstCirculatorI.H
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/containers/Circulators/ConstCirculatorI.H
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.C
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.C
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifierI.H b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifierI.H
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifierI.H
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/meshTools/coordinate/rotation/EulerCoordinateRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/EulerCoordinateRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/EulerCoordinateRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/EulerCoordinateRotation.C
diff --git a/src/meshTools/coordinate/rotation/EulerCoordinateRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/EulerCoordinateRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/EulerCoordinateRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/EulerCoordinateRotation.H
diff --git a/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/STARCDCoordinateRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/STARCDCoordinateRotation.C
diff --git a/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/STARCDCoordinateRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/STARCDCoordinateRotation.H
diff --git a/src/meshTools/coordinate/rotation/axesRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/axesRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/axesRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/axesRotation.C
diff --git a/src/meshTools/coordinate/rotation/axesRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/axesRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/axesRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/axesRotation.H
diff --git a/src/meshTools/coordinate/rotation/axisAngleRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/axisAngleRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/axisAngleRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/axisAngleRotation.C
diff --git a/src/meshTools/coordinate/rotation/axisAngleRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/axisAngleRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/axisAngleRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/axisAngleRotation.H
diff --git a/src/meshTools/coordinate/rotation/coordinateRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/coordinateRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/coordinateRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/coordinateRotation.C
diff --git a/src/meshTools/coordinate/rotation/coordinateRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/coordinateRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/coordinateRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/coordinateRotation.H
diff --git a/src/meshTools/coordinate/rotation/cylindricalRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/cylindricalRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/cylindricalRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/cylindricalRotation.C
diff --git a/src/meshTools/coordinate/rotation/cylindricalRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/cylindricalRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/cylindricalRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/cylindricalRotation.H
diff --git a/src/meshTools/coordinate/rotation/identityRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/identityRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/identityRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/identityRotation.C
diff --git a/src/meshTools/coordinate/rotation/identityRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/identityRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/identityRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/identityRotation.H
diff --git a/src/meshTools/coordinate/rotation/specifiedRotation.C b/src/OpenFOAM/primitives/coordinate/rotation/specifiedRotation.C
similarity index 100%
rename from src/meshTools/coordinate/rotation/specifiedRotation.C
rename to src/OpenFOAM/primitives/coordinate/rotation/specifiedRotation.C
diff --git a/src/meshTools/coordinate/rotation/specifiedRotation.H b/src/OpenFOAM/primitives/coordinate/rotation/specifiedRotation.H
similarity index 100%
rename from src/meshTools/coordinate/rotation/specifiedRotation.H
rename to src/OpenFOAM/primitives/coordinate/rotation/specifiedRotation.H
diff --git a/src/meshTools/coordinate/systems/cartesianCS.C b/src/OpenFOAM/primitives/coordinate/systems/cartesianCS.C
similarity index 100%
rename from src/meshTools/coordinate/systems/cartesianCS.C
rename to src/OpenFOAM/primitives/coordinate/systems/cartesianCS.C
diff --git a/src/meshTools/coordinate/systems/cartesianCS.H b/src/OpenFOAM/primitives/coordinate/systems/cartesianCS.H
similarity index 100%
rename from src/meshTools/coordinate/systems/cartesianCS.H
rename to src/OpenFOAM/primitives/coordinate/systems/cartesianCS.H
diff --git a/src/meshTools/coordinate/systems/coordinateSystem.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.C
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystem.C
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.C
diff --git a/src/meshTools/coordinate/systems/coordinateSystem.H b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.H
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystem.H
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystem.H
diff --git a/src/meshTools/coordinate/systems/coordinateSystemNew.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemNew.C
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystemNew.C
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystemNew.C
diff --git a/src/meshTools/coordinate/systems/coordinateSystemTemplates.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemTemplates.C
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystemTemplates.C
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystemTemplates.C
diff --git a/src/meshTools/coordinate/systems/coordinateSystemTransform.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystemTransform.C
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystemTransform.C
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystemTransform.C
diff --git a/src/meshTools/coordinate/systems/coordinateSystems.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystems.C
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C
diff --git a/src/meshTools/coordinate/systems/coordinateSystems.H b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H
similarity index 100%
rename from src/meshTools/coordinate/systems/coordinateSystems.H
rename to src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.C b/src/OpenFOAM/primitives/coordinate/systems/cylindricalCS.C
similarity index 100%
rename from src/meshTools/coordinate/systems/cylindricalCS.C
rename to src/OpenFOAM/primitives/coordinate/systems/cylindricalCS.C
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.H b/src/OpenFOAM/primitives/coordinate/systems/cylindricalCS.H
similarity index 100%
rename from src/meshTools/coordinate/systems/cylindricalCS.H
rename to src/OpenFOAM/primitives/coordinate/systems/cylindricalCS.H
diff --git a/src/meshTools/coordinate/systems/indirectCS.C b/src/OpenFOAM/primitives/coordinate/systems/indirectCS.C
similarity index 100%
rename from src/meshTools/coordinate/systems/indirectCS.C
rename to src/OpenFOAM/primitives/coordinate/systems/indirectCS.C
diff --git a/src/meshTools/coordinate/systems/indirectCS.H b/src/OpenFOAM/primitives/coordinate/systems/indirectCS.H
similarity index 100%
rename from src/meshTools/coordinate/systems/indirectCS.H
rename to src/OpenFOAM/primitives/coordinate/systems/indirectCS.H
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/wordPairHashTable.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/wordPairHashTable.H
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/wordPairHashTable.H
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index cb48fb872d..f26fc1966d 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -55,25 +55,6 @@ cellDist/wallPoint/wallPoint.C
 
 cellFeatures/cellFeatures.C
 
-csys = coordinate/systems
-$(csys)/coordinateSystem.C
-$(csys)/coordinateSystemNew.C
-$(csys)/coordinateSystemTransform.C
-$(csys)/coordinateSystems.C
-$(csys)/cartesianCS.C
-$(csys)/cylindricalCS.C
-$(csys)/indirectCS.C
-
-crot = coordinate/rotation
-$(crot)/axesRotation.C
-$(crot)/axisAngleRotation.C
-$(crot)/coordinateRotation.C
-$(crot)/cylindricalRotation.C
-$(crot)/identityRotation.C
-$(crot)/specifiedRotation.C
-$(crot)/EulerCoordinateRotation.C
-$(crot)/STARCDCoordinateRotation.C
-
 polyMeshZipUpCells/polyMeshZipUpCells.C
 primitiveMeshGeometry/primitiveMeshGeometry.C
 
diff --git a/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.C b/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.C
deleted file mode 100644
index 7cec1b4541..0000000000
--- a/src/meshTools/output/vtk/patch/foamVtkGenericPatchWriter.C
+++ /dev/null
@@ -1 +0,0 @@
-#warning File removed - left for old dependency check only