diff --git a/src/Mod/Part/App/ArcOfCirclePyImp.cpp b/src/Mod/Part/App/ArcOfCirclePyImp.cpp
index 6d3887435e..7057f49b18 100644
--- a/src/Mod/Part/App/ArcOfCirclePyImp.cpp
+++ b/src/Mod/Part/App/ArcOfCirclePyImp.cpp
@@ -20,24 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Circ.hxx>
-# include <Geom_Circle.hxx>
 # include <GC_MakeArcOfCircle.hxx>
-# include <GC_MakeCircle.hxx>
+# include <Geom_Circle.hxx>
 # include <Geom_TrimmedCurve.hxx>
 #endif
 
-#include "Geometry.h"
-#include <Mod/Part/App/ArcOfCirclePy.h>
-#include <Mod/Part/App/ArcOfCirclePy.cpp>
-#include <Mod/Part/App/CirclePy.h>
+#include <Base/VectorPy.h>
+
+#include "ArcOfCirclePy.h"
+#include "ArcOfCirclePy.cpp"
+#include "CirclePy.h"
 #include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ArcOfConicPyImp.cpp b/src/Mod/Part/App/ArcOfConicPyImp.cpp
index 03c6fef48a..b3768b921d 100644
--- a/src/Mod/Part/App/ArcOfConicPyImp.cpp
+++ b/src/Mod/Part/App/ArcOfConicPyImp.cpp
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom_TrimmedCurve.hxx>
 #endif
 
-#include "Geometry.h"
-#include <Mod/Part/App/ArcOfConicPy.h>
-#include <Mod/Part/App/ArcOfConicPy.cpp>
-#include "OCCError.h"
-
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
+#include "ArcOfConicPy.h"
+#include "ArcOfConicPy.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/ArcOfEllipsePyImp.cpp b/src/Mod/Part/App/ArcOfEllipsePyImp.cpp
index 86bd26a347..e9f7d7b8e8 100644
--- a/src/Mod/Part/App/ArcOfEllipsePyImp.cpp
+++ b/src/Mod/Part/App/ArcOfEllipsePyImp.cpp
@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Elips.hxx>
-# include <Geom_Ellipse.hxx>
 # include <GC_MakeArcOfEllipse.hxx>
-# include <GC_MakeEllipse.hxx>
+# include <Geom_Ellipse.hxx>
 # include <Geom_TrimmedCurve.hxx>
 #endif
 
-#include "Geometry.h"
-#include <Mod/Part/App/ArcOfEllipsePy.h>
-#include <Mod/Part/App/ArcOfEllipsePy.cpp>
-#include <Mod/Part/App/EllipsePy.h>
+#include "ArcOfEllipsePy.h"
+#include "ArcOfEllipsePy.cpp"
+#include "EllipsePy.h"
 #include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp b/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp
index e44daab59c..efff7240cd 100644
--- a/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp
+++ b/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp
@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Hypr.hxx>
-# include <Geom_Hyperbola.hxx>
 # include <GC_MakeArcOfHyperbola.hxx>
-# include <GC_MakeHyperbola.hxx>
+# include <Geom_Hyperbola.hxx>
 # include <Geom_TrimmedCurve.hxx>
 #endif
 
-#include "Geometry.h"
-#include <Mod/Part/App/ArcOfHyperbolaPy.h>
-#include <Mod/Part/App/ArcOfHyperbolaPy.cpp>
-#include <Mod/Part/App/HyperbolaPy.h>
+#include "ArcOfHyperbolaPy.h"
+#include "ArcOfHyperbolaPy.cpp"
+#include "HyperbolaPy.h"
 #include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ArcOfParabolaPyImp.cpp b/src/Mod/Part/App/ArcOfParabolaPyImp.cpp
index 37c4f2cdcf..9d4c0df626 100644
--- a/src/Mod/Part/App/ArcOfParabolaPyImp.cpp
+++ b/src/Mod/Part/App/ArcOfParabolaPyImp.cpp
@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Parab.hxx>
-# include <Geom_Parabola.hxx>
 # include <GC_MakeArcOfParabola.hxx>
-# include <gce_MakeParab.hxx>
+# include <Geom_Parabola.hxx>
 # include <Geom_TrimmedCurve.hxx>
 #endif
 
-#include "Geometry.h"
-#include <Mod/Part/App/ArcOfParabolaPy.h>
-#include <Mod/Part/App/ArcOfParabolaPy.cpp>
-#include <Mod/Part/App/ParabolaPy.h>
+#include "ArcOfParabolaPy.h"
+#include "ArcOfParabolaPy.cpp"
+#include "ParabolaPy.h"
 #include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ArcPyImp.cpp b/src/Mod/Part/App/ArcPyImp.cpp
index 35a6086343..8714ee404b 100644
--- a/src/Mod/Part/App/ArcPyImp.cpp
+++ b/src/Mod/Part/App/ArcPyImp.cpp
@@ -20,36 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Circ.hxx>
-# include <Geom_Circle.hxx>
-# include <gp_Elips.hxx>
-# include <gp_Parab.hxx>
-# include <Geom_Ellipse.hxx>
-# include <Geom_Parabola.hxx>
-# include <Geom_TrimmedCurve.hxx>
 # include <GC_MakeArcOfCircle.hxx>
 # include <GC_MakeArcOfEllipse.hxx>
-# include <GC_MakeArcOfParabola.hxx>
-# include <gp_Hypr.hxx>
-# include <Geom_Hyperbola.hxx>
-# include <Geom_TrimmedCurve.hxx>
-# include <GC_MakeArcOfCircle.hxx>
 # include <GC_MakeArcOfHyperbola.hxx>
+# include <GC_MakeArcOfParabola.hxx>
+# include <Geom_Circle.hxx>
+# include <Geom_Ellipse.hxx>
+# include <Geom_Hyperbola.hxx>
+# include <Geom_Parabola.hxx>
 #endif
 
+#include <Base/VectorPy.h>
+
 #include "ArcPy.h"
 #include "ArcPy.cpp"
 #include "CirclePy.h"
 #include "EllipsePy.h"
-#include "ParabolaPy.h"
 #include "HyperbolaPy.h"
 #include "OCCError.h"
+#include "ParabolaPy.h"
 
-#include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/CirclePyImp.cpp b/src/Mod/Part/App/CirclePyImp.cpp
index f58c6ce6ab..878b1c4df9 100644
--- a/src/Mod/Part/App/CirclePyImp.cpp
+++ b/src/Mod/Part/App/CirclePyImp.cpp
@@ -27,7 +27,6 @@
 # include <gp_Circ.hxx>
 #endif
 
-#include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
 #include "CirclePy.h"
diff --git a/src/Mod/Part/App/PointPyImp.cpp b/src/Mod/Part/App/PointPyImp.cpp
index aa88203090..18faf0f5fe 100644
--- a/src/Mod/Part/App/PointPyImp.cpp
+++ b/src/Mod/Part/App/PointPyImp.cpp
@@ -28,7 +28,6 @@
 # include <TopoDS_Vertex.hxx>
 #endif
 
-#include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
 #include "PointPy.h"
diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp
index 107e1fe88b..c66d0faab1 100644
--- a/src/Mod/Part/App/TopoShapePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapePyImp.cpp
@@ -68,7 +68,6 @@
 
 #include <App/PropertyStandard.h>
 #include <Base/GeometryPyCXX.h>
-#include <Base/Matrix.h>
 #include <Base/MatrixPy.h>
 #include <Base/Rotation.h>
 #include <Base/Stream.h>