diff --git a/src/Mod/TechDraw/App/AppTechDraw.cpp b/src/Mod/TechDraw/App/AppTechDraw.cpp
index d722a8569f..6e216ef70a 100644
--- a/src/Mod/TechDraw/App/AppTechDraw.cpp
+++ b/src/Mod/TechDraw/App/AppTechDraw.cpp
@@ -21,47 +21,46 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 
-#include "DrawPage.h"
-#include "DrawSVGTemplate.h"
-#include "DrawParametricTemplate.h"
-#include "DrawView.h"
-#include "DrawViewCollection.h"
-#include "DrawViewPart.h"
-#include "DrawViewSection.h"
-#include "DrawViewAnnotation.h"
-#include "DrawViewDimension.h"
-#include "DrawViewDimExtent.h"
-#include "LandmarkDimension.h"
-#include "DrawProjGroupItem.h"
-#include "DrawProjGroup.h"
-#include "DrawViewSymbol.h"
-#include "DrawViewClip.h"
-#include "DrawHatch.h"
+#include "Cosmetic.h"
+#include "CosmeticExtension.h"
 #include "DrawGeomHatch.h"
-#include "DrawViewDraft.h"
-#include "DrawViewArch.h"
-#include "DrawViewSpreadsheet.h"
-#include "DrawViewMulti.h"
-#include "DrawViewImage.h"
-#include "DrawViewDetail.h"
-#include "DrawViewBalloon.h"
+#include "DrawHatch.h"
 #include "DrawLeaderLine.h"
+#include "DrawPage.h"
+#include "DrawParametricTemplate.h"
+#include "DrawProjGroup.h"
+#include "DrawProjGroupItem.h"
 #include "DrawRichAnno.h"
+#include "DrawSVGTemplate.h"
 #include "DrawTile.h"
 #include "DrawTileWeld.h"
+#include "DrawView.h"
+#include "DrawViewAnnotation.h"
+#include "DrawViewArch.h"
+#include "DrawViewBalloon.h"
+#include "DrawViewClip.h"
+#include "DrawViewCollection.h"
+#include "DrawViewDetail.h"
+#include "DrawViewDimension.h"
+#include "DrawViewDimExtent.h"
+#include "DrawViewDraft.h"
+#include "DrawViewImage.h"
+#include "DrawViewMulti.h"
+#include "DrawViewPart.h"
+#include "DrawViewSection.h"
+#include "DrawViewSpreadsheet.h"
+#include "DrawViewSymbol.h"
 #include "DrawWeldSymbol.h"
-#include "Cosmetic.h"
-#include "PropertyGeomFormatList.h"
+#include "FeatureProjection.h"
+#include "LandmarkDimension.h"
 #include "PropertyCenterLineList.h"
 #include "PropertyCosmeticEdgeList.h"
 #include "PropertyCosmeticVertexList.h"
+#include "PropertyGeomFormatList.h"
 
-#include "CosmeticExtension.h"
-
-#include "FeatureProjection.h"
 
 namespace TechDraw {
     extern PyObject* initModule();
diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
index 592836ea9a..140de23aa2 100644
--- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp
+++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
@@ -21,67 +21,54 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
+#include <gp_Trsf.hxx>
+#include <gp_Vec.hxx>
 #include <TopoDS.hxx>
+#include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopoDS_Compound.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Vec.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <BRepTools.hxx>
 #endif
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <boost/regex.hpp>
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Exception.h>
-#include <Base/GeometryPyCXX.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
-
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
-
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/Vector3D.h>
+#include <Base/VectorPy.h>
+#include <Mod/Import/App/dxf/ImpExpDxf.h>
+#include <Mod/Part/App/OCCError.h>
 #include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/TopoShapePy.h>
+#include <Mod/Part/App/TopoShapeCompoundPy.h>
 #include <Mod/Part/App/TopoShapeEdgePy.h>
 #include <Mod/Part/App/TopoShapeFacePy.h>
+#include <Mod/Part/App/TopoShapePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/TopoShapeCompoundPy.h>
-#include <Mod/Part/App/OCCError.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <Mod/Import/App/dxf/ImpExpDxf.h>
-
-#include "DrawProjectSplit.h"
-#include "DrawViewPart.h"
-#include "DrawViewPartPy.h"
-#include "DrawViewAnnotation.h"
-#include "DrawViewDimension.h"
+#include "DrawDimHelper.h"
+#include "DrawGeomHatch.h"
 #include "DrawPage.h"
 #include "DrawPagePy.h"
-#include "Geometry.h"
-#include "GeometryObject.h"
-#include "EdgeWalker.h"
-#include "DrawUtil.h"
+#include "DrawProjectSplit.h"
 #include "DrawProjGroup.h"
 #include "DrawProjGroupItem.h"
-#include "DrawDimHelper.h"
-#include "HatchLine.h"
-#include "DrawGeomHatch.h"
-
-#include "TechDrawExport.h"
+#include "DrawUtil.h"
+#include "DrawViewAnnotation.h"
+#include "DrawViewDimension.h"
+#include "DrawViewPart.h"
+#include "DrawViewPartPy.h"
+#include "EdgeWalker.h"
+#include "Geometry.h"
+#include "GeometryObject.h"
 #include "ProjectionAlgos.h"
+#include "TechDrawExport.h"
 
 
 namespace TechDraw {
diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.cpp b/src/Mod/TechDraw/App/ArrowPropEnum.cpp
index a0b63fe344..16ad38c0fb 100644
--- a/src/Mod/TechDraw/App/ArrowPropEnum.cpp
+++ b/src/Mod/TechDraw/App/ArrowPropEnum.cpp
@@ -22,11 +22,9 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ArrowPropEnum.h"
 
+
 namespace TechDraw {
 
 const int   ArrowPropEnum::ArrowCount = 8;
diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.h b/src/Mod/TechDraw/App/ArrowPropEnum.h
index 8100231ff0..383f3866d4 100644
--- a/src/Mod/TechDraw/App/ArrowPropEnum.h
+++ b/src/Mod/TechDraw/App/ArrowPropEnum.h
@@ -23,12 +23,12 @@
 #ifndef ARROWENUMS_H_
 #define ARROWENUMS_H_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
-#include <vector>
 #include <string>
+#include <vector>
 #include <QCoreApplication>
 
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 
 namespace TechDraw
 {
diff --git a/src/Mod/TechDraw/App/CenterLinePyImp.cpp b/src/Mod/TechDraw/App/CenterLinePyImp.cpp
index 5fa33bcd38..98ea1078d2 100644
--- a/src/Mod/TechDraw/App/CenterLinePyImp.cpp
+++ b/src/Mod/TechDraw/App/CenterLinePyImp.cpp
@@ -20,18 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-
 # include <boost/uuid/uuid_io.hpp>
 #endif
 
 #include <Base/Console.h>
 
-#include "DrawUtil.h"
-#include "Cosmetic.h"
 #include "CenterLinePy.h"
+#include "DrawUtil.h"
+
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
index cdacf95e0f..ad17462dae 100644
--- a/src/Mod/TechDraw/App/Cosmetic.cpp
+++ b/src/Mod/TechDraw/App/Cosmetic.cpp
@@ -24,48 +24,38 @@
 #include "PreCompiled.h"
 #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 <BRepBndLib.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <gp_Pnt.hxx>
 # include <Precision.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Shape.hxx>
+# include <boost/uuid/uuid.hpp>
+# include <boost/uuid/uuid_generators.hpp>
+# include <boost/uuid/uuid_io.hpp>
 #endif
 
+#include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Matrix.h>
 #include <Base/Parameter.h>
 #include <Base/Reader.h>
-#include <Base/Tools.h>
 #include <Base/Vector3D.h>
 #include <Base/Writer.h>
-
-#include <App/Application.h>
-#include <App/Material.h>
-
-#include <Mod/TechDraw/App/GeomFormatPy.h>
 #include <Mod/TechDraw/App/CenterLinePy.h>
 #include <Mod/TechDraw/App/CosmeticEdgePy.h>
 #include <Mod/TechDraw/App/CosmeticVertexPy.h>
-
-#include "DrawUtil.h"
-#include "Preferences.h"
-#include "LineGroup.h"
-#include "GeometryObject.h"
-#include "Geometry.h"
-#include "DrawViewPart.h"
+#include <Mod/TechDraw/App/GeomFormatPy.h>
 
 #include "Cosmetic.h"
+#include "DrawUtil.h"
+#include "DrawViewPart.h"
+#include "Geometry.h"
+#include "GeometryObject.h"
+#include "LineGroup.h"
+#include "Preferences.h"
+
 
 using namespace TechDraw;
 using namespace std;
diff --git a/src/Mod/TechDraw/App/Cosmetic.h b/src/Mod/TechDraw/App/Cosmetic.h
index 10fc4629dc..04d1d67b82 100644
--- a/src/Mod/TechDraw/App/Cosmetic.h
+++ b/src/Mod/TechDraw/App/Cosmetic.h
@@ -23,17 +23,16 @@
 #ifndef TECHDRAW_COSMETIC_H
 #define TECHDRAW_COSMETIC_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <boost/uuid/uuid.hpp>
 
 #include <App/FeaturePython.h>
-#include <App/Material.h>
 #include <Base/Persistence.h>
 #include <Base/Vector3D.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "Geometry.h"
 
+
 class TopoDS_Edge;
 
 namespace TechDraw {
diff --git a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
index a8fb25e222..1091c5dec7 100644
--- a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
+++ b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp
@@ -20,30 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
 
+#ifndef _PreComp_
+# include <BRepBuilderAPI_MakeEdge.hxx>
 # include <boost/uuid/uuid_io.hpp>
 #endif
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <gp_Circ.hxx>
-#include <Geom_Circle.hxx>
-
-
-#include <App/Material.h>
 
 #include <Base/Console.h>
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
 
-#include "DrawUtil.h"
-#include "Geometry.h"
-#include "Cosmetic.h"
 #include "CosmeticEdgePy.h"
 #include "CosmeticEdgePy.cpp"
+#include "Cosmetic.h"
+#include "DrawUtil.h"
+#include "Geometry.h"
+
 
 using namespace TechDraw;
 
diff --git a/src/Mod/TechDraw/App/CosmeticExtension.cpp b/src/Mod/TechDraw/App/CosmeticExtension.cpp
index c7b8bd3123..44dfe3316a 100644
--- a/src/Mod/TechDraw/App/CosmeticExtension.cpp
+++ b/src/Mod/TechDraw/App/CosmeticExtension.cpp
@@ -21,26 +21,19 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif  // #ifndef _PreComp_
-
-#include "CosmeticExtension.h"
 
 #include <Base/Console.h>
 
-#include <App/Application.h>
-#include <App/FeaturePythonPyImp.h>
-
+#include "CosmeticExtension.h"
 #include "CosmeticExtensionPy.h"
-
 #include "Cosmetic.h"
 #include "DrawUtil.h"
 #include "DrawViewPart.h"
 
+
 using namespace TechDraw;
 using namespace std;
 
-
 EXTENSION_PROPERTY_SOURCE(TechDraw::CosmeticExtension, App::DocumentObjectExtension)
 
 CosmeticExtension::CosmeticExtension()
diff --git a/src/Mod/TechDraw/App/CosmeticExtension.h b/src/Mod/TechDraw/App/CosmeticExtension.h
index a010ddefa9..02daf18041 100644
--- a/src/Mod/TechDraw/App/CosmeticExtension.h
+++ b/src/Mod/TechDraw/App/CosmeticExtension.h
@@ -23,19 +23,17 @@
 #ifndef TECHDRAW_COSMETICEXTENSION_H
 #define TECHDRAW_COSMETICEXTENSION_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <App/DocumentObjectExtension.h>
 #include <App/ExtensionPython.h>
 #include <Base/Vector3D.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
+#include "Geometry.h"
 #include "PropertyCenterLineList.h"
 #include "PropertyCosmeticEdgeList.h"
 #include "PropertyCosmeticVertexList.h"
 #include "PropertyGeomFormatList.h"
 
-#include "Geometry.h"
-
 
 namespace TechDraw {
 class DrawViewPart;
diff --git a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp
index 615662150d..01bc8463cc 100644
--- a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp
+++ b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp
@@ -22,17 +22,12 @@
 
 #include "PreCompiled.h"
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
-
 #include "Mod/TechDraw/App/CosmeticExtension.h"
-
 // inclusion of the generated files (generated out of CosmeticExtensionPy.xml)
 #include "CosmeticExtensionPy.h"
 #include "CosmeticExtensionPy.cpp"
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp
index e30dbdf4c9..1d302d4c10 100644
--- a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp
+++ b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp
@@ -20,25 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
 
+#ifndef _PreComp_
 # include <boost/uuid/uuid_io.hpp>
 #endif
 
 #include <Base/Console.h>
+#include <Base/GeometryPyCXX.h>
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
-#include <Base/GeometryPyCXX.h>
-
 
 #include "Cosmetic.h"
 #include "CosmeticVertexPy.h"
 #include "CosmeticVertexPy.cpp"
-
 #include "DrawUtil.h"
 
+
 using namespace TechDraw;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h
index fe4d11f1a2..1ce0484ad7 100644
--- a/src/Mod/TechDraw/App/PreCompiled.h
+++ b/src/Mod/TechDraw/App/PreCompiled.h
@@ -51,16 +51,16 @@
 #ifdef _PreComp_
 
 // standard
+#include <bitset>
+#include <cassert>
+#include <cstdio>
 #include <fstream>
 #include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
 #include <map>
-#include <vector>
 #include <set>
-#include <bitset>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #include <boost/graph/boyer_myrvold_planar_test.hpp>
 #include <boost/graph/is_kuratowski_subgraph.hpp>