diff --git a/src/Gui/QtAll.h b/src/Gui/QtAll.h
index 0d570a641e..2dff1229ce 100644
--- a/src/Gui/QtAll.h
+++ b/src/Gui/QtAll.h
@@ -25,34 +25,41 @@
 
 // QtCore
 #include <qglobal.h>
+#include <QAbstractEventDispatcher>
+#include <QAbstractItemModel>
 #include <QBuffer>
 #include <QDebug>
 #include <QDirIterator>
 #include <QElapsedTimer>
-#include <qeventloop.h>
-#include <qfile.h>
+#include <QEvent>
+#include <QEventLoop>
+#include <QFile>
 #include <QLibraryInfo>
+#include <QLocale>
 #include <QMutex>
 #include <qmath.h>
+#include <QMessageLogContext>
+#include <QMimeData>
 #include <qnamespace.h>
 #include <QObject>
 #include <QPointer>
 #include <QProcess>
-#include <qrect.h>
+#include <QRect>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QRegularExpressionMatchIterator>
 #include <QRegularExpressionValidator>
-#include <qrunnable.h>
+#include <QRunnable>
 #include <QSet>
+#include <QSettings>
 #include <QSignalMapper>
 #include <QString>
 #include <QTemporaryFile>
-#include <qtextstream.h>
-#include <qthread.h>
-#include <qthreadpool.h>
-#include <qtimer.h>
-#include <qtranslator.h>
+#include <QTextStream>
+#include <QThread>
+#include <QThreadPool>
+#include <QTimer>
+#include <QTranslator>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QVariant>
@@ -60,58 +67,21 @@
 #include <QWaitCondition>
 
 // QtGui
-#include <QAbstractEventDispatcher>
-#include <QAbstractItemModel>
-#include <QStandardItemModel>
 #include <QAbstractTextDocumentLayout>
 #include <QAction>
 #include <QActionGroup>
-#include <qapplication.h>
 #include <QBitmap>
-#include <QButtonGroup>
-#include <qcheckbox.h>
-#include <qclipboard.h>
-#include <qcolordialog.h>
-#include <qcombobox.h>
-#include <qcursor.h>
+#include <QClipboard>
+#include <QCursor>
 #include <QDesktopServices>
-#include <QDesktopWidget>
-#include <QDialogButtonBox>
-#include <QDockWidget>
 #include <QDrag>
 #include <qdrawutil.h>
-#include <qevent.h>
-#include <QFileDialog>
-#include <QFileIconProvider>
-#include <qfontdatabase.h>
-#include <qfontdialog.h>
-#include <QGraphicsProxyWidget>
-#include <QGraphicsRectItem>
-#include <QGraphicsSvgItem>
-#include <QGraphicsSceneContextMenuEvent>
-#include <QGroupBox>
+#include <QFontDatabase>
 #include <QGuiApplication>
-#include <QHeaderView>
-#include <qimage.h>
+#include <QImage>
 #include <QImageWriter>
-#include <qinputdialog.h>
-#include <QItemDelegate>
-#include <QItemEditorFactory>
 #include <QKeyEvent>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <QListWidget>
-#include <QLocale>
-#include <QMainWindow>
-#include <QMdiArea>
-#include <QMdiSubWindow>
-#include <QMenu>
-#include <qmenubar.h>
-#include <QMessageBox>
-#include <QMessageLogContext>
-#include <QMimeData>
-#include <qmovie.h>
+#include <QMovie>
 #include <QOpenGLContext>
 #include <QOpenGLDebugMessage>
 #include <QOpenGLFunctions>
@@ -119,56 +89,22 @@
 #include <QPaintEngine>
 #include <QPainter>
 #include <QPainterPath>
-#include <qpalette.h>
-#include <qpixmap.h>
+#include <QPalette>
 #include <QPdfWriter>
+#include <QPixmap>
 #include <QPixmapCache>
-#include <QPlainTextEdit>
-#include <QPrinter>
-#include <QPrinterInfo>
-#include <QPrintDialog>
-#include <QPrintPreviewDialog>
-#include <QPrintPreviewWidget>
-#include <QProgressBar>
-#include <QProgressDialog>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
 #include <QScreen>
-#include <QScrollArea>
-#include <qscrollbar.h>
 #include <QSessionManager>
-#include <QSettings>
 #include <QShortcut>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qsplashscreen.h>
-#include <qsplitter.h>
-#include <QStatusBar>
-#include <qstyle.h>
-#include <QStyledItemDelegate>
-#include <qstylefactory.h>
-#include <QStyleOptionButton>
-#include <QStylePainter>
+#include <QStandardItemModel>
 #include <QSurfaceFormat>
 #include <QSyntaxHighlighter>
-#include <qtabbar.h>
-#include <QTableView>
-#include <qtabwidget.h>
-#include <QTextBrowser>
 #include <QTextDocument>
 #include <QTextDocumentFragment>
-#include <QTextEdit>
 #include <QTextList>
 #include <QTextTableCell>
-#include <QToolBar>
-#include <qtoolbox.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
-#include <QTreeView>
-#include <QTreeWidget>
-#include <qvalidator.h>
+#include <QValidator>
 #include <QWindow>
-#include <QWhatsThis>
 #include <QWhatsThisClickedEvent>
 
 // QtNetwork
@@ -176,8 +112,12 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
-// QtOpenGL
-#include <QGLWidget>
+// QtPrintSupport
+#include <QPrinter>
+#include <QPrinterInfo>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QPrintPreviewWidget>
 
 // QtSvg
 #include <QSvgGenerator>
@@ -185,11 +125,69 @@
 #include <QSvgWidget>
 
 // QtWidgets
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QDockWidget>
+#include <QFileDialog>
+#include <QFileIconProvider>
+#include <QFontDialog>
 #include <QGraphicsColorizeEffect>
 #include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QGraphicsProxyWidget>
+#include <QGraphicsRectItem>
+#include <QGraphicsSvgItem>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QItemDelegate>
+#include <QItemEditorFactory>
+#include <QLabel>
+#include <QLayout>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QMainWindow>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QPlainTextEdit>
+#include <QProgressBar>
+#include <QProgressDialog>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScrollArea>
+#include <QScrollBar>
 #include <QStackedWidget>
+#include <QSlider>
+#include <QSpinBox>
+#include <QSplashScreen>
+#include <QSplitter>
+#include <QStatusBar>
+#include <QStyle>
+#include <QStyledItemDelegate>
+#include <QStyleFactory>
+#include <QStyleOptionButton>
+#include <QStylePainter>
+#include <QTabBar>
+#include <QTableView>
+#include <QTabWidget>
 #include <QTableWidgetItem>
+#include <QTextBrowser>
+#include <QTextEdit>
+#include <QToolBar>
+#include <QToolBox>
+#include <QToolButton>
+#include <QToolTip>
+#include <QTreeView>
+#include <QTreeWidget>
+#include <QWhatsThis>
 #include <QWidget>
 #include <QWidgetAction>