From a44d4b9b8799ea70dede23aab27b45ba074f05a7 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 3 Jul 2022 17:41:42 +0200
Subject: [PATCH] [Part] Topo*: remove unneeded includes

- also sort includes
---
 src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp |  5 +-
 src/Mod/Part/App/TopoShapeCompoundPyImp.cpp  |  8 +-
 src/Mod/Part/App/TopoShapeEdgePyImp.cpp      | 53 +++++---------
 src/Mod/Part/App/TopoShapeFacePyImp.cpp      | 73 ++++++++-----------
 src/Mod/Part/App/TopoShapePyImp.cpp          | 77 ++++++++++----------
 src/Mod/Part/App/TopoShapeShellPyImp.cpp     | 11 +--
 src/Mod/Part/App/TopoShapeSolidPyImp.cpp     | 24 +++---
 src/Mod/Part/App/TopoShapeVertexPyImp.cpp    | 14 ++--
 src/Mod/Part/App/TopoShapeWirePyImp.cpp      | 26 +++----
 src/Mod/Part/App/ToroidPyImp.cpp             | 10 +--
 src/Mod/Part/App/TrimmedCurvePyImp.cpp       |  6 --
 11 files changed, 127 insertions(+), 180 deletions(-)

diff --git a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp
index 306ab4e416..416a30bdbd 100644
--- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -30,12 +29,12 @@
 #endif
 
 #include "OCCError.h"
-#include "TopoShape.h"
 
 // inclusion of the generated files (generated out of TopoShapeCompSolidPy.xml)
-#include "TopoShapeSolidPy.h"
 #include "TopoShapeCompSolidPy.h"
 #include "TopoShapeCompSolidPy.cpp"
+#include "TopoShapeSolidPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp
index 46b7bf2162..ca0a4a582a 100644
--- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp
@@ -20,19 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "TopoShape.h"
 
 #ifndef _PreComp_
 # include <BRep_Builder.hxx>
+# include <Precision.hxx>
+# include <ShapeAnalysis_FreeBounds.hxx>
 # include <Standard_Failure.hxx>
+# include <TopExp_Explorer.hxx>
 # include <TopoDS_Compound.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
-# include <ShapeAnalysis_FreeBounds.hxx>
-# include <Precision.hxx>
-# include <TopExp_Explorer.hxx>
 #endif
 
 #include "OCCError.h"
@@ -41,6 +40,7 @@
 #include "TopoShapeCompoundPy.h"
 #include "TopoShapeCompoundPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp
index 1018b70242..5ce0b82375 100644
--- a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <algorithm>
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
-# include <BRepBuilderAPI_MakeVertex.hxx>
+# include <BRepGProp.hxx>
 # include <BRepLProp_CLProps.hxx>
 # include <BRepLProp_CurveTool.hxx>
 # include <GProp_GProps.hxx>
@@ -40,66 +38,55 @@
 # include <Geom_Hyperbola.hxx>
 # include <Geom_Parabola.hxx>
 # include <Geom_Line.hxx>
-# include <Geom_TrimmedCurve.hxx>
-# include <Geom_BezierCurve.hxx>
-# include <Geom_BSplineCurve.hxx>
 # include <Geom_OffsetCurve.hxx>
 # include <Geom_Surface.hxx>
 # include <Geom2d_Curve.hxx>
 # include <TopLoc_Location.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Elips.hxx>
-# include <gp_Hypr.hxx>
-# include <gp_Parab.hxx>
-# include <gp_Lin.hxx>
-# include <Poly_Polygon2D.hxx>
 # include <Poly_Polygon3D.hxx>
 # include <Poly_Triangulation.hxx>
 # include <Poly_PolygonOnTriangulation.hxx>
 # include <TColStd_Array1OfReal.hxx>
 # include <TopExp.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Shape.hxx>
 # include <TopoDS_Edge.hxx>
+# include <TopoDS_Shape.hxx>
 # include <TopoDS_Vertex.hxx>
 # include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 # include <ShapeAnalysis_Edge.hxx>
 # include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
-# include <BRepGProp.hxx>
 # include <GProp_GProps.hxx>
 # include <GCPnts_AbscissaPoint.hxx>
-# include <GCPnts_UniformAbscissa.hxx>
-# include <GCPnts_UniformDeflection.hxx>
-# include <GCPnts_TangentialDeflection.hxx>
 # include <GCPnts_QuasiUniformAbscissa.hxx>
 # include <GCPnts_QuasiUniformDeflection.hxx>
+# include <GCPnts_TangentialDeflection.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
+# include <GCPnts_UniformDeflection.hxx>
 #endif // _PreComp_
 
+#include <Base/GeometryPyCXX.h>
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
 
-#include "Tools.h"
-#include "OCCError.h"
-#include "TopoShape.h"
+#include <Mod/Part/App/BezierCurvePy.h>
+#include <Mod/Part/App/BSplineCurvePy.h>
+#include <Mod/Part/App/CirclePy.h>
+#include <Mod/Part/App/EllipsePy.h>
+#include <Mod/Part/App/GeometryPy.h>
+#include <Mod/Part/App/HyperbolaPy.h>
+#include <Mod/Part/App/LinePy.h>
+#include <Mod/Part/App/OffsetCurvePy.h>
+#include <Mod/Part/App/ParabolaPy.h>
+#include <Mod/Part/App/TopoShapeEdgePy.h>
+#include <Mod/Part/App/TopoShapeEdgePy.cpp>
 #include <Mod/Part/App/TopoShapeFacePy.h>
 #include <Mod/Part/App/TopoShapeVertexPy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.cpp>
 
 #include "Geometry2d.h"
-#include "Geometry.h"
-#include <Mod/Part/App/GeometryPy.h>
-#include <Mod/Part/App/LinePy.h>
-#include <Mod/Part/App/CirclePy.h>
-#include <Mod/Part/App/EllipsePy.h>
-#include <Mod/Part/App/HyperbolaPy.h>
-#include <Mod/Part/App/ParabolaPy.h>
-#include <Mod/Part/App/BezierCurvePy.h>
-#include <Mod/Part/App/BSplineCurvePy.h>
-#include <Mod/Part/App/OffsetCurvePy.h>
+#include "OCCError.h"
+#include "Tools.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp
index ac5ed87690..ca10f3ac46 100644
--- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp
@@ -20,83 +20,70 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
+# include <BRepAdaptor_Surface.hxx>
 # include <BRepCheck_Analyzer.hxx>
 # include <BRepTools.hxx>
 # include <BRepBuilderAPI_FindPlane.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
-# include <ShapeAnalysis.hxx>
-# include <BRepAdaptor_Surface.hxx>
+# include <BRepGProp.hxx>
 # include <BRepLProp_SLProps.hxx>
 # include <BRepOffsetAPI_MakeOffset.hxx>
-# include <Geom_BezierSurface.hxx>
-# include <Geom_BSplineSurface.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_CylindricalSurface.hxx>
+# include <BRepPrimAPI_MakeHalfSpace.hxx>
+# include <BRepTopAdaptor_FClass2d.hxx>
 # include <Geom_ConicalSurface.hxx>
+# include <Geom_CylindricalSurface.hxx>
+# include <Geom_Plane.hxx>
 # include <Geom_RectangularTrimmedSurface.hxx>
 # include <Geom_SphericalSurface.hxx>
-# include <Geom_ToroidalSurface.hxx>
 # include <Geom_Surface.hxx>
+# include <Geom_ToroidalSurface.hxx>
 # include <Geom2d_Curve.hxx>
+# include <gp_Pnt2d.hxx>
+# include <GProp_GProps.hxx>
+# include <GProp_PrincipalProps.hxx>
 # include <Poly_Triangulation.hxx>
+# include <ShapeAnalysis.hxx>
+# include <ShapeFix_Shape.hxx>
+# include <ShapeFix_Wire.hxx>
+# include <Standard_Version.hxx>
+# include <TColgp_Array1OfPnt2d.hxx>
+# include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Face.hxx>
 # include <TopoDS_Wire.hxx>
 # include <TopoDS_Edge.hxx>
-# include <gp_Pnt2d.hxx>
-# include <gp_Pln.hxx>
-# include <gp_Cylinder.hxx>
-# include <gp_Cone.hxx>
-# include <gp_Sphere.hxx>
-# include <gp_Torus.hxx>
-# include <Standard_Version.hxx>
-# include <ShapeFix_Shape.hxx>
-# include <ShapeFix_Wire.hxx>
-# include <TColgp_Array1OfPnt2d.hxx>
-# include <TopExp_Explorer.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
-# include <BRepTopAdaptor_FClass2d.hxx>
-# include <BRepPrimAPI_MakeHalfSpace.hxx>
-# include <BRepGProp.hxx>
-# include <GProp_GProps.hxx>
-# include <GProp_PrincipalProps.hxx>
-# include <BRepLProp_SurfaceTool.hxx>
-# include <BRepGProp_Face.hxx>
-# include <GeomLProp_SLProps.hxx>
-# include <BRep_Tool.hxx>
 #endif // _PreComp
 #include <BRepOffsetAPI_MakeEvolved.hxx>
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
-
-#include "TopoShape.h"
-#include "Geometry2d.h"
-#include <Mod/Part/App/TopoShapeSolidPy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeFacePy.cpp>
-#include <Mod/Part/App/TopoShapeCompoundPy.h>
+#include <Base/VectorPy.h>
 
 #include <Mod/Part/App/BezierSurfacePy.h>
 #include <Mod/Part/App/BSplineSurfacePy.h>
-#include <Mod/Part/App/PlanePy.h>
-#include <Mod/Part/App/CylinderPy.h>
 #include <Mod/Part/App/ConePy.h>
-#include <Mod/Part/App/SpherePy.h>
+#include <Mod/Part/App/CylinderPy.h>
 #include <Mod/Part/App/OffsetSurfacePy.h>
-#include <Mod/Part/App/SurfaceOfRevolutionPy.h>
+#include <Mod/Part/App/PlanePy.h>
+#include <Mod/Part/App/SpherePy.h>
 #include <Mod/Part/App/SurfaceOfExtrusionPy.h>
+#include <Mod/Part/App/SurfaceOfRevolutionPy.h>
+#include <Mod/Part/App/TopoShapeEdgePy.h>
+#include <Mod/Part/App/TopoShapeFacePy.h>
+#include <Mod/Part/App/TopoShapeFacePy.cpp>
+#include <Mod/Part/App/TopoShapeSolidPy.h>
+#include <Mod/Part/App/TopoShapeWirePy.h>
 #include <Mod/Part/App/ToroidPy.h>
+
+#include "FaceMaker.h"
+#include "Geometry2d.h"
 #include "OCCError.h"
 #include "Tools.h"
-#include "FaceMaker.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp
index c3af7be9f6..107e1fe88b 100644
--- a/src/Mod/Part/App/TopoShapePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapePyImp.cpp
@@ -20,81 +20,78 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
 # include <boost/regex.hpp>
-# include <BRepMesh_IncrementalMesh.hxx>
+
+# include <BRep_Tool.hxx>
+# include <BRepAlgo_NormalProjection.hxx>
+# include <BRepBndLib.hxx>
 # include <BRepBuilderAPI_Copy.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
-# include <BRepBuilderAPI_Sewing.hxx>
 # include <BRepBuilderAPI_Transform.hxx>
 # include <BRepClass3d_SolidClassifier.hxx>
-# include <BRepFilletAPI_MakeFillet.hxx>
-# include <BRepFilletAPI_MakeChamfer.hxx>
-# include <BRepOffsetAPI_MakePipe.hxx>
-# include <BRepOffsetAPI_MakePipeShell.hxx>
-# include <BRepProj_Projection.hxx>
-# include <BRepTools.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
 # include <BRepExtrema_ShapeProximity.hxx>
 # include <BRepExtrema_SupportType.hxx>
-# include <BRepBndLib.hxx>
-# include <BRep_Tool.hxx>
+# include <BRepFilletAPI_MakeChamfer.hxx>
+# include <BRepFilletAPI_MakeFillet.hxx>
+# include <BRepGProp.hxx>
+# include <BRepMesh_IncrementalMesh.hxx>
+# include <BRepProj_Projection.hxx>
+# include <BRepTools.hxx>
+# include <Geom_Plane.hxx>
 # include <gp_Ax1.hxx>
 # include <gp_Ax2.hxx>
 # include <gp_Dir.hxx>
+# include <gp_Pln.hxx>
 # include <gp_Pnt.hxx>
 # include <gp_Trsf.hxx>
-# include <gp_Pln.hxx>
+# include <GProp_GProps.hxx>
+# include <HLRAppli_ReflectLines.hxx>
+# include <Precision.hxx>
 # include <Poly_Polygon3D.hxx>
 # include <Poly_Triangulation.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Iterator.hxx>
-# include <TopTools_IndexedMapOfShape.hxx>
-# include <TopTools_ListOfShape.hxx>
-# include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <TopLoc_Location.hxx>
-# include <TopExp.hxx>
-# include <Precision.hxx>
-# include <Geom_Plane.hxx>
-# include <HLRAppli_ReflectLines.hxx>
-# include <BRepGProp.hxx>
-# include <GProp_GProps.hxx>
-# include <BRepAlgo_NormalProjection.hxx>
 # include <ShapeAnalysis_ShapeTolerance.hxx>
 # include <ShapeFix_ShapeTolerance.hxx>
 # include <Standard_Version.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopLoc_Location.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Iterator.hxx>
+# include <TopTools_IndexedMapOfShape.hxx>
+# include <TopTools_ListIteratorOfListOfShape.hxx>
+# include <TopTools_ListOfShape.hxx>
 #endif
 
+#include <App/PropertyStandard.h>
 #include <Base/GeometryPyCXX.h>
 #include <Base/Matrix.h>
-#include <Base/Rotation.h>
 #include <Base/MatrixPy.h>
+#include <Base/Rotation.h>
 #include <Base/Stream.h>
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
-#include <App/PropertyStandard.h>
-#include <CXX/Extensions.hxx>
 
-#include "TopoShape.h"
-#include "PartPyCXX.h"
 #include <Mod/Part/App/TopoShapePy.h>
 #include <Mod/Part/App/TopoShapePy.cpp>
 
-#include "OCCError.h"
 #include <Mod/Part/App/GeometryPy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/TopoShapeVertexPy.h>
-#include <Mod/Part/App/TopoShapeSolidPy.h>
-#include <Mod/Part/App/TopoShapeShellPy.h>
-#include <Mod/Part/App/TopoShapeCompSolidPy.h>
-#include <Mod/Part/App/TopoShapeCompoundPy.h>
 #include <Mod/Part/App/PlanePy.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/TopoShapeShellPy.h>
+#include <Mod/Part/App/TopoShapeSolidPy.h>
+#include <Mod/Part/App/TopoShapeVertexPy.h>
+#include <Mod/Part/App/TopoShapeWirePy.h>
+
+#include "OCCError.h"
+#include "PartPyCXX.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/TopoShapeShellPyImp.cpp b/src/Mod/Part/App/TopoShapeShellPyImp.cpp
index c5f8306472..9add67ec72 100644
--- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Ax1.hxx>
 # include <BRep_Builder.hxx>
 # include <BRepCheck_Analyzer.hxx>
 # include <BRepGProp.hxx>
@@ -32,24 +30,23 @@
 # include <GProp_PrincipalProps.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Shell.hxx>
-# include <ShapeUpgrade_ShellSewing.hxx>
 # include <ShapeAnalysis_Shell.hxx>
-# include <BRepPrimAPI_MakeHalfSpace.hxx>
+# include <ShapeUpgrade_ShellSewing.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
 #include "OCCError.h"
 #include "Tools.h"
-#include "TopoShape.h"
 #include "TopoShapeCompoundPy.h"
-#include "TopoShapeCompSolidPy.h"
+#include "TopoShapeCompoundPy.h"
 #include "TopoShapeFacePy.h"
 #include "TopoShapeShellPy.h"
 #include "TopoShapeShellPy.cpp"
 #include "TopoShapeSolidPy.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp
index ec6b512a03..e5b13afc9c 100644
--- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp
@@ -20,43 +20,41 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Standard_Version.hxx>
-# include <BRepGProp.hxx>
-# include <BRepTools.hxx>
-# include <BRepOffset_MakeOffset.hxx>
+# include <BRepBuilderAPI_MakeSolid.hxx>
 # include <BRepClass3d.hxx>
+# include <BRepGProp.hxx>
+# include <BRepLib.hxx>
+# include <BRepOffset_MakeOffset.hxx>
 # include <GProp_GProps.hxx>
 # include <GProp_PrincipalProps.hxx>
-# include <BRepBuilderAPI_MakeSolid.hxx>
-# include <BRepLib.hxx>
 # include <Precision.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Shell.hxx>
 # include <TopoDS_CompSolid.hxx>
+# include <TopoDS_Shell.hxx>
+# include <TopoDS_Solid.hxx>
 # include <gp_Ax1.hxx>
-# include <gp_Pnt.hxx>
 # include <gp_Dir.hxx>
+# include <gp_Pnt.hxx>
 # include <Standard_Failure.hxx>
+# include <Standard_Version.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
-#include "TopoShape.h"
-#include "Tools.h"
 #include "OCCError.h"
+#include "Tools.h"
 
 // inclusion of the generated files (generated out of TopoShapeSolidPy.xml)
 #include "TopoShapeShellPy.h"
 #include "TopoShapeSolidPy.h"
 #include "TopoShapeSolidPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp
index b210bc4309..fcbac65cd0 100644
--- a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp
@@ -20,28 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <gp_Pnt.hxx>
-# include <gp_Ax1.hxx>
-# include <BRep_Tool.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Vertex.hxx>
 # include <BRep_Builder.hxx>
+# include <BRep_Tool.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <Geom_CartesianPoint.hxx>
 # include <Standard_Failure.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Vertex.hxx>
 #endif
 
-#include <Mod/Part/App/TopoShape.h>
-#include <Base/VectorPy.h>
 #include <Base/Vector3D.h>
+#include <Base/VectorPy.h>
 
-#include "PointPy.h"
 #include "TopoShapeVertexPy.h"
 #include "TopoShapeVertexPy.cpp"
+#include "PointPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp
index 0704431973..1a3a983b59 100644
--- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp
@@ -20,47 +20,41 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Approx_Curve3d.hxx>
-# include <ShapeAlgo_AlgoContainer.hxx>
 # include <BRepAdaptor_CompCurve.hxx>
 # include <BRepBuilderAPI_FindPlane.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
+# include <BRepGProp.hxx>
 # include <BRepOffsetAPI_MakeOffset.hxx>
 # include <BRepTools_WireExplorer.hxx>
+# include <GProp_GProps.hxx>
+# include <GProp_PrincipalProps.hxx>
+# include <GCPnts_QuasiUniformAbscissa.hxx>
+# include <GCPnts_QuasiUniformDeflection.hxx>
+# include <GCPnts_TangentialDeflection.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
+# include <GCPnts_UniformDeflection.hxx>
 # include <Precision.hxx>
+# include <ShapeAlgo_AlgoContainer.hxx>
 # include <ShapeFix_Wire.hxx>
 # include <TopExp.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Wire.hxx>
-# include <gp_Ax1.hxx>
-# include <BRepGProp.hxx>
-# include <GProp_GProps.hxx>
-# include <GProp_PrincipalProps.hxx>
-# include <GCPnts_UniformAbscissa.hxx>
-# include <GCPnts_UniformDeflection.hxx>
-# include <GCPnts_TangentialDeflection.hxx>
-# include <GCPnts_QuasiUniformAbscissa.hxx>
-# include <GCPnts_QuasiUniformDeflection.hxx>
 #endif
 #include <BRepOffsetAPI_MakeEvolved.hxx>
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
 
-#include "TopoShape.h"
 #include <Mod/Part/App/BSplineCurvePy.h>
-#include <Mod/Part/App/TopoShapeShellPy.h>
 #include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.cpp>
-#include <Mod/Part/App/TopoShapeVertexPy.h>
 #include "OCCError.h"
 #include "Tools.h"
 
+
 using namespace Part;
 
 namespace Part {
diff --git a/src/Mod/Part/App/ToroidPyImp.cpp b/src/Mod/Part/App/ToroidPyImp.cpp
index c80361480f..71eb2f0508 100644
--- a/src/Mod/Part/App/ToroidPyImp.cpp
+++ b/src/Mod/Part/App/ToroidPyImp.cpp
@@ -20,23 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Geom_Circle.hxx>
 # include <Geom_ToroidalSurface.hxx>
-# include <gp_Torus.hxx>
 # include <Standard_Failure.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
-#include "Geometry.h"
-#include "CirclePy.h"
+#include "OCCError.h"
 #include "ToroidPy.h"
 #include "ToroidPy.cpp"
-#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/TrimmedCurvePyImp.cpp b/src/Mod/Part/App/TrimmedCurvePyImp.cpp
index 94965dbb07..7a3e1913de 100644
--- a/src/Mod/Part/App/TrimmedCurvePyImp.cpp
+++ b/src/Mod/Part/App/TrimmedCurvePyImp.cpp
@@ -20,18 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
-
 #include "OCCError.h"
-
-#include "Geometry.h"
 #include "TrimmedCurvePy.h"
 #include "TrimmedCurvePy.cpp"