diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index b05ee16169..7fdc9d6d8b 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -326,6 +326,7 @@
 // gp*
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
+#include <gp_Ax2.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
@@ -339,8 +340,8 @@
 #include <gp_Lin2d.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Parab.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Sphere.hxx>
 #include <gp_Torus.hxx>
@@ -353,6 +354,7 @@
 #include <GProp_PrincipalProps.hxx>
 
 // HLR*
+#include <HLRAlgo_Projector.hxx>
 #include <HLRAppli_ReflectLines.hxx>
 #include <HLRBRep_HLRToShape.hxx>
 #include <HLRBRep_PolyAlgo.hxx>
diff --git a/src/Mod/TechDraw/App/EdgeWalker.cpp b/src/Mod/TechDraw/App/EdgeWalker.cpp
index 067c655487..ba752f2071 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.cpp
+++ b/src/Mod/TechDraw/App/EdgeWalker.cpp
@@ -26,30 +26,26 @@
 //**************************************************************************
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <ShapeAnalysis.hxx>
-#include <BRep_Tool.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeExtend_WireData.hxx>
-#include <ShapeFix_Wire.hxx>
-#include <TopExp.hxx>
+# include <cmath>
+# include <sstream>
+# include <BRep_Tool.hxx>
+# include <BRepBuilderAPI_MakeWire.hxx>
+# include <ShapeAnalysis.hxx>
+# include <ShapeFix_ShapeTolerance.hxx>
+# include <ShapeExtend_WireData.hxx>
+# include <ShapeFix_Wire.hxx>
+# include <TopExp.hxx>
+# include <boost/graph/boyer_myrvold_planar_test.hpp>
 #endif
 
-#include <sstream>
-#include <cmath>
-
-#include <boost/graph/boyer_myrvold_planar_test.hpp>
-#include <boost/graph/is_kuratowski_subgraph.hpp>
-
 #include <Base/Console.h>
-#include <Base/Exception.h>
 
+#include "EdgeWalker.h"
 #include "DrawUtil.h"
 #include "EWTOLERANCE.h"
-#include "EdgeWalker.h"
+
 
 using namespace TechDraw;
 using namespace boost;
diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h
index ae29ec91fc..98bbf37fb6 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.h
+++ b/src/Mod/TechDraw/App/EdgeWalker.h
@@ -28,11 +28,9 @@
 #ifndef TECHDRAW_EDGEWALKER_H
 #define TECHDRAW_EDGEWALKER_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <vector>
-#include <boost_graph_adjacency_list.hpp>
 
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/planar_face_traversal.hpp>
 #include <boost/property_map/property_map.hpp>
diff --git a/src/Mod/TechDraw/App/FeatureProjection.cpp b/src/Mod/TechDraw/App/FeatureProjection.cpp
index 7301c978d7..139bce3691 100644
--- a/src/Mod/TechDraw/App/FeatureProjection.cpp
+++ b/src/Mod/TechDraw/App/FeatureProjection.cpp
@@ -22,7 +22,6 @@
 //this file originally part of Drawing workbench
 //migrated to TechDraw workbench 2022-01-26 by Wandererfan
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -32,15 +31,10 @@
 # include <TopoDS_Compound.hxx>
 #endif
 
-
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-
 #include "FeatureProjection.h"
 #include "ProjectionAlgos.h"
 
+
 using namespace TechDraw;
 
 
diff --git a/src/Mod/TechDraw/App/FeatureProjection.h b/src/Mod/TechDraw/App/FeatureProjection.h
index be4928cf32..0d04915581 100644
--- a/src/Mod/TechDraw/App/FeatureProjection.h
+++ b/src/Mod/TechDraw/App/FeatureProjection.h
@@ -24,13 +24,13 @@
 
 #ifndef TECHDRAW_FEATUREPROJECTION
 #define TECHDRAW_FEATUREPROJECTION
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
+
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <App/DocumentObject.h>
-#include <App/PropertyGeo.h>
 #include <Mod/Part/App/PartFeature.h>
 
+
 namespace TechDraw
 {
 
diff --git a/src/Mod/TechDraw/App/GeomFormatPyImp.cpp b/src/Mod/TechDraw/App/GeomFormatPyImp.cpp
index 0e7520d2ad..bbf4c10c7a 100644
--- a/src/Mod/TechDraw/App/GeomFormatPyImp.cpp
+++ b/src/Mod/TechDraw/App/GeomFormatPyImp.cpp
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-
 # include <boost/uuid/uuid_io.hpp>
 #endif
 
-#include "Cosmetic.h"
 #include "GeomFormatPy.h"
 #include "GeomFormatPy.cpp"
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
index 8e01d394b2..6cd59fd153 100644
--- a/src/Mod/TechDraw/App/Geometry.cpp
+++ b/src/Mod/TechDraw/App/Geometry.cpp
@@ -21,71 +21,62 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
+# include <cmath>
 # include <boost/uuid/uuid_generators.hpp>
 # include <boost/uuid/uuid_io.hpp>
+
 # include <Approx_Curve3d.hxx>
-# include <Bnd_Box.hxx>
-# include <BRepBndLib.hxx>
-# include <BRepAdaptor_Curve.hxx>
 # include <BRep_Tool.hxx>
-# include <BRepTools.hxx>
-# include <BRepLib.hxx>
-# include <BRepBuilderAPI_MakeVertex.hxx>
+# include <BRepAdaptor_Curve.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepBuilderAPI_MakeVertex.hxx>
+# include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepLib.hxx>
 # include <BRepLProp_CLProps.hxx>
-# include <Precision.hxx>
-# include <GCPnts_AbscissaPoint.hxx>
-# include <gce_MakeCirc.hxx>
-# include <GC_MakeEllipse.hxx>
+# include <BRepTools.hxx>
 # include <GC_MakeArcOfCircle.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Elips.hxx>
-# include <gp_Pnt.hxx>
-# include <gp_Dir.hxx>
-# include <gp_Vec.hxx>
-# include <gp_Ax2.hxx>
-# include <GeomAdaptor_Curve.hxx>
+# include <GC_MakeEllipse.hxx>
+# include <gce_MakeCirc.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
 # include <Geom_BSplineCurve.hxx>
 # include <Geom_BezierCurve.hxx>
 # include <Geom_Circle.hxx>
-# include <Geom_Geometry.hxx>
 # include <Geom_TrimmedCurve.hxx>
-# include <GeomConvert_BSplineCurveToBezierCurve.hxx>
 # include <GeomAPI_PointsToBSpline.hxx>
-# include <GeomLProp_CLProps.hxx>
 # include <GeomAPI_ProjectPointOnCurve.hxx>
+# include <GeomConvert_BSplineCurveToBezierCurve.hxx>
+# include <GeomLProp_CLProps.hxx>
+# include <gp_Ax2.hxx>
+# include <gp_Circ.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Elips.hxx>
+# include <gp_Pnt.hxx>
+# include <gp_Vec.hxx>
 # include <Poly_Polygon3D.hxx>
+# include <Precision.hxx>
 # include <Standard_Version.hxx>
+# include <TColgp_Array1OfPnt.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopExp.hxx>
 # include <TopExp_Explorer.hxx>
-# include <TColgp_Array1OfPnt2d.hxx>
-# include <TColgp_Array1OfPnt.hxx>
 #if OCC_VERSION_HEX < 0x070600
 # include <BRepAdaptor_HCurve.hxx>
 #endif
-# include <cmath>
 #endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Tools2D.h>
 #include <Base/Parameter.h>
 #include <Base/Reader.h>
 #include <Base/Writer.h>
 
-#include <App/Application.h>
-#include <App/Material.h>
-
+#include "Geometry.h"
 #include "DrawUtil.h"
 
-#include "Geometry.h"
 
 using namespace TechDraw;
 using namespace std;
diff --git a/src/Mod/TechDraw/App/Geometry.h b/src/Mod/TechDraw/App/Geometry.h
index bd2e04fd05..2d564117e1 100644
--- a/src/Mod/TechDraw/App/Geometry.h
+++ b/src/Mod/TechDraw/App/Geometry.h
@@ -23,21 +23,19 @@
 #ifndef TECHDRAW_GEOMETRY_H
 #define TECHDRAW_GEOMETRY_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include <memory>
 #include <boost/uuid/uuid.hpp>
 
 #include <Base/Reader.h>
 #include <Base/Vector3D.h>
 #include <Base/Writer.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
-#include <memory>
-
 
 namespace TechDraw {
 
diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp
index 8bbf5f3aba..03d96e1b07 100644
--- a/src/Mod/TechDraw/App/GeometryObject.cpp
+++ b/src/Mod/TechDraw/App/GeometryObject.cpp
@@ -21,67 +21,48 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
 
-#include <BRep_Tool.hxx>
-#include <BRepTools.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepLib.hxx>
-#include <BRepLProp_CurveTool.hxx>
-#include <BRepLProp_CLProps.hxx>
+#ifndef _PreComp_
 #include <Bnd_Box.hxx>
+#include <BRep_Builder.hxx>
 #include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
-#include <Geom_BSplineCurve.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
+#include <BRepLib.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepTools.hxx>
 #include <gp_Ax2.hxx>
-#include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Vec.hxx>
 #include <HLRBRep.hxx>
 #include <HLRBRep_Algo.hxx>
 #include <HLRBRep_HLRToShape.hxx>
-#include <HLRAlgo_Projector.hxx>
-
-
-#include <BRepMesh_IncrementalMesh.hxx>
 #include <HLRBRep_PolyAlgo.hxx>
+#include <HLRAlgo_Projector.hxx>
 #include <HLRBRep_PolyHLRToShape.hxx>
-#include <Poly_Triangulation.hxx>
-#include <TopLoc_Location.hxx>
-
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Vertex.hxx>
 #endif  // #ifndef _PreComp_
 
 #include <algorithm>
 #include <chrono>
 
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Tools.h>
-
 #include <Mod/Part/App/PartFeature.h>
 
+#include "GeometryObject.h"
 #include "Cosmetic.h"
 #include "DrawUtil.h"
-#include "GeometryObject.h"
 #include "DrawViewPart.h"
 #include "DrawViewDetail.h"
 
+
 using namespace TechDraw;
 using namespace std;
 
diff --git a/src/Mod/TechDraw/App/GeometryObject.h b/src/Mod/TechDraw/App/GeometryObject.h
index c10d124a98..82cecc0447 100644
--- a/src/Mod/TechDraw/App/GeometryObject.h
+++ b/src/Mod/TechDraw/App/GeometryObject.h
@@ -28,10 +28,9 @@
 #include <string>
 #include <vector>
 
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Compound.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pnt.hxx>
+#include <TopoDS_Shape.hxx>
 
 #include <Base/BoundBox.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/App/HatchLine.cpp b/src/Mod/TechDraw/App/HatchLine.cpp
index 21ede75323..30aaee18c9 100644
--- a/src/Mod/TechDraw/App/HatchLine.cpp
+++ b/src/Mod/TechDraw/App/HatchLine.cpp
@@ -23,12 +23,10 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <sstream>
-#include <iomanip>
-#include <QFile>
-#include <QFileInfo>
-#include <stdexcept>
 #include <cmath>
+#include <iomanip>
+#include <sstream>
+#include <stdexcept>
 #endif
 
 #include <TopoDS_Vertex.hxx>
@@ -39,10 +37,9 @@
 #include <Base/Stream.h>
 #include <Base/Vector3D.h>
 
-#include "Geometry.h"
-
-#include "DrawUtil.h"
 #include "HatchLine.h"
+#include "DrawUtil.h"
+
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/HatchLine.h b/src/Mod/TechDraw/App/HatchLine.h
index 58f00e8869..68cb3a77de 100644
--- a/src/Mod/TechDraw/App/HatchLine.h
+++ b/src/Mod/TechDraw/App/HatchLine.h
@@ -25,18 +25,18 @@
 #ifndef TechDraw_HATCHLINE_H_
 #define TechDraw_HATCHLINE_H_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <string>
 #include <vector>
 
-#include <TopoDS_Edge.hxx>
 #include <Bnd_Box.hxx>
-#include <Base/Vector3D.h>
+#include <TopoDS_Edge.hxx>
 
+#include <Base/Vector3D.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "Geometry.h"
 
+
 namespace TechDraw
 {
 class BaseGeom;
diff --git a/src/Mod/TechDraw/App/LandmarkDimension.cpp b/src/Mod/TechDraw/App/LandmarkDimension.cpp
index a97fca434b..0b37991800 100644
--- a/src/Mod/TechDraw/App/LandmarkDimension.cpp
+++ b/src/Mod/TechDraw/App/LandmarkDimension.cpp
@@ -29,36 +29,21 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <gp_Ax2.hxx>
+# include <gp_Pnt.hxx>
+# include <gp_Pnt2d.hxx>
+# include <HLRAlgo_Projector.hxx>
 #endif
 
-#include <HLRAlgo_Projector.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-
-#include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-#include <Base/Quantity.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 
-#include <Mod/Measure/App/Measurement.h>
-
-#include "Geometry.h"
-#include "GeometryObject.h"
-#include "DrawViewPart.h"
-#include "DrawUtil.h"
-#include "LineGroup.h"
-#include "Cosmetic.h"
-#include "ShapeExtractor.h"
 #include "LandmarkDimension.h"
+#include "DrawUtil.h"
+#include "DrawViewPart.h"
+#include "ShapeExtractor.h"
 
 
-//#include <Mod/TechDraw/App/LandmarkDimensionPy.h>  // generated from LandmarkDimensionPy.xml
-
 using namespace TechDraw;
 
 //===========================================================================
diff --git a/src/Mod/TechDraw/App/LandmarkDimension.h b/src/Mod/TechDraw/App/LandmarkDimension.h
index cf9ad5562d..4a0d9d119a 100644
--- a/src/Mod/TechDraw/App/LandmarkDimension.h
+++ b/src/Mod/TechDraw/App/LandmarkDimension.h
@@ -23,10 +23,8 @@
 #ifndef TechDraw_LandmarkDimension_h_
 #define TechDraw_LandmarkDimension_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 # include <App/DocumentObject.h>
-# include <App/PropertyStandard.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawViewDimension.h"
 
diff --git a/src/Mod/TechDraw/App/LineGroup.cpp b/src/Mod/TechDraw/App/LineGroup.cpp
index 12a581a8da..dc4022cac8 100644
--- a/src/Mod/TechDraw/App/LineGroup.cpp
+++ b/src/Mod/TechDraw/App/LineGroup.cpp
@@ -23,20 +23,19 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <fstream>
-#include <sstream>
-#include <iomanip>
-#include <stdexcept>
+# include <fstream>
+# include <iomanip>
+# include <sstream>
+# include <stdexcept>
 #endif
 
-#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
-#include <Base/Parameter.h>
 #include <Base/Stream.h>
 
-#include "Preferences.h"
 #include "LineGroup.h"
+#include "Preferences.h"
+
 
 using namespace TechDraw;