diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp
index 1a7122e87e..85168470f5 100644
--- a/src/Mod/Part/App/Geometry.cpp
+++ b/src/Mod/Part/App/Geometry.cpp
@@ -20,133 +20,123 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Approx_Curve3d.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
+# include <GC_MakeArcOfCircle.hxx>
+# include <GC_MakeArcOfEllipse.hxx>
+# include <GC_MakeArcOfHyperbola.hxx>
+# include <GC_MakeArcOfParabola.hxx>
+# include <GC_MakeCircle.hxx>
+# include <GC_MakeEllipse.hxx>
+# include <GC_MakeHyperbola.hxx>
+# include <GC_MakeSegment.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
+# include <gce_ErrorType.hxx>
+# include <gce_MakeParab.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
 # include <Geom_CartesianPoint.hxx>
 # include <Geom_Circle.hxx>
+# include <Geom_ConicalSurface.hxx>
 # include <Geom_Curve.hxx>
+# include <Geom_CylindricalSurface.hxx>
 # include <Geom_Ellipse.hxx>
 # include <Geom_Hyperbola.hxx>
-# include <Geom_Parabola.hxx>
-# include <Geom_OffsetCurve.hxx>
-# include <Geom_TrimmedCurve.hxx>
 # include <Geom_Line.hxx>
-# include <Geom_BezierCurve.hxx>
-# include <Geom_BezierSurface.hxx>
-# include <Geom_BSplineCurve.hxx>
-# include <Geom_BSplineSurface.hxx>
-# include <Geom_Surface.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_CylindricalSurface.hxx>
-# include <Geom_ConicalSurface.hxx>
-# include <Geom_SphericalSurface.hxx>
-# include <Geom_ToroidalSurface.hxx>
+# include <Geom_OffsetCurve.hxx>
 # include <Geom_OffsetSurface.hxx>
-# include <GeomPlate_Surface.hxx>
+# include <Geom_Parabola.hxx>
+# include <Geom_Plane.hxx>
 # include <Geom_RectangularTrimmedSurface.hxx>
-# include <Geom_SurfaceOfRevolution.hxx>
+# include <Geom_SphericalSurface.hxx>
+# include <Geom_Surface.hxx>
 # include <Geom_SurfaceOfLinearExtrusion.hxx>
+# include <Geom_SurfaceOfRevolution.hxx>
+# include <Geom_ToroidalSurface.hxx>
+# include <Geom_TrimmedCurve.hxx>
+# include <GeomAPI_ExtremaCurveCurve.hxx>
 # include <GeomAPI_Interpolate.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
 # include <GeomConvert.hxx>
 # include <GeomConvert_CompCurveToBSplineCurve.hxx>
 # include <GeomLProp_CLProps.hxx>
 # include <GeomLProp_SLProps.hxx>
-# include <gp.hxx>
+# include <GeomPlate_Surface.hxx>
 # include <gp_Ax2.hxx>
 # include <gp_Circ.hxx>
+# include <gp_Cone.hxx>
+# include <gp_Cylinder.hxx>
 # include <gp_Elips.hxx>
 # include <gp_Hypr.hxx>
-# include <gp_Parab.hxx>
-# include <gce_ErrorType.hxx>
 # include <gp_Lin.hxx>
+# include <gp_Parab.hxx>
 # include <gp_Pln.hxx>
 # include <gp_Pnt.hxx>
-# include <gp_Cylinder.hxx>
-# include <gp_Cone.hxx>
 # include <gp_Sphere.hxx>
 # include <gp_Torus.hxx>
+# include <LProp_NotDefined.hxx>
+# include <Precision.hxx>
+# include <ShapeConstruct_Curve.hxx>
+# include <Standard_ConstructionError.hxx>
 # include <Standard_Real.hxx>
 # include <Standard_Version.hxx>
-# include <Standard_ConstructionError.hxx>
 # include <TColgp_Array1OfPnt.hxx>
-# include <TColgp_Array2OfPnt.hxx>
 # include <TColgp_Array1OfVec.hxx>
+# include <TColgp_Array2OfPnt.hxx>
 # include <TColgp_HArray1OfPnt.hxx>
-# include <TColStd_HArray1OfBoolean.hxx>
 # include <TColStd_Array1OfReal.hxx>
 # include <TColStd_Array1OfInteger.hxx>
-# include <gp.hxx>
-# include <gp_Lin.hxx>
-# include <Geom_Line.hxx>
-# include <Geom_TrimmedCurve.hxx>
-# include <GC_MakeArcOfCircle.hxx>
-# include <GC_MakeCircle.hxx>
-# include <GC_MakeArcOfEllipse.hxx>
-# include <GC_MakeEllipse.hxx>
-# include <gce_MakeParab.hxx>
-# include <GC_MakeArcOfParabola.hxx>
-# include <GC_MakeHyperbola.hxx>
-# include <GC_MakeArcOfHyperbola.hxx>
-# include <GC_MakeLine.hxx>
-# include <GC_MakeSegment.hxx>
-# include <GCPnts_AbscissaPoint.hxx>
-# include <Precision.hxx>
-# include <GeomAPI_ProjectPointOnCurve.hxx>
-# include <GeomAPI_ExtremaCurveCurve.hxx>
-# include <ShapeConstruct_Curve.hxx>
-# include <LProp_NotDefined.hxx>
+# include <TColStd_HArray1OfBoolean.hxx>
+
 # if OCC_VERSION_HEX < 0x070600
 # include <GeomAdaptor_HCurve.hxx>
 # endif
 
-# include <ctime>
 # include <cmath>
+# include <ctime>
 #endif //_PreComp_
 
-#include <Base/VectorPy.h>
-#include <Mod/Part/App/LinePy.h>
-#include <Mod/Part/App/LineSegmentPy.h>
-#include <Mod/Part/App/CirclePy.h>
-#include <Mod/Part/App/EllipsePy.h>
-#include <Mod/Part/App/ArcPy.h>
-#include <Mod/Part/App/ArcOfCirclePy.h>
-#include <Mod/Part/App/ArcOfEllipsePy.h>
-#include <Mod/Part/App/ArcOfParabolaPy.h>
-#include <Mod/Part/App/BezierCurvePy.h>
-#include <Mod/Part/App/BSplineCurvePy.h>
-#include <Mod/Part/App/HyperbolaPy.h>
-#include <Mod/Part/App/ArcOfHyperbolaPy.h>
-#include <Mod/Part/App/OffsetCurvePy.h>
-#include <Mod/Part/App/ParabolaPy.h>
-#include <Mod/Part/App/BezierSurfacePy.h>
-#include <Mod/Part/App/BSplineCurveBiArcs.h>
-#include <Mod/Part/App/BSplineSurfacePy.h>
-#include <Mod/Part/App/ConePy.h>
-#include <Mod/Part/App/CylinderPy.h>
-#include <Mod/Part/App/OffsetSurfacePy.h>
-#include <Mod/Part/App/PointPy.h>
-#include <Mod/Part/App/PlateSurfacePy.h>
-#include <Mod/Part/App/PlanePy.h>
-#include <Mod/Part/App/RectangularTrimmedSurfacePy.h>
-#include <Mod/Part/App/SpherePy.h>
-#include <Mod/Part/App/SurfaceOfExtrusionPy.h>
-#include <Mod/Part/App/SurfaceOfRevolutionPy.h>
-#include <Mod/Part/App/ToroidPy.h>
-
 #include <Base/Exception.h>
-#include <Base/Writer.h>
 #include <Base/Reader.h>
-#include <Base/Tools.h>
-
-#include "GeometryMigrationExtension.h"
+#include <Base/Writer.h>
 
 #include "Geometry.h"
+#include "ArcOfCirclePy.h"
+#include "ArcOfEllipsePy.h"
+#include "ArcOfHyperbolaPy.h"
+#include "ArcOfParabolaPy.h"
+#include "BezierCurvePy.h"
+#include "BezierSurfacePy.h"
+#include "BSplineCurveBiArcs.h"
+#include "BSplineCurvePy.h"
+#include "BSplineSurfacePy.h"
+#include "CirclePy.h"
+#include "ConePy.h"
+#include "CylinderPy.h"
+#include "EllipsePy.h"
+#include "GeometryMigrationExtension.h"
+#include "HyperbolaPy.h"
+#include "LinePy.h"
+#include "LineSegmentPy.h"
+#include "OffsetCurvePy.h"
+#include "OffsetSurfacePy.h"
+#include "ParabolaPy.h"
+#include "PlanePy.h"
+#include "PlateSurfacePy.h"
+#include "PointPy.h"
+#include "RectangularTrimmedSurfacePy.h"
+#include "SpherePy.h"
+#include "SurfaceOfExtrusionPy.h"
+#include "SurfaceOfRevolutionPy.h"
 #include "Tools.h"
+#include "ToroidPy.h"
+
 
 #if OCC_VERSION_HEX >= 0x070600
 using GeomAdaptor_HCurve = GeomAdaptor_Curve;
diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h
index 965ceee123..b13626772f 100644
--- a/src/Mod/Part/App/Geometry.h
+++ b/src/Mod/Part/App/Geometry.h
@@ -20,55 +20,55 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_GEOMETRY_H
 #define PART_GEOMETRY_H
 
 #include <Adaptor3d_Curve.hxx>
-#include <Geom_CartesianPoint.hxx>
 #include <Geom_BezierCurve.hxx>
+#include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Geom_CartesianPoint.hxx>
 #include <Geom_Circle.hxx>
+#include <Geom_ConicalSurface.hxx>
+#include <Geom_CylindricalSurface.hxx>
 #include <Geom_Ellipse.hxx>
 #include <Geom_Hyperbola.hxx>
-#include <Geom_Parabola.hxx>
 #include <Geom_Line.hxx>
 #include <Geom_OffsetCurve.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_ToroidalSurface.hxx>
-#include <Geom_Plane.hxx>
 #include <Geom_OffsetSurface.hxx>
-#include <GeomPlate_Surface.hxx>
+#include <Geom_Parabola.hxx>
+#include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
 #include <Geom_SurfaceOfLinearExtrusion.hxx>
+#include <Geom_SurfaceOfRevolution.hxx>
+#include <Geom_SphericalSurface.hxx>
+#include <Geom_TrimmedCurve.hxx>
+#include <Geom_ToroidalSurface.hxx>
 #include <GeomPlate_BuildPlateSurface.hxx>
-#include <Plate_Plate.hxx>
-#include <TopoDS_Shape.hxx>
+#include <GeomPlate_Surface.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
+#include <Plate_Plate.hxx>
+#include <TopoDS_Shape.hxx>
+
 #include <list>
 #include <memory>
 #include <vector>
-#include <Base/Persistence.h>
-#include <Base/Vector3D.h>
-#include <Base/Matrix.h>
-#include <Base/Placement.h>
 
-#include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 
+#include <Base/Matrix.h>
+#include <Base/Placement.h>
+#include <Base/Persistence.h>
+#include <Base/Vector3D.h>
 #include <Mod/Part/PartGlobal.h>
+
 #include "GeometryExtension.h"
 
+
 namespace Part {
 
 class PartExport Geometry: public Base::Persistence
diff --git a/src/Mod/Part/App/Geometry2d.cpp b/src/Mod/Part/App/Geometry2d.cpp
index f2985e23da..247beca2d4 100644
--- a/src/Mod/Part/App/Geometry2d.cpp
+++ b/src/Mod/Part/App/Geometry2d.cpp
@@ -20,67 +20,63 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRepBuilderAPI_MakeEdge2d.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
-# include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 # include <Geom2dAPI_Interpolate.hxx>
 # include <Geom2dAPI_ProjectPointOnCurve.hxx>
 # include <Geom2dConvert.hxx>
+# include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 # include <Geom2dLProp_CLProps2d.hxx>
-# include <gp.hxx>
+# include <gce_ErrorType.hxx>
 # include <gp_Ax22d.hxx>
 # include <gp_Circ2d.hxx>
 # include <gp_Elips2d.hxx>
 # include <gp_Hypr2d.hxx>
 # include <gp_Lin2d.hxx>
 # include <gp_Parab2d.hxx>
-# include <gce_ErrorType.hxx>
-# include <Standard_Real.hxx>
-# include <Standard_Version.hxx>
 # include <Standard_ConstructionError.hxx>
+# include <Standard_Version.hxx>
 # include <TColgp_Array1OfPnt2d.hxx>
 # include <TColgp_Array1OfVec2d.hxx>
 # include <TColgp_HArray1OfPnt2d.hxx>
-# include <TColStd_HArray1OfBoolean.hxx>
-# include <TColStd_Array1OfReal.hxx>
 # include <TColStd_Array1OfInteger.hxx>
-# include <GCE2d_MakeCircle.hxx>
+# include <TColStd_Array1OfReal.hxx>
+# include <TColStd_HArray1OfBoolean.hxx>
 # include <GCE2d_MakeArcOfCircle.hxx>
-# include <GCE2d_MakeEllipse.hxx>
 # include <GCE2d_MakeArcOfEllipse.hxx>
-# include <GCE2d_MakeParabola.hxx>
-# include <GCE2d_MakeArcOfParabola.hxx>
-# include <GCE2d_MakeHyperbola.hxx>
 # include <GCE2d_MakeArcOfHyperbola.hxx>
+# include <GCE2d_MakeArcOfParabola.hxx>
+# include <GCE2d_MakeCircle.hxx>
+# include <GCE2d_MakeEllipse.hxx>
+# include <GCE2d_MakeHyperbola.hxx>
 # include <GCE2d_MakeLine.hxx>
+# include <GCE2d_MakeParabola.hxx>
 # include <GCE2d_MakeSegment.hxx>
 # include <Precision.hxx>
 #endif
 
-#include <Base/VectorPy.h>
-
 #include <Base/Exception.h>
-#include <Base/Writer.h>
 #include <Base/Reader.h>
-#include <Base/Tools.h>
+#include <Base/Writer.h>
 
 #include "Geometry2d.h"
-#include <Mod/Part/App/Geom2d/Circle2dPy.h>
-#include <Mod/Part/App/Geom2d/Ellipse2dPy.h>
-#include <Mod/Part/App/Geom2d/Hyperbola2dPy.h>
-#include <Mod/Part/App/Geom2d/Parabola2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfCircle2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfEllipse2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfParabola2dPy.h>
-#include <Mod/Part/App/Geom2d/BezierCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/BSplineCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/Line2dSegmentPy.h>
-#include <Mod/Part/App/Geom2d/Line2dPy.h>
-#include <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+#include <Geom2d/ArcOfCircle2dPy.h>
+#include <Geom2d/ArcOfEllipse2dPy.h>
+#include <Geom2d/ArcOfHyperbola2dPy.h>
+#include <Geom2d/ArcOfParabola2dPy.h>
+#include <Geom2d/BezierCurve2dPy.h>
+#include <Geom2d/BSplineCurve2dPy.h>
+#include <Geom2d/Circle2dPy.h>
+#include <Geom2d/Ellipse2dPy.h>
+#include <Geom2d/Hyperbola2dPy.h>
+#include <Geom2d/Line2dSegmentPy.h>
+#include <Geom2d/Line2dPy.h>
+#include <Geom2d/OffsetCurve2dPy.h>
+#include <Geom2d/Parabola2dPy.h>
+
 
 using namespace Part;
 using namespace std;
diff --git a/src/Mod/Part/App/Geometry2d.h b/src/Mod/Part/App/Geometry2d.h
index 358169f03d..43241db924 100644
--- a/src/Mod/Part/App/Geometry2d.h
+++ b/src/Mod/Part/App/Geometry2d.h
@@ -20,31 +20,32 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_GEOMETRY2D_H
 #define PART_GEOMETRY2D_H
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Geom2d_CartesianPoint.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
+#include <Geom2d_CartesianPoint.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Ellipse.hxx>
 #include <Geom2d_Hyperbola.hxx>
-#include <Geom2d_Parabola.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_OffsetCurve.hxx>
+#include <Geom2d_Parabola.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
-#include <Geom_Surface.hxx>
-#include <TopoDS_Shape.hxx>
 #include <gp_Ax22d.hxx>
+#include <TopoDS_Shape.hxx>
+
 #include <list>
-#include <vector>
 #include <memory>
+#include <vector>
+
 #include <Base/Persistence.h>
 #include <Base/Tools2D.h>
 #include <Mod/Part/PartGlobal.h>
 
+
 namespace Part {
 
 class PartExport Geometry2d : public Base::Persistence
diff --git a/src/Mod/Part/App/GeometryDefaultExtension.cpp b/src/Mod/Part/App/GeometryDefaultExtension.cpp
index 88f66503f5..4fecdd4d6a 100644
--- a/src/Mod/Part/App/GeometryDefaultExtension.cpp
+++ b/src/Mod/Part/App/GeometryDefaultExtension.cpp
@@ -20,20 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include <Base/Writer.h>
 #include <Base/Reader.h>
-#include <Base/Tools.h>
-#include <Base/Exception.h>
 
 #include "GeometryDefaultExtension.h"
-
-#include "GeometryStringExtensionPy.h"
-#include "GeometryIntExtensionPy.h"
 #include "GeometryBoolExtensionPy.h"
 #include "GeometryDoubleExtensionPy.h"
+#include "GeometryIntExtensionPy.h"
+#include "GeometryStringExtensionPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/GeometryDefaultExtension.h b/src/Mod/Part/App/GeometryDefaultExtension.h
index 4eaf1de579..9ab4bdfdd3 100644
--- a/src/Mod/Part/App/GeometryDefaultExtension.h
+++ b/src/Mod/Part/App/GeometryDefaultExtension.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_GEOMETRYDEFAULTEXTENSION_H
 #define PART_GEOMETRYDEFAULTEXTENSION_H
 
 #include <string>
 #include "GeometryExtension.h"
 
+
 namespace Part {
 
     template <typename T>
diff --git a/src/Mod/Part/App/GeometryExtension.cpp b/src/Mod/Part/App/GeometryExtension.cpp
index e3b6f8275a..96c0c8f119 100644
--- a/src/Mod/Part/App/GeometryExtension.cpp
+++ b/src/Mod/Part/App/GeometryExtension.cpp
@@ -20,16 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include <Base/Writer.h>
 #include <Base/Reader.h>
-#include <Base/Tools.h>
+#include <Base/Writer.h>
 
 #include "GeometryExtension.h"
 #include "GeometryExtensionPy.h"
 
+
 using namespace Part;
 
 TYPESYSTEM_SOURCE_ABSTRACT(Part::GeometryExtension,Base::BaseClass)
diff --git a/src/Mod/Part/App/GeometryExtension.h b/src/Mod/Part/App/GeometryExtension.h
index afd6586628..228d537530 100644
--- a/src/Mod/Part/App/GeometryExtension.h
+++ b/src/Mod/Part/App/GeometryExtension.h
@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_GEOMETRYEXTENSION_H
 #define PART_GEOMETRYEXTENSION_H
 
-#include <Base/Persistence.h>
-#include <Mod/Part/PartGlobal.h>
 #include <memory>
 #include <string>
 
+#include <Base/Persistence.h>
+#include <Mod/Part/PartGlobal.h>
+
 
 namespace Part {
 
diff --git a/src/Mod/Part/App/GeometryMigrationExtension.cpp b/src/Mod/Part/App/GeometryMigrationExtension.cpp
index b39c635a96..806412d54a 100644
--- a/src/Mod/Part/App/GeometryMigrationExtension.cpp
+++ b/src/Mod/Part/App/GeometryMigrationExtension.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 
-#include "GeometryMigrationExtension.h"
-
 #include <Base/Exception.h>
 
-using namespace Part;
+#include "GeometryMigrationExtension.h"
 
 
+using namespace Part;
+
 //---------- Geometry Extension
 TYPESYSTEM_SOURCE(Part::GeometryMigrationExtension,Part::GeometryExtension)
 
diff --git a/src/Mod/Part/App/GeometryMigrationExtension.h b/src/Mod/Part/App/GeometryMigrationExtension.h
index 77f03546af..a9c68c5272 100644
--- a/src/Mod/Part/App/GeometryMigrationExtension.h
+++ b/src/Mod/Part/App/GeometryMigrationExtension.h
@@ -23,8 +23,9 @@
 #ifndef PART_GEOMETRYMIGRATIONEXTENSION_H
 #define PART_GEOMETRYMIGRATIONEXTENSION_H
 
-#include <Mod/Part/App/Geometry.h>
 #include <bitset>
+#include "Geometry.h"
+
 
 namespace Part
 {