diff --git a/src/Gui/QtAll.h b/src/Gui/QtAll.h
index 8ba8ea74c1..ecfd44d979 100644
--- a/src/Gui/QtAll.h
+++ b/src/Gui/QtAll.h
@@ -116,6 +116,7 @@
 #include <QOpenGLDebugMessage>
 #include <QOpenGLFunctions>
 #include <QOpenGLTexture>
+#include <QPaintEngine>
 #include <QPainter>
 #include <QPainterPath>
 #include <qpalette.h>
@@ -142,7 +143,7 @@
 #include <qspinbox.h>
 #include <qsplashscreen.h>
 #include <qsplitter.h>
-#include <qstatusbar.h>
+#include <QStatusBar>
 #include <qstyle.h>
 #include <QStyledItemDelegate>
 #include <qstylefactory.h>
@@ -157,6 +158,7 @@
 #include <QTextDocument>
 #include <QTextDocumentFragment>
 #include <QTextEdit>
+#include <QTextList>
 #include <QTextTableCell>
 #include <QToolBar>
 #include <qtoolbox.h>
@@ -174,18 +176,23 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
+// QtOpenGL
+#include <QGLWidget>
+
 // QtSvg
+#include <QSvgGenerator>
 #include <QSvgRenderer>
 #include <QSvgWidget>
 
 // QtWidgets
+#include <QGraphicsColorizeEffect>
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QStackedWidget>
 #include <QWidget>
 
 // QtXML
-# include <QDomDocument>
-# include <QDomElement>
+#include <QDomDocument>
+#include <QDomElement>
 
 #endif
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index 36c2ebf12f..4d7d83dcf6 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -57,11 +57,6 @@
 #ifndef _QtAll__
 # include <Gui/QtAll.h>
 #endif
-#include <QGLWidget>
-#include <QPaintEngine>
-#include <QStatusBar>
-#include <QSvgGenerator>
-#include <QTextList>
 #include <QXmlQuery>
 #include <QXmlResultItems>
 
diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
index 51d4167863..30a002b511 100644
--- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
+++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp
@@ -23,15 +23,15 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <QDomDocument>
-#include <QFile>
-#include <QGraphicsColorizeEffect>
-#include <QGraphicsEffect>
-#include <QGraphicsSvgItem>
-#include <QPen>
-#include <QSvgRenderer>
-#include <QXmlQuery>
-#include <QXmlResultItems>
+# include <QDomDocument>
+# include <QFile>
+# include <QGraphicsColorizeEffect>
+# include <QGraphicsEffect>
+# include <QGraphicsSvgItem>
+# include <QPen>
+# include <QSvgRenderer>
+# include <QXmlQuery>
+# include <QXmlResultItems>
 #endif// #ifndef _PreComp_
 
 #include <App/Application.h>