diff --git a/src/Mod/Part/App/AppPart.cpp b/src/Mod/Part/App/AppPart.cpp
index 534e9a07f3..b351e5fd00 100644
--- a/src/Mod/Part/App/AppPart.cpp
+++ b/src/Mod/Part/App/AppPart.cpp
@@ -27,127 +27,48 @@
 # include <IGESControl_Controller.hxx>
 # include <STEPControl_Controller.hxx>
 # include <Standard_Version.hxx>
-# include <OSD.hxx>
 #endif
 
+#include <App/Application.h>
 #include <Base/Console.h>
+#include <Base/ExceptionFactory.h>
 #include <Base/Interpreter.h>
 #include <Base/Parameter.h>
-#include <Base/ExceptionFactory.h>
-
-#include <App/Application.h>
-
-#include "Mod/Part/App/ArcOfCirclePy.h"
-#include "Mod/Part/App/ArcOfConicPy.h"
-#include "Mod/Part/App/ArcOfEllipsePy.h"
-#include "Mod/Part/App/ArcOfHyperbolaPy.h"
-#include "Mod/Part/App/ArcOfParabolaPy.h"
-#include "Mod/Part/App/ArcPy.h"
-#include "Mod/Part/App/AttachEnginePy.h"
-#include "Mod/Part/App/BezierCurvePy.h"
-#include "Mod/Part/App/BezierSurfacePy.h"
-#include <Mod/Part/App/BRepFeat/MakePrismPy.h>
-#include "Mod/Part/App/BRepOffsetAPI_MakeFillingPy.h"
-#include "Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.h"
-#include "Mod/Part/App/BSplineCurvePy.h"
-#include "Mod/Part/App/BSplineSurfacePy.h"
-#include <Mod/Part/App/ChFi2d/ChFi2d_AnaFilletAlgoPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_ChamferAPIPy.h>
-#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.h>
-#include "Mod/Part/App/CirclePy.h"
-#include "Mod/Part/App/ConePy.h"
-#include "Mod/Part/App/ConicPy.h"
-#include "Mod/Part/App/CylinderPy.h"
-#include "Mod/Part/App/EllipsePy.h"
-#include "Mod/Part/App/GeometryBoolExtensionPy.h"
-#include "Mod/Part/App/GeometryDoubleExtensionPy.h"
-#include "Mod/Part/App/GeometryIntExtensionPy.h"
-#include "Mod/Part/App/GeometryStringExtensionPy.h"
-#include <Mod/Part/App/Geom2d/ArcOfCircle2dPy.h>
-#include <Mod/Part/App/Geom2d/ArcOfConic2dPy.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/Circle2dPy.h>
-#include <Mod/Part/App/Geom2d/Conic2dPy.h>
-#include <Mod/Part/App/Geom2d/Curve2dPy.h>
-#include <Mod/Part/App/Geom2d/Ellipse2dPy.h>
-#include <Mod/Part/App/Geom2d/Geometry2dPy.h>
-#include <Mod/Part/App/Geom2d/Hyperbola2dPy.h>
-#include <Mod/Part/App/Geom2d/Line2dSegmentPy.h>
-#include <Mod/Part/App/Geom2d/Line2dPy.h>
-#include <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
-#include <Mod/Part/App/Geom2d/Parabola2dPy.h>
-#include <Mod/Part/App/GeomPlate/BuildPlateSurfacePy.h>
-#include <Mod/Part/App/GeomPlate/CurveConstraintPy.h>
-#include <Mod/Part/App/GeomPlate/PointConstraintPy.h>
-#include <Mod/Part/App/HLRBRep/HLRBRep_AlgoPy.h>
-#include <Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPy.h>
-#include <Mod/Part/App/HLRBRep/HLRToShapePy.h>
-#include <Mod/Part/App/HLRBRep/PolyHLRToShapePy.h>
-#include "Mod/Part/App/HyperbolaPy.h"
-#include "Mod/Part/App/LinePy.h"
-#include "Mod/Part/App/LineSegmentPy.h"
-#include "Mod/Part/App/OffsetCurvePy.h"
-#include "Mod/Part/App/OffsetSurfacePy.h"
-#include "Mod/Part/App/ParabolaPy.h"
-#include "Mod/Part/App/PartFeaturePy.h"
-#include "Mod/Part/App/PlateSurfacePy.h"
-#include "Mod/Part/App/PlanePy.h"
-#include "Mod/Part/App/PointPy.h"
-#include <Mod/Part/App/PrecisionPy.h>
-#include <Mod/Part/App/RectangularTrimmedSurfacePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_RootPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_EdgePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_EdgeConnectPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_FacePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_FaceConnectPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_FixSmallFacePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_FixSmallSolidPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_FreeBoundsPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_ShapePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_ShapeTolerancePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_ShellPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_SolidPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_SplitCommonVertexPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_SplitToolPy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_WirePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_WireframePy.h>
-#include <Mod/Part/App/ShapeFix/ShapeFix_WireVertexPy.h>
-#include <Mod/Part/App/ShapeUpgrade/UnifySameDomainPy.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 "Mod/Part/App/TopoShapeCompoundPy.h"
-#include "Mod/Part/App/TopoShapeCompSolidPy.h"
-#include "Mod/Part/App/TopoShapeEdgePy.h"
-#include "Mod/Part/App/TopoShapeFacePy.h"
-#include "Mod/Part/App/TopoShapeWirePy.h"
-#include "Mod/Part/App/TopoShapePy.h"
-#include "Mod/Part/App/TopoShapeSolidPy.h"
-#include "Mod/Part/App/TopoShapeVertexPy.h"
-#include "Mod/Part/App/TopoShapeShellPy.h"
 
+#include "ArcOfCirclePy.h"
+#include "ArcOfConicPy.h"
+#include "ArcOfEllipsePy.h"
+#include "ArcOfHyperbolaPy.h"
+#include "ArcOfParabolaPy.h"
+#include "ArcPy.h"
 #include "Attacher.h"
 #include "AttachExtension.h"
+#include "AttachEnginePy.h"
+#include "BezierCurvePy.h"
+#include "BezierSurfacePy.h"
 #include "BodyBase.h"
 #include "BodyBasePy.h"
+#include "BRepOffsetAPI_MakeFillingPy.h"
+#include "BRepOffsetAPI_MakePipeShellPy.h"
+#include "BSplineCurvePy.h"
+#include "BSplineSurfacePy.h"
+#include "CirclePy.h"
+#include "ConePy.h"
+#include "ConicPy.h"
+#include "CustomFeature.h"
+#include "CylinderPy.h"
 #include "DatumFeature.h"
+#include "EllipsePy.h"
 #include "FaceMaker.h"
 #include "FaceMakerBullseye.h"
 #include "FaceMakerCheese.h"
 #include "FeatureChamfer.h"
 #include "FeatureCompound.h"
-#include "FeatureGeometrySet.h"
-#include "FeatureFace.h"
 #include "FeatureExtrusion.h"
+#include "FeatureFace.h"
 #include "FeatureFillet.h"
+#include "FeatureGeometrySet.h"
 #include "FeatureMirroring.h"
-#include "FeatureRevolution.h"
 #include "FeatureOffset.h"
 #include "FeaturePartBoolean.h"
 #include "FeaturePartBox.h"
@@ -162,20 +83,103 @@
 #include "FeaturePartPolygon.h"
 #include "FeaturePartSection.h"
 #include "FeaturePartSpline.h"
-#include "PrimitiveFeature.h"
-#include "PartFeatures.h"
+#include "FeatureRevolution.h"
+#include "Geometry.h"
+#include "Geometry2d.h"
+#include "GeometryBoolExtensionPy.h"
+#include "GeometryDefaultExtension.h"
+#include "GeometryDoubleExtensionPy.h"
+#include "GeometryExtension.h"
+#include "GeometryIntExtensionPy.h"
+#include "GeometryMigrationExtension.h"
+#include "GeometryStringExtensionPy.h"
+#include "HyperbolaPy.h"
+#include "LinePy.h"
+#include "LineSegmentPy.h"
+#include "OffsetCurvePy.h"
+#include "OffsetSurfacePy.h"
+#include "ParabolaPy.h"
 #include "Part2DObject.h"
 #include "Part2DObjectPy.h"
-#include "CustomFeature.h"
-#include "Geometry.h"
-#include "GeometryDefaultExtension.h"
-#include "GeometryExtension.h"
-#include "GeometryMigrationExtension.h"
-#include "Geometry2d.h"
+#include "PartFeaturePy.h"
+#include "PartFeatures.h"
+#include "PlanePy.h"
+#include "PlateSurfacePy.h"
+#include "PointPy.h"
+#include "PrecisionPy.h"
+#include "PrimitiveFeature.h"
+#include "RectangularTrimmedSurfacePy.h"
+#include "SpherePy.h"
+#include "SurfaceOfExtrusionPy.h"
+#include "SurfaceOfRevolutionPy.h"
+#include "TopoShapeCompoundPy.h"
+#include "TopoShapeCompSolidPy.h"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeFacePy.h"
+#include "TopoShapePy.h"
+#include "TopoShapeShellPy.h"
+#include "TopoShapeSolidPy.h"
+#include "TopoShapeVertexPy.h"
+#include "TopoShapeWirePy.h"
+#include "ToroidPy.h"
 #include "OCCError.h"
 #include "PrismExtension.h"
 #include "PropertyGeometryList.h"
 
+#include <BRepFeat/MakePrismPy.h>
+
+#include <ChFi2d/ChFi2d_AnaFilletAlgoPy.h>
+#include <ChFi2d/ChFi2d_ChamferAPIPy.h>
+#include <ChFi2d/ChFi2d_FilletAlgoPy.h>
+#include <ChFi2d/ChFi2d_FilletAPIPy.h>
+
+#include <Geom2d/ArcOfCircle2dPy.h>
+#include <Geom2d/ArcOfConic2dPy.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/Conic2dPy.h>
+#include <Geom2d/Curve2dPy.h>
+#include <Geom2d/Ellipse2dPy.h>
+#include <Geom2d/Geometry2dPy.h>
+#include <Geom2d/Hyperbola2dPy.h>
+#include <Geom2d/Line2dPy.h>
+#include <Geom2d/Line2dSegmentPy.h>
+#include <Geom2d/OffsetCurve2dPy.h>
+#include <Geom2d/Parabola2dPy.h>
+
+#include <GeomPlate/BuildPlateSurfacePy.h>
+#include <GeomPlate/CurveConstraintPy.h>
+#include <GeomPlate/PointConstraintPy.h>
+
+#include <HLRBRep/HLRBRep_AlgoPy.h>
+#include <HLRBRep/HLRBRep_PolyAlgoPy.h>
+#include <HLRBRep/HLRToShapePy.h>
+#include <HLRBRep/PolyHLRToShapePy.h>
+
+#include <ShapeFix/ShapeFix_EdgeConnectPy.h>
+#include <ShapeFix/ShapeFix_EdgePy.h>
+#include <ShapeFix/ShapeFix_FaceConnectPy.h>
+#include <ShapeFix/ShapeFix_FacePy.h>
+#include <ShapeFix/ShapeFix_FreeBoundsPy.h>
+#include <ShapeFix/ShapeFix_FixSmallFacePy.h>
+#include <ShapeFix/ShapeFix_FixSmallSolidPy.h>
+#include <ShapeFix/ShapeFix_RootPy.h>
+#include <ShapeFix/ShapeFix_ShapePy.h>
+#include <ShapeFix/ShapeFix_ShapeTolerancePy.h>
+#include <ShapeFix/ShapeFix_ShellPy.h>
+#include <ShapeFix/ShapeFix_SolidPy.h>
+#include <ShapeFix/ShapeFix_SplitCommonVertexPy.h>
+#include <ShapeFix/ShapeFix_SplitToolPy.h>
+#include <ShapeFix/ShapeFix_WireframePy.h>
+#include <ShapeFix/ShapeFix_WirePy.h>
+#include <ShapeFix/ShapeFix_WireVertexPy.h>
+
+#include <ShapeUpgrade/UnifySameDomainPy.h>
+
 
 namespace Part {
 extern PyObject* initModule();
diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp
index 8c7c9e09cb..ab9f039b59 100644
--- a/src/Mod/Part/App/AppPartPy.cpp
+++ b/src/Mod/Part/App/AppPartPy.cpp
@@ -25,12 +25,10 @@
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakePolygon.hxx>
-# include <BRepBuilderAPI_MakeShell.hxx>
 # include <BRepBuilderAPI_MakeSolid.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepCheck_Analyzer.hxx>
 # include <BRepFeat_SplitShape.hxx>
 # include <BRepOffsetAPI_Sewing.hxx>
@@ -61,7 +59,6 @@
 # include <ShapeFix.hxx>
 # include <ShapeBuild_ReShape.hxx>
 # include <ShapeUpgrade_ShellSewing.hxx>
-# include <Standard_ConstructionError.hxx>
 # include <Standard_DomainError.hxx>
 # include <Standard_Version.hxx>
 # include <TopExp_Explorer.hxx>
@@ -73,8 +70,6 @@
 # include <TopTools_ListIteratorOfListOfShape.hxx>
 #endif
 
-#include <BRepFill_Generator.hxx>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
@@ -88,11 +83,6 @@
 #include "BSplineSurfacePy.h"
 #include "edgecluster.h"
 #include "FaceMaker.h"
-#include "FeaturePartBox.h"
-#include "FeaturePartCut.h"
-#include "FeaturePartImportStep.h"
-#include "FeaturePartImportIges.h"
-#include "FeaturePartImportBrep.h"
 #include "GeometryCurvePy.h"
 #include "GeometryPy.h"
 #include "ImportIges.h"
@@ -102,16 +92,14 @@
 #include "PartFeature.h"
 #include "PartPyCXX.h"
 #include "Tools.h"
-#include "TopoShape.h"
 #include "TopoShapeCompoundPy.h"
-#include "TopoShapeCompSolidPy.h"
 #include "TopoShapePy.h"
 #include "TopoShapeEdgePy.h"
 #include "TopoShapeFacePy.h"
 #include "TopoShapeShellPy.h"
 #include "TopoShapeSolidPy.h"
 #include "TopoShapeWirePy.h"
-#include "TopoShapeVertexPy.h"
+
 
 #ifdef FCUseFreeType
 #  include "FT2FC.h"