diff --git a/.clang-format b/.clang-format
index 84b96ab559..a733a1aeef 100644
--- a/.clang-format
+++ b/.clang-format
@@ -33,6 +33,8 @@ IncludeCategories:
     Priority:        3
   - Regex:           '^<sys/'
     Priority:        5
+  - Regex:           '^"QCMake'
+    Priority:        11
   - Regex:           '^(<|")Qt?[A-Z]'
     Priority:        6
   - Regex:           '^<cmtp/'
diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index 3c3be35967..e354d2497b 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -2,10 +2,11 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "AddCacheEntry.h"
 
-#include "QCMakeSizeType.h"
 #include <QCompleter>
 #include <QMetaProperty>
 
+#include "QCMakeSizeType.h"
+
 static int const NumTypes = 4;
 static int const DefaultTypeIndex = 0;
 static QByteArray const TypeStrings[NumTypes] = { "BOOL", "PATH", "FILEPATH",
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index c289c6bdd6..d9563b9abf 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -2,11 +2,11 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include "QCMake.h"
 #include <QCheckBox>
 #include <QStringList>
 #include <QWidget>
 
+#include "QCMake.h"
 #include "ui_AddCacheEntry.h"
 
 class AddCacheEntry
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index e74b871e8a..dfc82654fb 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -2,7 +2,6 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include <iostream>
 
-#include "QCMake.h" // include to disable MS warnings
 #include <QApplication>
 #include <QDir>
 #include <QLocale>
@@ -23,6 +22,8 @@
 #include "cmSystemTools.h" // IWYU pragma: keep
 #include "cmake.h"
 
+#include "QCMake.h" // include to disable MS warnings
+
 namespace {
 cmDocumentationEntry const cmDocumentationName = {
   {},
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 34e9c9ff97..0e972fa841 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -30,16 +30,15 @@
 #  include <QWinTaskbarProgress>
 #endif
 
-#include "QCMake.h"
-#include "QCMakeCacheView.h"
-#include "QCMakeSizeType.h"
-
 #include "cmSystemTools.h"
 #include "cmVersion.h"
 
 #include "AddCacheEntry.h"
 #include "EnvironmentDialog.h"
 #include "FirstConfigure.h"
+#include "QCMake.h"
+#include "QCMakeCacheView.h"
+#include "QCMakeSizeType.h"
 #include "RegexExplorer.h"
 #include "WarningMessagesDialog.h"
 
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index e5cd753ab7..21b266b081 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -4,13 +4,13 @@
 
 #include <memory>
 
-#include "QCMake.h"
-#include "QCMakePreset.h"
 #include <QEventLoop>
 #include <QMainWindow>
 #include <QThread>
 #include <QVector>
 
+#include "QCMake.h"
+#include "QCMakePreset.h"
 #include "ui_CMakeSetupDialog.h"
 
 class QCMakePresetItemModel;
diff --git a/Source/QtDialog/EnvironmentDialog.cxx b/Source/QtDialog/EnvironmentDialog.cxx
index 8ffb7f17a4..1a9db4e301 100644
--- a/Source/QtDialog/EnvironmentDialog.cxx
+++ b/Source/QtDialog/EnvironmentDialog.cxx
@@ -2,7 +2,6 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "EnvironmentDialog.h"
 
-#include "QCMakeWidgets.h"
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QItemSelectionModel>
@@ -11,6 +10,8 @@
 #include <QMessageBox>
 #include <QStandardItem>
 
+#include "QCMakeWidgets.h"
+
 EnvironmentItemModel::EnvironmentItemModel(
   QProcessEnvironment const& environment, QObject* parent)
   : QStandardItemModel(parent)
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx
index 4a3133efb4..2886ed8e14 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -1,7 +1,6 @@
 
 #include "FirstConfigure.h"
 
-#include "QCMakeSizeType.h"
 #include <QComboBox>
 #include <QRadioButton>
 #include <QSettings>
@@ -10,6 +9,7 @@
 #include "cmStringAlgorithms.h"
 
 #include "Compilers.h"
+#include "QCMakeSizeType.h"
 
 StartCompilerSetup::StartCompilerSetup(QString defaultGeneratorPlatform,
                                        QString defaultGeneratorToolset,
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index cf031b1514..1789d3ad2a 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -6,7 +6,6 @@
 
 #include <cm/memory>
 
-#include "QCMakeSizeType.h"
 #include <QCoreApplication>
 #include <QDir>
 #include <QString>
@@ -19,6 +18,8 @@
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 
+#include "QCMakeSizeType.h"
+
 #ifdef Q_OS_WIN
 #  include "qt_windows.h" // For SetErrorMode
 #endif
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index 50305f98f6..851cb5ffd2 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -15,7 +15,6 @@
 #include <memory>
 #include <vector>
 
-#include "QCMakePreset.h"
 #include <QAtomicInt>
 #include <QList>
 #include <QMetaType>
@@ -26,6 +25,8 @@
 #include <QTimer>
 #include <QVariant>
 
+#include "QCMakePreset.h"
+
 /// struct to represent cmake properties in Qt
 /// Value is of type String or Bool
 struct QCMakeProperty
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index fa2ad3ddec..e9eb792102 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -2,8 +2,6 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "QCMakeCacheView.h"
 
-#include "QCMakeSizeType.h"
-#include "QCMakeWidgets.h"
 #include <QApplication>
 #include <QEvent>
 #include <QHBoxLayout>
@@ -13,6 +11,9 @@
 #include <QSortFilterProxyModel>
 #include <QStyle>
 
+#include "QCMakeSizeType.h"
+#include "QCMakeWidgets.h"
+
 // filter for searches
 class QCMakeSearchFilter : public QSortFilterProxyModel
 {
diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h
index 8d2c7424f5..a334673a94 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/Source/QtDialog/QCMakeCacheView.h
@@ -2,13 +2,14 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include "QCMake.h"
-#include "QCMakeSizeType.h"
 #include <QItemDelegate>
 #include <QSet>
 #include <QStandardItemModel>
 #include <QTreeView>
 
+#include "QCMake.h"
+#include "QCMakeSizeType.h"
+
 class QSortFilterProxyModel;
 class QCMakeCacheModel;
 class QCMakeAdvancedFilter;
diff --git a/Source/QtDialog/QCMakePresetComboBox.h b/Source/QtDialog/QCMakePresetComboBox.h
index 47d8b8e0df..e7ac1732f0 100644
--- a/Source/QtDialog/QCMakePresetComboBox.h
+++ b/Source/QtDialog/QCMakePresetComboBox.h
@@ -2,12 +2,13 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include "QCMakePreset.h"
 #include <QComboBox>
 #include <QObject>
 #include <QString>
 #include <QVector>
 
+#include "QCMakePreset.h"
+
 class QCMakePresetItemModel;
 
 class QCMakePresetComboBox : public QComboBox
diff --git a/Source/QtDialog/QCMakePresetItemModel.cxx b/Source/QtDialog/QCMakePresetItemModel.cxx
index cb4e4feebe..cae0a429da 100644
--- a/Source/QtDialog/QCMakePresetItemModel.cxx
+++ b/Source/QtDialog/QCMakePresetItemModel.cxx
@@ -2,9 +2,10 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #include "QCMakePresetItemModel.h"
 
-#include "QCMakeSizeType.h"
 #include <QFont>
 
+#include "QCMakeSizeType.h"
+
 QCMakePresetItemModel::QCMakePresetItemModel(QObject* parent)
   : QAbstractItemModel(parent)
 {
diff --git a/Source/QtDialog/QCMakePresetItemModel.h b/Source/QtDialog/QCMakePresetItemModel.h
index b565cbdf4f..a3a0cf30f9 100644
--- a/Source/QtDialog/QCMakePresetItemModel.h
+++ b/Source/QtDialog/QCMakePresetItemModel.h
@@ -4,7 +4,6 @@
 
 #include <cm/optional>
 
-#include "QCMakePreset.h"
 #include <QAbstractItemModel>
 #include <QModelIndex>
 #include <QString>
@@ -12,6 +11,8 @@
 #include <QVector>
 #include <QtGlobal>
 
+#include "QCMakePreset.h"
+
 class QObject;
 
 class QCMakePresetItemModel : public QAbstractItemModel
diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h
index e5f06606d0..cf798d2ab3 100644
--- a/Source/QtDialog/WarningMessagesDialog.h
+++ b/Source/QtDialog/WarningMessagesDialog.h
@@ -2,10 +2,10 @@
    file LICENSE.rst or https://cmake.org/licensing for details.  */
 #pragma once
 
-#include "QCMake.h"
 #include <QDialog>
 #include <QWidget>
 
+#include "QCMake.h"
 #include "ui_WarningMessagesDialog.h"
 
 /**