diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h b/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
index 7781067addc3..3762859846f6 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParser.h
@@ -24,19 +24,18 @@
 # include <boost/interprocess/smart_ptr/unique_ptr.hpp>
 #endif
 
-#include <Poco/DOM/DOMParser.h>
-#include <Poco/DOM/Document.h>
-#include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/NodeIterator.h>
-#include <Poco/DOM/NodeFilter.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
-
 #include "MantidAPI/DllConfig.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "ImplicitFunctionParameter.h"
 
+namespace Poco
+{
+  namespace DOM
+  {
+    class Element;
+  }
+}
+
 /** XML Parser for parameter types for ImplicitFunctions
 
  @author Owen Arnold, Tessella plc
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h
index 15fe4927d78c..14dd7f16e860 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h
@@ -6,15 +6,6 @@
 //----------------------------------------------------------------------
 #include <vector>
 
-#include <Poco/DOM/DOMParser.h>
-#include <Poco/DOM/Document.h>
-#include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/NodeIterator.h>
-#include <Poco/DOM/NodeFilter.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
-
 #include "MantidKernel/System.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidMDAlgorithms/InvalidParameter.h"
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h
index 006f8bf59651..4d3d30ad0610 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h
@@ -7,22 +7,16 @@
 #include "MantidKernel/System.h"
 
 #include "MantidAPI/ImplicitFunctionParameterParser.h"
-//#include "MantidMDAlgorithms/UpParameter.h"
-//#include "MantidMDAlgorithms/PerpendicularParameter.h"
-//#include "MantidMDAlgorithms/NormalParameter.h"
-//#include "MantidMDAlgorithms/OriginParameter.h"
-
-#include <Poco/DOM/DOMParser.h>
-#include <Poco/DOM/Document.h>
-#include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/NodeIterator.h>
-#include <Poco/DOM/NodeFilter.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 
 #include <boost/algorithm/string.hpp>
 
+namespace Poco
+{
+  namespace DOM
+  {
+    class Element;
+  }
+}
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/BinMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/BinMD.cpp
index 23ca5d91b3c8..838e6e0e806e 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/BinMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/BinMD.cpp
@@ -14,9 +14,6 @@
 #include "MantidMDEvents/MDHistoWorkspace.h"
 #include "MantidMDAlgorithms/BinMD.h"
 #include <boost/algorithm/string.hpp>
-#include <Poco/DOM/Document.h>
-#include <Poco/DOM/DOMParser.h>
-#include <Poco/DOM/Element.h>
 #include "MantidKernel/EnabledWhenProperty.h"
 #include "MantidMDEvents/CoordTransformAffine.h"
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/InvalidParameterParserTest.h b/Code/Mantid/Framework/MDAlgorithms/test/InvalidParameterParserTest.h
index 8752ccbd7c52..ca1d3104707d 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/InvalidParameterParserTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/InvalidParameterParserTest.h
@@ -10,11 +10,6 @@
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/NodeIterator.h>
-#include <Poco/DOM/NodeFilter.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 
 class  InvalidParameterParserTest : public CxxTest::TestSuite
 {
@@ -27,11 +22,10 @@ class  InvalidParameterParserTest : public CxxTest::TestSuite
 
         DOMParser pParser;
         std::string xmlToParse = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Parameter><Type>SomeUnknownParameter</Type><Value>x</Value></Parameter>";
-        Document* pDoc = pParser.parseString(xmlToParse);
-        Element* pRootElem = pDoc->documentElement();
+        Poco::AutoPtr<Document> pDoc = pParser.parseString(xmlToParse);
 
         InvalidParameterParser parser;
-        Mantid::API::ImplicitFunctionParameter* iparam = parser.createParameter(pRootElem);
+        Mantid::API::ImplicitFunctionParameter* iparam = parser.createParameter(pDoc->documentElement());
         InvalidParameter* pInvalidParam = dynamic_cast<InvalidParameter*>(iparam);
         boost::scoped_ptr<InvalidParameter> invalparam(pInvalidParam);
 
diff --git a/Code/Mantid/Framework/MDEvents/src/CoordTransformAffineParser.cpp b/Code/Mantid/Framework/MDEvents/src/CoordTransformAffineParser.cpp
index f3ddd3cadede..c479f9725c71 100644
--- a/Code/Mantid/Framework/MDEvents/src/CoordTransformAffineParser.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/CoordTransformAffineParser.cpp
@@ -3,14 +3,9 @@
 #include "MantidAPI/CoordTransform.h"
 #include "MantidMDEvents/CoordTransformAffine.h"
 #include "MantidMDEvents/CoordTransformAffineParser.h"
-#include <Poco/DOM/Document.h>
-#include <Poco/DOM/DOMParser.h>
+
 #include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeFilter.h>
-#include <Poco/DOM/NodeIterator.h>
 #include <Poco/DOM/NodeList.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 
 namespace Mantid
 {
@@ -48,7 +43,7 @@ namespace Mantid
       }
 
       Element* paramListElement = coordTransElement->getChildElement("ParameterList");
-      Poco::XML::NodeList* parameters = paramListElement->getElementsByTagName("Parameter");
+      Poco::AutoPtr<Poco::XML::NodeList> parameters = paramListElement->getElementsByTagName("Parameter");
 
       //Add input dimension parameter.
       InDimParameterParser inDimParser;
diff --git a/Code/Mantid/Framework/MDEvents/src/CoordTransformDistanceParser.cpp b/Code/Mantid/Framework/MDEvents/src/CoordTransformDistanceParser.cpp
index 55a931388099..32146549d719 100644
--- a/Code/Mantid/Framework/MDEvents/src/CoordTransformDistanceParser.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/CoordTransformDistanceParser.cpp
@@ -3,15 +3,6 @@
 #include "MantidAPI/VectorParameterParser.h"
 #include "MantidAPI/SingleValueParameterParser.h"
 
-#include <Poco/DOM/DOMParser.h>
-#include <Poco/DOM/Document.h>
-#include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/NodeIterator.h>
-#include <Poco/DOM/NodeFilter.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
-
 namespace Mantid
 {
   namespace MDEvents
@@ -52,7 +43,7 @@ namespace Mantid
       }
 
       Element* paramListElement = coordTransElement->getChildElement("ParameterList");
-      Poco::XML::NodeList* parameters = paramListElement->getElementsByTagName("Parameter");
+      Poco::AutoPtr<Poco::XML::NodeList> parameters = paramListElement->getElementsByTagName("Parameter");
 
       // Parse the in dimension parameter.
       InDimParameterParser inDimParamParser;