diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
index b1977733eb..5f9b53df58 100644
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
@@ -22,23 +22,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <qmath.h>
-#include <QMouseEvent>
+# include <cassert>
+
 #include <QPainter>
 #include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include "QGCustomBorder.h"
 
+
 using namespace TechDrawGui;
 
 QGCustomBorder::QGCustomBorder()
diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.cpp b/src/Mod/TechDraw/Gui/QGCustomClip.cpp
index 09eb64f3b2..ae44d90251 100644
--- a/src/Mod/TechDraw/Gui/QGCustomClip.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomClip.cpp
@@ -22,22 +22,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
-#include "ZVALUE.h"
-#include "QGICMark.h"
 #include "QGCustomClip.h"
+#include "QGICMark.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.cpp b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
index ccdb10a01a..d890290cb6 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
@@ -22,17 +22,15 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QPainter>
-#include <QPixmap>
-#include <QRectF>
-#include <QStyleOptionGraphicsItem>
-#include <QtGlobal>
+# include <QPainter>
+# include <QPixmap>
+# include <QRectF>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <Base/Console.h>
-
 #include "QGCustomImage.h"
 
+
 using namespace TechDrawGui;
 
 QGCustomImage::QGCustomImage()
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h
index 737a444477..1f454d244f 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.h
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.h
@@ -25,12 +25,11 @@
 
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsPixmapItem>
+#include <QPixmap>
 #include <QPointF>
 #include <QSize>
-#include <QPixmap>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
index 4b2a1e9043..b74d4ce972 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
@@ -22,27 +22,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <qmath.h>
-#include <QMouseEvent>
-#include <QPaintDevice>
-#include <QPainter>
-#include <QPrinter>
-#include <QRectF>
-#include <QSvgGenerator>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QRectF>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
-#include "Rez.h"
 #include "QGCustomLabel.h"
 
+
 using namespace TechDrawGui;
 
 QGCustomLabel::QGCustomLabel()
diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.h b/src/Mod/TechDraw/Gui/QGCustomLabel.h
index fb8a2e0512..3d429527a3 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.h
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h
@@ -27,7 +27,7 @@
 
 #include <QGraphicsItem>
 #include <QGraphicsTextItem>
-#include <QPointF>
+
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.cpp b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
index 759c1f922e..43e0846d7c 100644
--- a/src/Mod/TechDraw/Gui/QGCustomRect.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
@@ -22,23 +22,16 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <qmath.h>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QRectF>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QRectF>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include "QGCustomRect.h"
 
+
 using namespace TechDrawGui;
 
 QGCustomRect::QGCustomRect()
diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
index 8b4dc0df5c..952933aee7 100644
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
@@ -22,15 +22,14 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QPainter>
-#include <QRectF>
-#include <QStyleOptionGraphicsItem>
+# include <QPainter>
+# include <QRectF>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <Base/Console.h>
-
 #include "QGCustomSvg.h"
 
+
 using namespace TechDrawGui;
 
 QGCustomSvg::QGCustomSvg()
diff --git a/src/Mod/TechDraw/Gui/QGCustomText.cpp b/src/Mod/TechDraw/Gui/QGCustomText.cpp
index 6daa708265..0ecc7674b9 100644
--- a/src/Mod/TechDraw/Gui/QGCustomText.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp
@@ -22,32 +22,23 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <qmath.h>
-#include <QMouseEvent>
-#include <QPaintDevice>
-#include <QPainter>
-#include <QPrinter>
-#include <QRectF>
-#include <QSvgGenerator>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QGraphicsSceneHoverEvent>
+# include <QPainter>
+# include <QRectF>
+# include <QStyleOptionGraphicsItem>
 #endif
 
 #include <App/Application.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include "DrawGuiUtil.h"
+#include "QGCustomText.h"
 #include "PreferencesGui.h"
 #include "QGICMark.h"
-#include "QGIView.h"
-#include "Rez.h"
 #include "ZVALUE.h"
 
-#include "QGCustomText.h"
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.cpp b/src/Mod/TechDraw/Gui/QGDisplayArea.cpp
index 16dd152f3d..0ab5fe59e9 100644
--- a/src/Mod/TechDraw/Gui/QGDisplayArea.cpp
+++ b/src/Mod/TechDraw/Gui/QGDisplayArea.cpp
@@ -22,21 +22,15 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cassert>
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
+# include <cassert>
+
+# include <QPainter>
+# include <QStyleOptionGraphicsItem>
 #endif
 
-#include <App/Application.h>
-#include <App/Material.h>
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include "QGDisplayArea.h"
 
+
 using namespace TechDrawGui;
 
 QGDisplayArea::QGDisplayArea()
diff --git a/src/Mod/TechDraw/Gui/QGEPath.cpp b/src/Mod/TechDraw/Gui/QGEPath.cpp
index 7c5cd739ce..a7147835d2 100644
--- a/src/Mod/TechDraw/Gui/QGEPath.cpp
+++ b/src/Mod/TechDraw/Gui/QGEPath.cpp
@@ -22,32 +22,26 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QGraphicsScene>
-#include <QGraphicsSceneHoverEvent>
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPainterPathStroker>
-#include <QStyleOptionGraphicsItem>
-#include <QVector2D>
+# include <QGraphicsScene>
+# include <QGraphicsSceneHoverEvent>
+# include <QKeyEvent>
+# include <QPainterPath>
+# include <QPainterPathStroker>
 #endif
 
-#include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Parameter.h>
-
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 
+#include "QGEPath.h"
 #include "PreferencesGui.h"
-#include "Rez.h"
-#include "ZVALUE.h"
+#include "QGILeaderLine.h"
 #include "QGIPrimPath.h"
 #include "QGIVertex.h"
 #include "QGIView.h"
-#include "QGILeaderLine.h"
-#include "QGEPath.h"
+#include "Rez.h"
+#include "ZVALUE.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;