From 610854af03e840e24244ef419d356a11da626926 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 22 Sep 2017 16:25:17 +0200
Subject: [PATCH] STYLE: minor cleanup after merge

---
 applications/test/FixedList/Test-FixedList.C                 | 3 +--
 applications/test/primitivePatch/Test-PrimitivePatch.C       | 3 +--
 .../rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C  | 3 +--
 .../test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C   | 3 +--
 applications/test/rigidBodyDynamics/spring/spring.C          | 3 +--
 applications/test/router/Test-processorRouter.C              | 3 +--
 .../utilities/mesh/advanced/refineHexMesh/refineHexMesh.C    | 3 +--
 applications/utilities/mesh/conversion/datToFoam/datToFoam.C | 3 +--
 .../utilities/mesh/conversion/kivaToFoam/kivaToFoam.C        | 3 +--
 applications/utilities/mesh/manipulation/setSet/setSet.C     | 3 +--
 .../utilities/miscellaneous/foamDictionary/foamDictionary.C  | 3 +--
 applications/utilities/surface/surfaceAdd/surfaceAdd.C       | 3 +--
 applications/utilities/surface/surfaceSubset/surfaceSubset.C | 3 +--
 .../surface/surfaceTransformPoints/surfaceTransformPoints.C  | 3 +--
 .../db/IOobjects/decomposedBlockData/decomposedBlockData.C   | 5 ++---
 src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C                | 5 +++--
 src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H          | 2 +-
 src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H      | 2 +-
 src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C     | 3 +--
 .../collatedFileOperation/threadedCollatedOFstream.H         | 2 +-
 .../uncollatedFileOperation/uncollatedFileOperation.C        | 3 +--
 src/OpenFOAM/primitives/predicates/predicates.H              | 2 +-
 src/conversion/ccm/reader/ccmReader.C                        | 3 ++-
 src/conversion/ccm/reader/ccmReaderAux.C                     | 3 ++-
 src/conversion/ccm/reader/ccmReaderMesh.C                    | 3 +--
 .../turbulentDFSEMInletFvPatchVectorField.C                  | 3 +--
 src/functionObjects/field/externalCoupled/externalCoupled.C  | 3 +--
 .../field/externalCoupled/externalCoupledTemplates.C         | 3 +--
 src/lumpedPointMotion/lumpedPointMovement.C                  | 3 +--
 src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C | 3 +--
 src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C   | 5 ++---
 src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H   | 3 +--
 .../edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H       | 3 +--
 src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C   | 3 +--
 src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C   | 3 +--
 .../writers/ensight/ensightSurfaceWriterTemplates.C          | 3 +--
 src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C   | 3 +--
 src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H     | 3 +--
 src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C           | 3 +--
 src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C           | 3 +--
 src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C           | 3 +--
 src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H | 3 +--
 src/surfMesh/surfaceFormats/surfaceFormatsCore.C             | 3 +--
 src/surfMesh/triSurface/triSurface.C                         | 3 +--
 44 files changed, 50 insertions(+), 84 deletions(-)

diff --git a/applications/test/FixedList/Test-FixedList.C b/applications/test/FixedList/Test-FixedList.C
index 9fd0fde37aa..b057b43f276 100644
--- a/applications/test/FixedList/Test-FixedList.C
+++ b/applications/test/FixedList/Test-FixedList.C
@@ -34,8 +34,7 @@ See also
 
 #include "argList.H"
 #include "FixedList.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "IPstream.H"
 #include "OPstream.H"
 
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index 97b3c0cc938..9fa8e4709b6 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -31,8 +31,7 @@ Description
 #include "Time.H"
 #include "polyMesh.H"
 #include "primitivePatch.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 
 using namespace Foam;
 
diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
index 94e151f69c0..f222e9c2c15 100644
--- a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
@@ -35,8 +35,7 @@ Description
 #include "joints.H"
 #include "rigidBodyRestraint.H"
 #include "rigidBodyModelState.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "constants.H"
 
 using namespace Foam;
diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
index 91a59104ed4..1ec432613b2 100644
--- a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
@@ -35,8 +35,7 @@ Description
 #include "joints.H"
 #include "rigidBodyRestraint.H"
 #include "rigidBodyModelState.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 
 using namespace Foam;
 using namespace RBD;
diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index 15e9034b309..bec262ec1b9 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -35,8 +35,7 @@ Description
 #include "joints.H"
 #include "rigidBodyRestraint.H"
 #include "rigidBodyModelState.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 
 using namespace Foam;
 using namespace RBD;
diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C
index 48fc4ab61b1..4f47c80b63d 100644
--- a/applications/test/router/Test-processorRouter.C
+++ b/applications/test/router/Test-processorRouter.C
@@ -28,8 +28,7 @@ Description
 #include "argList.H"
 #include "label.H"
 #include "labelList.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "point.H"
 #include "Time.H"
 #include "fvMesh.H"
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index 3a6cdfe11ae..613c0133b83 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -38,9 +38,8 @@ Description
 #include "Time.H"
 #include "hexRef8.H"
 #include "cellSet.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "meshTools.H"
-#include "IFstream.H"
 #include "polyTopoChange.H"
 #include "mapPolyMesh.H"
 #include "volMesh.H"
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index 7cc4fbffb86..e2961713106 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -35,8 +35,7 @@ Description
 
 #include "argList.H"
 #include "Time.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "pointField.H"
 #include "unitConversion.H"
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 56653cc9217..c88defe7020 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -35,8 +35,7 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "cellShape.H"
 #include "cellModeller.H"
 #include "preservePatchTypes.H"
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 3a7b554ee28..a290259e62f 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -41,8 +41,7 @@ Description
 #include "faceSet.H"
 #include "pointSet.H"
 #include "topoSetSource.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "demandDrivenData.H"
 #include "foamVtkWriteCellSetFaces.H"
 #include "foamVtkWriteFaceSet.H"
diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index 6d6dca2c76b..e4c31862614 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -114,8 +114,7 @@ Usage
 #include "argList.H"
 #include "profiling.H"
 #include "Time.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "includeEntry.H"
 
 using namespace Foam;
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 0be9024ebd9..fa964380d9e 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -38,8 +38,7 @@ Description
 #include "argList.H"
 #include "fileName.H"
 #include "triSurface.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "triFace.H"
 #include "triFaceList.H"
 
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 8a02cd9a1c1..f97e8408129 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -36,8 +36,7 @@ Description
 #include "triSurface.H"
 #include "triSurfaceSearch.H"
 #include "argList.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "Switch.H"
 #include "IOdictionary.H"
 #include "boundBox.H"
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 36ae2631c48..173bbf2e3a8 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -41,8 +41,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "boundBox.H"
 #include "transformField.H"
 #include "Pair.H"
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
index 15809004dcd..d5a93363386 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -27,9 +27,8 @@ License
 #include "OPstream.H"
 #include "IPstream.H"
 #include "PstreamBuffers.H"
-#include "OFstream.H"
-#include "IFstream.H"
-#include "IStringStream.H"
+#include "Fstream.H"
+#include "StringStream.H"
 #include "dictionary.H"
 #include <sys/time.h>
 #include "objectRegistry.H"
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index 17a2b7d1e42..59e7a8c6593 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -53,10 +53,11 @@ Foam::OFstreamAllocator::OFstreamAllocator
             InfoInFunction << "Cannot open null file " << endl;
         }
     }
-    ofstream::openmode mode(ofstream::out);
+
+    std::ios_base::openmode mode(std::ios_base::out);
     if (append)
     {
-        mode |= ofstream::app;
+        mode |= std::ios_base::app;
     }
 
     if (compression == IOstream::COMPRESSED)
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
index 6bc595d692c..c619ad8ac03 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef masterOFstream_H
 #define masterOFstream_H
 
-#include "OStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H b/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H
index a774271a11a..9477b087914 100644
--- a/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H
+++ b/src/OpenFOAM/db/IOstreams/dummyISstream/dummyISstream.H
@@ -34,7 +34,7 @@ SourceFiles
 #ifndef dummyISstream_H
 #define dummyISstream_H
 
-#include "IStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index 836f47500ee..1371c173004 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -26,8 +26,7 @@ License
 #include "dynamicCode.H"
 #include "dynamicCodeContext.H"
 #include "stringOps.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "OSspecific.H"
 #include "etcFiles.H"
 #include "dictionary.H"
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H
index e296e1132ca..7efd8d0daf2 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/threadedCollatedOFstream.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef threadedCollatedOFstream_H
 #define threadedCollatedOFstream_H
 
-#include "OStringStream.H"
+#include "StringStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 2ee8ad8b615..e6a509e74c2 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -25,8 +25,7 @@ License
 
 #include "uncollatedFileOperation.H"
 #include "Time.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "addToRunTimeSelectionTable.H"
 #include "masterUncollatedFileOperation.H"
 #include "decomposedBlockData.H"
diff --git a/src/OpenFOAM/primitives/predicates/predicates.H b/src/OpenFOAM/primitives/predicates/predicates.H
index e751c7e957f..0d7d8539fa2 100644
--- a/src/OpenFOAM/primitives/predicates/predicates.H
+++ b/src/OpenFOAM/primitives/predicates/predicates.H
@@ -72,7 +72,7 @@ public:
         return true;
     }
 
-    //- Binary predicate returning false
+    //- Binary predicate returning true
     template<class T1, class T2>
     inline bool operator()(const T1&, const T2&) const
     {
diff --git a/src/conversion/ccm/reader/ccmReader.C b/src/conversion/ccm/reader/ccmReader.C
index 78495c4ba51..4db674ed2ee 100644
--- a/src/conversion/ccm/reader/ccmReader.C
+++ b/src/conversion/ccm/reader/ccmReader.C
@@ -587,7 +587,8 @@ void Foam::ccm::reader::writeMesh
     (
         fmt,
         IOstream::currentVersion,
-        IOstream::UNCOMPRESSED
+        IOstream::UNCOMPRESSED,
+        true
     );
     writeAux(mesh);
 }
diff --git a/src/conversion/ccm/reader/ccmReaderAux.C b/src/conversion/ccm/reader/ccmReaderAux.C
index 717cdd20e88..eead7bb1c98 100644
--- a/src/conversion/ccm/reader/ccmReaderAux.C
+++ b/src/conversion/ccm/reader/ccmReaderAux.C
@@ -174,7 +174,8 @@ void Foam::ccm::reader::writeMeshLabelList
     (
         fmt,
         IOstream::currentVersion,
-        IOstream::UNCOMPRESSED
+        IOstream::UNCOMPRESSED,
+        true
     );
 }
 
diff --git a/src/conversion/ccm/reader/ccmReaderMesh.C b/src/conversion/ccm/reader/ccmReaderMesh.C
index cd696c86194..089b3f65bbd 100644
--- a/src/conversion/ccm/reader/ccmReaderMesh.C
+++ b/src/conversion/ccm/reader/ccmReaderMesh.C
@@ -28,8 +28,7 @@ License
 #include "emptyPolyPatch.H"
 #include "symmetryPolyPatch.H"
 #include "wallPolyPatch.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "IOdictionary.H"
 
 #include "ccmBoundaryInfo.H"
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 1f81e6fb63f..5d1bce06740 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -29,8 +29,7 @@ License
 #include "fvPatchFieldMapper.H"
 #include "momentOfInertia.H"
 #include "cartesianCS.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "globalIndex.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 17a2be571de..5f710e33186 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -26,8 +26,7 @@ License
 #include "externalCoupled.H"
 #include "addToRunTimeSelectionTable.H"
 #include "OSspecific.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "volFields.H"
 #include "globalIndex.H"
 #include "fvMesh.H"
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
index 3a4a3633c4e..77373bb37e4 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
@@ -26,8 +26,7 @@ License
 #include "externalCoupled.H"
 //#include "fvMesh.H"
 #include "OSspecific.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "volFields.H"
 #include "externalCoupledMixedFvPatchFields.H"
 #include "mixedFvPatchFields.H"
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index 7683ab5fd95..21cd34dc33f 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -27,8 +27,7 @@ License
 #include "lumpedPointIOMovement.H"
 #include "demandDrivenData.H"
 #include "linearInterpolationWeights.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "PtrMap.H"
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C
index 45ea4229c70..71d25e518b2 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C
@@ -26,8 +26,7 @@ License
 #include "edgeMeshFormatsCore.H"
 
 #include "Time.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "edgeMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
index e93dfead989..5153b212e30 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
@@ -25,10 +25,9 @@ License
 
 #include "OBJedgeFormat.H"
 #include "clock.H"
-#include "IFstream.H"
-#include "StringStream.H"
+#include "Fstream.H"
 #include "Ostream.H"
-#include "OFstream.H"
+#include "StringStream.H"
 #include "ListOps.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
index baa87877315..77a06d7bead 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.H
@@ -38,9 +38,8 @@ SourceFiles
 #define OBJedgeFormat_H
 
 #include "edgeMesh.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "Ostream.H"
-#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
index a6b0bbfb2f6..277ef7f65b1 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.H
@@ -44,9 +44,8 @@ SourceFiles
 #include "edgeMesh.H"
 #include "STARCDCore.H"
 
-#include "IFstream.H"
+#include "Fstream.H"
 #include "Ostream.H"
-#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
index 4accc8044ee..fd72bf1b87b 100644
--- a/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
@@ -24,9 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "VTKedgeFormat.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "clock.H"
-#include "IFstream.H"
 #include "vtkUnstructuredReader.H"
 #include "Time.H"
 
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index c727121a601..8da032518b1 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -30,8 +30,7 @@ License
 #include "treeDataPoint.H"
 #include "meshTools.H"
 #include "linePointRef.H"
-#include "OFstream.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "unitConversion.H"
 #include "EdgeMap.H"
 
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
index 2c058293e88..6db990686d1 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
@@ -24,8 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "IOmanip.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "OSspecific.H"
 #include "ensightPartFaces.H"
 #include "ensightSerialOutput.H"
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index ab426dc13d1..2df9b42fdc3 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -26,8 +26,7 @@ License
 #include "MeshedSurface.H"
 #include "UnsortedMeshedSurface.H"
 #include "MeshedSurfaceProxy.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "Time.H"
 #include "ListOps.H"
 #include "polyBoundaryMesh.H"
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
index 602ca185654..6054cb804fc 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
@@ -35,9 +35,8 @@ SourceFiles
 #ifndef AC3DsurfaceFormatCore_H
 #define AC3DsurfaceFormatCore_H
 
-#include "IFstream.H"
+#include "Fstream.H"
 #include "Ostream.H"
-#include "OFstream.H"
 #include "MeshedSurface.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index 65910225fca..e0cbfe401c3 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -26,9 +26,8 @@ License
 #include "GTSsurfaceFormat.H"
 #include "surfaceFormatsCore.H"
 #include "clock.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "StringStream.H"
-#include "OFstream.H"
 #include "faceTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index e7a16d36758..57376d2eaf2 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -25,9 +25,8 @@ License
 
 #include "OBJsurfaceFormat.H"
 #include "clock.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "StringStream.H"
-#include "OFstream.H"
 #include "ListOps.H"
 #include "faceTraits.H"
 
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 80047476fda..e666faab460 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -25,10 +25,9 @@ License
 
 #include "OFFsurfaceFormat.H"
 #include "clock.H"
-#include "IFstream.H"
+#include "Fstream.H"
 #include "StringStream.H"
 #include "faceTraits.H"
-#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
index 4f01ebea379..970ff3929ec 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
@@ -35,9 +35,8 @@ SourceFiles
 #ifndef STARCDsurfaceFormatCore_H
 #define STARCDsurfaceFormatCore_H
 
-#include "IFstream.H"
+#include "Fstream.H"
 #include "Ostream.H"
-#include "OFstream.H"
 #include "MeshedSurface.H"
 #include "STARCDCore.H"
 
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
index cff6e37d141..f6e2118bbd7 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
@@ -27,8 +27,7 @@ License
 
 #include "Time.H"
 #include "ListOps.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "surfMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C
index 921e410593e..b67da2ec63f 100644
--- a/src/surfMesh/triSurface/triSurface.C
+++ b/src/surfMesh/triSurface/triSurface.C
@@ -25,8 +25,7 @@ License
 
 #include "triSurface.H"
 #include "demandDrivenData.H"
-#include "IFstream.H"
-#include "OFstream.H"
+#include "Fstream.H"
 #include "Time.H"
 #include "boundBox.H"
 #include "SortableList.H"
-- 
GitLab