From 2b76f1f89e0dd65d7fbf94f4bf026c5718d982c4 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 21 Feb 2022 04:29:28 +0100
Subject: [PATCH] [Part] remove some unused includes and sorting

---
 src/Mod/Part/App/AppPart.cpp      | 178 +++++++++++++++---------------
 src/Mod/Part/App/AppPartPy.cpp    | 115 ++++++++-----------
 src/Mod/Part/Gui/AppPartGui.cpp   |  70 +++++-------
 src/Mod/Part/Gui/Command.cpp      |  18 +--
 src/Mod/Part/Gui/DlgExtrusion.cpp |  26 ++---
 5 files changed, 177 insertions(+), 230 deletions(-)

diff --git a/src/Mod/Part/App/AppPart.cpp b/src/Mod/Part/App/AppPart.cpp
index a550a71612..d231211b25 100644
--- a/src/Mod/Part/App/AppPart.cpp
+++ b/src/Mod/Part/App/AppPart.cpp
@@ -29,7 +29,6 @@
 # include <STEPControl_Controller.hxx>
 # include <Standard_Version.hxx>
 # include <OSD.hxx>
-# include <sstream>
 #endif
 
 #include <Base/Console.h>
@@ -39,89 +38,29 @@
 
 #include <App/Application.h>
 
-#include "OCCError.h"
-#include "TopoShape.h"
-#include "FeaturePartBox.h"
-#include "FeaturePartBoolean.h"
-#include "FeaturePartCommon.h"
-#include "FeaturePartCut.h"
-#include "FeaturePartFuse.h"
-#include "FeaturePartSection.h"
-#include "FeaturePartImportStep.h"
-#include "FeaturePartImportIges.h"
-#include "FeaturePartImportBrep.h"
-#include "FeaturePartCurveNet.h"
-#include "FeaturePartCircle.h"
-#include "FeaturePartPolygon.h"
-#include "FeaturePartSpline.h"
-#include "FeatureGeometrySet.h"
-#include "FeatureChamfer.h"
-#include "FeatureCompound.h"
-#include "FeatureFace.h"
-#include "FeatureExtrusion.h"
-#include "FeatureFillet.h"
-#include "FeatureMirroring.h"
-#include "FeatureRevolution.h"
-#include "FeatureOffset.h"
-#include "PartFeatures.h"
-#include "BodyBase.h"
-#include "BodyBasePy.h"
-#include "PrimitiveFeature.h"
-#include "Part2DObject.h"
-#include "Part2DObjectPy.h"
-#include "CustomFeature.h"
-#include "Geometry.h"
-#include "GeometryExtension.h"
-#include "GeometryDefaultExtension.h"
-#include "GeometryMigrationExtension.h"
-#include "Geometry2d.h"
-#include "Mod/Part/App/GeometryIntExtensionPy.h"
-#include "Mod/Part/App/GeometryStringExtensionPy.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/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/TopoShapePy.h"
-#include "Mod/Part/App/TopoShapeVertexPy.h"
-#include "Mod/Part/App/TopoShapeFacePy.h"
-#include "Mod/Part/App/TopoShapeWirePy.h"
-#include "Mod/Part/App/TopoShapeEdgePy.h"
-#include "Mod/Part/App/TopoShapeSolidPy.h"
-#include "Mod/Part/App/TopoShapeCompoundPy.h"
-#include "Mod/Part/App/TopoShapeCompSolidPy.h"
-#include "Mod/Part/App/TopoShapeShellPy.h"
-#include "Mod/Part/App/LinePy.h"
-#include "Mod/Part/App/LineSegmentPy.h"
-#include "Mod/Part/App/PointPy.h"
-#include "Mod/Part/App/ConicPy.h"
-#include "Mod/Part/App/ArcOfConicPy.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/ArcOfHyperbolaPy.h"
-#include "Mod/Part/App/BezierCurvePy.h"
-#include "Mod/Part/App/BSplineCurvePy.h"
-#include "Mod/Part/App/HyperbolaPy.h"
-#include "Mod/Part/App/OffsetCurvePy.h"
-#include "Mod/Part/App/ParabolaPy.h"
-#include "Mod/Part/App/BezierSurfacePy.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/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 "Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.h"
-#include "Mod/Part/App/BRepOffsetAPI_MakeFillingPy.h"
-#include "Mod/Part/App/PartFeaturePy.h"
-#include "Mod/Part/App/AttachEnginePy.h"
-#include <Mod/Part/App/BRepFeat/MakePrismPy.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>
@@ -131,10 +70,10 @@
 #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/Curve2dPy.h>
 #include <Mod/Part/App/Geom2d/Line2dSegmentPy.h>
 #include <Mod/Part/App/Geom2d/Line2dPy.h>
 #include <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
@@ -143,19 +82,80 @@
 #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/HLRToShapePy.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/ShapeUpgrade/UnifySameDomainPy.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 "PropertyGeometryList.h"
-#include "DatumFeature.h"
+#include "Mod/Part/App/RectangularTrimmedSurfacePy.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 "Attacher.h"
 #include "AttachExtension.h"
-#include "PrismExtension.h"
+#include "BodyBase.h"
+#include "BodyBasePy.h"
+#include "DatumFeature.h"
 #include "FaceMaker.h"
-#include "FaceMakerCheese.h"
 #include "FaceMakerBullseye.h"
+#include "FaceMakerCheese.h"
+#include "FeatureChamfer.h"
+#include "FeatureCompound.h"
+#include "FeatureGeometrySet.h"
+#include "FeatureFace.h"
+#include "FeatureExtrusion.h"
+#include "FeatureFillet.h"
+#include "FeatureMirroring.h"
+#include "FeatureRevolution.h"
+#include "FeatureOffset.h"
+#include "FeaturePartBoolean.h"
+#include "FeaturePartBox.h"
+#include "FeaturePartCircle.h"
+#include "FeaturePartCommon.h"
+#include "FeaturePartCurveNet.h"
+#include "FeaturePartCut.h"
+#include "FeaturePartFuse.h"
+#include "FeaturePartImportBrep.h"
+#include "FeaturePartImportIges.h"
+#include "FeaturePartImportStep.h"
+#include "FeaturePartPolygon.h"
+#include "FeaturePartSection.h"
+#include "FeaturePartSpline.h"
+#include "PrimitiveFeature.h"
+#include "PartFeatures.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 "OCCError.h"
+#include "PrismExtension.h"
+#include "PropertyGeometryList.h"
+
 
 namespace Part {
 extern PyObject* initModule();
diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp
index 178472e10c..266603c2f3 100644
--- a/src/Mod/Part/App/AppPartPy.cpp
+++ b/src/Mod/Part/App/AppPartPy.cpp
@@ -22,106 +22,70 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepAdaptor_Curve.hxx>
-# include <BRepCheck_Analyzer.hxx>
-# include <BRepFeat_SplitShape.hxx>
-# include <BRepPrimAPI_MakeBox.hxx>
-# include <BRepPrimAPI_MakeCone.hxx>
-# include <BRepPrimAPI_MakeTorus.hxx>
-# include <BRepPrimAPI_MakeCylinder.hxx>
-# include <BRepPrimAPI_MakeSphere.hxx>
-# include <BRepPrimAPI_MakeRevolution.hxx>
-# include <BRepPrim_Wedge.hxx>
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
-# include <BRepLib.hxx>
+# include <BRepAdaptor_Curve.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
-# include <BRepBuilderAPI_MakeWire.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>
+# include <BRepPrim_Wedge.hxx>
+# include <BRepPrimAPI_MakeBox.hxx>
+# include <BRepPrimAPI_MakeCone.hxx>
+# include <BRepPrimAPI_MakeCylinder.hxx>
+# include <BRepPrimAPI_MakeRevolution.hxx>
+# include <BRepPrimAPI_MakeSphere.hxx>
+# include <BRepPrimAPI_MakeTorus.hxx>
 # include <BRepFill.hxx>
+# include <BRepFill_Filling.hxx>
+# include <BRepFill_Generator.hxx>
 # include <BRepLib.hxx>
-# include <gp_Circ.hxx>
+# include <BSplCLib.hxx>
 # include <gp_Ax3.hxx>
+# include <gp_Circ.hxx>
 # include <gp_Pnt.hxx>
-# include <gp_Lin.hxx>
-# include <GCE2d_MakeSegment.hxx>
-# include <Geom2d_Line.hxx>
-# include <Geom_Circle.hxx>
-# include <Geom_Line.hxx>
-# include <Geom_Plane.hxx>
 # include <Geom_BSplineSurface.hxx>
-# include <Geom_ConicalSurface.hxx>
-# include <Geom_CylindricalSurface.hxx>
-# include <Geom_OffsetSurface.hxx>
-# include <GeomAPI_PointsToBSplineSurface.hxx>
 # include <Geom_Circle.hxx>
 # include <Geom_Plane.hxx>
-# include <Geom2d_TrimmedCurve.hxx>
+# include <GeomFill_AppSurf.hxx>
+# include <GeomFill_Line.hxx>
+# include <GeomFill_SectionGenerator.hxx>
 # include <Interface_Static.hxx>
-# include <Poly_Triangulation.hxx>
+# include <NCollection_List.hxx>
+# include <Precision.hxx>
 # include <ShapeUpgrade_ShellSewing.hxx>
 # include <Standard_ConstructionError.hxx>
 # include <Standard_DomainError.hxx>
-# include <TopoDS.hxx>
+# include <Standard_Version.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS_Compound.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Face.hxx>
-# include <TopoDS_Wire.hxx>
 # include <TopoDS_Shell.hxx>
 # include <TopoDS_Solid.hxx>
-# include <TopoDS_Compound.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TColgp_HArray2OfPnt.hxx>
-# include <TColStd_Array1OfReal.hxx>
-# include <TColStd_Array1OfInteger.hxx>
 # include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <Precision.hxx>
-# include <Standard_Version.hxx>
-# include <BRepOffsetAPI_ThruSections.hxx>
-# include <BSplCLib.hxx>
-# include <GeomFill_AppSurf.hxx>
-# include <GeomFill_Line.hxx>
-# include <GeomFill_Pipe.hxx>
-# include <GeomFill_SectionGenerator.hxx>
-# include <NCollection_List.hxx>
-# include <BRepFill_Filling.hxx>
 #endif
-# include <BRepFill_Generator.hxx>
 
-#include <cstdio>
-#include <fstream>
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Interpreter.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
+#include <Base/GeometryPyCXX.h>
+#include <Base/Interpreter.h>
+#include <Base/VectorPy.h>
 
-#include "OCCError.h"
-#include "TopoShape.h"
-#include "TopoShapePy.h"
-#include "TopoShapeEdgePy.h"
-#include "TopoShapeWirePy.h"
-#include "TopoShapeFacePy.h"
-#include "TopoShapeCompoundPy.h"
-#include "TopoShapeCompSolidPy.h"
-#include "TopoShapeSolidPy.h"
-#include "TopoShapeShellPy.h"
-#include "TopoShapeVertexPy.h"
-#include "GeometryPy.h"
 #include "GeometryCurvePy.h"
+#include "GeometryPy.h"
 #include "BSplineSurfacePy.h"
+#include "edgecluster.h"
+#include "FaceMaker.h"
 #include "FeaturePartBox.h"
 #include "FeaturePartCut.h"
 #include "FeaturePartImportStep.h"
@@ -129,12 +93,21 @@
 #include "FeaturePartImportBrep.h"
 #include "ImportIges.h"
 #include "ImportStep.h"
-#include "edgecluster.h"
-#include "FaceMaker.h"
+#include "modelRefine.h"
+#include "OCCError.h"
 #include "PartFeature.h"
 #include "PartPyCXX.h"
-#include "modelRefine.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"
diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index ea296ec2b5..d0ad1f3581 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -14,64 +14,54 @@
 #ifndef _PreComp_
 # include <Standard_math.hxx>
 # include <Python.h>
-# include <Inventor/system/inttypes.h>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
-
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/WidgetFactory.h>
-
-#include <Mod/Part/App/PropertyTopoShape.h>
+#include <Gui/Language/Translator.h>
 
 #include "AttacherTexts.h"
 #include "PropertyEnumAttacherItem.h"
-#include "SoBrepFaceSet.h"
 #include "SoBrepEdgeSet.h"
+#include "SoBrepFaceSet.h"
 #include "SoBrepPointSet.h"
 #include "SoFCShapeObject.h"
-#include "ViewProvider.h"
-#include "ViewProviderExt.h"
-#include "ViewProviderPython.h"
-#include "ViewProviderPrimitive.h"
-#include "ViewProviderBox.h"
-#include "ViewProviderCurveNet.h"
-#include "ViewProviderImport.h"
-#include "ViewProviderExtrusion.h"
-#include "ViewProvider2DObject.h"
-#include "ViewProviderMirror.h"
-#include "ViewProviderBoolean.h"
-#include "ViewProviderCompound.h"
-#include "ViewProviderCircleParametric.h"
-#include "ViewProviderLineParametric.h"
-#include "ViewProviderPointParametric.h"
-#include "ViewProviderEllipseParametric.h"
-#include "ViewProviderHelixParametric.h"
-#include "ViewProviderPlaneParametric.h"
-#include "ViewProviderSphereParametric.h"
-#include "ViewProviderCylinderParametric.h"
-#include "ViewProviderConeParametric.h"
-#include "ViewProviderTorusParametric.h"
-#include "ViewProviderRuledSurface.h"
-#include "ViewProviderPrism.h"
-#include "ViewProviderSpline.h"
-#include "ViewProviderRegularPolygon.h"
-#include "ViewProviderAttachExtension.h"
 #include "TaskDimension.h"
+#include "DlgSettings3DViewPartImp.h"
 #include "DlgSettingsGeneral.h"
 #include "DlgSettingsObjectColor.h"
-#include "DlgSettings3DViewPartImp.h"
+#include "ViewProvider.h"
+#include "ViewProvider2DObject.h"
+#include "ViewProviderAttachExtension.h"
+#include "ViewProviderBoolean.h"
+#include "ViewProviderBox.h"
+#include "ViewProviderCircleParametric.h"
+#include "ViewProviderCompound.h"
+#include "ViewProviderConeParametric.h"
+#include "ViewProviderCurveNet.h"
+#include "ViewProviderCylinderParametric.h"
+#include "ViewProviderEllipseParametric.h"
+#include "ViewProviderExt.h"
+#include "ViewProviderExtrusion.h"
+#include "ViewProviderHelixParametric.h"
+#include "ViewProviderPrimitive.h"
+#include "ViewProviderPython.h"
+#include "ViewProviderImport.h"
+#include "ViewProviderLineParametric.h"
+#include "ViewProviderMirror.h"
+#include "ViewProviderPlaneParametric.h"
+#include "ViewProviderPointParametric.h"
+#include "ViewProviderPrism.h"
+#include "ViewProviderRegularPolygon.h"
+#include "ViewProviderRuledSurface.h"
+#include "ViewProviderSphereParametric.h"
+#include "ViewProviderSpline.h"
+#include "ViewProviderTorusParametric.h"
 #include "Workbench.h"
 
-#include <Gui/Language/Translator.h>
-
-// #include "Resources/icons/Part_Feature.xpm"
-// #include "Resources/icons/Part_FeatureImport.xpm"
 
 // use a different name to CreateCommand()
 void CreatePartCommands(void);
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index 3b1cfee1ec..e46ca01d93 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -23,27 +23,19 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <sstream>
-# include <Python.h>
-# include <QString>
-# include <QDir>
 # include <QFileInfo>
-# include <QLineEdit>
 # include <QPointer>
+# include <QString>
 # include <Standard_math.hxx>
-# include <TopoDS_Shape.hxx>
-# include <TopExp_Explorer.hxx>
-# include <Inventor/events/SoMouseButtonEvent.h>
 # include <Standard_Version.hxx>
-# include <TopoDS_TCompound.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS_Shape.hxx>
 #endif
 
+#include <App/DocumentObjectGroup.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Tools.h>
-#include <App/Document.h>
-#include <App/DocumentObjectGroup.h>
-#include <App/DocumentObserver.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
@@ -56,8 +48,6 @@
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/WaitCursor.h>
-#include <Mod/Part/App/Part2DObject.h>
-#include <Mod/Part/App/PartFeature.h>
 
 #include "BoxSelection.h"
 #include "CrossSections.h"
diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 1982aa7b42..90bfdfffed 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -23,39 +23,33 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepAdaptor_Surface.hxx>
+
 # include <BRepAdaptor_Curve.hxx>
-# include <BRepLProp_SLProps.hxx>
-# include <BRepGProp_Face.hxx>
 # include <BRep_Tool.hxx>
 # include <Precision.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopExp_Explorer.hxx>
 # include <ShapeExtend_Explorer.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
 # include <QKeyEvent>
 # include <QMessageBox>
-# include <Python.h>
-# include <Inventor/system/inttypes.h>
 #endif
 
-#include "ui_DlgExtrusion.h"
-#include "DlgExtrusion.h"
-#include "../App/PartFeature.h"
-#include <Base/Console.h>
-#include <Base/UnitsApi.h>
-#include <Base/Interpreter.h>
 #include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <Base/Interpreter.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
+#include <Gui/Utilities.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
-#include <Gui/Utilities.h>
+
+#include "ui_DlgExtrusion.h"
+#include "DlgExtrusion.h"
+
 
 FC_LOG_LEVEL_INIT("Part",true,true)