diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index b9f4dd25b6..6cc4d6f32b 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -53,7 +53,7 @@ Description
 #include "polyAddFace.H"
 #include "combineFaces.H"
 #include "removePoints.H"
-#include "polyMesh.H"
+#include "polyMeshCheck.H"
 #include "polyTopoChangeMap.H"
 #include "unitConversion.H"
 #include "motionSmoother.H"
@@ -135,7 +135,7 @@ label mergePatchFaces
         }
         else
         {
-            mesh.checkFacePyramids(false, -small, &errorFaces);
+            meshCheck::checkFacePyramids(mesh, false, -small, &errorFaces);
         }
 
         // Sets where the master is in error
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 0ed8058f3f..c7e55c2181 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -25,7 +25,6 @@ License
 
 #include "PatchTools.H"
 #include "checkGeometry.H"
-#include "polyMesh.H"
 #include "polyMeshCheck.H"
 #include "cellSet.H"
 #include "faceSet.H"
@@ -582,15 +581,16 @@ Foam::label Foam::checkGeometry
         }
     }
 
-    if (mesh.checkClosedBoundary(true)) noFailedChecks++;
+    if (meshCheck::checkClosedBoundary(mesh, true)) noFailedChecks++;
 
     {
         cellSet cells(mesh, "nonClosedCells", mesh.nCells()/100+1);
         cellSet aspectCells(mesh, "highAspectRatioCells", mesh.nCells()/100+1);
         if
         (
-            mesh.checkClosedCells
+            meshCheck::checkClosedCells
             (
+                mesh,
                 true,
                 &cells,
                 &aspectCells,
@@ -633,7 +633,7 @@ Foam::label Foam::checkGeometry
 
     {
         faceSet faces(mesh, "zeroAreaFaces", mesh.nFaces()/100+1);
-        if (mesh.checkFaceAreas(true, &faces))
+        if (meshCheck::checkFaceAreas(mesh, true, &faces))
         {
             noFailedChecks++;
 
@@ -655,7 +655,7 @@ Foam::label Foam::checkGeometry
 
     {
         cellSet cells(mesh, "zeroVolumeCells", mesh.nCells()/100+1);
-        if (mesh.checkCellVolumes(true, &cells))
+        if (meshCheck::checkCellVolumes(mesh, true, &cells))
         {
             noFailedChecks++;
 
@@ -699,7 +699,7 @@ Foam::label Foam::checkGeometry
 
     {
         faceSet faces(mesh, "wrongOrientedFaces", mesh.nFaces()/100 + 1);
-        if (mesh.checkFacePyramids(true, -small, &faces))
+        if (meshCheck::checkFacePyramids(mesh, true, -small, &faces))
         {
             noFailedChecks++;
 
@@ -803,7 +803,7 @@ Foam::label Foam::checkGeometry
     {
         // Note use of nPoints since don't want edge construction.
         pointSet points(mesh, "shortEdges", mesh.nPoints()/1000 + 1);
-        if (mesh.checkEdgeLength(true, minDistSqr, &points))
+        if (meshCheck::checkEdgeLength(mesh, true, minDistSqr, &points))
         {
             // noFailedChecks++;
 
@@ -825,7 +825,7 @@ Foam::label Foam::checkGeometry
 
         label nEdgeClose = returnReduce(points.size(), sumOp<label>());
 
-        if (mesh.checkPointNearness(false, minDistSqr, &points))
+        if (meshCheck::checkPointNearness(mesh, false, minDistSqr, &points))
         {
             // noFailedChecks++;
 
@@ -850,7 +850,7 @@ Foam::label Foam::checkGeometry
     if (allGeometry)
     {
         faceSet faces(mesh, "concaveFaces", mesh.nFaces()/100 + 1);
-        if (mesh.checkFaceAngles(true, 10, &faces))
+        if (meshCheck::checkFaceAngles(mesh, true, 10, &faces))
         {
             // noFailedChecks++;
 
@@ -874,7 +874,7 @@ Foam::label Foam::checkGeometry
     if (allGeometry)
     {
         faceSet faces(mesh, "warpedFaces", mesh.nFaces()/100 + 1);
-        if (mesh.checkFaceFlatness(true, 0.8, &faces))
+        if (meshCheck::checkFaceFlatness(mesh, true, 0.8, &faces))
         {
             // noFailedChecks++;
 
@@ -917,7 +917,7 @@ Foam::label Foam::checkGeometry
     if (allGeometry)
     {
         cellSet cells(mesh, "concaveCells", mesh.nCells()/100);
-        if (mesh.checkConcaveCells(true, &cells))
+        if (meshCheck::checkConcaveCells(mesh, true, &cells))
         {
             noFailedChecks++;
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index e7d871e79a..18e8453317 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "checkTopology.H"
-#include "polyMesh.H"
+#include "polyMeshCheck.H"
 #include "Time.H"
 #include "regionSplit.H"
 #include "cellSet.H"
@@ -145,7 +145,7 @@ Foam::label Foam::checkTopology
 
     {
         pointSet points(mesh, "unusedPoints", mesh.nPoints()/100);
-        if (mesh.checkPoints(true, &points))
+        if (meshCheck::checkPoints(mesh, true, &points))
         {
             noFailedChecks++;
 
@@ -164,7 +164,7 @@ Foam::label Foam::checkTopology
 
     {
         faceSet faces(mesh, "upperTriangularFace", mesh.nFaces()/100);
-        if (mesh.checkUpperTriangular(true, &faces))
+        if (meshCheck::checkUpperTriangular(mesh, true, &faces))
         {
             noFailedChecks++;
         }
@@ -186,7 +186,7 @@ Foam::label Foam::checkTopology
 
     {
         faceSet faces(mesh, "outOfRangeFaces", mesh.nFaces()/100);
-        if (mesh.checkFaceVertices(true, &faces))
+        if (meshCheck::checkFaceVertices(mesh, true, &faces))
         {
             noFailedChecks++;
 
@@ -207,7 +207,7 @@ Foam::label Foam::checkTopology
     if (allTopology)
     {
         cellSet cells(mesh, "zipUpCells", mesh.nCells()/100);
-        if (mesh.checkCellsZipUp(true, &cells))
+        if (meshCheck::checkCellsZipUp(mesh, true, &cells))
         {
             noFailedChecks++;
 
@@ -229,7 +229,7 @@ Foam::label Foam::checkTopology
     if (allTopology)
     {
         faceSet faces(mesh, "edgeFaces", mesh.nFaces()/100);
-        if (mesh.checkFaceFaces(true, &faces))
+        if (meshCheck::checkFaceFaces(mesh, true, &faces))
         {
             noFailedChecks++;
         }