diff --git a/Framework/API/src/BoxController.cpp b/Framework/API/src/BoxController.cpp
index 6721ce5e6f52..872e75d1ef3b 100644
--- a/Framework/API/src/BoxController.cpp
+++ b/Framework/API/src/BoxController.cpp
@@ -8,7 +8,6 @@
 
 #include "MantidAPI/BoxController.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VectorHelper.h"
 
 #include <Poco/DOM/Attr.h>
diff --git a/Framework/API/src/BoxControllerSettingsAlgorithm.cpp b/Framework/API/src/BoxControllerSettingsAlgorithm.cpp
index bf9a8d476d49..20cede1e11d5 100644
--- a/Framework/API/src/BoxControllerSettingsAlgorithm.cpp
+++ b/Framework/API/src/BoxControllerSettingsAlgorithm.cpp
@@ -13,7 +13,6 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/StringTokenizer.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 
diff --git a/Framework/API/src/CoordTransform.cpp b/Framework/API/src/CoordTransform.cpp
index 002d9f17ff97..a6cae7b8e10b 100644
--- a/Framework/API/src/CoordTransform.cpp
+++ b/Framework/API/src/CoordTransform.cpp
@@ -8,7 +8,6 @@
 #include "MantidGeometry/MDGeometry/MDTypes.h"
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VMD.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
diff --git a/Framework/API/src/DataProcessorAlgorithm.cpp b/Framework/API/src/DataProcessorAlgorithm.cpp
index a28112f0b70f..17ae4dcf7114 100644
--- a/Framework/API/src/DataProcessorAlgorithm.cpp
+++ b/Framework/API/src/DataProcessorAlgorithm.cpp
@@ -16,7 +16,6 @@
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/PropertyManagerDataService.h"
-#include "MantidKernel/System.h"
 #include "Poco/Path.h"
 #include <stdexcept>
 #include <utility>
diff --git a/Framework/API/src/EnabledWhenWorkspaceIsType.cpp b/Framework/API/src/EnabledWhenWorkspaceIsType.cpp
index 6e4b9bcabe3d..8177fe9e91a7 100644
--- a/Framework/API/src/EnabledWhenWorkspaceIsType.cpp
+++ b/Framework/API/src/EnabledWhenWorkspaceIsType.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/EnabledWhenWorkspaceIsType.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/API/src/IEventList.cpp b/Framework/API/src/IEventList.cpp
index adffbe04db0e..62ec50f3d3c1 100644
--- a/Framework/API/src/IEventList.cpp
+++ b/Framework/API/src/IEventList.cpp
@@ -5,4 +5,3 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/IEventList.h"
-#include "MantidKernel/System.h"
diff --git a/Framework/API/src/IMDHistoWorkspace.cpp b/Framework/API/src/IMDHistoWorkspace.cpp
index 041b06bd78e1..40679cc3e295 100644
--- a/Framework/API/src/IMDHistoWorkspace.cpp
+++ b/Framework/API/src/IMDHistoWorkspace.cpp
@@ -9,7 +9,6 @@
 #include "MantidAPI/Sample.h"
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/IPropertyManager.h"
-#include "MantidKernel/System.h"
 
 #include <sstream>
 
diff --git a/Framework/API/src/ISpectrum.cpp b/Framework/API/src/ISpectrum.cpp
index 9c03be7de7ac..b3ca92e63c78 100644
--- a/Framework/API/src/ISpectrum.cpp
+++ b/Framework/API/src/ISpectrum.cpp
@@ -7,7 +7,6 @@
 #include "MantidAPI/ISpectrum.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidHistogramData/Histogram.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::API {
 
diff --git a/Framework/API/src/MDGeometry.cpp b/Framework/API/src/MDGeometry.cpp
index 9fb675969b51..d06b532dc486 100644
--- a/Framework/API/src/MDGeometry.cpp
+++ b/Framework/API/src/MDGeometry.cpp
@@ -10,7 +10,6 @@
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h"
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/NObserver.h>
 #include <memory>
diff --git a/Framework/API/src/MatrixWorkspaceMDIterator.cpp b/Framework/API/src/MatrixWorkspaceMDIterator.cpp
index 8073f3dd78b6..dff48c72f338 100644
--- a/Framework/API/src/MatrixWorkspaceMDIterator.cpp
+++ b/Framework/API/src/MatrixWorkspaceMDIterator.cpp
@@ -9,7 +9,6 @@
 #include "MantidAPI/NumericAxis.h"
 #include "MantidAPI/SpectrumInfo.h"
 #include "MantidGeometry/IDetector.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VMD.h"
 #include "MantidKernel/cow_ptr.h"
 
diff --git a/Framework/API/src/MultipleExperimentInfos.cpp b/Framework/API/src/MultipleExperimentInfos.cpp
index 21466fecc976..cfe163f1359d 100644
--- a/Framework/API/src/MultipleExperimentInfos.cpp
+++ b/Framework/API/src/MultipleExperimentInfos.cpp
@@ -7,7 +7,6 @@
 #include "MantidAPI/MultipleExperimentInfos.h"
 #include "MantidAPI/ExperimentInfo.h"
 #include "MantidAPI/Sample.h"
-#include "MantidKernel/System.h"
 
 #include <memory>
 #include <sstream>
diff --git a/Framework/API/src/MultipleFileProperty.cpp b/Framework/API/src/MultipleFileProperty.cpp
index 8509299a966e..f011d12b94d4 100644
--- a/Framework/API/src/MultipleFileProperty.cpp
+++ b/Framework/API/src/MultipleFileProperty.cpp
@@ -12,7 +12,6 @@
 #include "MantidKernel/MultiFileValidator.h"
 #include "MantidKernel/Property.h"
 #include "MantidKernel/PropertyHelper.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VectorHelper.h"
 
 #include <Poco/Path.h>
diff --git a/Framework/Algorithms/src/AddLogDerivative.cpp b/Framework/Algorithms/src/AddLogDerivative.cpp
index 858f72a05fb0..0aae2eb39630 100644
--- a/Framework/Algorithms/src/AddLogDerivative.cpp
+++ b/Framework/Algorithms/src/AddLogDerivative.cpp
@@ -10,7 +10,6 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/MandatoryValidator.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 
 using namespace Mantid::Kernel;
diff --git a/Framework/Algorithms/src/AddPeak.cpp b/Framework/Algorithms/src/AddPeak.cpp
index 6de3bf347775..b9c5311bc9ee 100644
--- a/Framework/Algorithms/src/AddPeak.cpp
+++ b/Framework/Algorithms/src/AddPeak.cpp
@@ -13,7 +13,6 @@
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument/DetectorInfo.h"
 #include "MantidGeometry/Instrument/Goniometer.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Unit.h"
 
 using namespace Mantid::PhysicalConstants;
diff --git a/Framework/Algorithms/src/ChangePulsetime.cpp b/Framework/Algorithms/src/ChangePulsetime.cpp
index 90432ae8148b..5e16dabe4ad2 100644
--- a/Framework/Algorithms/src/ChangePulsetime.cpp
+++ b/Framework/Algorithms/src/ChangePulsetime.cpp
@@ -7,7 +7,6 @@
 #include "MantidAlgorithms/ChangePulsetime.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::Algorithms {
 
diff --git a/Framework/Algorithms/src/ChangePulsetime2.cpp b/Framework/Algorithms/src/ChangePulsetime2.cpp
index f5c14737a705..1557ade95f48 100644
--- a/Framework/Algorithms/src/ChangePulsetime2.cpp
+++ b/Framework/Algorithms/src/ChangePulsetime2.cpp
@@ -8,7 +8,6 @@
 #include "MantidAPI/Algorithm.tcc"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::Algorithms {
 
diff --git a/Framework/Algorithms/src/ChangeTimeZero.cpp b/Framework/Algorithms/src/ChangeTimeZero.cpp
index b8a4ea5ca49d..241f1c93f9c4 100644
--- a/Framework/Algorithms/src/ChangeTimeZero.cpp
+++ b/Framework/Algorithms/src/ChangeTimeZero.cpp
@@ -15,7 +15,6 @@
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/DateTimeValidator.h"
 #include "MantidKernel/PropertyWithValue.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 
 #include <boost/lexical_cast.hpp>
diff --git a/Framework/Algorithms/src/ConvertToEventWorkspace.cpp b/Framework/Algorithms/src/ConvertToEventWorkspace.cpp
index 521fd9357ed3..c755601e132f 100644
--- a/Framework/Algorithms/src/ConvertToEventWorkspace.cpp
+++ b/Framework/Algorithms/src/ConvertToEventWorkspace.cpp
@@ -9,7 +9,6 @@
 #include "MantidDataObjects/Events.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
-#include "MantidKernel/System.h"
 #include <limits>
 
 using namespace Mantid::Kernel;
diff --git a/Framework/Algorithms/src/CreateGroupingWorkspace.cpp b/Framework/Algorithms/src/CreateGroupingWorkspace.cpp
index 84ee066516b6..d01b1c98e75e 100644
--- a/Framework/Algorithms/src/CreateGroupingWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateGroupingWorkspace.cpp
@@ -13,7 +13,6 @@
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include <boost/algorithm/string/detail/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
diff --git a/Framework/Algorithms/src/CreatePeaksWorkspace.cpp b/Framework/Algorithms/src/CreatePeaksWorkspace.cpp
index 400145149f55..8d6e3fef8482 100644
--- a/Framework/Algorithms/src/CreatePeaksWorkspace.cpp
+++ b/Framework/Algorithms/src/CreatePeaksWorkspace.cpp
@@ -12,7 +12,6 @@
 #include "MantidDataObjects/PeaksWorkspace.h"
 #include "MantidGeometry/Instrument/Goniometer.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::Algorithms {
 
diff --git a/Framework/Algorithms/src/ExportTimeSeriesLog.cpp b/Framework/Algorithms/src/ExportTimeSeriesLog.cpp
index 6504dde967aa..44207944bee6 100644
--- a/Framework/Algorithms/src/ExportTimeSeriesLog.cpp
+++ b/Framework/Algorithms/src/ExportTimeSeriesLog.cpp
@@ -17,7 +17,6 @@
 #include "MantidGeometry/Instrument.h"
 #include "MantidHistogramData/Histogram.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/UnitFactory.h"
 #include <algorithm>
diff --git a/Framework/Algorithms/src/FilterEvents.cpp b/Framework/Algorithms/src/FilterEvents.cpp
index f50a5d54f7f5..242a1beffc18 100644
--- a/Framework/Algorithms/src/FilterEvents.cpp
+++ b/Framework/Algorithms/src/FilterEvents.cpp
@@ -28,7 +28,6 @@
 #include "MantidKernel/PhysicalConstants.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 #include <MantidKernel/InvisibleProperty.h>
diff --git a/Framework/Algorithms/src/GenerateIPythonNotebook.cpp b/Framework/Algorithms/src/GenerateIPythonNotebook.cpp
index ca4eee3e2bbe..94c07763b10f 100644
--- a/Framework/Algorithms/src/GenerateIPythonNotebook.cpp
+++ b/Framework/Algorithms/src/GenerateIPythonNotebook.cpp
@@ -11,7 +11,6 @@
 #include "MantidAPI/NotebookBuilder.h"
 #include "MantidAPI/Workspace.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 
 #include <fstream>
 
diff --git a/Framework/Algorithms/src/GeneratePythonScript.cpp b/Framework/Algorithms/src/GeneratePythonScript.cpp
index 2c17c9c3a115..8fedabb11e50 100644
--- a/Framework/Algorithms/src/GeneratePythonScript.cpp
+++ b/Framework/Algorithms/src/GeneratePythonScript.cpp
@@ -12,7 +12,6 @@
 #include "MantidAPI/Workspace.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/MantidVersion.h"
-#include "MantidKernel/System.h"
 
 #include <fstream>
 
diff --git a/Framework/Algorithms/src/MaskBinsFromTable.cpp b/Framework/Algorithms/src/MaskBinsFromTable.cpp
index 879b85fd469c..496712028c40 100644
--- a/Framework/Algorithms/src/MaskBinsFromTable.cpp
+++ b/Framework/Algorithms/src/MaskBinsFromTable.cpp
@@ -11,7 +11,6 @@
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/RayTracerTester.cpp b/Framework/Algorithms/src/RayTracerTester.cpp
index 820752b0aa91..305b30238d40 100644
--- a/Framework/Algorithms/src/RayTracerTester.cpp
+++ b/Framework/Algorithms/src/RayTracerTester.cpp
@@ -9,7 +9,6 @@
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Objects/InstrumentRayTracer.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/V3D.h"
 
 #include <cmath>
diff --git a/Framework/Algorithms/src/ResetNegatives.cpp b/Framework/Algorithms/src/ResetNegatives.cpp
index eb4f5ae48dcc..fe9b9b29b36b 100644
--- a/Framework/Algorithms/src/ResetNegatives.cpp
+++ b/Framework/Algorithms/src/ResetNegatives.cpp
@@ -8,7 +8,6 @@
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/EnabledWhenProperty.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/ResizeRectangularDetector.cpp b/Framework/Algorithms/src/ResizeRectangularDetector.cpp
index e387d076b7f1..3a12137bc246 100644
--- a/Framework/Algorithms/src/ResizeRectangularDetector.cpp
+++ b/Framework/Algorithms/src/ResizeRectangularDetector.cpp
@@ -13,7 +13,6 @@
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/ComponentInfo.h"
 #include "MantidGeometry/Instrument/RectangularDetector.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/ShiftLogTime.cpp b/Framework/Algorithms/src/ShiftLogTime.cpp
index 21b16b893bab..bb0f2ecb3104 100644
--- a/Framework/Algorithms/src/ShiftLogTime.cpp
+++ b/Framework/Algorithms/src/ShiftLogTime.cpp
@@ -7,7 +7,6 @@
 #include "MantidAlgorithms/ShiftLogTime.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Run.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 
 #include <sstream>
diff --git a/Framework/Algorithms/src/SignalOverError.cpp b/Framework/Algorithms/src/SignalOverError.cpp
index b8319e63ef96..765409eacaf6 100644
--- a/Framework/Algorithms/src/SignalOverError.cpp
+++ b/Framework/Algorithms/src/SignalOverError.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAlgorithms/SignalOverError.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/SortXAxis.cpp b/Framework/Algorithms/src/SortXAxis.cpp
index b8c0826c500d..a955c2cbd8dd 100644
--- a/Framework/Algorithms/src/SortXAxis.cpp
+++ b/Framework/Algorithms/src/SortXAxis.cpp
@@ -10,7 +10,6 @@
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidHistogramData/Histogram.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid;
 using namespace Mantid::API;
diff --git a/Framework/Algorithms/src/WeightingStrategy.cpp b/Framework/Algorithms/src/WeightingStrategy.cpp
index 2b950f7f8d81..37cb25f8d3f7 100644
--- a/Framework/Algorithms/src/WeightingStrategy.cpp
+++ b/Framework/Algorithms/src/WeightingStrategy.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAlgorithms/WeightingStrategy.h"
-#include "MantidKernel/System.h"
 
 #include <cmath>
 #include <stdexcept>
diff --git a/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
index f4ce07c419a0..dd36c2380c85 100644
--- a/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFunction.cpp
@@ -11,7 +11,6 @@
 #include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
 #include "MantidHistogramData/HistogramX.h"
 #include "MantidHistogramData/HistogramY.h"
-#include "MantidKernel/System.h"
 
 #include <sstream>
 #include <utility>
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
index 76f6b53e2206..35b7dd133963 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -15,7 +15,6 @@
 
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/Logger.h"
-#include "MantidKernel/System.h"
 
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_version.h>
diff --git a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
index 18b288a67f30..d5c299a4e3e0 100644
--- a/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
+++ b/Framework/CurveFitting/src/Functions/BivariateNormal.cpp
@@ -4,17 +4,13 @@
 //   NScD Oak Ridge National Laboratory, European Spallation Source,
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
+#include "MantidCurveFitting/Functions/BivariateNormal.h"
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/ParameterTie.h"
-
 #include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
-#include "MantidCurveFitting/Functions/BivariateNormal.h"
-
 #include "MantidHistogramData/HistogramY.h"
-
 #include "MantidKernel/PhysicalConstants.h"
-#include "MantidKernel/System.h"
 
 #include <algorithm>
 #include <cmath>
diff --git a/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
index 3c995e59dd12..00c0dcf57efc 100644
--- a/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
+++ b/Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
@@ -11,7 +11,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidCurveFitting/Functions/Bk2BkExpConvPV.h"
 #include "MantidCurveFitting/SpecialFunctionSupport.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/UnitFactory.h"
 
 #include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/Functions/FlatBackground.cpp b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
index b77af7681455..fca440633738 100644
--- a/Framework/CurveFitting/src/Functions/FlatBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/FlatBackground.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidCurveFitting/Functions/FlatBackground.h"
 #include "MantidAPI/FunctionFactory.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 
diff --git a/Framework/CurveFitting/src/Functions/ProcessBackground.cpp b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
index 8832e359b921..82a3d7cf0785 100644
--- a/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
+++ b/Framework/CurveFitting/src/Functions/ProcessBackground.cpp
@@ -16,7 +16,6 @@
 #include "MantidGeometry/Crystal/IPeak.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/Property.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 
 #include <algorithm>
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
index bcb1ff681f0e..c7baa7c3b14e 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpAlpha.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h"
 #include "MantidAPI/FunctionFactory.h"
-#include "MantidKernel/System.h"
 
 #include <cmath>
 #include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
index f1a159c850c3..3eba3132c91b 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpBeta.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h"
 #include "MantidAPI/FunctionFactory.h"
-#include "MantidKernel/System.h"
 
 #include <cmath>
 #include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
index ea099660bc80..f7ef43da17bf 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronBk2BkExpSigma.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h"
 #include "MantidAPI/FunctionFactory.h"
-#include "MantidKernel/System.h"
 
 #include <cmath>
 #include <gsl/gsl_sf_erf.h>
diff --git a/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
index 52e94930e4be..abf27713fadc 100644
--- a/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
+++ b/Framework/CurveFitting/src/Functions/ThermalNeutronDtoTOFFunction.cpp
@@ -7,7 +7,6 @@
 #include "MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h"
 #include "MantidAPI/FunctionDomain1D.h"
 #include "MantidAPI/FunctionFactory.h"
-#include "MantidKernel/System.h"
 #include <cmath>
 #include <gsl/gsl_sf_erf.h>
 
diff --git a/Framework/DataHandling/src/LoadCalFile.cpp b/Framework/DataHandling/src/LoadCalFile.cpp
index db762a52b474..e6eafb246db6 100644
--- a/Framework/DataHandling/src/LoadCalFile.cpp
+++ b/Framework/DataHandling/src/LoadCalFile.cpp
@@ -16,7 +16,6 @@
 #include "MantidDataObjects/OffsetsWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/OptionalBool.h"
-#include "MantidKernel/System.h"
 #include <Poco/Path.h>
 #include <fstream>
 
diff --git a/Framework/DataHandling/src/LoadDNSEvent.cpp b/Framework/DataHandling/src/LoadDNSEvent.cpp
index 43877aaefdb0..8f34a922fefc 100644
--- a/Framework/DataHandling/src/LoadDNSEvent.cpp
+++ b/Framework/DataHandling/src/LoadDNSEvent.cpp
@@ -20,7 +20,6 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include <stdexcept>
 #include <vector>
 
diff --git a/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp b/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp
index b7122ad55900..4d5848cfb0fd 100644
--- a/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp
+++ b/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp
@@ -18,7 +18,6 @@
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Element.h>
diff --git a/Framework/DataHandling/src/LoadEventPreNexus2.cpp b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
index ab69cac3b5d6..f5416fb2900f 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus2.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
@@ -28,7 +28,6 @@
 #include "MantidKernel/InstrumentInfo.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/OptionalBool.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/VisibleWhenProperty.h"
diff --git a/Framework/DataHandling/src/LoadMask.cpp b/Framework/DataHandling/src/LoadMask.cpp
index 6bee234a9e9a..e11de2d33121 100644
--- a/Framework/DataHandling/src/LoadMask.cpp
+++ b/Framework/DataHandling/src/LoadMask.cpp
@@ -18,7 +18,6 @@
 #include "MantidKernel/MandatoryValidator.h"
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 #include <fstream>
 #include <map>
diff --git a/Framework/DataHandling/src/LoadPreNexus.cpp b/Framework/DataHandling/src/LoadPreNexus.cpp
index 76ff45140f19..69a3c5336ada 100644
--- a/Framework/DataHandling/src/LoadPreNexus.cpp
+++ b/Framework/DataHandling/src/LoadPreNexus.cpp
@@ -14,7 +14,6 @@
 #include "MantidDataHandling/LoadTOFRawNexus.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 #include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/DOMParser.h>
diff --git a/Framework/DataHandling/src/ModifyDetectorDotDatFile.cpp b/Framework/DataHandling/src/ModifyDetectorDotDatFile.cpp
index 1a0946a203ad..7337de7d0dd8 100644
--- a/Framework/DataHandling/src/ModifyDetectorDotDatFile.cpp
+++ b/Framework/DataHandling/src/ModifyDetectorDotDatFile.cpp
@@ -12,7 +12,6 @@
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/DetectorInfo.h"
 #include "MantidGeometry/Instrument/RectangularDetector.h"
-#include "MantidKernel/System.h"
 #include <fstream>
 
 using namespace Mantid::Kernel;
diff --git a/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp b/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp
index ad4cbaec0bf1..ee31fd371118 100644
--- a/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp
+++ b/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp
@@ -11,7 +11,6 @@
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/OptionalBool.h"
-#include "MantidKernel/System.h"
 
 // clang-format off
 #include <nexus/NeXusFile.hpp>
diff --git a/Framework/DataHandling/src/SaveCalFile.cpp b/Framework/DataHandling/src/SaveCalFile.cpp
index fa665f79fd1c..6a15102cbeb5 100644
--- a/Framework/DataHandling/src/SaveCalFile.cpp
+++ b/Framework/DataHandling/src/SaveCalFile.cpp
@@ -7,7 +7,6 @@
 #include "MantidDataHandling/SaveCalFile.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/BoundedValidator.h"
-#include "MantidKernel/System.h"
 #include <cmath>
 #include <fstream>
 
diff --git a/Framework/DataHandling/src/SaveDaveGrp.cpp b/Framework/DataHandling/src/SaveDaveGrp.cpp
index 2e8fd8962a64..df6229bb94a8 100644
--- a/Framework/DataHandling/src/SaveDaveGrp.cpp
+++ b/Framework/DataHandling/src/SaveDaveGrp.cpp
@@ -8,7 +8,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Unit.h"
 #include "MantidKernel/UnitFactory.h"
 #include <fstream>
diff --git a/Framework/DataHandling/src/SaveDetectorsGrouping.cpp b/Framework/DataHandling/src/SaveDetectorsGrouping.cpp
index c935caf3db69..0b05a8d82791 100644
--- a/Framework/DataHandling/src/SaveDetectorsGrouping.cpp
+++ b/Framework/DataHandling/src/SaveDetectorsGrouping.cpp
@@ -9,7 +9,6 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/ISpectrum.h"
 #include "MantidAPI/Run.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/DOMWriter.h>
diff --git a/Framework/DataHandling/src/SaveDspacemap.cpp b/Framework/DataHandling/src/SaveDspacemap.cpp
index 5e994a07a13d..4a8f1f048557 100644
--- a/Framework/DataHandling/src/SaveDspacemap.cpp
+++ b/Framework/DataHandling/src/SaveDspacemap.cpp
@@ -8,7 +8,6 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidDataObjects/OffsetsWorkspace.h"
 #include "MantidGeometry/Instrument/DetectorInfo.h"
-#include "MantidKernel/System.h"
 #include <fstream>
 
 namespace Mantid::DataHandling {
diff --git a/Framework/DataHandling/src/SaveIsawDetCal.cpp b/Framework/DataHandling/src/SaveIsawDetCal.cpp
index 42505bcf3bd0..4c50941a61cf 100644
--- a/Framework/DataHandling/src/SaveIsawDetCal.cpp
+++ b/Framework/DataHandling/src/SaveIsawDetCal.cpp
@@ -14,7 +14,6 @@
 #include "MantidGeometry/Instrument/RectangularDetector.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/File.h>
 #include <boost/algorithm/string/trim.hpp>
diff --git a/Framework/DataHandling/src/SaveMask.cpp b/Framework/DataHandling/src/SaveMask.cpp
index 95d52768adae..ecfbff440dca 100644
--- a/Framework/DataHandling/src/SaveMask.cpp
+++ b/Framework/DataHandling/src/SaveMask.cpp
@@ -9,7 +9,6 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/ISpectrum.h"
 #include "MantidDataObjects/SpecialWorkspace2D.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/DOMWriter.h>
diff --git a/Framework/DataObjects/src/CoordTransformAffine.cpp b/Framework/DataObjects/src/CoordTransformAffine.cpp
index 6fdadfb82f37..aab8bbe1e4d1 100644
--- a/Framework/DataObjects/src/CoordTransformAffine.cpp
+++ b/Framework/DataObjects/src/CoordTransformAffine.cpp
@@ -10,7 +10,6 @@
 #include "MantidGeometry/MDGeometry/MDTypes.h"
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VectorHelper.h"
 
 #include <boost/algorithm/string.hpp>
diff --git a/Framework/DataObjects/src/CoordTransformDistance.cpp b/Framework/DataObjects/src/CoordTransformDistance.cpp
index ee9d21252b21..b2850629e8fa 100644
--- a/Framework/DataObjects/src/CoordTransformDistance.cpp
+++ b/Framework/DataObjects/src/CoordTransformDistance.cpp
@@ -7,7 +7,6 @@
 #include "MantidDataObjects/CoordTransformDistance.h"
 #include "MantidAPI/CoordTransform.h"
 #include "MantidKernel/Exception.h"
-#include "MantidKernel/System.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
diff --git a/Framework/DataObjects/src/EventWorkspaceMRU.cpp b/Framework/DataObjects/src/EventWorkspaceMRU.cpp
index 055b53dc64f6..3cc2cc20b019 100644
--- a/Framework/DataObjects/src/EventWorkspaceMRU.cpp
+++ b/Framework/DataObjects/src/EventWorkspaceMRU.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidDataObjects/EventWorkspaceMRU.h"
-#include "MantidKernel/System.h"
 
 #include <algorithm>
 
diff --git a/Framework/DataObjects/src/GroupingWorkspace.cpp b/Framework/DataObjects/src/GroupingWorkspace.cpp
index 54eab03b20bc..e7114d80577f 100644
--- a/Framework/DataObjects/src/GroupingWorkspace.cpp
+++ b/Framework/DataObjects/src/GroupingWorkspace.cpp
@@ -10,7 +10,6 @@
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/GroupingWorkspace.h"
 #include "MantidKernel/IPropertyManager.h"
-#include "MantidKernel/System.h"
 
 using std::size_t;
 using namespace Mantid::API;
diff --git a/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp b/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
index 73cf2e5c6f52..ac27e39e6ce9 100644
--- a/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
+++ b/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidDataObjects/MDHistoWorkspaceIterator.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Utils.h"
 #include "MantidKernel/VMD.h"
 #include <algorithm>
diff --git a/Framework/DataObjects/src/MDLeanEvent.cpp b/Framework/DataObjects/src/MDLeanEvent.cpp
index 10d813e6c4b3..701e8b6a6ff5 100644
--- a/Framework/DataObjects/src/MDLeanEvent.cpp
+++ b/Framework/DataObjects/src/MDLeanEvent.cpp
@@ -5,4 +5,3 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidDataObjects/MDLeanEvent.h"
-#include "MantidKernel/System.h"
diff --git a/Framework/DataObjects/src/MaskWorkspace.cpp b/Framework/DataObjects/src/MaskWorkspace.cpp
index 0b881e6bac5d..0700a23d4829 100644
--- a/Framework/DataObjects/src/MaskWorkspace.cpp
+++ b/Framework/DataObjects/src/MaskWorkspace.cpp
@@ -10,7 +10,6 @@
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/MaskWorkspace.h"
 #include "MantidKernel/IPropertyManager.h"
-#include "MantidKernel/System.h"
 
 #include <algorithm>
 
diff --git a/Framework/DataObjects/src/OffsetsWorkspace.cpp b/Framework/DataObjects/src/OffsetsWorkspace.cpp
index f12be621a9ce..3f2b094a41e3 100644
--- a/Framework/DataObjects/src/OffsetsWorkspace.cpp
+++ b/Framework/DataObjects/src/OffsetsWorkspace.cpp
@@ -10,7 +10,6 @@
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/OffsetsWorkspace.h"
 #include "MantidKernel/IPropertyManager.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::DataObjects {
 // Register the workspace
diff --git a/Framework/DataObjects/src/PeakColumn.cpp b/Framework/DataObjects/src/PeakColumn.cpp
index 59d39e373c2e..05b39c25144d 100644
--- a/Framework/DataObjects/src/PeakColumn.cpp
+++ b/Framework/DataObjects/src/PeakColumn.cpp
@@ -9,7 +9,6 @@
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/MultiThreaded.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 #include <boost/variant/get.hpp>
 
diff --git a/Framework/Geometry/src/Crystal/PointGroup.cpp b/Framework/Geometry/src/Crystal/PointGroup.cpp
index 4374abfeeb7b..f8c8587f0759 100644
--- a/Framework/Geometry/src/Crystal/PointGroup.cpp
+++ b/Framework/Geometry/src/Crystal/PointGroup.cpp
@@ -9,7 +9,6 @@
 #include "MantidGeometry/Crystal/SymmetryElementFactory.h"
 #include "MantidGeometry/Crystal/SymmetryOperationFactory.h"
 #include "MantidKernel/Logger.h"
-#include "MantidKernel/System.h"
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
diff --git a/Framework/Geometry/src/Instrument/GridDetectorPixel.cpp b/Framework/Geometry/src/Instrument/GridDetectorPixel.cpp
index 757c03192c01..9ce42236f5a8 100644
--- a/Framework/Geometry/src/Instrument/GridDetectorPixel.cpp
+++ b/Framework/Geometry/src/Instrument/GridDetectorPixel.cpp
@@ -8,7 +8,6 @@
 
 #include "MantidGeometry/Instrument/GridDetector.h"
 #include "MantidGeometry/Instrument/GridDetectorPixel.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/V3D.h"
 
 using namespace Mantid::Kernel;
diff --git a/Framework/Geometry/src/MDGeometry/MDBoxImplicitFunction.cpp b/Framework/Geometry/src/MDGeometry/MDBoxImplicitFunction.cpp
index e0e7e26b5b4f..74a4c90f4d9b 100644
--- a/Framework/Geometry/src/MDGeometry/MDBoxImplicitFunction.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDBoxImplicitFunction.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidGeometry/MDGeometry/MDBoxImplicitFunction.h"
 #include "MantidGeometry/MDGeometry/MDPlane.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VMD.h"
 
 #include <algorithm>
diff --git a/Framework/Geometry/src/MDGeometry/MDImplicitFunction.cpp b/Framework/Geometry/src/MDGeometry/MDImplicitFunction.cpp
index a0b1e120756d..341e63971a8f 100644
--- a/Framework/Geometry/src/MDGeometry/MDImplicitFunction.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDImplicitFunction.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::Geometry {
 
diff --git a/Framework/Geometry/src/MDGeometry/MDPlane.cpp b/Framework/Geometry/src/MDGeometry/MDPlane.cpp
index fbfa63fbfcab..2c664f16cb4d 100644
--- a/Framework/Geometry/src/MDGeometry/MDPlane.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDPlane.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidGeometry/MDGeometry/MDPlane.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VMD.h"
 #include <gsl/gsl_linalg.h>
 #include <stdexcept>
diff --git a/Framework/Kernel/src/ConfigObserver.cpp b/Framework/Kernel/src/ConfigObserver.cpp
index 2ed8ea434bef..a5f3cf919b69 100644
--- a/Framework/Kernel/src/ConfigObserver.cpp
+++ b/Framework/Kernel/src/ConfigObserver.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidKernel/ConfigObserver.h"
 #include "MantidKernel/ConfigService.h"
-#include "MantidKernel/System.h"
 
 namespace Mantid::Kernel {
 /**
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 05d9df39d3ab..27f2f331db05 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -19,7 +19,6 @@
 #include "MantidKernel/StdoutChannel.h"
 #include "MantidKernel/StringTokenizer.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 #include <Poco/AutoPtr.h>
 #include <Poco/Channel.h>
diff --git a/Framework/Kernel/src/DateTimeValidator.cpp b/Framework/Kernel/src/DateTimeValidator.cpp
index 26218531669d..f43b29e73a84 100644
--- a/Framework/Kernel/src/DateTimeValidator.cpp
+++ b/Framework/Kernel/src/DateTimeValidator.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidKernel/DateTimeValidator.h"
 #include "MantidKernel/DateAndTimeHelpers.h"
-#include "MantidKernel/System.h"
 
 #include <memory>
 #include <stdexcept>
diff --git a/Framework/Kernel/src/FloatingPointComparison.cpp b/Framework/Kernel/src/FloatingPointComparison.cpp
index 18e21ee0a5c8..e356a2f9d986 100644
--- a/Framework/Kernel/src/FloatingPointComparison.cpp
+++ b/Framework/Kernel/src/FloatingPointComparison.cpp
@@ -8,7 +8,6 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include "MantidKernel/FloatingPointComparison.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/V3D.h"
 
 #include <cmath>
diff --git a/Framework/Kernel/src/Memory.cpp b/Framework/Kernel/src/Memory.cpp
index fff4dfdb0599..f545d13116f6 100644
--- a/Framework/Kernel/src/Memory.cpp
+++ b/Framework/Kernel/src/Memory.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidKernel/Memory.h"
 #include "MantidKernel/Logger.h"
-#include "MantidKernel/System.h"
 
 #include <cstdio>
 #include <sstream>
diff --git a/Framework/LiveData/src/ISIS/DAE/idc.cpp b/Framework/LiveData/src/ISIS/DAE/idc.cpp
index 9c9692fa94bb..47435b69a454 100644
--- a/Framework/LiveData/src/ISIS/DAE/idc.cpp
+++ b/Framework/LiveData/src/ISIS/DAE/idc.cpp
@@ -15,7 +15,6 @@
 */
 
 #include "idc.h"
-#include "MantidKernel/System.h"
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
diff --git a/Framework/LiveData/src/ISIS/DAE/isisds_command.cpp b/Framework/LiveData/src/ISIS/DAE/isisds_command.cpp
index 56eba42ebfb5..d24c678061f5 100644
--- a/Framework/LiveData/src/ISIS/DAE/isisds_command.cpp
+++ b/Framework/LiveData/src/ISIS/DAE/isisds_command.cpp
@@ -31,7 +31,6 @@
 
 #include "isisds_command.h"
 #include "MantidKernel/ConfigService.h"
-#include "MantidKernel/System.h"
 #include <cstdio>
 
 /*
diff --git a/Framework/MDAlgorithms/src/BinMD.cpp b/Framework/MDAlgorithms/src/BinMD.cpp
index 1cbaeda8b15c..9bbeaa42782d 100644
--- a/Framework/MDAlgorithms/src/BinMD.cpp
+++ b/Framework/MDAlgorithms/src/BinMD.cpp
@@ -19,7 +19,6 @@
 #include "MantidKernel/CPUTimer.h"
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Utils.h"
 #include <boost/algorithm/string.hpp>
 
diff --git a/Framework/MDAlgorithms/src/BinaryOperationMD.cpp b/Framework/MDAlgorithms/src/BinaryOperationMD.cpp
index f0448cb4e6ca..8178b40903e3 100644
--- a/Framework/MDAlgorithms/src/BinaryOperationMD.cpp
+++ b/Framework/MDAlgorithms/src/BinaryOperationMD.cpp
@@ -14,7 +14,6 @@
 #include "MantidDataObjects/MDHistoWorkspace.h"
 #include "MantidDataObjects/WorkspaceSingleValue.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp b/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp
index f7785ff17507..95d758722fbe 100644
--- a/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp
+++ b/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/BooleanBinaryOperationMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/CentroidPeaksMD.cpp b/Framework/MDAlgorithms/src/CentroidPeaksMD.cpp
index 48438758e362..06c6fabb228f 100644
--- a/Framework/MDAlgorithms/src/CentroidPeaksMD.cpp
+++ b/Framework/MDAlgorithms/src/CentroidPeaksMD.cpp
@@ -10,7 +10,6 @@
 #include "MantidDataObjects/MDEventFactory.h"
 #include "MantidDataObjects/PeaksWorkspace.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 #include "MantidMDAlgorithms/IntegratePeaksMD.h"
 
 using Mantid::DataObjects::PeaksWorkspace;
diff --git a/Framework/MDAlgorithms/src/CentroidPeaksMD2.cpp b/Framework/MDAlgorithms/src/CentroidPeaksMD2.cpp
index 5418e9ea19c8..b594278b0dae 100644
--- a/Framework/MDAlgorithms/src/CentroidPeaksMD2.cpp
+++ b/Framework/MDAlgorithms/src/CentroidPeaksMD2.cpp
@@ -12,7 +12,6 @@
 #include "MantidDataObjects/MDEventFactory.h"
 #include "MantidDataObjects/PeaksWorkspace.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 #include "MantidMDAlgorithms/IntegratePeaksMD.h"
 
 namespace Mantid::MDAlgorithms {
diff --git a/Framework/MDAlgorithms/src/ChangeQConvention.cpp b/Framework/MDAlgorithms/src/ChangeQConvention.cpp
index a49b3e74cb52..7c51fc253943 100644
--- a/Framework/MDAlgorithms/src/ChangeQConvention.cpp
+++ b/Framework/MDAlgorithms/src/ChangeQConvention.cpp
@@ -19,7 +19,6 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 #include <Poco/File.h>
 
 using namespace Mantid::Kernel;
diff --git a/Framework/MDAlgorithms/src/CloneMDWorkspace.cpp b/Framework/MDAlgorithms/src/CloneMDWorkspace.cpp
index 26fcddd46f64..438c38d01ddf 100644
--- a/Framework/MDAlgorithms/src/CloneMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/CloneMDWorkspace.cpp
@@ -9,7 +9,6 @@
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidDataObjects/MDEventFactory.h"
 #include "MantidDataObjects/MDHistoWorkspace.h"
-#include "MantidKernel/System.h"
 #include <Poco/File.h>
 #include <Poco/Path.h>
 
diff --git a/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp b/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
index 11ed2d6679c7..b26fa93bf4e1 100644
--- a/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
+++ b/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
@@ -11,7 +11,6 @@
 #include "MantidDataObjects/MDHistoWorkspace.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include <sstream>
 #include <utility>
 
diff --git a/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp b/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp
index a40ef0fed76c..c54ab49fb7c0 100644
--- a/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp
@@ -14,7 +14,6 @@
 #include "MantidKernel/ArrayLengthValidator.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Unit.h"
 
 using namespace Mantid::Kernel;
diff --git a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
index cd72e98ab107..f430cd8690c8 100644
--- a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
@@ -27,7 +27,6 @@
 #include "MantidKernel/FunctionTask.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/PhysicalConstants.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
 #include "MantidKernel/Unit.h"
 #include "MantidKernel/UnitLabelTypes.h"
diff --git a/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp b/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
index 9be4dc9ff2d1..59699d2be808 100644
--- a/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
@@ -20,7 +20,6 @@
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/MandatoryValidator.h"
 #include "MantidKernel/Memory.h"
-#include "MantidKernel/System.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 #include <cmath>
diff --git a/Framework/MDAlgorithms/src/CutMD.cpp b/Framework/MDAlgorithms/src/CutMD.cpp
index cb869ed69e76..41fc8cbeaecf 100644
--- a/Framework/MDAlgorithms/src/CutMD.cpp
+++ b/Framework/MDAlgorithms/src/CutMD.cpp
@@ -16,7 +16,6 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidKernel/System.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
diff --git a/Framework/MDAlgorithms/src/DivideMD.cpp b/Framework/MDAlgorithms/src/DivideMD.cpp
index de49fbcccac1..7ced7f68d6c2 100644
--- a/Framework/MDAlgorithms/src/DivideMD.cpp
+++ b/Framework/MDAlgorithms/src/DivideMD.cpp
@@ -9,7 +9,6 @@
 #include "MantidDataObjects/MDBoxBase.h"
 #include "MantidDataObjects/MDEventFactory.h"
 #include "MantidDataObjects/MDEventWorkspace.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/EqualToMD.cpp b/Framework/MDAlgorithms/src/EqualToMD.cpp
index 57a562cda065..2bf0d41b2ed3 100644
--- a/Framework/MDAlgorithms/src/EqualToMD.cpp
+++ b/Framework/MDAlgorithms/src/EqualToMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/EqualToMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/ExponentialMD.cpp b/Framework/MDAlgorithms/src/ExponentialMD.cpp
index 35bc019aae17..1613708f048b 100644
--- a/Framework/MDAlgorithms/src/ExponentialMD.cpp
+++ b/Framework/MDAlgorithms/src/ExponentialMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/ExponentialMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/GreaterThanMD.cpp b/Framework/MDAlgorithms/src/GreaterThanMD.cpp
index a1d274bb7d60..726ec842794b 100644
--- a/Framework/MDAlgorithms/src/GreaterThanMD.cpp
+++ b/Framework/MDAlgorithms/src/GreaterThanMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/GreaterThanMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/IntegratePeaksMD.cpp b/Framework/MDAlgorithms/src/IntegratePeaksMD.cpp
index 8ce46afbd36c..d6d08de17a2a 100644
--- a/Framework/MDAlgorithms/src/IntegratePeaksMD.cpp
+++ b/Framework/MDAlgorithms/src/IntegratePeaksMD.cpp
@@ -24,7 +24,6 @@
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidHistogramData/LinearGenerator.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Utils.h"
 #include "MantidMDAlgorithms/GSLFunctions.h"
 
diff --git a/Framework/MDAlgorithms/src/IntegratePeaksMD2.cpp b/Framework/MDAlgorithms/src/IntegratePeaksMD2.cpp
index 8f58311809eb..b18f38029dee 100644
--- a/Framework/MDAlgorithms/src/IntegratePeaksMD2.cpp
+++ b/Framework/MDAlgorithms/src/IntegratePeaksMD2.cpp
@@ -34,7 +34,6 @@
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/SetValueWhenProperty.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/Utils.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 #include "MantidMDAlgorithms/GSLFunctions.h"
diff --git a/Framework/MDAlgorithms/src/LessThanMD.cpp b/Framework/MDAlgorithms/src/LessThanMD.cpp
index f8cc1885c0e7..c6cd400bfe29 100644
--- a/Framework/MDAlgorithms/src/LessThanMD.cpp
+++ b/Framework/MDAlgorithms/src/LessThanMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/LessThanMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/LogarithmMD.cpp b/Framework/MDAlgorithms/src/LogarithmMD.cpp
index 107d37d1ce3d..bb57f587850a 100644
--- a/Framework/MDAlgorithms/src/LogarithmMD.cpp
+++ b/Framework/MDAlgorithms/src/LogarithmMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/LogarithmMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/MinusMD.cpp b/Framework/MDAlgorithms/src/MinusMD.cpp
index cfa25570844b..d60c326fdf8c 100644
--- a/Framework/MDAlgorithms/src/MinusMD.cpp
+++ b/Framework/MDAlgorithms/src/MinusMD.cpp
@@ -9,7 +9,6 @@
 #include "MantidDataObjects/MDBoxIterator.h"
 #include "MantidDataObjects/MDEventFactory.h"
 #include "MantidDataObjects/MDEventWorkspace.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/MultiplyMD.cpp b/Framework/MDAlgorithms/src/MultiplyMD.cpp
index 8d184db9ad79..ff91d19553cb 100644
--- a/Framework/MDAlgorithms/src/MultiplyMD.cpp
+++ b/Framework/MDAlgorithms/src/MultiplyMD.cpp
@@ -9,7 +9,6 @@
 #include "MantidDataObjects/MDBoxBase.h"
 #include "MantidDataObjects/MDEventFactory.h"
 #include "MantidDataObjects/MDEventWorkspace.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/NotMD.cpp b/Framework/MDAlgorithms/src/NotMD.cpp
index bb5b4e138aef..dcf7050b1fcd 100644
--- a/Framework/MDAlgorithms/src/NotMD.cpp
+++ b/Framework/MDAlgorithms/src/NotMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/NotMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/OrMD.cpp b/Framework/MDAlgorithms/src/OrMD.cpp
index 2bf47e09bfbe..812ca5d57b7d 100644
--- a/Framework/MDAlgorithms/src/OrMD.cpp
+++ b/Framework/MDAlgorithms/src/OrMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/OrMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/PlusMD.cpp b/Framework/MDAlgorithms/src/PlusMD.cpp
index e53def9eff49..1b60d13ede5b 100644
--- a/Framework/MDAlgorithms/src/PlusMD.cpp
+++ b/Framework/MDAlgorithms/src/PlusMD.cpp
@@ -9,7 +9,6 @@
 #include "MantidDataObjects/MDBoxBase.h"
 #include "MantidDataObjects/MDBoxIterator.h"
 #include "MantidDataObjects/MDEventFactory.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/ThreadPool.h"
 #include "MantidKernel/ThreadScheduler.h"
 
diff --git a/Framework/MDAlgorithms/src/PowerMD.cpp b/Framework/MDAlgorithms/src/PowerMD.cpp
index 8f6095f5dc70..dd8542094dbc 100644
--- a/Framework/MDAlgorithms/src/PowerMD.cpp
+++ b/Framework/MDAlgorithms/src/PowerMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/PowerMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/SaveMD.cpp b/Framework/MDAlgorithms/src/SaveMD.cpp
index 4eb35a6c3856..5fb8de2b7bf0 100644
--- a/Framework/MDAlgorithms/src/SaveMD.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -20,7 +20,6 @@
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include <Poco/File.h>
 
 using file_holder_type = std::unique_ptr<::NeXus::File>;
diff --git a/Framework/MDAlgorithms/src/SaveMD2.cpp b/Framework/MDAlgorithms/src/SaveMD2.cpp
index 673c407cca19..9754edc80964 100644
--- a/Framework/MDAlgorithms/src/SaveMD2.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD2.cpp
@@ -21,7 +21,6 @@
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidKernel/Matrix.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include <Poco/File.h>
 
 using file_holder_type = std::unique_ptr<::NeXus::File>;
diff --git a/Framework/MDAlgorithms/src/SaveZODS.cpp b/Framework/MDAlgorithms/src/SaveZODS.cpp
index 3b76e10815e2..030121407396 100644
--- a/Framework/MDAlgorithms/src/SaveZODS.cpp
+++ b/Framework/MDAlgorithms/src/SaveZODS.cpp
@@ -11,7 +11,6 @@
 #include "MantidDataObjects/MDHistoWorkspace.h"
 #include "MantidGeometry/Crystal/OrientedLattice.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/SetMDUsingMask.cpp b/Framework/MDAlgorithms/src/SetMDUsingMask.cpp
index cbe44a763a86..2eb19fb693d3 100644
--- a/Framework/MDAlgorithms/src/SetMDUsingMask.cpp
+++ b/Framework/MDAlgorithms/src/SetMDUsingMask.cpp
@@ -8,7 +8,6 @@
 #include "MantidAPI/IMDHistoWorkspace.h"
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidDataObjects/MDHistoWorkspace.h"
-#include "MantidKernel/System.h"
 #include <cfloat>
 
 using namespace Mantid::Kernel;
diff --git a/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp b/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp
index f9de254fc45d..be683c68c04a 100644
--- a/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp
+++ b/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp
@@ -15,7 +15,6 @@
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 
 #include <boost/regex.hpp>
diff --git a/Framework/MDAlgorithms/src/TransformMD.cpp b/Framework/MDAlgorithms/src/TransformMD.cpp
index 41bf5ed53bb8..a8d2575a718e 100644
--- a/Framework/MDAlgorithms/src/TransformMD.cpp
+++ b/Framework/MDAlgorithms/src/TransformMD.cpp
@@ -12,7 +12,6 @@
 #include "MantidDataObjects/MDHistoWorkspace.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/UnaryOperationMD.cpp b/Framework/MDAlgorithms/src/UnaryOperationMD.cpp
index 3f5e4a38448c..92db07d9b993 100644
--- a/Framework/MDAlgorithms/src/UnaryOperationMD.cpp
+++ b/Framework/MDAlgorithms/src/UnaryOperationMD.cpp
@@ -10,7 +10,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidDataObjects/MDHistoWorkspace.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/WeightedMeanMD.cpp b/Framework/MDAlgorithms/src/WeightedMeanMD.cpp
index 5657ab3e5640..1669ddb63b97 100644
--- a/Framework/MDAlgorithms/src/WeightedMeanMD.cpp
+++ b/Framework/MDAlgorithms/src/WeightedMeanMD.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/WeightedMeanMD.h"
 #include "MantidDataObjects/MDHistoWorkspaceIterator.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/MDAlgorithms/src/XorMD.cpp b/Framework/MDAlgorithms/src/XorMD.cpp
index 49336bfaf381..f554b29f5ded 100644
--- a/Framework/MDAlgorithms/src/XorMD.cpp
+++ b/Framework/MDAlgorithms/src/XorMD.cpp
@@ -5,7 +5,6 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidMDAlgorithms/XorMD.h"
-#include "MantidKernel/System.h"
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Framework/Muon/src/ApplyDeadTimeCorr.cpp b/Framework/Muon/src/ApplyDeadTimeCorr.cpp
index 87eae47e7886..a3946e87a5bb 100644
--- a/Framework/Muon/src/ApplyDeadTimeCorr.cpp
+++ b/Framework/Muon/src/ApplyDeadTimeCorr.cpp
@@ -11,7 +11,6 @@
 #include "MantidAPI/Run.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidKernel/PropertyWithValue.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 
 #include "boost/lexical_cast.hpp"
diff --git a/Framework/Muon/src/MuonGroupingCounts.cpp b/Framework/Muon/src/MuonGroupingCounts.cpp
index 2a8c51255af0..13c402926b65 100644
--- a/Framework/Muon/src/MuonGroupingCounts.cpp
+++ b/Framework/Muon/src/MuonGroupingCounts.cpp
@@ -13,7 +13,6 @@
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidHistogramData/HistogramMath.h"
 #include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/System.h"
 #include "MantidMuon/MuonAlgorithmHelper.h"
 #include <boost/format.hpp>
 
diff --git a/Framework/Muon/src/MuonPreProcess.cpp b/Framework/Muon/src/MuonPreProcess.cpp
index 04810b2dc86c..1b4ce746c134 100644
--- a/Framework/Muon/src/MuonPreProcess.cpp
+++ b/Framework/Muon/src/MuonPreProcess.cpp
@@ -20,7 +20,6 @@
 #include "MantidKernel/CompositeValidator.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/MandatoryValidator.h"
-#include "MantidKernel/System.h"
 
 #include "MantidMuon/MuonAlgorithmHelper.h"
 
diff --git a/Framework/Nexus/src/H5Util.cpp b/Framework/Nexus/src/H5Util.cpp
index 220d50d983c8..1af177c6a42d 100644
--- a/Framework/Nexus/src/H5Util.cpp
+++ b/Framework/Nexus/src/H5Util.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidNexus/H5Util.h"
 #include "MantidAPI/LogManager.h"
-#include "MantidKernel/System.h"
 
 #include <H5Cpp.h>
 #include <algorithm>
diff --git a/Framework/Nexus/src/MuonNexusReader.cpp b/Framework/Nexus/src/MuonNexusReader.cpp
index c2e7051b5417..d0a79047a17e 100644
--- a/Framework/Nexus/src/MuonNexusReader.cpp
+++ b/Framework/Nexus/src/MuonNexusReader.cpp
@@ -6,7 +6,6 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidNexus/MuonNexusReader.h"
 #include "MantidKernel/Logger.h"
-#include "MantidKernel/System.h"
 #include <boost/scoped_array.hpp>
 #include <nexus/NeXusException.hpp>
 #include <sstream>
diff --git a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
index 7be8563d6265..1c638a621b06 100644
--- a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+++ b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -27,7 +27,6 @@
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/PropertyManagerDataService.h"
-#include "MantidKernel/System.h"
 
 using Mantid::Geometry::Instrument_const_sptr;
 using namespace Mantid::Kernel;
diff --git a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
index 9e90639ef35f..6c5a414a4ae4 100644
--- a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
@@ -18,7 +18,6 @@
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/PropertyManagerDataService.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 #include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
 #include "Poco/Path.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsReduction.cpp b/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
index ee8aa9f100ca..63a9d995f499 100644
--- a/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
@@ -19,7 +19,6 @@
 #include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/RebinParamsValidator.h"
-#include "MantidKernel/System.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 
 #include <boost/algorithm/string/erase.hpp>