diff --git a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp
index e9b4f41b81..709d2c72e0 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp
@@ -20,24 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Circ2d.hxx>
-# include <Geom2d_Circle.hxx>
 # include <GCE2d_MakeArcOfCircle.hxx>
-# include <GCE2d_MakeCircle.hxx>
+# include <Geom2d_Circle.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
 #endif
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Part/App/Geom2d/ArcOfCircle2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfCircle2dPy.cpp>
-#include <Mod/Part/App/Geom2d/Circle2dPy.h>
-
 #include <Base/GeometryPyCXX.h>
 
+#include "Geom2d/ArcOfCircle2dPy.h"
+#include "Geom2d/ArcOfCircle2dPy.cpp"
+#include "Geom2d/Circle2dPy.h"
+#include "OCCError.h"
+
+
 using namespace Part;
 
 extern const char* gce_ErrorStatusText(gce_ErrorType et);
diff --git a/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp
index 05369bd790..0ad55faadb 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom2d_Conic.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
 #endif
 
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/ArcOfConic2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfConic2dPy.cpp>
-#include <Mod/Part/App/OCCError.h>
-
 #include <Base/GeometryPyCXX.h>
 
+#include "Geom2d/ArcOfConic2dPy.h"
+#include "Geom2d/ArcOfConic2dPy.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/Geom2d/ArcOfEllipse2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp
index 410e061cb8..62e4cc4f74 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp
@@ -20,23 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Elips2d.hxx>
-# include <Geom2d_Ellipse.hxx>
 # include <GCE2d_MakeArcOfEllipse.hxx>
-# include <GCE2d_MakeEllipse.hxx>
+# include <Geom2d_Ellipse.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
 #endif
 
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/ArcOfEllipse2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfEllipse2dPy.cpp>
-#include <Mod/Part/App/Geom2d/Ellipse2dPy.h>
-#include <Mod/Part/App/OCCError.h>
+#include "Geom2d/ArcOfEllipse2dPy.h"
+#include "Geom2d/ArcOfEllipse2dPy.cpp"
+#include "Geom2d/Ellipse2dPy.h"
+#include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp
index d0a7359e21..9fedc57a22 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp
@@ -20,23 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Hypr2d.hxx>
-# include <Geom2d_Hyperbola.hxx>
 # include <GCE2d_MakeArcOfHyperbola.hxx>
-# include <GCE2d_MakeHyperbola.hxx>
+# include <Geom2d_Hyperbola.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
 #endif
 
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.cpp>
-#include <Mod/Part/App/Geom2d/Hyperbola2dPy.h>
-#include <Mod/Part/App/OCCError.h>
+#include "Geom2d/ArcOfHyperbola2dPy.h"
+#include "Geom2d/ArcOfHyperbola2dPy.cpp"
+#include "Geom2d/Hyperbola2dPy.h"
+#include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp
index 03358862b2..1beb2780dc 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp
@@ -20,22 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Parab2d.hxx>
-# include <Geom2d_Parabola.hxx>
 # include <GCE2d_MakeArcOfParabola.hxx>
+# include <Geom2d_Parabola.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
 #endif
 
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/ArcOfParabola2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfParabola2dPy.cpp>
-#include <Mod/Part/App/Geom2d/Parabola2dPy.h>
-#include <Mod/Part/App/OCCError.h>
+#include "Geom2d/ArcOfParabola2dPy.h"
+#include "Geom2d/ArcOfParabola2dPy.cpp"
+#include "Geom2d/Parabola2dPy.h"
+#include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp
index 328904ef46..df3bd1589f 100644
--- a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp
@@ -20,34 +20,30 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom2d_BSplineCurve.hxx>
 # include <Geom2dAPI_PointsToBSpline.hxx>
 # include <Geom2dAPI_Interpolate.hxx>
 # include <Geom2dConvert_BSplineCurveToBezierCurve.hxx>
-# include <Standard_PrimitiveTypes.hxx>
 # include <gp_Pnt2d.hxx>
-# include <TColStd_Array1OfReal.hxx>
+# include <Precision.hxx>
 # include <TColgp_Array1OfPnt2d.hxx>
 # include <TColgp_Array1OfVec2d.hxx>
 # include <TColgp_HArray1OfPnt2d.hxx>
 # include <TColStd_Array1OfInteger.hxx>
-# include <TColStd_HArray1OfReal.hxx>
 # include <TColStd_Array1OfReal.hxx>
 # include <TColStd_HArray1OfBoolean.hxx>
-
-# include <Precision.hxx>
+# include <TColStd_HArray1OfReal.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/BSplineCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/BSplineCurve2dPy.cpp>
-#include <Mod/Part/App/Geom2d/BezierCurve2dPy.h>
+#include "Geom2d/BSplineCurve2dPy.h"
+#include "Geom2d/BSplineCurve2dPy.cpp"
+#include "Geom2d/BezierCurve2dPy.h"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp
index a9b410c597..17e5baeb94 100644
--- a/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp
@@ -20,21 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom2d_BezierCurve.hxx>
 # include <gp_Pnt2d.hxx>
-# include <TColStd_Array1OfReal.hxx>
 # include <TColgp_Array1OfPnt2d.hxx>
+# include <TColStd_Array1OfReal.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/BezierCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/BezierCurve2dPy.cpp>
+#include "Geom2d/BezierCurve2dPy.h"
+#include "Geom2d/BezierCurve2dPy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp
index 75b9a6268d..a7a99e5703 100644
--- a/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Circ2d.hxx>
-# include <Geom2d_Circle.hxx>
 # include <GCE2d_MakeCircle.hxx>
+# include <Geom2d_Circle.hxx>
 #endif
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geom2d/Circle2dPy.h>
-#include <Mod/Part/App/Geom2d/Circle2dPy.cpp>
-
 #include <Base/GeometryPyCXX.h>
 
+#include "Geom2d/Circle2dPy.h"
+#include "Geom2d/Circle2dPy.cpp"
+#include "OCCError.h"
+
+
 using namespace Part;
 
 extern const char* gce_ErrorStatusText(gce_ErrorType et);
diff --git a/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp
index 74b51def6b..c8095c6e1a 100644
--- a/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp
@@ -20,18 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom2d_Conic.hxx>
 #endif
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geom2d/Conic2dPy.h>
-#include <Mod/Part/App/Geom2d/Conic2dPy.cpp>
-
 #include <Base/GeometryPyCXX.h>
 
+#include "Geom2d/Conic2dPy.h"
+#include "Geom2d/Conic2dPy.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/Geom2d/Curve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp
index 5e20dd77b5..8cee685f0f 100644
--- a/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp
@@ -20,57 +20,46 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
-# include <gp_Dir2d.hxx>
-# include <gp_Vec2d.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Elips.hxx>
-# include <gp_Hypr.hxx>
-# include <gp_Parab.hxx>
+
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepBuilderAPI_MakeEdge2d.hxx>
+# include <BRepLib.hxx>
 # include <GCPnts_UniformAbscissa.hxx>
 # include <GCPnts_UniformDeflection.hxx>
 # include <GCPnts_TangentialDeflection.hxx>
 # include <GCPnts_QuasiUniformAbscissa.hxx>
 # include <GCPnts_QuasiUniformDeflection.hxx>
 # include <GCPnts_AbscissaPoint.hxx>
-# include <Geom2dAPI_InterCurveCurve.hxx>
-# include <Geom2d_Geometry.hxx>
 # include <Geom2d_Curve.hxx>
+# include <Geom2d_Geometry.hxx>
 # include <Geom2dAdaptor_Curve.hxx>
-# include <Geom2dLProp_CLProps2d.hxx>
-# include <GeomAdaptor_Surface.hxx>
-# include <Precision.hxx>
+# include <Geom2dAPI_ExtremaCurveCurve.hxx>
+# include <Geom2dAPI_InterCurveCurve.hxx>
 # include <Geom2dAPI_ProjectPointOnCurve.hxx>
 # include <Geom2dConvert_ApproxCurve.hxx>
+# include <Geom2dLProp_CLProps2d.hxx>
+# include <gp_Dir2d.hxx>
+# include <Precision.hxx>
+# include <ShapeConstruct_Curve.hxx>
 # include <Standard_Failure.hxx>
 # include <Standard_NullValue.hxx>
-# include <ShapeConstruct_Curve.hxx>
-# include <Geom2dAPI_ExtremaCurveCurve.hxx>
-# include <BRepBuilderAPI_MakeEdge2d.hxx>
-# include <BRepBuilderAPI_MakeEdge.hxx>
-# include <BRepAdaptor_Surface.hxx>
-# include <BRepLib.hxx>
-# include <BRepAdaptor_Curve.hxx>
 # include <TopoDS.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/GeometrySurfacePy.h>
-#include <Mod/Part/App/Geom2d/BSplineCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/Curve2dPy.h>
-#include <Mod/Part/App/Geom2d/Curve2dPy.cpp>
+#include "Geom2d/Curve2dPy.h"
+#include "Geom2d/Curve2dPy.cpp"
+#include "Geom2d/BSplineCurve2dPy.h"
+#include "GeometrySurfacePy.h"
+#include "OCCError.h"
+#include "TopoShapeFacePy.h"
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
 
 namespace Part {
 extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c);
diff --git a/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp
index 8871a05c37..60e2efaeee 100644
--- a/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp
@@ -20,20 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Elips2d.hxx>
-# include <Geom2d_Ellipse.hxx>
 # include <GCE2d_MakeEllipse.hxx>
+# include <Geom2d_Ellipse.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/Ellipse2dPy.h>
-#include <Mod/Part/App/Geom2d/Ellipse2dPy.cpp>
+#include "Geom2d/Ellipse2dPy.h"
+#include "Geom2d/Ellipse2dPy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp
index b8bc44e237..b5f9c360d3 100644
--- a/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Geometry2dPyImp.cpp
@@ -20,35 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <gp_Dir2d.hxx>
 # include <gp_Pnt2d.hxx>
-# include <gp_Vec2d.hxx>
-# include <gp_Trsf2d.hxx>
 # include <gp_Trsf.hxx>
-# include <Geom2d_Geometry.hxx>
-# include <Geom2d_Curve.hxx>
-# include <Precision.hxx>
-# include <Standard_Failure.hxx>
+# include <gp_Trsf2d.hxx>
+# include <gp_Vec2d.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
-#include <Base/Matrix.h>
-#include <Base/MatrixPy.h>
-#include <Base/Tools2D.h>
-#include <Base/Rotation.h>
-#include <Base/Placement.h>
-#include <Base/PlacementPy.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/Geometry2dPy.h>
-#include <Mod/Part/App/Geom2d/Geometry2dPy.cpp>
+#include "Geom2d/Geometry2dPy.h"
+#include "Geom2d/Geometry2dPy.cpp"
+#include "OCCError.h"
 
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/TopoShapePy.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp
index 8781728da7..794c7cde07 100644
--- a/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp
@@ -20,20 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Hypr2d.hxx>
-# include <Geom2d_Hyperbola.hxx>
 # include <GCE2d_MakeHyperbola.hxx>
+# include <Geom2d_Hyperbola.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/Hyperbola2dPy.h>
-#include <Mod/Part/App/Geom2d/Hyperbola2dPy.cpp>
+#include "Geom2d/Hyperbola2dPy.h"
+#include "Geom2d/Hyperbola2dPy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp
index 974958785b..ee9b94d17c 100644
--- a/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp
@@ -20,22 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp.hxx>
-# include <gp_Lin2d.hxx>
 # include <Geom2d_Line.hxx>
 # include <GCE2d_MakeLine.hxx>
-# include <Precision.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/Line2dPy.h>
-#include <Mod/Part/App/Geom2d/Line2dPy.cpp>
+#include "Geom2d/Line2dPy.h"
+#include "Geom2d/Line2dPy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp b/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp
index 3bf91f8ac9..a55b1f923c 100644
--- a/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp
@@ -20,25 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp.hxx>
-# include <gp_Lin2d.hxx>
+# include <GCE2d_MakeSegment.hxx>
 # include <Geom2d_Line.hxx>
 # include <Geom2d_TrimmedCurve.hxx>
-# include <GCE2d_MakeLine.hxx>
-# include <GCE2d_MakeSegment.hxx>
-# include <Precision.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/Line2dPy.h>
-#include <Mod/Part/App/Geom2d/Line2dSegmentPy.h>
-#include <Mod/Part/App/Geom2d/Line2dSegmentPy.cpp>
+#include "Geom2d/Line2dSegmentPy.h"
+#include "Geom2d/Line2dSegmentPy.cpp"
+#include "Geom2d/Line2dPy.h"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp
index 75b0f3e514..31333aebc7 100644
--- a/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom2d_OffsetCurve.hxx>
 #endif
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/OffsetCurve2dPy.cpp>
+#include "Geom2d/OffsetCurve2dPy.h"
+#include "Geom2d/OffsetCurve2dPy.cpp"
+#include "OCCError.h"
 
-#include <Base/GeometryPyCXX.h>
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp
index 98bd3e95df..353eb1bdbd 100644
--- a/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp
+++ b/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom2d_Parabola.hxx>
@@ -28,10 +27,10 @@
 
 #include <Base/GeometryPyCXX.h>
 
-#include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/Geometry2d.h>
-#include <Mod/Part/App/Geom2d/Parabola2dPy.h>
-#include <Mod/Part/App/Geom2d/Parabola2dPy.cpp>
+#include "Geom2d/Parabola2dPy.h"
+#include "Geom2d/Parabola2dPy.cpp"
+#include "OCCError.h"
+
 
 using namespace Part;