diff --git a/tests/auto/cmake/test_add_resource_prefix/main.cpp b/tests/auto/cmake/test_add_resource_prefix/main.cpp
index 1a8b37715b..3cccf067e2 100644
--- a/tests/auto/cmake/test_add_resource_prefix/main.cpp
+++ b/tests/auto/cmake/test_add_resource_prefix/main.cpp
@@ -1,8 +1,8 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QFile>
-#include <QtTest>
+#include <QtTest/qtest.h>
+#include <QtCore/qfile.h>
 
 class TestAddResourcePrefix : public QObject
 {
diff --git a/tests/auto/cmake/test_concurrent_module/main.cpp b/tests/auto/cmake/test_concurrent_module/main.cpp
index 9412c60638..5cbe3bd59f 100644
--- a/tests/auto/cmake/test_concurrent_module/main.cpp
+++ b/tests/auto/cmake/test_concurrent_module/main.cpp
@@ -1,10 +1,8 @@
 // Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtConcurrent>
-#include <QtConcurrent/QtConcurrent>
-#include <QtConcurrent/QtConcurrentRun>
-#include <QtConcurrentRun>
+#include <QtCore/qbytearray.h>
+#include <QtConcurrent/qtconcurrentrun.h>
 
 int main(int argc, char **argv)
 {
diff --git a/tests/auto/cmake/test_widgets_app_deployment/main.cpp b/tests/auto/cmake/test_widgets_app_deployment/main.cpp
index 939cd72380..3b0f540a8a 100644
--- a/tests/auto/cmake/test_widgets_app_deployment/main.cpp
+++ b/tests/auto/cmake/test_widgets_app_deployment/main.cpp
@@ -1,7 +1,8 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-#include <QtTest>
-#include <QMainWindow>
+
+#include <QtTest/qtest.h>
+#include <QtWidgets/qmainwindow.h>
 
 class test_widgets_app_deployment : public QObject
 {
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index ea751b586e..a8f4b1b79f 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -2,18 +2,19 @@
 // Copyright (C) 2016 Intel Corporation.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <qurl.h>
-#include <QtCore/QDebug>
+#include <QtTest/qtest.h>
+
+#include <QtConcurrent/qtconcurrentrun.h>
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qdiriterator.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qthreadpool.h>
+#include <QtCore/qurl.h>
 
-#include <QTest>
 #include <QtTest/private/qcomparisontesthelper_p.h>
-#include <QDirIterator>
-
-#include <qcoreapplication.h>
-
-#include <qfileinfo.h>
-#include <qmap.h>
-
 #include <QtTest/private/qemulationdetector_p.h>
 
 using namespace Qt::StringLiterals;
@@ -4245,9 +4246,6 @@ void tst_QUrl::testThreadingHelper()
     }
 }
 
-#include <QThreadPool>
-#include <QtConcurrent>
-
 void tst_QUrl::testThreading()
 {
     enum { Count = 100 };
diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
index 40aa89ded4..50ff9103b9 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -1,11 +1,20 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-#include <QCoreApplication>
-#include <QDebug>
-#include <QElapsedTimer>
-#include <QSignalSpy>
 
-#include <QtConcurrent>
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
+
+#include <QtConcurrent/qtconcurrentfilter.h>
+#include <QtConcurrent/qtconcurrentmap.h>
+#include <QtConcurrent/qtconcurrentrun.h>
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qelapsedtimer.h>
+#include <QtCore/qfuturesynchronizer.h>
+#include <QtCore/qfuturewatcher.h>
+#include <QtCore/qset.h>
+
 #include <private/qfutureinterface_p.h>
 
 using namespace QtConcurrent;
diff --git a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
index 136f56facf..36cf8ac8fd 100644
--- a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
+++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
@@ -1,8 +1,14 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-#include <QTest>
-#include <QtGui>
-#include <QtCore>
+
+#include <QtTest/qtest.h>
+
+#include <QtGui/qcolorspace.h>
+#include <QtGui/qimagereader.h>
+#include <QtGui/qimagewriter.h>
+
+#include <QtCore/qbuffer.h>
+#include <QtCore/qfile.h>
 
 class tst_QIcoImageFormat : public QObject
 {
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
index bd74e7497f..db27f6531f 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
@@ -1,8 +1,10 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtGui>
-#include <QEvent>
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qevent.h>
+
+#include <QtCore/qfile.h>
 
 struct MyApplication : public QGuiApplication
 {
diff --git a/tests/auto/gui/platform/qx11info/tst_qx11info.cpp b/tests/auto/gui/platform/qx11info/tst_qx11info.cpp
index f71e644a8f..ec9dfdeb24 100644
--- a/tests/auto/gui/platform/qx11info/tst_qx11info.cpp
+++ b/tests/auto/gui/platform/qx11info/tst_qx11info.cpp
@@ -2,8 +2,9 @@
 // Copyright (C) 2016 David Faure <david.faure@kdab.com>
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtGui>
-#include <QtTest/QtTest>
+#include <QtTest/qtest.h>
+
+#include <QtGui/qguiapplication.h>
 
 #include <QtGui/private/qtx11extras_p.h>
 
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
index 1c41552eb5..63bd7b1e07 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
@@ -1,9 +1,12 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtNetwork/qtcpserver.h>
+#include <QtNetwork/qtcpsocket.h>
+#include <QtNetwork/qhostaddress.h>
+
+#include <QtCore/qcoreapplication.h>
 
-#include <QtCore>
-#include <QtNetwork>
 #if defined(Q_OS_WIN) && defined(Q_CC_MSVC)
 #  include <crtdbg.h>
 #endif
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/main.cpp b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
index 76bdf3aada..4c5e335bb2 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
+++ b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
@@ -1,6 +1,10 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-#include <QtNetwork>
+
+#include <QtNetwork/qudpsocket.h>
+
+#include <QtCore/qcoreevent.h>
+#include <QtCore/qcoreapplication.h>
 
 class ClientServer : public QUdpSocket
 {
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/main.cpp b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
index ba5bb3c0d0..7477250841 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
+++ b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
@@ -1,6 +1,10 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-#include <QtNetwork>
+
+#include <QtNetwork/qudpsocket.h>
+#include <QtNetwork/qhostaddress.h>
+
+#include <QtCore/qcoreapplication.h>
 
 class Server : public QObject
 {
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
index 119891c916..8601212f53 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
@@ -1,12 +1,11 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
 
-#include <QtNetwork>
-#include <QTest>
-
-#include <QNetworkProxy>
-#include <QAuthenticator>
+#include <QtNetwork/qsslsocket.h>
+#include <QtNetwork/qnetworkproxy.h>
+#include <QtNetwork/qauthenticator.h>
 
 #ifdef QT_BUILD_INTERNAL
 #  include "private/qhostinfo_p.h"
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
index c5475da581..dd3e35f205 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
@@ -1,12 +1,11 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
 
-#include <QtNetwork>
-#include <QTest>
-
-#include <QNetworkProxy>
-#include <QAuthenticator>
+#include <QtNetwork/qsslsocket.h>
+#include <QtNetwork/qnetworkproxy.h>
+#include <QtNetwork/qauthenticator.h>
 
 #include "private/qhostinfo_p.h"
 
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index c665068f72..ee494cedc5 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -1,17 +1,16 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
+#include <QtTest/qtesteventloop.h>
 
-#include <QTest>
-#include <QtGui>
-#include <QtWidgets>
-#include <QtCore>
-#include <QTestEventLoop>
+#include <QtWidgets/qprogressdialog.h>
 
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-#include <qdebug.h>
+#include <QtNetwork/qnetworkaccessmanager.h>
+#include <QtNetwork/qnetworkrequest.h>
+#include <QtNetwork/qnetworkreply.h>
+
+#include <QtCore/qdebug.h>
 
 #include "../../network-settings.h"
 
diff --git a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
index af6634f253..a0099cd801 100644
--- a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
@@ -1,9 +1,14 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
 
-#include <QtCore>
-#include <QTest>
+#include <QtCore/qobject.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qsemaphore.h>
+#include <QtCore/qthread.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qvarlengtharray.h>
 
 #include <QtTest/private/qemulationdetector_p.h>
 
diff --git a/tests/auto/other/xkbkeyboard/tst_xkbkeyboard.cpp b/tests/auto/other/xkbkeyboard/tst_xkbkeyboard.cpp
index 323693bb84..a00249b58b 100644
--- a/tests/auto/other/xkbkeyboard/tst_xkbkeyboard.cpp
+++ b/tests/auto/other/xkbkeyboard/tst_xkbkeyboard.cpp
@@ -1,9 +1,10 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtCore>
-#include <QtGui>
-#include <QTest>
+#include <QtTest/qtest.h>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qmetaobject.h>
 
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qplatforminputcontext.h>
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 6ac58b30f7..b8dbceda4a 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -5,25 +5,22 @@
 #ifndef TST_DATABASES_H
 #define TST_DATABASES_H
 
-#include <QSqlDatabase>
-#include <QSqlDriver>
-#include <QSqlError>
-#include <QSqlQuery>
-#include <QSqlRecord>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QDir>
-#include <QScopedPointer>
-#include <QVariant>
-#include <QDebug>
-#include <QSqlTableModel>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QSysInfo>
-#include <QVersionNumber>
-#include <QtSql/private/qsqldriver_p.h>
-#include <QTest>
+#include <QtTest/qtest.h>
+
+#include <QtSql/qsqldatabase.h>
+#include <QtSql/qsqldriver.h>
+#include <QtSql/qsqlerror.h>
+#include <QtSql/qsqlquery.h>
+#include <QtSql/qsqlrecord.h>
+#include <QtSql/qsqltablemodel.h>
+
+#include <QtCore/qjsonarray.h>
+#include <QtCore/qjsondocument.h>
+#include <QtCore/qjsonobject.h>
+#include <QtCore/qregularexpression.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qtemporarydir.h>
+#include <QtCore/qversionnumber.h>
 
 using namespace Qt::StringLiterals;
 
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index 0bebb7edd5..18e5ea64fc 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
-#include <QTest>
+#include <QtTest/qtest.h>
 
+#include <QtCore/qatomic.h>
+#include <QtCore/qthread.h>
+#include <QtCore/qdebug.h>
 
 #include "../qsqldatabase/tst_databases.h"
 
-#include <QtCore>
-#include <QtSql>
-#include "qdebug.h"
-
 QString qtest;
 // set this define if Oracle is built with threading support
 //#define QOCI_THREADED
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index a669c72a1e..eeafef15fa 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -1,21 +1,20 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
 
-#include <QTest>
-#include <QtGui>
-#include <QtWidgets>
-#include <QSignalSpy>
+#include <QtWidgets/qtableview.h>
 
-#include <qsqldriver.h>
-#include <qsqldatabase.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlquery.h>
-#include <qsqlrecord.h>
+#include <QtSql/qsqldriver.h>
+#include <QtSql/qsqldatabase.h>
+#include <QtSql/qsqlerror.h>
+#include <QtSql/qsqlfield.h>
+#include <QtSql/qsqlquery.h>
+#include <QtSql/qsqlrecord.h>
+#include <QtSql/qsqlquerymodel.h>
 
-#include <qsqlquerymodel.h>
-#include <qsortfilterproxymodel.h>
+#include <QtCore/qsortfilterproxymodel.h>
 
 #include "../../kernel/qsqldatabase/tst_databases.h"
 
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index 9c93fc2b18..122487a934 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -1,14 +1,20 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-
-#include <QTest>
 #include "../../kernel/qsqldatabase/tst_databases.h"
-#include <QtSql>
+
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
+
+#include <QtSql/qsqltablemodel.h>
+#include <QtSql/qsqldriver.h>
+#include <QtSql/qsqlfield.h>
+
+#include <QtCore/qthread.h>
+#include <QtCore/qelapsedtimer.h>
+#include <QtCore/qvariant.h>
+
 #include <QtSql/private/qsqltablemodel_p.h>
-#include <QThread>
-#include <QElapsedTimer>
-#include <QSignalSpy>
 
 // In order to catch when the warning message occurs, indicating that the database belongs to another
 // thread, we have to install our own message handler. To ensure that the test reporting still happens
diff --git a/tests/auto/tools/macdeployqt/source_plugin_tls/main.cpp b/tests/auto/tools/macdeployqt/source_plugin_tls/main.cpp
index 61b5edd614..54ca1f4926 100644
--- a/tests/auto/tools/macdeployqt/source_plugin_tls/main.cpp
+++ b/tests/auto/tools/macdeployqt/source_plugin_tls/main.cpp
@@ -1,7 +1,9 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtNetwork>
+#include <QtNetwork/qsslsocket.h>
+
+#include <QtCore/qcoreapplication.h>
 
 int main(int argc, char ** argv)
 {
diff --git a/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp b/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp
index 4f51467d51..fc0bdb4166 100644
--- a/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp
+++ b/tests/auto/tools/macdeployqt/tst_macdeployqt.cpp
@@ -1,8 +1,12 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtCore>
-#include <QtTest>
+#include <QtTest/qtest.h>
+
+#include <QtCore/qloggingcategory.h>
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qstandardpaths.h>
 
 Q_LOGGING_CATEGORY(lcTests, "qt.tools.tests")
 
diff --git a/tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp b/tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp
index 52c3bef14a..0bd18de815 100644
--- a/tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp
+++ b/tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp
@@ -1,15 +1,15 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QTest>
-#include <QtTest>
+#include <QtTest/qtest.h>
 
-#include <QLibraryInfo>
-#include <QLatin1StringView>
-#include <QDir>
-#include <QFileInfo>
-#include <QProcess>
-#include <QCryptographicHash>
+#include <QtCore/qcryptographichash.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qlatin1stringview.h>
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qstandardpaths.h>
 
 #include <array>
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index 9a047b876d..dc26419f3f 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -1,11 +1,14 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtGui>
-#include <QTest>
-#include <QTest>
-#include <QMetaType>
+#include <QtTest/qtest.h>
+
 #include <QtWidgets/qgraphicsanchorlayout.h>
+#include <QtWidgets/qgraphicswidget.h>
+
+#include <QtCore/qmetatype.h>
+#include <QtCore/qlibraryinfo.h>
+
 #include <private/qgraphicsanchorlayout_p.h>
 
 #define TEST_COMPLEX_CASES
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index 268195d7d3..17db8f240c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -2,9 +2,18 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
-#include <QTest>
-#include <QtGui>
-#include <QtWidgets>
+#include <QtTest/qtest.h>
+
+#include <QtWidgets/qgraphicslinearlayout.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qgraphicswidget.h>
+#include <QtWidgets/qstyleoption.h>
+
+#include <QtCore/qmap.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qset.h>
+#include <QtCore/qtimeline.h>
+
 #include <math.h>
 
 class tst_QGraphicsLayout : public QObject
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 4313d9891c..a9122d634e 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -1,10 +1,19 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
 
-#include <QTest>
-#include <QtGui>
-#include <QtWidgets>
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qdial.h>
+#include <QtWidgets/qdialog.h>
+#include <QtWidgets/qgroupbox.h>
+#include <QtWidgets/qlabel.h>
+#include <QtWidgets/qlineedit.h>
+#include <QtWidgets/qproxystyle.h>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qstylefactory.h>
+#include <QtWidgets/qstyleoption.h>
+#include <QtWidgets/qwidget.h>
 
 #include <QtTest/private/qtesthelpers_p.h>
 
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 3c325699a7..1f7720a5e9 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -1,20 +1,18 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
 
-#include <QTest>
-#include <qlayout.h>
-#include <qapplication.h>
-#include <qwidget.h>
-#include <qproxystyle.h>
-#include <qsizepolicy.h>
-//#include <QtGui>
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qlabel.h>
+#include <QtWidgets/qlayout.h>
+#include <QtWidgets/qlineedit.h>
+#include <QtWidgets/qproxystyle.h>
+#include <QtWidgets/qradiobutton.h>
+#include <QtWidgets/qsizepolicy.h>
+#include <QtWidgets/qstylefactory.h>
 
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QRadioButton>
-#include <QStyleFactory>
-#include <QSharedPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include <QtTest/private/qtesthelpers_p.h>
 
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index 0623ab4167..ab6bc9bb3e 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -1,13 +1,27 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QTest>
-#include <QtGui>
-#include <QtWidgets>
-#include <QtDebug>
-#include <QList>
-#include <QPointer>
-#include <QSignalSpy>
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
+
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qcombobox.h>
+#include <QtWidgets/qcompleter.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qlineedit.h>
+#include <QtWidgets/qlistview.h>
+#include <QtWidgets/qtextedit.h>
+#include <QtWidgets/qtreewidget.h>
+
+#include <QtGui/qfilesystemmodel.h>
+#include <QtGui/qstandarditemmodel.h>
+
+#include <QtCore/qabstractproxymodel.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qstandardpaths.h>
+#include <QtCore/qstringlistmodel.h>
 
 #include <QtTest/private/qtesthelpers_p.h>
 
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 101b502fc6..3f94710f2e 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -1,9 +1,20 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include <QtGui>
-#include <QtWidgets>
-#include <QTest>
+#include <QtTest/qtest.h>
+
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qscroller.h>
+#include <QtWidgets/qwidget.h>
+
+#include <QtGui/qevent.h>
+#include <QtGui/qpointingdevice.h>
+#include <QtGui/qstylehints.h>
+
+#include <QtCore/qeasingcurve.h>
+#include <QtCore/qpoint.h>
+#include <QtCore/qrect.h>
+
 #include <QtGui/private/qevent_p.h>
 #include <QtGui/private/qeventpoint_p.h>
 #include <qpa/qwindowsysteminterface.h>
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index af0b9ce367..3a6bd28926 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -2,27 +2,27 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
-#include <QTest>
-#include <QSignalSpy>
-#include <QMdiSubWindow>
-#include <QMdiArea>
+#include <QtTest/qtest.h>
+#include <QtTest/qsignalspy.h>
 
-#include <QApplication>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QPushButton>
-#include <QStyle>
-#include <QStyleOption>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QDockWidget>
-#include <QScrollBar>
-#include <QTextEdit>
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qdockwidget.h>
+#include <QtWidgets/qlineedit.h>
+#include <QtWidgets/qmainwindow.h>
+#include <QtWidgets/qmdiarea.h>
+#include <QtWidgets/qmdisubwindow.h>
+#include <QtWidgets/qmenubar.h>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qscrollbar.h>
+#include <QtWidgets/qstyle.h>
+#include <QtWidgets/qstyleoption.h>
+#include <QtWidgets/qtextedit.h>
+
+#include <QtGui/qstylehints.h>
 #ifndef QT_NO_OPENGL
-#include <QtOpenGL>
-#include <QOpenGLContext>
+#  include <QtGui/qopenglcontext.h>
 #endif
-#include <QStyleHints>
 
 #include <QtWidgets/private/qapplication_p.h>
 
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index d77ecc811d..3a6fc1356c 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -1,22 +1,27 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#include <QtTest/qtest.h>
+
+#include <QtXml/qdom.h>
+
+#include <QtCore/qbuffer.h>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qregularexpression.h>
+#include <QtCore/qscopeguard.h>
+#include <QtCore/qtemporaryfile.h>
+#include <QtCore/qtextstream.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qxmlstream.h>
 
-#include <QBuffer>
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QFile>
-#include <QList>
-#include <QRegularExpression>
-#include <QScopeGuard>
-#include <QTextStream>
-#include <QTest>
-#include <QtXml>
-#include <QVariant>
-#include <cmath>
 #include <QtXml/private/qdom_p.h>
 
+#include <cmath>
+
 QT_REQUIRE_CONFIG(dom);
 QT_FORWARD_DECLARE_CLASS(QDomDocument)
 QT_FORWARD_DECLARE_CLASS(QDomNode)