diff --git a/src/Base/GeometryPyCXX.cpp b/src/Base/GeometryPyCXX.cpp
index 806a11ca79..151c043b00 100644
--- a/src/Base/GeometryPyCXX.cpp
+++ b/src/Base/GeometryPyCXX.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include "GeometryPyCXX.h"
-#include <Base/VectorPy.h>
+#include "VectorPy.h"
 
 
 int Py::Vector::Vector_TypeCheck(PyObject * obj)
diff --git a/src/Base/GeometryPyCXX.h b/src/Base/GeometryPyCXX.h
index 1f1eaadaea..797a06f682 100644
--- a/src/Base/GeometryPyCXX.h
+++ b/src/Base/GeometryPyCXX.h
@@ -24,18 +24,18 @@
 #ifndef PY_GEOMETRYPY_H
 #define PY_GEOMETRYPY_H
 
-#include <CXX/Objects.hxx>
 #include <CXX/Extensions.hxx>
 #include <FCGlobal.h>
-#include <Base/Vector3D.h>
+
+#include <Base/BoundBoxPy.h>
 #include <Base/Matrix.h>
 #include <Base/MatrixPy.h>
 #include <Base/Rotation.h>
 #include <Base/RotationPy.h>
 #include <Base/Placement.h>
 #include <Base/PlacementPy.h>
-#include <Base/BoundBoxPy.h>
-#include <Base/Tools2D.h>
+#include <Base/Vector3D.h>
+
 
 namespace Base {
 template <typename T>
diff --git a/src/Base/Handle.cpp b/src/Base/Handle.cpp
index 01c534aad1..c02189b83f 100644
--- a/src/Base/Handle.cpp
+++ b/src/Base/Handle.cpp
@@ -25,14 +25,14 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <iostream>
 # include <cassert>
+# include <iostream>
 #endif
 
 #include <QAtomicInt>
 
 #include "Handle.h"
-#include "Exception.h"
+
 
 using namespace Base;
 
diff --git a/src/Base/Handle.h b/src/Base/Handle.h
index 02bebf0eb6..c3e05ffb80 100644
--- a/src/Base/Handle.h
+++ b/src/Base/Handle.h
@@ -25,12 +25,11 @@
 #ifndef BASE_HANDLE_H
 #define BASE_HANDLE_H
 
-// Std. configurations
-
 #ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
 #endif
 
+
 class QAtomicInt;
 
 namespace Base
diff --git a/src/Base/InputSource.cpp b/src/Base/InputSource.cpp
index 107cf0e52b..ef959b730d 100644
--- a/src/Base/InputSource.cpp
+++ b/src/Base/InputSource.cpp
@@ -23,28 +23,10 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <xercesc/sax/SAXParseException.hpp>
-# include <xercesc/sax/SAXException.hpp>
-# include <xercesc/sax2/XMLReaderFactory.hpp>
-#endif
-
-// ---------------------------------------------------------------------------
-//  Includes
-// ---------------------------------------------------------------------------
-#include <xercesc/util/Janitor.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XMLExceptMsgs.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "InputSource.h"
-#include "Exception.h"
 #include "XMLTools.h"
 
+
 XERCES_CPP_NAMESPACE_USE
 
 using namespace Base;
diff --git a/src/Base/InputSource.h b/src/Base/InputSource.h
index 79d1848328..51e12a8421 100644
--- a/src/Base/InputSource.h
+++ b/src/Base/InputSource.h
@@ -23,13 +23,9 @@
 #ifndef BASE_IINPUTSOURCE_H
 #define BASE_IINPUTSOURCE_H
 
-
 #include <iosfwd>
 
-#include <xercesc/sax2/Attributes.hpp>
 #include <xercesc/util/BinInputStream.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/XercesVersion.hpp>
 #include <xercesc/sax/InputSource.hpp>
 #include <QTextCodec>
 #ifndef FC_GLOBAL_H
diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp
index f59443682d..3a75866ee5 100644
--- a/src/Base/Interpreter.cpp
+++ b/src/Base/Interpreter.cpp
@@ -29,16 +29,12 @@
 #   include <boost/regex.hpp>
 #endif
 
-#include "Console.h"
 #include "Interpreter.h"
-#include "FileInfo.h"
-#include "Stream.h"
-#include "PyTools.h"
-#include "Exception.h"
-#include "PyObjectBase.h"
-#include <CXX/Extensions.hxx>
-
+#include "Console.h"
 #include "ExceptionFactory.h"
+#include "FileInfo.h"
+#include "PyObjectBase.h"
+#include "PyTools.h"
 
 
 char format2[1024];  //Warning! Can't go over 512 characters!!!
diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h
index 19888ae83c..dd3d101fd7 100644
--- a/src/Base/Interpreter.h
+++ b/src/Base/Interpreter.h
@@ -31,11 +31,6 @@
 #   undef _XOPEN_SOURCE
 #endif // (re-)defined in pyconfig.h
 
-
-#include <Python.h>
-#include <CXX/Extensions.hxx>
-
-
 #ifdef FC_OS_MACOSX
 #undef toupper
 #undef tolower
@@ -46,12 +41,11 @@
 #undef isalnum
 #endif
 
-// Std. configurations
+#include <CXX/Extensions.hxx>
 #include <string>
-#include <map>
-
 #include "Exception.h"
 
+
 /** Helper macro to obtain callable from an object
  *
  * @param _pyobj: PyObject pointer
@@ -92,7 +86,6 @@ namespace Base {
     using std::vector;
 
 
-
 class BaseExport PyException : public Exception
 {
 public:
diff --git a/src/Base/gzstream.cpp b/src/Base/gzstream.cpp
index ba63d45648..3236c124ed 100644
--- a/src/Base/gzstream.cpp
+++ b/src/Base/gzstream.cpp
@@ -25,11 +25,11 @@
 // Standard streambuf implementation following Nicolai Josuttis, "The 
 // Standard C++ Library".
 // ============================================================================
+
 #include "PreCompiled.h"
 
 #include "gzstream.h"
 #include <cassert>
-#include <string>
 #include <cstring>  // for memcpy
 
 
diff --git a/src/Base/gzstream.h b/src/Base/gzstream.h
index 0816bc5873..7a098d8bf6 100644
--- a/src/Base/gzstream.h
+++ b/src/Base/gzstream.h
@@ -29,11 +29,7 @@
 #ifndef GZSTREAM_H
 #define GZSTREAM_H 1
 
-// standard C++ with new header file names and std:: namespace
-#include <iostream>
-#include <fstream>
-#include <istream>
-#include <ios>
+#include <sstream>
 #include <zlib.h>
 
 #ifdef _MSC_VER