From 620530af6d456196e22e3dae08efb12634412e1e Mon Sep 17 00:00:00 2001
From: Stuart Campbell <campbellsi@ornl.gov>
Date: Tue, 25 Mar 2014 11:01:52 -0400
Subject: [PATCH] Add guard to prevent Qt moc including boost headers.
This is required as Qt4 is not completely C++11 compliant. I think that these will no longer be needed when we move to Qt5.
Should only be required for files up to and including API.
Refs #7284
---
Code/Mantid/Framework/API/inc/MantidAPI/Column.h | 4 +++-
Code/Mantid/Framework/API/inc/MantidAPI/Expression.h | 5 ++++-
.../Framework/API/inc/MantidAPI/FileLoaderRegistry.h | 4 +++-
.../Framework/API/inc/MantidAPI/FunctionDomain.h | 6 +++---
.../Framework/API/inc/MantidAPI/IArchiveSearch.h | 4 +++-
Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h | 7 +++++--
.../Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h | 10 ++++++----
.../Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h | 4 +++-
.../Framework/API/inc/MantidAPI/ITableWorkspace.h | 7 +++++--
.../Framework/API/inc/MantidAPI/ITransformScale.h | 5 ++++-
.../API/inc/MantidAPI/ImplicitFunctionParameter.h | 7 +++++--
.../inc/MantidAPI/ImplicitFunctionParameterParser.h | 7 +++++--
.../Framework/API/inc/MantidAPI/MatrixWorkspace.h | 4 +++-
.../Framework/API/inc/MantidAPI/ModeratorModel.h | 4 +++-
.../API/inc/MantidAPI/SingleValueParameter.h | 6 ++++--
.../API/inc/MantidAPI/SingleValueParameterParser.h | 5 ++++-
.../API/inc/MantidAPI/SpectrumDetectorMapping.h | 5 ++++-
Code/Mantid/Framework/API/inc/MantidAPI/TableRow.h | 5 ++++-
Code/Mantid/Framework/API/inc/MantidAPI/TextAxis.h | 7 +++++--
.../API/inc/MantidAPI/VectorParameterParser.h | 4 +++-
.../Geometry/inc/MantidGeometry/Crystal/PointGroup.h | 4 +++-
.../inc/MantidGeometry/Crystal/ReflectionCondition.h | 6 +++++-
.../Geometry/inc/MantidGeometry/IComponent.h | 4 +++-
.../inc/MantidGeometry/Instrument/IDFObject.h | 4 +++-
.../MantidGeometry/Instrument/INearestNeighbours.h | 10 ++++++----
.../MantidGeometry/Instrument/ParComponentFactory.h | 4 +++-
.../inc/MantidGeometry/Instrument/Parameter.h | 4 +++-
.../inc/MantidGeometry/MDGeometry/IMDDimension.h | 4 +++-
.../MantidGeometry/MDGeometry/MDDimensionExtents.h | 4 +++-
.../inc/MantidGeometry/Objects/BoundingBox.h | 4 +++-
.../inc/MantidGeometry/Objects/ShapeFactory.h | 4 +++-
.../MantidGeometry/Rendering/BitmapGeometryHandler.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/DataItem.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/DataService.h | 6 ++++--
.../Framework/Kernel/inc/MantidKernel/DateAndTime.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/DiskBuffer.h | 12 +++++++-----
.../Kernel/inc/MantidKernel/DynamicFactory.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/FacilityInfo.h | 5 +++--
.../Framework/Kernel/inc/MantidKernel/FunctionTask.h | 7 +++++--
.../Framework/Kernel/inc/MantidKernel/ISaveable.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/IValidator.h | 12 +++++++-----
.../Framework/Kernel/inc/MantidKernel/Instantiator.h | 4 +++-
.../Kernel/inc/MantidKernel/LibraryManager.h | 4 +++-
.../Kernel/inc/MantidKernel/ListValidator.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/LogFilter.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/LogParser.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/MRUList.h | 10 ++++++----
.../Framework/Kernel/inc/MantidKernel/Material.h | 4 +++-
.../Kernel/inc/MantidKernel/MersenneTwister.h | 8 +++++---
.../inc/MantidKernel/NDPseudoRandomNumberGenerator.h | 4 +++-
.../Framework/Kernel/inc/MantidKernel/Property.h | 4 +++-
.../Kernel/inc/MantidKernel/PropertyWithValue.h | 8 ++++++--
.../Framework/Kernel/inc/MantidKernel/RegexStrings.h | 4 +++-
.../Kernel/inc/MantidKernel/StartsWithValidator.h | 4 +++-
Code/Mantid/Framework/Kernel/inc/MantidKernel/Task.h | 4 +++-
Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h | 4 +++-
.../Kernel/inc/MantidKernel/UserStringParser.h | 7 +++++--
Code/Mantid/Framework/Kernel/inc/MantidKernel/VMD.h | 6 ++++--
.../Kernel/inc/MantidKernel/XMLInstantiator.h | 5 +++--
.../Framework/Kernel/inc/MantidKernel/cow_ptr.h | 6 +++++-
.../MantidPythonInterface/kernel/PropertyWithValue.h | 8 +++++---
61 files changed, 233 insertions(+), 97 deletions(-)
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/Column.h b/Code/Mantid/Framework/API/inc/MantidAPI/Column.h
index 5927f84bd9e..4e40daadec2 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/Column.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/Column.h
@@ -7,7 +7,9 @@
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/Logger.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <string>
#include <typeinfo>
#include <limits>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/Expression.h b/Code/Mantid/Framework/API/inc/MantidAPI/Expression.h
index 407ace54609..ab5f99c168a 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/Expression.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/Expression.h
@@ -3,7 +3,10 @@
#include "MantidAPI/DllConfig.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
+
#include <string>
#include <vector>
#include <map>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h b/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
index 9707f11d361..6e1d3fd1ddd 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
@@ -5,7 +5,9 @@
#include "MantidAPI/IFileLoader.h"
#include "MantidKernel/SingletonHolder.h"
-#include <boost/type_traits/is_base_of.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/type_traits/is_base_of.hpp>
+#endif
#include <map>
#include <string>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain.h b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain.h
index d1c5c322e2a..25ff27a2bce 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionDomain.h
@@ -6,9 +6,9 @@
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
//#include "MantidKernel/PropertyManager.h"
-
-#include <boost/shared_ptr.hpp>
-
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <stdexcept>
namespace Mantid
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IArchiveSearch.h b/Code/Mantid/Framework/API/inc/MantidAPI/IArchiveSearch.h
index 376f6cc807e..43d50bd46e0 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IArchiveSearch.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IArchiveSearch.h
@@ -6,7 +6,9 @@
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <string>
#include <vector>
#include <set>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h
index 6027de4d263..77ebd70997d 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IFunction.h
@@ -14,8 +14,11 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/Unit.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/variant.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+# include <boost/variant.hpp>
+#endif
+
#include <string>
#include <vector>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h
index 6fd400a2616..2386c502d17 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h
@@ -11,10 +11,12 @@
#include "MantidAPI/IMDIterator.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidGeometry/MDGeometry/IMDDimension.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/variant.hpp>
-#include <boost/scoped_array.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+# include <boost/shared_array.hpp>
+# include <boost/variant.hpp>
+# include <boost/scoped_array.hpp>
+#endif
#include <string>
#include <vector>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h
index 786348415c2..72bd98ebd7d 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h
@@ -8,7 +8,9 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/Unit.h"
-#include <boost/weak_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/weak_ptr.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ITableWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/ITableWorkspace.h
index b2c0faef5a0..6971cab0156 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ITableWorkspace.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ITableWorkspace.h
@@ -10,8 +10,11 @@
#include "MantidKernel/V3D.h"
#include "MantidAPI/LogManager.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+# include <boost/lexical_cast.hpp>
+#endif
+
#include <sstream>
namespace Mantid
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h b/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h
index 9f3174eac28..179179330c5 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h
@@ -4,7 +4,10 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
+
#include <vector>
#include "MantidAPI/DllConfig.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameter.h b/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameter.h
index 96d6b2926c0..7f134c48c9a 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameter.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameter.h
@@ -13,8 +13,11 @@
#include <sstream>
#include <vector>
#include <memory>
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/algorithm/string.hpp>
+# include <boost/format.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h b/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
index d0dbb645b0d..fbd401f9650 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
@@ -19,8 +19,11 @@
//----------------------------------------------------------------------
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/interprocess/smart_ptr/unique_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+# include <boost/interprocess/smart_ptr/unique_ptr.hpp>
+#endif
+
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
index b99e24e874a..cd1417b1fc8 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -4,7 +4,9 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <boost/scoped_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/scoped_ptr.hpp>
+#endif
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/IMDWorkspace.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ModeratorModel.h b/Code/Mantid/Framework/API/inc/MantidAPI/ModeratorModel.h
index de552b0b28e..36fc640f401 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ModeratorModel.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ModeratorModel.h
@@ -24,7 +24,9 @@
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/ClassMacros.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <string>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameter.h b/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameter.h
index ea663fb48fc..170601bff7d 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameter.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameter.h
@@ -3,8 +3,10 @@
#include "MantidKernel/System.h"
#include "MantidAPI/ImplicitFunctionParameter.h"
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/algorithm/string.hpp>
+# include <boost/format.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameterParser.h b/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
index 2bdacd720c3..546fcbc8f80 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
@@ -17,7 +17,10 @@
#include <Poco/Path.h>
#include "MantidAPI/ImplicitFunctionParameterParser.h"
-#include <boost/lexical_cast.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h b/Code/Mantid/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
index 8040da59710..ca4bad11445 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/SpectrumDetectorMapping.h
@@ -3,7 +3,10 @@
#include <vector>
#include <set>
-#include <boost/unordered_map.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/unordered_map.hpp>
+#endif
+
#include "MantidGeometry/IDTypes.h"
#include "MantidAPI/DllConfig.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/TableRow.h b/Code/Mantid/Framework/API/inc/MantidAPI/TableRow.h
index 8212e01c0e5..470741fa567 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/TableRow.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/TableRow.h
@@ -3,7 +3,10 @@
#include "MantidAPI/Column.h"
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+#endif
+
#include <ostream>
#include <vector>
#include <stdexcept>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/TextAxis.h b/Code/Mantid/Framework/API/inc/MantidAPI/TextAxis.h
index 005fb5e4c22..f401fb644ed 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/TextAxis.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/TextAxis.h
@@ -8,8 +8,11 @@
#include "MantidKernel/Unit.h"
#include "MantidAPI/Axis.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+# include <boost/lexical_cast.hpp>
+#endif
+
#include <string>
#include <vector>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/VectorParameterParser.h b/Code/Mantid/Framework/API/inc/MantidAPI/VectorParameterParser.h
index dad73702891..3c8a5812f51 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/VectorParameterParser.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/VectorParameterParser.h
@@ -16,7 +16,9 @@
#include <Poco/DOM/NodeFilter.h>
#include <Poco/File.h>
#include <Poco/Path.h>
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
index fb6e5551f70..acc9c775e88 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
@@ -3,7 +3,9 @@
#include "MantidGeometry/DllConfig.h"
#include "MantidKernel/V3D.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <vector>
#include <string>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
index 994cad2bc2a..b669f2fe36a 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
@@ -2,7 +2,11 @@
#define MANTID_GEOMETRY_REFLECTIONCONDITION_H_
#include "MantidGeometry/DllConfig.h"
-#include <boost/shared_ptr.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
+
#include <vector>
#include <string>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IComponent.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IComponent.h
index cb052f18131..0c4be884012 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IComponent.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IComponent.h
@@ -10,7 +10,9 @@
#include <string>
#include <vector>
#include <set>
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
index e41a8f3b2f5..d0cfab1edc4 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
@@ -2,7 +2,9 @@
#define MANTID_GEOMETRY_IDFOBJECT_H_
#include "MantidKernel/System.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <Poco/Timestamp.h>
#include <Poco/File.h>
#include <Poco/Path.h>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h
index ef637b578da..2caa52875cc 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/INearestNeighbours.h
@@ -6,10 +6,12 @@
#include "MantidGeometry/IDTypes.h"
#include "MantidKernel/V3D.h"
// Boost graphing
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/graph/adjacency_list.hpp>
+# include <boost/unordered_map.hpp>
+# include <boost/shared_ptr.hpp>
+# include <boost/scoped_ptr.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h
index 50f45fbb52d..225e3cfee77 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParComponentFactory.h
@@ -4,7 +4,9 @@
// Includes
//------------------------------------------------------------------------------
#include "MantidGeometry/DllConfig.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <vector>
#include <stdexcept>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index 9f0b69f8ffd..08440671501 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
@@ -18,7 +18,9 @@ namespace { \
#include "MantidKernel/V3D.h"
#include "MantidKernel/Quat.h"
#include "MantidKernel/RegistrationHelper.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <string>
#include <typeinfo>
#include <vector>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
index be0c3e9803c..f5dd9267323 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/IMDDimension.h
@@ -4,7 +4,9 @@
#include "MantidGeometry/DllConfig.h"
#include "MantidGeometry/MDGeometry/MDTypes.h"
#include "MantidKernel/V3D.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <stdexcept>
#include <vector>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h
index 2b85b0b46f9..3d1f50f867d 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDDimensionExtents.h
@@ -10,7 +10,9 @@
#include "MantidGeometry/MDGeometry/MDTypes.h"
#include "MantidKernel/System.h"
#include <limits>
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
index dbb804e81e2..5e7b99b565a 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/BoundingBox.h
@@ -5,7 +5,9 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/Tolerance.h"
#include "MantidKernel/V3D.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <sstream>
namespace Mantid
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
index 0b1bf7f2286..31a543f6295 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
@@ -6,7 +6,9 @@
//----------------------------------------------------------------------
#include "MantidGeometry/DllConfig.h"
#include "MantidKernel/V3D.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <map>
//----------------------------------------------------------------------
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
index 9cdadb8ab85..3ac8af1b606 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
@@ -1,7 +1,9 @@
#ifndef BITMAPGEOMETRYHANDLER_H
#define BITMAPGEOMETRYHANDLER_H
-#include <boost/weak_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/weak_ptr.hpp>
+#endif
#include "MantidGeometry/DllConfig.h"
#include "MantidKernel/Logger.h"
#include "MantidGeometry/IObjComponent.h"
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataItem.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataItem.h
index e098e764883..29a8f7c4b87 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataItem.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataItem.h
@@ -5,7 +5,9 @@
// Includes
//-----------------------------------------------------------------------------
#include "MantidKernel/DllConfig.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <string>
// Poco forward declarations
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataService.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataService.h
index b58a09d224d..b86a9421b70 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataService.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DataService.h
@@ -4,8 +4,10 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include <boost/shared_ptr.hpp>
-#include <boost/algorithm/string.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+# include <boost/algorithm/string.hpp>
+#endif
#include <Poco/NotificationCenter.h>
#include <Poco/Notification.h>
#include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DateAndTime.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DateAndTime.h
index 294f8a5d237..cea3995dba5 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DateAndTime.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DateAndTime.h
@@ -2,7 +2,9 @@
#define DATE_AND_TIME_H
#include "MantidKernel/DllConfig.h"
-#include <boost/date_time/posix_time/posix_time.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/date_time/posix_time/posix_time.hpp>
+#endif
#include <iosfwd>
namespace Mantid
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DiskBuffer.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
index 71da394c61b..4dac5bcda1c 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DiskBuffer.h
@@ -6,11 +6,13 @@
#include "MantidKernel/ISaveable.h"
#include "MantidKernel/MultiThreaded.h"
#include "MantidKernel/System.h"
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/mem_fun.hpp>
-#include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/multi_index_container.hpp>
+# include <boost/multi_index/hashed_index.hpp>
+# include <boost/multi_index/mem_fun.hpp>
+# include <boost/multi_index/ordered_index.hpp>
+# include <boost/multi_index/sequenced_index.hpp>
+#endif
#include <map>
#include <stdint.h>
#include <vector>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DynamicFactory.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DynamicFactory.h
index b90dc5d7464..822069d71fe 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/DynamicFactory.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/DynamicFactory.h
@@ -10,7 +10,9 @@
#include "MantidKernel/RegistrationHelper.h"
// Boost
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
// Poco
#include <Poco/Notification.h>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/FacilityInfo.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
index 8f72726b527..5c7680f700a 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/FacilityInfo.h
@@ -9,8 +9,9 @@
#include "MantidKernel/Logger.h"
#include "MantidKernel/InstrumentInfo.h"
#include "MantidKernel/RemoteJobManager.h"
-
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <vector>
#include <string>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/FunctionTask.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/FunctionTask.h
index a6c596ef63a..6a9fd03cd48 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/FunctionTask.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/FunctionTask.h
@@ -4,8 +4,11 @@
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/Task.h"
#include <stdexcept>
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/bind.hpp>
+# include <boost/function.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ISaveable.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ISaveable.h
index d1ec1ceedd8..7ebf398c48f 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ISaveable.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ISaveable.h
@@ -6,7 +6,9 @@
#include <list>
#include <vector>
#include <algorithm>
-#include <boost/optional.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/optional.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/IValidator.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/IValidator.h
index 7b2c449f1f6..47bf2b7dcc9 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/IValidator.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/IValidator.h
@@ -7,11 +7,13 @@
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/DataItem.h"
#include "MantidKernel/Logger.h"
-#include <boost/any.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_pointer.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/any.hpp>
+# include <boost/shared_ptr.hpp>
+# include <boost/make_shared.hpp>
+# include <boost/type_traits/is_convertible.hpp>
+# include <boost/type_traits/is_pointer.hpp>
+#endif
#include <set>
#include <string>
#include <sstream>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Instantiator.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Instantiator.h
index d88796f3024..c6a44a5739a 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Instantiator.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Instantiator.h
@@ -1,7 +1,9 @@
#ifndef MANTID_KERNEL_INSTANTIATOR_H_
#define MANTID_KERNEL_INSTANTIATOR_H_
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/LibraryManager.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/LibraryManager.h
index 3bd115a8062..4f0c3cbe797 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/LibraryManager.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/LibraryManager.h
@@ -6,7 +6,9 @@
//----------------------------------------------------------------------
#include <string>
#include <map>
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include "MantidKernel/SingletonHolder.h"
#include "MantidKernel/DllConfig.h"
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ListValidator.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ListValidator.h
index 1955d058ea5..8fd5e39a274 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ListValidator.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ListValidator.h
@@ -5,7 +5,9 @@
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/TypedValidator.h"
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+#endif
#include <vector>
namespace Mantid
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogFilter.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogFilter.h
index feba48a458f..dff14cbbb68 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogFilter.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogFilter.h
@@ -8,7 +8,9 @@
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/Exception.h"
-#include <boost/scoped_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/scoped_ptr.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogParser.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogParser.h
index 034b646dc7f..7af1870eaf7 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogParser.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/LogParser.h
@@ -7,7 +7,9 @@
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/Logger.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <map>
#include <sstream>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/MRUList.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/MRUList.h
index f44e4626e38..3baccd62f1e 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/MRUList.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/MRUList.h
@@ -7,10 +7,12 @@
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/MultiThreaded.h"
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/mem_fun.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/multi_index_container.hpp>
+# include <boost/multi_index/hashed_index.hpp>
+# include <boost/multi_index/mem_fun.hpp>
+# include <boost/multi_index/sequenced_index.hpp>
+#endif
#include <fstream>
#include <valarray>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Material.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Material.h
index 8788fec9f46..50cb9347ac5 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Material.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Material.h
@@ -6,7 +6,9 @@
//------------------------------------------------------------------------------
#include "MantidKernel/NeutronAtom.h"
#include "MantidKernel/PhysicalConstants.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <nexus/NeXusFile.hpp>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/MersenneTwister.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/MersenneTwister.h
index 29bb1a6b171..3cdc16a4738 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/MersenneTwister.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/MersenneTwister.h
@@ -7,9 +7,11 @@
#include "MantidKernel/PseudoRandomNumberGenerator.h"
#include "MantidKernel/ClassMacros.h"
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/variate_generator.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/random/mersenne_twister.hpp>
+# include <boost/random/uniform_real.hpp>
+# include <boost/random/variate_generator.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h
index 83a126656b9..80f78528dbb 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h
@@ -27,7 +27,9 @@
#include "MantidKernel/ClassMacros.h"
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/NDRandomNumberGenerator.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Property.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Property.h
index 41fe5815208..2d47cd14148 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Property.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Property.h
@@ -5,7 +5,9 @@
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/DllConfig.h"
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <set>
#include <string>
#include <vector>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
index 59b239223c7..943b72c7d0b 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
@@ -8,8 +8,12 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/NullValidator.h"
-#include <boost/lexical_cast.hpp>
-#include <boost/shared_ptr.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+# include <boost/shared_ptr.hpp>
+#endif
+
#include <Poco/StringTokenizer.h>
#include <vector>
#include "MantidKernel/IPropertySettings.h"
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/RegexStrings.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/RegexStrings.h
index eb6f928616f..16690b5e803 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/RegexStrings.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/RegexStrings.h
@@ -2,7 +2,9 @@
#define REGEXSUPPORT_H
#include "MantidKernel/DllConfig.h"
-#include <boost/regex.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/regex.hpp>
+#endif
namespace Mantid
{
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
index e0db5badca4..0e37f7b3e24 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
@@ -6,7 +6,9 @@
//----------------------------------------------------------------------
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/ListValidator.h"
-#include <boost/lexical_cast.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/lexical_cast.hpp>
+#endif
#include <vector>
namespace Mantid
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Task.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Task.h
index 005019d23a9..779a6301b13 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Task.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Task.h
@@ -1,7 +1,9 @@
#ifndef MANTID_KERNEL_TASK_H_
#define MANTID_KERNEL_TASK_H_
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/MultiThreaded.h"
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
index 451e6b6f062..e68d0973f11 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
@@ -9,7 +9,9 @@
#include <string>
#include <vector>
#include <map>
-#include <boost/shared_ptr.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
#include <stdexcept>
#include <limits>
#include <cfloat>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/UserStringParser.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/UserStringParser.h
index 6fbb28e1d3d..0e8e7fc7f62 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/UserStringParser.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/UserStringParser.h
@@ -6,8 +6,11 @@
//----------------------------------------------------------------------
#include "MantidKernel/DllConfig.h"
-#include <boost/tokenizer.hpp>
-#include <boost/shared_ptr.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/tokenizer.hpp>
+# include <boost/shared_ptr.hpp>
+#endif
#include<vector>
namespace Mantid
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/VMD.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/VMD.h
index cb855c3206f..d30c6256df3 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/VMD.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/VMD.h
@@ -5,8 +5,10 @@
#include "MantidKernel/System.h"
#include "MantidKernel/Tolerance.h"
#include "MantidKernel/V3D.h"
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/trim.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/algorithm/string/split.hpp>
+# include <boost/algorithm/string/trim.hpp>
+#endif
#include <cstddef>
#include <sstream>
#include <stdexcept>
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/XMLInstantiator.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/XMLInstantiator.h
index 27616b02ea4..21eda9ce6b7 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/XMLInstantiator.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/XMLInstantiator.h
@@ -1,8 +1,9 @@
#ifndef MANTID_KERNEL_XMLINSTANTIATOR_H_
#define MANTID_KERNEL_XMLINSTANTIATOR_H_
-#include <boost/shared_ptr.hpp>
-
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
/** @class XMLInstantiator XMLInstantiator.h Kernel/XMLInstantiator.h
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/cow_ptr.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/cow_ptr.h
index 61b70c16a51..de4f02db360 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/cow_ptr.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/cow_ptr.h
@@ -2,7 +2,11 @@
#define MANTIDKERNEL_COW_PTR_H
#include "MultiThreaded.h"
-#include <boost/shared_ptr.hpp>
+
+#ifndef Q_MOC_RUN
+# include <boost/shared_ptr.hpp>
+#endif
+
#include <vector>
namespace Mantid
diff --git a/Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PropertyWithValue.h b/Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PropertyWithValue.h
index aa414a43b44..f173c761b84 100644
--- a/Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PropertyWithValue.h
+++ b/Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PropertyWithValue.h
@@ -26,9 +26,11 @@
#include "MantidKernel/PropertyWithValue.h"
#include "MantidPythonInterface/kernel/Policies/DowncastReturnedValue.h"
-#include <boost/python/class.hpp>
-#include <boost/python/bases.hpp>
-#include <boost/python/return_value_policy.hpp>
+#ifndef Q_MOC_RUN
+# include <boost/python/class.hpp>
+# include <boost/python/bases.hpp>
+# include <boost/python/return_value_policy.hpp>
+#endif
/**
* Define a macro to export PropertyWithValue template types
--
GitLab