diff --git a/etc/caseDicts/postProcessing/README b/etc/caseDicts/postProcessing/README
index 4e265159e..2759598c0 100644
--- a/etc/caseDicts/postProcessing/README
+++ b/etc/caseDicts/postProcessing/README
@@ -32,7 +32,7 @@ Solution:
   sub-dictionary in the case controlDict file, e.g.
   functions
   {
-      #includeFunc flowRatePatch
+      #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch"
       ... other function objects here ...
   }
 
diff --git a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
index 33e20231b..b63c882f0 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc faceSource.cfg
+#includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
 
 source faceZone;
 
diff --git a/etc/caseDicts/postProcessing/faceSource/patchAverage b/etc/caseDicts/postProcessing/faceSource/patchAverage
index b6d3f3ca2..cab266e03 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchAverage
+++ b/etc/caseDicts/postProcessing/faceSource/patchAverage
@@ -12,7 +12,7 @@ patchAverage
     fields (p);
 
     operation average;
-    #includeFunc patchSource.cfg;
+    #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg;"
 }
 
 
diff --git a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
index c4502acff..d5bd7fd1a 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc faceSource.cfg
+#includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
 
 source     patch;
 sourceName $patch;
diff --git a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
index c740c0ee0..4bcbde878 100644
--- a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc faceSource.cfg
+#includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
 
 source sampledSurface;
 
diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/postProcessing/fields/randomise
index 840b614b3..84c58b5a0 100644
--- a/etc/caseDicts/postProcessing/fields/randomise
+++ b/etc/caseDicts/postProcessing/fields/randomise
@@ -8,7 +8,7 @@
 
 randomise
 {
-    #includeFunc "randomise.cfg"
+    #includeEtc "caseDicts/postProcessing/fields/randomise.cfg"
 
     field           <fieldName>;
 
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
index 1a6e27d8b..7eb8d0873 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
@@ -14,7 +14,7 @@ flowRatePatch
 {
     patch <patchName>;
 
-    #includeFunc flowRatePatch.cfg
+    #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
index 67d6a3f3e..8ce22645f 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc patchSource.cfg
+#includeEtc "caseDicts/postProcessing/flowRate/patchSource.cfg"
 
 fields (phi);
 operation sum;
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
index 8525079f0..1f64e1e5b 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
@@ -14,7 +14,7 @@ volFlowRateSurface
 {
     triSurface <triSurfaceFile>;
 
-    #includeFunc volFlowRateSurface.cfg
+    #includeEtc "caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
index fe6d1b987..f0c76cb49 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc surfaceSource.cfg
+#includeEtc "caseDicts/postProcessing/flowRate/surfaceSource.cfg"
 
 fields (U);
 operation areaNormalIntegrate;
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
index 561b6fd86..d9d83a75d 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc forces.cfg
+#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
 
 type        forceCoeffs;
 rhoInf      1;           // Redundant for incompressible
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
index 1200131ac..dbd612482 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
@@ -21,7 +21,7 @@ forceCoeffs
     CofR        (0 0 0);
     pitchAxis   (0 1 0);
 
-    #includeFunc forceCoeffsCompressible.cfg
+    #includeEtc "caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
index 1da340d3d..87a8667d8 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
@@ -6,6 +6,6 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc forceCoeffs.cfg
+#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
index 9283f9778..89926a516 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
@@ -20,7 +20,7 @@ forceCoeffs
     CofR        (0 0 0);
     pitchAxis   (0 1 0);
 
-    #includeFunc forceCoeffs.cfg
+    #includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible
index 6a836135a..1792b0c38 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible
@@ -13,7 +13,7 @@ forces
     CofR        (0 0 0);
     pitchAxis   (0 1 0);
 
-    #includeFunc forcesCompressible.cfg
+    #includeEtc "caseDicts/postProcessing/forces/forcesCompressible.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
index c371556f8..66604a4a0 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc forces.cfg
+#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
 
 rhoInf          1;  // Redundant
 
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible
index 6692b1ecf..0b91e37f5 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible
@@ -8,7 +8,7 @@
 
 forces
 {
-    #includeFunc forces.cfg
+    #includeEtc "caseDicts/postProcessing/forces/forces.cfg"
 
     rhoInf      1.225;    // Fluid density
     patches     (patch1 patch2);
diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict b/etc/caseDicts/postProcessing/graphs/sampleDict
index c12686218..7731f411f 100644
--- a/etc/caseDicts/postProcessing/graphs/sampleDict
+++ b/etc/caseDicts/postProcessing/graphs/sampleDict
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc sampleDict.cfg
+#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
 
 sets
 (
diff --git a/etc/caseDicts/postProcessing/graphs/singleGraph b/etc/caseDicts/postProcessing/graphs/singleGraph
index d95411863..836d7a82c 100644
--- a/etc/caseDicts/postProcessing/graphs/singleGraph
+++ b/etc/caseDicts/postProcessing/graphs/singleGraph
@@ -12,10 +12,10 @@ graph
     end     (1 1e-06 0);
     fields  (U p);
 
-    #includeFunc sampleDict.cfg
+    #includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
 
     // Must be last entry
-    #includeFunc graph.cfg
+    #includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/cellMax b/etc/caseDicts/postProcessing/minMax/cellMax
index 5eb6de159..815a7f7f3 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMax
+++ b/etc/caseDicts/postProcessing/minMax/cellMax
@@ -8,7 +8,7 @@
 
 cellMax
 {
-    #includeFunc cellMinMax.cfg
+    #includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg"
 
     fields (U p);
 }
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin b/etc/caseDicts/postProcessing/minMax/cellMin
index 5dfc71282..aea52c7b6 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin
+++ b/etc/caseDicts/postProcessing/minMax/cellMin
@@ -8,7 +8,7 @@
 
 cellMin
 {
-    #includeFunc cellMin.cfg
+    #includeEtc "caseDicts/postProcessing/minMax/cellMin.cfg"
 
     fields (U p);
 }
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin.cfg b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
index 52583d154..dc0e49df2 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc cellMinMax.cfg
+#includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg"
 operation       min;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/faceMax b/etc/caseDicts/postProcessing/minMax/faceMax
index 537252738..d8b4f6fd0 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMax
+++ b/etc/caseDicts/postProcessing/minMax/faceMax
@@ -8,7 +8,7 @@
 
 faceMax
 {
-    #includeFunc faceMinMax.cfg
+    #includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg"
 
     fields (U p);
 }
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin b/etc/caseDicts/postProcessing/minMax/faceMin
index f100563ca..0c82ec01d 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin
+++ b/etc/caseDicts/postProcessing/minMax/faceMin
@@ -8,7 +8,7 @@
 
 faceMin
 {
-    #includeFunc faceMin.cfg
+    #includeEtc "caseDicts/postProcessing/minMax/faceMin.cfg"
 
     fields (U p);
 }
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin.cfg b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
index 6875f0244..f2bf1aeee 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc faceMinMax.cfg
+#includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg"
 operation       min;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents b/etc/caseDicts/postProcessing/minMax/minMaxComponents
index 3af6c8a7a..71db68463 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents
@@ -8,7 +8,7 @@
 
 minMaxComponents
 {
-    #includeFunc minMaxComponents.cfg
+    #includeEtc "caseDicts/postProcessing/minMax/minMaxComponents.cfg"
 
     mode components;
 }
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
index cc1d5ab38..f18af3c91 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc fieldMinMax.cfg
+#includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg"
 mode components;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
index 7197b3dc4..3691baa8c 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
+++ b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
@@ -8,7 +8,7 @@
 
 minMaxMagnitude
 {
-    #includeFunc fieldMinMax.cfg
+    #includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg"
 
     fields (U p);
 }
diff --git a/etc/caseDicts/postProcessing/numerical/residuals b/etc/caseDicts/postProcessing/numerical/residuals
index feb2a5924..d4e937ecc 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals
+++ b/etc/caseDicts/postProcessing/numerical/residuals
@@ -8,7 +8,7 @@
 
 residuals
 {
-    #includeFunc residuals.cfg
+    #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
 
     fields (p U);
 }
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
index b64268ed3..3b6fd7bcd 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
@@ -17,13 +17,13 @@ log             false;
 
 source1
 {
-    #includeFunc faceSource.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/faceSource.cfg"
     operation       areaAverage;
     fields          (p);
 }
 source2
 {
-    #includeFunc faceSource.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/faceSource.cfg"
     operation       areaAverage;
     fields          (p);
 }
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
index dc76efaf3..8bb8360cb 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
@@ -11,7 +11,7 @@ pressureDifferencePatch
     patch1 <patch1>;
     patch2 <patch2>;
 
-    #includeFunc pressureDifferencePatch.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
index d9e9b2f40..01a239236 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc pressureDifference.cfg
+#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
 
 source1
 {
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
index dc2a39451..a2693dc52 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
@@ -11,7 +11,7 @@ pressureDifferenceSurface
     triSurface1 <triSurface1>;
     triSurface2 <triSurface2>;
 
-    #includeFunc pressureDifferenceSurface.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
index 4a57c5a7c..c1df7cff5 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc pressureDifference.cfg
+#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
 
 source1
 {
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure b/etc/caseDicts/postProcessing/pressure/staticPressure
index 37bde327a..39ebd637f 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure
@@ -8,7 +8,7 @@
 
 staticPressure
 {
-    #includeFunc staticPressure.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/staticPressure.cfg"
 
     rhoInf 1.2; // Density to scale
 }
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
index 7d9cbddfa..59c76b41d 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc pressure.cfg
+#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg"
 
 calcTotal     no;
 calcCoeff     no;
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
index 950bff3ec..16fdabb1b 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
@@ -8,7 +8,7 @@
 
 totalPressure
 {
-    #includeFunc totalPressureCompressible.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg"
 
     pRef    0;
 }
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
index 28ab16cda..6a86d3949 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc pressure.cfg
+#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg"
 
 calcTotal     no;
 calcCoeff     no;
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
index 6f9f0de90..cbac4b71f 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
@@ -8,7 +8,7 @@
 
 totalPressure
 {
-    #includeFunc totalPressureIncompressible.cfg
+    #includeEtc "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg"
 
     pRef    0.0;
     rhoInf  1.2;
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
index 4be65223e..41998addb 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc pressure.cfg
+#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg"
 
 calcTotal     yes;
 calcCoeff     no;
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud b/etc/caseDicts/postProcessing/probes/boundaryCloud
index 195bd4724..72b0da5b7 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud
@@ -19,7 +19,7 @@ boundaryCloud
 
     patches     (".*");
 
-    #includeFunc boundaryCloud.cfg
+    #includeEtc "caseDicts/postProcessing/probes/boundaryCloud.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
index 10d23ab34..d90c94122 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc cloud.cfg
+#includeEtc "caseDicts/postProcessing/probes/cloud.cfg"
 
 sets
 (
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud b/etc/caseDicts/postProcessing/probes/internalCloud
index 7fdeb0c13..e5ba0c254 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud
+++ b/etc/caseDicts/postProcessing/probes/internalCloud
@@ -14,7 +14,7 @@ internalCloud
         (0 0 0)
     );
 
-    #includeFunc internalCloud.cfg
+    #includeEtc "caseDicts/postProcessing/probes/internalCloud.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud.cfg b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
index 9179ce273..19bf54f89 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
@@ -6,7 +6,7 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-#includeFunc cloud.cfg
+#includeEtc "caseDicts/postProcessing/probes/cloud.cfg"
 
 sets
 (
diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/postProcessing/probes/probes
index a2d4a4fed..f5936b06b 100644
--- a/etc/caseDicts/postProcessing/probes/probes
+++ b/etc/caseDicts/postProcessing/probes/probes
@@ -8,7 +8,7 @@
 
 probes
 {
-    #includeFunc probes.cfg
+    #includeEtc "caseDicts/postProcessing/probes/probes.cfg"
 
     fields (p U);
     probeLocations
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
index 2eba2a4a5..c1204f7e7 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
@@ -8,7 +8,7 @@
 
 T
 {
-    #includeFunc scalarTransport.cfg
+    #includeEtc "caseDicts/postProcessing/scalarTransport/scalarTransport.cfg"
 
     userDT true;
     DT     1e-09;
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
index dea72251d..32b4bf140 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
@@ -20,6 +20,6 @@ writeInterval   1e-2;
 // transportProperties settings
 DT      DT [ 0 2 -1 0 0 0 0 ] 1e-9;
 
-#includeFunc scalarTransportDict.cfg
+#includeEtc "caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines
index b9d625f5b..c194eb7ef 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines
+++ b/etc/caseDicts/postProcessing/visualization/streamlines
@@ -14,7 +14,7 @@ streamlines
     fields  (U p);
 
     // Must be last entry
-    #includeFunc streamlines.cfg
+    #includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces b/etc/caseDicts/postProcessing/visualization/surfaces
index 60b6432f8..3b820bd51 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces
+++ b/etc/caseDicts/postProcessing/visualization/surfaces
@@ -8,7 +8,7 @@
 
 surfaces
 {
-    #includeFunc surfaces.cfg
+    #includeEtc "caseDicts/postProcessing/visualization/surfaces.cfg"
 
     fields       (p U);