diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp
index bdfef28822..34516d80c8 100644
--- a/src/Mod/TechDraw/App/DrawView.cpp
+++ b/src/Mod/TechDraw/App/DrawView.cpp
@@ -20,36 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <cmath>
 # include <sstream>
 # include <Standard_Failure.hxx>
-#include <Precision.hxx>
-#include <cmath>
+# include <Precision.hxx>
 #endif
 
-
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Base/Console.h>
-#include <Base/UnitsApi.h>
-
-#include "DrawPage.h"
-#include "DrawViewCollection.h"
-#include "DrawViewClip.h"
-#include "DrawLeaderLine.h"
-#include "Preferences.h"
-#include "DrawUtil.h"
-
+#include <Base/Reader.h>
 #include <Mod/TechDraw/App/DrawViewPy.h>  // generated from DrawViewPy.xml
 
 #include "DrawView.h"
+#include "DrawLeaderLine.h"
+#include "DrawPage.h"
+#include "DrawUtil.h"
+#include "DrawViewClip.h"
+#include "DrawViewCollection.h"
+#include "Preferences.h"
+
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h
index 74567071da..537e8dfc38 100644
--- a/src/Mod/TechDraw/App/DrawView.h
+++ b/src/Mod/TechDraw/App/DrawView.h
@@ -23,17 +23,14 @@
 #ifndef DrawView_h_
 #define DrawView_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <boost_signals2.hpp>
-
 #include <QCoreApplication>
-#include <QObject>
 #include <QRectF>
 
 #include <App/DocumentObject.h>
 #include <App/FeaturePython.h>
 #include <App/PropertyUnits.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 namespace TechDraw
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp
index ce8e06a27d..a8247d6f30 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp
+++ b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp
@@ -21,27 +21,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
 #endif
 
-#include <iomanip>
-
-#include <App/Application.h>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Parameter.h>
-
-#include "Preferences.h"
 #include "DrawViewAnnotation.h"
+#include "Preferences.h"
+
 
 using namespace TechDraw;
-using namespace std;
-
 
 //===========================================================================
 // DrawViewAnnotation
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.h b/src/Mod/TechDraw/App/DrawViewAnnotation.h
index e04c38a43e..077dd9b27c 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotation.h
+++ b/src/Mod/TechDraw/App/DrawViewAnnotation.h
@@ -24,11 +24,10 @@
 #ifndef DrawViewAnnotation_h_
 #define DrawViewAnnotation_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/FeaturePython.h>
 #include <App/PropertyUnits.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawView.h"
 
@@ -36,7 +35,6 @@
 namespace TechDraw
 {
 
-
 class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView
 {
     PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewAnnotation);
diff --git a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp
index ac242215af..8e884144bd 100644
--- a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp
@@ -20,17 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include <App/DocumentObject.h>
-#include <Base/Console.h>
-
-#include "DrawPage.h"
 #include "DrawView.h"
 #include "DrawViewAnnotation.h"
 
@@ -39,6 +34,7 @@
 #include <Mod/TechDraw/App/DrawViewAnnotationPy.h>
 #include <Mod/TechDraw/App/DrawViewAnnotationPy.cpp>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawViewArch.cpp b/src/Mod/TechDraw/App/DrawViewArch.cpp
index 11d018ac7d..57f6929f51 100644
--- a/src/Mod/TechDraw/App/DrawViewArch.cpp
+++ b/src/Mod/TechDraw/App/DrawViewArch.cpp
@@ -20,25 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
 #endif
 
-#include <iomanip>
-
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Base/Interpreter.h>
 
 #include "DrawViewArch.h"
 
-using namespace TechDraw;
-using namespace std;
 
+using namespace TechDraw;
 
 //===========================================================================
 // DrawViewArch
diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h
index 1b13275cf7..5ae47e01f8 100644
--- a/src/Mod/TechDraw/App/DrawViewArch.h
+++ b/src/Mod/TechDraw/App/DrawViewArch.h
@@ -23,11 +23,10 @@
 #ifndef DrawViewArch_h_
 #define DrawViewArch_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
 #include <Base/BoundBox.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawViewSymbol.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp
index 094078c769..c9430ca2ec 100644
--- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp
+++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp
@@ -23,44 +23,22 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
-# include <cstring>
 # include <cstdlib>
-# include <exception>
-# include <QString>
-# include <QStringList>
-# include <QRegExp>
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <gp_Pnt.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
+# include <cstring>
+# include <sstream>
+# include <Precision.hxx>
 #endif
 
-#include <QLocale>
-
 #include <App/Application.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 "Preferences.h"
-#include "Geometry.h"
-#include "DrawViewPart.h"
 #include "DrawViewBalloon.h"
-#include "DrawUtil.h"
-#include "LineGroup.h"
 #include "ArrowPropEnum.h"
+#include "DrawViewPart.h"
+#include "Preferences.h"
 
 
-//#include <Mod/TechDraw/App/DrawViewBalloonPy.h>  // generated from DrawViewBalloonPy.xml
-
 using namespace TechDraw;
 
 App::PropertyFloatConstraint::Constraints DrawViewBalloon::SymbolScaleRange = { Precision::Confusion(),
diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.h b/src/Mod/TechDraw/App/DrawViewBalloon.h
index d0c84dab22..f9ad15110d 100644
--- a/src/Mod/TechDraw/App/DrawViewBalloon.h
+++ b/src/Mod/TechDraw/App/DrawViewBalloon.h
@@ -23,11 +23,9 @@
 #ifndef TechDraw_DrawViewBalloon_h_
 #define TechDraw_DrawViewBalloon_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyUnits.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawView.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp
index d395f57ef7..d489c0c13d 100644
--- a/src/Mod/TechDraw/App/DrawViewClip.cpp
+++ b/src/Mod/TechDraw/App/DrawViewClip.cpp
@@ -21,23 +21,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-
-#endif
-
-#include <Base/Console.h>
-
 #include "DrawViewClip.h"
 #include "DrawPage.h"
-
 #include <Mod/TechDraw/App/DrawViewClipPy.h>  // generated from DrawViewClipPy.xml
 
-using namespace TechDraw;
-using namespace std;
 
+using namespace TechDraw;
 
 //===========================================================================
 // DrawViewClip
diff --git a/src/Mod/TechDraw/App/DrawViewClip.h b/src/Mod/TechDraw/App/DrawViewClip.h
index 79fc0a168d..3f7a60bc91 100644
--- a/src/Mod/TechDraw/App/DrawViewClip.h
+++ b/src/Mod/TechDraw/App/DrawViewClip.h
@@ -24,12 +24,10 @@
 #ifndef DrawViewClip_h_
 #define DrawViewClip_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/FeaturePython.h>
 #include <App/PropertyLinks.h>
-#include <App/PropertyUnits.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawView.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
index 1338e1075a..2c6d40e72e 100644
--- a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp
@@ -27,12 +27,12 @@
 
 #include "DrawViewClip.h"
 #include "DrawView.h"
-
 // inclusion of the generated files
 #include <Mod/TechDraw/App/DrawViewPy.h>
 #include <Mod/TechDraw/App/DrawViewClipPy.h>
 #include <Mod/TechDraw/App/DrawViewClipPy.cpp>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawViewCollection.cpp b/src/Mod/TechDraw/App/DrawViewCollection.cpp
index 17e6c82efa..314cb24aa5 100644
--- a/src/Mod/TechDraw/App/DrawViewCollection.cpp
+++ b/src/Mod/TechDraw/App/DrawViewCollection.cpp
@@ -28,13 +28,12 @@
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-
 #include <Base/Console.h>
-#include <Base/Exception.h>
+#include <Base/Interpreter.h>
 
-#include "DrawPage.h"
 #include "DrawViewCollection.h"
 
+
 using namespace TechDraw;
 
 //===========================================================================
diff --git a/src/Mod/TechDraw/App/DrawViewCollection.h b/src/Mod/TechDraw/App/DrawViewCollection.h
index 3fb1d8ac23..ab310bf754 100644
--- a/src/Mod/TechDraw/App/DrawViewCollection.h
+++ b/src/Mod/TechDraw/App/DrawViewCollection.h
@@ -24,13 +24,13 @@
 #ifndef TECHDRAW_FEATUREVIEWCOLLECTION_h_
 #define TECHDRAW_FEATUREVIEWCOLLECTION_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawView.h"
 
+
 namespace TechDraw
 {
 
diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
index cfbcbf3093..902e47b050 100644
--- a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp
@@ -23,11 +23,11 @@
 #include "PreCompiled.h"
 
 #include "DrawViewCollection.h"
-
 // inclusion of the generated files (generated out of DrawViewCollectionPy.xml)
 #include <Mod/TechDraw/App/DrawViewCollectionPy.h>
 #include <Mod/TechDraw/App/DrawViewCollectionPy.cpp>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp
index d77b1172cf..fea6116fe8 100644
--- a/src/Mod/TechDraw/App/DrawViewDetail.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp
@@ -20,62 +20,48 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <Bnd_Box.hxx>
-#include <BRepAlgoAPI_Common.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
-#include <BRepPrimAPI_MakePrism.hxx>
-#include <BRepProj_Projection.hxx>
-#include <BRepTools.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Pnt.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
+# include <QtConcurrentRun>
+# include <sstream>
+# include <Bnd_Box.hxx>
+# include <BRepAlgoAPI_Common.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRep_Builder.hxx>
+# include <BRepPrimAPI_MakeCylinder.hxx>
+# include <BRepPrimAPI_MakePrism.hxx>
+# include <BRepProj_Projection.hxx>
+# include <BRepTools.hxx>
+# include <gp_Ax2.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Pln.hxx>
+# include <gp_Pnt.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS_Compound.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Face.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Shell.hxx>
+# include <TopoDS_Solid.hxx>
 #endif
 
-#include <chrono>
-#include <sstream>
-
-#include <QFile>
-#include <QFileInfo>
-#include <QtConcurrentRun>
-
 #include <App/Application.h>
 #include <App/Document.h>
-#include <App/Material.h>
-#include <Base/BoundBox.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Parameter.h>
 
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/TopoShape.h>
-
+#include "DrawViewDetail.h"
 #include "DrawUtil.h"
 #include "DrawViewSection.h"
 #include "GeometryObject.h"
 #include "Preferences.h"
 
-#include "DrawViewDetail.h"
 
 using namespace TechDraw;
-using namespace std;
 
 //===========================================================================
 // DrawViewDetail
diff --git a/src/Mod/TechDraw/App/DrawViewDetail.h b/src/Mod/TechDraw/App/DrawViewDetail.h
index 46ac8dc510..8873ad0af7 100644
--- a/src/Mod/TechDraw/App/DrawViewDetail.h
+++ b/src/Mod/TechDraw/App/DrawViewDetail.h
@@ -23,15 +23,13 @@
 #ifndef DrawViewDetail_h_
 #define DrawViewDetail_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <gp_Ax2.hxx>
 #include <TopoDS_Shape.hxx>
 
 #include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
 #include <App/FeaturePython.h>
-#include <Base/Vector3D.h>
+#include <App/PropertyLinks.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawViewPart.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
index e190970be0..5b2f8432b0 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp
@@ -23,35 +23,21 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
-# include <cstring>
 # include <cstdlib>
-# include <exception>
-# include <QString>
-# include <QStringList>
-# include <QRegExp>
-
+# include <cstring>
+# include <sstream>
 #endif
 
-#include <QLocale>
-
-#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 "Cosmetic.h"
-#include "Geometry.h"
-#include "DrawViewPart.h"
-#include "DrawViewDimExtent.h"
-#include "DrawDimHelper.h"
-
 #include <Mod/TechDraw/App/DrawViewDimExtentPy.h>  // generated from DrawViewDimExtentPy.xml
 
+#include "DrawViewDimExtent.h"
+#include "Cosmetic.h"
+#include "DrawDimHelper.h"
+#include "DrawViewPart.h"
+
+
 using namespace TechDraw;
 
 //===========================================================================
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.h b/src/Mod/TechDraw/App/DrawViewDimExtent.h
index b96e13abc1..28d8535adc 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtent.h
+++ b/src/Mod/TechDraw/App/DrawViewDimExtent.h
@@ -23,12 +23,11 @@
 #ifndef TechDraw_DrawViewDimExtent_h_
 #define TechDraw_DrawViewDimExtent_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <tuple>
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawViewDimension.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp
index a1e41873a2..2293b4d6ce 100644
--- a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp
@@ -21,20 +21,13 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Vector3D.h>
 
 #include "DrawViewDimExtent.h"
-
 // inclusion of the generated files (generated out of DrawViewDimExtentPy.xml)
-#include <Base/VectorPy.h>
 #include <Mod/TechDraw/App/DrawViewDimExtentPy.h>
 #include <Mod/TechDraw/App/DrawViewDimExtentPy.cpp>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index b3c727c8cd..0914f4d6d0 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -23,45 +23,38 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
-# include <cstring>
 # include <cstdlib>
-# include <exception>
+# include <cstring>
+# include <sstream>
+# include <QLocale>
+# include <QRegExp>
 # include <QString>
 # include <QStringList>
-# include <QRegExp>
-#include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepBndLib.hxx>
 #include <gp_Pnt.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
+#include <TopoDS_Shape.hxx>
 #endif
 
-#include <QLocale>
-
 #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 <Mod/TechDraw/App/DrawViewDimensionPy.h>  // generated from DrawViewDimensionPy.xml
 
-#include "Preferences.h"
-#include "Geometry.h"
-#include "DrawViewPart.h"
 #include "DrawViewDimension.h"
 #include "DrawUtil.h"
-#include "LineGroup.h"
+#include "DrawViewPart.h"
+#include "Geometry.h"
+#include "Preferences.h"
 
 
-#include <Mod/TechDraw/App/DrawViewDimensionPy.h>  // generated from DrawViewDimensionPy.xml
-
 using namespace TechDraw;
 
 //===========================================================================
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h
index ef7f990eed..87c150b6ac 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.h
+++ b/src/Mod/TechDraw/App/DrawViewDimension.h
@@ -23,13 +23,11 @@
 #ifndef TechDraw_DrawViewDimension_h_
 #define TechDraw_DrawViewDimension_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <tuple>
 
 #include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
 #include <Base/UnitsApi.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawView.h"
 
diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
index e8851ecb5a..1b078001f1 100644
--- a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp
@@ -21,20 +21,16 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Vector3D.h>
+#include <Base/VectorPy.h>
 
 #include "DrawViewDimension.h"
-
 // inclusion of the generated files (generated out of DrawViewDimensionPy.xml)
-#include <Base/VectorPy.h>
 #include <Mod/TechDraw/App/DrawViewDimensionPy.h>
 #include <Mod/TechDraw/App/DrawViewDimensionPy.cpp>
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp
index f5f4838fbe..a42de7e34c 100644
--- a/src/Mod/TechDraw/App/DrawViewDraft.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp
@@ -20,25 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
 #endif
 
-#include <iomanip>
-
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Base/Interpreter.h>
 
 #include "DrawViewDraft.h"
 
-using namespace TechDraw;
-using namespace std;
 
+using namespace TechDraw;
 
 //===========================================================================
 // DrawViewDraft
diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h
index 06d9620873..287bc22083 100644
--- a/src/Mod/TechDraw/App/DrawViewDraft.h
+++ b/src/Mod/TechDraw/App/DrawViewDraft.h
@@ -23,12 +23,11 @@
 #ifndef DrawViewDraft_h_
 #define DrawViewDraft_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObject.h>
 #include <App/FeaturePython.h>
 #include <App/PropertyLinks.h>
 #include <Base/BoundBox.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "DrawViewSymbol.h"
 
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index 1ce0484ad7..698a96fdf9 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -55,6 +55,7 @@
 #include <cassert>
 #include <cstdio>
 #include <fstream>
+#include <iomanip>
 #include <iostream>
 #include <map>
 #include <set>
@@ -69,7 +70,9 @@
 #include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+#include <QtConcurrentRun>
 #include <QFile>
+#include <QLocale>
 
 // OpenCasCade =====================================================================================
 #include <Mod/Part/App/OpenCascadeAll.h>