diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
index f75f97a614..732211d568 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
@@ -24,65 +24,45 @@
 
 #ifndef _PreComp_
 # include <sstream>
-# include <cstring>
-# include <cstdlib>
-# include <exception>
-# include <boost/regex.hpp>
+
 # include <QComboBox>
-# include <QString>
-# include <QStringList>
 # include <QMessageBox>
-# include <QRectF>
 # include <QPointF>
+# include <QRectF>
+# include <QString>
+
+# include <BRepAdaptor_Surface.hxx>
+# include <BRepLProp_SLProps.hxx>
+# include <gp_Dir.hxx>
 #endif
 
-#include <gp_Vec.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax2.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepLProp_SLProps.hxx>
-
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <App/FeaturePython.h>
-#include <App/Property.h>
 #include <App/PropertyPythonObject.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/Parameter.h>
 #include <Base/Type.h>
 #include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
-#include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MDIView.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-
 #include <Inventor/SbVec3f.h>
-
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/Part2DObject.h>
-#include <Mod/Spreadsheet/App/Sheet.h>
-
-#include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/ArrowPropEnum.h>
+#include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawUtil.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
 
-#include "QGSPage.h"
-#include "QGVPage.h"
-#include "MDIViewPage.h"
-#include "ViewProviderPage.h"
-#include "DlgPageChooser.h"
 #include "DrawGuiUtil.h"
+#include "DlgPageChooser.h"
+#include "MDIViewPage.h"
+#include "QGSPage.h"
+#include "ViewProviderPage.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.h b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
index b425a360b2..dd0ec46888 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -23,12 +23,12 @@
 #ifndef DrawGuiUtil_h_
 #define DrawGuiUtil_h_
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <string>
 #include <QCoreApplication>
 
 #include <Base/Vector3D.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
+
 
 class QComboBox;
 class QPointF;
diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp
index 2e0edb7b6e..a56fa60bf2 100644
--- a/src/Mod/TechDraw/Gui/Grabber3d.cpp
+++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp
@@ -22,14 +22,7 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-
-#endif
-
-#include <App/Document.h>
 #include <Base/Console.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MDIView.h>
 #include <Gui/View3DInventor.h>
@@ -37,6 +30,7 @@
 
 #include "Grabber3d.h"
 
+
 using namespace TechDrawGui;
 using namespace Gui;
 
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index b064a1531c..51145984f5 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -21,71 +21,59 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-    #include <cmath>
-    #include <QAction>
-    #include <QTimer>
-    #include <QApplication>
-    #include <QContextMenuEvent>
-    #include <QFileDialog>
-    #include <QGridLayout>
-    #include <QGroupBox>
-    #include <QListWidget>
-    #include <QMenu>
-    #include <QMessageBox>
-    #include <QPageLayout>
-    #include <QPageSize>
-    #include <QPaintEngine>
-    #include <QPainter>
-    #include <QPdfWriter>
-    #include <QPrinter>
-    #include <QPrintDialog>
-    #include <QPrintPreviewDialog>
-    #include <boost_signals2.hpp>
-#endif  // #ifndef _PreComp_
-
-
-#include "MDIViewPage.h"
-
-#include <Base/Stream.h>
-#include <Base/Tools.h>
-#include <Base/gzstream.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Console.h>
+# include <cmath>
+# include <QAction>
+# include <QApplication>
+# include <QContextMenuEvent>
+# include <QMenu>
+# include <QMessageBox>
+# include <QPageLayout>
+# include <QPageSize>
+# include <QPaintEngine>
+# include <QPainter>
+# include <QPdfWriter>
+# include <QPrinter>
+# include <QPrintDialog>
+# include <QPrintPreviewDialog>
+# include <boost_signals2.hpp>
+#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-
-#include <Gui/Document.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/FileDialog.h>
-#include <Gui/WaitCursor.h>
+#include <Base/Console.h>
+#include <Base/Stream.h>
+#include <Base/Tools.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/Window.h>
+#include <Gui/Document.h>
+#include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-
+#include <Gui/ViewProvider.h>
+#include <Gui/WaitCursor.h>
+#include <Gui/Window.h>
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawPagePy.h>
 #include <Mod/TechDraw/App/DrawTemplate.h>
 #include <Mod/TechDraw/App/Preferences.h>
 
-#include "Rez.h"
-#include "QGIView.h"
-#include "QGIViewDimension.h"
-#include "QGIViewBalloon.h"
-#include "QGIVertex.h"
+#include "MDIViewPage.h"
 #include "QGIEdge.h"
 #include "QGIFace.h"
-#include "ViewProviderPage.h"
+#include "QGIVertex.h"
+#include "QGIView.h"
+#include "QGIViewBalloon.h"
+#include "QGIViewDimension.h"
+#include "QGMText.h"
 #include "QGSPage.h"
 #include "QGVPage.h"
-#include "QGMText.h"
+#include "Rez.h"
+#include "ViewProviderPage.h"
 
 
 using namespace TechDrawGui;
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index 4e92a9ee40..0757aafb93 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -23,14 +23,12 @@
 #ifndef TECHDRAWGUI_MDIVIEWPAGE_H
 #define TECHDRAWGUI_MDIVIEWPAGE_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
-#include <QPointF>
 #include <QPrinter>
 
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
 #include <Gui/Selection.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include "ViewProviderPage.h"
 
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index 991f4a746a..c6af496e96 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -59,15 +59,15 @@
 #include <sstream>
 
 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
 #include <algorithm>
-#include <stack>
-#include <queue>
 #include <bitset>
+#include <list>
+#include <map>
+#include <queue>
+#include <set>
+#include <stack>
+#include <string>
+#include <vector>
 
 #ifdef FC_OS_WIN32
 # define WIN32_LEAN_AND_MEAN
@@ -75,7 +75,6 @@
 # undef small
 #endif
 
-
 // Qt Toolkit
 #ifndef _QtAll__
 # include <Gui/QtAll.h>
diff --git a/src/Mod/TechDraw/Gui/PreferencesGui.cpp b/src/Mod/TechDraw/Gui/PreferencesGui.cpp
index fe8a65a5e2..61e3d04627 100644
--- a/src/Mod/TechDraw/Gui/PreferencesGui.cpp
+++ b/src/Mod/TechDraw/Gui/PreferencesGui.cpp
@@ -23,24 +23,21 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <string>
-#include <QString>
-#include <QFont>
-#include <QColor>
-#include <QPen>
+# include <string>
+# include <QColor>
+# include <QFont>
+# include <QString>
 #endif
 
 #include <App/Application.h>
 #include <App/Material.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Parameter.h>
-#include <Base/Vector3D.h>
-
 #include <Mod/TechDraw/App/Preferences.h>
 
-#include "Rez.h"
 #include "PreferencesGui.h"
+#include "Rez.h"
+
 
 //getters for parameters used in multiple places.
 //ensure this is in sync with preference page user interfaces
diff --git a/src/Mod/TechDraw/Gui/Rez.cpp b/src/Mod/TechDraw/Gui/Rez.cpp
index 49f54fb5d8..e103b70456 100644
--- a/src/Mod/TechDraw/Gui/Rez.cpp
+++ b/src/Mod/TechDraw/Gui/Rez.cpp
@@ -19,25 +19,21 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
+
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-
-#endif
-
 #include <App/Application.h>
-#include <Base/Console.h>
 #include <Base/Parameter.h>
 
 #include "Rez.h"
 
+
 using namespace TechDrawGui;
 
 //*** initial static var outside methods!
 double Rez::m_rezFactor = Rez::getParameter();
 //***
 
-
 double Rez::getRezFactor()
 {
     return Rez::m_rezFactor;
@@ -48,7 +44,6 @@ void Rez::setRezFactor(double f)
     Rez::m_rezFactor = f;
 }
 
-
 //turn App side value to Gui side value
 double Rez::guiX(double x)
 {
diff --git a/src/Mod/TechDraw/Gui/Rez.h b/src/Mod/TechDraw/Gui/Rez.h
index e09e6e4e67..24da0f6b46 100644
--- a/src/Mod/TechDraw/Gui/Rez.h
+++ b/src/Mod/TechDraw/Gui/Rez.h
@@ -23,14 +23,13 @@
 #ifndef DRAWINGGUI_REZ_H
 #define DRAWINGGUI_REZ_H
 
-#include <Mod/TechDraw/TechDrawGlobal.h>
-
 #include <QPointF>
 #include <QRectF>
 #include <QSize>
 
 #include <Base/Tools2D.h>
 #include <Base/Vector3D.h>
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 
 namespace TechDrawGui
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.cpp b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
index 88f37a0706..a15222c49a 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.cpp
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -22,13 +22,13 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QListWidget>
+# include <QListWidget>
 #endif
 
 #include <App/Application.h>
-#include <Mod/TechDraw/Gui/ui_SymbolChooser.h>
 
 #include "SymbolChooser.h"
+#include "ui_SymbolChooser.h"
 
 
 using namespace Gui;
diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp
index f1af6f4792..3c41a7d4a7 100644
--- a/src/Mod/TechDraw/Gui/Workbench.cpp
+++ b/src/Mod/TechDraw/Gui/Workbench.cpp
@@ -27,9 +27,10 @@
 # include <qobject.h>
 #endif
 
-#include "Workbench.h"
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
+#include "Workbench.h"
+
 
 using namespace TechDrawGui;
 
diff --git a/src/Mod/TechDraw/Gui/Workbench.h b/src/Mod/TechDraw/Gui/Workbench.h
index 9c17696ed9..f6ff098dbe 100644
--- a/src/Mod/TechDraw/Gui/Workbench.h
+++ b/src/Mod/TechDraw/Gui/Workbench.h
@@ -23,8 +23,8 @@
 
 #ifndef TECHDRAW_WORKBENCH_H
 #define TECHDRAW_WORKBENCH_H
-
-#include <Mod/TechDraw/TechDrawGlobal.h>
+
+#include <Mod/TechDraw/TechDrawGlobal.h>
 
 #include <Gui/Workbench.h>
 
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
index d30cf4f4bc..97ccfcf86c 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
@@ -27,40 +27,36 @@
  ********************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-#include <algorithm>
-#include <iostream>
-#include <QApplication>
-#include <QClipboard>
-#include <QMimeData>
-#include <QFontDatabase>
-#include <QInputDialog>
-#include <QColorDialog>
-#include <QTextList>
-#include <QtDebug>
-#include <QFileDialog>
-#include <QImageReader>
-#include <QSettings>
-#include <QBuffer>
-#include <QUrl>
-#include <QPlainTextEdit>
-#include <QMenu>
-#include <QDialog>
-#include <QBitmap>
-#include <QRegularExpression>
+# include <algorithm>
+# include <iostream>
+# include <QApplication>
+# include <QBitmap>
+# include <QClipboard>
+# include <QColorDialog>
+# include <QDialog>
+# include <QFileDialog>
+# include <QFontDatabase>
+# include <QImageReader>
+# include <QInputDialog>
+# include <QMenu>
+# include <QMimeData>
+# include <QPlainTextEdit>
+# include <QRegularExpression>
+# include <QSettings>
+# include <QTextList>
 #endif
 
+#include <App/Application.h>
 #include <Base/Console.h>
-#include <Base/Parameter.h>
 #include <Base/Tools.h>
 #include <Gui/FileDialog.h>
-
 #include <Mod/TechDraw/App/Preferences.h>
 
-#include <App/Application.h>
-
-#include "PreferencesGui.h"
 #include "mrichtextedit.h"
+#include "PreferencesGui.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
diff --git a/src/Mod/TechDraw/Gui/mtextedit.cpp b/src/Mod/TechDraw/Gui/mtextedit.cpp
index 46b23476aa..8c903db90c 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mtextedit.cpp
@@ -24,13 +24,11 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <cstdlib>
-
-#include <QTextDocument>
-#include <QTextCursor>
-#include <QImage>
-#include <QByteArray>
-#include <QBuffer>
+# include <cstdlib>
+# include <QBuffer>
+# include <QByteArray>
+# include <QImage>
+# include <QTextCursor>
 #endif
 
 #include "mtextedit.h"