diff --git a/src/Mod/Part/App/PrimitiveFeature.cpp b/src/Mod/Part/App/PrimitiveFeature.cpp
index ac057e79a3..0ca8b6285a 100644
--- a/src/Mod/Part/App/PrimitiveFeature.cpp
+++ b/src/Mod/Part/App/PrimitiveFeature.cpp
@@ -20,66 +20,48 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cfloat>
-# include <BRepLib.hxx>
-# include <BRepPrimAPI_MakeCone.hxx>
-# include <BRepPrimAPI_MakeCylinder.hxx>
-# include <BRepPrimAPI_MakePrism.hxx>
-# include <BRepPrimAPI_MakeRevol.hxx>
-# include <BRepPrimAPI_MakeSphere.hxx>
-# include <BRepPrim_Cylinder.hxx>
-# include <BRepPrim_Wedge.hxx>
+# include <BRepBuilderAPI_GTransform.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepBuilderAPI_MakeSolid.hxx>
 # include <BRepBuilderAPI_MakePolygon.hxx>
-# include <BRepBuilderAPI_GTransform.hxx>
-# include <BRepProj_Projection.hxx>
-# include <gp_Circ.hxx>
+# include <BRepPrim_Cylinder.hxx>
+# include <BRepPrim_Wedge.hxx>
+# include <BRepPrimAPI_MakeCone.hxx>
+# include <BRepPrimAPI_MakeCylinder.hxx>
+# include <BRepPrimAPI_MakeSphere.hxx>
+# include <Geom_Plane.hxx>
 # include <gp_Elips.hxx>
 # include <gp_GTrsf.hxx>
-# include <GCE2d_MakeSegment.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_ConicalSurface.hxx>
-# include <Geom_CylindricalSurface.hxx>
-# include <Geom2d_Line.hxx>
-# include <Geom2d_TrimmedCurve.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_CylindricalSurface.hxx>
-# include <Geom2d_Line.hxx>
-# include <Geom2d_TrimmedCurve.hxx>
 # include <Precision.hxx>
 # include <Standard_Real.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Vertex.hxx>
 # include <Standard_Version.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Vertex.hxx>
 #endif
 
-#include "PrimitiveFeature.h"
-#include <Mod/Part/App/PartFeaturePy.h>
 #include <App/FeaturePythonPyImp.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Reader.h>
 #include <Base/Tools.h>
 
+#include "PrimitiveFeature.h"
+#include "PartFeaturePy.h"
+
 #ifndef M_PI
 #define M_PI       3.14159265358979323846
 #endif
 
 
 namespace Part {
-    const App::PropertyQuantityConstraint::Constraints apexRange   = {-90.0,90.0,0.1};
-    const App::PropertyQuantityConstraint::Constraints torusRangeV = {-180.0,180.0,1.0};
-    const App::PropertyQuantityConstraint::Constraints angleRangeU = {0.0,360.0,1.0};
-    const App::PropertyQuantityConstraint::Constraints angleRangeV = {-90.0,90.0,1.0};
-    const App::PropertyQuantityConstraint::Constraints quantityRange  = {0.0,FLT_MAX,0.1};
+    const App::PropertyQuantityConstraint::Constraints apexRange = {-90.0, 90.0, 0.1};
+    const App::PropertyQuantityConstraint::Constraints torusRangeV = {-180.0, 180.0, 1.0};
+    const App::PropertyQuantityConstraint::Constraints angleRangeU = {0.0, 360.0, 1.0};
+    const App::PropertyQuantityConstraint::Constraints angleRangeV = {-90.0, 90.0, 1.0};
+    const App::PropertyQuantityConstraint::Constraints quantityRange = {0.0, FLT_MAX, 0.1};
 }
 
 using namespace Part;
diff --git a/src/Mod/Part/App/PrimitiveFeature.h b/src/Mod/Part/App/PrimitiveFeature.h
index 585efd19ef..9c5d0801fa 100644
--- a/src/Mod/Part/App/PrimitiveFeature.h
+++ b/src/Mod/Part/App/PrimitiveFeature.h
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_PRIMITIVEFEATURE_H
 #define PART_PRIMITIVEFEATURE_H
 
-#include <App/PropertyUnits.h>
-#include "PartFeature.h"
 #include "AttachExtension.h"
 #include "PrismExtension.h"
 
+
 namespace Part
 {
 
diff --git a/src/Mod/Part/App/PrismExtension.cpp b/src/Mod/Part/App/PrismExtension.cpp
index e6b020442c..c7a586e18c 100644
--- a/src/Mod/Part/App/PrismExtension.cpp
+++ b/src/Mod/Part/App/PrismExtension.cpp
@@ -25,9 +25,10 @@
 # include <BRepPrimAPI_MakePrism.hxx>
 #endif
 
-#include "PrismExtension.h"
 #include <Base/Tools.h>
 
+#include "PrismExtension.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/PrismExtension.h b/src/Mod/Part/App/PrismExtension.h
index dcebae0fcf..dff9b5dcfe 100644
--- a/src/Mod/Part/App/PrismExtension.h
+++ b/src/Mod/Part/App/PrismExtension.h
@@ -23,11 +23,13 @@
 #ifndef PART_PRISM_EXTENSION_H
 #define PART_PRISM_EXTENSION_H
 
-#include <Mod/Part/PartGlobal.h>
 #include <App/DocumentObjectExtension.h>
 #include <App/PropertyUnits.h>
+#include <Mod/Part/PartGlobal.h>
+
 #include <TopoDS_Face.hxx>
 
+
 namespace Part
 {
 
diff --git a/src/Mod/Part/App/ProgressIndicator.cpp b/src/Mod/Part/App/ProgressIndicator.cpp
index 8eb0fcadd1..fbc6b5108c 100644
--- a/src/Mod/Part/App/ProgressIndicator.cpp
+++ b/src/Mod/Part/App/ProgressIndicator.cpp
@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "ProgressIndicator.h"
 
+
 using namespace Part;
 /*!
   \code
diff --git a/src/Mod/Part/App/ProgressIndicator.h b/src/Mod/Part/App/ProgressIndicator.h
index f9221fff22..2ffe6766ac 100644
--- a/src/Mod/Part/App/ProgressIndicator.h
+++ b/src/Mod/Part/App/ProgressIndicator.h
@@ -20,15 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_PROGRESSINDICATOR_H
 #define PART_PROGRESSINDICATOR_H
 
+#include <memory>
+
 #include <Message_ProgressIndicator.hxx>
 #include <Standard_Version.hxx>
+
 #include <Base/Sequencer.h>
 #include <Mod/Part/PartGlobal.h>
-#include <memory>
+
 
 namespace Part {
 
diff --git a/src/Mod/Part/App/PropertyGeometryList.cpp b/src/Mod/Part/App/PropertyGeometryList.cpp
index fbf36588b5..cfdd64fdc6 100644
--- a/src/Mod/Part/App/PropertyGeometryList.cpp
+++ b/src/Mod/Part/App/PropertyGeometryList.cpp
@@ -20,24 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#   include <cassert>
-#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/Console.h>
-
-#include "Geometry.h"
-#include "GeometryPy.h"
 
 #include "PropertyGeometryList.h"
+#include "GeometryPy.h"
 #include "Part2DObject.h"
 
 
diff --git a/src/Mod/Part/App/PropertyGeometryList.h b/src/Mod/Part/App/PropertyGeometryList.h
index 9c7dce62eb..3a31b07f9b 100644
--- a/src/Mod/Part/App/PropertyGeometryList.h
+++ b/src/Mod/Part/App/PropertyGeometryList.h
@@ -20,18 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef APP_PropertyGeometryList_H
 #define APP_PropertyGeometryList_H
 
-// Std. configurations
-
-
 #include <vector>
-#include <string>
+
 #include <App/Property.h>
+
 #include "Geometry.h"
 
+
 namespace Base {
 class Writer;
 }
diff --git a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp
index 61664f045f..3ab84199bf 100644
--- a/src/Mod/Part/App/PropertyTopoShape.cpp
+++ b/src/Mod/Part/App/PropertyTopoShape.cpp
@@ -20,53 +20,34 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
-# include <BRepAdaptor_Curve.hxx>
-# include <BRepAdaptor_Surface.hxx>
-# include <BRepBndLib.hxx>
-# include <BRepBuilderAPI_GTransform.hxx>
 # include <Bnd_Box.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
 # include <BRepTools.hxx>
 # include <BRepTools_ShapeSet.hxx>
-# include <BRepBuilderAPI_Copy.hxx>
-# include <TopTools_HSequenceOfShape.hxx>
-# include <TopTools_MapOfShape.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Iterator.hxx>
-# include <TopExp.hxx>
+# include <OSD_OpenFile.hxx>
 # include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
-# include <gp_GTrsf.hxx>
-# include <gp_Trsf.hxx>
-
-# include <OSD_OpenFile.hxx>
-
+# include <TopoDS.hxx>
 #endif // _PreComp_
 
-#include <Base/Console.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
 #include <App/Application.h>
 #include <App/DocumentObject.h>
 #include <App/ObjectIdentifier.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
+#include <Base/Reader.h>
+#include <Base/Stream.h>
+#include <Base/Writer.h>
 
 #include "PropertyTopoShape.h"
 #include "TopoShapePy.h"
-#include "TopoShapeFacePy.h"
-#include "TopoShapeEdgePy.h"
-#include "TopoShapeWirePy.h"
-#include "TopoShapeVertexPy.h"
-#include "TopoShapeSolidPy.h"
-#include "TopoShapeShellPy.h"
-#include "TopoShapeCompSolidPy.h"
-#include "TopoShapeCompoundPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h
index c6382396b5..0a0fe92fd6 100644
--- a/src/Mod/Part/App/PropertyTopoShape.h
+++ b/src/Mod/Part/App/PropertyTopoShape.h
@@ -20,17 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_PROPERTYTOPOSHAPE_H
 #define PART_PROPERTYTOPOSHAPE_H
 
-#include "TopoShape.h"
-#include <TopAbs_ShapeEnum.hxx>
-#include <App/DocumentObject.h>
-#include <App/PropertyGeo.h>
 #include <map>
 #include <vector>
 
+#include <App/PropertyGeo.h>
+
+#include "TopoShape.h"
+#include <TopAbs_ShapeEnum.hxx>
+
+
 namespace Part
 {
 
diff --git a/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp b/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp
index 1b734dce56..7331761be0 100644
--- a/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp
+++ b/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp
@@ -20,20 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom_RectangularTrimmedSurface.hxx>
-# include <Geom_Curve.hxx>
 #endif
 
-#include "Mod/Part/App/Geometry.h"
 #include "OCCError.h"
 
 // inclusion of the generated files (generated out of RectangularTrimmedSurfacePy.xml)
+#include "GeometryCurvePy.h"
 #include "RectangularTrimmedSurfacePy.h"
 #include "RectangularTrimmedSurfacePy.cpp"
-#include "GeometryCurvePy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/SpherePyImp.cpp b/src/Mod/Part/App/SpherePyImp.cpp
index 832c59d3f7..554677caf9 100644
--- a/src/Mod/Part/App/SpherePyImp.cpp
+++ b/src/Mod/Part/App/SpherePyImp.cpp
@@ -20,12 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Circ.hxx>
-# include <gp_Sphere.hxx>
-# include <Geom_Circle.hxx>
 # include <Geom_SphericalSurface.hxx>
 # include <Standard_Failure.hxx>
 #endif
@@ -33,12 +29,11 @@
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
-#include "Geometry.h"
-#include "CirclePy.h"
 #include "SpherePy.h"
 #include "SpherePy.cpp"
 #include "OCCError.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp b/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp
index 37c6777102..670bf36ebf 100644
--- a/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp
+++ b/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp
@@ -20,27 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Geom_SurfaceOfLinearExtrusion.hxx>
 # include <Geom_Curve.hxx>
-# include <Geom_Line.hxx>
-# include <gp_Lin.hxx>
+# include <Geom_SurfaceOfLinearExtrusion.hxx>
 #endif
 
-#include "Geometry.h"
-#include "SurfaceOfExtrusionPy.h"
-#include "SurfaceOfExtrusionPy.cpp"
-#include "GeometryCurvePy.h"
-#include "LinePy.h"
-#include "BezierCurvePy.h"
-#include "BSplineCurvePy.h"
-
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
+
+#include "SurfaceOfExtrusionPy.h"
+#include "SurfaceOfExtrusionPy.cpp"
+#include "GeometryCurvePy.h"
 #include "OCCError.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp b/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp
index 646c720e12..f338abab48 100644
--- a/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp
+++ b/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom_SurfaceOfRevolution.hxx>
 #endif
 
-#include "Geometry.h"
-#include "SurfaceOfRevolutionPy.h"
-#include "SurfaceOfRevolutionPy.cpp"
-
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
+
+#include "SurfaceOfRevolutionPy.h"
+#include "SurfaceOfRevolutionPy.cpp"
 #include "OCCError.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python