diff --git a/src/Mod/TechDraw/Gui/QGVNavStyle.cpp b/src/Mod/TechDraw/Gui/QGVNavStyle.cpp
index 4ba0b90d36..df981f4fc5 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyle.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyle.cpp
@@ -22,23 +22,20 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QContextMenuEvent>
-#include <QKeyEvent>
-#include <QScrollBar>
+# include <QContextMenuEvent>
+# include <QKeyEvent>
+# include <QScrollBar>
 #endif
 
+#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
-
-#include <App/Application.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
 
 #include "QGVNavStyle.h"
-#include "QGVPage.h"
 #include "QGSPage.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp
index 24c14c0a34..b6242ad066 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleBlender.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleBlender.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp
index d01c3771f9..2157632b8a 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleCAD.cpp
@@ -22,13 +22,14 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QApplication>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleCAD.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp
index 5d75960c5a..6f440f0d39 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleGesture.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleGesture.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp
index 5be8915bec..7b85d37786 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleInventor.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleInventor.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp
index 880808baf9..01ddba8710 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleMaya.cpp
@@ -22,13 +22,14 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QApplication>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleMaya.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp
index aa0dedbb30..410916309d 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleOCC.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleOCC.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp
index b78e1a934a..e0703fef9e 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleOpenSCAD.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleOpenSCAD.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp
index 3aa5a227c5..2d1d10de07 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleRevit.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleRevit.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp
index 502b79b634..06cf7353ff 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleTinkerCAD.cpp
@@ -22,17 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
-#include <QScrollBar>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include <Mod/TechDraw/App/DrawPage.h>
-
-#include "QGVPage.h"
-#include "QGSPage.h"
 #include "QGVNavStyleTinkerCAD.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
index 33c4b1553b..fe987ed333 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
@@ -22,13 +22,14 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QApplication>
-#include <QGuiApplication>
-#include <QMouseEvent>
+# include <QApplication>
+# include <QGuiApplication>
+# include <QMouseEvent>
 #endif
 
-#include "QGVPage.h"
 #include "QGVNavStyleTouchpad.h"
+#include "QGVPage.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp
index 0872cea1e3..68aee200cf 100644
--- a/src/Mod/TechDraw/Gui/QGVPage.cpp
+++ b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -22,111 +22,51 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cmath>
+# include <cmath>
 
-#include <QAction>
-#include <QApplication>
-#include <QBitmap>
-#include <QContextMenuEvent>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QGLWidget>
-#include <QGraphicsEffect>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPaintEvent>
-#include <QSvgGenerator>
-#include <QScrollBar>
-#include <QWheelEvent>
-#include <QTemporaryFile>
-#include <QDomDocument>
-#include <QTextStream>
-#include <QFile>
-#include <QLabel>
+# include <QApplication>
+# include <QBitmap>
+# include <QContextMenuEvent>
+# include <QGLWidget>
+# include <QLabel>
+# include <QMouseEvent>
+# include <QPainter>
+# include <QPaintEvent>
+# include <QScrollBar>
+# include <QWheelEvent>
 #endif
 
 #include <App/Application.h>
 #include <App/Document.h>
-#include <App/Material.h>
 #include <Base/Console.h>
 #include <Base/Parameter.h>
-#include <Base/Stream.h>
-#include <Gui/FileDialog.h>
-#include <Gui/Selection.h>
-#include <Gui/WaitCursor.h>
-#include <Gui/Command.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/MainWindow.h>
+#include <Gui/Document.h>
+#include <Gui/NavigationStyle.h>
+#include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/NavigationStyle.h>
 
-#include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawTemplate.h>
 #include <Mod/TechDraw/App/DrawSVGTemplate.h>
-#include <Mod/TechDraw/App/DrawParametricTemplate.h>
-#include <Mod/TechDraw/App/DrawViewCollection.h>
-#include <Mod/TechDraw/App/DrawViewBalloon.h>
-#include <Mod/TechDraw/App/DrawViewDimension.h>
-//#include <Mod/TechDraw/App/LandmarkDimension.h>
-#include <Mod/TechDraw/App/DrawProjGroup.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawViewAnnotation.h>
-#include <Mod/TechDraw/App/DrawViewSymbol.h>
-#include <Mod/TechDraw/App/DrawViewClip.h>
-#include <Mod/TechDraw/App/DrawHatch.h>
-#include <Mod/TechDraw/App/DrawViewSpreadsheet.h>
-#include <Mod/TechDraw/App/DrawViewImage.h>
-#include <Mod/TechDraw/App/DrawLeaderLine.h>
-#include <Mod/TechDraw/App/DrawRichAnno.h>
-#include <Mod/TechDraw/App/DrawWeldSymbol.h>
-#include <Mod/TechDraw/App/DrawTile.h>
-#include <Mod/TechDraw/App/DrawTileWeld.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
 
-#include "Rez.h"
-#include "PreferencesGui.h"
-#include "DrawGuiUtil.h"
-#include "QGIDrawingTemplate.h"
-#include "QGITemplate.h"
-#include "QGISVGTemplate.h"
-#include "TemplateTextField.h"
-#include "QGIViewCollection.h"
-#include "QGIViewDimension.h"
-#include "QGIViewBalloon.h"
-#include "QGIProjGroup.h"
-#include "QGIViewPart.h"
-#include "QGIViewSection.h"
-#include "QGIViewAnnotation.h"
-#include "QGIViewSymbol.h"
-#include "QGIViewClip.h"
-#include "QGIViewSpreadsheet.h"
-#include "QGIViewImage.h"
-#include "QGIFace.h"
-#include "QGILeaderLine.h"
-#include "QGIRichAnno.h"
-#include "QGIWeldSymbol.h"
-#include "QGITile.h"
-
-#include "ZVALUE.h"
-#include "ViewProviderPage.h"
-#include "QGSPage.h"
 #include "QGVPage.h"
 #include "MDIViewPage.h"
-#include "QGVNavStyle.h"
+#include "PreferencesGui.h"
+#include "QGSPage.h"
 #include "QGVNavStyleBlender.h"
-#include "QGVNavStyleTouchpad.h"
 #include "QGVNavStyleCAD.h"
-#include "QGVNavStyleTinkerCAD.h"
 #include "QGVNavStyleGesture.h"
 #include "QGVNavStyleInventor.h"
 #include "QGVNavStyleMaya.h"
 #include "QGVNavStyleOCC.h"
 #include "QGVNavStyleOpenSCAD.h"
 #include "QGVNavStyleRevit.h"
+#include "QGVNavStyleTinkerCAD.h"
+#include "QGVNavStyleTouchpad.h"
+#include "Rez.h"
+#include "ViewProviderPage.h"
+
 
 // used SVG namespaces
 #define CC_NS_URI "http://creativecommons.org/ns#"