diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index a5d2c106ec..0940603e49 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -312,6 +312,7 @@
 #include <GeomFill_Sweep.hxx>
 #include <GeomLib.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
+#include <GeomLib_Tool.hxx>
 #include <GeomLProp.hxx>
 #include <GeomLProp_CLProps.hxx>
 #include <GeomLProp_SLProps.hxx>
diff --git a/src/Mod/TechDraw/App/DrawDimHelper.cpp b/src/Mod/TechDraw/App/DrawDimHelper.cpp
index 8d12f0c622..8268c7ba4c 100644
--- a/src/Mod/TechDraw/App/DrawDimHelper.cpp
+++ b/src/Mod/TechDraw/App/DrawDimHelper.cpp
@@ -23,50 +23,33 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
-# include <cstring>
 # include <cstdlib>
-#include <cmath>
-#include <cfloat>
-#include <string>
-# include <exception>
+# include <sstream>
 
-#include <limits>
-
-#include <Precision.hxx>
-#include <Bnd_Box2d.hxx>
-#include <BndLib_Add2dCurve.hxx>
-#include <Bnd_Box.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include "BRepBuilderAPI_MakeShape.hxx"
-#include <BRepBndLib.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Curve.hxx>
-#include <gp_Pln.hxx>
-#include <TopoDS_Edge.hxx>
+# include <Bnd_Box.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <Geom_Line.hxx>
+# include <gp_Pln.hxx>
+# include <TopoDS_Edge.hxx>
 #endif
 
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-
-#include <Base/BoundBox.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
-#include <Base/Parameter.h>
 #include <Base/Vector3D.h>
 
+#include "DrawDimHelper.h"
 #include "Geometry.h"
-#include "DrawUtil.h"
 #include "Cosmetic.h"
 #include "DrawPage.h"
-#include "DrawViewPart.h"
+#include "DrawUtil.h"
 #include "DrawViewDimension.h"
 #include "DrawViewDimExtent.h"
+#include "DrawViewPart.h"
 
-#include "DrawDimHelper.h"
 
 #define HORIZONTAL 0
 #define VERTICAL 1
diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.cpp b/src/Mod/TechDraw/App/DrawGeomHatch.cpp
index 5ab7ef73d0..d77e11a89a 100644
--- a/src/Mod/TechDraw/App/DrawGeomHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawGeomHatch.cpp
@@ -20,88 +20,71 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
-#include <iomanip>
-#include <cmath>
-
-# include <QFile>
-# include <QFileInfo>
 
+#include <Bnd_Box.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepAlgoAPI_Common.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
-#include <BRep_Builder.hxx>
-
-#include <BRepAlgoAPI_Common.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <BRepTools.hxx>
-#include <Standard_PrimitiveTypes.hxx>
+#include <Precision.hxx>
+#include <TopExp.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Compound.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopExp.hxx>
-#include <Precision.hxx>
-
-#include <cmath>
-
 #endif
 
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/FileInfo.h>
 #include <Base/Parameter.h>
-#include <Base/UnitsApi.h>
 
-#include "HatchLine.h"
+#include "DrawGeomHatch.h"
+#include "DrawGeomHatchPy.h" // generated from DrawGeomHatchPy.xml
 #include "DrawUtil.h"
-#include "Preferences.h"
-#include "Geometry.h"
-#include "DrawPage.h"
 #include "DrawViewPart.h"
 #include "DrawViewSection.h"
-#include "DrawViewDetail.h"
-#include "DrawGeomHatch.h"
+#include "Geometry.h"
 #include "GeometryObject.h"
+#include "HatchLine.h"
+#include "Preferences.h"
 
-#include <Mod/TechDraw/App/DrawGeomHatchPy.h>  // generated from DrawGeomHatchPy.xml
 
 using namespace TechDraw;
-using namespace std;
 
-App::PropertyFloatConstraint::Constraints DrawGeomHatch::scaleRange = {Precision::Confusion(),
-                                                                       std::numeric_limits<double>::max(),
-                                                                       (0.1)}; // increment by 0.1
+App::PropertyFloatConstraint::Constraints DrawGeomHatch::scaleRange = {
+    Precision::Confusion(), std::numeric_limits<double>::max(), (0.1)}; // increment by 0.1
 
 PROPERTY_SOURCE(TechDraw::DrawGeomHatch, App::DocumentObject)
 
-
 DrawGeomHatch::DrawGeomHatch()
 {
     static const char *vgroup = "GeomHatch";
 
-    ADD_PROPERTY_TYPE(Source, (nullptr), vgroup, (App::PropertyType)(App::Prop_None), "The View + Face to be crosshatched");
+    ADD_PROPERTY_TYPE(Source, (nullptr), vgroup, (App::PropertyType)(App::Prop_None),
+                      "The View + Face to be crosshatched");
     Source.setScope(App::LinkScope::Global);
-    ADD_PROPERTY_TYPE(FilePattern ,(prefGeomHatchFile()), vgroup, App::Prop_None, "The crosshatch pattern file for this area");
+    ADD_PROPERTY_TYPE(FilePattern, (prefGeomHatchFile()), vgroup, App::Prop_None,
+                      "The crosshatch pattern file for this area");
     ADD_PROPERTY_TYPE(PatIncluded, (""), vgroup, App::Prop_None,
-                                            "Embedded Pat hatch file. System use only.");   // n/a to end users
-    ADD_PROPERTY_TYPE(NamePattern, (prefGeomHatchName()), vgroup, App::Prop_None, "The name of the pattern");
-    ADD_PROPERTY_TYPE(ScalePattern, (1.0), vgroup, App::Prop_None, "GeomHatch pattern size adjustment");
+                      "Embedded Pat hatch file. System use only.");// n/a to end users
+    ADD_PROPERTY_TYPE(NamePattern, (prefGeomHatchName()), vgroup, App::Prop_None,
+                      "The name of the pattern");
+    ADD_PROPERTY_TYPE(ScalePattern, (1.0), vgroup, App::Prop_None,
+                      "GeomHatch pattern size adjustment");
     ScalePattern.setConstraints(&scaleRange);
 
     m_saveFile = "";
@@ -122,14 +105,14 @@ void DrawGeomHatch::onChanged(const App::Property* prop)
         if ((prop == &FilePattern) && doc) {
             if (!FilePattern.isEmpty()) {
                 replacePatIncluded(FilePattern.getValue());
-                DrawGeomHatch::execute();         //remake the line sets
+                DrawGeomHatch::execute();   //remake the line sets
             }
         }
         if ((prop == &NamePattern) && doc) {
-            DrawGeomHatch::execute();            //remake the line sets
+            DrawGeomHatch::execute();       //remake the line sets
         }
     } else {
-        if ((prop == &FilePattern) ||                //make sure right pattern gets loaded at start up
+        if ((prop == &FilePattern) ||       //make sure right pattern gets loaded at start up
             (prop == &NamePattern))   {
             DrawGeomHatch::execute();
         }
diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp
index 2679ac3efb..cad4e8ab38 100644
--- a/src/Mod/TechDraw/App/DrawHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawHatch.cpp
@@ -20,42 +20,30 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
-#include <Precision.hxx>
-#include <cmath>
-
 #endif
 
-#include <iomanip>
-
-# include <QFile>
-# include <QFileInfo>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/FileInfo.h>
 #include <Base/Parameter.h>
-#include <Base/UnitsApi.h>
 
-#include "Preferences.h"
-#include "DrawViewPart.h"
-#include "DrawUtil.h"
 #include "DrawHatch.h"
+#include "DrawHatchPy.h"  // generated from DrawHatchPy.xml
+#include "DrawUtil.h"
+#include "DrawViewPart.h"
+#include "Preferences.h"
 
-#include <Mod/TechDraw/App/DrawHatchPy.h>  // generated from DrawHatchPy.xml
 
 using namespace TechDraw;
-using namespace std;
 
 PROPERTY_SOURCE(TechDraw::DrawHatch, App::DocumentObject)
 
-
 DrawHatch::DrawHatch(void)
 {
     static const char *vgroup = "Hatch";
diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.cpp b/src/Mod/TechDraw/App/DrawLeaderLine.cpp
index b5d8c202a8..e1db3276f7 100644
--- a/src/Mod/TechDraw/App/DrawLeaderLine.cpp
+++ b/src/Mod/TechDraw/App/DrawLeaderLine.cpp
@@ -22,19 +22,15 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Parameter.h>
 
+#include "DrawLeaderLine.h"
+#include "DrawLeaderLinePy.h"  // generated from DrawLeaderLinePy.xml
+#include "ArrowPropEnum.h"
 #include "DrawView.h"
 
-#include <Mod/TechDraw/App/DrawLeaderLinePy.h>  // generated from DrawLeaderLinePy.xml
-#include "DrawLeaderLine.h"
-#include "ArrowPropEnum.h"
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp
index e7f1f3bdea..a421088777 100644
--- a/src/Mod/TechDraw/App/DrawPage.cpp
+++ b/src/Mod/TechDraw/App/DrawPage.cpp
@@ -20,44 +20,31 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
 # include <iostream>
-# include <iterator>
-#include <Precision.hxx>
-#include <cmath>
+# include <sstream>
+# include <Precision.hxx>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Console.h>
-#include <Base/FileInfo.h>
-#include <Base/Parameter.h>
-#include <Base/UnitsApi.h>
-
 #include <App/Application.h>
 #include <App/Document.h>
-#include <boost/regex.hpp>
+#include <Base/Console.h>
+#include <Base/Parameter.h>
 
 #include "DrawPage.h"
-#include "DrawView.h"
+#include "DrawPagePy.h"  // generated from DrawPagePy.xml
 #include "DrawProjGroup.h"
-#include "DrawViewClip.h"
 #include "DrawTemplate.h"
-#include "DrawViewCollection.h"
-#include "DrawViewPart.h"
-#include "DrawViewDimension.h"
+#include "DrawView.h"
 #include "DrawViewBalloon.h"
-#include "DrawLeaderLine.h"
+#include "DrawViewDimension.h"
+#include "DrawViewPart.h"
 #include "Preferences.h"
 
-#include <Mod/TechDraw/App/DrawPagePy.h>  // generated from DrawPagePy.xml
 
 using namespace TechDraw;
-using namespace std;
-
 
 //===========================================================================
 // DrawPage
diff --git a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
index dabae70dce..68f40ac9de 100644
--- a/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
+++ b/src/Mod/TechDraw/App/DrawParametricTemplate.cpp
@@ -27,24 +27,15 @@
 #endif
 
 #include <Base/Exception.h>
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
 #include <Base/FileInfo.h>
-#include <Base/Vector3D.h>
-#include <Base/Tools2D.h>
-
-#include <App/Application.h>
-
-#include "Geometry.h"
-
-#include <iostream>
-#include <iterator>
+#include <Base/Interpreter.h>
 
 #include "DrawParametricTemplate.h"
-#include <Mod/TechDraw/App/DrawParametricTemplatePy.h>
+#include "DrawParametricTemplatePy.h"
+#include "Geometry.h"
+
 
 using namespace TechDraw;
-using namespace std;
 
 PROPERTY_SOURCE(TechDraw::DrawParametricTemplate, TechDraw::DrawTemplate)
 
diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp
index c2937b6791..88cb90baba 100644
--- a/src/Mod/TechDraw/App/DrawProjGroup.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp
@@ -25,39 +25,34 @@
 
 #ifndef _PreComp_
 # include <sstream>
-#include <QRectF>
-#include <cmath>
+# include <QRectF>
+# include <gp_Ax2.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Pnt.hxx>
+# include <gp_Vec.hxx>
 #endif
 
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax2.hxx>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <App/Part.h>
-
 #include <Base/BoundBox.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Matrix.h>
 #include <Base/Parameter.h>
 
-#include "DrawUtil.h"
-#include "Preferences.h"
+#include "DrawProjGroup.h"
+#include "DrawProjGroupPy.h" // generated from DrawProjGroupPy.xml
 #include "DrawPage.h"
 #include "DrawProjGroupItem.h"
-#include "DrawProjGroup.h"
+#include "DrawUtil.h"
+#include "Preferences.h"
 
-#include <Mod/TechDraw/App/DrawProjGroupPy.h>  // generated from DrawProjGroupPy.xml
 
 using namespace TechDraw;
 
 const char* DrawProjGroup::ProjectionTypeEnums[] = {"First Angle",
                                                     "Third Angle",
-                                                    "Default",          //Use Page setting
+                                                    "Default",     //Use Page setting
                                                     nullptr};
 
 PROPERTY_SOURCE(TechDraw::DrawProjGroup, TechDraw::DrawViewCollection)
diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
index 929744d3c8..0fa1a67de7 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp
@@ -24,39 +24,33 @@
 
 #ifndef _PreComp_
 # include <sstream>
+# include <gp_Ax2.hxx>
 #endif
 
-#include <gp_Ax2.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Trsf.hxx>
-
-#include <App/Application.h>
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
 
-#include "GeometryObject.h"
-#include "DrawUtil.h"
+#include "DrawProjGroupItem.h"
+#include "DrawProjGroupItemPy.h" // generated from DrawProjGroupItemPy.xml
 #include "DrawPage.h"
 #include "DrawProjGroup.h"
-#include "DrawProjGroupItem.h"
-
-#include <Mod/TechDraw/App/DrawProjGroupItemPy.h>  // generated from DrawProjGroupItemPy.xml
+#include "DrawUtil.h"
+#include "GeometryObject.h"
 
 
 using namespace TechDraw;
 
-const char* DrawProjGroupItem::TypeEnums[] = {"Front",
-                                             "Left",
-                                             "Right",
-                                             "Rear",
-                                             "Top",
-                                             "Bottom",
-                                             "FrontTopLeft",
-                                             "FrontTopRight",
-                                             "FrontBottomLeft",
-                                             "FrontBottomRight",
-                                             nullptr};
-
+const char *DrawProjGroupItem::TypeEnums[] = {"Front",
+                                              "Left",
+                                              "Right",
+                                              "Rear",
+                                              "Top",
+                                              "Bottom",
+                                              "FrontTopLeft",
+                                              "FrontTopRight",
+                                              "FrontBottomLeft",
+                                              "FrontBottomRight",
+                                              nullptr};
 
 PROPERTY_SOURCE(TechDraw::DrawProjGroupItem, TechDraw::DrawViewPart)
 
diff --git a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
index 57555c81d6..e86a69bd94 100644
--- a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp
@@ -27,13 +27,13 @@
 
 #include "DrawProjGroup.h"
 #include "DrawProjGroupItem.h"
-
 // inclusion of the generated files (generated out of DrawProjGroupPy.xml)
 #include <Mod/TechDraw/App/DrawProjGroupPy.h>
 #include <Mod/TechDraw/App/DrawProjGroupPy.cpp>
 #include <Mod/TechDraw/App/DrawProjGroupItemPy.h>
 #include <Base/VectorPy.h>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp
index 76c3600a10..90212cd882 100644
--- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp
+++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp
@@ -23,72 +23,38 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <algorithm>
+# include <limits>
 # include <sstream>
-
+#include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepGProp.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAlgoAPI_Common.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepLProp_CurveTool.hxx>
-#include <BRepLProp_CLProps.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepTools.hxx>
 #include <BRepBndLib.hxx>
-#include <Bnd_Box.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepLProp_CurveTool.hxx>
 #include <Geom_Curve.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GProp_GProps.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
+#include <GeomLib_Tool.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pln.hxx>
-#include <gp_XYZ.hxx>
-#include <HLRBRep_Algo.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <ShapeAnalysis.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeExtend_WireData.hxx>
-#include <ShapeFix_Wire.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
 #endif
 
-#include <limits>
-#include <algorithm>
-#include <cmath>
-#include <GeomLib_Tool.hxx>
-
-#include <App/Application.h>
-#include <Base/BoundBox.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Base/Parameter.h>
-#include <Mod/Part/App/PartFeature.h>
 
+#include "DrawProjectSplit.h"
 #include "DrawUtil.h"
 #include "Geometry.h"
 #include "GeometryObject.h"
-#include "DrawProjectSplit.h"
 
 
 using namespace TechDraw;
-using namespace std;
 
 //===========================================================================
 // DrawProjectSplit
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index 7585654cba..2564835438 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -51,6 +51,7 @@
 #ifdef _PreComp_
 
 // standard
+#include <algorithm>
 #include <bitset>
 #include <cassert>
 #include <cstdio>
@@ -58,6 +59,7 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
+#include <limits>
 #include <map>
 #include <set>
 #include <sstream>