diff --git a/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp b/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp
index 5baba19195..c7ec94e454 100644
--- a/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp
+++ b/src/Mod/Part/App/GeometryBoolExtensionPyImp.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "GeometryDefaultExtension.h"
-
 #include "GeometryBoolExtensionPy.h"
 #include "GeometryBoolExtensionPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/GeometryCurvePyImp.cpp b/src/Mod/Part/App/GeometryCurvePyImp.cpp
index 5aec8991ef..e399722d4a 100644
--- a/src/Mod/Part/App/GeometryCurvePyImp.cpp
+++ b/src/Mod/Part/App/GeometryCurvePyImp.cpp
@@ -25,57 +25,52 @@
 
 #ifndef _PreComp_
 # include <sstream>
+
 # include <BRepBuilderAPI_MakeEdge.hxx>
-# include <gp_Dir.hxx>
-# include <gp_Vec.hxx>
-# include <gp_Pln.hxx>
-# include <gp_Quaternion.hxx>
-# include <GCPnts_UniformAbscissa.hxx>
-# include <GCPnts_UniformDeflection.hxx>
-# include <GCPnts_TangentialDeflection.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
 # include <GCPnts_QuasiUniformAbscissa.hxx>
 # include <GCPnts_QuasiUniformDeflection.hxx>
-# include <GCPnts_AbscissaPoint.hxx>
-# include <Geom2dAPI_InterCurveCurve.hxx>
-# include <GeomAPI.hxx>
-# include <Geom_Geometry.hxx>
+# include <GCPnts_TangentialDeflection.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
+# include <GCPnts_UniformDeflection.hxx>
+# include <Geom_BSplineSurface.hxx>
 # include <Geom_Curve.hxx>
+# include <Geom_Geometry.hxx>
 # include <Geom_Plane.hxx>
+# include <Geom_RectangularTrimmedSurface.hxx>
 # include <Geom_Surface.hxx>
+# include <Geom2dAPI_InterCurveCurve.hxx>
 # include <GeomAdaptor_Curve.hxx>
+# include <GeomAPI.hxx>
+# include <GeomAPI_IntCS.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
+# include <GeomConvert_ApproxCurve.hxx>
 # include <GeomFill.hxx>
 # include <GeomLProp.hxx>
 # include <GeomLProp_CLProps.hxx>
-# include <Geom_RectangularTrimmedSurface.hxx>
-# include <Geom_BSplineSurface.hxx>
-# include <Precision.hxx>
-# include <GeomAPI_ProjectPointOnCurve.hxx>
-# include <GeomConvert_ApproxCurve.hxx>
-# include <Standard_Failure.hxx>
-# include <Standard_NullValue.hxx>
-# include <ShapeConstruct_Curve.hxx>
-# include <GeomAPI_IntCS.hxx>
-# include <GeomAPI_ExtremaCurveCurve.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Quaternion.hxx>
+# include <gp_Vec.hxx>
 # include <IntRes2d_IntersectionSegment.hxx>
+# include <Precision.hxx>
+# include <Standard_Failure.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
-#include "Geometry.h"
 #include "GeometryCurvePy.h"
 #include "GeometryCurvePy.cpp"
-#include "RectangularTrimmedSurfacePy.h"
+#include "BSplineCurvePy.h"
 #include "BSplineSurfacePy.h"
 #include "PlanePy.h"
 #include "PointPy.h"
-#include "BSplineCurvePy.h"
-
+#include "RectangularTrimmedSurfacePy.h"
 #include "OCCError.h"
 #include "TopoShape.h"
-#include "TopoShapePy.h"
 #include "TopoShapeEdgePy.h"
 
+
 namespace Part {
 extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c);
 extern const Py::Object makeTrimmedCurvePy(const Handle(Geom_Curve)& c, double f,double l);
diff --git a/src/Mod/Part/App/GeometryExtensionPyImp.cpp b/src/Mod/Part/App/GeometryExtensionPyImp.cpp
index ebeaeb84bf..ae5ac1af5a 100644
--- a/src/Mod/Part/App/GeometryExtensionPyImp.cpp
+++ b/src/Mod/Part/App/GeometryExtensionPyImp.cpp
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "GeometryExtension.h"
 #include "GeometryExtensionPy.h"
 #include "GeometryExtensionPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp b/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp
index d50f67f8b3..d16d44a618 100644
--- a/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp
+++ b/src/Mod/Part/App/GeometryIntExtensionPyImp.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "GeometryDefaultExtension.h"
-
 #include "GeometryIntExtensionPy.h"
 #include "GeometryIntExtensionPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/GeometryPyImp.cpp b/src/Mod/Part/App/GeometryPyImp.cpp
index 8e4ff5cedd..1215901435 100644
--- a/src/Mod/Part/App/GeometryPyImp.cpp
+++ b/src/Mod/Part/App/GeometryPyImp.cpp
@@ -20,40 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <gp_Ax1.hxx>
-# include <gp_Dir.hxx>
-# include <gp_Pnt.hxx>
-# include <gp_Vec.hxx>
-# include <gp_Trsf.hxx>
-# include <Geom_Geometry.hxx>
-# include <Geom_Curve.hxx>
-# include <Geom_Surface.hxx>
-# include <Precision.hxx>
-# include <Standard_Failure.hxx>
 
+#ifndef _PreComp_
 # include <boost/uuid/uuid_io.hpp>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/Matrix.h>
 #include <Base/MatrixPy.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
-#include <Base/Rotation.h>
 #include <Base/Placement.h>
 #include <Base/PlacementPy.h>
+#include <Base/Vector3D.h>
+#include <Base/VectorPy.h>
 
-#include "OCCError.h"
-#include "Geometry.h"
 #include "GeometryPy.h"
 #include "GeometryPy.cpp"
-
 #include "GeometryExtensionPy.h"
-#include "TopoShape.h"
-#include "TopoShapePy.h"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp b/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp
index 77e59fe188..294f3a9ce1 100644
--- a/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp
+++ b/src/Mod/Part/App/GeometryStringExtensionPyImp.cpp
@@ -20,18 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include "GeometryDefaultExtension.h"
-
 #include "GeometryStringExtensionPy.h"
 #include "GeometryStringExtensionPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/GeometrySurfacePyImp.cpp b/src/Mod/Part/App/GeometrySurfacePyImp.cpp
index f513033eca..d0ac2e1ba3 100644
--- a/src/Mod/Part/App/GeometrySurfacePyImp.cpp
+++ b/src/Mod/Part/App/GeometrySurfacePyImp.cpp
@@ -20,62 +20,40 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeShell.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Dir.hxx>
-# include <gp_Elips.hxx>
-# include <gp_Hypr.hxx>
-# include <gp_Parab.hxx>
-# include <gp_Vec.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Quaternion.hxx>
+# include <Geom_BSplineSurface.hxx>
 # include <Geom_Geometry.hxx>
 # include <Geom_Surface.hxx>
+# include <GeomAPI_IntSS.hxx>
 # include <GeomAPI_ProjectPointOnSurf.hxx>
 # include <GeomConvert_ApproxSurface.hxx>
+# include <GeomLib_IsPlanarSurface.hxx>
 # include <GeomLProp_SLProps.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Quaternion.hxx>
+# include <gp_Vec.hxx>
 # include <Precision.hxx>
+# include <ShapeAnalysis_Surface.hxx>
 # include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
-# include <ShapeAnalysis_Surface.hxx>
-# include <GeomAPI_IntSS.hxx>
-# include <GeomLib_IsPlanarSurface.hxx>
-# include <Geom_BSplineSurface.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
+#include "GeometrySurfacePy.h"
+#include "GeometrySurfacePy.cpp"
+#include "BSplineSurfacePy.h"
+#include "GeometryCurvePy.h"
+#include "LinePy.h"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/GeometrySurfacePy.h>
-#include <Mod/Part/App/GeometrySurfacePy.cpp>
-#include <Mod/Part/App/GeometryCurvePy.h>
-#include <Mod/Part/App/BSplineSurfacePy.h>
+#include "TopoShapeFacePy.h"
+#include "TopoShapeShellPy.h"
 
-#include <Mod/Part/App/LinePy.h>
-#include <Mod/Part/App/LineSegmentPy.h>
-#include <Mod/Part/App/BezierCurvePy.h>
-#include <Mod/Part/App/BSplineCurvePy.h>
-#include <Mod/Part/App/CirclePy.h>
-#include <Mod/Part/App/ArcOfCirclePy.h>
-#include <Mod/Part/App/EllipsePy.h>
-#include <Mod/Part/App/ArcOfEllipsePy.h>
-#include <Mod/Part/App/HyperbolaPy.h>
-#include <Mod/Part/App/ArcOfHyperbolaPy.h>
-#include <Mod/Part/App/ParabolaPy.h>
-#include <Mod/Part/App/ArcOfParabolaPy.h>
-#include <Mod/Part/App/OffsetCurvePy.h>
-
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeShellPy.h>
 
 namespace Part {
 const Py::Object makeTrimmedCurvePy(const Handle(Geom_Curve)& c, double f, double l)