diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h
index dc8f6ee1e578754eeeab985168feaccd3ef8a95e..fd9b1df6089610f208d2568b03de011b3c4df5e7 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h
@@ -6,7 +6,6 @@
 //------------------------------------------------------------------------------
 #include "MantidAPI/DllConfig.h"
 #include "MantidKernel/TypedValidator.h"
-#include <boost/shared_ptr.hpp>
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h
index d4fbc1c89cb256b41f2b38d5e3fa46d153b3422e..04bf937189a02f68118386d9ea12b5ea3754b7a1 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmProxy.h
@@ -7,8 +7,6 @@
 #include "MantidAPI/DllConfig.h"
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidKernel/PropertyManagerOwner.h"
-#include <boost/shared_ptr.hpp>
-
 
 #ifdef _MSC_VER
   #pragma warning( disable: 4250 ) // Disable warning regarding inheritance via dominance, we have no way around it with the design
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/Axis.h b/Code/Mantid/Framework/API/inc/MantidAPI/Axis.h
index 6784b7fd2393120181a07f9b8ad867c19efac4b7..d402ba01c8ef6aa2c166d8502f25674084e83990 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/Axis.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/Axis.h
@@ -4,7 +4,6 @@
 #include "MantidAPI/DllConfig.h"
 #include "MantidKernel/Unit.h"
 #include "MantidGeometry/IDTypes.h"
-#include <boost/shared_ptr.hpp>
 #include <string>
 #include <vector>
 
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h b/Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h
index 2ba5838baabba64a8bdd8e88e02c9cf5887e96b8..df98cad970e94d8b3b749546bbff239de6ad388a 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h
@@ -8,8 +8,7 @@
 #include "MantidKernel/Exception.h"
 #include "MantidAPI/IBoxControllerIO.h"
 #include <nexus/NeXusFile.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/interprocess/smart_ptr/unique_ptr.hpp>
+
 #include <vector>
 
 
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ChopperModel.h b/Code/Mantid/Framework/API/inc/MantidAPI/ChopperModel.h
index 669aad38ec3a1b37fbca2f78b5f5ba4dcadfb5c2..c471bf4a3c5ff4b6a99e432c335cece3dbd9c761 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ChopperModel.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ChopperModel.h
@@ -24,8 +24,6 @@
 #include "MantidAPI/DllConfig.h"
 #include "MantidAPI/Run.h"
 
-#include <boost/shared_ptr.hpp>
-
 #include <string>
 
 namespace Mantid
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunction.h
index fad055511359a5b180194f8adc5747cb3a81b050..8d2408a3dce628f451dcce7e506e9cc6dd60f7b5 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunction.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunction.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/IFunction.h"
 #include "MantidAPI/Jacobian.h"
 
-#include <boost/shared_array.hpp>
 #include <map>
 
 namespace Mantid
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionFactory.h b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionFactory.h
index b9fed8c63c82d4b379622c64ddf7bb52ba6df66d..0c491a8ab25d7066aba02110716268b97b8434b5 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -10,9 +10,6 @@
 #include "MantidKernel/SingletonHolder.h"
 #include "MantidKernel/MultiThreaded.h"
 
-#include <boost/shared_ptr.hpp>
-
-
 namespace Mantid
 {
         
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionProperty.h b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionProperty.h
index eba0b6c6c551c8fde1d07b62aa0d7d3912395aaa..1db8c6b3400348d08d7a640e813ba3a78f381f9d 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionProperty.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionProperty.h
@@ -10,8 +10,6 @@
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/Exception.h"
 
-#include <boost/shared_ptr.hpp>
-
 #include <string>
 
 namespace Mantid
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain.h b/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain.h
index a08288b2f78fd9b8a1544489f9e1203379a39816..9a82efb2ea257ad527008561567c84fe6a91ecce 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain.h
@@ -4,7 +4,6 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 #include "MantidAPI/DllConfig.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain1D.h b/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain1D.h
index a12faa6208d2d79d6f42fd663054b0fdf018313b..f5d9ea2230c856680b1ee85be0f59048515fbe5f 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain1D.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/GridDomain1D.h
@@ -5,7 +5,6 @@
 // Includes
 //----------------------------------------------------------------------
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
 
 #include "MantidAPI/DllConfig.h"
 #include "MantidAPI/GridDomain.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ILiveListener.h b/Code/Mantid/Framework/API/inc/MantidAPI/ILiveListener.h
index fe7d10dc7248b34b5fcd6027720ca8a618a1d25d..483a5db83a804fae655d080f2f8e745f8058d5ac 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ILiveListener.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ILiveListener.h
@@ -5,7 +5,6 @@
 // Includes
 //----------------------------------------------------------------------
 #include <string>
-#include <boost/shared_ptr.hpp>
 #include <Poco/Net/SocketAddress.h>
 #include "MantidKernel/DateAndTime.h"
 #include "MantidGeometry/IDTypes.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
index 9195106fad4e85dafcb088962a439c58f2900a85..59c3ff17e27545c26ca872f7166884b32a08c115 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
@@ -14,7 +14,6 @@
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
 #include "MantidKernel/ProgressBase.h"
 #include "MantidKernel/ThreadScheduler.h"
-#include <boost/shared_ptr.hpp>
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h
index b8f4d58762fcf99acdde641ae11f0cd1821294d8..6c8b3e65093f9bbae6dde7e3cb28811a5067f0a4 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h
@@ -7,7 +7,6 @@
 #include <stdint.h>
 #include "MantidAPI/Workspace.h"
 #include "MantidGeometry/MDGeometry/IMDDimension.h"
-#include <boost/shared_ptr.hpp>
 #include <vector>
 #include <stdarg.h>
 #include "MantidAPI/MDGeometry.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/LinearScale.h b/Code/Mantid/Framework/API/inc/MantidAPI/LinearScale.h
index 115e2c4419735408fe8a04530dd23519f2f32044..83fc4ee6675a67e4910a5a0ea18b0d65e56681a5 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/LinearScale.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/LinearScale.h
@@ -5,7 +5,6 @@
 // Includes
 //----------------------------------------------------------------------
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 #include "MantidAPI/DllConfig.h"
 #include "MantidAPI/ITransformScale.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/LogarithmScale.h b/Code/Mantid/Framework/API/inc/MantidAPI/LogarithmScale.h
index a3a334d81c062cb36157924696efd2d91334ac1d..f7021938ee8879da62c0ac005ffd47aef024d945 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/LogarithmScale.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/LogarithmScale.h
@@ -5,7 +5,6 @@
 // Includes
 //----------------------------------------------------------------------
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <cmath>
 
 #include "MantidAPI/DllConfig.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/NumericAxis.h b/Code/Mantid/Framework/API/inc/MantidAPI/NumericAxis.h
index ff709ae13008ea7646d94aa2a330ffb3d5a27444..9f8b1e06d5c316409f419c35f2582d98aa2fba03 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/NumericAxis.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/NumericAxis.h
@@ -8,7 +8,6 @@
 #include "MantidKernel/Unit.h"
 #include "MantidAPI/Axis.h"
 
-#include <boost/shared_ptr.hpp>
 #include <string>
 #include <vector>
 
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h
index 87e28b3027566ea4a7c6399e7b32c95d8c0726af..8af5aec6a9ca77e811375bb220eb2682de657ec9 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h
@@ -7,10 +7,8 @@
 #include "MantidAPI/DllConfig.h"
 #include "MantidKernel/Unit.h"
 #include "MantidAPI/IFunction.h"
-#include <boost/shared_ptr.hpp>
 #include <string>
 #include <vector>
-#include <boost/shared_array.hpp>
 
 #ifndef HAS_UNORDERED_MAP_H
 #include <map>
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
index 142bc1c0e559e93830b89b2e0c28026c9c9cb967..eab49883a84be9e80311a7f622f2e06cbe1c753f 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
@@ -7,7 +7,6 @@
 
 #include "MantidKernel/DateAndTime.h"
 #include "MantidAPI/DllConfig.h"
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace Mantid
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
index 32b89d2cb259c394643a68ec157fc42bab19ecd9..da4b60375197ecbb10f05796b1f9baaeee20b679 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
@@ -9,8 +9,6 @@
 #include "MantidKernel/DynamicFactory.h"
 #include "MantidKernel/SingletonHolder.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace Mantid
 {
 
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/SpectraAxis.h b/Code/Mantid/Framework/API/inc/MantidAPI/SpectraAxis.h
index 19960ce7afb41ba7d24ab92047c91af668c2b49f..89dfd1d1e3158ec1670ce5c03702a495a26531ae 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/SpectraAxis.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/SpectraAxis.h
@@ -8,7 +8,6 @@
 #include "MantidAPI/SpectraDetectorTypes.h"
 #include "MantidAPI/DllConfig.h"
 #include "MantidKernel/Unit.h"
-#include <boost/shared_ptr.hpp>
 #include <string>
 #include <vector>
 
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceHistory.h b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceHistory.h
index aa91fc6cdee5a6e3be45f4f1ed18bbcdef7259ba..bce7448fb824f0fed7916b0518648490e5a55d31 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceHistory.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceHistory.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AlgorithmHistory.h"
 #include "MantidKernel/EnvironmentHistory.h"
 #include <nexus/NeXusFile.hpp>
-#include <boost/shared_ptr.hpp>
 #include <ctime>
 #include <list>
 #include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceProperty.h b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceProperty.h
index 9f8e259e6000da388ce8c1d883646ea3bd4c4a72..dbbfc37ab952153545a29d1af9425180baeebd54 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceProperty.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceProperty.h
@@ -7,7 +7,6 @@
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidAPI/IWorkspaceProperty.h"
 #include "MantidAPI/AnalysisDataService.h"
-#include <boost/shared_ptr.hpp>
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/Exception.h"
 #include "MantidAPI/WorkspaceGroup.h"
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h
index 89194ede690a110cd56edf7fad8c81cbf900fb44..d09d2b1e3f708b6ddfe133d751a96d3bb7dcb7d6 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceValidators.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/TypedValidator.h"
 #include "MantidKernel/CompositeValidator.h"
-#include <boost/shared_ptr.hpp>
 #include <numeric>
 #include <vector>
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
index 279ccdb17ed7fa8b21c2f0e73181a7e1de8819a5..55a2804506eb45afd8ea00a8213963c9a24e97b6 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
@@ -3,7 +3,6 @@
 
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/DllConfig.h"
-#include <boost/shared_ptr.hpp>
 #include <deque>
 #include <string>
 #include <vector>
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IDetector.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IDetector.h
index a987b1f153b31a6f6db2816d83cdf0641b6429f6..c437d13e7cf1f1395dbdef91446a6a210297c1a9 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IDetector.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IDetector.h
@@ -9,7 +9,6 @@
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/IObjComponent.h"
 #include "MantidGeometry/IDTypes.h"
-#include <boost/shared_ptr.hpp>
 #include <stdexcept>
 #include <map>
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IObjComponent.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
index 6b019d1c8e62d2ba7c635a46e032d33adefdf5f8..36bd6d57ec0291f067177f3a277cb2bacc6d3767 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
@@ -8,7 +8,6 @@
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Objects/Track.h"
 #include "MantidKernel/Material.h"
-#include <boost/shared_ptr.hpp>
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
index 17ab348c02b34a836f2f85d9a969e3be1a255607..62820d02b3bce35fc1c7d6dc5398820dd0946178 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
@@ -7,7 +7,6 @@
 #include "MantidGeometry/IDetector.h"
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidGeometry/Instrument/ObjComponent.h"
-#include <boost/shared_ptr.hpp>
 #include <vector>
 #include <map>
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
index fc5d7b3c31994c745b354ddd96a226fcdce76420..30268f713763938be7b97aeacffbd0007e8b1037 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
@@ -4,7 +4,6 @@
 #include "MantidKernel/System.h"
 #include "MantidGeometry/IComponent.h"
 #include <Poco/DOM/Element.h>
-#include <boost/shared_ptr.hpp>
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/ICompAssembly.h"
 #include "MantidKernel/Logger.h"
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
index b296061dfdb2fa7c39f4f9008cfbb4bba0731833..4235d3e11675d550dc09c0c5b7d2228ab97d3433 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
@@ -11,8 +11,6 @@
 #include "MantidKernel/Material.h"
 #include "MantidGeometry/Objects/Object.h"
 
-#include <boost/shared_ptr.hpp>
-
 #ifdef _WIN32
   #pragma warning( disable: 4250 )
 #endif
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
index ba8ecb087b530a3a97172938527418e818646474..c511620b8db0d3fd7cb1b9b6b17789fb091c6439 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
@@ -7,7 +7,6 @@
 #include <vector>
 #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
 #include "MantidKernel/System.h"
-#include <boost/shared_ptr.hpp>
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
index 6e0eb71539dc29833b1409526dd791f5800feeda..6476a7a95e90d9458dcb8af831dc4e192936755e 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
@@ -7,8 +7,6 @@
 #include "MantidKernel/Exception.h"
 #include <vector>
 #include <string>
-#include <boost/shared_ptr.hpp>
-
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h
index be1197e6caa4752238da649381cf418c66d31141..a676f30694f262a884e1eb0e13dff02c0e19cabb 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h
@@ -9,9 +9,6 @@
 #include "MantidKernel/Quat.h"
 #include "BoundingBox.h"
 #include <map>
-#include <string>
-#include <boost/shared_ptr.hpp>
-
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
index 822cbcf4e3c6ef43b8c12d3b35263904f2e47e4c..79a4895a85cdf69189ea4e7fb1b5a5f3a538e18f 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
@@ -3,7 +3,6 @@
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Logger.h"
-#include <boost/shared_ptr.hpp>
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
index 116b77e2050d60a5bf45c8b92a22d7c26d411b93..5637a402b0ce4a02af0937b6671c04f00868a767 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
@@ -1,7 +1,6 @@
 #ifndef CACHE_GEOMETRYHANDLER_H
 #define CACHE_GEOMETRYHANDLER_H
 
-#include <boost/shared_ptr.hpp>
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Rendering/GeometryHandler.h"
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
index eb34d72b138b8f7a34b6a88afab41009c3cb41ae..418a1b8273fe5e430b2b4362dc79a68faafb5c11 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
@@ -1,7 +1,6 @@
 #ifndef GLU_GEOMETRYHANDLER_H
 #define GLU_GEOMETRYHANDLER_H
 
-#include <boost/shared_ptr.hpp>
 #include "MantidGeometry/DllConfig.h"
 #include "MantidGeometry/Rendering/GeometryHandler.h"
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
index f81f48f29529d41ab60d04fb8d99d9f10907fcfe..ff00c8986fd63773513194effc0bf50695e4e6b3 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
@@ -3,7 +3,6 @@
 
 #include "MantidGeometry/DllConfig.h"
 #include "MantidKernel/Logger.h"
-#include <boost/shared_ptr.hpp>
 
 class TopoDS_Shape;
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h
index 31b9e1807ebff731a14c97d8c589f5f48546bafb..227c81d079d1cfe7b06c355fdc08e41c3f9dfabb 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h
@@ -2,7 +2,6 @@
 #define OC_GEOMETRYHANDLER_H
 
 #include "MantidGeometry/DllConfig.h"
-#include <boost/shared_ptr.hpp>
 
 namespace Mantid
 {