diff --git a/Framework/Algorithms/test/IndirectFitDataCreationHelperTest.h b/Framework/Algorithms/test/IndirectFitDataCreationHelperTest.h
index bf52c1ba5b421fb8ad447b56d8978f32044a5316..cec200d2f1dbd7f731585bbe3d985d09dee7fefa 100644
--- a/Framework/Algorithms/test/IndirectFitDataCreationHelperTest.h
+++ b/Framework/Algorithms/test/IndirectFitDataCreationHelperTest.h
@@ -180,4 +180,4 @@ public:
   }
 };
 
-#endif
+#endif // MANTID_INDIRECTFITDATACREATIONHELPER_TEST
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/IndirectFitDataCreationHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/IndirectFitDataCreationHelper.h
index f1d50a61b31be840227715afc868dcaf50aa8335..8f11acefd4bcc7248492eabcc91296e41461f726 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/IndirectFitDataCreationHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/IndirectFitDataCreationHelper.h
@@ -1,8 +1,11 @@
 #ifndef MANTID_INDIRECTFITDATACREATIONHELPER_H_
 #define MANTID_INDIRECTFITDATACREATIONHELPER_H_
 
-#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/MatrixWorkspace_fwd.h"
+#include "MantidHistogramData/BinEdges.h"
+
+#include <string>
 
 #include <boost/variant.hpp>
 #include <boost/variant/apply_visitor.hpp>
@@ -105,4 +108,4 @@ struct AreSpectraEqual : public boost::static_visitor<bool> {
 } // namespace IndirectFitDataCreationHelper
 } // namespace Mantid
 
-#endif
+#endif // MANTID_INDIRECTFITDATACREATIONHELPER_H
diff --git a/Framework/TestHelpers/src/IndirectFitDataCreationHelper.cpp b/Framework/TestHelpers/src/IndirectFitDataCreationHelper.cpp
index 49b04058f51e27476f69391f207e4d6eeb43c0c5..83082b0c41ef340802cfdb8591cfd883832370ba 100644
--- a/Framework/TestHelpers/src/IndirectFitDataCreationHelper.cpp
+++ b/Framework/TestHelpers/src/IndirectFitDataCreationHelper.cpp
@@ -1,4 +1,5 @@
 #include "MantidTestHelpers/IndirectFitDataCreationHelper.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
 
 namespace Mantid {
 namespace IndirectFitDataCreationHelper {
diff --git a/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h b/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h
index 1d910f52882f317c4b2f00feb68c1c2205f16b3d..7b1deefe1bc94018a4c5e1220ccfed1ac8ec4a4e 100644
--- a/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h
+++ b/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h
@@ -9,6 +9,7 @@
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/TableRow.h"
+#include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidTestHelpers/IndirectFitDataCreationHelper.h"
 
@@ -366,4 +367,4 @@ public:
   }
 };
 
-#endif
+#endif // MANTID_INDIRECTFITOUTPUTTEST_H
diff --git a/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h b/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h
index 88f0af15bbfb21b77edc9058ff4ffc47c55894a8..23a5ae9068e59139a4db5769b54029e2a324f499 100644
--- a/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h
+++ b/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h
@@ -9,6 +9,7 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidCurveFitting/Algorithms/ConvolutionFit.h"
 #include "MantidCurveFitting/Algorithms/QENSFitSequential.h"
+#include "MantidDataObjects/Workspace2D.h"
 #include "MantidTestHelpers/IndirectFitDataCreationHelper.h"
 
 using namespace Mantid::API;
@@ -738,4 +739,4 @@ public:
   }
 };
 
-#endif
+#endif // MANTID_INDIRECTFITTINGMODELTEST_H