diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index da3d26c6aeb46d9f319b6bed8904a24d53618c28..e193e6437c68624dd2297da5d0f2b24dfe612369 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -53,7 +53,6 @@ SourceFiles
 #include "Time.H"
 #include "polyMesh.H"
 #include "plane.H"
-#include "SortableList.H"
 #include "meshTools.H"
 #include "dynamicIndexedOctree.H"
 #include "dynamicTreeDataPoint.H"
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 255b2ebcf3aadcabd38c54f4f657bdeeb5440242..19f3603e185d7c3ffb93848cf8eea8c967495d69 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -47,7 +47,6 @@ Description
 #include "argList.H"
 #include "polyMesh.H"
 #include "Time.H"
-#include "SortableList.H"
 #include "OFstream.H"
 #include "meshTools.H"
 #include "faceSet.H"
@@ -703,25 +702,21 @@ int main(int argc, char *argv[])
         {
             const word setName(dict.get<word>("set"));
 
-            faceSet faces(mesh, setName);
+            faceSet set(mesh, setName);
 
-            Info<< "Read " << returnReduce(faces.size(), sumOp<label>())
-                << " faces from faceSet " << faces.name() << endl;
+            Info<< "Read " << returnReduce(set.size(), sumOp<label>())
+                << " faces from faceSet " << set.name() << endl;
 
             // Sort (since faceSet contains faces in arbitrary order)
-            labelList faceLabels(faces.toc());
+            labelList faceLabels(set.sortedToc());
 
-            SortableList<label> patchFaces(faceLabels);
-
-            forAll(patchFaces, i)
+            for (const label facei : faceLabels)
             {
-                label facei = patchFaces[i];
-
                 if (mesh.isInternalFace(facei))
                 {
                     FatalErrorInFunction
                         << "Face " << facei << " specified in set "
-                        << faces.name()
+                        << set.name()
                         << " is not an external face of the mesh." << endl
                         << "This application can only repatch existing boundary"
                         << " faces." << exit(FatalError);
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index d192600447d68309e63e7ee624e00d37bdfba2f3..3ec4c9a29649b9de21edbf75c5d68dcd6e16be5a 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -53,7 +53,6 @@ Description
 #include "faceSet.H"
 #include "pointSet.H"
 #include "IOobjectList.H"
-#include "SortableList.H"
 #include "timeSelector.H"
 
 using namespace Foam;
@@ -114,7 +113,7 @@ int main(int argc, char *argv[])
     {
         // Not in memory. Load it.
         pointSet set(*iter());
-        SortableList<label> pointLabels(set.toc());
+        labelList pointLabels(set.sortedToc());
 
         // The original number of zones
         const label nOrigZones = mesh.pointZones().size();
@@ -150,7 +149,7 @@ int main(int argc, char *argv[])
     {
         // Not in memory. Load it.
         faceSet set(*iter());
-        SortableList<label> faceLabels(set.toc());
+        labelList faceLabels(set.sortedToc());
 
         DynamicList<label> addressing(set.size());
         DynamicList<bool> flipMap(set.size());
@@ -278,7 +277,7 @@ int main(int argc, char *argv[])
         {
             // Not in memory. Load it.
             cellSet set(*iter());
-            SortableList<label> cellLabels(set.toc());
+            labelList cellLabels(set.sortedToc());
 
             // The original number of zones
             const label nOrigZones = mesh.cellZones().size();
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index cdab0733b19152a7f88321bfde80a8caab7c499c..665d16d89afebd81a569c6da2c25338d32f0c234 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -97,7 +97,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "SortableList.H"
 #include "argList.H"
 #include "regionSplit.H"
 #include "fvMeshSubset.H"
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
index 46d33118d56cb6ae0d44bd3751d271c7d7a15b1d..a863442174aeddf0b14b2951890fc902f96e3de1 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
@@ -27,7 +27,6 @@ License
 
 #include "helpType.H"
 #include "doxygenXmlParser.H"
-#include "SortableList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -95,7 +94,7 @@ void Foam::helpType::displayDocOptions
         Info<< parser;
     }
 
-    Info<< "Valid types include:" << nl << SortableList<word>(parser.toc());
+    Info<< "Valid types:" << nl << parser.sortedToc();
 }
 
 
@@ -168,24 +167,12 @@ void Foam::helpType::displayDoc
     {
         FatalErrorInFunction
             << "No help for type " << className << " found."
-            << "  Valid options include:" << SortableList<word>(parser.toc())
+            << "  Valid options:" << parser.sortedToc()
             << exit(FatalError);
     }
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::helpType::helpType()
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::helpType::~helpType()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::helpType::init()
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H
index 5d39e74cbe42ef684f6730092cb6d4c3beb107e0..23d24c62707eafeea41fd187761c4f7b869ecea3 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H
@@ -47,8 +47,7 @@ SourceFiles
 namespace Foam
 {
 
-// forward declaration of classes
-
+// Forward Declarations
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -57,7 +56,6 @@ class fvMesh;
 
 class helpType
 {
-
 protected:
 
     //- Return file path to the Doxygen sources (if available)
@@ -97,14 +95,14 @@ public:
     );
 
 
-    //- Constructor
-    helpType();
+    //- Default construct
+    helpType() = default;
 
     //- Selector
     static autoPtr<helpType> New(const word& helpTypeName);
 
     //- Destructor
-    virtual ~helpType();
+    virtual ~helpType() = default;
 
 
     // Member Functions
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
index a547e864be7990c027cff29edcffe1b161401c9e..9171acfa2cbe27999cd6a40ece868789ec217a5a 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
@@ -29,7 +29,6 @@ License
 #define steadyParticleTracksTemplates_H
 
 #include "OFstream.H"
-#include "SortableList.H"
 #include "IOobjectList.H"
 #include "PtrList.H"
 #include "Field.H"
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index 2df5b03e2a7a66dcfd74545ed67040328e15af78..2dc1253bc0e2b860020ac7526b4d3246c49cc389 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -45,7 +45,6 @@ SourceFiles
 #include "polyMesh.H"
 #include "mapAddedPolyMesh.H"
 #include "faceCoupleInfo.H"
-#include "SortableList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index a0896f63efa8c4a8978a53b6df72db3832a6f17f..0893fbd6ed54fde871f7bf35df39fd22b3c914f1 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -38,7 +38,6 @@ License
 #include "faMeshLduAddressing.H"
 #include "wedgeFaPatch.H"
 #include "faPatchData.H"
-#include "SortableList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
index 3c7fe145799cd8f088faf1ba04e9e98274f2fa3e..0d40def9fc96849e59297641d227c93851636790 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
@@ -27,7 +27,6 @@ License
 
 #include "CFCCellToCellStencil.H"
 #include "syncTools.H"
-#include "SortableList.H"
 #include "emptyPolyPatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index 1876127686ff664839eec9bbee26809135c49afb..15dcc55c86248553d62f27bb5e28808d98b4fb6c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -28,7 +28,6 @@ License
 
 #include "cellToCellStencil.H"
 #include "syncTools.H"
-#include "SortableList.H"
 #include "emptyPolyPatch.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
index b9f6292c6b01f34eb241690274393fdd144e7bba..2aae7ffd926ba036efe277e80d7bece724f41df9 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
@@ -28,7 +28,6 @@ License
 #include "extendedCellToFaceStencil.H"
 #include "globalIndex.H"
 #include "syncTools.H"
-#include "SortableList.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index 6f9cd11cb9b29e07a2ef4c05f92696fbe7b8d64e..22df81f4b4fc6bbebd42b392f1aef2ab853676b7 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cellToFaceStencil.H"
-#include "SortableList.H"
 #include "emptyPolyPatch.H"
 #include "syncTools.H"
 #include "dummyTransform.H"
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index c9ba0c781c1b58d52d3ad607b9102c1b5ad15b19..6e4a017bdbe6c66c0dd9554abc4c2b9673108c79 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fvmSup.H"
-#include "SortableList.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
index 38c0713a66d0d490fc8bc386b3bb2d87d1171c15..1057ea9cd21e9f89b001fc4d39a88cd09e8393dd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
@@ -28,7 +28,6 @@ License
 #include "InjectedParticleInjection.H"
 #include "mathematicalConstants.H"
 #include "bitSet.H"
-#include "SortableList.H"
 #include "injectedParticleCloud.H"
 
 using namespace Foam::constant;
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
index bafa2a742e42cf15aafbdc148f4a020f065446e1..bb1f014163ba19761b3537b1638e5df53281eb75 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
+++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H
@@ -39,6 +39,7 @@ Description
 #define SprayCloud_H
 
 #include "sprayCloud.H"
+#include "SortableList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/polyTopoChange/polyTopoChange.C b/src/meshTools/polyTopoChange/polyTopoChange.C
index 675341571d5a85b8081ccae0263d8e563714bc7d..806ddb58b66448ea1ee04968536cf6c75a139704 100644
--- a/src/meshTools/polyTopoChange/polyTopoChange.C
+++ b/src/meshTools/polyTopoChange/polyTopoChange.C
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "polyTopoChange.H"
-#include "SortableList.H"
 #include "polyMesh.H"
 #include "polyAddPoint.H"
 #include "polyModifyPoint.H"
diff --git a/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.C b/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.C
index bef9bcb79a3e050b7c3761b7c302f7048daf5f19..9da75c38102326df167245f89d22e3208e49be24 100644
--- a/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.C
+++ b/src/meshTools/searchableSurfaces/searchablePlane/searchablePlane.C
@@ -27,7 +27,6 @@ License
 
 #include "searchablePlane.H"
 #include "addToRunTimeSelectionTable.H"
-#include "SortableList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C
index 010e1c217313c75783a1e454fdf699efbaf8a45d..31059ec0aeb324a2f356b077b03065cab99f4d9f 100644
--- a/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C
+++ b/src/meshTools/searchableSurfaces/searchablePlate/searchablePlate.C
@@ -28,7 +28,6 @@ License
 
 #include "searchablePlate.H"
 #include "addToRunTimeSelectionTable.H"
-#include "SortableList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
index 22bf80724a7c9cdb7565859154a42718d06610e9..ca7b82299bb99a6b22d42227d9b657badc1d5c53 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
@@ -28,7 +28,6 @@ License
 
 #include "searchableSurfaceCollection.H"
 #include "addToRunTimeSelectionTable.H"
-#include "SortableList.H"
 #include "Time.H"
 #include "ListOps.H"