diff --git a/src/Base/Reader.cpp b/src/Base/Reader.cpp
index a50f39b544..b8b7721f01 100644
--- a/src/Base/Reader.cpp
+++ b/src/Base/Reader.cpp
@@ -24,39 +24,30 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <xercesc/sax/SAXParseException.hpp>
-# include <xercesc/sax/SAXException.hpp>
 # include <xercesc/sax2/XMLReaderFactory.hpp>
-# include <xercesc/sax2/SAX2XMLReader.hpp>
 #endif
 
 #include <locale>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "Reader.h"
 #include "Base64.h"
-#include "Exception.h"
-#include "Persistence.h"
-#include "InputSource.h"
 #include "Console.h"
+#include "InputSource.h"
+#include "Persistence.h"
 #include "Sequencer.h"
+#include "XMLTools.h"
 
 #ifdef _MSC_VER
 #include <zipios++/zipios-config.h>
 #endif
-#include <zipios++/zipfile.h>
 #include <zipios++/zipinputstream.h>
-#include <zipios++/zipoutputstream.h>
-#include <zipios++/meta-iostreams.h>
 
-#include "XMLTools.h"
 
 XERCES_CPP_NAMESPACE_USE
 
 using namespace std;
 
 
-
 // ---------------------------------------------------------------------------
 //  Base::XMLReader: Constructors and Destructor
 // ---------------------------------------------------------------------------
diff --git a/src/Base/Reader.h b/src/Base/Reader.h
index b7a884317b..1b3eb1f42a 100644
--- a/src/Base/Reader.h
+++ b/src/Base/Reader.h
@@ -23,18 +23,18 @@
 #ifndef BASE_READER_H
 #define BASE_READER_H
 
-
-#include <string>
-#include <map>
 #include <bitset>
+#include <map>
 #include <memory>
+#include <sstream>
+#include <string>
 
 #include <xercesc/framework/XMLPScanToken.hpp>
 #include <xercesc/sax2/Attributes.hpp>
 #include <xercesc/sax2/DefaultHandler.hpp>
 
 #include "FileInfo.h"
-#include "Writer.h"
+
 
 namespace zipios {
 class ZipInputStream;
@@ -47,7 +47,7 @@ XERCES_CPP_NAMESPACE_END
 
 namespace Base
 {
-
+class Persistence;
 
 /** The XML reader class
  * This is an important helper class for the store and retrieval system
diff --git a/src/Base/Writer.cpp b/src/Base/Writer.cpp
index 1150703f5f..1a8bf2cb00 100644
--- a/src/Base/Writer.cpp
+++ b/src/Base/Writer.cpp
@@ -23,25 +23,23 @@
 
 #include "PreCompiled.h"
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
+#include <limits>
+#include <locale>
+
 #include "Writer.h"
-#include "Persistence.h"
-#include "Exception.h"
 #include "Base64.h"
+#include "Exception.h"
 #include "FileInfo.h"
+#include "Persistence.h"
 #include "Stream.h"
 #include "Tools.h"
 
-#include <algorithm>
-#include <locale>
-#include <limits>
 
 using namespace Base;
 using namespace std;
 using namespace zipios;
 
 
-
 // ---------------------------------------------------------------------------
 //  Writer: Constructors and Destructor
 // ---------------------------------------------------------------------------
diff --git a/src/Base/XMLTools.cpp b/src/Base/XMLTools.cpp
index 382c186d52..9d824c2b1b 100644
--- a/src/Base/XMLTools.cpp
+++ b/src/Base/XMLTools.cpp
@@ -23,11 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <cassert>
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "XMLTools.h"
 
 using namespace Base;
diff --git a/src/Base/XMLTools.h b/src/Base/XMLTools.h
index 68590af933..9660379685 100644
--- a/src/Base/XMLTools.h
+++ b/src/Base/XMLTools.h
@@ -25,20 +25,13 @@
 #ifndef BASE_XMLTOOLS_H
 #define BASE_XMLTOOLS_H
 
-// Std. configurations
-
-
-// Include files
 #include <memory>
 #include <iostream>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/util/XercesVersion.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/TransService.hpp>
 
 #include <Base/Exception.h>
 
+
 XERCES_CPP_NAMESPACE_BEGIN
     class DOMNode;
     class DOMElement;