diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp
index a4974f0f23..68aa6b8ed8 100644
--- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.cpp
@@ -22,52 +22,30 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-  #include <BRep_Builder.hxx>
-  #include <TopoDS_Compound.hxx>
-  # include <TopoDS_Shape.hxx>
-  # include <TopoDS_Edge.hxx>
-  # include <TopoDS.hxx>
-  # include <BRepAdaptor_Curve.hxx>
-  # include <Precision.hxx>
-
-  # include <QGraphicsScene>
-  # include <QPainter>
-  # include <QPainterPath>
-  # include <QPaintDevice>
-  # include <QSvgGenerator>
-
-  # include <cmath>
+# include <cmath>
+# include <QGraphicsScene>
+# include <QPainterPath>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
 #include <Base/Tools.h>
-#include <Base/UnitsApi.h>
-#include <Gui/Command.h>
 
-#include <Mod/Part/App/PartFeature.h>
-
-#include <Mod/TechDraw/App/DrawWeldSymbol.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
 #include <Mod/TechDraw/App/DrawTile.h>
 #include <Mod/TechDraw/App/DrawTileWeld.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/Geometry.h>
-//#include <Mod/TechDraw/App/Preferences.h>
-
-#include "ZVALUE.h"
-#include "PreferencesGui.h"
-#include "ViewProviderWeld.h"
-#include "QGIPrimPath.h"
-#include "QGITile.h"
-#include "QGILeaderLine.h"
-#include "QGIVertex.h"
-#include "QGCustomText.h"
+#include <Mod/TechDraw/App/DrawWeldSymbol.h>
 
 #include "QGIWeldSymbol.h"
+#include "PreferencesGui.h"
+#include "QGCustomText.h"
+#include "QGILeaderLine.h"
+#include "QGIPrimPath.h"
+#include "QGITile.h"
+#include "QGIVertex.h"
+
+#include "ViewProviderWeld.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDraw;
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGMText.cpp b/src/Mod/TechDraw/Gui/QGMText.cpp
index 3e6dba60e9..dea98e9a01 100644
--- a/src/Mod/TechDraw/Gui/QGMText.cpp
+++ b/src/Mod/TechDraw/Gui/QGMText.cpp
@@ -22,9 +22,9 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QGraphicsScene>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
+# include <QGraphicsScene>
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
 #endif
 
 #include "QGMText.h"
diff --git a/src/Mod/TechDraw/Gui/QGMText.h b/src/Mod/TechDraw/Gui/QGMText.h
index 86fd62fb54..1e42aed927 100644
--- a/src/Mod/TechDraw/Gui/QGMText.h
+++ b/src/Mod/TechDraw/Gui/QGMText.h
@@ -28,10 +28,9 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <QObject>
-
 #include "QGCustomText.h"
 
+
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QStyleOptionGraphicsItem;
diff --git a/src/Mod/TechDraw/Gui/QGSPage.cpp b/src/Mod/TechDraw/Gui/QGSPage.cpp
index 67b048a7d2..8d6508181e 100644
--- a/src/Mod/TechDraw/Gui/QGSPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGSPage.cpp
@@ -22,43 +22,23 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAction>
-# include <QApplication>
-# include <QContextMenuEvent>
-# include <QFileInfo>
-# include <QFileDialog>
-# include <QGLWidget>
-# include <QGraphicsEffect>
-# include <QMouseEvent>
+# include <cmath>
+
+# include <QDomDocument>
+# include <QFile>
 # include <QPainter>
-# include <QPaintEvent>
 # include <QSvgGenerator>
-#include <QScrollBar>
-# include <QWheelEvent>
-#include <QTemporaryFile>
-#include <QDomDocument>
-#include <QTextStream>
-#include <QFile>
-#include <QLabel>
-#include <cmath>
+# include <QTemporaryFile>
+# include <QTextStream>
 #endif
 
 #include <App/Application.h>
 #include <App/Document.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
-#include <Base/Stream.h>
-#include <Gui/FileDialog.h>
-#include <Gui/Selection.h>
-#include <Gui/WaitCursor.h>
 #include <Gui/Command.h>
-#include <Gui/Application.h>
 #include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+#include <Gui/Selection.h>
 
 #include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
@@ -68,14 +48,11 @@
 #include <Mod/TechDraw/App/DrawRichAnno.h>
 #include <Mod/TechDraw/App/DrawSVGTemplate.h>
 #include <Mod/TechDraw/App/DrawTemplate.h>
-#include <Mod/TechDraw/App/DrawTile.h>
-#include <Mod/TechDraw/App/DrawTileWeld.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 #include <Mod/TechDraw/App/DrawViewAnnotation.h>
 #include <Mod/TechDraw/App/DrawViewBalloon.h>
 #include <Mod/TechDraw/App/DrawViewClip.h>
 #include <Mod/TechDraw/App/DrawViewCollection.h>
-#include <Mod/TechDraw/App/DrawViewDetail.h>
 #include <Mod/TechDraw/App/DrawViewDimension.h>
 #include <Mod/TechDraw/App/DrawViewImage.h>
 #include <Mod/TechDraw/App/DrawViewPart.h>
@@ -83,33 +60,30 @@
 #include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
 #include <Mod/TechDraw/App/DrawViewSymbol.h>
 #include <Mod/TechDraw/App/DrawWeldSymbol.h>
-#include <Mod/TechDraw/App/Geometry.h>
 
-
-#include "Rez.h"
-#include "QGIDrawingTemplate.h"
-#include "QGITemplate.h"
-#include "QGISVGTemplate.h"
-#include "QGIViewCollection.h"
-#include "QGIViewDimension.h"
-#include "QGIViewBalloon.h"
-#include "QGIProjGroup.h"
-#include "QGIViewPart.h"
-#include "QGIViewSection.h"
-#include "QGIViewAnnotation.h"
-#include "QGIViewSymbol.h"
-#include "QGIViewClip.h"
-#include "QGIViewSpreadsheet.h"
-#include "QGIViewImage.h"
-#include "QGILeaderLine.h"
-#include "QGIRichAnno.h"
-#include "QGIWeldSymbol.h"
-
-#include "ZVALUE.h"
-#include "DrawGuiUtil.h"
-#include "ViewProviderPage.h"
 #include "QGSPage.h"
 #include "MDIViewPage.h"
+#include "QGIDrawingTemplate.h"
+#include "QGILeaderLine.h"
+#include "QGIProjGroup.h"
+#include "QGIRichAnno.h"
+#include "QGISVGTemplate.h"
+#include "QGITemplate.h"
+#include "QGIViewAnnotation.h"
+#include "QGIViewBalloon.h"
+#include "QGIViewClip.h"
+#include "QGIViewCollection.h"
+#include "QGIViewDimension.h"
+#include "QGIViewImage.h"
+#include "QGIViewPart.h"
+#include "QGIViewSection.h"
+#include "QGIViewSpreadsheet.h"
+#include "QGIViewSymbol.h"
+#include "QGIWeldSymbol.h"
+#include "Rez.h"
+#include "ViewProviderPage.h"
+#include "ZVALUE.h"
+
 
 // used SVG namespaces
 #define CC_NS_URI "http://creativecommons.org/ns#"
diff --git a/src/Mod/TechDraw/Gui/QGSPage.h b/src/Mod/TechDraw/Gui/QGSPage.h
index 26992733ea..c63c19fbd0 100644
--- a/src/Mod/TechDraw/Gui/QGSPage.h
+++ b/src/Mod/TechDraw/Gui/QGSPage.h
@@ -26,7 +26,7 @@
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <QGraphicsScene>
-#include <QPageLayout>
+
 
 class QTemporaryFile;
 class QLabel;
diff --git a/src/Mod/TechDraw/Gui/QGTracker.cpp b/src/Mod/TechDraw/Gui/QGTracker.cpp
index 6c53c86a35..3684049d19 100644
--- a/src/Mod/TechDraw/Gui/QGTracker.cpp
+++ b/src/Mod/TechDraw/Gui/QGTracker.cpp
@@ -22,34 +22,29 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QGraphicsSceneHoverEvent>
-#include <QEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
-#include <QKeyEvent>
-#include <QTransform>
+# include <cassert>
+# include <limits>
+
+# include <QGraphicsScene>
+# include <QGraphicsSceneHoverEvent>
+# include <QGraphicsView>
+# include <QKeyEvent>
+# include <QPainter>
+# include <QPainterPath>
+# include <QStyleOptionGraphicsItem>
+# include <QTransform>
 #endif
 
-#include <limits>
-
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
-
 #include <Mod/TechDraw/App/DrawUtil.h>
 
+#include "QGTracker.h"
+#include "QGIView.h"
+#include "QGSPage.h"
 #include "Rez.h"
 #include "ZVALUE.h"
-#include "QGSPage.h"
-#include "DrawGuiUtil.h"
-#include "QGIView.h"
-#include "QGTracker.h"
+
 
 using namespace TechDrawGui;