diff --git a/src/Mod/TechDraw/Gui/DrawGuiStd.h b/src/Mod/TechDraw/Gui/DrawGuiStd.h
index dfcf4f1708..07c93fbef2 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiStd.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiStd.h
@@ -22,15 +22,10 @@
 
 // "DrawGuiStd.h"
 // standard includes for TechDraw/Gui files
+
 #ifndef TECHDRAWGUI_STANDARD_H
 #define TECHDRAWGUI_STANDARD_H
 
-#include <Base/Console.h>
-
 #include <Mod/TechDraw/App/DrawUtil.h>
 
-#include "Rez.h"
-#include "ZVALUE.h"
-#include "DrawGuiUtil.h"
-
 #endif // #ifndef TECHDRAWGUI_STANDARD_H
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.h b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
index 94150c8f04..02ae91c385 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -24,15 +24,14 @@
 #define _DrawGuiUtil_h_
 
 #include <string>
-#include <QCoreApplication>
-#include <QRectF>
-#include <QPointF>
 #include <QComboBox>
-#include <Base/Vector3D.h>
+#include <QCoreApplication>
+#include <QPointF>
+#include <QRectF>
 
 #include <App/DocumentObject.h>
+#include <Base/Vector3D.h>
 
-/*#include <Gui/PrefWidgets.h>*/
 
 namespace Part {
 class Feature;
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index 1cac4cb8e6..474fc8df77 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -20,22 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef TECHDRAWGUI_MDIVIEWPAGE_H
 #define TECHDRAWGUI_MDIVIEWPAGE_H
 
-#include "ViewProviderPage.h"
+#include <QGraphicsScene>
+#include <QPointF>
+#include <QPrinter>
 
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
 #include <Gui/Selection.h>
-
-#include <QPrinter>
-#include <QGraphicsScene>
-#include <QPointF>
-
 #include <Mod/TechDraw/App/DrawPage.h>
 
+#include "ViewProviderPage.h"
+
+
 QT_BEGIN_NAMESPACE
 class QAction;
 class QTimer;
diff --git a/src/Mod/TechDraw/Gui/QGCustomImage.h b/src/Mod/TechDraw/Gui/QGCustomImage.h
index 0a1f3dee4a..dce9116b4d 100644
--- a/src/Mod/TechDraw/Gui/QGCustomImage.h
+++ b/src/Mod/TechDraw/Gui/QGCustomImage.h
@@ -23,13 +23,14 @@
 #ifndef DRAWINGGUI_QGCUSTOMIMAGE_H
 #define DRAWINGGUI_QGCUSTOMIMAGE_H
 
+#include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsPixmapItem>
 #include <QPointF>
 #include <QSize>
-#include <QByteArray>
 #include <QPixmap>
 
+
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QStyleOptionGraphicsItem;
diff --git a/src/Mod/TechDraw/Gui/QGCustomSvg.h b/src/Mod/TechDraw/Gui/QGCustomSvg.h
index 9cdeeecee3..602a4b9884 100644
--- a/src/Mod/TechDraw/Gui/QGCustomSvg.h
+++ b/src/Mod/TechDraw/Gui/QGCustomSvg.h
@@ -23,12 +23,13 @@
 #ifndef DRAWINGGUI_QGCUSTOMSVG_H
 #define DRAWINGGUI_QGCUSTOMSVG_H
 
+#include <QByteArray>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QPointF>
-#include <QByteArray>
 #include <QSvgRenderer>
 
+
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QStyleOptionGraphicsItem;
diff --git a/src/Mod/TechDraw/Gui/QGEPath.cpp b/src/Mod/TechDraw/Gui/QGEPath.cpp
index 49951a7d37..33d908b7e5 100644
--- a/src/Mod/TechDraw/Gui/QGEPath.cpp
+++ b/src/Mod/TechDraw/Gui/QGEPath.cpp
@@ -41,6 +41,8 @@
 
 #include "DrawGuiStd.h"
 #include "PreferencesGui.h"
+#include "Rez.h"
+#include "ZVALUE.h"
 #include "QGIPrimPath.h"
 #include "QGIVertex.h"
 #include "QGIView.h"
diff --git a/src/Mod/TechDraw/Gui/QGEPath.h b/src/Mod/TechDraw/Gui/QGEPath.h
index 56ca1961b9..1916947b9b 100644
--- a/src/Mod/TechDraw/Gui/QGEPath.h
+++ b/src/Mod/TechDraw/Gui/QGEPath.h
@@ -25,12 +25,11 @@
 
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
-#include <QMouseEvent>
 #include <QObject>
 
-#include <Base/Vector3D.h>
-#include "QGIVertex.h"
 #include "QGIPrimPath.h"
+#include "QGIVertex.h"
+
 
 namespace TechDrawGui
 {
diff --git a/src/Mod/TechDraw/Gui/mtextedit.h b/src/Mod/TechDraw/Gui/mtextedit.h
index bede44b610..0a2fd2becb 100644
--- a/src/Mod/TechDraw/Gui/mtextedit.h
+++ b/src/Mod/TechDraw/Gui/mtextedit.h
@@ -23,9 +23,10 @@
 #ifndef _MTEXTEDIT_H_
 #define _MTEXTEDIT_H_
 
-#include <QTextEdit>
-#include <QMimeData>
 #include <QImage>
+#include <QMimeData>
+#include <QTextEdit>
+
 
 class MTextEdit : public QTextEdit {
     Q_OBJECT