diff --git a/src/Mod/Drawing/Gui/AppDrawingGui.cpp b/src/Mod/Drawing/Gui/AppDrawingGui.cpp
index 5ceffbd906..e58bf7a377 100644
--- a/src/Mod/Drawing/Gui/AppDrawingGui.cpp
+++ b/src/Mod/Drawing/Gui/AppDrawingGui.cpp
@@ -26,6 +26,7 @@
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
+
 #include "Workbench.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderView.h"
diff --git a/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp b/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp
index b849c52fea..6eead31417 100644
--- a/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp
+++ b/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp
@@ -22,29 +22,25 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QFileInfo>
-# include <QIcon>
-# include <QImage>
 # include <sstream>
+
+# include <QFileInfo>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
+#include <App/DocumentObjectPy.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
+#include <Base/Stream.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/MainWindow.h>
 
-#include "DrawingView.h"
 #include <Mod/Drawing/App/FeaturePage.h>
 #include <Mod/Drawing/App/FeatureViewPart.h>
 #include <Mod/Drawing/App/ProjectionAlgos.h>
 #include <Mod/Part/App/PartFeature.h>
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <App/Application.h>
-#include <App/DocumentObjectPy.h>
-#include <Gui/MainWindow.h>
-#include <Gui/BitmapFactory.h>
+#include "DrawingView.h"
+
 
 namespace DrawingGui {
 class Module : public Py::ExtensionModule<Module>
diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt
index a20b6297d1..9bee0d9f6b 100644
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -64,6 +64,18 @@ SET(DrawingGuiTaskDlgs_SRCS
 )
 SOURCE_GROUP("TaskDialogs" FILES ${DrawingGuiTaskDlgs_SRCS})
 
+SET(DrawingGuiComplete_SRCS
+    ${DrawingGui_SRCS}
+    ${DrawingGuiView_SRCS}
+    ${DrawingGuiViewProvider_SRCS}
+)
+
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${DrawingGuiComplete_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(DrawingGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 SET(DrawingGuiIcon_SVG
     Resources/icons/DrawingWorkbench.svg
 )
diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp
index 9126056635..04577252e1 100644
--- a/src/Mod/Drawing/Gui/Command.cpp
+++ b/src/Mod/Drawing/Gui/Command.cpp
@@ -12,6 +12,8 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
+# include <vector>
+
 # include <QCoreApplication>
 # include <QDir>
 # include <QFile>
@@ -20,30 +22,25 @@
 # include <QRegExp>
 #endif
 
-#include <vector>
-
-#include <Base/Tools.h>
 #include <App/Document.h>
 #include <App/PropertyGeo.h>
-
+#include <Base/Tools.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Gui/Selection.h>
-#include <Gui/MainWindow.h>
 #include <Gui/FileDialog.h>
-
-#include <Mod/Part/App/PartFeature.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 #include <Mod/Drawing/App/FeaturePage.h>
+#include <Mod/Part/App/PartFeature.h>
 #include <Mod/Spreadsheet/App/Sheet.h>
 
-
-#include "DrawingView.h"
 #include "TaskDialog.h"
 #include "TaskOrthoViews.h"
 
+
 using namespace DrawingGui;
 using namespace std;
 
diff --git a/src/Mod/Drawing/Gui/DrawingView.cpp b/src/Mod/Drawing/Gui/DrawingView.cpp
index df8b25e12f..4219870b6a 100644
--- a/src/Mod/Drawing/Gui/DrawingView.cpp
+++ b/src/Mod/Drawing/Gui/DrawingView.cpp
@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <cmath>
+
 # include <QAction>
 # include <QApplication>
-# include <QBuffer>
 # include <QContextMenuEvent>
 # include <QFileInfo>
 # include <QFileDialog>
@@ -37,34 +37,26 @@
 # include <QListWidget>
 # include <QMenu>
 # include <QMessageBox>
-# include <QMouseEvent>
 # include <QPainter>
 # include <QPaintEvent>
 # include <QPrinter>
 # include <QPrintDialog>
 # include <QPrintPreviewDialog>
-# include <QPrintPreviewWidget>
-# include <QScrollArea>
-# include <QSlider>
-# include <QStatusBar>
-# include <QSvgRenderer>
-# include <QSvgWidget>
 # include <QWheelEvent>
-# include <cmath>
+
 #endif
 
-#include "DrawingView.h"
-#include <Base/Parameter.h>
-#include <Base/Stream.h>
-#include <Base/gzstream.h>
-#include <Base/PyObjectBase.h>
 #include <App/Application.h>
 #include <App/Document.h>
+#include <Base/Parameter.h>
 #include <Gui/Document.h>
-#include <Gui/ViewProvider.h>
 #include <Gui/FileDialog.h>
+#include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 
+#include "DrawingView.h"
+
+
 using namespace DrawingGui;
 
 SvgView::SvgView(QWidget *parent)
diff --git a/src/Mod/Drawing/Gui/DrawingView.h b/src/Mod/Drawing/Gui/DrawingView.h
index 1a37149025..d7c43b07fc 100644
--- a/src/Mod/Drawing/Gui/DrawingView.h
+++ b/src/Mod/Drawing/Gui/DrawingView.h
@@ -20,15 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_DRAWINGVIEW_H
 #define DRAWINGGUI_DRAWINGVIEW_H
 
-#include <Gui/MDIView.h>
-#include <Mod/Drawing/DrawingGlobal.h>
 #include <QGraphicsView>
 #include <QPrinter>
 
+#include <Gui/MDIView.h>
+#include <Mod/Drawing/DrawingGlobal.h>
+
+
 QT_BEGIN_NAMESPACE
 class QSlider;
 class QAction;
diff --git a/src/Mod/Drawing/Gui/PreCompiled.cpp b/src/Mod/Drawing/Gui/PreCompiled.cpp
index 90814f0b6c..3139e21f64 100644
--- a/src/Mod/Drawing/Gui/PreCompiled.cpp
+++ b/src/Mod/Drawing/Gui/PreCompiled.cpp
@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h" 
diff --git a/src/Mod/Drawing/Gui/PreCompiled.h b/src/Mod/Drawing/Gui/PreCompiled.h
index 59ecb5ec55..855f8a5968 100644
--- a/src/Mod/Drawing/Gui/PreCompiled.h
+++ b/src/Mod/Drawing/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_PRECOMPILED_H
 #define DRAWINGGUI_PRECOMPILED_H
 
@@ -32,31 +31,38 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <iostream>
-#include <cassert>
-#include <cmath>
-
 // STL
+#include <cmath>
+#include <sstream>
 #include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
 
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
-
-
-// Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+// Qt
+#include <QAction>
+#include <QApplication>
+#include <QCheckBox>
+#include <QContextMenuEvent>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QGLWidget>
+#include <QGraphicsRectItem>
+#include <QGraphicsSvgItem>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QRegExp>
+#include <QTimer>
+#include <QWheelEvent>
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Drawing/Gui/TaskDialog.cpp b/src/Mod/Drawing/Gui/TaskDialog.cpp
index e1c53d02dc..8ac2ad756d 100644
--- a/src/Mod/Drawing/Gui/TaskDialog.cpp
+++ b/src/Mod/Drawing/Gui/TaskDialog.cpp
@@ -20,46 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QCheckBox>
 # include <QMessageBox>
 #endif
 
-
-#include <Standard_math.hxx>
-#include "TaskDialog.h"
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/Selection.h>
 #include <Gui/Document.h>
+#include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Mod/Part/App/PartFeature.h>
 
+#include "TaskDialog.h"
+
+
 using namespace DrawingGui;
 
-
 /* TRANSLATOR DrawingGui::TaskProjection */
-
-TaskProjection::TaskProjection()
-{
-    QString texts[10] = 
-    {
-        tr("Visible sharp edges"),
-        tr("Visible smooth edges"),
-        tr("Visible sewn edges"),
-        tr("Visible outline edges"),
-        tr("Visible isoparameters"),
-        tr("Hidden sharp edges"),
-        tr("Hidden smooth edges"),
-        tr("Hidden sewn edges"),
-        tr("Hidden outline edges"),
-        tr("Hidden isoparameters")
-    };
-    widget = new QWidget();
+
+TaskProjection::TaskProjection()
+{
+    QString texts[10] = 
+    {
+        tr("Visible sharp edges"),
+        tr("Visible smooth edges"),
+        tr("Visible sewn edges"),
+        tr("Visible outline edges"),
+        tr("Visible isoparameters"),
+        tr("Hidden sharp edges"),
+        tr("Hidden smooth edges"),
+        tr("Hidden sewn edges"),
+        tr("Hidden outline edges"),
+        tr("Hidden isoparameters")
+    };
+    widget = new QWidget();
     QVBoxLayout *mainLayout = new QVBoxLayout;
 
     for (int i=0; i<10; i++) {
@@ -73,19 +70,19 @@ TaskProjection::TaskProjection()
 
     widget->setLayout(mainLayout);
 
-    taskbox = new Gui::TaskView::TaskBox(
-        QPixmap(), tr("Project shapes"), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
-}
-
-TaskProjection::~TaskProjection()
-{
-    // automatically deleted in the sub-class
-}
-
-bool TaskProjection::accept()
-{
+    taskbox = new Gui::TaskView::TaskBox(
+        QPixmap(), tr("Project shapes"), false, nullptr);
+    taskbox->groupLayout()->addWidget(widget);
+    Content.push_back(taskbox);
+}
+
+TaskProjection::~TaskProjection()
+{
+    // automatically deleted in the sub-class
+}
+
+bool TaskProjection::accept()
+{
     Gui::Document* document = Gui::Application::Instance->activeDocument();
     if (!document) {
         QMessageBox::warning(widget, tr("No active document"),
@@ -139,7 +136,7 @@ bool TaskProjection::accept()
     }
     Gui::Command::updateActive();
     Gui::Command::commitCommand();
-    return true;
-}
-
-#include "moc_TaskDialog.cpp"
+    return true;
+}
+
+#include "moc_TaskDialog.cpp"
diff --git a/src/Mod/Drawing/Gui/TaskDialog.h b/src/Mod/Drawing/Gui/TaskDialog.h
index 1224b5b101..ad87e17ce2 100644
--- a/src/Mod/Drawing/Gui/TaskDialog.h
+++ b/src/Mod/Drawing/Gui/TaskDialog.h
@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_TASKDIALOG
 #define DRAWINGGUI_TASKDIALOG
 
 #include <QWidget>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
+
 class QCheckBox;
 
 namespace DrawingGui
diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
index 87b3d7fa0b..513b11b6d1 100644
--- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
+++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp
@@ -22,21 +22,19 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QCheckBox>
 # include <QLineEdit>
 # include <QMenu>
 #endif
 
-#include "TaskOrthoViews.h"
-#include "ui_TaskOrthoViews.h"
-
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Mod/Part/App/PartFeature.h>
 #include <Mod/Drawing/App/FeaturePage.h>
+#include <Mod/Part/App/PartFeature.h>
+
+#include "TaskOrthoViews.h"
+#include "ui_TaskOrthoViews.h"
 
 
 using namespace Gui;
diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.h b/src/Mod/Drawing/Gui/TaskOrthoViews.h
index 2351e6ebcd..d680770beb 100644
--- a/src/Mod/Drawing/Gui/TaskOrthoViews.h
+++ b/src/Mod/Drawing/Gui/TaskOrthoViews.h
@@ -23,19 +23,19 @@
 #ifndef GUI_TASKVIEW_TASKORTHOVIEWS_H
 #define GUI_TASKVIEW_TASKORTHOVIEWS_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/TaskView/TaskDialog.h>
-#include <Base/BoundBox.h>
-
 #include <gp_Ax2.hxx>
 #include <vector>
+
+#include <QCheckBox>
+
 #include <boost_signals2.hpp>
 
+#include <Base/BoundBox.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Drawing/App/FeatureViewPart.h>
 
 
-
-
 namespace DrawingGui {
 class Ui_TaskOrthoViews;
 
diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.cpp b/src/Mod/Drawing/Gui/ViewProviderPage.cpp
index 6dd9f8fef2..46d80d2b06 100644
--- a/src/Mod/Drawing/Gui/ViewProviderPage.cpp
+++ b/src/Mod/Drawing/Gui/ViewProviderPage.cpp
@@ -20,32 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QAction>
 # include <QMenu>
 # include <QTimer>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
-#include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
-#include <Gui/Selection.h>
-#include <Gui/MainWindow.h>
 #include <Gui/BitmapFactory.h>
+#include <Gui/MainWindow.h>
 #include <Gui/ViewProviderDocumentObjectGroup.h>
-
+#include <Mod/Drawing/App/FeaturePage.h>
 
 #include "ViewProviderPage.h"
-#include <Mod/Drawing/App/FeaturePage.h>
+
 
 using namespace DrawingGui;
 
diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.h b/src/Mod/Drawing/Gui/ViewProviderPage.h
index 3f8caf6119..d646d3549b 100644
--- a/src/Mod/Drawing/Gui/ViewProviderPage.h
+++ b/src/Mod/Drawing/Gui/ViewProviderPage.h
@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H
 #define DRAWINGGUI_VIEWPROVIDERPAGE_H
 
 #include <QPointer>
-#include <Gui/ViewProviderFeature.h>
+
 #include <Gui/ViewProviderDocumentObjectGroup.h>
 
 #include "DrawingView.h"
 
+
 namespace Drawing{
     class FeaturePage;
 }
diff --git a/src/Mod/Drawing/Gui/ViewProviderView.cpp b/src/Mod/Drawing/Gui/ViewProviderView.cpp
index f8858d7e11..2a20ca8c62 100644
--- a/src/Mod/Drawing/Gui/ViewProviderView.cpp
+++ b/src/Mod/Drawing/Gui/ViewProviderView.cpp
@@ -20,24 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
-#include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Gui/Selection.h>
-
-#include <Mod/Drawing/App/FeatureView.h>
 #include <Mod/Drawing/App/FeatureClip.h>
+#include <Mod/Drawing/App/FeatureView.h>
+
 #include "ViewProviderView.h"
 
 
diff --git a/src/Mod/Drawing/Gui/ViewProviderView.h b/src/Mod/Drawing/Gui/ViewProviderView.h
index 5b86df4b2a..91295a0f6a 100644
--- a/src/Mod/Drawing/Gui/ViewProviderView.h
+++ b/src/Mod/Drawing/Gui/ViewProviderView.h
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_VIEWPROVIDERVIEW_H
 #define DRAWINGGUI_VIEWPROVIDERVIEW_H
 
-#include <Gui/ViewProviderFeature.h>
 #include <Gui/ViewProviderDocumentObjectGroup.h>
 
 
diff --git a/src/Mod/Drawing/Gui/Workbench.cpp b/src/Mod/Drawing/Gui/Workbench.cpp
index bd8e306eef..51d7f17129 100644
--- a/src/Mod/Drawing/Gui/Workbench.cpp
+++ b/src/Mod/Drawing/Gui/Workbench.cpp
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
-
-#include "Workbench.h"
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
 
+#include "Workbench.h"
+
+
 using namespace DrawingGui;
 
 #if 0 // needed for Qt's lupdate utility
diff --git a/src/Mod/Drawing/Gui/Workbench.h b/src/Mod/Drawing/Gui/Workbench.h
index d7a5e1d004..595c81ff91 100644
--- a/src/Mod/Drawing/Gui/Workbench.h
+++ b/src/Mod/Drawing/Gui/Workbench.h
@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWING_WORKBENCH_H
 #define DRAWING_WORKBENCH_H
 
 #include <Gui/Workbench.h>
 
+
 namespace DrawingGui {
 
 /**