From 27a69f89c32bcb8c2b13e54be2cc3ebe51df3368 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 4 Jul 2022 10:59:16 +0200
Subject: [PATCH] [Part] E*: remove unneeded includes

- also sort includes
---
 src/Mod/Part/App/EllipsePyImp.cpp    | 10 ++++------
 src/Mod/Part/App/ExtrusionHelper.cpp |  1 -
 src/Mod/Part/App/ExtrusionHelper.h   |  3 +--
 src/Mod/Part/App/FT2FC.cpp           | 27 +++++++++++++--------------
 src/Mod/Part/App/edgecluster.cpp     | 24 ++----------------------
 src/Mod/Part/App/edgecluster.h       |  7 +++----
 6 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/src/Mod/Part/App/EllipsePyImp.cpp b/src/Mod/Part/App/EllipsePyImp.cpp
index df01abf9ff..91d55e8e06 100644
--- a/src/Mod/Part/App/EllipsePyImp.cpp
+++ b/src/Mod/Part/App/EllipsePyImp.cpp
@@ -20,21 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Elips.hxx>
-# include <Geom_Ellipse.hxx>
 # include <GC_MakeEllipse.hxx>
+# include <Geom_Ellipse.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
+#include "EllipsePy.h"
+#include "EllipsePy.cpp"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/EllipsePy.h>
-#include <Mod/Part/App/EllipsePy.cpp>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ExtrusionHelper.cpp b/src/Mod/Part/App/ExtrusionHelper.cpp
index b4503f6641..d8987fd60b 100644
--- a/src/Mod/Part/App/ExtrusionHelper.cpp
+++ b/src/Mod/Part/App/ExtrusionHelper.cpp
@@ -44,7 +44,6 @@
 
 #include "ExtrusionHelper.h"
 #include "BRepOffsetAPI_MakeOffsetFix.h"
-#include "FeatureExtrusion.h"
 
 
 using namespace Part;
diff --git a/src/Mod/Part/App/ExtrusionHelper.h b/src/Mod/Part/App/ExtrusionHelper.h
index 5b8f7bda44..8c14d08a16 100644
--- a/src/Mod/Part/App/ExtrusionHelper.h
+++ b/src/Mod/Part/App/ExtrusionHelper.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_EXTRUSIONHELPER_H
 #define PART_EXTRUSIONHELPER_H
 
@@ -28,7 +27,7 @@
 #include <vector>
 #include <gp_Dir.hxx>
 #include <TopoDS_Shape.hxx>
-#include <Mod/Part/PartGlobal.h>
+
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/FT2FC.cpp b/src/Mod/Part/App/FT2FC.cpp
index 379a58c90f..3853b93056 100644
--- a/src/Mod/Part/App/FT2FC.cpp
+++ b/src/Mod/Part/App/FT2FC.cpp
@@ -39,31 +39,28 @@
 # include <stdexcept>
 # include <vector>
 
-# include <BRepLib.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepBuilderAPI_Transform.hxx>
+# include <BRepLib.hxx>
+# include <GCE2d_MakeSegment.hxx>
+# include <Geom_Plane.hxx>
+# include <Geom2d_BezierCurve.hxx>
+# include <Geom2d_BSplineCurve.hxx>
+# include <Geom2d_TrimmedCurve.hxx>
 # include <gp_Pnt.hxx>
+# include <gp_Trsf.hxx>
 # include <gp_Vec.hxx>
+# include <Precision.hxx>
+# include <ShapeConstruct_Curve.hxx>
+# include <TColgp_Array1OfPnt2d.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Wire.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TColgp_Array1OfPnt2d.hxx>
-# include <GCE2d_MakeSegment.hxx>
-# include <Geom2d_TrimmedCurve.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom2d_BezierCurve.hxx>
-# include <gp_Trsf.hxx>
-# include <Precision.hxx>
-#include <ShapeConstruct_Curve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #endif // _PreComp
 
 #include <Base/Console.h>
-#include "TopoShape.h"
-#include "TopoShapePy.h"
-#include "TopoShapeEdgePy.h"
+
 #include "TopoShapeWirePy.h"
 
 #include <ft2build.h>
@@ -76,6 +73,8 @@
 
 #define CLOCKWISE 0
 #define ANTICLOCKWISE 1
+
+
 using namespace Part;
 
 typedef unsigned long UNICHAR;           // ul is FT2's codepoint type <=> Py_UNICODE2/4
diff --git a/src/Mod/Part/App/edgecluster.cpp b/src/Mod/Part/App/edgecluster.cpp
index b7301c0ebe..45789f6894 100644
--- a/src/Mod/Part/App/edgecluster.cpp
+++ b/src/Mod/Part/App/edgecluster.cpp
@@ -20,38 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <TopExp_Explorer.hxx>
-# include <TopAbs_ShapeEnum.hxx>
 # include <BRep_Tool.hxx>
+# include <BRepAdaptor_Curve.hxx>
 # include <TopExp.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Shape.hxx>
 # include <TopoDS_Vertex.hxx>
-# include <TopoDS_Compound.hxx>
-# include <BRepAdaptor_Curve.hxx>
-# include <GCPnts_QuasiUniformDeflection.hxx>
-# include <BRep_Builder.hxx>
-#endif
-
-#ifndef _PreComp_
-# include <TopExp_Explorer.hxx>
-# include <TopAbs_ShapeEnum.hxx>
-# include <BRep_Tool.hxx>
-# include <TopExp.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <TopoDS_Compound.hxx>
-# include <BRepAdaptor_Curve.hxx>
-# include <GCPnts_QuasiUniformDeflection.hxx>
-# include <BRep_Builder.hxx>
 #endif
 
 #include "edgecluster.h"
 
+
 using namespace Part;
 
 Edgecluster::Edgecluster(const std::vector<TopoDS_Edge>& unsorted_edges)
diff --git a/src/Mod/Part/App/edgecluster.h b/src/Mod/Part/App/edgecluster.h
index dcc9a2b417..41d592a3ce 100644
--- a/src/Mod/Part/App/edgecluster.h
+++ b/src/Mod/Part/App/edgecluster.h
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_EDGECLUSTER_H
 #define PART_EDGECLUSTER_H
 
-#include <Mod/Part/PartGlobal.h>
+#include <map>
+#include <vector>
+
 #include <gp_Pnt.hxx>
 #include <TopoDS_Edge.hxx>
-#include <vector>
-#include <map>
 
 
 namespace Part {