DataHandling: less includes in Algorithm, MatrixWorkspace, re #15246

Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h

@@ -2,6 +2,7 @@
 #define MANTID_DATAHANDLING_CREATESIMULATIONWORKSPACE_H_
 
 #include "MantidAPI/Algorithm.h"
+#include "MantidKernel/cow_ptr.h"
 #include "MantidGeometry/Instrument.h"
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h

@@ -3,9 +3,11 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidAPI/Algorithm.h"
 #include <fstream>
 
+#include "MantidAPI/Algorithm.h"
+#include "MantidGeometry/IDetector.h"
+
 namespace Mantid {
 namespace DataHandling {
 /**  file types currently supported by ASCII loader are:

Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h

 #ifndef MANTID_DATAHANDLING_LOADDAVEGRP_H_
 #define MANTID_DATAHANDLING_LOADDAVEGRP_H_
 
-#include "MantidAPI/IFileLoader.h"
 #include <fstream>
 #include <string>
 
+#include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/cow_ptr.h"
+
 namespace Mantid {
 namespace DataHandling {
 /** @class Mantid::DataHandling::LoadDaveGrp

Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h

@@ -5,6 +5,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/Algorithm.h"
+#include "MantidGeometry/Instrument.h"
 
 namespace Mantid {
 namespace DataHandling {

Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h

 #ifndef MANTID_DATAHANDLING_LOADDIFFCAL_H_
 #define MANTID_DATAHANDLING_LOADDIFFCAL_H_
 
-#include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
+#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/System.h"
 
 namespace H5 {
 class H5File;

Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h

 #ifndef MANTID_DATAHANDLING_LoadHelper_H_
 #define MANTID_DATAHANDLING_LoadHelper_H_
 
+#include "MantidAPI/Run.h"
 #include "MantidKernel/System.h"
 #include "MantidNexus/NexusClasses.h"
 

Framework/DataHandling/inc/MantidDataHandling/LoadLog.h

@@ -5,6 +5,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/Algorithm.h"
+#include "MantidAPI/Run.h"
 
 namespace Mantid {
 

Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h

@@ -3,6 +3,7 @@
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/IFileLoader.h"
+#include "MantidGeometry/Objects/Object.h"
 
 namespace Mantid {
 namespace DataHandling {

Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h

@@ -3,6 +3,7 @@
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
+#include "MantidGeometry/IDTypes.h"
 #include <boost/scoped_array.hpp>
 #include <nexus/NeXusException.hpp>
 #include <nexus/NeXusFile.hpp>
@@ -78,8 +79,9 @@ protected:
 
 private:
   /// Fix the detector numbers if the defaults are not correct
-  void fixUDets(boost::scoped_array<detid_t> &det_ids, ::NeXus::File &file,
-                const boost::scoped_array<specid_t> &spec_ids,
+  void fixUDets(boost::scoped_array<Mantid::detid_t> &det_ids,
+                ::NeXus::File &file,
+                const boost::scoped_array<Mantid::specid_t> &spec_ids,
                 const size_t nmonitors) const;
 
   /// Load the logs

Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h

@@ -7,6 +7,7 @@
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
+#include "MantidKernel/cow_ptr.h"
 
 #include "MantidNexus/NexusClasses.h"
 

Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h

@@ -5,6 +5,8 @@
 // Includes
 //---------------------------------------------------
 #include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/cow_ptr.h"
+
 #include <fstream>
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h

 #ifndef MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_
 #define MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_
 
+#include <iosfwd>
+
 #include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
-#include <iosfwd>
+#include "MantidAPI/ITableWorkspace_fwd.h"
 
 namespace Mantid {
 namespace DataHandling {

Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h

@@ -5,6 +5,7 @@
 // Includes
 //---------------------------------------------------
 #include "MantidAPI/Algorithm.h"
+#include "MantidKernel/cow_ptr.h"
 
 namespace Mantid {
 namespace DataHandling {

Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h

@@ -7,6 +7,15 @@
 #include "MantidAPI/Algorithm.h"
 
 namespace Mantid {
+
+namespace Geometry {
+class IComponent;
+}
+
+namespace Kernel {
+class V3D;
+}
+
 namespace DataHandling {
 /** @class SetScalingPSD SetScalingPSD.h MantidAlgorithm/SetScalingPSD.h
 

Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h

@@ -5,6 +5,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/Algorithm.h"
+#include "MantidGeometry/IDetector.h"
 #include <nexus/NeXusFile.hpp>
 
 namespace Mantid {

Framework/DataHandling/src/AsciiPointBase.cpp

@@ -9,11 +9,14 @@ GUI
 //----------------------------------------------------------------------
 #include "MantidDataHandling/AsciiPointBase.h"
 #include "MantidAPI/FileProperty.h"
-#include <fstream>
+#include "MantidAPI/MatrixWorkspace.h"
+
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 
+#include <fstream>
+
 namespace Mantid {
 namespace DataHandling {
 using namespace Kernel;

Framework/DataHandling/src/CreateChopperModel.cpp

 #include "MantidDataHandling/CreateChopperModel.h"
 #include "MantidAPI/FermiChopperModel.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/MandatoryValidator.h"

Framework/DataHandling/src/CreateModeratorModel.cpp

 #include "MantidDataHandling/CreateModeratorModel.h"
 
 #include "MantidAPI/IkedaCarpenterModerator.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/MandatoryValidator.h"
 

Framework/DataHandling/src/CreateSimulationWorkspace.cpp

 #include "MantidDataHandling/CreateSimulationWorkspace.h"
 
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/ListValidator.h"

Framework/DataHandling/src/EventWorkspaceCollection.cpp

 #include "MantidDataHandling/EventWorkspaceCollection.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/UnitFactory.h"
+#include "MantidAPI/Axis.h"
 #include "MantidAPI/Run.h"
 
 #include <vector>