diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
index 02b99fbc1c..722d9154b9 100644
--- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
@@ -50,6 +50,7 @@
 #include <Mod/TechDraw/App/DrawViewPy.h>  // generated from DrawViewPy.xml
 
 #include "MDIViewPage.h"
+#include "QGIView.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderDrawingView.h"
 #include "Grabber3d.h"
diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt
index 3aa5911578..7d6d8007ce 100644
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -403,6 +403,13 @@ SET(TechDrawGuiFonts
     Resources/fonts/osifont.license
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS}
+                                                           ${TechDrawGuiViewProvider_SRCS} ${MRTE_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(TechDrawGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(TechDrawGui SHARED ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${TechDrawGuiViewProvider_SRCS}
                                ${TechDrawGuiIcon_SVG} ${TechDrawGuiFonts} ${MRTE_SRCS})
 target_link_libraries(TechDrawGui ${TechDrawGui_LIBS})
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index 004ab4a960..abd757589c 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <QApplication>
 # include <QGraphicsView>
 # include <QMessageBox>
 # include <iostream>
@@ -69,6 +70,7 @@
 #include "TaskCosmeticLine.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderViewPart.h"
+#include "QGIView.h"
 #include "QGVPage.h"
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index c4b8930ffd..91c028608e 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <QApplication>
 # include <QMessageBox>
 # include <iostream>
 # include <string>
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
index 36df204f26..514d203208 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
@@ -41,6 +41,7 @@
 # include <Gui/Selection.h>
 # include <Gui/SelectionObject.h>
 
+# include <Mod/TechDraw/App/Cosmetic.h>
 # include <Mod/TechDraw/App/DrawViewBalloon.h>
 # include <Mod/TechDraw/App/DrawViewDimension.h>
 # include <Mod/TechDraw/App/DrawPage.h>
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
index dc1d4ab0e5..88dcaa5338 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <QApplication>
 # include <QMessageBox>
 # include <iostream>
 # include <string>
@@ -51,6 +52,7 @@
 # include <Mod/Part/App/PartFeature.h>
 # include <Mod/Part/App/Geometry2d.h>
 
+# include <Mod/TechDraw/App/Cosmetic.h>
 # include <Mod/TechDraw/App/DrawViewPart.h>
 # include <Mod/TechDraw/App/DrawProjGroupItem.h>
 # include <Mod/TechDraw/App/DrawProjGroup.h>
diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp
index 09a22d8f63..4bf0836ee6 100644
--- a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp
@@ -24,20 +24,21 @@
 #include "PreCompiled.h"
 #include <Base/Console.h>
 #include "DlgTemplateField.h"
+#include <Mod/TechDraw/Gui/ui_DlgTemplateField.h>
 
 using namespace TechDrawGui;
 
 DlgTemplateField::DlgTemplateField( QWidget *parent /* = nullptr */ ) :
-    QDialog(parent)
+    QDialog(parent), ui(new Ui_dlgTemplateField)
 {
-    setupUi(this);
-    leInput->setFocus();
+    ui->setupUi(this);
+    ui->leInput->setFocus();
 }
 
 void DlgTemplateField::changeEvent(QEvent *e)
 {
     if (e->type() == QEvent::LanguageChange) {
-        retranslateUi(this);
+        ui->retranslateUi(this);
     }
     else {
         QWidget::changeEvent(e);
@@ -47,18 +48,18 @@ void DlgTemplateField::changeEvent(QEvent *e)
 void DlgTemplateField::setFieldName(std::string name)
 {
     QString qs = QString::fromUtf8(name.data(), name.size());
-    lblName->setText(qs);
+    ui->lblName->setText(qs);
 }
 
 void DlgTemplateField::setFieldContent(std::string content)
 {
     QString qs = QString::fromUtf8(content.data(), content.size());
-    leInput->setText(qs);
+    ui->leInput->setText(qs);
 }
 
 QString DlgTemplateField::getFieldContent()
 {
-    QString result = leInput->text();
+    QString result = ui->leInput->text();
     return result;
 }
 
diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.h b/src/Mod/TechDraw/Gui/DlgTemplateField.h
index 4874a25bd6..729e5265f7 100644
--- a/src/Mod/TechDraw/Gui/DlgTemplateField.h
+++ b/src/Mod/TechDraw/Gui/DlgTemplateField.h
@@ -26,12 +26,12 @@
 
 #include <QDialog>
 #include <QString>
-
-#include <Mod/TechDraw/Gui/ui_DlgTemplateField.h>
+#include <memory>
 
 namespace TechDrawGui {
 
-class DlgTemplateField : public QDialog, public Ui_dlgTemplateField
+class Ui_dlgTemplateField;
+class DlgTemplateField : public QDialog
 {
     Q_OBJECT
 
@@ -49,6 +49,9 @@ public Q_SLOTS:
 
 protected:
     void changeEvent(QEvent *e);
+
+private:
+    std::shared_ptr<Ui_dlgTemplateField> ui;
 };
 
 } // namespace TechDrawGui
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
index bac8e73f49..5d4b0c5752 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
@@ -28,12 +28,13 @@
 # include <cstdlib>
 # include <exception>
 # include <boost/regex.hpp>
+# include <QComboBox>
 # include <QString>
 # include <QStringList>
 # include <QRegExp>
 # include <QMessageBox>
-#include <QRectF>
-
+# include <QRectF>
+# include <QPointF>
 #endif
 
 #include <gp_Vec.hxx>
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.h b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
index 02ae91c385..e47f0f6e1a 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -24,14 +24,17 @@
 #define _DrawGuiUtil_h_
 
 #include <string>
-#include <QComboBox>
 #include <QCoreApplication>
-#include <QPointF>
-#include <QRectF>
 
-#include <App/DocumentObject.h>
 #include <Base/Vector3D.h>
 
+class QComboBox;
+class QPointF;
+class QRectF;
+
+namespace App {
+class DocumentObject;
+}
 
 namespace Part {
 class Feature;
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index e5199baab4..57cf3ae8c4 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -29,6 +29,7 @@
     #include <QApplication>
     #include <QContextMenuEvent>
     #include <QFileDialog>
+    #include <QGraphicsScene>
     #include <QGridLayout>
     #include <QGroupBox>
     #include <QListWidget>
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index 474fc8df77..459d0b37fa 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -23,24 +23,25 @@
 #ifndef TECHDRAWGUI_MDIVIEWPAGE_H
 #define TECHDRAWGUI_MDIVIEWPAGE_H
 
-#include <QGraphicsScene>
 #include <QPointF>
 #include <QPrinter>
 
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
 #include <Gui/Selection.h>
-#include <Mod/TechDraw/App/DrawPage.h>
 
 #include "ViewProviderPage.h"
 
 
 QT_BEGIN_NAMESPACE
 class QAction;
+class QGraphicsItem;
+class QGraphicsScene;
 class QTimer;
 QT_END_NAMESPACE
 
 namespace TechDraw {
+class DrawPage;
 class DrawTemplate;
 class DrawView;
 }
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index 5ef46e8649..1035911529 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -69,7 +69,9 @@
 #include <bitset>
 
 #ifdef FC_OS_WIN32
+# define WIN32_LEAN_AND_MEAN
 # include <windows.h>
+# undef small
 #endif
 
 
@@ -77,6 +79,15 @@
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif
+#include <QPaintEngine>
+#include <QSvgGenerator>
+#include <QGLWidget>
+
+#include <Inventor/nodes/SoDirectionalLight.h>
+#include <Inventor/nodes/SoOrthographicCamera.h>
+#include <Inventor/nodes/SoPerspectiveCamera.h>
+#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/misc/SoChildList.h>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.h b/src/Mod/TechDraw/Gui/PreferencesGui.h
index ca7ab938e4..3f66c0340a 100644
--- a/src/Mod/TechDraw/Gui/PreferencesGui.h
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.h
@@ -30,6 +30,7 @@ class QString;
 class QColor;
 
 #include <Mod/TechDraw/App/Preferences.h>
+#include <QColor>
 
 namespace TechDrawGui
 {
diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h
index e4ae6b26a8..746cb708b7 100644
--- a/src/Mod/TechDraw/Gui/QGIPrimPath.h
+++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h
@@ -24,14 +24,13 @@
 #define DRAWINGGUI_QGIPRIMPATH_H
 
 #include <QGraphicsItem>
+#include <Base/Parameter.h>
 
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QStyleOptionGraphicsItem;
 QT_END_NAMESPACE
 
-#include <Base/Parameter.h>
-
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp
index 0094c8fc57..b43b9ea64a 100644
--- a/src/Mod/TechDraw/Gui/QGIView.cpp
+++ b/src/Mod/TechDraw/Gui/QGIView.cpp
@@ -40,6 +40,7 @@
 
 #include <App/Application.h>
 #include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <App/Material.h>
 #include <Base/Console.h>
 #include <Gui/Selection.h>
@@ -68,6 +69,7 @@
 #include "QGTracker.h"
 
 #include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawViewClip.h>
 #include <Mod/TechDraw/App/DrawProjGroup.h>
 #include <Mod/TechDraw/App/DrawProjGroupItem.h>
diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h
index 2b5b47689a..1119fa7fb5 100644
--- a/src/Mod/TechDraw/Gui/QGIView.h
+++ b/src/Mod/TechDraw/Gui/QGIView.h
@@ -30,10 +30,8 @@
 #include <QPen>
 #include <QPointF>
 
-#include <App/DocumentObject.h>
 #include <Base/Parameter.h>
-#include <Gui/ViewProvider.h>
-#include <Mod/TechDraw/App/DrawView.h>
+#include <Base/Vector3D.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -41,6 +39,21 @@ class QGraphicsScene;
 class QGraphicsSceneMouseEvent;
 QT_END_NAMESPACE
 
+namespace App
+{
+class DocumentObject;
+}
+
+namespace Gui
+{
+class ViewProvider;
+}
+
+namespace TechDraw
+{
+class DrawView;
+}
+
 namespace TechDrawGui
 {
 class QGVPage;
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.cpp b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
index 71494cdd24..11689b6668 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.cpp
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -21,6 +21,7 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#include <QListWidget>
 
 #include <App/Application.h>
 #include <Mod/TechDraw/Gui/ui_SymbolChooser.h>
@@ -48,6 +49,10 @@ SymbolChooser::SymbolChooser(QWidget *parent,
     setUiPrimary();
 }
 
+SymbolChooser::~SymbolChooser()
+{
+}
+
 void SymbolChooser::setUiPrimary()
 {
     // Base::Console().Message("SC::setUiPrimary()\n");
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h
index 4a77f12208..f5b7dfb462 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.h
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.h
@@ -23,13 +23,12 @@
 #define TECHDRAWGUI_SYMBOLCHOOSER_H
 
 #include <QDialog>
-#include <QListWidget>
-
-#include <Mod/TechDraw/Gui/ui_SymbolChooser.h>
 
+class QListWidgetItem;
 
 namespace TechDrawGui {
 
+class Ui_SymbolChooser;
 class TechDrawGuiExport SymbolChooser : public QDialog
 {
     Q_OBJECT
@@ -38,6 +37,7 @@ public:
     SymbolChooser(QWidget *parent = nullptr,
                   QString startDir = QString(),
                   QString source = QString());
+    ~SymbolChooser();
 
 public Q_SLOTS:
     void onOKClicked();
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
index 27f4e38c4c..409ca9fa3b 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
@@ -23,13 +23,13 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-
-#endif // #ifndef _PreComp_
-
 #include <QApplication>
+#include <QPushButton>
 #include <QStatusBar>
 #include <QGraphicsScene>
 #include <QTemporaryFile>
+#endif // #ifndef _PreComp_
+
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h
index fc3066af10..09c3c77fa0 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.h
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.h
@@ -23,13 +23,11 @@
 #ifndef TECHDRAWGUI_TASKACTIVEVIEW_H
 #define TECHDRAWGUI_TASKACTIVEVIEW_H
 
-#include <QPushButton>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskActiveView.h>
 
 
+class QPushButton;
 class Ui_TaskActiveView;
 
 namespace TechDraw
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
index ea2b2ecc5c..6830c8ab21 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
@@ -44,8 +44,6 @@
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/ArrowPropEnum.h>
 
-#include <Mod/TechDraw/Gui/ui_TaskBalloon.h>
-
 #include "DrawGuiUtil.h"
 #include "QGIViewBalloon.h"
 #include "ViewProviderBalloon.h"
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h
index a723d267bc..15c029fb42 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.h
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.h
@@ -27,13 +27,11 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
-#include "QGIViewBalloon.h"
-#include "ViewProviderBalloon.h"
-
-
 namespace TechDrawGui
 {
 
+class QGIViewBalloon;
+class ViewProviderBalloon;
 class Ui_TaskBalloon;
 class TaskBalloon : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
index 247410885a..d1f9a10cbc 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp
@@ -26,12 +26,11 @@
 #include <cmath>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
-
-#endif // #ifndef _PreComp_
-
 #include <QButtonGroup>
 #include <QStatusBar>
 #include <QGraphicsScene>
+#endif // #ifndef _PreComp_
+
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h
index 6542ee74ca..b352713839 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.h
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h
@@ -25,7 +25,6 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskCenterLine.h>
 
 
 //TODO: make this a proper enum
@@ -36,20 +35,14 @@
 #define TRACKERFINISHED 4
 #define TRACKERSAVE 5
 
-class Ui_TaskCenterLine;
-
 namespace TechDraw
 {
 class DrawPage;
 class DrawView;
 class DrawViewPart;
 class CosmeticEdge;
-class LineFormat;
-}
-
-namespace TechDraw
-{
 class Face;
+class LineFormat;
 }
 
 namespace TechDrawGui
@@ -59,6 +52,7 @@ class QGIView;
 class QGIPrimPath;
 class MDIViewPage;
 class ViewProviderViewPart;
+class Ui_TaskCenterLine;
 
 class TaskCenterLine : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h
index 563f765684..ee085dac75 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.h
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h
@@ -25,7 +25,6 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskCosVertex.h>
 
 #include "QGTracker.h"
 
@@ -36,8 +35,6 @@
 #define TRACKERCANCEL 2
 #define TRACKERCANCELEDIT 3
 
-class Ui_TaskCosVertex;
-
 namespace TechDraw
 {
 class DrawPage;
@@ -56,6 +53,7 @@ class QGEPath;
 class QGMText;
 class QGICosVertex;
 class ViewProviderLeader;
+class Ui_TaskCosVertex;
 
 class TaskCosVertex : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h
index 5240210524..12995b702d 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h
@@ -26,10 +26,7 @@
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/App/Cosmetic.h>
-#include <Mod/TechDraw/Gui/ui_TaskCosmeticLine.h>
 
-class Ui_TaskCosmeticLine;
 
 namespace TechDraw
 {
@@ -37,12 +34,8 @@ class DrawPage;
 class DrawView;
 class DrawViewPart;
 class CosmeticEdge;
-class LineFormat;
-}
-
-namespace TechDraw
-{
 class Face;
+class LineFormat;
 }
 
 namespace TechDrawGui
@@ -52,6 +45,7 @@ class QGIView;
 class QGIPrimPath;
 class MDIViewPage;
 class ViewProviderViewPart;
+class Ui_TaskCosmeticLine;
 
 class TaskCosmeticLine : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
index 85b132a777..3f42cb67c1 100644
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp
@@ -39,6 +39,8 @@
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
 
+#include <App/DocumentObject.h>
+
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h
index e9d8dd8c01..2a933031a3 100644
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h
@@ -23,7 +23,6 @@
 #ifndef TECHDRAWGUI_TASKCUSTOMIZEFORMAT_H
 #define TECHDRAWGUI_TASKCUSTOMIZEFORMAT_H
 
-#include <App/DocumentObject.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h
index 6a9e35246d..88ed8c1a12 100644
--- a/src/Mod/TechDraw/Gui/TaskDetail.h
+++ b/src/Mod/TechDraw/Gui/TaskDetail.h
@@ -26,7 +26,6 @@
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskDetail.h>
 
 
 //TODO: make this a proper enum
@@ -35,8 +34,6 @@
 #define TRACKERCANCEL 2
 #define TRACKERCANCELEDIT 3
 
-class Ui_TaskDetail;
-
 namespace TechDraw
 {
 class DrawPage;
@@ -55,6 +52,7 @@ class QGEPath;
 class QGIDetail;
 class QGIGhostHighlight;
 class ViewProviderLeader;
+class Ui_TaskDetail;
 
 class TaskDetail : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskDimension.cpp b/src/Mod/TechDraw/Gui/TaskDimension.cpp
index d44c75f278..31e23ac0fb 100644
--- a/src/Mod/TechDraw/Gui/TaskDimension.cpp
+++ b/src/Mod/TechDraw/Gui/TaskDimension.cpp
@@ -24,9 +24,9 @@
 
 #ifndef _PreComp_
 #include <cmath>
+#include <QMessageBox>
 #endif // #ifndef _PreComp_
 
-# include <QMessageBox>
 
 #include <Base/Console.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskDimension.h b/src/Mod/TechDraw/Gui/TaskDimension.h
index de69a0105c..77028ed10a 100644
--- a/src/Mod/TechDraw/Gui/TaskDimension.h
+++ b/src/Mod/TechDraw/Gui/TaskDimension.h
@@ -26,13 +26,11 @@
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
-#include "QGIViewDimension.h"
-#include "ViewProviderDimension.h"
-
-
 namespace TechDrawGui
 {
 
+class QGIViewDimension;
+class ViewProviderDimension;
 class Ui_TaskDimension;
 class TaskDimension : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
index 53feb78d17..1f38fa7d4d 100644
--- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
+++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
@@ -41,6 +41,7 @@
 #include <App/DocumentObject.h>
 
 #include <Mod/TechDraw/App/HatchLine.h>
+#include <Mod/TechDraw/App/DrawGeomHatch.h>
 #include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h
index a332941ac2..dee2997ae5 100644
--- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h
+++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h
@@ -25,20 +25,22 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/App/DrawGeomHatch.h>
-#include <Mod/TechDraw/Gui/ui_TaskGeomHatch.h>
 
 
-class Ui_TaskGeomHatch;
-
 namespace App
 {
 class DocumentObject;
 }
 
+namespace TechDraw
+{
+class DrawGeomHatch;
+}
+
 
 namespace TechDrawGui
 {
+class Ui_TaskGeomHatch;
 class ViewProviderGeomHatch;
 
 class TaskGeomHatch : public QWidget
diff --git a/src/Mod/TechDraw/Gui/TaskHatch.cpp b/src/Mod/TechDraw/Gui/TaskHatch.cpp
index cf09c9c00d..a5fc0e25da 100644
--- a/src/Mod/TechDraw/Gui/TaskHatch.cpp
+++ b/src/Mod/TechDraw/Gui/TaskHatch.cpp
@@ -41,6 +41,7 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
+#include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskHatch.h b/src/Mod/TechDraw/Gui/TaskHatch.h
index 97e64d7184..986f507d73 100644
--- a/src/Mod/TechDraw/Gui/TaskHatch.h
+++ b/src/Mod/TechDraw/Gui/TaskHatch.h
@@ -26,19 +26,21 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/App/DrawHatch.h>
-#include <Mod/TechDraw/Gui/ui_TaskHatch.h>
 
 
-class Ui_TaskHatch;
-
 namespace App
 {
 class DocumentObject;
 }
 
+namespace TechDraw
+{
+class DrawHatch;
+}
+
 namespace TechDrawGui
 {
+class Ui_TaskHatch;
 class ViewProviderHatch;
 
 class TaskHatch : public QWidget
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h
index b1e9d45bc6..7a2f047922 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h
@@ -26,7 +26,6 @@
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskLeaderLine.h>
 
 #include "QGTracker.h"
 
@@ -39,8 +38,6 @@
 #define TRACKERFINISHED 4
 #define TRACKERSAVE 5
 
-class Ui_TaskLeaderLine;
-
 namespace TechDraw
 {
 class DrawPage;
@@ -59,6 +56,7 @@ class QGEPath;
 class QGMText;
 class QGILeaderLine;
 class ViewProviderLeader;
+class Ui_TaskLeaderLine;
 
 class TaskLeaderLine : public QWidget
 {
diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.h b/src/Mod/TechDraw/Gui/TaskLineDecor.h
index eb873a4b09..76661ff2e7 100644
--- a/src/Mod/TechDraw/Gui/TaskLineDecor.h
+++ b/src/Mod/TechDraw/Gui/TaskLineDecor.h
@@ -25,12 +25,8 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskLineDecor.h>
-#include <Mod/TechDraw/Gui/ui_TaskRestoreLines.h>   //????
 
 
-class Ui_TaskLineDecor;
-
 namespace App
 {
 class DocumentObject;
@@ -40,6 +36,8 @@ class DocumentObject;
 namespace TechDrawGui
 {
 
+class Ui_TaskLineDecor;
+class Ui_TaskRestoreLines;
 class TaskLineDecor : public QWidget
 {
     Q_OBJECT
diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.h b/src/Mod/TechDraw/Gui/TaskLinkDim.h
index fc2baf0b5c..a329acc079 100644
--- a/src/Mod/TechDraw/Gui/TaskLinkDim.h
+++ b/src/Mod/TechDraw/Gui/TaskLinkDim.h
@@ -25,19 +25,21 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/App/DrawViewDimension.h>
-#include <Mod/TechDraw/Gui/ui_TaskLinkDim.h>
 
+class QTreeWidgetItem;
 
 namespace Gui {
 class Document;
 }
 
-class Ui_TaskLinkDim;
+namespace TechDraw {
+class DrawViewDimension;
+}
 
 namespace TechDrawGui
 {
 
+class Ui_TaskLinkDim;
 class TaskLinkDim : public QWidget
 {
     Q_OBJECT
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
index d2cddc20be..cffb499243 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
@@ -51,6 +51,7 @@
 #include <Mod/TechDraw/App/DrawView.h>
 #include <Mod/TechDraw/App/DrawViewPart.h>
 
+#include "MDIViewPage.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderProjGroup.h"
 #include "ViewProviderProjGroupItem.h"
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h
index b9fc46766f..3f8633a05c 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.h
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h
@@ -29,13 +29,6 @@
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/App/DrawProjGroup.h>
-#include <Mod/TechDraw/Gui/ui_TaskProjGroup.h>
-
-#include "MDIViewPage.h"
-
-
-class Ui_TaskProjGroup;
 
 namespace TechDraw {
 class DrawProjGroup;
@@ -45,6 +38,7 @@ class DrawPage;
 namespace TechDrawGui
 {
 class MDIViewPage;
+class Ui_TaskProjGroup;
 class ViewProviderProjGroup;
 
 class TaskProjGroup : public QWidget
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index 429aa4352c..b0050c51b4 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -24,11 +24,10 @@
 
 #ifndef _PreComp_
 #include <cmath>
-#endif // #ifndef _PreComp_
-
 #include <QStatusBar>
 #include <QGraphicsScene>
 #include <QDialog>
+#endif // #ifndef _PreComp_
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h
index 5aa1b44c28..e08fdb2f24 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.h
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h
@@ -26,7 +26,6 @@
 #include <Base/Vector3D.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskRichAnno.h>
 
 
 class MRichTextEdit;
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h
index 3d30b5fdf2..03f013c60a 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.h
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.h
@@ -25,13 +25,15 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskSectionView.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawViewSection.h>
 
 
 class Ui_TaskSectionView;
 
+namespace TechDraw {
+    class DrawViewPart;
+    class DrawViewSection;
+}
+
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
index 284d3f4bdc..4a45fec0b4 100644
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.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 // #ifndef _PreComp_
+
+#include <BRepBuilderAPI_MakeEdge.hxx>
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
index 12da8b9a66..845222add3 100644
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
@@ -25,7 +25,6 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/App/Cosmetic.h>
 
 
 class dimAttributes {
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index 460f41e997..3ee5b3a5c2 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -26,12 +26,12 @@
 #include <cmath>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
-
+#include <QApplication>
+#include <QGraphicsScene>
+#include <QPushButton>
+#include <QStatusBar>
 #endif // #ifndef _PreComp_
 
-#include <QApplication>
-#include <QStatusBar>
-#include <QGraphicsScene>
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
@@ -73,6 +73,7 @@
 #include "Rez.h"
 
 #include "TaskWeldingSymbol.h"
+#include "ui_TaskWeldingSymbol.h"
 
 using namespace Gui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
index 37c3596aba..679209183b 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
@@ -23,14 +23,10 @@
 #ifndef TECHDRAWGUI_TASKWELDINGSYMBOL_H
 #define TECHDRAWGUI_TASKWELDINGSYMBOL_H
 
-#include <QPushButton>
-
-#include <App/DocumentObject.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Mod/TechDraw/Gui/ui_TaskWeldingSymbol.h>
-
 
+class QPushButton;
 class Ui_TaskWeldingSymbol;
 
 namespace App {
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.cpp b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
index 45964a66ad..1ada1c0ae7 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.cpp
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
@@ -30,6 +30,7 @@
 #endif // #ifndef _PreCmp_
 
 #include <Base/Console.h>
+#include <Mod/TechDraw/App/DrawTemplate.h>
 
 #include "DlgTemplateField.h"
 #include "TemplateTextField.h"
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h
index c54049f867..24960ba67b 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.h
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.h
@@ -25,7 +25,9 @@
 
 #include <QGraphicsRectItem>
 
-#include "Mod/TechDraw/App/DrawTemplate.h"
+namespace TechDraw {
+class DrawTemplate;
+}
 
 namespace TechDrawGui
 {
diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
index a59997af40..826120500b 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp
@@ -29,6 +29,7 @@
 
 #include <App/DocumentObject.h>
 #include "ViewProviderAnnotation.h"
+#include "QGIView.h"
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h
index 312ec6ce6a..1e9e77f7b8 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h
@@ -24,8 +24,6 @@
 #ifndef DRAWINGGUI_VIEWPROVIDERANNOTATION_H
 #define DRAWINGGUI_VIEWPROVIDERANNOTATION_H
 
-#include <Gui/ViewProviderFeature.h>
-
 #include <Mod/TechDraw/App/DrawViewAnnotation.h>
 
 #include "ViewProviderDrawingView.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
index 3dc0ae78e8..e9a280e364 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp
@@ -39,6 +39,7 @@
 #include <Mod/TechDraw/App/LineGroup.h>
 
 #include "PreferencesGui.h"
+#include "QGIViewBalloon.h"
 #include "TaskBalloon.h"
 #include "ViewProviderBalloon.h"
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
index 5627fb4e36..e3da89e733 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
@@ -26,10 +26,10 @@
 
 #ifndef _PreComp_
 # include <QAction>
+# include <QColor>
 # include <QMenu>
 #endif
 
-#include <QColor>
 #include <Base/Parameter.h>
 #include <App/Application.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
index 5c8332785f..a576e62855 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
@@ -34,6 +34,7 @@
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 
+#include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawView.h>
 
 #include "ViewProviderDrawingView.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
index be389a570d..a8b30c8cbb 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
@@ -31,8 +31,6 @@
 #include <Gui/ViewProviderDocumentObject.h>
 #include <Mod/TechDraw/App/DrawView.h>
 
-#include "QGIView.h"
-
 
 namespace TechDraw {
 class DrawView;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
index 4e95d8d0dd..4662505fe1 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp
@@ -38,6 +38,7 @@
 #include <Mod/TechDraw/App/DrawViewPart.h>
 #include <Mod/TechDraw/App/LineGroup.h>
 
+#include "QGIView.h"
 #include "TaskGeomHatch.h"
 #include "PreferencesGui.h"
 #include "ViewProviderDrawingView.h"
diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
index 40d2a5a642..a34f34595b 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h
@@ -24,10 +24,12 @@
 #ifndef DRAWINGGUI_VIEWPROVIDERCROSSHATCH_H
 #define DRAWINGGUI_VIEWPROVIDERCROSSHATCH_H
 
-#include <App/DocumentObject.h>
 #include <App/PropertyStandard.h>
 #include <Gui/ViewProviderDocumentObject.h>
 
+namespace App {
+    class DocumentObject;
+}
 
 namespace TechDraw{
     class DrawGeomHatch;
diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
index 726984ed1b..8d3d4cafc6 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp
@@ -29,6 +29,7 @@
 #include <App/DocumentObject.h>
 
 #include "ViewProviderImage.h"
+#include "QGIView.h"
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
index c1b5b62ff3..c4ba364658 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp
@@ -36,6 +36,7 @@
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 
+#include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawTemplate.h>
 #include <Mod/TechDraw/App/DrawSVGTemplate.h>
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
index 02a74528cd..1279ed1119 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp
@@ -41,6 +41,7 @@
 
 #include "TaskSectionView.h"
 #include "ViewProviderViewSection.h"
+#include "QGIView.h"
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
index f74d0f9b1b..6ceb5b694f 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp
@@ -37,6 +37,7 @@
 #include "PreferencesGui.h"
 #include "TaskWeldingSymbol.h"
 #include "ViewProviderWeld.h"
+#include "QGIView.h"
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/mtextedit.cpp b/src/Mod/TechDraw/Gui/mtextedit.cpp
index fe7ef3ef86..4fa6ac3ec4 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mtextedit.cpp
@@ -20,6 +20,7 @@
 **
 ** $QT_END_LICENSE$
 */
+#include "PreCompiled.h"
 
 #include "mtextedit.h"
 #include <QTextDocument>
@@ -44,21 +45,21 @@ void MTextEdit::insertFromMimeData(const QMimeData *source) {
         QStringList formats = source->formats();
         QString format;
         for (int i=0; i<formats.size(); i++) {
-            if (formats[i] == "image/bmp")  { format = "BMP";  break; }
-            if (formats[i] == "image/jpeg") { format = "JPG";  break; }
-            if (formats[i] == "image/jpg")  { format = "JPG";  break; }
-            if (formats[i] == "image/gif")  { format = "GIF";  break; }
-            if (formats[i] == "image/png")  { format = "PNG";  break; }
-            if (formats[i] == "image/pbm")  { format = "PBM";  break; }
-            if (formats[i] == "image/pgm")  { format = "PGM";  break; }
-            if (formats[i] == "image/ppm")  { format = "PPM";  break; }
-            if (formats[i] == "image/tiff") { format = "TIFF"; break; }
-            if (formats[i] == "image/xbm")  { format = "XBM";  break; }
-            if (formats[i] == "image/xpm")  { format = "XPM";  break; }
+            if (formats[i] == QLatin1String("image/bmp"))  { format = QString::fromLatin1("BMP");  break; }
+            if (formats[i] == QLatin1String("image/jpeg")) { format = QString::fromLatin1("JPG");  break; }
+            if (formats[i] == QLatin1String("image/jpg"))  { format = QString::fromLatin1("JPG");  break; }
+            if (formats[i] == QLatin1String("image/gif"))  { format = QString::fromLatin1("GIF");  break; }
+            if (formats[i] == QLatin1String("image/png"))  { format = QString::fromLatin1("PNG");  break; }
+            if (formats[i] == QLatin1String("image/pbm"))  { format = QString::fromLatin1("PBM");  break; }
+            if (formats[i] == QLatin1String("image/pgm"))  { format = QString::fromLatin1("PGM");  break; }
+            if (formats[i] == QLatin1String("image/ppm"))  { format = QString::fromLatin1("PPM");  break; }
+            if (formats[i] == QLatin1String("image/tiff")) { format = QString::fromLatin1("TIFF"); break; }
+            if (formats[i] == QLatin1String("image/xbm"))  { format = QString::fromLatin1("XBM");  break; }
+            if (formats[i] == QLatin1String("image/xpm"))  { format = QString::fromLatin1("XPM");  break; }
             }
         if (!format.isEmpty()) {
 //          dropImage(qvariant_cast<QImage>(source->imageData()), format);
-            dropImage(qvariant_cast<QImage>(source->imageData()), "JPG"); // Sorry, ale cokoli jiného dlouho trvá
+            dropImage(qvariant_cast<QImage>(source->imageData()), QString::fromLatin1("JPG")); // Sorry, ale cokoli jiného dlouho trvá
             return;
             }
         }
@@ -90,9 +91,9 @@ void MTextEdit::dropImage(const QImage& image, const QString& format) {
     QTextImageFormat imageFormat;
     imageFormat.setWidth  ( image.width() );
     imageFormat.setHeight ( image.height() );
-    imageFormat.setName   ( QString("data:image/%1;base64,%2")
-                                .arg(QString("%1.%2").arg(rand()).arg(format))
-                                .arg(base64l.data())
+    imageFormat.setName   ( QString::fromLatin1("data:image/%1;base64,%2")
+                                .arg(QString::fromLatin1("%1.%2").arg(rand()).arg(format))
+                                .arg(QString::fromLatin1(base64l.data()))
                                 );
     cursor.insertImage    ( imageFormat );
 }