From aa9a667506ae927e7a6d45bec2599f6fed4d009f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Fri, 5 Aug 2022 00:06:56 +0200
Subject: [PATCH] [TechDraw] Clean up precompile in Gui

---
 src/Mod/TechDraw/Gui/Command.cpp              | 26 +++++++++----------
 src/Mod/TechDraw/Gui/CommandCreateDims.cpp    |  2 +-
 src/Mod/TechDraw/Gui/CommandDecorate.cpp      |  2 +-
 src/Mod/TechDraw/Gui/DlgPageChooser.h         |  3 +++
 src/Mod/TechDraw/Gui/DlgTemplateField.h       |  3 +++
 src/Mod/TechDraw/Gui/DrawGuiUtil.h            |  3 +++
 src/Mod/TechDraw/Gui/MDIViewPage.cpp          |  2 +-
 src/Mod/TechDraw/Gui/MDIViewPage.h            |  3 +++
 src/Mod/TechDraw/Gui/PreCompiled.h            |  5 +++-
 src/Mod/TechDraw/Gui/PreferencesGui.h         |  6 ++++-
 src/Mod/TechDraw/Gui/QGCustomBorder.cpp       |  2 +-
 src/Mod/TechDraw/Gui/QGCustomBorder.h         |  3 +++
 src/Mod/TechDraw/Gui/QGCustomClip.h           |  7 +++--
 src/Mod/TechDraw/Gui/QGCustomImage.cpp        |  5 ++--
 src/Mod/TechDraw/Gui/QGCustomImage.h          |  7 +++--
 src/Mod/TechDraw/Gui/QGCustomLabel.cpp        |  2 +-
 src/Mod/TechDraw/Gui/QGCustomLabel.h          |  3 +++
 src/Mod/TechDraw/Gui/QGCustomRect.cpp         |  2 +-
 src/Mod/TechDraw/Gui/QGCustomRect.h           |  3 +++
 src/Mod/TechDraw/Gui/QGCustomSvg.cpp          |  2 +-
 src/Mod/TechDraw/Gui/QGCustomSvg.h            |  3 +++
 src/Mod/TechDraw/Gui/QGCustomText.cpp         |  2 +-
 src/Mod/TechDraw/Gui/QGCustomText.h           |  3 +++
 src/Mod/TechDraw/Gui/QGDisplayArea.h          |  3 +++
 src/Mod/TechDraw/Gui/QGEPath.h                |  3 +++
 src/Mod/TechDraw/Gui/QGICaption.cpp           |  2 +-
 src/Mod/TechDraw/Gui/QGICenterLine.cpp        |  2 +-
 src/Mod/TechDraw/Gui/QGICenterLine.h          |  3 +++
 src/Mod/TechDraw/Gui/QGIDecoration.h          |  3 +++
 src/Mod/TechDraw/Gui/QGIFace.cpp              | 13 +++-------
 src/Mod/TechDraw/Gui/QGIFace.h                |  3 +++
 src/Mod/TechDraw/Gui/QGIGhostHighlight.h      |  3 +++
 src/Mod/TechDraw/Gui/QGIHighlight.h           |  3 +++
 src/Mod/TechDraw/Gui/QGILeaderLine.h          |  3 +++
 src/Mod/TechDraw/Gui/QGIMatting.cpp           |  2 +-
 src/Mod/TechDraw/Gui/QGIMatting.h             |  7 +++--
 src/Mod/TechDraw/Gui/QGIPrimPath.h            |  4 +++
 src/Mod/TechDraw/Gui/QGIProjGroup.h           |  6 ++++-
 src/Mod/TechDraw/Gui/QGIRichAnno.h            |  3 +++
 src/Mod/TechDraw/Gui/QGISVGTemplate.cpp       |  4 +--
 src/Mod/TechDraw/Gui/QGISectionLine.h         |  5 ++++
 src/Mod/TechDraw/Gui/QGITemplate.h            |  5 ++--
 src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp    | 12 ++++-----
 src/Mod/TechDraw/Gui/QGIViewBalloon.h         |  3 +++
 src/Mod/TechDraw/Gui/QGIViewDimension.h       |  7 +++--
 src/Mod/TechDraw/Gui/QGIViewPart.h            |  4 +++
 src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp   |  2 --
 src/Mod/TechDraw/Gui/QGIViewSymbol.h          |  3 +++
 src/Mod/TechDraw/Gui/QGIWeldSymbol.h          |  3 +++
 src/Mod/TechDraw/Gui/QGMText.h                |  6 ++++-
 src/Mod/TechDraw/Gui/QGVNavStyle.h            |  8 ++++--
 src/Mod/TechDraw/Gui/QGVPage.h                |  8 ++++--
 src/Mod/TechDraw/Gui/Rez.cpp                  |  4 ---
 src/Mod/TechDraw/Gui/Rez.h                    |  4 +++
 src/Mod/TechDraw/Gui/SymbolChooser.cpp        |  2 ++
 src/Mod/TechDraw/Gui/SymbolChooser.h          |  3 +++
 src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp     |  9 +++----
 src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp  |  8 +++---
 src/Mod/TechDraw/Gui/TaskLeaderLine.cpp       |  4 +--
 src/Mod/TechDraw/Gui/TaskProjGroup.h          |  3 +++
 src/Mod/TechDraw/Gui/TaskProjection.h         |  4 +++
 src/Mod/TechDraw/Gui/TaskSectionView.cpp      |  4 +--
 .../TechDraw/Gui/TaskSurfaceFinishSymbols.cpp | 11 +++++---
 src/Mod/TechDraw/Gui/TemplateTextField.h      |  3 +++
 .../TechDraw/Gui/ViewProviderAnnotation.cpp   |  3 ---
 src/Mod/TechDraw/Gui/ViewProviderImage.cpp    |  4 ---
 src/Mod/TechDraw/Gui/ViewProviderPage.h       |  8 ++++--
 src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp |  4 ---
 .../TechDraw/Gui/ViewProviderSpreadsheet.cpp  |  4 ---
 src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp   |  4 ---
 src/Mod/TechDraw/Gui/ViewProviderTile.cpp     |  4 ---
 src/Mod/TechDraw/Gui/mrichtextedit.cpp        |  9 ++++---
 src/Mod/TechDraw/Gui/mrichtextedit.h          |  4 +++
 src/Mod/TechDraw/Gui/mtextedit.cpp            |  7 +++--
 src/Mod/TechDraw/Gui/mtextedit.h              |  3 +++
 75 files changed, 228 insertions(+), 117 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 1530dd2b16..33a9280123 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -22,23 +22,23 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <sstream>
-# include <QCoreApplication>
-# include <QDir>
-# include <QFile>
-# include <QFileInfo>
-# include <QMessageBox>
-# include <QRegExp>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QGraphicsView>
+#include <QMessageBox>
+#include <QPainter>
+#include <QRegExp>
+#include <QStringBuilder>
+#include <QSvgGenerator>
+#include <QSvgRenderer>
+#include <sstream>
+#include <vector>
 #endif
 
-#include <QStringBuilder>
 
-#include <QGraphicsView>
-#include <QPainter>
-#include <QSvgRenderer>
-#include <QSvgGenerator>
 
-#include <vector>
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index e938c61cce..b0b569948b 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -24,6 +24,7 @@
 #ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
+# include <QGraphicsView>
 # include <iostream>
 # include <string>
 # include <sstream>
@@ -31,7 +32,6 @@
 # include <exception>
 #endif  //#ifndef _PreComp_
 
-#include <QGraphicsView>
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
index cfa5eff799..a650df65e8 100644
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
+# include <QGraphicsView>
 # include <iostream>
 # include <string>
 # include <sstream>
@@ -30,7 +31,6 @@
 # include <exception>
 #endif  //#ifndef _PreComp_
 
-#include <QGraphicsView>
 
 #include <Base/Tools.h>
 #include <App/Document.h>
diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.h b/src/Mod/TechDraw/Gui/DlgPageChooser.h
index 5e9675445c..d4bb5c2631 100644
--- a/src/Mod/TechDraw/Gui/DlgPageChooser.h
+++ b/src/Mod/TechDraw/Gui/DlgPageChooser.h
@@ -22,7 +22,10 @@
 #ifndef GUI_DLGPAGECHOOSER_H
 #define GUI_DLGPAGECHOOSER_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QDialog>
+#endif
 
 namespace TechDrawGui {
 
diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h
index d76bef562e..38e17a5429 100644
--- a/src/Mod/TechDraw/Gui/DlgTemplateField.h
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h
@@ -24,9 +24,12 @@
 #ifndef DRAWINGGUI_DLGTEMPLATEFIELD_H
 #define DRAWINGGUI_DLGTEMPLATEFIELD_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 e47f0f6e1a..71db3a516a 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -23,8 +23,11 @@
 #ifndef _DrawGuiUtil_h_
 #define _DrawGuiUtil_h_
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <string>
 #include <QCoreApplication>
+#endif
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index 8cb80a3b86..6156e2d455 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -24,6 +24,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+    #include <cmath>
     #include <QAction>
     #include <QTimer>
     #include <QApplication>
@@ -43,7 +44,6 @@
     #include <boost_signals2.hpp>
 #endif  // #ifndef _PreComp_
 
-#include <cmath>
 
 #include "MDIViewPage.h"
 
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index 36b7750443..d2fd59ddf0 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -23,8 +23,11 @@
 #ifndef TECHDRAWGUI_MDIVIEWPAGE_H
 #define TECHDRAWGUI_MDIVIEWPAGE_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPointF>
 #include <QPrinter>
+#endif
 
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index 1035911529..321afaec6d 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -79,9 +79,12 @@
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif
+#include <QGLWidget>
 #include <QPaintEngine>
 #include <QSvgGenerator>
-#include <QGLWidget>
+#include <QTextList>
+#include <QXmlQuery>
+#include <QXmlResultItems>
 
 #include <Inventor/nodes/SoDirectionalLight.h>
 #include <Inventor/nodes/SoOrthographicCamera.h>
diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.h b/src/Mod/TechDraw/Gui/PreferencesGui.h
index 3f66c0340a..f7f594c2bf 100644
--- a/src/Mod/TechDraw/Gui/PreferencesGui.h
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.h
@@ -23,6 +23,11 @@
 #ifndef _PreferencesGui_h_
 #define _PreferencesGui_h_
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QColor>
+#endif
+
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
 class QFont;
@@ -30,7 +35,6 @@ class QString;
 class QColor;
 
 #include <Mod/TechDraw/App/Preferences.h>
-#include <QColor>
 
 namespace TechDrawGui
 {
diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
index ac61f1b24e..1ab5aa7553 100644
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.cpp
@@ -27,6 +27,7 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif
 
@@ -36,7 +37,6 @@
 #include <Base/Parameter.h>
 
 #include <qmath.h>
-#include <QRectF>
 #include "QGCustomBorder.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.h b/src/Mod/TechDraw/Gui/QGCustomBorder.h
index 256fcbe501..c1250d0d1f 100644
--- a/src/Mod/TechDraw/Gui/QGCustomBorder.h
+++ b/src/Mod/TechDraw/Gui/QGCustomBorder.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMBORDER_H
 #define DRAWINGGUI_QGCUSTOMBORDER_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 230540132f..124dd7a3f8 100644
--- a/src/Mod/TechDraw/Gui/QGCustomClip.h
+++ b/src/Mod/TechDraw/Gui/QGCustomClip.h
@@ -23,11 +23,14 @@
 #ifndef DRAWINGGUI_QGCUSTOMCLIP_H
 #define DRAWINGGUI_QGCUSTOMCLIP_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QPointF>
 #include <QRectF>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.cpp b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
index 356a1ad262..ccdb10a01a 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.cpp
@@ -23,15 +23,14 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QPainter>
+#include <QPixmap>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #include <QtGlobal>
 #endif
 
 #include <Base/Console.h>
 
-#include <QRectF>
-#include <QPixmap>
-
 #include "QGCustomImage.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h
index 737a444477..e9ad50e97e 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.h
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.h
@@ -23,14 +23,17 @@
 #ifndef DRAWINGGUI_QGCUSTOMIMAGE_H
 #define DRAWINGGUI_QGCUSTOMIMAGE_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 778312bfae..5acfa3c741 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.cpp
@@ -29,6 +29,7 @@
 #include <QPaintDevice>
 #include <QPainter>
 #include <QPrinter>
+#include <QRectF>
 #include <QSvgGenerator>
 #include <QStyleOptionGraphicsItem>
 #endif
@@ -39,7 +40,6 @@
 #include <Base/Parameter.h>
 
 #include <qmath.h>
-#include <QRectF>
 #include "Rez.h"
 #include "QGCustomLabel.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.h b/src/Mod/TechDraw/Gui/QGCustomLabel.h
index ef39694282..de6f9b1d4c 100644
--- a/src/Mod/TechDraw/Gui/QGCustomLabel.h
+++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMLABEL_H
 #define DRAWINGGUI_QGCUSTOMLABEL_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 feb4c1cd38..346df4ff6a 100644
--- a/src/Mod/TechDraw/Gui/QGCustomRect.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.cpp
@@ -27,6 +27,7 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QMouseEvent>
 #include <QPainter>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif
 
@@ -36,7 +37,6 @@
 #include <Base/Parameter.h>
 
 #include <qmath.h>
-#include <QRectF>
 #include "QGCustomRect.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.h b/src/Mod/TechDraw/Gui/QGCustomRect.h
index c554c000f6..8a81e5fa7a 100644
--- a/src/Mod/TechDraw/Gui/QGCustomRect.h
+++ b/src/Mod/TechDraw/Gui/QGCustomRect.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMRECT_H
 #define DRAWINGGUI_QGCUSTOMRECT_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsRectItem>
 #include <QPointF>
+#endif
 
 QT_BEGIN_NAMESPACE
 class QPainter;
diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
index 82471600c4..09b3d6b533 100644
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.cpp
@@ -23,12 +23,12 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QPainter>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif
 
 #include <Base/Console.h>
 
-#include <QRectF>
 #include "QGCustomSvg.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.h b/src/Mod/TechDraw/Gui/QGCustomSvg.h
index 602a4b9884..758d39ac59 100644
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.h
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.h
@@ -23,11 +23,14 @@
 #ifndef DRAWINGGUI_QGCUSTOMSVG_H
 #define DRAWINGGUI_QGCUSTOMSVG_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 e3426437be..5273848df6 100644
--- a/src/Mod/TechDraw/Gui/QGCustomText.cpp
+++ b/src/Mod/TechDraw/Gui/QGCustomText.cpp
@@ -29,6 +29,7 @@
 #include <QPaintDevice>
 #include <QPainter>
 #include <QPrinter>
+#include <QRectF>
 #include <QSvgGenerator>
 #include <QStyleOptionGraphicsItem>
 #endif
@@ -39,7 +40,6 @@
 #include <Base/Parameter.h>
 
 #include <qmath.h>
-#include <QRectF>
 #include "Rez.h"
 #include "ZVALUE.h"
 #include "DrawGuiUtil.h"
diff --git a/src/Mod/TechDraw/Gui/QGCustomText.h b/src/Mod/TechDraw/Gui/QGCustomText.h
index 30d93fd9e3..722790665e 100644
--- a/src/Mod/TechDraw/Gui/QGCustomText.h
+++ b/src/Mod/TechDraw/Gui/QGCustomText.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGCUSTOMTEXT_H
 #define DRAWINGGUI_QGCUSTOMTEXT_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 4b606c4de7..3fab612aa5 100644
--- a/src/Mod/TechDraw/Gui/QGDisplayArea.h
+++ b/src/Mod/TechDraw/Gui/QGDisplayArea.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGDISPLAYAREA_H
 #define DRAWINGGUI_QGDISPLAYAREA_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 1916947b9b..71759e8217 100644
--- a/src/Mod/TechDraw/Gui/QGEPath.h
+++ b/src/Mod/TechDraw/Gui/QGEPath.h
@@ -23,9 +23,12 @@
 #ifndef TECHDRAWGUI_EDITABLEPATH_H
 #define TECHDRAWGUI_EDITABLEPATH_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
 #include <QObject>
+#endif
 
 #include "QGIPrimPath.h"
 #include "QGIVertex.h"
diff --git a/src/Mod/TechDraw/Gui/QGICaption.cpp b/src/Mod/TechDraw/Gui/QGICaption.cpp
index c4dbbe40eb..c7b0392e4d 100644
--- a/src/Mod/TechDraw/Gui/QGICaption.cpp
+++ b/src/Mod/TechDraw/Gui/QGICaption.cpp
@@ -29,6 +29,7 @@
 #include <QPaintDevice>
 #include <QPainter>
 #include <QPrinter>
+#include <QRectF>
 #include <QSvgGenerator>
 #include <QStyleOptionGraphicsItem>
 #endif
@@ -39,7 +40,6 @@
 #include <Base/Parameter.h>
 
 #include <qmath.h>
-#include <QRectF>
 #include "QGICaption.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.cpp b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
index c8123263d5..80c541d741 100644
--- a/src/Mod/TechDraw/Gui/QGICenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.cpp
@@ -22,12 +22,12 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <cmath>
 #include <QPainter>
 #include <QPainterPath>
 #include <QStyleOptionGraphicsItem>
 #endif
 
-#include <cmath>
 
 #include <App/Application.h>
 #include <App/Material.h>
diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.h b/src/Mod/TechDraw/Gui/QGICenterLine.h
index 56bd7f69ac..692b2a8518 100644
--- a/src/Mod/TechDraw/Gui/QGICenterLine.h
+++ b/src/Mod/TechDraw/Gui/QGICenterLine.h
@@ -23,8 +23,11 @@
 #ifndef TECHDRAWGUI_QGICENTERLINE_H
 #define TECHDRAWGUI_QGICENTERLINE_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QColor>
 #include <QPointF>
+#endif
 
 #include "QGIDecoration.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.h b/src/Mod/TechDraw/Gui/QGIDecoration.h
index 448a47718f..64d57e6ad8 100644
--- a/src/Mod/TechDraw/Gui/QGIDecoration.h
+++ b/src/Mod/TechDraw/Gui/QGIDecoration.h
@@ -23,9 +23,12 @@
 #ifndef DRAWINGGUI_QGIDECORATION_H
 #define DRAWINGGUI_QGIDECORATION_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QBrush>
 #include <QGraphicsItemGroup>
 #include <QPen>
+#endif
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp
index 1eebfe6834..1d999fcb24 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -22,10 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <cmath>
 #include <QAction>
 #include <QApplication>
 #include <QContextMenuEvent>
 #include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QTransform>
 #include <QMouseEvent>
 #include <QPainterPathStroker>
 #include <QPainter>
@@ -34,18 +37,10 @@
 #include <QBitmap>
 #include <QFile>
 #include <QFileInfo>
-#endif
-
-#include <QFile>
 #include <QTextStream>
 #include <QRectF>
 #include <QPointF>
-
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QTransform>
-
-#include <cmath>
+#endif
 
 #include <App/Application.h>
 #include <App/Material.h>
diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h
index 1cedf89e45..4c1e7c3ce9 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 "PreCompiled.h"
+#ifndef _PreComp_
 #include <Qt>
 #include <QGraphicsItem>
 #include <QSvgRenderer>
@@ -30,6 +32,7 @@
 #include <QBrush>
 #include <QPixmap>
 #include <QImage>
+#endif
 
 #include <App/Material.h>
 #include <Mod/TechDraw/App/HatchLine.h>
diff --git a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
index 7d17557d80..410c85cebf 100644
--- a/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIGhostHighlight.h
@@ -23,9 +23,12 @@
 #ifndef TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H
 #define TECHDRAWGUI_QGIGHOSTHIGHLIGHT_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 6cf0d4c2b5..c8bc58b26a 100644
--- a/src/Mod/TechDraw/Gui/QGIHighlight.h
+++ b/src/Mod/TechDraw/Gui/QGIHighlight.h
@@ -23,11 +23,14 @@
 #ifndef TECHDRAWGUI_QGIHIGHLIGHT_H
 #define TECHDRAWGUI_QGIHIGHLIGHT_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 7444959929..c769575b72 100644
--- a/src/Mod/TechDraw/Gui/QGILeaderLine.h
+++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h
@@ -23,12 +23,15 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H
 #define DRAWINGGUI_QGRAPHICSITEMLEADERLINE_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 72bcdc164a..4af86a693b 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.cpp
+++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <QPainter>
 #include <QPainterPath>
+#include <QRectF>
 #include <QStyleOptionGraphicsItem>
 #endif
 
@@ -34,7 +35,6 @@
 #include <Base/Parameter.h>
 
 #include <qmath.h>
-#include <QRectF>
 #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 2838235c9e..851dc12bb5 100644
--- a/src/Mod/TechDraw/Gui/QGIMatting.h
+++ b/src/Mod/TechDraw/Gui/QGIMatting.h
@@ -23,11 +23,14 @@
 #ifndef DRAWINGGUI_QGIMATTING_H
 #define DRAWINGGUI_QGIMATTING_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
 #include <QGraphicsItemGroup>
 #include <QGraphicsPathItem>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h
index 78d27e7e85..29ff51fb7d 100644
--- a/src/Mod/TechDraw/Gui/QGIPrimPath.h
+++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h
@@ -23,7 +23,11 @@
 #ifndef DRAWINGGUI_QGIPRIMPATH_H
 #define DRAWINGGUI_QGIPRIMPATH_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QGraphicsItem>
+#endif
+
 #include <Base/Parameter.h>
 #include <Mod/TechDraw/TechDrawGlobal.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.h b/src/Mod/TechDraw/Gui/QGIProjGroup.h
index 182474ed17..cdd7854ea5 100644
--- a/src/Mod/TechDraw/Gui/QGIProjGroup.h
+++ b/src/Mod/TechDraw/Gui/QGIProjGroup.h
@@ -23,8 +23,12 @@
 #ifndef DRAWINGGUI_QGIProjGroup_H
 #define DRAWINGGUI_QGIProjGroup_H
 
-#include "QGIViewCollection.h"
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QObject>
+#endif
+
+#include "QGIViewCollection.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h
index 794511088f..a307912b75 100644
--- a/src/Mod/TechDraw/Gui/QGIRichAnno.h
+++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h
@@ -23,12 +23,15 @@
 #ifndef TECHDRAWGUI_QGIRICHANNO_H
 #define TECHDRAWGUI_QGIRICHANNO_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QFont>
 #include <QGraphicsItem>
 #include <QObject>
 #include <QPainterPath>
 #include <QPen>
 #include <QStyleOptionGraphicsItem>
+#endif
 
 
 namespace TechDraw {
diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
index 3399ecd2e1..3df35c26a1 100644
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
@@ -29,11 +29,11 @@
 #include <QSvgRenderer>
 #include <QGraphicsSvgItem>
 #include <QDomDocument>
-#endif // #ifndef _PreComp_
-
 #include <QFile>
 #include <QXmlQuery>
 #include <QXmlResultItems>
+#endif // #ifndef _PreComp_
+
 
 #include <App/Application.h>
 #include <Base/Console.h>
diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.h b/src/Mod/TechDraw/Gui/QGISectionLine.h
index ea336298da..a557955a81 100644
--- a/src/Mod/TechDraw/Gui/QGISectionLine.h
+++ b/src/Mod/TechDraw/Gui/QGISectionLine.h
@@ -23,9 +23,14 @@
 #ifndef TECHDRAWGUI_QGISECTIONLINE_H
 #define TECHDRAWGUI_QGISECTIONLINE_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QGraphicsItemGroup>
+#include <QObject>
 #include <QColor>
 #include <QFont>
 #include <QPointF>
+#endif
 
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/QGITemplate.h b/src/Mod/TechDraw/Gui/QGITemplate.h
index 56553b7ebe..38cc3a073e 100644
--- a/src/Mod/TechDraw/Gui/QGITemplate.h
+++ b/src/Mod/TechDraw/Gui/QGITemplate.h
@@ -23,9 +23,10 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H
 #define DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H
 
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 #include <QGraphicsItemGroup>
 #include <QObject>
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
 QT_BEGIN_NAMESPACE
 class QGraphicsScene;
@@ -69,6 +70,6 @@ protected:
     std::vector<TemplateTextField *> textFields;
 };
 
-} // namespace MDIViewPageGui
+} // namespace
 
 #endif // DRAWINGGUI_QGRAPHICSITEMTEMPLATE_H
diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
index 6987f86566..ac55bd1582 100644
--- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
@@ -36,18 +36,18 @@
 #include <QString>
 #include <QTextOption>
 #include <QVBoxLayout>
-#include <sstream>
-#endif
-
 #include <string>
-#include <regex>
-
-#include <qmath.h>
 #include <QTextDocument>
 #include <QTextBlock>
 #include <QTextBlockFormat>
 #include <QTextFrame>
 #include <QSizeF>
+#endif
+
+#include <sstream>
+#include <regex>
+
+#include <qmath.h>
 
 #include <App/Application.h>
 #include <App/Material.h>
diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
index 1ff632f57f..58e8313784 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h
@@ -24,12 +24,15 @@
 #ifndef TECHDRAWGUI_QGIVBALLOON_H
 #define TECHDRAWGUI_QGIVBALLOON_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 396052f4e8..08b6bea2fb 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.h
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h
@@ -23,13 +23,16 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWDIMENSION_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 4578620714..491aae7fea 100644
--- a/src/Mod/TechDraw/Gui/QGIViewPart.h
+++ b/src/Mod/TechDraw/Gui/QGIViewPart.h
@@ -23,8 +23,12 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWPART_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWPART_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
+#endif
+
 #include <Mod/TechDraw/App/Geometry.h>
 
 #include "QGIView.h"
diff --git a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
index d7667be4d8..1696e4d6e8 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewSpreadsheet.cpp
@@ -21,8 +21,6 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
 #include "QGIViewSpreadsheet.h"
diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h
index 14b9f3d65e..114538c3e1 100644
--- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h
+++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h
@@ -24,7 +24,10 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H
 #define DRAWINGGUI_QGRAPHICSITEMVIEWSYMBOL_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QByteArray>
+#endif
 
 #include "QGIView.h"
 
diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
index f68a0978ac..6af398c52e 100644
--- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
+++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h
@@ -23,12 +23,15 @@
 #ifndef DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H
 #define DRAWINGGUI_QGRAPHICSITEMWELDSYMBOL_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 6769395df6..572de677f7 100644
--- a/src/Mod/TechDraw/Gui/QGMText.h
+++ b/src/Mod/TechDraw/Gui/QGMText.h
@@ -26,8 +26,12 @@
 #ifndef TECHDRAWGUI_MOVABLETEXT_H
 #define TECHDRAWGUI_MOVABLETEXT_H
 
-#include "QGCustomText.h"
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QObject>
+#endif
+
+#include "QGCustomText.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.h b/src/Mod/TechDraw/Gui/QGVNavStyle.h
index f9e72dabb3..69d757139e 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyle.h
+++ b/src/Mod/TechDraw/Gui/QGVNavStyle.h
@@ -22,11 +22,15 @@
 
 
 #ifndef TECHDRAW_NAVIGATIONSTYLE_H
-#include <QPoint>
 #define TECHDRAW_NAVIGATIONSTYLE_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QCursor>
+#include <QPoint>
+#endif
+
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 class QEvent;
 class QFocusEvent;
diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h
index 996dc8355a..65ef86ce99 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.h
+++ b/src/Mod/TechDraw/Gui/QGVPage.h
@@ -23,12 +23,16 @@
 #ifndef TECHDRAWGUI_QGVIEW_H
 #define TECHDRAWGUI_QGVIEW_H
 
-#include <memory>
-#include <Mod/TechDraw/TechDrawGlobal.h>
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 21ab1eb63f..32d5a7b2c2 100644
--- a/src/Mod/TechDraw/Gui/Rez.cpp
+++ b/src/Mod/TechDraw/Gui/Rez.cpp
@@ -21,10 +21,6 @@
  ***************************************************************************/
 #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 a981f01222..b9911dde76 100644
--- a/src/Mod/TechDraw/Gui/Rez.h
+++ b/src/Mod/TechDraw/Gui/Rez.h
@@ -23,9 +23,13 @@
 #ifndef DRAWINGGUI_REZ_H
 #define DRAWINGGUI_REZ_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QPointF>
 #include <QRectF>
 #include <QSize>
+#endif
+
 #include <Base/Tools2D.h>
 #include <Base/Vector3D.h>
 
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.cpp b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
index 11689b6668..88f37a0706 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.cpp
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -21,7 +21,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QListWidget>
+#endif
 
 #include <App/Application.h>
 #include <Mod/TechDraw/Gui/ui_SymbolChooser.h>
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h
index f5b7dfb462..4a1021a2a8 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.h
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.h
@@ -22,7 +22,10 @@
 #ifndef TECHDRAWGUI_SYMBOLCHOOSER_H
 #define TECHDRAWGUI_SYMBOLCHOOSER_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QDialog>
+#endif
 
 class QListWidgetItem;
 
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
index 226c51c996..589a455375 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp
@@ -26,14 +26,13 @@
 #include <cmath>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
-
-#endif // #ifndef _PreComp_
-
-#include <BRepBuilderAPI_MakeEdge.hxx>
-
 #include <QButtonGroup>
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif
+
+#include <BRepBuilderAPI_MakeEdge.hxx>
+
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
index 3f42cb67c1..caeed64cd9 100644
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
@@ -26,14 +26,12 @@
 #include <cmath>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
-
-#endif // #ifndef _PreComp_
-
-#include <BRepBuilderAPI_MakeEdge.hxx>
-
 #include <QButtonGroup>
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif
+
+#include <BRepBuilderAPI_MakeEdge.hxx>
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index 3d69cd6d9e..4b52b76e8f 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -24,10 +24,10 @@
 
 #ifndef _PreComp_
 #include <cmath>
-#endif
-
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif
+
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h
index 7057e01987..81172cd9d8 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.h
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h
@@ -24,7 +24,10 @@
 #ifndef GUI_TASKVIEW_TASKVIEWGROUP_H
 #define GUI_TASKVIEW_TASKVIEWGROUP_H
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #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 c3cf950f66..a0ddd1190c 100644
--- a/src/Mod/TechDraw/Gui/TaskProjection.h
+++ b/src/Mod/TechDraw/Gui/TaskProjection.h
@@ -26,7 +26,11 @@
 #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/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
index 4c1b8ec3ab..cd06546cbc 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
@@ -24,12 +24,12 @@
 
 #ifndef _PreComp_
 #include <cmath>
-#endif // #ifndef _PreComp_
-
 #include <QApplication>
 #include <QStatusBar>
 #include <QGraphicsScene>
 #include <QMessageBox>
+#endif // #ifndef _PreComp_
+
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
index b3fd43adcb..4ad46c0627 100644
--- a/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSurfaceFinishSymbols.cpp
@@ -21,6 +21,13 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
+#include <QGraphicsScene>
+#include <QLineEdit>
+#include <QGraphicsProxyWidget>
+#include <QComboBox>
+#endif
+
 #include <App/Document.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
@@ -28,10 +35,6 @@
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/Gui/ui_TaskSurfaceFinishSymbols.h>
 #include "TaskSurfaceFinishSymbols.h"
-#include <QGraphicsScene>
-#include <QLineEdit>
-#include <QGraphicsProxyWidget>
-#include <QComboBox>
 
 using namespace Gui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h
index 24960ba67b..46224c57c8 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.h
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.h
@@ -23,7 +23,10 @@
 #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/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
index 9b57a63b2e..f1997f3a61 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
@@ -24,9 +24,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderAnnotation.h"
 #include "QGIView.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
index 775743b05f..d109d6b4e2 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
@@ -20,12 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 
 #include "ViewProviderImage.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h
index eaf8aed196..721e8b4867 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h
@@ -24,10 +24,14 @@
 #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 <boost_signals2.hpp>
 
 #include <App/PropertyUnits.h>
 #include <Gui/ViewProviderDocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
index e1999e9e81..28d47d695f 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp
@@ -21,12 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include <Gui/Control.h>
 #include <Gui/Selection.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
index 2ca84e002d..650530e595 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp
@@ -20,12 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderSpreadsheet.h"
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
index 684569ae86..44ce3d8dbf 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp
@@ -21,12 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderSymbol.h"
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
index b3036bc81e..885300e727 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp
@@ -20,12 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <App/DocumentObject.h>
 #include "ViewProviderTile.h"
 
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
index b7a4445a8d..8c4271c919 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
@@ -25,8 +25,11 @@
  * includes changes by wandererfan@gmail.com
  * for FreeCAD project https://www.freecadweb.org/
  ********************************/
-#include "PreCompiled.h"
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
+#include <algorithm>
+#include <iostream>
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
@@ -44,9 +47,7 @@
 #include <QMenu>
 #include <QDialog>
 #include <QBitmap>
-
-#include <iostream>
-#include <algorithm>
+#endif
 
 #include <Base/Console.h>
 #include <Base/Parameter.h>
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.h b/src/Mod/TechDraw/Gui/mrichtextedit.h
index 17fba1c035..fed345bc96 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.h
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.h
@@ -29,7 +29,11 @@
 #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 cd59e98095..dab9e1744e 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mtextedit.cpp
@@ -21,14 +21,17 @@
 ** $QT_END_LICENSE$
 */
 // clazy:excludeall=qstring-arg
-#include "PreCompiled.h"
 
-#include "mtextedit.h"
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QTextDocument>
 #include <QTextCursor>
 #include <QImage>
 #include <QByteArray>
 #include <QBuffer>
+#endif
+
+#include "mtextedit.h"
 #include <cstdlib>
 
 
diff --git a/src/Mod/TechDraw/Gui/mtextedit.h b/src/Mod/TechDraw/Gui/mtextedit.h
index 0a2fd2becb..9a31661321 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.h
+++ b/src/Mod/TechDraw/Gui/mtextedit.h
@@ -23,9 +23,12 @@
 #ifndef _MTEXTEDIT_H_
 #define _MTEXTEDIT_H_
 
+#include "PreCompiled.h"
+#ifndef _PreComp_
 #include <QImage>
 #include <QMimeData>
 #include <QTextEdit>
+#endif
 
 
 class MTextEdit : public QTextEdit {