From f2ba030ebb12c0d0a96a9d7aabdc02aa8ba89dda Mon Sep 17 00:00:00 2001
From: Wanderer Fan <wandererfan@gmail.com>
Date: Sat, 13 Aug 2022 14:21:16 -0400
Subject: [PATCH] [TD]remove precompiled from *.h

---
 src/Mod/TechDraw/App/Preferences.cpp          |  2 --
 src/Mod/TechDraw/App/Preferences.h            |  2 ++
 src/Mod/TechDraw/Gui/Command.cpp              |  3 --
 src/Mod/TechDraw/Gui/DlgPageChooser.h         |  5 ++--
 src/Mod/TechDraw/Gui/DlgTemplateField.h       |  5 ++--
 src/Mod/TechDraw/Gui/DrawGuiUtil.h            |  5 ++--
 src/Mod/TechDraw/Gui/MDIViewPage.h            |  5 ++--
 src/Mod/TechDraw/Gui/PreferencesGui.cpp       |  2 ++
 src/Mod/TechDraw/Gui/PreferencesGui.h         |  8 ++---
 src/Mod/TechDraw/Gui/QGCustomBorder.cpp       |  2 +-
 src/Mod/TechDraw/Gui/QGCustomBorder.h         |  5 ++--
 src/Mod/TechDraw/Gui/QGCustomClip.h           |  7 ++---
 src/Mod/TechDraw/Gui/QGCustomImage.h          |  7 ++---
 src/Mod/TechDraw/Gui/QGCustomLabel.cpp        |  2 +-
 src/Mod/TechDraw/Gui/QGCustomLabel.h          |  5 ++--
 src/Mod/TechDraw/Gui/QGCustomRect.cpp         |  2 +-
 src/Mod/TechDraw/Gui/QGCustomRect.h           |  5 ++--
 src/Mod/TechDraw/Gui/QGCustomSvg.h            |  5 ++--
 src/Mod/TechDraw/Gui/QGCustomText.cpp         |  9 +++---
 src/Mod/TechDraw/Gui/QGCustomText.h           |  5 ++--
 src/Mod/TechDraw/Gui/QGDisplayArea.h          |  5 ++--
 src/Mod/TechDraw/Gui/QGEPath.h                |  6 ++--
 src/Mod/TechDraw/Gui/QGICaption.cpp           |  2 +-
 src/Mod/TechDraw/Gui/QGICenterLine.cpp        |  2 +-
 src/Mod/TechDraw/Gui/QGICenterLine.h          |  6 ++--
 src/Mod/TechDraw/Gui/QGIDecoration.h          |  5 ++--
 src/Mod/TechDraw/Gui/QGIFace.h                |  2 ++
 src/Mod/TechDraw/Gui/QGIGhostHighlight.h      |  5 ++--
 src/Mod/TechDraw/Gui/QGIHighlight.h           |  5 ++--
 src/Mod/TechDraw/Gui/QGILeaderLine.h          |  5 ++--
 src/Mod/TechDraw/Gui/QGIMatting.cpp           |  2 +-
 src/Mod/TechDraw/Gui/QGIMatting.h             |  8 ++---
 src/Mod/TechDraw/Gui/QGIPrimPath.h            |  6 ++--
 src/Mod/TechDraw/Gui/QGIProjGroup.h           |  7 ++---
 src/Mod/TechDraw/Gui/QGIRichAnno.h            |  5 ++--
 src/Mod/TechDraw/Gui/QGISectionLine.cpp       |  9 +++---
 src/Mod/TechDraw/Gui/QGISectionLine.h         | 12 ++++----
 src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp    |  7 ++---
 src/Mod/TechDraw/Gui/QGIViewBalloon.h         |  5 ++--
 src/Mod/TechDraw/Gui/QGIViewDimension.h       |  7 ++---
 src/Mod/TechDraw/Gui/QGIViewPart.h            |  6 ++--
 src/Mod/TechDraw/Gui/QGIViewSymbol.h          |  5 ++--
 src/Mod/TechDraw/Gui/QGIWeldSymbol.h          |  5 ++--
 src/Mod/TechDraw/Gui/QGMText.h                |  6 +---
 src/Mod/TechDraw/Gui/QGVNavStyle.h            |  7 ++---
 src/Mod/TechDraw/Gui/QGVPage.cpp              | 29 ++++++++++---------
 src/Mod/TechDraw/Gui/QGVPage.h                |  8 ++---
 src/Mod/TechDraw/Gui/Rez.cpp                  |  4 +++
 src/Mod/TechDraw/Gui/Rez.h                    |  5 ++--
 src/Mod/TechDraw/Gui/SymbolChooser.h          |  5 ++--
 src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp     |  2 --
 src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp  |  9 +++---
 src/Mod/TechDraw/Gui/TaskProjGroup.h          |  5 ++--
 src/Mod/TechDraw/Gui/TaskProjection.h         |  3 --
 .../TechDraw/Gui/TaskSurfaceFinishSymbols.cpp |  3 +-
 src/Mod/TechDraw/Gui/TemplateTextField.h      |  3 --
 src/Mod/TechDraw/Gui/ViewProviderPage.h       |  6 +---
 src/Mod/TechDraw/Gui/mrichtextedit.cpp        |  3 ++
 src/Mod/TechDraw/Gui/mrichtextedit.h          |  3 --
 src/Mod/TechDraw/Gui/mtextedit.cpp            |  3 +-
 src/Mod/TechDraw/Gui/mtextedit.h              |  3 --
 61 files changed, 128 insertions(+), 197 deletions(-)

diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp
index d13d8137bc..9a79c50217 100644
--- a/src/Mod/TechDraw/App/Preferences.cpp
+++ b/src/Mod/TechDraw/App/Preferences.cpp
@@ -25,8 +25,6 @@
 #ifndef _PreComp_
 #include <string>
 #include <QString>
-//#include <QFont>
-//#include <QColor>
 #endif
 
 #include <App/Application.h>
diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h
index c940f18c42..a3c4984d10 100644
--- a/src/Mod/TechDraw/App/Preferences.h
+++ b/src/Mod/TechDraw/App/Preferences.h
@@ -23,6 +23,8 @@
 #ifndef _Preferences_h_
 #define _Preferences_h_
 
+#include <App/Material.h>
+
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <string>
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 33a9280123..5b9d178db0 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -37,9 +37,6 @@
 #include <vector>
 #endif
 
-
-
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.h b/src/Mod/TechDraw/Gui/DlgPageChooser.h
index d4bb5c2631..f3db38a431 100644
--- a/src/Mod/TechDraw/Gui/DlgPageChooser.h
+++ b/src/Mod/TechDraw/Gui/DlgPageChooser.h
@@ -22,10 +22,9 @@
 #ifndef GUI_DLGPAGECHOOSER_H
 #define GUI_DLGPAGECHOOSER_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QDialog>
-#endif
 
 namespace TechDrawGui {
 
diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h
index 38e17a5429..152da482c2 100644
--- a/src/Mod/TechDraw/Gui/DlgTemplateField.h
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h
@@ -24,12 +24,11 @@
 #ifndef DRAWINGGUI_DLGTEMPLATEFIELD_H
 #define DRAWINGGUI_DLGTEMPLATEFIELD_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QDialog>
 #include <QString>
 #include <memory>
-#endif
 
 namespace TechDrawGui {
 
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.h b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
index 71db3a516a..6704d56473 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -23,11 +23,10 @@
 #ifndef _DrawGuiUtil_h_
 #define _DrawGuiUtil_h_
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <string>
 #include <QCoreApplication>
-#endif
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index d2fd59ddf0..33da9a0c98 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -23,11 +23,10 @@
 #ifndef TECHDRAWGUI_MDIVIEWPAGE_H
 #define TECHDRAWGUI_MDIVIEWPAGE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QPointF>
 #include <QPrinter>
-#endif
 
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.cpp b/src/Mod/TechDraw/Gui/PreferencesGui.cpp
index dfcbe76d0e..48b281653a 100644
--- a/src/Mod/TechDraw/Gui/PreferencesGui.cpp
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.cpp
@@ -37,6 +37,8 @@
 #include <Base/Parameter.h>
 #include <Base/Vector3D.h>
 
+#include <Mod/TechDraw/App/Preferences.h>
+
 #include "Rez.h"
 #include "PreferencesGui.h"
 
diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.h b/src/Mod/TechDraw/Gui/PreferencesGui.h
index f7f594c2bf..3da59ca9e7 100644
--- a/src/Mod/TechDraw/Gui/PreferencesGui.h
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.h
@@ -23,16 +23,12 @@
 #ifndef _PreferencesGui_h_
 #define _PreferencesGui_h_
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#include <QColor>
-#endif
-
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
+#include <QColor>
+
 class QFont;
 class QString;
-class QColor;
 
 #include <Mod/TechDraw/App/Preferences.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
index 1ab5aa7553..c9fabd025b 100644
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
+#include <qmath.h>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRectF>
@@ -36,7 +37,6 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include <qmath.h>
 #include "QGCustomBorder.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.h b/src/Mod/TechDraw/Gui/QGCustomBorder.h
index c1250d0d1f..103bcb1a8a 100644
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.h
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_QGCUSTOMBORDER_H
 #define DRAWINGGUI_QGCUSTOMBORDER_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QGraphicsRectItem>
 #include <QPointF>
-#endif
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.h b/src/Mod/TechDraw/Gui/QGCustomClip.h
index 124dd7a3f8..230540132f 100644
--- a/src/Mod/TechDraw/Gui/QGCustomClip.h
+++ b/src/Mod/TechDraw/Gui/QGCustomClip.h
@@ -23,14 +23,11 @@
 #ifndef DRAWINGGUI_QGCUSTOMCLIP_H
 #define DRAWINGGUI_QGCUSTOMCLIP_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QPointF>
 #include <QRectF>
-#endif
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h
index e9ad50e97e..737a444477 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.h
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.h
@@ -23,17 +23,14 @@
 #ifndef DRAWINGGUI_QGCUSTOMIMAGE_H
 #define DRAWINGGUI_QGCUSTOMIMAGE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsPixmapItem>
 #include <QPointF>
 #include <QSize>
 #include <QPixmap>
-#endif
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
index 5acfa3c741..a720213023 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
+#include <qmath.h>
 #include <QMouseEvent>
 #include <QPaintDevice>
 #include <QPainter>
@@ -39,7 +40,6 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include <qmath.h>
 #include "Rez.h"
 #include "QGCustomLabel.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.h b/src/Mod/TechDraw/Gui/QGCustomLabel.h
index de6f9b1d4c..fb8a2e0512 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.h
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_QGCUSTOMLABEL_H
 #define DRAWINGGUI_QGCUSTOMLABEL_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QGraphicsTextItem>
 #include <QPointF>
-#endif
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.cpp b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
index 346df4ff6a..0de4c724cd 100644
--- a/src/Mod/TechDraw/Gui/QGCustomRect.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
+#include <qmath.h>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRectF>
@@ -36,7 +37,6 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include <qmath.h>
 #include "QGCustomRect.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.h b/src/Mod/TechDraw/Gui/QGCustomRect.h
index 8a81e5fa7a..866cf509e3 100644
--- a/src/Mod/TechDraw/Gui/QGCustomRect.h
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_QGCUSTOMRECT_H
 #define DRAWINGGUI_QGCUSTOMRECT_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QGraphicsRectItem>
 #include <QPointF>
-#endif
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.h b/src/Mod/TechDraw/Gui/QGCustomSvg.h
index 758d39ac59..bdeb34e23e 100644
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.h
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.h
@@ -23,14 +23,13 @@
 #ifndef DRAWINGGUI_QGCUSTOMSVG_H
 #define DRAWINGGUI_QGCUSTOMSVG_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QPointF>
 #include <QSvgRenderer>
-#endif
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGCustomText.cpp b/src/Mod/TechDraw/Gui/QGCustomText.cpp
index 5273848df6..5831a12cb6 100644
--- a/src/Mod/TechDraw/Gui/QGCustomText.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
+#include <qmath.h>
 #include <QMouseEvent>
 #include <QPaintDevice>
 #include <QPainter>
@@ -39,13 +40,13 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include <qmath.h>
-#include "Rez.h"
-#include "ZVALUE.h"
 #include "DrawGuiUtil.h"
+#include "PreferencesGui.h"
 #include "QGICMark.h"
 #include "QGIView.h"
-#include "PreferencesGui.h"
+#include "Rez.h"
+#include "ZVALUE.h"
+
 #include "QGCustomText.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomText.h b/src/Mod/TechDraw/Gui/QGCustomText.h
index 722790665e..804d6ead43 100644
--- a/src/Mod/TechDraw/Gui/QGCustomText.h
+++ b/src/Mod/TechDraw/Gui/QGCustomText.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_QGCUSTOMTEXT_H
 #define DRAWINGGUI_QGCUSTOMTEXT_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QGraphicsTextItem>
 #include <QPointF>
-#endif
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.h b/src/Mod/TechDraw/Gui/QGDisplayArea.h
index 3fab612aa5..3acd564d71 100644
--- a/src/Mod/TechDraw/Gui/QGDisplayArea.h
+++ b/src/Mod/TechDraw/Gui/QGDisplayArea.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_QGDISPLAYAREA_H
 #define DRAWINGGUI_QGDISPLAYAREA_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QPointF>
 #include <QRectF>
-#endif
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGEPath.h b/src/Mod/TechDraw/Gui/QGEPath.h
index 71759e8217..288c026ceb 100644
--- a/src/Mod/TechDraw/Gui/QGEPath.h
+++ b/src/Mod/TechDraw/Gui/QGEPath.h
@@ -23,17 +23,15 @@
 #ifndef TECHDRAWGUI_EDITABLEPATH_H
 #define TECHDRAWGUI_EDITABLEPATH_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
 #include <QObject>
-#endif
 
 #include "QGIPrimPath.h"
 #include "QGIVertex.h"
 
-
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/QGICaption.cpp b/src/Mod/TechDraw/Gui/QGICaption.cpp
index c7b0392e4d..e6451e1bfe 100644
--- a/src/Mod/TechDraw/Gui/QGICaption.cpp
+++ b/src/Mod/TechDraw/Gui/QGICaption.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
+#include <qmath.h>
 #include <QMouseEvent>
 #include <QPaintDevice>
 #include <QPainter>
@@ -39,7 +40,6 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include <qmath.h>
 #include "QGICaption.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.cpp b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
index 80c541d741..e19986a26d 100644
--- a/src/Mod/TechDraw/Gui/QGICenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
@@ -28,13 +28,13 @@
 #include <QStyleOptionGraphicsItem>
 #endif
 
-
 #include <App/Application.h>
 #include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
 #include "PreferencesGui.h"
+
 #include "QGICenterLine.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.h b/src/Mod/TechDraw/Gui/QGICenterLine.h
index 692b2a8518..052cef956a 100644
--- a/src/Mod/TechDraw/Gui/QGICenterLine.h
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.h
@@ -23,15 +23,13 @@
 #ifndef TECHDRAWGUI_QGICENTERLINE_H
 #define TECHDRAWGUI_QGICENTERLINE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QPointF>
-#endif
 
 #include "QGIDecoration.h"
 
-
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.h b/src/Mod/TechDraw/Gui/QGIDecoration.h
index 64d57e6ad8..a32228b494 100644
--- a/src/Mod/TechDraw/Gui/QGIDecoration.h
+++ b/src/Mod/TechDraw/Gui/QGIDecoration.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_QGIDECORATION_H
 #define DRAWINGGUI_QGIDECORATION_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QBrush>
 #include <QGraphicsItemGroup>
 #include <QPen>
-#endif
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h
index 4c1e7c3ce9..438cfc28b4 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.h
+++ b/src/Mod/TechDraw/Gui/QGIFace.h
@@ -23,6 +23,8 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMFACE_H
 #define DRAWINGGUI_QGRAPHICSITEMFACE_H
 
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <Qt>
diff --git a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
index 410c85cebf..9c37a6a388 100644
--- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
@@ -23,12 +23,11 @@
 #ifndef TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H
 #define TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsScene>
 #include <QObject>
 #include <QPointF>
-#endif
 
 #include "QGIHighlight.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.h b/src/Mod/TechDraw/Gui/QGIHighlight.h
index c8bc58b26a..750093c220 100644
--- a/src/Mod/TechDraw/Gui/QGIHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIHighlight.h
@@ -23,14 +23,13 @@
 #ifndef TECHDRAWGUI_QGIHIGHLIGHT_H
 #define TECHDRAWGUI_QGIHIGHLIGHT_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QFont>
 #include <QGraphicsEllipseItem>
 #include <QGraphicsScene>
 #include <QPointF>
-#endif
 
 #include "QGIArrow.h"
 #include "QGCustomText.h"
diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h
index c769575b72..ac45b19140 100644
--- a/src/Mod/TechDraw/Gui/QGILeaderLine.h
+++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h
@@ -23,15 +23,14 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H
 #define DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPainterPath>
 #include <QPointF>
 #include <QStyleOptionGraphicsItem>
-#endif
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIMatting.cpp b/src/Mod/TechDraw/Gui/QGIMatting.cpp
index 4af86a693b..c462168838 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.cpp
+++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <cassert>
+#include <qmath.h>
 #include <QPainter>
 #include <QPainterPath>
 #include <QRectF>
@@ -34,7 +35,6 @@
 #include <Base/Console.h>
 #include <Base/Parameter.h>
 
-#include <qmath.h>
 #include "PreferencesGui.h"
 #include "QGCustomRect.h"
 #include "ZVALUE.h"
diff --git a/src/Mod/TechDraw/Gui/QGIMatting.h b/src/Mod/TechDraw/Gui/QGIMatting.h
index 851dc12bb5..ab031a7a15 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.h
+++ b/src/Mod/TechDraw/Gui/QGIMatting.h
@@ -23,15 +23,11 @@
 #ifndef DRAWINGGUI_QGIMATTING_H
 #define DRAWINGGUI_QGIMATTING_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
 #include <QGraphicsItemGroup>
 #include <QGraphicsPathItem>
-#endif
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h
index 29ff51fb7d..ce3e3cc2aa 100644
--- a/src/Mod/TechDraw/Gui/QGIPrimPath.h
+++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h
@@ -23,13 +23,11 @@
 #ifndef DRAWINGGUI_QGIPRIMPATH_H
 #define DRAWINGGUI_QGIPRIMPATH_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItem>
-#endif
 
 #include <Base/Parameter.h>
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h
index cdd7854ea5..eed8917d35 100644
--- a/src/Mod/TechDraw/Gui/QGIProjGroup.h
+++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h
@@ -23,14 +23,11 @@
 #ifndef DRAWINGGUI_QGIProjGroup_H
 #define DRAWINGGUI_QGIProjGroup_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QObject>
-#endif
-
 #include "QGIViewCollection.h"
 
-
 QT_BEGIN_NAMESPACE
 class QGraphicsScene;
 class QGraphicsSceneMouseEvent;
diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h
index a307912b75..aab1710e24 100644
--- a/src/Mod/TechDraw/Gui/QGIRichAnno.h
+++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h
@@ -23,15 +23,14 @@
 #ifndef TECHDRAWGUI_QGIRICHANNO_H
 #define TECHDRAWGUI_QGIRICHANNO_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QFont>
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPainterPath>
 #include <QPen>
 #include <QStyleOptionGraphicsItem>
-#endif
 
 
 namespace TechDraw {
diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.cpp b/src/Mod/TechDraw/Gui/QGISectionLine.cpp
index 205bed5824..04d62ee0e3 100644
--- a/src/Mod/TechDraw/Gui/QGISectionLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <qmath.h>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPainterPathStroker>
@@ -36,11 +37,11 @@
 //#include <Mod/TechDraw/App/Preferences.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 
-#include <qmath.h>
-#include "Rez.h"
-#include "PreferencesGui.h"
-#include "QGIView.h"
+#include "QGIArrow.h"
 #include "QGISectionLine.h"
+#include "QGIView.h"
+#include "PreferencesGui.h"
+#include "Rez.h"
 
 #define ANSISTANDARD 0
 #define ISOSTANDARD 1
diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.h b/src/Mod/TechDraw/Gui/QGISectionLine.h
index a557955a81..31eaed6337 100644
--- a/src/Mod/TechDraw/Gui/QGISectionLine.h
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.h
@@ -23,25 +23,23 @@
 #ifndef TECHDRAWGUI_QGISECTIONLINE_H
 #define TECHDRAWGUI_QGISECTIONLINE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#include <QGraphicsItemGroup>
-#include <QObject>
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QFont>
 #include <QPointF>
-#endif
 
 #include <Base/Vector3D.h>
 
 #include "QGCustomText.h"
-#include "QGIArrow.h"
 #include "QGIDecoration.h"
 
-
 namespace TechDrawGui
 {
 
+class QGIArrow;
+class QGCustomText;
+
 class TechDrawGuiExport QGISectionLine : public QGIDecoration
 {
 public:
diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
index ac55bd1582..471b1826c6 100644
--- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
@@ -24,8 +24,11 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <cmath>
+#include <string>
+#include <sstream>
 #include <QDialogButtonBox>
 #include <QGraphicsScene>
+#include <qmath.h>
 #include <QMouseEvent>
 #include <QGraphicsSceneHoverEvent>
 #include <QGraphicsItem>
@@ -36,7 +39,6 @@
 #include <QString>
 #include <QTextOption>
 #include <QVBoxLayout>
-#include <string>
 #include <QTextDocument>
 #include <QTextBlock>
 #include <QTextBlockFormat>
@@ -44,11 +46,8 @@
 #include <QSizeF>
 #endif
 
-#include <sstream>
 #include <regex>
 
-#include <qmath.h>
-
 #include <App/Application.h>
 #include <App/Material.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
index 58e8313784..36c16fd69f 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
@@ -24,15 +24,14 @@
 #ifndef TECHDRAWGUI_QGIVBALLOON_H
 #define TECHDRAWGUI_QGIVBALLOON_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QGraphicsObject>
 #include <QObject>
 #include <QStyleOptionGraphicsItem>
-#endif
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h
index 08b6bea2fb..396052f4e8 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.h
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h
@@ -23,16 +23,13 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QGraphicsObject>
 #include <QStyleOptionGraphicsItem>
-#endif
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h
index 491aae7fea..fb944d0337 100644
--- a/src/Mod/TechDraw/Gui/QGIViewPart.h
+++ b/src/Mod/TechDraw/Gui/QGIViewPart.h
@@ -23,12 +23,10 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWPART_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWPART_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
-#endif
-
 #include <Mod/TechDraw/App/Geometry.h>
 
 #include "QGIView.h"
diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h
index 114538c3e1..5283868220 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h
+++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h
@@ -24,10 +24,9 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QByteArray>
-#endif
 
 #include "QGIView.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
index 6af398c52e..b2fdb2df9f 100644
--- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
+++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
@@ -23,15 +23,14 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H
 #define DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QColor>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QPainterPath>
 #include <QPointF>
 #include <QStyleOptionGraphicsItem>
-#endif
 
 #include "QGIView.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGMText.h b/src/Mod/TechDraw/Gui/QGMText.h
index 572de677f7..83c9194079 100644
--- a/src/Mod/TechDraw/Gui/QGMText.h
+++ b/src/Mod/TechDraw/Gui/QGMText.h
@@ -26,14 +26,10 @@
 #ifndef TECHDRAWGUI_MOVABLETEXT_H
 #define TECHDRAWGUI_MOVABLETEXT_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#include <QObject>
-#endif
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "QGCustomText.h"
 
-
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QStyleOptionGraphicsItem;
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.h b/src/Mod/TechDraw/Gui/QGVNavStyle.h
index 69d757139e..de92ad3852 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyle.h
+++ b/src/Mod/TechDraw/Gui/QGVNavStyle.h
@@ -24,13 +24,10 @@
 #ifndef TECHDRAW_NAVIGATIONSTYLE_H
 #define TECHDRAW_NAVIGATIONSTYLE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QCursor>
 #include <QPoint>
-#endif
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 class QEvent;
 class QFocusEvent;
diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp
index 3e13ae313d..3af7be5d29 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -22,27 +22,28 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QAction>
-# include <QApplication>
-# include <QBitmap>
-# include <QContextMenuEvent>
-# include <QFileInfo>
-# include <QFileDialog>
-# include <QGLWidget>
-# include <QGraphicsEffect>
-# include <QMouseEvent>
-# include <QPainter>
-# include <QPaintEvent>
-# include <QSvgGenerator>
+#include <cmath>
+
+#include <QAction>
+#include <QApplication>
+#include <QBitmap>
+#include <QContextMenuEvent>
+#include <QFileInfo>
+#include <QFileDialog>
+#include <QGLWidget>
+#include <QGraphicsEffect>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QSvgGenerator>
 #include <QScrollBar>
-# include <QWheelEvent>
+#include <QWheelEvent>
 #include <QTemporaryFile>
 #include <QDomDocument>
 #include <QTextStream>
 #include <QFile>
 #include <QLabel>
 #include <QTextCodec>
-#include <cmath>
 #endif
 
 #include <App/Application.h>
diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h
index 65ef86ce99..8692355b93 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.h
+++ b/src/Mod/TechDraw/Gui/QGVPage.h
@@ -23,16 +23,12 @@
 #ifndef TECHDRAWGUI_QGVIEW_H
 #define TECHDRAWGUI_QGVIEW_H
 
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <memory>
 #include <QGraphicsView>
 #include <QLabel>
 #include <QPainterPath>
-#endif
-
-#include <memory>
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <Base/Type.h>
 
diff --git a/src/Mod/TechDraw/Gui/Rez.cpp b/src/Mod/TechDraw/Gui/Rez.cpp
index 32d5a7b2c2..21ab1eb63f 100644
--- a/src/Mod/TechDraw/Gui/Rez.cpp
+++ b/src/Mod/TechDraw/Gui/Rez.cpp
@@ -21,6 +21,10 @@
  ***************************************************************************/
 #include "PreCompiled.h"
 
+#ifndef _PreComp_
+
+#endif
+
 #include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/Rez.h b/src/Mod/TechDraw/Gui/Rez.h
index b9911dde76..e09e6e4e67 100644
--- a/src/Mod/TechDraw/Gui/Rez.h
+++ b/src/Mod/TechDraw/Gui/Rez.h
@@ -23,12 +23,11 @@
 #ifndef DRAWINGGUI_REZ_H
 #define DRAWINGGUI_REZ_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QPointF>
 #include <QRectF>
 #include <QSize>
-#endif
 
 #include <Base/Tools2D.h>
 #include <Base/Vector3D.h>
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h
index 4a1021a2a8..c8dddfab66 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.h
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.h
@@ -22,10 +22,9 @@
 #ifndef TECHDRAWGUI_SYMBOLCHOOSER_H
 #define TECHDRAWGUI_SYMBOLCHOOSER_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QDialog>
-#endif
 
 class QListWidgetItem;
 
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
index 589a455375..008e28b1bd 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
@@ -28,12 +28,10 @@
 #include <Bnd_Box.hxx>
 #include <QButtonGroup>
 #include <QStatusBar>
-#include <QGraphicsScene>
 #endif
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 
-
 #include <Base/Console.h>
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
index caeed64cd9..42c0bd7614 100644
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
@@ -25,14 +25,13 @@
 #ifndef _PreComp_
 #include <cmath>
 #include <BRepBndLib.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
 #include <Bnd_Box.hxx>
 #include <QButtonGroup>
 #include <QStatusBar>
 #include <QGraphicsScene>
 #endif
 
-#include <BRepBuilderAPI_MakeEdge.hxx>
-
 #include <Base/Console.h>
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
@@ -49,9 +48,9 @@
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 
-# include <Mod/TechDraw/App/DrawViewDimension.h>
-# include <Mod/TechDraw/App/DrawViewBalloon.h>
-# include <Mod/TechDraw/Gui/ui_TaskCustomizeFormat.h>
+#include <Mod/TechDraw/App/DrawViewDimension.h>
+#include <Mod/TechDraw/App/DrawViewBalloon.h>
+#include <Mod/TechDraw/Gui/ui_TaskCustomizeFormat.h>
 
 #include "PreferencesGui.h"
 #include "QGVPage.h"
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h
index 81172cd9d8..7fd47dc314 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.h
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h
@@ -24,10 +24,9 @@
 #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H
 #define GUI_TASKVIEW_TASKVIEWGROUP_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QString>
-#endif
 
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
diff --git a/src/Mod/TechDraw/Gui/TaskProjection.h b/src/Mod/TechDraw/Gui/TaskProjection.h
index a0ddd1190c..9b47c77ded 100644
--- a/src/Mod/TechDraw/Gui/TaskProjection.h
+++ b/src/Mod/TechDraw/Gui/TaskProjection.h
@@ -26,10 +26,7 @@
 #ifndef TECHDRAWGUI_TASKDIALOG
 #define TECHDRAWGUI_TASKDIALOG
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QWidget>
-#endif
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
index 4ad46c0627..78d8cdb0cc 100644
--- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
@@ -22,7 +22,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QGraphicsScene>
 #include <QLineEdit>
 #include <QGraphicsProxyWidget>
 #include <QComboBox>
@@ -32,8 +31,10 @@
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
+
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/Gui/ui_TaskSurfaceFinishSymbols.h>
+
 #include "TaskSurfaceFinishSymbols.h"
 
 using namespace Gui;
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h
index 46224c57c8..24960ba67b 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.h
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.h
@@ -23,10 +23,7 @@
 #ifndef DRAWINGGUI_TEMPLATETEXTFIELD_H
 #define DRAWINGGUI_TEMPLATETEXTFIELD_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QGraphicsRectItem>
-#endif
 
 namespace TechDraw {
 class DrawTemplate;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h
index 721e8b4867..7e36b632a9 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h
@@ -24,14 +24,10 @@
 #ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H
 #define DRAWINGGUI_VIEWPROVIDERPAGE_H
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
-#include <QPointer>
-#endif
-
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <boost_signals2.hpp>
+#include <QPointer>
 
 #include <App/PropertyUnits.h>
 #include <Gui/ViewProviderDocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
index 8c4271c919..45bf671cae 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
@@ -54,7 +54,10 @@
 #include <Base/Tools.h>
 #include <Gui/FileDialog.h>
 
+#include <Mod/TechDraw/App/Preferences.h>
+
 #include <App/Application.h>
+
 #include "PreferencesGui.h"
 #include "mrichtextedit.h"
 
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.h b/src/Mod/TechDraw/Gui/mrichtextedit.h
index fed345bc96..79095f1a74 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.h
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.h
@@ -29,10 +29,7 @@
 #ifndef _MRICHTEXTEDIT_H_
 #define _MRICHTEXTEDIT_H_
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QPointer>
-#endif
 
 #include "ui_mrichtextedit.h"
 
diff --git a/src/Mod/TechDraw/Gui/mtextedit.cpp b/src/Mod/TechDraw/Gui/mtextedit.cpp
index dab9e1744e..a94e0beae3 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mtextedit.cpp
@@ -24,6 +24,8 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <cstdlib>
+
 #include <QTextDocument>
 #include <QTextCursor>
 #include <QImage>
@@ -32,7 +34,6 @@
 #endif
 
 #include "mtextedit.h"
-#include <cstdlib>
 
 
 MTextEdit::MTextEdit(QWidget *parent) : QTextEdit(parent) {
diff --git a/src/Mod/TechDraw/Gui/mtextedit.h b/src/Mod/TechDraw/Gui/mtextedit.h
index 9a31661321..0a2fd2becb 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.h
+++ b/src/Mod/TechDraw/Gui/mtextedit.h
@@ -23,12 +23,9 @@
 #ifndef _MTEXTEDIT_H_
 #define _MTEXTEDIT_H_
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <QImage>
 #include <QMimeData>
 #include <QTextEdit>
-#endif
 
 
 class MTextEdit : public QTextEdit {