diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
index 6de8e80263..740bd9d2da 100644
--- a/src/Mod/TechDraw/App/Cosmetic.cpp
+++ b/src/Mod/TechDraw/App/Cosmetic.cpp
@@ -22,20 +22,23 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax1.hxx>
-#include <gp_Circ.hxx>
-#include <Geom_Circle.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
-#include <Precision.hxx>
-#endif  // #ifndef _PreComp_
+# include <cmath>
+# include <boost/uuid/uuid.hpp>
+# include <boost/uuid/uuid_io.hpp>
+# include <boost/uuid/uuid_generators.hpp>
+# include <gp_Pnt.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Ax1.hxx>
+# include <gp_Circ.hxx>
+# include <Geom_Circle.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Edge.hxx>
+# include <BRepBndLib.hxx>
+# include <Bnd_Box.hxx>
+# include <Precision.hxx>
+#endif
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h
index 0469cff248..00a643c346 100644
--- a/src/Mod/TechDraw/App/CosmeticExtension.h
+++ b/src/Mod/TechDraw/App/CosmeticExtension.h
@@ -32,6 +32,8 @@
 #include "PropertyCosmeticVertexList.h"
 #include "PropertyGeomFormatList.h"
 
+#include "Geometry.h"
+
 
 namespace TechDraw {
 class DrawViewPart;
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
index db71d5b27c..aae80a15ed 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
@@ -44,7 +44,7 @@
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
 
-
+#include "Cosmetic.h"
 #include "Geometry.h"
 #include "DrawViewPart.h"
 #include "DrawViewDimExtent.h"
diff --git a/src/Mod/TechDraw/App/FeatureProjection.h b/src/Mod/TechDraw/App/FeatureProjection.h
index a6b309a8ef..20a013448f 100644
--- a/src/Mod/TechDraw/App/FeatureProjection.h
+++ b/src/Mod/TechDraw/App/FeatureProjection.h
@@ -22,21 +22,16 @@
 //this file originally part of TechDraw workbench
 //migrated to TechDraw workbench 2022-01-26 by Wandererfan
 
-
 #ifndef TECHDRAW_FEATUREPROJECTION
 #define TECHDRAW_FEATUREPROJECTION
 
-
 #include <App/DocumentObject.h>
-#include <App/PropertyStandard.h>
 #include <App/PropertyGeo.h>
 #include <Mod/Part/App/PartFeature.h>
 
-
 namespace TechDraw
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class TechDrawExport FeatureProjection : public Part::Feature
diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
index 5c5663d916..abc6cd2b72 100644
--- a/src/Mod/TechDraw/App/Geometry.cpp
+++ b/src/Mod/TechDraw/App/Geometry.cpp
@@ -22,53 +22,55 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#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 <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepLProp_CLProps.hxx>
-#include <Precision.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-#include <gce_MakeCirc.hxx>
-#include <GC_MakeEllipse.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 <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 <Poly_Polygon3D.hxx>
-#include <Standard_Version.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_Array1OfPnt.hxx>
+# 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 <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepBuilderAPI_MakeWire.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepLProp_CLProps.hxx>
+# include <Precision.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
+# include <gce_MakeCirc.hxx>
+# include <GC_MakeEllipse.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 <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 <Poly_Polygon3D.hxx>
+# include <Standard_Version.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>
+# include <BRepAdaptor_HCurve.hxx>
 #endif
-#include <cmath>
+# include <cmath>
 #endif  // #ifndef _PreComp_
 
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/App/Geometry.h b/src/Mod/TechDraw/App/Geometry.h
index 1364eb9df2..a06d32f562 100644
--- a/src/Mod/TechDraw/App/Geometry.h
+++ b/src/Mod/TechDraw/App/Geometry.h
@@ -26,22 +26,19 @@
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_io.hpp>
-#include <boost/uuid/uuid_generators.hpp>
 
-#include <Base/Tools2D.h>
-#include <Base/Vector3D.h>
 #include <Base/Reader.h>
+#include <Base/Vector3D.h>
 #include <Base/Writer.h>
 
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopoDS_Face.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Wire.hxx>
 
 #include <memory>
 
+
 namespace TechDraw {
 
 enum ExtractionType {               //obs
diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp
index 52cd530922..94f3846366 100644
--- a/src/Mod/TechDraw/App/GeometryObject.cpp
+++ b/src/Mod/TechDraw/App/GeometryObject.cpp
@@ -76,6 +76,7 @@
 
 #include <Mod/Part/App/PartFeature.h>
 
+#include "Cosmetic.h"
 #include "DrawUtil.h"
 #include "GeometryObject.h"
 #include "DrawViewPart.h"
diff --git a/src/Mod/TechDraw/App/GeometryObject.h b/src/Mod/TechDraw/App/GeometryObject.h
index e5a27155f3..430d82315d 100644
--- a/src/Mod/TechDraw/App/GeometryObject.h
+++ b/src/Mod/TechDraw/App/GeometryObject.h
@@ -25,16 +25,16 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Compound.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Ax2.hxx>
-
-#include <Base/Vector3D.h>
-#include <Base/BoundBox.h>
 #include <string>
 #include <vector>
 
+#include <TopoDS_Shape.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Pnt.hxx>
+
+#include <Base/BoundBox.h>
+#include <Base/Vector3D.h>
+
 #include "Geometry.h"
 
 
diff --git a/src/Mod/TechDraw/App/HatchLine.h b/src/Mod/TechDraw/App/HatchLine.h
index d2cb69ca82..747b639498 100644
--- a/src/Mod/TechDraw/App/HatchLine.h
+++ b/src/Mod/TechDraw/App/HatchLine.h
@@ -27,15 +27,13 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <TopoDS_Edge.hxx>
 #include <Bnd_Box.hxx>
 #include <Base/Vector3D.h>
 
-//class TopoDS_Edge;
-//class Bnd_Box;
 
 #include "Geometry.h"
 
diff --git a/src/Mod/TechDraw/App/LandmarkDimension.h b/src/Mod/TechDraw/App/LandmarkDimension.h
index 7a8ad8bd79..b74a985208 100644
--- a/src/Mod/TechDraw/App/LandmarkDimension.h
+++ b/src/Mod/TechDraw/App/LandmarkDimension.h
@@ -24,11 +24,11 @@
 #define _TechDraw_LandmarkDimension_h_
 
 # include <App/DocumentObject.h>
-# include <App/FeaturePython.h>
-# include <App/PropertyLinks.h>
+# include <App/PropertyStandard.h>
 
 #include "DrawViewDimension.h"
 
+
 class TopoDS_Shape;
 class gp_Ax2;
 
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index 23863f70dc..3a6b38cae4 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -61,6 +61,8 @@
 
 #include <boost/graph/boyer_myrvold_planar_test.hpp>
 #include <boost/graph/is_kuratowski_subgraph.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
 // OpenCasCade =====================================================================================
diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h
index 4b20446b3c..88d83df08b 100644
--- a/src/Mod/TechDraw/App/Preferences.h
+++ b/src/Mod/TechDraw/App/Preferences.h
@@ -26,6 +26,7 @@
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <string>
+
 class QString;
 
 namespace App
diff --git a/src/Mod/TechDraw/App/PropertyCenterLineList.h b/src/Mod/TechDraw/App/PropertyCenterLineList.h
index a4ce6ef034..f397acb866 100644
--- a/src/Mod/TechDraw/App/PropertyCenterLineList.h
+++ b/src/Mod/TechDraw/App/PropertyCenterLineList.h
@@ -20,19 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef TECHDRAW_PropertyCenterLineList_H
 #define TECHDRAW_PropertyCenterLineList_H
 
-// Std. configurations
-
 #include <vector>
-#include <string>
 #include <App/Property.h>
 
-#include <Mod/TechDraw/App/CenterLinePy.h>
-
-#include "Cosmetic.h"
 
 namespace Base {
 class Writer;
diff --git a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h
index df1c07179c..58d16fafd7 100644
--- a/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h
+++ b/src/Mod/TechDraw/App/PropertyCosmeticEdgeList.h
@@ -20,19 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef TECHDRAW_PropertyCosmeticEdgeList_H
 #define TECHDRAW_PropertyCosmeticEdgeList_H
 
-// Std. configurations
-
 #include <vector>
-#include <string>
 #include <App/Property.h>
 
-#include <Mod/TechDraw/App/CosmeticEdgePy.h>
-
-#include "Cosmetic.h"
 
 namespace Base {
 class Writer;
diff --git a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h
index 58ee06a692..b3f225c767 100644
--- a/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h
+++ b/src/Mod/TechDraw/App/PropertyCosmeticVertexList.h
@@ -20,19 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef TECHDRAW_PropertyCosmeticVertexList_H
 #define TECHDRAW_PropertyCosmeticVertexList_H
 
-// Std. configurations
-
 #include <vector>
-#include <string>
 #include <App/Property.h>
 
-#include <Mod/TechDraw/App/CosmeticVertexPy.h>
-
-#include "Cosmetic.h"
 
 namespace Base {
 class Writer;
diff --git a/src/Mod/TechDraw/App/PropertyGeomFormatList.h b/src/Mod/TechDraw/App/PropertyGeomFormatList.h
index fcdbc75f3a..87348e5018 100644
--- a/src/Mod/TechDraw/App/PropertyGeomFormatList.h
+++ b/src/Mod/TechDraw/App/PropertyGeomFormatList.h
@@ -20,20 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef TECHDRAW_PropertyGeomFormatList_H
 #define TECHDRAW_PropertyGeomFormatList_H
 
-// Std. configurations
-
 #include <vector>
-#include <string>
 #include <App/Property.h>
 
-#include <Mod/TechDraw/App/GeomFormatPy.h>
-
-#include "Cosmetic.h"
-
 namespace Base {
 class Writer;
 }
diff --git a/src/Mod/TechDraw/App/QDomNodeModel.h b/src/Mod/TechDraw/App/QDomNodeModel.h
index b6d7f22d9c..018a402ea7 100644
--- a/src/Mod/TechDraw/App/QDomNodeModel.h
+++ b/src/Mod/TechDraw/App/QDomNodeModel.h
@@ -28,8 +28,9 @@
 #define _QDOMNODEMODEL_H_
 
 #include <QAbstractXmlNodeModel>
-#include <QXmlNamePool>
 #include <QDomDocument>
+#include <QXmlNamePool>
+
 
 class TechDrawExport QDomNodeModel: public QAbstractXmlNodeModel
 {
diff --git a/src/Mod/TechDraw/App/ShapeExtractor.h b/src/Mod/TechDraw/App/ShapeExtractor.h
index d2a30ccb76..23e09717ae 100644
--- a/src/Mod/TechDraw/App/ShapeExtractor.h
+++ b/src/Mod/TechDraw/App/ShapeExtractor.h
@@ -25,22 +25,14 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/FeaturePython.h>
-#include <App/GroupExtension.h>
-#include <App/Part.h>
 #include <App/Link.h>
-#include <App/PropertyLinks.h>
-#include <App/PropertyStandard.h>
-
 #include <Base/Type.h>
 #include <Base/Vector3D.h>
 
+
 namespace TechDraw
 {