diff --git a/src/App/Placement.cpp b/src/App/Placement.cpp
index d3e9364337..dadba176ad 100644
--- a/src/App/Placement.cpp
+++ b/src/App/Placement.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <Base/Placement.h>
 
 #include "Placement.h"
diff --git a/src/App/Placement.h b/src/App/Placement.h
index e7ae37dcea..a34475d574 100644
--- a/src/App/Placement.h
+++ b/src/App/Placement.h
@@ -25,25 +25,11 @@
 #define _AppPlacement_h_
 
 #include <Base/Placement.h>
-
 #include "FeaturePython.h"
-#include "GeoFeature.h"
-#include "PropertyGeo.h"
-
-
-namespace Base
-{
-//  class Vector3D;
-  //class Matrix4D;
-}
-
-//using Base::Vector3D;
-//using Base::Matrix4D;
 
 namespace App
 {
 
-
 /** Placement Object
  *  Handles the repositioning of data. Also can do grouping
  */
@@ -52,8 +38,6 @@ class AppExport Placement: public App::GeoFeature
     PROPERTY_HEADER(App::Placement);
 
 public:
-
-
   /// Constructor
   Placement(void);
   virtual ~Placement();
@@ -68,10 +52,7 @@ public:
 typedef App::FeaturePythonT<App::Placement> PlacementPython;
 
 
-
-
 } //namespace App
 
 
-
 #endif
diff --git a/src/App/Property.cpp b/src/App/Property.cpp
index 52876db92c..7dc5caa5d0 100644
--- a/src/App/Property.cpp
+++ b/src/App/Property.cpp
@@ -24,19 +24,17 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#	include <cassert>
+#include <cassert>
 #endif
 
 #include <atomic>
+#include <Base/Tools.h>
+#include <Base/Writer.h>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "Property.h"
 #include "ObjectIdentifier.h"
 #include "PropertyContainer.h"
-#include <Base/Exception.h>
-#include <Base/Tools.h>
-#include "Application.h"
-#include "DocumentObject.h"
+
 
 using namespace App;
 
diff --git a/src/App/Property.h b/src/App/Property.h
index 8258724db3..d6f3cc4614 100644
--- a/src/App/Property.h
+++ b/src/App/Property.h
@@ -24,14 +24,12 @@
 #ifndef APP_PROPERTY_H
 #define APP_PROPERTY_H
 
-// Std. configurations
-
 #include <Base/Exception.h>
 #include <Base/Persistence.h>
 #include <boost/any.hpp>
-#include <string>
-#include <bitset>
 #include <boost/signals2.hpp>
+#include <bitset>
+#include <string>
 #include <FCGlobal.h>
 
 namespace Py {
diff --git a/src/App/PropertyContainer.cpp b/src/App/PropertyContainer.cpp
index 9abad5e779..a5f8d63f47 100644
--- a/src/App/PropertyContainer.cpp
+++ b/src/App/PropertyContainer.cpp
@@ -23,22 +23,14 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <cassert>
-# include <algorithm>
-# include <functional>
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Reader.h>
-#include <Base/Writer.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 
-#include "Application.h"
 #include "Property.h"
 #include "PropertyContainer.h"
-#include "PropertyLinks.h"
+
 
 FC_LOG_LEVEL_INIT("App",true,true)
 
diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h
index 92458b8d5a..f7ebe291c2 100644
--- a/src/App/PropertyContainer.h
+++ b/src/App/PropertyContainer.h
@@ -25,7 +25,6 @@
 #define APP_PROPERTYCONTAINER_H
 
 #include <map>
-#include <climits>
 #include <cstring>
 #include <Base/Persistence.h>
 
diff --git a/src/App/PropertyContainerPyImp.cpp b/src/App/PropertyContainerPyImp.cpp
index 7eec6216f5..af5380ef29 100644
--- a/src/App/PropertyContainerPyImp.cpp
+++ b/src/App/PropertyContainerPyImp.cpp
@@ -29,8 +29,6 @@
 
 #include "PropertyContainer.h"
 #include "Property.h"
-#include "PropertyLinks.h"
-#include "Application.h"
 #include "DocumentObject.h"
 
 #include <boost/iostreams/device/array.hpp>
diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp
index e316c0310d..858073d5b9 100644
--- a/src/App/PropertyExpressionEngine.cpp
+++ b/src/App/PropertyExpressionEngine.cpp
@@ -21,21 +21,17 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Base/Interpreter.h>
-#include <Base/Writer.h>
 #include <Base/Reader.h>
 #include <Base/Tools.h>
-#include "ExpressionParser.h"
-#include "ExpressionVisitors.h"
+#include <Base/Writer.h>
+
 #include "PropertyExpressionEngine.h"
-#include "PropertyStandard.h"
-#include "PropertyUnits.h"
-#include <CXX/Objects.hxx>
-#include <boost/bind/bind.hpp>
-#include <boost/graph/graph_traits.hpp>
+#include "ExpressionVisitors.h"
+
 
 FC_LOG_LEVEL_INIT("App",true);
 
diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h
index edc2748ab1..caa0fe18d4 100644
--- a/src/App/PropertyExpressionEngine.h
+++ b/src/App/PropertyExpressionEngine.h
@@ -28,7 +28,6 @@
 #include <boost_signals2.hpp>
 #include <boost_graph_adjacency_list.hpp>
 #include <boost/graph/topological_sort.hpp>
-#include <App/PropertyLinks.h>
 #include <App/Expression.h>
 #include <set>
 
diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp
index c563cb79c6..563ca2a8a6 100644
--- a/src/App/PropertyFile.cpp
+++ b/src/App/PropertyFile.cpp
@@ -23,25 +23,16 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <algorithm>
-# include <sstream>
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-
-#include <Base/Exception.h>
+#include <Base/Console.h>
 #include <Base/Reader.h>
 #include <Base/Writer.h>
-#include <Base/Stream.h>
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Uuid.h>
 
 #include "PropertyFile.h"
 #include "Document.h"
-#include "PropertyContainer.h"
 #include "DocumentObject.h"
+#include "PropertyContainer.h"
+
 
 using namespace App;
 using namespace Base;
diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h
index 72dea92d47..f512ae4522 100644
--- a/src/App/PropertyFile.h
+++ b/src/App/PropertyFile.h
@@ -24,13 +24,7 @@
 #ifndef APP_PROPERTFILE_H
 #define APP_PROPERTFILE_H
 
-// Std. configurations
-
-
 #include <string>
-#include <list>
-#include <vector>
-#include <boost/filesystem/path.hpp>
 
 #include "PropertyStandard.h"
 
diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp
index 062e78a7b9..dc109e744d 100644
--- a/src/App/PropertyGeo.cpp
+++ b/src/App/PropertyGeo.cpp
@@ -23,31 +23,24 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#	include <assert.h>
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-
-#include <Base/Exception.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Stream.h>
-#include <Base/Rotation.h>
-#include <Base/Quantity.h>
-#include <Base/Tools.h>
-#include <Base/VectorPy.h>
 #include <Base/MatrixPy.h>
 #include <Base/PlacementPy.h>
-#include <Base/QuantityPy.h>
-#include <Base/RotationPy.h>
+#include <Base/Reader.h>
+
+#include <Base/Quantity.h>
+#include <Base/QuantityPy.h>
+#include <Base/Rotation.h>
+#include <Base/RotationPy.h>
+#include <Base/Stream.h>
+#include <Base/Tools.h>
+#include <Base/VectorPy.h>
+#include <Base/Writer.h>
 
-#include "Document.h"
-#include "DocumentObject.h"
-#include "Placement.h"
 #include "PropertyGeo.h"
+#include "Placement.h"
 #include "ObjectIdentifier.h"
 
+
 using namespace App;
 using namespace Base;
 using namespace std;
diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h
index 77825f52c1..633e4b567c 100644
--- a/src/App/PropertyGeo.h
+++ b/src/App/PropertyGeo.h
@@ -24,19 +24,18 @@
 #ifndef APP_PROPERTYGEO_H
 #define APP_PROPERTYGEO_H
 
-// Std. configurations
-
-#include <Base/Vector3D.h>
-#include <Base/Matrix.h>
 #include <Base/BoundBox.h>
+#include <Base/Matrix.h>
 #include <Base/Placement.h>
 #include <Base/Unit.h>
+#include <Base/Vector3D.h>
 
 #include "Property.h"
-#include "PropertyLinks.h"
 #include "ComplexGeoData.h"
+#include "PropertyLinks.h"
 #include <FCGlobal.h>
 
+
 namespace Base {
 class Writer;
 }
diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp
index 3144bb3b3d..83728b086d 100644
--- a/src/App/PropertyLinks.cpp
+++ b/src/App/PropertyLinks.cpp
@@ -23,32 +23,22 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <assert.h>
-# include <sstream>
-#endif
-
-#include <QFileInfo>
-#include <QDateTime>
 #include <QDir>
-
+#include <QFileInfo>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost_bind_bind.hpp>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <CXX/Objects.hxx>
+#include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Reader.h>
 #include <Base/Writer.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-
-#include "Application.h"
-#include "DocumentObject.h"
-#include "DocumentObjectPy.h"
-#include "Document.h"
 
 #include "PropertyLinks.h"
+#include "Application.h"
+#include "Document.h"
+#include "DocumentObject.h"
+#include "DocumentObjectPy.h"
+
 
 FC_LOG_LEVEL_INIT("PropertyLinks",true,true)
 
diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h
index 5f527ba765..da9f9838ff 100644
--- a/src/App/PropertyLinks.h
+++ b/src/App/PropertyLinks.h
@@ -24,15 +24,10 @@
 #ifndef APP_PROPERTYLINKS_H
 #define APP_PROPERTYLINKS_H
 
-// Std. configurations
-#include <boost_signals2.hpp>
-
-#include <vector>
-#include <map>
 #include <list>
+#include <map>
 #include <string>
-#include <memory>
-#include <cinttypes>
+#include <vector>
 #include "Property.h"
 
 namespace Base {
diff --git a/src/App/PropertyPythonObject.cpp b/src/App/PropertyPythonObject.cpp
index 8e201a5cba..b8433162f5 100644
--- a/src/App/PropertyPythonObject.cpp
+++ b/src/App/PropertyPythonObject.cpp
@@ -23,20 +23,18 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include "PropertyPythonObject.h"
-#include "DocumentObjectPy.h"
-#include "DocumentObject.h"
-#include <Base/Base64.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
 #include <iostream>
 #include <boost/regex.hpp>
 
+#include <Base/Base64.h>
+#include <Base/Console.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
+
+#include "PropertyPythonObject.h"
+#include "DocumentObject.h"
+
+
 using namespace App;
 
 
diff --git a/src/App/PropertyPythonObject.h b/src/App/PropertyPythonObject.h
index bd4bec9339..dfaea0f7bd 100644
--- a/src/App/PropertyPythonObject.h
+++ b/src/App/PropertyPythonObject.h
@@ -25,8 +25,6 @@
 #define APP_PROPERTYPYTHONOBJECT_H
 
 #include <string>
-#include <list>
-#include <vector>
 #include <CXX/Objects.hxx>
 
 #include "Property.h"
diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp
index 3344c9a29a..2847560f5f 100644
--- a/src/App/PropertyStandard.cpp
+++ b/src/App/PropertyStandard.cpp
@@ -23,31 +23,23 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <sstream>
-# include <boost/version.hpp>
-# include <boost/filesystem/path.hpp>
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <boost/math/special_functions/round.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/math/special_functions/round.hpp>
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Reader.h>
 #include <Base/Writer.h>
-#include <Base/Stream.h>
 #include <Base/Quantity.h>
 #include <Base/Tools.h>
 
 #include "PropertyStandard.h"
-#include "PropertyLinks.h"
-#include "MaterialPy.h"
-#include "ObjectIdentifier.h"
 #include "Application.h"
 #include "Document.h"
 #include "DocumentObject.h"
+#include "MaterialPy.h"
+#include "ObjectIdentifier.h"
+
 
 using namespace App;
 using namespace Base;
diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h
index 7bc229bfdd..e9c477aa91 100644
--- a/src/App/PropertyStandard.h
+++ b/src/App/PropertyStandard.h
@@ -24,21 +24,19 @@
 #ifndef APP_PROPERTYSTANDARD_H
 #define APP_PROPERTYSTANDARD_H
 
-// Std. configurations
-
-
+#include <list>
 #include <memory>
 #include <string>
-#include <list>
 #include <vector>
 #include <boost/dynamic_bitset.hpp>
 #include <boost/filesystem/path.hpp>
-
 #include <Base/Uuid.h>
-#include "Enumeration.h"
+
 #include "Property.h"
+#include "Enumeration.h"
 #include "Material.h"
 
+
 namespace Base {
 class Writer;
 }
diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp
index 6189e144fb..61d21f036f 100644
--- a/src/App/PropertyUnits.cpp
+++ b/src/App/PropertyUnits.cpp
@@ -24,25 +24,16 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <boost/version.hpp>
-# include <boost/filesystem/path.hpp>
 # include <cfloat>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-
-#include <Base/Exception.h>
-#include <Base/Reader.h>
-#include <Base/Writer.h>
-#include <Base/Stream.h>
-#include <Base/UnitsApi.h>
-
-#include "PropertyUnits.h"
-#include <Base/PyObjectBase.h>
 #include <Base/QuantityPy.h>
 #include <Base/UnitPy.h>
+
+#include "PropertyUnits.h"
 #include "Expression.h"
 
+
 using namespace App;
 using namespace Base;
 using namespace std;
diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h
index 2b24e59095..1f6155e75f 100644
--- a/src/App/PropertyUnits.h
+++ b/src/App/PropertyUnits.h
@@ -24,16 +24,9 @@
 #ifndef APP_PROPERTYUNITS_H
 #define APP_PROPERTYUNITS_H
 
-// Std. configurations
-
-
-#include <string>
-#include <list>
-#include <vector>
-#include <boost/filesystem/path.hpp>
-
-#include <Base/Unit.h>
 #include <Base/Quantity.h>
+#include <Base/Unit.h>
+
 #include "PropertyStandard.h"
 
 namespace Base {
diff --git a/src/App/Range.cpp b/src/App/Range.cpp
index 00c8fb8a27..d77dab7b86 100644
--- a/src/App/Range.cpp
+++ b/src/App/Range.cpp
@@ -21,12 +21,15 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#include "Range.h"
+
 #include <Base/Exception.h>
-#include <assert.h>
-#include <string.h>
-#include <sstream>
 #include <boost/regex.hpp>
+#include <assert.h>
+#include <sstream>
+#include <string.h>
+
+#include "Range.h"
+
 
 using namespace App;