diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md
index 0bbf0e2c6276..4c4e84083254 100644
--- a/CODING_GUIDELINES.md
+++ b/CODING_GUIDELINES.md
@@ -318,7 +318,7 @@ The headers should be ordered alphabetically within each group. \
 If there are conditionals for the same header group, then put them at the bottom of the respective group. \
 If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
 
-One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
+One exception is the header containing the library version (for example, QtVersionChecks), this particular header isn't constrained by the aforementioned order.
 
 Example:
 
@@ -331,7 +331,7 @@ Example:
 // exceptions, headers containing version number
 #include <boost/version.hpp>
 #include <libtorrent/version.hpp>
-#include <QtGlobal>
+#include <QtVersionChecks>
 
 // C++ Standard Library headers
 #include <cstdio>
diff --git a/src/app/application.h b/src/app/application.h
index ee69f5afcd09..c08d7ef94517 100644
--- a/src/app/application.h
+++ b/src/app/application.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QAtomicInt>
 #include <QCoreApplication>
 #include <QPointer>
diff --git a/src/app/applicationinstancemanager.cpp b/src/app/applicationinstancemanager.cpp
index a897733e2f8a..26001724a55d 100644
--- a/src/app/applicationinstancemanager.cpp
+++ b/src/app/applicationinstancemanager.cpp
@@ -28,7 +28,7 @@
 
 #include "applicationinstancemanager.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <windows.h>
diff --git a/src/app/main.cpp b/src/app/main.cpp
index a9e29f86d810..71ebb2160def 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -27,7 +27,7 @@
  * exception statement from your version.
  */
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <chrono>
 #include <cstdlib>
diff --git a/src/app/qtlocalpeer/qtlocalpeer.cpp b/src/app/qtlocalpeer/qtlocalpeer.cpp
index 5e9dbe7971be..2b264b593f65 100644
--- a/src/app/qtlocalpeer/qtlocalpeer.cpp
+++ b/src/app/qtlocalpeer/qtlocalpeer.cpp
@@ -68,7 +68,7 @@
 
 #include "qtlocalpeer.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #if defined(Q_OS_WIN)
 #include <Windows.h>
diff --git a/src/app/signalhandler.cpp b/src/app/signalhandler.cpp
index be70f254d027..f5ef5263c9d5 100644
--- a/src/app/signalhandler.cpp
+++ b/src/app/signalhandler.cpp
@@ -30,7 +30,7 @@
 
 #include "signalhandler.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <algorithm>
 #include <csignal>
diff --git a/src/app/upgrade.cpp b/src/app/upgrade.cpp
index 59e715c7f909..15e07772425c 100644
--- a/src/app/upgrade.cpp
+++ b/src/app/upgrade.cpp
@@ -28,7 +28,7 @@
 
 #include "upgrade.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QCoreApplication>
 #include <QMetaEnum>
 
diff --git a/src/base/applicationcomponent.h b/src/base/applicationcomponent.h
index bbf530b46192..29d0fcbc7e4b 100644
--- a/src/base/applicationcomponent.h
+++ b/src/base/applicationcomponent.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtClassHelperMacros>
 
 #include "interfaces/iapplication.h"
 
diff --git a/src/base/bittorrent/abstractfilestorage.h b/src/base/bittorrent/abstractfilestorage.h
index f6f8eec926af..dc50b6c42983 100644
--- a/src/base/bittorrent/abstractfilestorage.h
+++ b/src/base/bittorrent/abstractfilestorage.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <QCoreApplication>
 
 #include "base/pathfwd.h"
diff --git a/src/base/bittorrent/cachestatus.h b/src/base/bittorrent/cachestatus.h
index 4dd228dda8a1..0abab1dbbe30 100644
--- a/src/base/bittorrent/cachestatus.h
+++ b/src/base/bittorrent/cachestatus.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 
 namespace BitTorrent
 {
diff --git a/src/base/bittorrent/infohash.h b/src/base/bittorrent/infohash.h
index fbf6b8f9533d..c79b3496882b 100644
--- a/src/base/bittorrent/infohash.h
+++ b/src/base/bittorrent/infohash.h
@@ -32,7 +32,6 @@
 #include <libtorrent/info_hash.hpp>
 #endif
 
-#include <QtGlobal>
 #include <QMetaType>
 
 #include "base/digest32.h"
diff --git a/src/base/bittorrent/peeraddress.h b/src/base/bittorrent/peeraddress.h
index 46e6de15cc4e..dbaca69198bd 100644
--- a/src/base/bittorrent/peeraddress.h
+++ b/src/base/bittorrent/peeraddress.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QHostAddress>
 
 class QString;
diff --git a/src/base/bittorrent/sessionstatus.h b/src/base/bittorrent/sessionstatus.h
index 9997a24d752f..20ec0d6fc231 100644
--- a/src/base/bittorrent/sessionstatus.h
+++ b/src/base/bittorrent/sessionstatus.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 
 namespace BitTorrent
 {
diff --git a/src/base/bittorrent/speedmonitor.h b/src/base/bittorrent/speedmonitor.h
index 6bb7c97c9e0d..ba1f52e81ff2 100644
--- a/src/base/bittorrent/speedmonitor.h
+++ b/src/base/bittorrent/speedmonitor.h
@@ -33,7 +33,7 @@
 #include <boost/circular_buffer.hpp>
 #endif
 
-#include <QtGlobal>
+#include <QtTypes>
 
 template<typename T>
 struct Sample
diff --git a/src/base/bittorrent/torrent.h b/src/base/bittorrent/torrent.h
index 80e22b77a4e6..d7e690d67183 100644
--- a/src/base/bittorrent/torrent.h
+++ b/src/base/bittorrent/torrent.h
@@ -29,8 +29,8 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <QtContainerFwd>
+#include <QtTypes>
 #include <QMetaType>
 #include <QString>
 
diff --git a/src/base/bittorrent/tracker.h b/src/base/bittorrent/tracker.h
index 892c5f3e20f0..8370d3958795 100644
--- a/src/base/bittorrent/tracker.h
+++ b/src/base/bittorrent/tracker.h
@@ -34,7 +34,7 @@
 
 #include <libtorrent/entry.hpp>
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QHash>
 #include <QObject>
 #include <QSet>
diff --git a/src/base/bittorrent/trackerentry.h b/src/base/bittorrent/trackerentry.h
index 502a8b0961e1..8e0b98b1a566 100644
--- a/src/base/bittorrent/trackerentry.h
+++ b/src/base/bittorrent/trackerentry.h
@@ -31,7 +31,6 @@
 #include <libtorrent/socket.hpp>
 
 #include <QtContainerFwd>
-#include <QtGlobal>
 #include <QHash>
 #include <QMap>
 #include <QString>
diff --git a/src/base/digest32.h b/src/base/digest32.h
index 5fdace840de3..3aaf27c35c42 100644
--- a/src/base/digest32.h
+++ b/src/base/digest32.h
@@ -30,7 +30,6 @@
 
 #include <libtorrent/sha1_hash.hpp>
 
-#include <QtGlobal>
 #include <QByteArray>
 #include <QHash>
 #include <QSharedData>
diff --git a/src/base/global.h b/src/base/global.h
index bd714058de0c..6bf4ccdcccba 100644
--- a/src/base/global.h
+++ b/src/base/global.h
@@ -30,7 +30,7 @@
 
 #include <type_traits>
 
-#include <QtGlobal>
+#include <QtProcessorDetection>
 
 #include <QString>
 
diff --git a/src/base/indexrange.h b/src/base/indexrange.h
index 37931f791b48..31b5fefea3de 100644
--- a/src/base/indexrange.h
+++ b/src/base/indexrange.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtAssert>
 
 // Interval is defined via [first;last]
 template <typename Index>
diff --git a/src/base/interfaces/iapplication.h b/src/base/interfaces/iapplication.h
index 3942fd9d06a6..8b1a156c283d 100644
--- a/src/base/interfaces/iapplication.h
+++ b/src/base/interfaces/iapplication.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QMetaObject>
 
 class QString;
diff --git a/src/base/net/downloadmanager.h b/src/base/net/downloadmanager.h
index 263ed700b69a..d7a407f975da 100644
--- a/src/base/net/downloadmanager.h
+++ b/src/base/net/downloadmanager.h
@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QHash>
 #include <QNetworkProxy>
 #include <QObject>
diff --git a/src/base/net/geoipdatabase.h b/src/base/net/geoipdatabase.h
index 06b6a209f22f..cc4c13205b54 100644
--- a/src/base/net/geoipdatabase.h
+++ b/src/base/net/geoipdatabase.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QHash>
diff --git a/src/base/path.h b/src/base/path.h
index 4501e26684ef..17dcbb40ac47 100644
--- a/src/base/path.h
+++ b/src/base/path.h
@@ -31,7 +31,6 @@
 
 #include <filesystem>
 
-#include <QtGlobal>
 #include <QMetaType>
 #include <QString>
 
@@ -39,6 +38,8 @@
 
 #include "base/interfaces/istringable.h"
 
+class QStringView;
+
 class Path final : public IStringable
 {
 public:
diff --git a/src/base/preferences.h b/src/base/preferences.h
index 9f17eabb5da4..fbf763eea2a4 100644
--- a/src/base/preferences.h
+++ b/src/base/preferences.h
@@ -30,7 +30,7 @@
 #pragma once
 
 #include <QtContainerFwd>
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QObject>
 
 #include "base/pathfwd.h"
diff --git a/src/base/torrentfileswatcher.cpp b/src/base/torrentfileswatcher.cpp
index f50768767ef2..c8ec3e9d67d3 100644
--- a/src/base/torrentfileswatcher.cpp
+++ b/src/base/torrentfileswatcher.cpp
@@ -31,7 +31,7 @@
 
 #include <chrono>
 
-#include <QtGlobal>
+#include <QtAssert>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>
diff --git a/src/base/utils/compare.h b/src/base/utils/compare.h
index 53de6b73ade6..aa63d102b595 100644
--- a/src/base/utils/compare.h
+++ b/src/base/utils/compare.h
@@ -29,7 +29,7 @@
 #pragma once
 
 #include <Qt>
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #if !defined(Q_OS_WIN) && (!defined(Q_OS_UNIX) || defined(Q_OS_MACOS) || defined(QT_FEATURE_icu))
 #define QBT_USE_QCOLLATOR
diff --git a/src/base/utils/gzip.cpp b/src/base/utils/gzip.cpp
index 9419d1ba6be9..2375850efe0f 100644
--- a/src/base/utils/gzip.cpp
+++ b/src/base/utils/gzip.cpp
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include <QtGlobal>
+#include <QtAssert>
 #include <QByteArray>
 
 #ifndef ZLIB_CONST
diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h
index fc1eac40d62d..157bb357ad8d 100644
--- a/src/base/utils/misc.h
+++ b/src/base/utils/misc.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <Windows.h>
diff --git a/src/base/utils/random.cpp b/src/base/utils/random.cpp
index 768973762413..7938e5a0ce47 100644
--- a/src/base/utils/random.cpp
+++ b/src/base/utils/random.cpp
@@ -30,7 +30,7 @@
 
 #include <random>
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <Windows.h>
diff --git a/src/gui/log/loglistview.cpp b/src/gui/log/loglistview.cpp
index a50906ba44a2..2fb4a1ce18c4 100644
--- a/src/gui/log/loglistview.cpp
+++ b/src/gui/log/loglistview.cpp
@@ -29,7 +29,7 @@
 
 #include "loglistview.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QApplication>
 #include <QClipboard>
 #include <QFontMetrics>
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 0f6a2d82e825..31feea966320 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -29,7 +29,7 @@
 
 #include "mainwindow.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <algorithm>
 #include <chrono>
@@ -59,7 +59,6 @@
 #include <QShortcut>
 #include <QSplitter>
 #include <QStatusBar>
-#include <QtGlobal>
 #include <QTimer>
 
 #include "base/bittorrent/session.h"
diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp
index 2fbecec452e3..a51bb10fe8d9 100644
--- a/src/gui/powermanagement/powermanagement.cpp
+++ b/src/gui/powermanagement/powermanagement.cpp
@@ -28,7 +28,7 @@
 
 #include "powermanagement.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_MACOS
 #include <IOKit/pwr_mgt/IOPMLib.h>
diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp
index 5fa4abf18552..68db32ab8b07 100644
--- a/src/gui/programupdater.cpp
+++ b/src/gui/programupdater.cpp
@@ -29,7 +29,7 @@
 
 #include "programupdater.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #if defined(Q_OS_WIN)
 #include <Windows.h>
diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp
index 9f6b37b083f3..02f0cc60939d 100644
--- a/src/gui/properties/peerlistwidget.cpp
+++ b/src/gui/properties/peerlistwidget.cpp
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QClipboard>
 #include <QHeaderView>
diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp
index 233e28f6a43d..6ebfaaf4c847 100644
--- a/src/gui/rss/automatedrssdownloader.cpp
+++ b/src/gui/rss/automatedrssdownloader.cpp
@@ -29,7 +29,6 @@
 
 #include "automatedrssdownloader.h"
 
-#include <QtGlobal>
 #include <QCursor>
 #include <QFileDialog>
 #include <QMenu>
diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
index cb08799ef971..a8764a3c4a58 100644
--- a/src/gui/search/searchwidget.cpp
+++ b/src/gui/search/searchwidget.cpp
@@ -30,7 +30,7 @@
 
 #include "searchwidget.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <utility>
 
diff --git a/src/gui/uithemecommon.h b/src/gui/uithemecommon.h
index 08735739503a..f08cb2de1f7e 100644
--- a/src/gui/uithemecommon.h
+++ b/src/gui/uithemecommon.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QColor>
 #include <QHash>
diff --git a/src/gui/uithememanager.h b/src/gui/uithememanager.h
index df5e0984c427..88c7eba3b91b 100644
--- a/src/gui/uithememanager.h
+++ b/src/gui/uithememanager.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QColor>
 #include <QHash>
 #include <QIcon>
diff --git a/src/gui/uithemesource.h b/src/gui/uithemesource.h
index 4969c3cee495..8a156d8fc657 100644
--- a/src/gui/uithemesource.h
+++ b/src/gui/uithemesource.h
@@ -32,8 +32,8 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QColor>
+#include <QCoreApplication>
 #include <QHash>
 #include <QIcon>
 #include <QString>
diff --git a/src/gui/utils.cpp b/src/gui/utils.cpp
index b82646cf8764..1757e1b35fc6 100644
--- a/src/gui/utils.cpp
+++ b/src/gui/utils.cpp
@@ -28,7 +28,7 @@
 
 #include "utils.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <Objbase.h>
diff --git a/test/testalgorithm.cpp b/test/testalgorithm.cpp
index 1a17f861d606..dccfeb36b4be 100644
--- a/test/testalgorithm.cpp
+++ b/test/testalgorithm.cpp
@@ -31,6 +31,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include <QObject>
 #include <QTest>
 
 #include "base/algorithm.h"
diff --git a/test/testbittorrenttrackerentry.cpp b/test/testbittorrenttrackerentry.cpp
index 380a11f36297..ebac85bcf2a5 100644
--- a/test/testbittorrenttrackerentry.cpp
+++ b/test/testbittorrenttrackerentry.cpp
@@ -28,6 +28,7 @@
 
 #include <algorithm>
 
+#include <QObject>
 #include <QTest>
 #include <QVector>
 
diff --git a/test/testglobal.cpp b/test/testglobal.cpp
index bc56d2659132..f3c8393f5866 100644
--- a/test/testglobal.cpp
+++ b/test/testglobal.cpp
@@ -26,7 +26,10 @@
  * exception statement from your version.
  */
 
-#include <QtGlobal>
+#include <type_traits>
+
+#include <QList>
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
@@ -40,13 +43,27 @@ class TestGlobal final : public QObject
     TestGlobal() = default;
 
 private slots:
-#if (QT_VERSION < QT_VERSION_CHECK(6, 4, 0))
-    void testStringLiteral() const
+    void testAsConst() const
     {
-        QCOMPARE(u""_s, QStringLiteral(""));
-        QCOMPARE(u"abc"_s, QStringLiteral("abc"));
+        {
+            QList<int> list = {0, 1, 2};
+
+            static_assert(std::is_const_v<std::remove_reference_t<decltype(asConst(list))>>);
+            QCOMPARE(list, asConst(list));
+            QCOMPARE(list, asConst(QList<int>(list)));
+        }
+
+        {
+            const QList<int> list = {0, 1, 2};
+
+            static_assert(std::is_const_v<std::remove_reference_t<decltype(asConst(list))>>);
+            QCOMPARE(list, asConst(list));
+            QCOMPARE(list, asConst(QList<int>(list)));
+
+            // should not compile:
+            //asConst(std::move(list));
+        }
     }
-#endif
 };
 
 QTEST_APPLESS_MAIN(TestGlobal)
diff --git a/test/testorderedset.cpp b/test/testorderedset.cpp
index 52843a75f193..5246b6355c85 100644
--- a/test/testorderedset.cpp
+++ b/test/testorderedset.cpp
@@ -27,6 +27,7 @@
  * exception statement from your version.
  */
 
+#include <QObject>
 #include <QSet>
 #include <QTest>
 
diff --git a/test/testpath.cpp b/test/testpath.cpp
index 50ee84f66f2e..6449a8071437 100644
--- a/test/testpath.cpp
+++ b/test/testpath.cpp
@@ -26,7 +26,8 @@
  * exception statement from your version.
  */
 
-#include <QtGlobal>
+#include <QtSystemDetection>
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
diff --git a/test/testutilsbytearray.cpp b/test/testutilsbytearray.cpp
index 951ded736a65..562c59020d64 100644
--- a/test/testutilsbytearray.cpp
+++ b/test/testutilsbytearray.cpp
@@ -26,6 +26,7 @@
  * exception statement from your version.
  */
 
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
diff --git a/test/testutilscompare.cpp b/test/testutilscompare.cpp
index 1d1c49bd7f0d..980f1895cdab 100644
--- a/test/testutilscompare.cpp
+++ b/test/testutilscompare.cpp
@@ -28,6 +28,7 @@
 
 #include <tuple>
 
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
diff --git a/test/testutilsgzip.cpp b/test/testutilsgzip.cpp
index c46cc1fa1855..637e71922c93 100644
--- a/test/testutilsgzip.cpp
+++ b/test/testutilsgzip.cpp
@@ -26,6 +26,7 @@
  * exception statement from your version.
  */
 
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
diff --git a/test/testutilsio.cpp b/test/testutilsio.cpp
index fdc1358b1355..2e2b970ed288 100644
--- a/test/testutilsio.cpp
+++ b/test/testutilsio.cpp
@@ -26,7 +26,8 @@
  * exception statement from your version.
  */
 
-#include <QtGlobal>
+#include <QtSystemDetection>
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
diff --git a/test/testutilsstring.cpp b/test/testutilsstring.cpp
index 8fbb12d5c520..164b2b480218 100644
--- a/test/testutilsstring.cpp
+++ b/test/testutilsstring.cpp
@@ -26,6 +26,7 @@
  * exception statement from your version.
  */
 
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"
diff --git a/test/testutilsversion.cpp b/test/testutilsversion.cpp
index ce0ff52bec62..9c07f81f7ffa 100644
--- a/test/testutilsversion.cpp
+++ b/test/testutilsversion.cpp
@@ -26,6 +26,7 @@
  * exception statement from your version.
  */
 
+#include <QObject>
 #include <QTest>
 
 #include "base/global.h"