diff --git a/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp b/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
index 6268cd25d704a5e341581812d47619d983393984..82e3ebe2a4f5313009606cd9d367438eb8e79533 100644
--- a/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
+++ b/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
@@ -2,12 +2,13 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidWorkflowAlgorithms/ComputeSensitivity.h"
-#include "MantidAPI/FileProperty.h"
-#include "MantidDataObjects/TableWorkspace.h"
-#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
 #include "MantidAPI/AlgorithmProperty.h"
+#include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidDataObjects/TableWorkspace.h"
 #include "MantidKernel/PropertyManager.h"
+#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
 
 namespace Mantid {
 namespace WorkflowAlgorithms {
@@ -17,7 +18,6 @@ DECLARE_ALGORITHM(ComputeSensitivity)
 
 using namespace Kernel;
 using namespace API;
-using namespace Geometry;
 using namespace DataObjects;
 
 void ComputeSensitivity::init() {
diff --git a/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp b/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
index ca93f043d7c3be341127f310b33c8102ed5ad5f8..0c048e14023f06f230373425789b523e85240b79 100644
--- a/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
+++ b/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
@@ -1,6 +1,7 @@
 #include "MantidWorkflowAlgorithms/ConvolutionFitSequential.h"
 
 #include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/FunctionDomain1D.h"
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/IFunction.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp b/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
index 7f146efc89ad7d23b531f94bc08b2657bd88657f..4f2a9ffc1b3604b0c39757839f7a343d367e8ce1 100644
--- a/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
@@ -1,10 +1,11 @@
 #include "MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h"
+#include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
 #include "MantidAPI/PropertyManagerDataService.h"
 #include "MantidKernel/Atom.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/NeutronAtom.h"
 #include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/PropertyWithValue.h"
-#include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
 
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
diff --git a/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp b/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
index 1660c7cc1487a14b25bda83f71895b40a72e726f..0ee8e9a2a5c25cf20cae1942aaab47196d5b1f43 100644
--- a/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
@@ -1,4 +1,5 @@
 #include "MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/PropertyManagerDataService.h"
 #include "MantidAPI/WorkspaceHistory.h"
 #include "MantidGeometry/IDetector.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
index 56258b060d0b10e28f0dc52aa4f9db294585e850..a22880f4ab2c998bb2e10b18a5415c98f3e5d35c 100644
--- a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
@@ -4,6 +4,7 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FileFinder.h"
 #include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/PropertyManagerDataService.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp b/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
index 408d66a7a4c11e6f9f6d21de3cbacd75d833a6c2..14692230f0831864932825d6eb81e0d92e540a46 100644
--- a/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
@@ -1,4 +1,5 @@
 #include "MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/PropertyManagerDataService.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
index 93ae31ef193e6ac2069217d1ec58b5e910b0f6c0..68b16f28afd918d8864e81e64b7bc122ce20836e 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
@@ -2,26 +2,30 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidWorkflowAlgorithms/EQSANSLoad.h"
+#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/AlgorithmProperty.h"
+#include <MantidAPI/Axis.h>
 #include <MantidAPI/FileFinder.h>
 #include <MantidAPI/FileProperty.h>
+#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManager.h"
 #include "MantidKernel/TimeSeriesProperty.h"
+
+#include <boost/algorithm/string.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/regex.hpp>
+
 #include "Poco/DirectoryIterator.h"
 #include "Poco/NumberParser.h"
 #include "Poco/NumberFormatter.h"
 #include "Poco/String.h"
+
 #include <iostream>
 #include <fstream>
 #include <istream>
-#include <boost/algorithm/string.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/regex.hpp>
-#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
-#include "MantidAPI/AlgorithmManager.h"
-#include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
-#include "MantidKernel/PropertyManager.h"
 
 namespace Mantid {
 namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp b/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp
index 6d01fd628af6a7e9077fe8eef426a32c5e3c26c5..80ad2616b328d53cbf02902edddceed8a5bb51db 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp
@@ -2,6 +2,9 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidWorkflowAlgorithms/EQSANSPatchSensitivity.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidGeometry/Instrument/ParameterMap.h"
+#include "MantidKernel/cow_ptr.h"
 
 namespace Mantid {
 namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp b/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp
index fe2c68f1dcaa77410c7744896720eca3d6e08dfe..f0c0e7a0d45cb70e71fcfc3786372e5bbe2d378e 100644
--- a/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp
+++ b/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp
@@ -2,9 +2,13 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidWorkflowAlgorithms/HFIRSANSNormalise.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidKernel/ListValidator.h"
+
 #include <boost/algorithm/string.hpp>
+
 #include "Poco/NumberFormatter.h"
-#include "MantidKernel/ListValidator.h"
+
 
 namespace Mantid {
 namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp b/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp
index 7d7dd90d78a9da8bea3703d1466f5f3299924cd7..214c498e4205234aa683594221f625471fab7087 100644
--- a/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp
+++ b/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp
@@ -1,6 +1,7 @@
 #include "MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h"
 
 #include "MantidAPI/ITableWorkspace.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TextAxis.h"
 
 #include "MantidKernel/MandatoryValidator.h"
diff --git a/Framework/WorkflowAlgorithms/src/RefRoi.cpp b/Framework/WorkflowAlgorithms/src/RefRoi.cpp
index 075e69641f0e62ad3b877b1b5e9376c7470270fd..5c6e0982ec2cd018c10e425bad8dcef5199b1fe3 100644
--- a/Framework/WorkflowAlgorithms/src/RefRoi.cpp
+++ b/Framework/WorkflowAlgorithms/src/RefRoi.cpp
@@ -2,6 +2,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidWorkflowAlgorithms/RefRoi.h"
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/CommonBinsValidator.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/UnitFactory.h"
diff --git a/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp
index 496bd565e196b129564e582647fdeda350bf6590..4783f0d5744d596d45100758c30d4e2f5f2b6a2a 100644
--- a/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp
@@ -4,6 +4,7 @@
 #include "MantidWorkflowAlgorithms/SANSBeamFluxCorrection.h"
 #include "MantidAPI/AlgorithmProperty.h"
 #include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/PropertyManager.h"
 #include "Poco/Path.h"
 
@@ -12,7 +13,6 @@ namespace WorkflowAlgorithms {
 
 using namespace Kernel;
 using namespace API;
-using namespace Geometry;
 
 // Register the algorithm into the AlgorithmFactory
 DECLARE_ALGORITHM(SANSBeamFluxCorrection)
diff --git a/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h b/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h
index d52c76f4ecb4b40540bc40d1ebfea56b1e0697b6..f1b84d2202dcd86064b94984e38150a2c13e1017 100644
--- a/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h
+++ b/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h
@@ -3,6 +3,7 @@
 
 #include <cxxtest/TestSuite.h>
 
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/WorkspaceFactory.h"
 
diff --git a/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h b/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h
index 11f16b8e4c55d0b3b5d94c4b268da4566c699f5e..335f6c152cb8f637da4933beb6a7b6d71757e688 100644
--- a/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h
+++ b/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h
@@ -4,7 +4,9 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h"
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/ITableWorkspace.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TableRow.h"
 
 using Mantid::Algorithms::ProcessIndirectFitParameters;
diff --git a/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h b/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h
index 7eb23751294d22831ae17f192429dc016e4fdf85..b8f325eaa131afd305ad85cd50d6167eff88e489 100644
--- a/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h
+++ b/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h
@@ -3,6 +3,7 @@
 
 #include <cxxtest/TestSuite.h>
 #include "MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h"
+#include "MantidAPI/Axis.h"
 #include "MantidDataHandling/LoadSpice2D.h"
 #include "MantidDataHandling/MoveInstrumentComponent.h"
 
diff --git a/Framework/WorkflowAlgorithms/test/StepScanTest.h b/Framework/WorkflowAlgorithms/test/StepScanTest.h
index bfca74ece5d753235de637d7ebcf8e622fa3f5ae..cb5ac0519e66cc47763b8c4ced7c1ecdc9b69550 100644
--- a/Framework/WorkflowAlgorithms/test/StepScanTest.h
+++ b/Framework/WorkflowAlgorithms/test/StepScanTest.h
@@ -5,6 +5,7 @@
 
 #include "MantidWorkflowAlgorithms/StepScan.h"
 #include "MantidAlgorithms/FilterByXValue.h"
+#include "MantidAPI/Axis.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"