diff --git a/src/finiteVolume/fvMesh/wallDist/patchDist.C b/src/finiteVolume/fvMesh/wallDist/patchDist.C
index 846cc901c2cc61628d2bcbaf8c2a40632016c57b..6855f5a1709ebdb1d2a0271184a0de55b9d41aa0 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDist.C
@@ -48,7 +48,6 @@ Foam::patchDist::patchDist
         mesh,
         dimensionedScalar("y", dimLength, GREAT)
     ),
-    cellDistFuncs(mesh),
     patchIDs_(patchIDs),
     correctWalls_(correctWalls),
     nUnset_(0)
@@ -68,7 +67,7 @@ Foam::patchDist::~patchDist()
 void Foam::patchDist::correct()
 {
     // Calculate distance starting from patch faces
-    patchWave wave(cellDistFuncs::mesh(), patchIDs_, correctWalls_);
+    patchWave wave(mesh(), patchIDs_, correctWalls_);
 
     // Transfer cell values from wave into *this
     transfer(wave.distance());
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDist.H b/src/finiteVolume/fvMesh/wallDist/patchDist.H
index 1cb596a538fbc4e18024dde7c7500db4d316dfbf..8c631cfe139e50f0cdd1454d9660fc60654ac010 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDist.H
@@ -62,7 +62,6 @@ SourceFiles
 #define patchDist_H
 
 #include "volFields.H"
-#include "cellDistFuncs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,8 +76,7 @@ class fvMesh;
 
 class patchDist
 :
-    public volScalarField,
-    public cellDistFuncs
+    public volScalarField
 {
 
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist.C
index 2f857de2fce73a51aff1dc128a795ba4f7e6c470..e089985d4d6d5e5357bc65ba5232846b6b82e9ab 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.C
@@ -35,7 +35,12 @@ Foam::wallDist::wallDist
     const bool correctWalls
 )
 :
-    patchDist(mesh, getPatchIDs<wallPolyPatch>(), correctWalls)
+    patchDist
+    (
+        mesh,
+        mesh.boundaryMesh().findPatchIDs<wallPolyPatch>(),
+        correctWalls
+    )
 {}