diff --git a/Code/Mantid/Framework/Algorithms/src/ReadGroupsFromFile.cpp b/Code/Mantid/Framework/Algorithms/src/ReadGroupsFromFile.cpp
index 9add9701867935b436407df9cd9a96affa9ac232..c355b8564e8dc78c40cccbfa5be5849ffc8299cd 100644
--- a/Code/Mantid/Framework/Algorithms/src/ReadGroupsFromFile.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ReadGroupsFromFile.cpp
@@ -2,26 +2,23 @@
 // Includes
 //----------------------------------------------------------------------
 #include <fstream>
+
 #include "MantidAlgorithms/ReadGroupsFromFile.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/InstrumentDataService.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/WorkspaceProperty.h"
+#include "MantidAPI/WorkspaceValidators.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/ConfigService.h"
+#include "MantidKernel/ListValidator.h"
 #include "MantidKernel/System.h"
 
 // Poco XML Headers for Grouping File
 #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>
-#include "MantidAPI/WorkspaceValidators.h"
-#include "MantidKernel/ListValidator.h"
 
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
diff --git a/Code/Mantid/Framework/DataHandling/src/GenerateGroupingPowder.cpp b/Code/Mantid/Framework/DataHandling/src/GenerateGroupingPowder.cpp
index 5f5dcc24a65fad2cedd97ea611bc079e2bdc9877..d925a4fd7bd850c850f43386a5e19c5d7b379406 100644
--- a/Code/Mantid/Framework/DataHandling/src/GenerateGroupingPowder.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/GenerateGroupingPowder.cpp
@@ -3,11 +3,11 @@
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/BoundedValidator.h"
 
-#include "Poco/DOM/Document.h"
-#include "Poco/DOM/Element.h"
-#include "Poco/DOM/Text.h"
-#include "Poco/DOM/AutoPtr.h"
-#include "Poco/DOM/DOMWriter.h"
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/DOMWriter.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Text.h>
 
 #ifdef _MSC_VER
 // Disable a flood of warnings from Poco about inheriting from
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
index b30663623408975b408f1ecd0b98185a1efe5872..c65700a0ab877467b7a9657ac2650fb8d9a94164 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
@@ -10,13 +10,12 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidDataObjects/Workspace2D.h"
 
-#include <Poco/Path.h>
-#include <Poco/DOM/DOMParser.h>
+#include <Poco/AutoPtr.h>
 #include <Poco/DOM/Document.h>
+#include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/Text.h>
 #include <Poco/SAX/InputSource.h>
-#include <Poco/DOM/AutoPtr.h>
+
 
 #include <boost/lexical_cast.hpp>
 //-----------------------------------------------------------------------
@@ -26,7 +25,6 @@ using Poco::XML::Document;
 using Poco::XML::Element;
 using Poco::XML::NodeList;
 using Poco::XML::Node;
-using Poco::XML::Text;
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp
index 378569dbbbb06142d61ab97386d7ff39eb5f1535..eac275524932df28a063073672e9cdb3b8b0bbc5 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp
@@ -10,11 +10,9 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidDataObjects/Workspace2D.h"
 
-#include <Poco/Path.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/Text.h>
 
 #include <boost/lexical_cast.hpp>
 //-----------------------------------------------------------------------
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp b/Code/Mantid/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp
index 37f6b96c15a994bee076f341d1355dc537002810..5d7c46af5b805e29552909f26ff83bdfe1810eb8 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadDetectorsGroupingFile.cpp
@@ -1,3 +1,5 @@
+#include <sstream>
+
 #include "MantidDataHandling/LoadDetectorsGroupingFile.h"
 #include "MantidKernel/System.h"
 #include "MantidAPI/FileProperty.h"
@@ -17,12 +19,9 @@
 #include <Poco/DOM/NodeList.h>
 #include <Poco/DOM/NamedNodeMap.h>
 #include <Poco/Exception.h>
-#include <Poco/File.h>
 #include <Poco/Path.h>
 #include <Poco/String.h>
 
-#include <sstream>
-
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
 
@@ -609,7 +608,7 @@ std::string LoadGroupXMLFile::getAttributeValueByName(Poco::XML::Node *pNode,
                                                       std::string attributename,
                                                       bool &found) {
   // 1. Init
-  Poco::XML::NamedNodeMap *att = pNode->attributes();
+  Poco::AutoPtr<Poco::XML::NamedNodeMap> att = pNode->attributes();
   found = false;
   std::string value = "";
 
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp b/Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
index d5246168f95ca5cca91165c9f2cfecc7a5781150..2e5a8078098c924e61c0a269003c1583e8f928e5 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp
@@ -1,29 +1,28 @@
+#include <cmath>
+#include <cstdlib>
+#include <fstream>
+#include <iostream>
+#include <iterator>
+
 #include "MantidDataHandling/LoadPreNexusMonitors.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/BinaryFile.h"
 
-#include <Poco/Path.h>
-#include <Poco/File.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/shared_array.hpp>
+
+#include <Poco/DOM/AutoPtr.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/NodeIterator.h>
 #include <Poco/DOM/NodeFilter.h>
 #include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/AutoPtr.h>
+#include <Poco/Path.h>
 #include <Poco/SAX/InputSource.h>
 
-#include <boost/lexical_cast.hpp>
-#include <boost/shared_array.hpp>
-
-#include <fstream>
-#include <cmath>
-#include <iostream>
-#include <cstdlib>
-#include <iterator>
-
 namespace Mantid {
 namespace DataHandling {
 
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
index 588e5422fc33c55192eb028133fddce8236447f2..dd7120c63b57bca97f498f6ca35c50c77a597c15 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
@@ -1,25 +1,24 @@
+#include <algorithm>
+#include <fstream>
+
 #include "MantidDataHandling/LoadSpiceXML2DDet.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/WorkspaceProperty.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/ArrayProperty.h"
 
-#include "Poco/SAX/InputSource.h"
-#include "Poco/DOM/Document.h"
-#include "Poco/DOM/DOMParser.h"
-#include "Poco/DOM/AutoPtr.h"
-
-#include "Poco/DOM/NodeIterator.h"
-#include "Poco/DOM/NodeFilter.h"
-
-#include "Poco/DOM/Node.h"
-#include "Poco/DOM/NodeList.h"
-#include "Poco/DOM/NamedNodeMap.h"
-
-#include <algorithm>
-#include <fstream>
 #include <boost/algorithm/string.hpp>
 
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/DOMParser.h>
+#include <Poco/DOM/NamedNodeMap.h>
+#include <Poco/DOM/Node.h>
+#include <Poco/DOM/NodeFilter.h>
+#include <Poco/DOM/NodeIterator.h>
+#include <Poco/DOM/NodeList.h>
+#include <Poco/SAX/InputSource.h>
+
 namespace Mantid {
 namespace DataHandling {
 
diff --git a/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp b/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
index ca088cab0faf7f1a46a733d9e0cc0f011b7f01b5..694da9114c58fcf9b17de874d194aae819d27860 100644
--- a/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
@@ -1,25 +1,24 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
+#include <iostream>
+#include <sstream>
+
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/InternetHelper.h"
 #include "MantidKernel/Exception.h"
 #include "MantidDataHandling/SNSDataArchive.h"
 #include "MantidAPI/ArchiveSearchFactory.h"
 
-#include <Poco/File.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <Poco/AutoPtr.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
-#include "Poco/SAX/InputSource.h"
+#include <Poco/SAX/InputSource.h>
 #include <Poco/DOM/NodeList.h>
-#include <Poco/DOM/NodeIterator.h>
-#include <boost/algorithm/string/predicate.hpp>
-#include "Poco/DOM/AutoPtr.h"
-
-#include <iostream>
-#include <sstream>
 
 
 namespace Mantid {
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveDetectorsGrouping.cpp b/Code/Mantid/Framework/DataHandling/src/SaveDetectorsGrouping.cpp
index eb9c0e0004031e3dfc8f60da8ce54c92edcc48d4..3ad37864c6807070932d4b7be63ddfd5f84e3de3 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveDetectorsGrouping.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveDetectorsGrouping.cpp
@@ -1,17 +1,18 @@
-#include "MantidDataHandling/SaveDetectorsGrouping.h"
-#include "MantidKernel/System.h"
+#include <algorithm>
+#include <fstream>
+#include <sstream>
+
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/ISpectrum.h"
+#include "MantidDataHandling/SaveDetectorsGrouping.h"
+#include "MantidKernel/System.h"
 
-#include "fstream"
-#include "sstream"
-#include "algorithm"
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/DOMWriter.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Text.h>
 
-#include "Poco/DOM/Document.h"
-#include "Poco/DOM/Element.h"
-#include "Poco/DOM/Text.h"
-#include "Poco/DOM/AutoPtr.h"
-#include "Poco/DOM/DOMWriter.h"
 #ifdef _MSC_VER
 // Disable a flood of warnings from Poco about inheriting from
 // std::basic_istream
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveMask.cpp b/Code/Mantid/Framework/DataHandling/src/SaveMask.cpp
index cbc31100b1e879ccd1ef2351e61384ec7fd05ff8..22da9d34e6621d78b9f8dd9f7bd6d1bfd0b84ea0 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveMask.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveMask.cpp
@@ -1,19 +1,20 @@
-#include "MantidDataHandling/SaveMask.h"
-#include "MantidKernel/System.h"
-#include "MantidDataObjects/SpecialWorkspace2D.h"
+#include <fstream>
+#include <sstream>
+#include <algorithm>
+
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/ISpectrum.h"
-
-#include "fstream"
-#include "sstream"
-#include "algorithm"
+#include "MantidDataHandling/SaveMask.h"
+#include "MantidDataObjects/SpecialWorkspace2D.h"
+#include "MantidKernel/System.h"
 
 #include <boost/shared_ptr.hpp>
-#include "Poco/DOM/Document.h"
-#include "Poco/DOM/Element.h"
-#include "Poco/DOM/Text.h"
-#include "Poco/DOM/AutoPtr.h"
-#include "Poco/DOM/DOMWriter.h"
+
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Text.h>
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/DOMWriter.h>
 #ifdef _MSC_VER
 // Disable a flood of warnings from Poco about inheriting from
 // std::basic_istream