diff --git a/src/App/DynamicProperty.cpp b/src/App/DynamicProperty.cpp
index 45ef89051c..208c1cd3ad 100644
--- a/src/App/DynamicProperty.cpp
+++ b/src/App/DynamicProperty.cpp
@@ -22,20 +22,16 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <algorithm>
-#endif
+
+#include <Base/Reader.h>
+#include <Base/Tools.h>
+#include <Base/Writer.h>
 
 #include "DynamicProperty.h"
+#include "Application.h"
 #include "Property.h"
 #include "PropertyContainer.h"
-#include "Application.h"
-#include "ExtensionContainer.h"
-#include <Base/Reader.h>
-#include <Base/Writer.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Tools.h>
+
 
 FC_LOG_LEVEL_INIT("Property",true,true)
 
diff --git a/src/App/DynamicProperty.h b/src/App/DynamicProperty.h
index 91317db545..8a49f9a136 100644
--- a/src/App/DynamicProperty.h
+++ b/src/App/DynamicProperty.h
@@ -24,21 +24,20 @@
 #ifndef APP_DYNAMICPROPERTY_H
 #define APP_DYNAMICPROPERTY_H
 
-#include <Base/Persistence.h>
-#include <unordered_map>
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-#include <boost/functional/hash.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/mem_fun.hpp>
 
+
 namespace Base {
 class Writer;
+class XMLReader;
 class XMLWriter;
 }
 
diff --git a/src/App/FeatureCustom.h b/src/App/FeatureCustom.h
index 777443b8c4..961472a558 100644
--- a/src/App/FeatureCustom.h
+++ b/src/App/FeatureCustom.h
@@ -25,10 +25,9 @@
 #ifndef APP_FEATURECUSTOM_H
 #define APP_FEATURECUSTOM_H
 
-
-#include <Base/Writer.h>
 #include <App/DocumentObject.h>
 
+
 namespace App
 {
 
diff --git a/src/App/FeaturePython.cpp b/src/App/FeaturePython.cpp
index 65de2fec78..79ea67ed30 100644
--- a/src/App/FeaturePython.cpp
+++ b/src/App/FeaturePython.cpp
@@ -26,16 +26,15 @@
 # include <sstream>
 #endif
 
-
-#include <Base/Console.h>
+#include <App/DocumentObjectPy.h>
 #include <Base/Interpreter.h>
-#include <Base/Reader.h>
 #include <Base/MatrixPy.h>
 #include <Base/Tools.h>
-#include <App/DocumentObjectPy.h>
+
 #include "FeaturePython.h"
 #include "FeaturePythonPyImp.h"
 
+
 using namespace App;
 
 FeaturePythonImp::FeaturePythonImp(App::DocumentObject* o)
diff --git a/src/App/FeaturePython.h b/src/App/FeaturePython.h
index de040658b6..1a15f6ea87 100644
--- a/src/App/FeaturePython.h
+++ b/src/App/FeaturePython.h
@@ -25,13 +25,9 @@
 #ifndef APP_FEATUREPYTHON_H
 #define APP_FEATUREPYTHON_H
 
-
-#include <Base/Exception.h>
-#include <Base/Writer.h>
 #include <App/GeoFeature.h>
-#include <App/DynamicProperty.h>
 #include <App/PropertyPythonObject.h>
-#include <App/PropertyGeo.h>
+
 
 namespace App
 {
diff --git a/src/App/FeaturePythonPyImp.h b/src/App/FeaturePythonPyImp.h
index a1671102f5..a31f8095fe 100644
--- a/src/App/FeaturePythonPyImp.h
+++ b/src/App/FeaturePythonPyImp.h
@@ -25,7 +25,7 @@
 
 #include <Base/BaseClass.h>
 #include <Base/Interpreter.h>
-#include <App/PropertyContainerPy.h>
+#include <Base/PyObjectBase.h>
 
 #if defined(__clang__)
 # pragma clang diagnostic push
@@ -76,6 +76,8 @@
 namespace App
 {
 
+class Property;
+
 /**
  * @author Werner Mayer
  */
diff --git a/src/App/FeatureTest.cpp b/src/App/FeatureTest.cpp
index a24f6046f8..a7aba4e6bf 100644
--- a/src/App/FeatureTest.cpp
+++ b/src/App/FeatureTest.cpp
@@ -22,17 +22,12 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <stdexcept>
-#endif
 
-
-#include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Unit.h>
+
 #include "FeatureTest.h"
 #include "Material.h"
-#include "Material.h"
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4700 )
diff --git a/src/App/FeatureTest.h b/src/App/FeatureTest.h
index c193fe049b..e2592a1c54 100644
--- a/src/App/FeatureTest.h
+++ b/src/App/FeatureTest.h
@@ -21,15 +21,14 @@
  ***************************************************************************/
 
 
-
 #ifndef APP_FEATURETEST_H
 #define APP_FEATURETEST_H
 
-
 #include "DocumentObject.h"
-#include "PropertyUnits.h"
 #include "PropertyGeo.h"
 #include "PropertyLinks.h"
+#include "PropertyUnits.h"
+
 
 namespace App
 {
diff --git a/src/App/GeoFeature.cpp b/src/App/GeoFeature.cpp
index 0e9df0b3e6..80590bf74b 100644
--- a/src/App/GeoFeature.cpp
+++ b/src/App/GeoFeature.cpp
@@ -23,12 +23,11 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <App/GeoFeaturePy.h>
 
 #include "GeoFeature.h"
 #include "GeoFeatureGroupExtension.h"
-#include <App/GeoFeaturePy.h>
+
 
 using namespace App;
 
diff --git a/src/App/GeoFeature.h b/src/App/GeoFeature.h
index 9936b414b2..bbc35454dc 100644
--- a/src/App/GeoFeature.h
+++ b/src/App/GeoFeature.h
@@ -28,7 +28,6 @@
 #include "PropertyGeo.h"
 
 
-
 namespace App
 {
 
diff --git a/src/App/GeoFeatureGroupExtension.cpp b/src/App/GeoFeatureGroupExtension.cpp
index deeec66a04..1dfb23a971 100644
--- a/src/App/GeoFeatureGroupExtension.cpp
+++ b/src/App/GeoFeatureGroupExtension.cpp
@@ -24,20 +24,15 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/Document.h>
-
-#include "Link.h"
-#include "GeoFeatureGroupExtension.h"
-#include "OriginFeature.h"
-#include "Origin.h"
-#include "OriginGroupExtension.h"
-#include <Base/Console.h>
 #include <Base/Tools.h>
-//#include "GeoFeatureGroupPy.h"
-//#include "FeaturePythonPyImp.h"
+
+#include "GeoFeatureGroupExtension.h"
+#include "Link.h"
+#include "Origin.h"
+#include "OriginFeature.h"
+#include "OriginGroupExtension.h"
+
 
 using namespace App;
 
diff --git a/src/App/GeoFeatureGroupExtension.h b/src/App/GeoFeatureGroupExtension.h
index 376b2c1401..7a7ce6d017 100644
--- a/src/App/GeoFeatureGroupExtension.h
+++ b/src/App/GeoFeatureGroupExtension.h
@@ -25,11 +25,10 @@
 #ifndef APP_GeoFeatureGroup_H
 #define APP_GeoFeatureGroup_H
 
-#include <App/FeaturePython.h>
-
-#include "DocumentObjectGroup.h"
+#include "GroupExtension.h"
 #include "PropertyGeo.h"
 
+
 namespace App
 {
 
diff --git a/src/App/GeoFeatureGroupExtensionPyImp.cpp b/src/App/GeoFeatureGroupExtensionPyImp.cpp
index e3ee368157..9261bb550f 100644
--- a/src/App/GeoFeatureGroupExtensionPyImp.cpp
+++ b/src/App/GeoFeatureGroupExtensionPyImp.cpp
@@ -24,8 +24,6 @@
 
 #include "PreCompiled.h"
 
-#include "App/GeoFeatureGroupExtension.h"
-
 // inclusion of the generated files (generated out of GeoFeatureGroupExtensionPy.xml)
 #include "GeoFeatureGroupExtensionPy.h"
 #include "GeoFeatureGroupExtensionPy.cpp"
diff --git a/src/App/GeoFeaturePyImp.cpp b/src/App/GeoFeaturePyImp.cpp
index d2bd0941aa..70cff24361 100644
--- a/src/App/GeoFeaturePyImp.cpp
+++ b/src/App/GeoFeaturePyImp.cpp
@@ -23,8 +23,6 @@
 
 #include "PreCompiled.h"
 
-#include "App/GeoFeature.h"
-
 // inclusion of the generated files (generated out of GeoFeaturePy.xml)
 #include "GeoFeaturePy.h"
 #include "GeoFeaturePy.cpp"
diff --git a/src/App/GroupExtension.cpp b/src/App/GroupExtension.cpp
index b56963c04c..551471c3d5 100644
--- a/src/App/GroupExtension.cpp
+++ b/src/App/GroupExtension.cpp
@@ -23,19 +23,13 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <boost_bind_bind.hpp>
-#endif
-
-#include "DocumentObjectGroup.h"
-#include "DocumentObjectGroupPy.h"
-#include "GroupExtensionPy.h"
-#include "Document.h"
-#include "FeaturePythonPyImp.h"
-#include "GeoFeatureGroupExtension.h"
-#include <Base/Console.h>
 #include <Base/Tools.h>
 
+#include "Document.h"
+#include "GeoFeatureGroupExtension.h"
+#include "GroupExtensionPy.h"
+
+
 using namespace App;
 namespace bp = boost::placeholders;
 
diff --git a/src/App/GroupExtension.h b/src/App/GroupExtension.h
index 9940f44352..38750b54fd 100644
--- a/src/App/GroupExtension.h
+++ b/src/App/GroupExtension.h
@@ -24,13 +24,11 @@
 #ifndef APP_GROUPEXTENSION_H
 #define APP_GROUPEXTENSION_H
 
-#include <boost_signals2.hpp>
-#include "FeaturePython.h"
 #include "DocumentObject.h"
-#include "PropertyLinks.h"
 #include "DocumentObjectExtension.h"
 #include <vector>
 
+
 namespace App
 {
 class DocumentObjectGroup;
diff --git a/src/App/GroupExtensionPyImp.cpp b/src/App/GroupExtensionPyImp.cpp
index 5e2f2df9c5..6bba7a8c69 100644
--- a/src/App/GroupExtensionPyImp.cpp
+++ b/src/App/GroupExtensionPyImp.cpp
@@ -23,15 +23,14 @@
 
 #include "PreCompiled.h"
 
-#include "DocumentObjectGroup.h"
-#include "Document.h"
-#include <CXX/Objects.hxx>
+#include "DocumentObject.h"
 
 // inclusion of the generated files (generated out of GroupExtensionPy.xml)
 #include "GroupExtensionPy.h"
 #include "GroupExtensionPy.cpp"
 #include "DocumentObjectPy.h"
 
+
 using namespace App;
 
 // returns a string which represent the object e.g. when printed in python
diff --git a/src/App/InventorObject.cpp b/src/App/InventorObject.cpp
index 52d1f2a1ff..a005c6d4ef 100644
--- a/src/App/InventorObject.cpp
+++ b/src/App/InventorObject.cpp
@@ -23,12 +23,10 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "InventorObject.h"
 #include "DocumentObjectPy.h"
 
+
 using namespace App;
 
 PROPERTY_SOURCE(App::InventorObject, App::GeoFeature)
diff --git a/src/App/Part.h b/src/App/Part.h
index a38ab5ec8f..c058582ebf 100644
--- a/src/App/Part.h
+++ b/src/App/Part.h
@@ -24,11 +24,11 @@
 #ifndef APP_Part_H
 #define APP_Part_H
 
+#include "GeoFeature.h"
 #include "OriginGroupExtension.h"
 #include "PropertyLinks.h"
 
 
-
 namespace App
 {