diff --git a/Framework/API/src/IFunction1D.cpp b/Framework/API/src/IFunction1D.cpp
index e663e2b529cc58a0ae2188dad2ff5db203637f53..0045b8043e08dba373c809be1b2daadb1a33f9a7 100644
--- a/Framework/API/src/IFunction1D.cpp
+++ b/Framework/API/src/IFunction1D.cpp
@@ -13,7 +13,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/ParameterTie.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidGeometry/Instrument/DetectorGroup.h"
 #include "MantidGeometry/Instrument/FitParameter.h"
diff --git a/Framework/API/test/CompositeFunctionTest.h b/Framework/API/test/CompositeFunctionTest.h
index f24ce97ab62b32130757dd3d35466c7970790b8e..a854e34d5fc7e0dcee777590f83697922d65ae41 100644
--- a/Framework/API/test/CompositeFunctionTest.h
+++ b/Framework/API/test/CompositeFunctionTest.h
@@ -10,7 +10,6 @@
 #include "MantidAPI/IPeakFunction.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/ParamFunction.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidTestHelpers/FakeObjects.h"
 
 using namespace Mantid;
diff --git a/Framework/API/test/DetectorInfoTest.h b/Framework/API/test/DetectorInfoTest.h
index 0627189da66d900faeee03e96824e1b9a1651f7e..93338ddbbeda37df416d32544b3e2c0d05425d4d 100644
--- a/Framework/API/test/DetectorInfoTest.h
+++ b/Framework/API/test/DetectorInfoTest.h
@@ -3,7 +3,6 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidGeometry/Instrument/ComponentInfo.h"
 #include "MantidGeometry/Instrument/DetectorInfo.h"
 #include "MantidTestHelpers/ComponentCreationHelper.h"
diff --git a/Framework/API/test/FunctionDomainTest.h b/Framework/API/test/FunctionDomainTest.h
index cd9d99bfe53cc630a2ef9e7724eb54661fbb2d50..217f188024c2778b3b6e497fe2be92732256c22d 100644
--- a/Framework/API/test/FunctionDomainTest.h
+++ b/Framework/API/test/FunctionDomainTest.h
@@ -3,7 +3,6 @@
 
 #include "MantidAPI/FunctionDomain1D.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 
 #include <cxxtest/TestSuite.h>
 
diff --git a/Framework/API/test/FunctionTest.h b/Framework/API/test/FunctionTest.h
index 9155f1b8fbb894f9db45ef6572e4452f27b92bf3..60ca0b2be02a404280fab64ceecc0f73b71e7746 100644
--- a/Framework/API/test/FunctionTest.h
+++ b/Framework/API/test/FunctionTest.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/ParamFunction.h"
 #include "MantidAPI/ParameterTie.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidTestHelpers/FakeObjects.h"
 #include "PropertyManagerHelper.h"
 
diff --git a/Framework/API/test/IMDWorkspaceTest.h b/Framework/API/test/IMDWorkspaceTest.h
index 1ed40ccfaf509dc6888031372c02a221d54fc3a2..f14cee76732359bf8fe043b9dbd777e7828d6357 100644
--- a/Framework/API/test/IMDWorkspaceTest.h
+++ b/Framework/API/test/IMDWorkspaceTest.h
@@ -6,7 +6,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/NumericAxis.h"
 #include "MantidAPI/SpectraAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
 #include "MantidTestHelpers/FakeObjects.h"
diff --git a/Framework/API/test/LogFilterGeneratorTest.h b/Framework/API/test/LogFilterGeneratorTest.h
index 54e554f573fa9e4ea7a45dcc2845adb4570a9cde..283f1537c27e1bf338250623ddca29650787bec2 100644
--- a/Framework/API/test/LogFilterGeneratorTest.h
+++ b/Framework/API/test/LogFilterGeneratorTest.h
@@ -5,7 +5,6 @@
 
 #include "MantidAPI/LogFilterGenerator.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/make_unique.h"
diff --git a/Framework/API/test/SingleCountValidatorTest.h b/Framework/API/test/SingleCountValidatorTest.h
index 4ac3c5bf37fc24adc298eb88cc080284ebff5185..2f700f65b21df152dc4e9b4fb3a12c151dadf4e2 100644
--- a/Framework/API/test/SingleCountValidatorTest.h
+++ b/Framework/API/test/SingleCountValidatorTest.h
@@ -5,7 +5,6 @@
 
 #include "MantidAPI/SingleCountValidator.h"
 
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidHistogramData/Histogram.h"
 #include "MantidTestHelpers/FakeObjects.h"
 
diff --git a/Framework/Algorithms/src/AlignDetectors.cpp b/Framework/Algorithms/src/AlignDetectors.cpp
index 69fcbdf9bd4e23512ef044619c5f107820ffa08a..3caf6d5f56cd7d013338dcf7d57524064570976c 100644
--- a/Framework/Algorithms/src/AlignDetectors.cpp
+++ b/Framework/Algorithms/src/AlignDetectors.cpp
@@ -7,7 +7,6 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/RawCountValidator.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/OffsetsWorkspace.h"
diff --git a/Framework/Algorithms/src/ChangePulsetime.cpp b/Framework/Algorithms/src/ChangePulsetime.cpp
index 8ebf8abd0970fc2818800bf22ef13bfbee2399c0..6a140ef50c0081dfbce86ccae368a2ecba8e8fd6 100644
--- a/Framework/Algorithms/src/ChangePulsetime.cpp
+++ b/Framework/Algorithms/src/ChangePulsetime.cpp
@@ -1,5 +1,4 @@
 #include "MantidAlgorithms/ChangePulsetime.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/System.h"
diff --git a/Framework/Algorithms/src/ChangePulsetime2.cpp b/Framework/Algorithms/src/ChangePulsetime2.cpp
index 68b24d2cfb531f5539fc4f5d44462c0b14f93083..38cf680736f754a33581ed5734aa96f004173481 100644
--- a/Framework/Algorithms/src/ChangePulsetime2.cpp
+++ b/Framework/Algorithms/src/ChangePulsetime2.cpp
@@ -1,6 +1,5 @@
 #include "MantidAlgorithms/ChangePulsetime2.h"
 #include "MantidAPI/Algorithm.tcc"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/System.h"
diff --git a/Framework/Algorithms/src/ConvertEmptyToTof.cpp b/Framework/Algorithms/src/ConvertEmptyToTof.cpp
index 630d2fdcbe756d3e5ed48cbb8d37031432200a33..489b595ebf5ea5f5e175c50d3990b1c3c1597fa9 100644
--- a/Framework/Algorithms/src/ConvertEmptyToTof.cpp
+++ b/Framework/Algorithms/src/ConvertEmptyToTof.cpp
@@ -6,7 +6,6 @@
 #include "MantidAPI/IPeakFunction.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/ArrayProperty.h"
diff --git a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
index 429957267b914d84f2a47805a45b3c4bacf4dcf2..9067be7e23bb258136db54a7e344935394a117a7 100644
--- a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
+++ b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
@@ -2,7 +2,6 @@
 #include "MantidAPI/InstrumentValidator.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidGeometry/IComponent.h"
diff --git a/Framework/Algorithms/src/CreateSampleWorkspace.cpp b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
index ddd8b4b6632cdb51f57275bb25ee439006a4f94b..b6f0599d8ce55bc2ba03bac6595b1924882b45bc 100644
--- a/Framework/Algorithms/src/CreateSampleWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
@@ -4,7 +4,6 @@
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/FunctionProperty.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/ScanningWorkspaceBuilder.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/src/DetectorDiagnostic.cpp b/Framework/Algorithms/src/DetectorDiagnostic.cpp
index 8b3e3c2455c32ad5c5331fd76b5d730d698da780..26d45e2813abaa859e71a213e4c4532bad2cb377 100644
--- a/Framework/Algorithms/src/DetectorDiagnostic.cpp
+++ b/Framework/Algorithms/src/DetectorDiagnostic.cpp
@@ -1,6 +1,5 @@
 #include "MantidAlgorithms/DetectorDiagnostic.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspaceHelpers.h"
 #include "MantidDataObjects/MaskWorkspace.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
diff --git a/Framework/Algorithms/src/ExtractSpectra.cpp b/Framework/Algorithms/src/ExtractSpectra.cpp
index 560241ea0c60036604ad1043d5c6b60597a88aee..8227362f8fecad7da4495d5f8de4d6c7691cefcb 100644
--- a/Framework/Algorithms/src/ExtractSpectra.cpp
+++ b/Framework/Algorithms/src/ExtractSpectra.cpp
@@ -4,7 +4,6 @@
 #include "MantidAPI/Algorithm.tcc"
 #include "MantidAPI/NumericAxis.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidHistogramData/Slice.h"
 #include "MantidIndexing/Extract.h"
diff --git a/Framework/Algorithms/src/FilterByXValue.cpp b/Framework/Algorithms/src/FilterByXValue.cpp
index 1c18ee609ccbedb3eef62120d85a4ea74ba009bf..c780eb7be0415a56ccbb5619a8368cab5f6bd193 100644
--- a/Framework/Algorithms/src/FilterByXValue.cpp
+++ b/Framework/Algorithms/src/FilterByXValue.cpp
@@ -1,5 +1,4 @@
 #include "MantidAlgorithms/FilterByXValue.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 
 namespace Mantid {
diff --git a/Framework/Algorithms/src/MaskBins.cpp b/Framework/Algorithms/src/MaskBins.cpp
index 89394ab843be03f1c419f9c57d1be05a35c857d2..ee7f96d3418dc1e68dff5aa41bf4c1b638b5f948 100644
--- a/Framework/Algorithms/src/MaskBins.cpp
+++ b/Framework/Algorithms/src/MaskBins.cpp
@@ -1,7 +1,6 @@
 #include "MantidAlgorithms/MaskBins.h"
 #include "MantidAPI/Algorithm.tcc"
 #include "MantidAPI/HistogramValidator.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/BoundedValidator.h"
 
diff --git a/Framework/Algorithms/src/PolarizationCorrectionFredrikze.cpp b/Framework/Algorithms/src/PolarizationCorrectionFredrikze.cpp
index 8e6a3e6d1c3a0a71f2107a6e584c20305e1dfc74..1b9df1c00dca02741ffa18891102de5c9b89df7d 100644
--- a/Framework/Algorithms/src/PolarizationCorrectionFredrikze.cpp
+++ b/Framework/Algorithms/src/PolarizationCorrectionFredrikze.cpp
@@ -2,7 +2,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidAPI/WorkspaceHistory.h"
 #include "MantidDataObjects/WorkspaceSingleValue.h"
diff --git a/Framework/Algorithms/src/PolarizationEfficiencyCor.cpp b/Framework/Algorithms/src/PolarizationEfficiencyCor.cpp
index 44b10eae96c3cad947d1f2e5591b1ebf26579422..7cb122d30cb1c27244f910a1aaea922df3832b4d 100644
--- a/Framework/Algorithms/src/PolarizationEfficiencyCor.cpp
+++ b/Framework/Algorithms/src/PolarizationEfficiencyCor.cpp
@@ -10,7 +10,6 @@
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/StringTokenizer.h"
 
-#include "MantidAPI/WorkspaceFactory.h"
 
 #include <Eigen/Dense>
 #include <boost/math/special_functions/pow.hpp>
diff --git a/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp b/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
index 931c486f59f596a37012b9b5a9cc84a2dc7c3fe9..ef9631e3f118b37e2a003bdf420126b41d71c83c 100644
--- a/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
+++ b/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
@@ -1,5 +1,4 @@
 #include "MantidAlgorithms/ReflectometryWorkflowBase.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidAlgorithms/BoostOptionalToAlgorithmProperty.h"
 #include "MantidKernel/ArrayProperty.h"
diff --git a/Framework/Algorithms/src/RemoveMaskedSpectra.cpp b/Framework/Algorithms/src/RemoveMaskedSpectra.cpp
index db352b1b69cb7580f0523a114f5a7af1685e3694..4cc5e32b494d3b32793f49e628ef806e6104e4e4 100644
--- a/Framework/Algorithms/src/RemoveMaskedSpectra.cpp
+++ b/Framework/Algorithms/src/RemoveMaskedSpectra.cpp
@@ -3,7 +3,6 @@
 #include "MantidAPI/NumericAxis.h"
 #include "MantidAPI/SpectrumInfo.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/MaskWorkspace.h"
 
 namespace Mantid {
diff --git a/Framework/Algorithms/src/Transpose.cpp b/Framework/Algorithms/src/Transpose.cpp
index 65f1750a4d35c0fd6052f13a452b0b88973000f8..d2d03cf9b4c360199b8bf954f05a1f30b8b1cca1 100644
--- a/Framework/Algorithms/src/Transpose.cpp
+++ b/Framework/Algorithms/src/Transpose.cpp
@@ -5,7 +5,6 @@
 #include "MantidAPI/BinEdgeAxis.h"
 #include "MantidAPI/CommonBinsValidator.h"
 #include "MantidAPI/NumericAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/RebinnedOutput.h"
 
 namespace Mantid {
diff --git a/Framework/Algorithms/src/UnwrapMonitorsInTOF.cpp b/Framework/Algorithms/src/UnwrapMonitorsInTOF.cpp
index 01fbe53c7c996e65d71a69983a7cb220f4c6f94c..e2d4ef53edff8b85a5b3962bd3dfff81c72ac87b 100644
--- a/Framework/Algorithms/src/UnwrapMonitorsInTOF.cpp
+++ b/Framework/Algorithms/src/UnwrapMonitorsInTOF.cpp
@@ -2,7 +2,6 @@
 #include "MantidAPI/ISpectrum.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidHistogramData/Counts.h"
diff --git a/Framework/Algorithms/test/BinaryOperationTest.h b/Framework/Algorithms/test/BinaryOperationTest.h
index 212da846227cf9b1335a5666f59b72619061f26b..2a73fe3fcb4648d1b75e673832852722494830ce 100644
--- a/Framework/Algorithms/test/BinaryOperationTest.h
+++ b/Framework/Algorithms/test/BinaryOperationTest.h
@@ -6,7 +6,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/BinaryOperation.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/ChainedOperatorTest.h b/Framework/Algorithms/test/ChainedOperatorTest.h
index 5b43df4d640f7f8554180a7a0cd1ac171166b436..27e1ec9c4c877db74c699829e88bda188b80e770 100644
--- a/Framework/Algorithms/test/ChainedOperatorTest.h
+++ b/Framework/Algorithms/test/ChainedOperatorTest.h
@@ -6,7 +6,6 @@
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidAlgorithms/Minus.h"
diff --git a/Framework/Algorithms/test/ConvertUnitsTest.h b/Framework/Algorithms/test/ConvertUnitsTest.h
index 4ac5485f18a54472e8321b23c9babda3ad0a8962..327fba0730a6576811507aaf62a46397f1804522 100644
--- a/Framework/Algorithms/test/ConvertUnitsTest.h
+++ b/Framework/Algorithms/test/ConvertUnitsTest.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/ConvertToDistribution.h"
 #include "MantidAlgorithms/ConvertUnits.h"
 #include "MantidDataHandling/LoadInstrument.h"
diff --git a/Framework/Algorithms/test/CreateCalFileByNamesTest.h b/Framework/Algorithms/test/CreateCalFileByNamesTest.h
index 32a50fefb6f7f542332ce88ff125750ef6ac6866..cccc73a43de4e5718a2b3ac1a96205ebb44bfa53 100644
--- a/Framework/Algorithms/test/CreateCalFileByNamesTest.h
+++ b/Framework/Algorithms/test/CreateCalFileByNamesTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/CreateCalFileByNames.h"
 #include "MantidDataHandling/LoadEmptyInstrument.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/CropWorkspaceTest.h b/Framework/Algorithms/test/CropWorkspaceTest.h
index 5d56d19ebee60782c4c7781d464cef47188853b9..c27060d0bfc357cc16b9fdc76c58ad900320ebe5 100644
--- a/Framework/Algorithms/test/CropWorkspaceTest.h
+++ b/Framework/Algorithms/test/CropWorkspaceTest.h
@@ -2,6 +2,7 @@
 #define CROPWORKSPACETEST_H_
 
 #include "MantidAPI/TextAxis.h"
+#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/CropWorkspace.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/FindDeadDetectorsTest.h b/Framework/Algorithms/test/FindDeadDetectorsTest.h
index 9fc21f32ebd5df609c250f3a734cb0aae5c113a4..235217ba9ecba385b1190f8598d23f59a2defd1b 100644
--- a/Framework/Algorithms/test/FindDeadDetectorsTest.h
+++ b/Framework/Algorithms/test/FindDeadDetectorsTest.h
@@ -4,7 +4,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/FindDeadDetectors.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/Algorithms/test/FitPeaksTest.h b/Framework/Algorithms/test/FitPeaksTest.h
index e5dee3e7077637c14977382390fd165c88d9d957..bf201ff2dc370ab066559a8163f38ef3d0d60278 100644
--- a/Framework/Algorithms/test/FitPeaksTest.h
+++ b/Framework/Algorithms/test/FitPeaksTest.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TableRow.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/FitPeaks.h"
 #include "MantidDataHandling/LoadNexusProcessed.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/GroupWorkspacesTest.h b/Framework/Algorithms/test/GroupWorkspacesTest.h
index a7038a3d5024874bc3aee4f87d24d4fa996ca20a..4d92f2c6bda2b9f2f985cfaa5be94f58c4dac156 100644
--- a/Framework/Algorithms/test/GroupWorkspacesTest.h
+++ b/Framework/Algorithms/test/GroupWorkspacesTest.h
@@ -1,6 +1,7 @@
 #ifndef GROUPWORKSPACESTEST_H_
 #define GROUPWORKSPACESTEST_H_
 
+#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidAlgorithms/GroupWorkspaces.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Algorithms/test/He3TubeEfficiencyTest.h b/Framework/Algorithms/test/He3TubeEfficiencyTest.h
index 780e66147e25214897c9c1097dec68a9b4747f67..f3f13f62e1fd77e28bea6207a8a644846c027802 100644
--- a/Framework/Algorithms/test/He3TubeEfficiencyTest.h
+++ b/Framework/Algorithms/test/He3TubeEfficiencyTest.h
@@ -4,7 +4,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/Axis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/He3TubeEfficiency.h"
 #include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataObjects/EventWorkspace.h"
diff --git a/Framework/Algorithms/test/LogarithmTest.h b/Framework/Algorithms/test/LogarithmTest.h
index 5c6b792149fcfcddd73c5a49b67f9222a1842242..b55f0f2519b6527eb27e1ef3eea0994355d3af03 100644
--- a/Framework/Algorithms/test/LogarithmTest.h
+++ b/Framework/Algorithms/test/LogarithmTest.h
@@ -4,7 +4,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/PoissonErrorsTest.h b/Framework/Algorithms/test/PoissonErrorsTest.h
index 00e7c4403a2cb8481f932b17406bf62f292f4938..7500caa17459ea6e10ea79ece4de0b28d87af4a8 100644
--- a/Framework/Algorithms/test/PoissonErrorsTest.h
+++ b/Framework/Algorithms/test/PoissonErrorsTest.h
@@ -5,7 +5,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidAlgorithms/PoissonErrors.h"
diff --git a/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h b/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h
index d05840ee2e87b7c397c477df682a6a0c58900d38..326bd38a125403438a14b9f6a47bef901114859f 100644
--- a/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h
+++ b/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h
@@ -9,7 +9,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
diff --git a/Framework/Algorithms/test/PowerTest.h b/Framework/Algorithms/test/PowerTest.h
index 1c2825a37c91013243fefe1afc4d078ed4dbaf0e..4987fb5e2adb7018749ed73c1b79823bbf24f8ca 100644
--- a/Framework/Algorithms/test/PowerTest.h
+++ b/Framework/Algorithms/test/PowerTest.h
@@ -5,7 +5,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidAlgorithms/Power.h"
diff --git a/Framework/Algorithms/test/ReadGroupsFromFileTest.h b/Framework/Algorithms/test/ReadGroupsFromFileTest.h
index 5d017bac061aad93342bb50b509e043a995293ff..c9e0356b565f666da87a79be07fe8536b7fbfe64 100644
--- a/Framework/Algorithms/test/ReadGroupsFromFileTest.h
+++ b/Framework/Algorithms/test/ReadGroupsFromFileTest.h
@@ -6,7 +6,6 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/CreateGroupingWorkspace.h"
 #include "MantidAlgorithms/ReadGroupsFromFile.h"
 #include "MantidDataHandling/LoadEmptyInstrument.h"
diff --git a/Framework/Algorithms/test/RemoveBinsTest.h b/Framework/Algorithms/test/RemoveBinsTest.h
index 24b2e67a1a42ebde47bbd22fedca574888f1068b..d30853c38f2ee3f74ef7fd44c4579f9dfefe81d4 100644
--- a/Framework/Algorithms/test/RemoveBinsTest.h
+++ b/Framework/Algorithms/test/RemoveBinsTest.h
@@ -9,7 +9,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/RemoveBins.h"
 #include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/SolidAngleTest.h b/Framework/Algorithms/test/SolidAngleTest.h
index 08ceaf04922bccd4953bdb5a6644b2ed4feb5766..71056cb4044fc0e453c94d9f6b77dbaaf5e2c249 100644
--- a/Framework/Algorithms/test/SolidAngleTest.h
+++ b/Framework/Algorithms/test/SolidAngleTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/SolidAngle.h"
 #include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/Algorithms/test/SumNeighboursTest.h b/Framework/Algorithms/test/SumNeighboursTest.h
index 9c589935213d4f2703600488611c7f9d94a2ad62..7351784561d37cf03b44bddae74d78604358c4dd 100644
--- a/Framework/Algorithms/test/SumNeighboursTest.h
+++ b/Framework/Algorithms/test/SumNeighboursTest.h
@@ -4,7 +4,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/SumNeighbours.h"
 #include "MantidDataObjects/Workspace2D.h"
 
diff --git a/Framework/Algorithms/test/SumSpectraTest.h b/Framework/Algorithms/test/SumSpectraTest.h
index afa40ebce322b30e03061be4fc4957a792eed6c6..e1232506bde605ffad626d43d474a9498ea7e57f 100644
--- a/Framework/Algorithms/test/SumSpectraTest.h
+++ b/Framework/Algorithms/test/SumSpectraTest.h
@@ -3,7 +3,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAlgorithms/SumSpectra.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidGeometry/Instrument/ParameterMap.h"
diff --git a/Framework/Crystal/test/IndexSXPeaksTest.h b/Framework/Crystal/test/IndexSXPeaksTest.h
index 67e13ce36ba4bc0f18790fb20dbe131976fa2779..bf857e8c7155317d27d79ba3240abbf7075e442c 100644
--- a/Framework/Crystal/test/IndexSXPeaksTest.h
+++ b/Framework/Crystal/test/IndexSXPeaksTest.h
@@ -4,7 +4,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/TableRow.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidCrystal/IndexSXPeaks.h"
 #include "MantidCrystal/LoadIsawUB.h"
 #include "MantidDataHandling/LoadNexusProcessed.h"
diff --git a/Framework/CurveFitting/src/Algorithms/ConvolutionFit.cpp b/Framework/CurveFitting/src/Algorithms/ConvolutionFit.cpp
index 905137797fc3a2d1f985b85b23ab7201e835c4a6..046809d59b4df0c09b89df34be190f2ccceca975 100644
--- a/Framework/CurveFitting/src/Algorithms/ConvolutionFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/ConvolutionFit.cpp
@@ -7,7 +7,6 @@
 #include "MantidAPI/Progress.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 
 #include "MantidCurveFitting/Algorithms/ConvolutionFit.h"
diff --git a/Framework/CurveFitting/src/FitMW.cpp b/Framework/CurveFitting/src/FitMW.cpp
index 29b3496cf11079ad2694b8e991a167d8f69a0184..26979dfaccd3c29bdcdeb740463d0f6435b22040 100644
--- a/Framework/CurveFitting/src/FitMW.cpp
+++ b/Framework/CurveFitting/src/FitMW.cpp
@@ -13,7 +13,6 @@
 #include "MantidAPI/IFunctionMW.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceProperty.h"
 
 #include "MantidKernel/ArrayOrderedPairsValidator.h"
diff --git a/Framework/CurveFitting/src/HistogramDomainCreator.cpp b/Framework/CurveFitting/src/HistogramDomainCreator.cpp
index fa3f2030265597a1a102b07d00435239def0462e..7c3e35bca691fcbe5183e0ea5110199d1e8a4b08 100644
--- a/Framework/CurveFitting/src/HistogramDomainCreator.cpp
+++ b/Framework/CurveFitting/src/HistogramDomainCreator.cpp
@@ -1,7 +1,6 @@
 #include "MantidCurveFitting/HistogramDomainCreator.h"
 #include "MantidAPI/FunctionDomain1D.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidKernel/PropertyWithValue.h"
 
diff --git a/Framework/CurveFitting/test/Algorithms/ConvolutionFitSequentialTest.h b/Framework/CurveFitting/test/Algorithms/ConvolutionFitSequentialTest.h
index 28dab6370c142de629a38dd975d809d6ca26b5f8..b6961f925e31247bd30c3c38efddc81fe034a54a 100644
--- a/Framework/CurveFitting/test/Algorithms/ConvolutionFitSequentialTest.h
+++ b/Framework/CurveFitting/test/Algorithms/ConvolutionFitSequentialTest.h
@@ -5,7 +5,6 @@
 
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 
 #include "MantidDataHandling/Load.h"
diff --git a/Framework/CurveFitting/test/Algorithms/QENSFitSequentialTest.h b/Framework/CurveFitting/test/Algorithms/QENSFitSequentialTest.h
index eef1a9ef9a0ca6ff2cac480dfbf5c8bf06409ca0..dfdcd16393343a6f3a0a39db9933d5084c8376c6 100644
--- a/Framework/CurveFitting/test/Algorithms/QENSFitSequentialTest.h
+++ b/Framework/CurveFitting/test/Algorithms/QENSFitSequentialTest.h
@@ -5,7 +5,6 @@
 
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 
 #include "MantidDataHandling/Load.h"
diff --git a/Framework/CurveFitting/test/Algorithms/QENSFitSimultaneousTest.h b/Framework/CurveFitting/test/Algorithms/QENSFitSimultaneousTest.h
index 3a6ff00976f485f22c9d03be5e92a640a03d236c..281a8cccbb212a77295500d5f5d177ec26b4f722 100644
--- a/Framework/CurveFitting/test/Algorithms/QENSFitSimultaneousTest.h
+++ b/Framework/CurveFitting/test/Algorithms/QENSFitSimultaneousTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/MultiDomainFunction.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 
 #include "MantidDataHandling/Load.h"
diff --git a/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h b/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
index ac181119403a9fa3f165e8a3ed68f2141454da5c..16754fde81ba78a3f198f7358f7a9ee7bba11b54 100644
--- a/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
+++ b/Framework/CurveFitting/test/Constraints/BoundaryConstraintTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Expression.h"
 #include "MantidAPI/FunctionFactory.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidCurveFitting/Constraints/BoundaryConstraint.h"
 #include "MantidCurveFitting/Functions/Gaussian.h"
 #include "MantidCurveFitting/Functions/Lorentzian.h"
diff --git a/Framework/CurveFitting/test/SpecialFunctionSupportTest.h b/Framework/CurveFitting/test/SpecialFunctionSupportTest.h
index 9a83c11a70a9e4a3420f23b646a77f1b033e0867..872294ba72918b19ac4dd0c117c2251d85fd12ec 100644
--- a/Framework/CurveFitting/test/SpecialFunctionSupportTest.h
+++ b/Framework/CurveFitting/test/SpecialFunctionSupportTest.h
@@ -7,7 +7,6 @@
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/UnitFactory.h"
 
diff --git a/Framework/DataHandling/src/CompressEvents.cpp b/Framework/DataHandling/src/CompressEvents.cpp
index 49d2ffb8dfd5edcf3c993dd3bf00c188feaaa3d7..24c82aee57a6797dff501bd1c5a2dc6c45ede24f 100644
--- a/Framework/DataHandling/src/CompressEvents.cpp
+++ b/Framework/DataHandling/src/CompressEvents.cpp
@@ -1,6 +1,5 @@
 #include "MantidDataHandling/CompressEvents.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidKernel/ArrayProperty.h"
diff --git a/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp b/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp
index 0326d8015a1239edcc83cbd009a227fd82601667..efaa70901765649b5a38672e682f027e4832002e 100644
--- a/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp
+++ b/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp
@@ -1,7 +1,6 @@
 #include "MantidDataHandling/CreatePolarizationEfficienciesBase.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceHistory.h"
 #include "MantidDataObjects/WorkspaceSingleValue.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/src/EventWorkspaceCollection.cpp b/Framework/DataHandling/src/EventWorkspaceCollection.cpp
index c2add3c44f44c9caeef9314df4685abf264147d1..2bc99ad7f4bb8cbcaf4a3ed422b29028f7212f31 100644
--- a/Framework/DataHandling/src/EventWorkspaceCollection.cpp
+++ b/Framework/DataHandling/src/EventWorkspaceCollection.cpp
@@ -2,7 +2,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/Sample.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp b/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp
index 96b5825b8ae470e1c0ca5b10db48045bf14e324b..9a800815031811ad344bd5e07edfe63b3b4b756c 100644
--- a/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp
+++ b/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp
@@ -2,7 +2,6 @@
 
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidHistogramData/Histogram.h"
diff --git a/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp b/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp
index 0d5e0b494693b8def90e49b702ebf410d93f0c34..7668df279f70745e2909093099a2a25667c7756b 100644
--- a/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp
+++ b/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp
@@ -2,7 +2,6 @@
 
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidHistogramData/Histogram.h"
diff --git a/Framework/DataHandling/src/LoadQKK.cpp b/Framework/DataHandling/src/LoadQKK.cpp
index eddeb8e6e53a41a87380367d21b0fe80a7c8f37d..0703bfb994bb6f8eaba71bfa04280421ab332baa 100644
--- a/Framework/DataHandling/src/LoadQKK.cpp
+++ b/Framework/DataHandling/src/LoadQKK.cpp
@@ -3,7 +3,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/RegisterFileLoader.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/src/LoadSNSspec.cpp b/Framework/DataHandling/src/LoadSNSspec.cpp
index 4ae6749dfaa1e62dcb04de6f3f2fe73f8eebda44..2dbdec21a3feb3d01e69386e3c6292eac2b544fc 100644
--- a/Framework/DataHandling/src/LoadSNSspec.cpp
+++ b/Framework/DataHandling/src/LoadSNSspec.cpp
@@ -5,7 +5,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/RegisterFileLoader.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/StringTokenizer.h"
diff --git a/Framework/DataHandling/test/LoadBBYTest.h b/Framework/DataHandling/test/LoadBBYTest.h
index 40ae3b7715eb9acdcd01d3ce93e52a919f7f320b..fdd230bddf9af2bb0575044ec0b285a687c342f6 100644
--- a/Framework/DataHandling/test/LoadBBYTest.h
+++ b/Framework/DataHandling/test/LoadBBYTest.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadBBY.h"
 #include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataObjects/WorkspaceSingleValue.h"
diff --git a/Framework/DataHandling/test/LoadEventPreNexus2Test.h b/Framework/DataHandling/test/LoadEventPreNexus2Test.h
index 3a89b136fadc52ac276106aef69e98ba546efecf..ca2ca90c420de3b0035325b1003f43271df89070 100644
--- a/Framework/DataHandling/test/LoadEventPreNexus2Test.h
+++ b/Framework/DataHandling/test/LoadEventPreNexus2Test.h
@@ -15,7 +15,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/EventList.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/DataHandling/test/LoadIsawDetCalTest.h b/Framework/DataHandling/test/LoadIsawDetCalTest.h
index 2e712ccb9f6e7d3181acd9af272d920bd734fadd..667702f61c5b466211522da4a22d6ec23ce331d8 100644
--- a/Framework/DataHandling/test/LoadIsawDetCalTest.h
+++ b/Framework/DataHandling/test/LoadIsawDetCalTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadEmptyInstrument.h"
 #include "MantidDataHandling/LoadIsawDetCal.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/DataHandling/test/LoadMcStasNexusTest.h b/Framework/DataHandling/test/LoadMcStasNexusTest.h
index 5e643700f21c9ef753079590a127fe254a848669..230a7eb5d9453aa988b518637fb4d48fff221c1b 100644
--- a/Framework/DataHandling/test/LoadMcStasNexusTest.h
+++ b/Framework/DataHandling/test/LoadMcStasNexusTest.h
@@ -6,7 +6,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadMcStasNexus.h"
 // These includes seem to make the difference between initialization of the
diff --git a/Framework/DataHandling/test/LoadMcStasTest.h b/Framework/DataHandling/test/LoadMcStasTest.h
index 79b3882435a1fa6c9ff2d0b5e060b20507e0cc42..a05fdf7d3dd0045ee286be96755c20ed67287873 100644
--- a/Framework/DataHandling/test/LoadMcStasTest.h
+++ b/Framework/DataHandling/test/LoadMcStasTest.h
@@ -7,7 +7,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadMcStas.h"
 // These includes seem to make the difference between initialization of the
diff --git a/Framework/DataHandling/test/LoadMuonNexus1Test.h b/Framework/DataHandling/test/LoadMuonNexus1Test.h
index e5b18522e92552b7d98d3958200a5052d788ec6b..9e49f68508a98e2dae711456d422275c4a016e84 100644
--- a/Framework/DataHandling/test/LoadMuonNexus1Test.h
+++ b/Framework/DataHandling/test/LoadMuonNexus1Test.h
@@ -18,7 +18,6 @@
 #include "MantidAPI/Run.h"
 #include "MantidAPI/Sample.h"
 #include "MantidAPI/ScopedWorkspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadMuonNexus1.h"
 #include "MantidKernel/ConfigService.h"
diff --git a/Framework/DataHandling/test/LoadMuonNexus2Test.h b/Framework/DataHandling/test/LoadMuonNexus2Test.h
index 378dbab2fe1d5491414a6cf1bdb9b61c0b4004f6..f2811424834224b8b390f29e3d7a3a6ee6d2fb2b 100644
--- a/Framework/DataHandling/test/LoadMuonNexus2Test.h
+++ b/Framework/DataHandling/test/LoadMuonNexus2Test.h
@@ -14,7 +14,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/TimeSeriesProperty.h"
diff --git a/Framework/DataHandling/test/LoadNexusTest.h b/Framework/DataHandling/test/LoadNexusTest.h
index 09b971f838dc611b182c86e0a418167e8de601bc..e770f695f06d1a2fbbe33cfebdeef25c48e0d8de 100644
--- a/Framework/DataHandling/test/LoadNexusTest.h
+++ b/Framework/DataHandling/test/LoadNexusTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadNexus.h"
 #include "MantidKernel/Unit.h"
diff --git a/Framework/DataHandling/test/LoadRaw3Test.h b/Framework/DataHandling/test/LoadRaw3Test.h
index db0c4892f5ac7b30b875cdba2ed3de3111b6a41c..cbb5ff2d5f988eaa3b70e8246dce9fa414fb7f3d 100644
--- a/Framework/DataHandling/test/LoadRaw3Test.h
+++ b/Framework/DataHandling/test/LoadRaw3Test.h
@@ -4,7 +4,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadRaw3.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/test/LoadRawBin0Test.h b/Framework/DataHandling/test/LoadRawBin0Test.h
index 5e3b843c8e23d255a76393be7460427b742df827..8625aadcd1954e2ec5cad8bbfcc48a6eef825165 100644
--- a/Framework/DataHandling/test/LoadRawBin0Test.h
+++ b/Framework/DataHandling/test/LoadRawBin0Test.h
@@ -6,7 +6,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadRawBin0.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h b/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
index e961b3336a03a1add21ef7197348b47b2e9892e1..39fd30e6a0b1109fc4922d8d29c971ab553460f6 100644
--- a/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
+++ b/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
@@ -4,7 +4,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataHandling/LoadMuonNexus.h"
 #include "MantidDataHandling/LoadNexus.h"
diff --git a/Framework/DataHandling/test/LoadRawSpectrum0Test.h b/Framework/DataHandling/test/LoadRawSpectrum0Test.h
index 5566a94a2d6c62fe75a129caa46f3298dea759d7..4046e5ee3bcce7c765c50c2eb6d32f7aa2e1179c 100644
--- a/Framework/DataHandling/test/LoadRawSpectrum0Test.h
+++ b/Framework/DataHandling/test/LoadRawSpectrum0Test.h
@@ -6,7 +6,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadRawSpectrum0.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/test/MaskDetectorsTest.h b/Framework/DataHandling/test/MaskDetectorsTest.h
index e6c5c9f9e5f01b7c5d75cfac566a9bcf58c34460..ced4df118d05716637aa16b87d2837c6d024ede4 100644
--- a/Framework/DataHandling/test/MaskDetectorsTest.h
+++ b/Framework/DataHandling/test/MaskDetectorsTest.h
@@ -6,6 +6,7 @@
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/SpectrumInfo.h"
+#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidDataHandling/MaskDetectors.h"
 #include "MantidDataObjects/EventWorkspace.h"
diff --git a/Framework/DataHandling/test/MoveInstrumentComponentTest.h b/Framework/DataHandling/test/MoveInstrumentComponentTest.h
index c110e68d209a7cd91fce57d6be52b2b26371d1f9..96458630060f3cbf6947626d027f886a1e15e129 100644
--- a/Framework/DataHandling/test/MoveInstrumentComponentTest.h
+++ b/Framework/DataHandling/test/MoveInstrumentComponentTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/MoveInstrumentComponent.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/DataHandling/test/RemoveLogsTest.h b/Framework/DataHandling/test/RemoveLogsTest.h
index 10210d6717388096afbdcd496b79db269faf7b5b..89340d35a46c6c8c87905628a47b58b2478561e3 100644
--- a/Framework/DataHandling/test/RemoveLogsTest.h
+++ b/Framework/DataHandling/test/RemoveLogsTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadLog.h"
 #include "MantidDataHandling/RemoveLogs.h"
 #include "MantidDataObjects/Workspace2D.h"
diff --git a/Framework/DataHandling/test/SaveNexusTest.h b/Framework/DataHandling/test/SaveNexusTest.h
index d9e01cf49014feed1282b68ac251a43dcffe96f1..282203eda8194a3bcfbcaebcfe87bb13390803fc 100644
--- a/Framework/DataHandling/test/SaveNexusTest.h
+++ b/Framework/DataHandling/test/SaveNexusTest.h
@@ -13,7 +13,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadMuonNexus.h"
 #include "MantidDataHandling/LoadNexus.h"
 #include "MantidDataHandling/SaveNexus.h"
diff --git a/Framework/DataHandling/test/SaveRKHTest.h b/Framework/DataHandling/test/SaveRKHTest.h
index 817047975082de64d445b3174f10de226953168e..17878d2d46f79d10e8ad4c7d74101ea981c15a7e 100644
--- a/Framework/DataHandling/test/SaveRKHTest.h
+++ b/Framework/DataHandling/test/SaveRKHTest.h
@@ -1,6 +1,7 @@
 #ifndef SAVERKHTEST_H_
 #define SAVERKHTEST_H_
 
+#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/SaveRKH.h"
 #include "MantidHistogramData/LinearGenerator.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h b/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h
index 4216d42dfa4c996a29c9d847ecb4a1b35f15404a..5c42db5b4f05455041c5082a3e83ba3e1c9891e5 100644
--- a/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h
+++ b/Framework/DataHandling/test/UpdateInstrumentFromFileTest.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/InstrumentDataService.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/GroupDetectors2.h"
 #include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataHandling/LoadInstrumentFromNexus.h"
diff --git a/Framework/DataHandling/test/XMLInstrumentParameterTest.h b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
index d828b19a477b661c9efb01f299bea53256a656b4..5f425a1a2856ebb36694599d93ef1b3cde405d94 100644
--- a/Framework/DataHandling/test/XMLInstrumentParameterTest.h
+++ b/Framework/DataHandling/test/XMLInstrumentParameterTest.h
@@ -5,7 +5,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadRaw3.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/ComponentInfo.h"
diff --git a/Framework/DataObjects/src/Histogram1D.cpp b/Framework/DataObjects/src/Histogram1D.cpp
index 146dea8763fda49c409c9278d522d38e67294af1..c94dde3be7066624bfd9961a5690e7c6537bc3fd 100644
--- a/Framework/DataObjects/src/Histogram1D.cpp
+++ b/Framework/DataObjects/src/Histogram1D.cpp
@@ -1,5 +1,4 @@
 #include "MantidDataObjects/Histogram1D.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/Exception.h"
 
 namespace Mantid {
diff --git a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
index 9d8a9df2e58f01c75002b0e0dc9094b8b2ebee18..2e76ddd0f9118681ed3d09578698e25777792277 100644
--- a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
+++ b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
@@ -1,6 +1,5 @@
 #include "MantidDataObjects/ScanningWorkspaceBuilder.h"
 
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
 #include "MantidGeometry/Instrument.h"
diff --git a/Framework/MDAlgorithms/test/MDNormDirectSCTest.h b/Framework/MDAlgorithms/test/MDNormDirectSCTest.h
index a7e0f5b53511f8c0bbcb59270ea1e3d6753e59d7..04dab340e44087c71394e40e24ab5f62a801f050 100644
--- a/Framework/MDAlgorithms/test/MDNormDirectSCTest.h
+++ b/Framework/MDAlgorithms/test/MDNormDirectSCTest.h
@@ -4,7 +4,6 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidAPI/IMDHistoWorkspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidMDAlgorithms/CreateMDWorkspace.h"
 #include "MantidMDAlgorithms/MDNormDirectSC.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/MDAlgorithms/test/MDNormSCDTest.h b/Framework/MDAlgorithms/test/MDNormSCDTest.h
index f797981d062a56f0ddf48610b8a838ebd44266e4..b6cf35d233382ec3d034157d53281a4eed6fde6e 100644
--- a/Framework/MDAlgorithms/test/MDNormSCDTest.h
+++ b/Framework/MDAlgorithms/test/MDNormSCDTest.h
@@ -5,7 +5,6 @@
 
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/IMDHistoWorkspace.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidMDAlgorithms/CreateMDWorkspace.h"
 #include "MantidMDAlgorithms/MDNormSCD.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Muon/src/CalculateMuonAsymmetry.cpp b/Framework/Muon/src/CalculateMuonAsymmetry.cpp
index 15f6af64f6797c63a769c9944860f57069a87646..8ca7a0d1d626a9ef9df58ea958959cd9a9cdbb70 100644
--- a/Framework/Muon/src/CalculateMuonAsymmetry.cpp
+++ b/Framework/Muon/src/CalculateMuonAsymmetry.cpp
@@ -14,7 +14,6 @@
 #include "MantidAPI/IFunction.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/MultiDomainFunction.h"
-#include "MantidAPI/WorkspaceFactory.h"
 
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Muon/src/MuonAsymmetryHelper.cpp b/Framework/Muon/src/MuonAsymmetryHelper.cpp
index 8e71b7ed55bc0d8222c90cde91f1a3f7baf5d611..723e35d9a7f96bbfb12d88752984830452bf41e2 100644
--- a/Framework/Muon/src/MuonAsymmetryHelper.cpp
+++ b/Framework/Muon/src/MuonAsymmetryHelper.cpp
@@ -6,7 +6,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Progress.h"
 #include "MantidAPI/Run.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/Workspace_fwd.h"
 
 #include "MantidAPI/AnalysisDataService.h"
diff --git a/Framework/WorkflowAlgorithms/test/ExtractQENSMembersTest.h b/Framework/WorkflowAlgorithms/test/ExtractQENSMembersTest.h
index b4460cd8c4a5b610bae754895de69f80712ff07d..af98e4ef071c50029ee2ce3e0a99bf8f6bd08471 100644
--- a/Framework/WorkflowAlgorithms/test/ExtractQENSMembersTest.h
+++ b/Framework/WorkflowAlgorithms/test/ExtractQENSMembersTest.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TextAxis.h"
-#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 
 #include "MantidDataObjects/Workspace2D.h"