diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 90268fdf4b..a063a3fd3c 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -11,8 +11,8 @@
 #include "checkTools.H"
 #include "functionObject.H"
 
+#include "vtkSetWriter.H"
 #include "vtkSurfaceWriter.H"
-#include "writer.H"
 
 #include "cyclicACMIPolyPatch.H"
 #include "Time.H"
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
index acd3d401be..cd7d13d540 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
@@ -1,12 +1,13 @@
 #include "label.H"
 #include "HashSet.H"
 #include "labelVector.H"
-#include "writer.H"
 
 namespace Foam
 {
+    // Forward Declarations
     class polyMesh;
     class wedgePolyPatch;
+    template<class T> class writer;
     class surfaceWriter;
 
     label findOppositeWedge(const polyMesh&, const wedgePolyPatch&);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
index 80cc521258..a77ca272cd 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
@@ -36,10 +36,12 @@ License
 #include "tetWedgeMatcher.H"
 #include "tetMatcher.H"
 #include "IOmanip.H"
+#include "OFstream.H"
 #include "pointSet.H"
 #include "faceSet.H"
 #include "cellSet.H"
 #include "Time.H"
+#include "writer.H"
 #include "surfaceWriter.H"
 #include "syncTools.H"
 #include "globalIndex.H"
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.H b/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
index 79c68b6673..b04394c946 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
@@ -1,15 +1,16 @@
 #include "scalar.H"
 #include "indirectPrimitivePatch.H"
-#include "writer.H"
 
 namespace Foam
 {
+    // Forward Declarations
     class polyMesh;
     class pointSet;
     class faceSet;
     class cellSet;
     class fileName;
     class polyMesh;
+    template<class T> class writer;
     class surfaceWriter;
 
     void printMeshStats(const polyMesh& mesh, const bool allTopology);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index cfd0a579fa..197c9d2ed4 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,6 +36,7 @@ License
 #include "IOmanip.H"
 #include "emptyPolyPatch.H"
 #include "processorPolyPatch.H"
+#include "vtkSetWriter.H"
 #include "vtkSurfaceWriter.H"
 #include "checkTools.H"
 #include "treeBoundBox.H"
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
index bd93afc3db..b0388920d3 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
@@ -1,11 +1,12 @@
 #include "label.H"
 #include "autoPtr.H"
-#include "writer.H"
 
 namespace Foam
 {
+    // Forward Declarations
     class polyMesh;
     class pointSet;
+    template<class T> class writer;
     class surfaceWriter;
 
     template<class PatchType>
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
index 8cab3a7008..60af09cab6 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.C
@@ -32,6 +32,7 @@ License
 #include "Time.H"
 #include "DynamicField.H"
 #include "PatchTools.H"
+#include "writer.H"
 #include "triSurfaceMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
index 0bf6c3b221..92d3d9b9f3 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
@@ -56,19 +56,19 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef searchableSurfaces_H
-#define searchableSurfaces_H
+#ifndef Foam_searchableSurfaces_H
+#define Foam_searchableSurfaces_H
 
 #include "searchableSurface.H"
 #include "labelPair.H"
-#include "writer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
+template<class T> class writer;
 class triSurface;
 
 /*---------------------------------------------------------------------------*\
@@ -292,8 +292,6 @@ public:
 
         //- Return reference to searchableSurface by name.
         searchableSurface& operator[](const word&);
-
-
 };