diff --git a/src/Base/Persistence.cpp b/src/Base/Persistence.cpp
index 1f12a33686..892fc4df36 100644
--- a/src/Base/Persistence.cpp
+++ b/src/Base/Persistence.cpp
@@ -22,17 +22,19 @@
 
 
 #include "PreCompiled.h"
-#include "Writer.h"
-#include "Reader.h"
-#include "PyObjectBase.h"
 
 #ifndef _PreComp_
 #include <cassert>
 #endif
 
+#include "Exception.h"
+#include "Reader.h"
+#include "Writer.h"
+
 /// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "Persistence.h"
 
+
 using namespace Base;
 
 TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass)
diff --git a/src/Base/Persistence.h b/src/Base/Persistence.h
index c264a50a88..75deac6212 100644
--- a/src/Base/Persistence.h
+++ b/src/Base/Persistence.h
@@ -24,9 +24,6 @@
 #ifndef APP_PERSISTENCE_H
 #define APP_PERSISTENCE_H
 
-// Std. configurations
-
-
 #include "BaseClass.h"
 
 namespace Base
diff --git a/src/Base/PersistencePyImp.cpp b/src/Base/PersistencePyImp.cpp
index d31450de9e..27bdade2c5 100644
--- a/src/Base/PersistencePyImp.cpp
+++ b/src/Base/PersistencePyImp.cpp
@@ -22,11 +22,12 @@
 
 
 #include "PreCompiled.h"
-#include "Writer.h"
-#include "Persistence.h"
-#include <boost/iostreams/device/array.hpp>
+
 #include <boost/iostreams/stream.hpp>
 
+#include "Persistence.h"
+#include "Writer.h"
+
 // inclution of the generated files (generated By PersitancePy.xml)
 #include "PersistencePy.h"
 #include "PersistencePy.cpp"
diff --git a/src/Base/Placement.h b/src/Base/Placement.h
index 6720acba81..4bd5670338 100644
--- a/src/Base/Placement.h
+++ b/src/Base/Placement.h
@@ -23,9 +23,9 @@
 #ifndef BASE_PLACEMENT_H
 #define BASE_PLACEMENT_H
 
-#include "Vector3D.h"
-#include "Rotation.h"
 #include "Matrix.h"
+#include "Rotation.h"
+#include "Vector3D.h"
 
 
 namespace Base {
diff --git a/src/Base/PlacementPyImp.cpp b/src/Base/PlacementPyImp.cpp
index 8b6aed5cac..15789ae5e4 100644
--- a/src/Base/PlacementPyImp.cpp
+++ b/src/Base/PlacementPyImp.cpp
@@ -23,7 +23,6 @@
 
 #include "PreCompiled.h"
 
-#include "Placement.h"
 #include "GeometryPyCXX.h"
 
 // inclusion of the generated files (generated out of PlacementPy.xml)
diff --git a/src/Base/PyExport.cpp b/src/Base/PyExport.cpp
index ca2eb2d5d5..467a91fa43 100644
--- a/src/Base/PyExport.cpp
+++ b/src/Base/PyExport.cpp
@@ -30,11 +30,7 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#   include <cstdlib>
-#endif
 
 #include "PyExport.h"
-#include "PyObjectBase.h"
 
 using namespace Base;
diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp
index 6af4326050..ad28902bbb 100644
--- a/src/Base/PyObjectBase.cpp
+++ b/src/Base/PyObjectBase.cpp
@@ -25,13 +25,13 @@
 
 #ifndef _PreComp_
 # include <sstream>
-# include <cstdlib>
 #endif
 
 #include "PyObjectBase.h"
 #include "Console.h"
 #include "Interpreter.h"
 
+
 #define ATTR_TRACKING
 
 using namespace Base;
diff --git a/src/Base/PyObjectBase.h b/src/Base/PyObjectBase.h
index a68e3c9066..fb0388100b 100644
--- a/src/Base/PyObjectBase.h
+++ b/src/Base/PyObjectBase.h
@@ -48,7 +48,6 @@
 #define slots
 #include <bitset>
 
-#include <typeinfo>
 #include "Exception.h"
 #ifndef PYCXX_PYTHON_2TO3
 #define PYCXX_PYTHON_2TO3
@@ -56,7 +55,6 @@
 #include <CXX/Objects.hxx>
 
 
-
 /** Python static class macro for definition
  * sets up a static function entry in a class inheriting
  * from PyObjectBase. It's a pure convenience macro. You can also do