From 27d96b4789b98587e64642bf7bd6ef5f3a07e174 Mon Sep 17 00:00:00 2001
From: David Skoland <david.skoland@qt.io>
Date: Thu, 26 Nov 2020 17:31:50 +0100
Subject: Replace QtTest headers with QTest

Complete search and replace of QtTest and QtTest/QtTest with QTest, as
QtTest includes the whole module. Replace all such instances with
correct header includes. See Jira task for more discussion.

Fixes: QTBUG-88831
Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44
Pick-to: 6.0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 .../animation/qabstractanimation/tst_qabstractanimation.cpp    |  2 +-
 .../corelib/animation/qanimationgroup/tst_qanimationgroup.cpp  |  6 +++++-
 .../qparallelanimationgroup/tst_qparallelanimationgroup.cpp    |  5 ++++-
 .../corelib/animation/qpauseanimation/tst_qpauseanimation.cpp  |  4 +++-
 .../animation/qpropertyanimation/tst_qpropertyanimation.cpp    |  5 ++++-
 .../tst_qsequentialanimationgroup.cpp                          |  7 ++++++-
 .../animation/qvariantanimation/tst_qvariantanimation.cpp      |  2 +-
 tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp      |  2 +-
 tests/auto/corelib/global/qflags/tst_qflags.cpp                |  2 +-
 tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp            |  2 +-
 tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp        |  2 +-
 tests/auto/corelib/global/qglobal/tst_qglobal.cpp              |  2 +-
 tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp  |  3 ++-
 tests/auto/corelib/global/qhooks/tst_qhooks.cpp                |  2 +-
 tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp            |  2 +-
 .../qoperatingsystemversion/tst_qoperatingsystemversion.cpp    |  2 +-
 .../corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp   |  2 +-
 tests/auto/corelib/global/qtendian/tst_qtendian.cpp            |  2 +-
 tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp    |  2 +-
 tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp                  |  3 ++-
 tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp                |  2 +-
 tests/auto/corelib/io/qdebug/tst_qdebug.cpp                    |  6 +++++-
 tests/auto/corelib/io/qdir/tst_qdir.cpp                        |  4 +++-
 tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp        |  6 +++++-
 tests/auto/corelib/io/qfile/tst_qfile.cpp                      |  7 ++++++-
 tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp              |  5 ++++-
 tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp      |  2 +-
 .../auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp  |  2 +-
 .../corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp |  2 +-
 .../corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp   |  9 ++++++++-
 tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp              |  2 +-
 tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp            |  2 +-
 tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp              |  7 ++++++-
 .../auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp  |  2 +-
 .../auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp  |  3 ++-
 tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp                |  2 +-
 .../io/qprocess-noapplication/tst_qprocessnoapplication.cpp    |  2 +-
 tests/auto/corelib/io/qprocess/tst_qprocess.cpp                |  5 ++++-
 .../corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp |  2 +-
 tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp  |  4 +++-
 tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp              |  3 ++-
 tests/auto/corelib/io/qsettings/tst_qsettings.cpp              |  2 +-
 tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp    |  3 ++-
 tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp        |  3 ++-
 tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp      |  3 ++-
 tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp    |  7 ++++++-
 tests/auto/corelib/io/qurl/tst_qurl.cpp                        |  4 +++-
 tests/auto/corelib/io/qurl/tst_qurl_mac.mm                     |  2 +-
 tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp        |  2 +-
 tests/auto/corelib/io/qurlinternal/utf8data.cpp                |  2 +-
 tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp              |  6 +++---
 .../itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp   |  5 +++--
 .../itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp |  2 +-
 tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp      |  2 +-
 tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp    |  3 ++-
 .../itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp |  3 ++-
 .../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp |  5 ++++-
 .../tst_qsortfilterproxymodel_regularexpression.cpp            |  3 ++-
 .../itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp       |  3 ++-
 .../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp   |  2 +-
 .../auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp  |  3 ++-
 tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp  |  3 ++-
 .../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp   |  4 +++-
 tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp        |  3 ++-
 tests/auto/corelib/kernel/qmath/tst_qmath.cpp                  |  2 +-
 tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp          |  2 +-
 tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp      |  3 ++-
 tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp      |  4 +++-
 .../kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp       |  3 ++-
 tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp  |  2 +-
 tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp          |  2 +-
 tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp          |  2 +-
 tests/auto/corelib/kernel/qobject/tst_qobject.cpp              |  5 ++++-
 tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp            |  4 +++-
 .../auto/corelib/kernel/qsignalblocker/tst_qsignalblocker.cpp  |  2 +-
 tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp  |  2 +-
 .../corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp   |  4 +++-
 tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp                |  3 ++-
 tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp      |  9 ++++++++-
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp            |  9 ++++++++-
 .../corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp |  2 +-
 .../qmimedatabase-cache/tst_qmimedatabase-cache.cpp            |  2 +-
 .../auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp |  5 ++++-
 tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp       |  2 +-
 tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp            |  2 +-
 tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp              |  2 +-
 tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp  |  4 +++-
 tests/auto/corelib/plugin/quuid/tst_quuid.cpp                  |  3 ++-
 tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm            |  2 +-
 tests/auto/corelib/serialization/cborlargedatavalidation.cpp   |  4 +++-
 tests/auto/corelib/serialization/json/tst_qtjson.cpp           |  2 +-
 .../serialization/qcborstreamreader/tst_qcborstreamreader.cpp  |  3 ++-
 .../serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp  |  4 +++-
 tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp |  6 +++++-
 .../serialization/qcborvalue_json/tst_qcborvalue_json.cpp      |  5 ++++-
 .../auto/corelib/serialization/qdatastream/tst_qdatastream.cpp | 10 +++++++++-
 .../qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp    |  2 +-
 .../auto/corelib/serialization/qtextstream/tst_qtextstream.cpp |  2 +-
 tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp |  4 +++-
 tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp          |  2 +-
 tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm       |  2 +-
 tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp  |  2 +-
 .../corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp   |  2 +-
 tests/auto/corelib/text/qchar/tst_qchar.cpp                    |  2 +-
 tests/auto/corelib/text/qcollator/tst_qcollator.cpp            |  2 +-
 tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp    |  2 +-
 tests/auto/corelib/text/qlocale/tst_qlocale.cpp                |  3 ++-
 .../corelib/text/qregularexpression/tst_qregularexpression.cpp |  2 +-
 tests/auto/corelib/text/qstring/tst_qstring.cpp                |  4 +++-
 tests/auto/corelib/text/qstring/tst_qstring_mac.mm             |  2 +-
 .../tst_qstring_no_cast_from_bytearray.cpp                     |  2 +-
 .../corelib/text/qstringconverter/tst_qstringconverter.cpp     |  2 +-
 .../auto/corelib/text/qstringiterator/tst_qstringiterator.cpp  |  2 +-
 tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp        |  2 +-
 tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp  |  2 +-
 .../text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp       |  3 ++-
 tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp        |  2 +-
 .../auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp  |  2 +-
 .../auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp  |  2 +-
 tests/auto/corelib/thread/qfuture/tst_qfuture.cpp              |  6 +++++-
 .../thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp     |  2 +-
 .../auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp  |  4 ++--
 tests/auto/corelib/thread/qmutex/tst_qmutex.cpp                |  3 ++-
 tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp    |  2 +-
 tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp        |  2 +-
 tests/auto/corelib/thread/qpromise/tst_qpromise.cpp            |  2 +-
 tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp      |  2 +-
 .../auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp  |  3 ++-
 tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp    |  2 +-
 tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp        |  2 +-
 tests/auto/corelib/thread/qthread/tst_qthread.cpp              |  6 +++++-
 tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp      |  3 ++-
 tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp      |  5 ++++-
 .../auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp  |  4 +++-
 .../auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp  |  3 ++-
 tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp    |  2 +-
 tests/auto/corelib/time/qcalendar/tst_qcalendar.cpp            |  2 +-
 tests/auto/corelib/time/qdate/tst_qdate.cpp                    |  3 ++-
 tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp            |  2 +-
 tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm         |  2 +-
 .../auto/corelib/time/qdatetimeparser/tst_qdatetimeparser.cpp  |  2 +-
 tests/auto/corelib/time/qtime/tst_qtime.cpp                    |  2 +-
 tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp            |  6 +++++-
 tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm      |  2 +-
 tests/auto/corelib/tools/collections/tst_collections.cpp       |  3 ++-
 .../tools/containerapisymmetry/tst_containerapisymmetry.cpp    |  2 +-
 tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp       |  2 +-
 tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp         |  2 +-
 tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp           |  2 +-
 tests/auto/corelib/tools/qcache/tst_qcache.cpp                 |  2 +-
 .../tools/qcommandlineparser/tst_qcommandlineparser.cpp        |  3 ++-
 .../tools/qcryptographichash/tst_qcryptographichash.cpp        |  3 ++-
 tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp     |  2 +-
 .../tst_qexplicitlyshareddatapointer.cpp                       |  2 +-
 tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp             |  2 +-
 tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp           |  2 +-
 tests/auto/corelib/tools/qhash/tst_qhash.cpp                   |  2 +-
 tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp |  2 +-
 tests/auto/corelib/tools/qline/tst_qline.cpp                   |  2 +-
 tests/auto/corelib/tools/qlist/tst_qlist.cpp                   |  3 ++-
 .../tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm       |  2 +-
 tests/auto/corelib/tools/qmakearray/tst_qmakearray.cpp         |  2 +-
 tests/auto/corelib/tools/qmap/tst_qmap.cpp                     |  2 +-
 tests/auto/corelib/tools/qmargins/tst_qmargins.cpp             |  2 +-
 .../tst_qmessageauthenticationcode.cpp                         |  5 ++++-
 .../tools/qoffsetstringarray/tst_qoffsetstringarray.cpp        |  2 +-
 tests/auto/corelib/tools/qpair/tst_qpair.cpp                   |  2 +-
 tests/auto/corelib/tools/qpoint/tst_qpoint.cpp                 |  3 ++-
 tests/auto/corelib/tools/qpointf/tst_qpointf.cpp               |  3 ++-
 tests/auto/corelib/tools/qqueue/tst_qqueue.cpp                 |  2 +-
 tests/auto/corelib/tools/qrect/tst_qrect.cpp                   |  2 +-
 tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp       |  3 ++-
 tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp |  2 +-
 .../tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp    |  2 +-
 tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp       |  2 +-
 tests/auto/corelib/tools/qset/tst_qset.cpp                     |  2 +-
 tests/auto/corelib/tools/qsharedpointer/externaltests.cpp      |  2 +-
 tests/auto/corelib/tools/qsharedpointer/nontracked.cpp         |  2 +-
 tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp |  4 +++-
 tests/auto/corelib/tools/qsize/tst_qsize.cpp                   |  2 +-
 tests/auto/corelib/tools/qsizef/tst_qsizef.cpp                 |  2 +-
 tests/auto/corelib/tools/qstl/tst_qstl.cpp                     |  2 +-
 tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp |  2 +-
 tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp           |  3 ++-
 tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp |  2 +-
 185 files changed, 361 insertions(+), 189 deletions(-)

(limited to 'tests/auto/corelib')

diff --git a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp
index b490e5ca72..b9cf91444f 100644
--- a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp
+++ b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp
@@ -29,7 +29,7 @@
 
 #include <QtCore/qabstractanimation.h>
 #include <QtCore/qanimationgroup.h>
-#include <QtTest>
+#include <QTest>
 
 class tst_QAbstractAnimation : public QObject
 {
diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
index fd1e288b4d..a5cb2c021e 100644
--- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
@@ -26,7 +26,11 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QPauseAnimation>
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
+#include <QSignalSpy>
 
 #include <QtCore/qanimationgroup.h>
 #include <QtCore/qsequentialanimationgroup.h>
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
index eae5fda53b..6cf7e5cb94 100644
--- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -26,7 +26,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
+#include <QSignalSpy>
 
 #include <QtCore/qparallelanimationgroup.h>
 
diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
index 5f2923f498..a10930b517 100644
--- a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
+++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
@@ -26,12 +26,14 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QtCore/qpauseanimation.h>
 #include <QtCore/qpropertyanimation.h>
 #include <QtCore/qsequentialanimationgroup.h>
 
+#include <QParallelAnimationGroup>
+
 #include <private/qabstractanimation_p.h>
 
 #if defined(Q_OS_WIN) || defined(Q_OS_ANDROID)
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
index ada5d29f5c..2c7587c2fe 100644
--- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -26,7 +26,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
+#include <QAnimationGroup>
+#include <QSequentialAnimationGroup>
 #include <QtCore/qpropertyanimation.h>
 #include <QtCore/qvariantanimation.h>
 #include <private/qabstractanimation_p.h>
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
index 1a03254e0b..0cb7fa6b2d 100644
--- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
@@ -26,7 +26,12 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
+#include <QSignalSpy>
+#include <QParallelAnimationGroup>
+
 #include <QtCore/qanimationgroup.h>
 #include <QtCore/qsequentialanimationgroup.h>
 
diff --git a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
index 724db5ae21..ed1cea3fcf 100644
--- a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
+++ b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QtCore/qvariantanimation.h>
-#include <QtTest>
+#include <QTest>
 
 class tst_QVariantAnimation : public QObject
 {
diff --git a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
index 32e4217ad0..9d6bc15d73 100644
--- a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
+++ b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QString>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtDebug>
 
 class tst_q_func_info : public QObject
diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
index 86a233f984..4b76a32c9a 100644
--- a/tests/auto/corelib/global/qflags/tst_qflags.cpp
+++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp
@@ -25,7 +25,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
 
 QT_WARNING_DISABLE_DEPRECATED
 
diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
index 82ad6b1c38..96051cbe2c 100644
--- a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
+++ b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QFloat16>
 
 #include <math.h>
diff --git a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
index 8cc66c6477..519c5fa88d 100644
--- a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
+++ b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include <qdebug.h>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qglobal.h>
 #ifdef Q_OS_WIN
diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index 1f64fca3dc..5b10049144 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QPair>
 #include <QSysInfo>
diff --git a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
index 53a521d06d..dfc62ce163 100644
--- a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
+++ b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include <QtCore/QThread>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QReadWriteLock>
 
 #if defined(Q_OS_UNIX)
 #include <sys/resource.h>
diff --git a/tests/auto/corelib/global/qhooks/tst_qhooks.cpp b/tests/auto/corelib/global/qhooks/tst_qhooks.cpp
index c06b9e7e3d..5a24275177 100644
--- a/tests/auto/corelib/global/qhooks/tst_qhooks.cpp
+++ b/tests/auto/corelib/global/qhooks/tst_qhooks.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/private/qhooks_p.h>
 
 class tst_QHooks: public QObject
diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
index 526fbbabb2..0cfb8541ab 100644
--- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
+++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtGlobal>
 #include "private/qnumeric_p.h"
 
diff --git a/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp b/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp
index 5fae598fc6..b109666be5 100644
--- a/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp
+++ b/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qoperatingsystemversion.h>
 
 class tst_QOperatingSystemVersion : public QObject
diff --git a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
index 9f4abb367a..847193e3b5 100644
--- a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
+++ b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include <qlist.h>
 #include <qobject.h>
 #include <qrandom.h>
diff --git a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
index 2345bb39c1..58fcca4351 100644
--- a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
+++ b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/qendian.h>
 #include <QtCore/private/qendian_p.h>
 
diff --git a/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp b/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp
index ac811de2a1..c73a0a7575 100644
--- a/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp
+++ b/tests/auto/corelib/global/qwinregistry/tst_qwinregistry.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QtCore/qoperatingsystemversion.h>
 
diff --git a/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp b/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
index 4968742110..7a68da8192 100644
--- a/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTestEventLoop>
 
 #include <QBuffer>
 #include <QByteArray>
diff --git a/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp b/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp
index 66720d28e0..9be0463b99 100644
--- a/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp
+++ b/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include "private/qdataurl_p.h"
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QDebug>
 
 class tst_QDataUrl : public QObject
diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 6acc80bdc4..9b9696d7c1 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -30,11 +30,15 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QtDebug>
-#include <QtTest/QtTest>
 
+#include <QTest>
 #include <QtConcurrentRun>
 #include <QFutureSynchronizer>
 #include <QVariant>
+#include <QSemaphore>
+#include <QLine>
+#include <QMimeType>
+#include <QMimeDatabase>
 
 static_assert(QTypeTraits::has_ostream_operator_v<QDebug, int>);
 static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QList<int>>);
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 304020d1f3..f71bc7e7eb 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -27,7 +27,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTemporaryFile>
+#include <QProcess>
 
 #include <qcoreapplication.h>
 #include <qdebug.h>
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
index c18354d840..b41352185d 100644
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qcoreapplication.h>
 #include <qdebug.h>
@@ -45,6 +45,10 @@
 #  include "../../../network-settings.h"
 #endif
 
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
+#include <QStandardPaths>
+#endif
+
 Q_DECLARE_METATYPE(QDirIterator::IteratorFlags)
 Q_DECLARE_METATYPE(QDir::Filters)
 
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index a0c1078d0c..b1e0bab405 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QScopedValueRollback>
 #include <qplatformdefs.h>
 
 #include <QCoreApplication>
@@ -36,6 +37,10 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QTemporaryDir>
+#include <QTemporaryFile>
+#include <QOperatingSystemVersion>
+#include <QStorageInfo>
+#include <QScopeGuard>
 
 #include <private/qabstractfileengine_p.h>
 #include <private/qfsfileengine_p.h>
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index ec1dc531dc..09113cd40b 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -26,7 +26,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QStandardPaths>
+#include <QScopeGuard>
+#include <QScopedValueRollback>
 
 #include <qfile.h>
 #include <qdir.h>
diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
index efdfc071a3..d8639b6864 100644
--- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
+++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qplatformdefs.h>
 
 #include <QCoreApplication>
diff --git a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
index aed4895a47..30c38b20f9 100644
--- a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
+++ b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QtCore/private/qfilesystementry_p.h>
 
diff --git a/tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp b/tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp
index ea4da39cd5..880c88c441 100644
--- a/tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp
+++ b/tests/auto/corelib/io/qfilesystemmetadata/tst_qfilesystemmetadata.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/private/qfilesystemmetadata_p.h>
 
 class tst_QFileSystemMetaData : public QObject
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 72d0960473..721901ffe7 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -25,7 +25,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QCoreApplication>
 
@@ -34,10 +34,17 @@
 #include <QElapsedTimer>
 #include <QTextStream>
 #include <QDir>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QTemporaryFile>
 #if defined(Q_OS_WIN)
 #include <windows.h>
 #endif
 
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
+#include <QStandardPaths>
+#endif
+
 /* All tests need to run in temporary directories not used
  * by the application to avoid non-deterministic failures on Windows
  * due to locked directories and left-overs from previous tests. */
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 10214f2996..5b320d03d6 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -28,7 +28,7 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtNetwork/QtNetwork>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "../../../network-settings.h"
 
diff --git a/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp b/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
index d41efa18f5..5f99cec3af 100644
--- a/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
+++ b/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <QtCore/QString>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/private/qipaddress_p.h>
 
 #ifdef __GLIBC__
diff --git a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
index 431ca4dd5a..a0727eb617 100644
--- a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
+++ b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
@@ -27,8 +27,12 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtConcurrentRun>
+#include <QProcess>
+#include <QSemaphore>
+#include <QFutureSynchronizer>
+
 #include <qlockfile.h>
 #include <qtemporarydir.h>
 #include <qsysinfo.h>
@@ -37,6 +41,7 @@
 #include <sys/time.h>
 #elif defined(Q_OS_WIN)
 #  include <qt_windows.h>
+# include <QOperatingSystemVersion>
 #endif
 
 #include <private/qlockfile_p.h>  // for getLockFileHandle()
diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
index e45c13b9b9..a2a96e32d3 100644
--- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
+++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include <QMutexLocker>
 #include <QLoggingCategory>
 
diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index 4c269822d6..d13be425bf 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -26,8 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include <QLoggingCategory>
+#include <QStandardPaths>
 
 #include <QtCore/private/qloggingregistry_p.h>
 
diff --git a/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp b/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
index cf2079a407..7279aad287 100644
--- a/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
+++ b/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
@@ -37,7 +37,7 @@
 #include <QtCore/QtCore>
 #include <QtCore/QtDebug>
 #include <QtCore/QLoggingCategory>
-#include <QtTest/QtTest>
+#include <QTest>
 
 class tst_QNoDebug: public QObject
 {
diff --git a/tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp b/tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp
index ae53559de7..c9949b4932 100644
--- a/tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp
+++ b/tests/auto/corelib/io/qprocess-noapplication/tst_qprocessnoapplication.cpp
@@ -29,7 +29,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QProcess>
 #include <QtCore/QThread>
-#include <QtTest>
+#include <QTest>
 
 class tst_QProcessNoApplication : public QObject
 {
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 48aeec3231..cd0f928094 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -29,7 +29,10 @@
 
 #include <emulationdetector.h>
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTestEventLoop>
+#include <QSignalSpy>
+
 #include <QtCore/QProcess>
 #include <QtCore/QDir>
 #include <QtCore/QElapsedTimer>
diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
index af5078a3dc..e0f598e32e 100644
--- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
+++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include <QObject>
 #include <QProcessEnvironment>
 
diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
index 519b95e745..b2f7aedab0 100644
--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -27,7 +27,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QResource>
+#include <QtPlugin>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QScopeGuard>
 #include <QtCore/private/qglobal_p.h>
diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
index 361d18054b..9756ed45d0 100644
--- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
+++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSaveFile>
 #include <qcoreapplication.h>
 #include <qstring.h>
 #include <qtemporaryfile.h>
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 60904f7ebc..eef0a7ca2a 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QtCore/QSettings>
 #include <private/qsettings_p.h>
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
index e9ade7c4fb..d9439d6d6b 100644
--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include <qstandardpaths.h>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QOperatingSystemVersion>
 #include <qdebug.h>
 #include <qfileinfo.h>
 #include <qplatformdefs.h>
diff --git a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
index ff89dc0f35..f7273d19cf 100644
--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
@@ -26,8 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QStorageInfo>
+#include <QTemporaryFile>
 
 #include <stdarg.h>
 
diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index 40582eba1b..4f4bedd933 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -27,7 +27,8 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QStandardPaths>
 #include <qcoreapplication.h>
 #include <qstring.h>
 #include <qtemporarydir.h>
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
index ef04bfdd2b..331558255f 100644
--- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qcoreapplication.h>
 #include <qstring.h>
 #include <qtemporarydir.h>
@@ -50,6 +50,11 @@
 # include <unistd.h>            // close(2)
 #endif
 
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
+#include <QDirIterator>
+#include <QStandardPaths>
+#endif
+
 class tst_QTemporaryFile : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index e46b6eb329..1ee5c9cd42 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -28,9 +28,11 @@
 ****************************************************************************/
 
 #include <qurl.h>
-#include <QtTest/QtTest>
 #include <QtCore/QDebug>
 
+#include <QTest>
+#include <QDirIterator>
+
 #include <qcoreapplication.h>
 
 #include <qfileinfo.h>
diff --git a/tests/auto/corelib/io/qurl/tst_qurl_mac.mm b/tests/auto/corelib/io/qurl/tst_qurl_mac.mm
index f2d151a090..b6e2a923f3 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl_mac.mm
+++ b/tests/auto/corelib/io/qurl/tst_qurl_mac.mm
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
index 4b77820028..7fbfa10bfa 100644
--- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
+++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include <QtCore/QUrl>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "private/qurl_p.h"
 
diff --git a/tests/auto/corelib/io/qurlinternal/utf8data.cpp b/tests/auto/corelib/io/qurlinternal/utf8data.cpp
index ef02761a0e..ba2c3e054a 100644
--- a/tests/auto/corelib/io/qurlinternal/utf8data.cpp
+++ b/tests/auto/corelib/io/qurlinternal/utf8data.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
 
 void loadInvalidUtf8Rows()
 {
diff --git a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
index 25d392b37e..de911b7aa4 100644
--- a/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
+++ b/tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <QtCore/QUrlQuery>
-#include <QtTest/QtTest>
+#include <QTest>
 
 typedef QList<QPair<QString, QString> > QueryItems;
 Q_DECLARE_METATYPE(QueryItems)
@@ -73,11 +73,11 @@ static QString prettyElement(const QString &key, const QString &value)
     if (key.isNull())
         result += "null -> ";
     else
-        result += '"' % key % "\" -> ";
+        result += '"' + key + "\" -> ";
     if (value.isNull())
         result += "null";
     else
-        result += '"' % value % '"';
+        result += '"' + value + '"';
     return result;
 }
 
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index bf44cf5fa0..02b852bb3a 100644
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -26,9 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
-#include <QtCore/QCoreApplication>
+#include <QTest>
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QStringListModel>
 #include <QtGui/QStandardItemModel>
@@ -37,6 +37,7 @@
 
 // for testing QModelRoleDataSpan construction
 #include <QVarLengthArray>
+#include <QSignalSpy>
 #include <array>
 #include <vector>
 #include <deque>
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index 92700b251e..b6ee3c5d4a 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qabstractproxymodel.h>
 #include <QItemSelection>
 #include <qstandarditemmodel.h>
diff --git a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
index 8ceb621e42..3eb6c15ec2 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QCoreApplication>
 #include <QtSql/QtSql>
 #include <QtWidgets/QtWidgets>
diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
index b9deb7b6a9..40495c1d9e 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 #include <QtCore/QCoreApplication>
 #include <qdebug.h>
 #include "modelstotest.cpp"
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index d58866cf7f..052abe0700 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 
 #include <QtGui/QtGui>
 
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index ca97543ee7..0fabd5ea57 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -36,7 +36,10 @@
 #include <QStringListModel>
 #include <QTableView>
 #include <QTreeView>
-#include <QtTest>
+#include <QTest>
+#include <QStack>
+#include <QSignalSpy>
+#include <QAbstractItemModelTester>
 
 Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
 
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp
index 7f2a4b64ae..adeb0cfe5a 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QStringListModel>
 
 #include "tst_qsortfilterproxymodel.h"
 
diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
index fc65109bbc..79ad4145a2 100644
--- a/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 #include <qabstractitemmodel.h>
 #include <qcoreapplication.h>
 #include <qmap.h>
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index 3b87f8fabf..fcfd3030d5 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
@@ -30,7 +30,7 @@
 #include "tst_qcoreapplication.h"
 
 #include <QtCore/QtCore>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <private/qcoreapplication_p.h>
 #include <private/qeventloop_p.h>
diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp b/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
index 74ab52ee7e..540856ad6e 100644
--- a/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
+++ b/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
@@ -30,7 +30,8 @@
 #include <QtCore/QTime>
 #include <QtCore/QDeadlineTimer>
 #include <QtCore/QElapsedTimer>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTimer>
 
 #if __has_include(<chrono>)
 #  include <chrono>
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
index ab461d566f..e27ccc336a 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
+++ b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp
@@ -29,7 +29,8 @@
 #include <QtCore/QString>
 #include <QtCore/QTime>
 #include <QtCore/QElapsedTimer>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTimer>
 
 static const int minResolution = 100; // the minimum resolution for the tests
 
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
index fa5c78bceb..8d69314fa5 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
+++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
@@ -32,7 +32,9 @@
 #else
 #  include <QtCore/QCoreApplication>
 #endif
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QAbstractEventDispatcher>
+#include <QTimer>
 
 enum {
     PreciseTimerInterval    =   10,
diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index 9d1153fe47..7a73e30ec3 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qabstracteventdispatcher.h>
 #include <qcoreapplication.h>
@@ -46,6 +46,7 @@
 #include <qwaitcondition.h>
 #include <QTcpServer>
 #include <QTcpSocket>
+#include <QSignalSpy>
 
 class EventLoopExiter : public QObject
 {
diff --git a/tests/auto/corelib/kernel/qmath/tst_qmath.cpp b/tests/auto/corelib/kernel/qmath/tst_qmath.cpp
index e8855caf88..5496daf269 100644
--- a/tests/auto/corelib/kernel/qmath/tst_qmath.cpp
+++ b/tests/auto/corelib/kernel/qmath/tst_qmath.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qmath.h>
 
 class tst_QMath : public QObject
diff --git a/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp b/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp
index 6452800bf0..92a75ba8ed 100644
--- a/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp
+++ b/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qmetaobject.h>
diff --git a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
index 942f075723..86adc5e92a 100644
--- a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
+++ b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTypeRevision>
 
 #include <qobject.h>
 #include <qmetaobject.h>
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 82d39cbbb3..86501b74ea 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -26,7 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
+#include <QSortFilterProxyModel>
 
 #include <qobject.h>
 #include <qmetaobject.h>
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 3068fe60c5..a66787a484 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 #include <QtCore/qlocale.h>
 #include <private/qmetaobjectbuilder_p.h>
 
diff --git a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
index 06bca28001..6638351928 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
+++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qobject.h>
 #include <qmetaobject.h>
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 8d5dcbb884..1978e9e1b7 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QtCore>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/private/qmetaobjectbuilder_p.h>
 
 #include "tst_qmetatype.h"
diff --git a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
index 380755127e..92d745090d 100644
--- a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
+++ b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QMimeData>
 
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 0fcae68505..8513375a20 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -27,7 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QStringListModel>
+#include <QAbstractEventDispatcher>
+#include <QScopedValueRollback>
 
 #include <qcoreapplication.h>
 #include <qpointer.h>
diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
index 63e2f25d1d..6f9a422820 100644
--- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
+++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
@@ -26,7 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QRunnable>
+#include <QThreadPool>
 
 #include <QPointer>
 #ifndef QT_NO_WIDGETS
diff --git a/tests/auto/corelib/kernel/qsignalblocker/tst_qsignalblocker.cpp b/tests/auto/corelib/kernel/qsignalblocker/tst_qsignalblocker.cpp
index 39b03ade61..aa9832f7ce 100644
--- a/tests/auto/corelib/kernel/qsignalblocker/tst_qsignalblocker.cpp
+++ b/tests/auto/corelib/kernel/qsignalblocker/tst_qsignalblocker.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "qobject.h"
 
diff --git a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
index 78b0b5dc55..c3f7bb9b85 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
+++ b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qsignalmapper.h>
 
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
index 496e214b8f..c3e88f96aa 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -26,7 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QProcess>
+
 #include <QtCore/QList>
 #include <QtCore/QSystemSemaphore>
 #include <QtCore/QTemporaryDir>
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index d9c8b34690..586ffc85ed 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -34,7 +34,8 @@
 #endif
 
 #include <QtCore/private/qglobal_p.h>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 
 #include <qtimer.h>
 #include <qthread.h>
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index 9d7c095b2f..3e7790d6ac 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -26,11 +26,18 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QWaitCondition>
+#include <QMutex>
+#include <QStandardPaths>
 #include <qtranslator.h>
 #include <qfile.h>
 #include <qtemporarydir.h>
 
+#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
+#include <QDirIterator>
+#endif
+
 class tst_QTranslator : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 1b76566401..366d07cfa0 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -28,7 +28,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QQueue>
+#include <QStack>
 
 #include <qvariant.h>
 #include <QtCore/private/qvariant_p.h>
@@ -52,6 +54,11 @@
 #include <QRegularExpression>
 #include <QDir>
 #include <QBuffer>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QEasingCurve>
+#include <QSequentialIterable>
+#include <QAssociativeIterable>
 #include "qnumeric.h"
 
 #include <private/qlocale_p.h>
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
index cd9268d736..c3dc941088 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qlist.h>
 #include <qtimer.h>
 #include <qvarlengtharray.h>
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
index 529c8942b3..1637f644be 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp
@@ -29,7 +29,7 @@
 #include "../tst_qmimedatabase.h"
 #include <QDir>
 #include <QFile>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qstandardpaths.h>
 
 #include "../tst_qmimedatabase.cpp"
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 1c2597a1f2..6ee2539b1a 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -43,7 +43,10 @@
 #include <QtCore/QTextStream>
 #include <QtConcurrent/QtConcurrentRun>
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QBuffer>
+#include <QTemporaryFile>
+#include <QProcess>
 
 static const char *const additionalMimeFiles[] = {
     "yast2-metapackage-handler-mimetypes.xml",
diff --git a/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp b/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
index e1357245f3..6d180cd838 100644
--- a/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
+++ b/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
@@ -31,7 +31,7 @@
 #include <qmimetype.h>
 #include <qmimedatabase.h>
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 
 class tst_qmimetype : public QObject
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index 0898817240..6ecbf393e2 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qdir.h>
 #include <qlibrary.h>
 #include <QtCore/QRegularExpression>
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index 644b8b700d..1a7cf2e1e8 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index f8a6450f54..68edfdf97d 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -27,7 +27,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
+#include <QJsonArray>
 #include <qdir.h>
 #include <qpluginloader.h>
 #include "theplugin/plugininterface.h"
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
index 6ebf4a7c33..8240f2452a 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
@@ -27,7 +27,8 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QProcess>
 
 #include <qcoreapplication.h>
 #include <quuid.h>
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm b/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm
index 41ccece115..d895fabab9 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid_darwin.mm
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <QtCore/QUuid>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/corelib/serialization/cborlargedatavalidation.cpp b/tests/auto/corelib/serialization/cborlargedatavalidation.cpp
index 39e4f1fb17..9d1eb9a81b 100644
--- a/tests/auto/corelib/serialization/cborlargedatavalidation.cpp
+++ b/tests/auto/corelib/serialization/cborlargedatavalidation.cpp
@@ -37,7 +37,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QtEndian>
+
 #include <cbor.h>
 
 namespace {
diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index 2153c9eff7..792c3baa35 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 QT_WARNING_DISABLE_DEPRECATED
 
diff --git a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp
index f04f26b42f..8d0b5a054e 100644
--- a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp
+++ b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 
 #include <QtCore/qcborstream.h>
-#include <QtTest>
+#include <QTest>
+#include <QBuffer>
 
 #include <QtCore/private/qbytearray_p.h>
 
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
index 40e9291a13..cf717aaad5 100644
--- a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
@@ -37,7 +37,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QCborStreamWriter>
+#include <QBuffer>
 
 class tst_QCborStreamWriter : public QObject
 {
diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
index f258ca74f7..c92aedb747 100644
--- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
@@ -38,7 +38,11 @@
 ****************************************************************************/
 
 #include <QtCore/qcborvalue.h>
-#include <QtTest>
+#include <QTest>
+#include <QBuffer>
+#include <QCborStreamReader>
+#include <QCborStreamWriter>
+#include <QtEndian>
 
 #include <QtCore/private/qbytearray_p.h>
 
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
index 9324459512..723dfef90b 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@@ -38,7 +38,10 @@
 ****************************************************************************/
 
 #include <QtCore/qcborvalue.h>
-#include <QtTest>
+#include <QTest>
+#include <QJsonValue>
+#include <QJsonObject>
+#include <QJsonArray>
 
 Q_DECLARE_METATYPE(QCborValue)
 
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index b0fddf171e..2b99c5eef6 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -26,7 +26,15 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QBuffer>
+#include <QEasingCurve>
+#include <QJsonValue>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QtEndian>
+
 #include <QtGui/QBitmap>
 #include <QtGui/QPainter>
 #include <QtGui/QPainterPath>
diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp b/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp
index cf5ead1220..10721cd253 100644
--- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp
+++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtGui/QPixmap>
 #include <QtGui/QImage>
 
diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
index f9de9eeebf..3ab095827f 100644
--- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #ifdef Q_OS_UNIX
 #include <locale.h>
diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
index 56b6a91e9b..fa0728f020 100644
--- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
@@ -32,9 +32,11 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QUrl>
 #include <QXmlStreamReader>
+#include <QBuffer>
+#include <QStack>
 
 #include "qc14n.h"
 
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
index 7f9bff844f..70180bbf3b 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qbytearray.h>
 #include <qfile.h>
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm b/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm
index 98146e3525..ca8e88d4e2 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray_mac.mm
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include <QtCore/QByteArray>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp b/tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp
index 09ce41337e..29e5b947f6 100644
--- a/tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp
+++ b/tests/auto/corelib/text/qbytearraylist/tst_qbytearraylist.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qbytearraylist.h>
 
 #include <qmetatype.h>
diff --git a/tests/auto/corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp
index 654752f028..42b978acc8 100644
--- a/tests/auto/corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp
+++ b/tests/auto/corelib/text/qbytearraymatcher/tst_qbytearraymatcher.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qbytearraymatcher.h>
 
diff --git a/tests/auto/corelib/text/qchar/tst_qchar.cpp b/tests/auto/corelib/text/qchar/tst_qchar.cpp
index 134862f716..0773fd7b82 100644
--- a/tests/auto/corelib/text/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/text/qchar/tst_qchar.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qchar.h>
 #include <qfile.h>
 #include <qstringlist.h>
diff --git a/tests/auto/corelib/text/qcollator/tst_qcollator.cpp b/tests/auto/corelib/text/qcollator/tst_qcollator.cpp
index 804ae5ec1d..d1345906a9 100644
--- a/tests/auto/corelib/text/qcollator/tst_qcollator.cpp
+++ b/tests/auto/corelib/text/qcollator/tst_qcollator.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qlocale.h>
 #include <qcollator.h>
diff --git a/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp b/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp
index 428318eb4d..41c4f26c2c 100644
--- a/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp
+++ b/tests/auto/corelib/text/qlatin1string/tst_qlatin1string.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QString>
 
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index 3e2711a6e1..327cb7d714 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -27,12 +27,13 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <math.h>
 #include <qdebug.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <QScopedArrayPointer>
+#include <QTimeZone>
 #include <qdatetime.h>
 #if QT_CONFIG(process)
 # include <qprocess.h>
diff --git a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
index 048b9fe3f9..7570feb4de 100644
--- a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
+++ b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qstring.h>
 #include <qlist.h>
 #include <qstringlist.h>
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
index 4d2c4a755b..79c4fa4ab0 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -38,7 +38,9 @@
 #endif
 
 #include <private/qglobal_p.h> // for the icu feature test
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QString>
+#include <QStringBuilder>
 #include <qregularexpression.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
diff --git a/tests/auto/corelib/text/qstring/tst_qstring_mac.mm b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
index 60bd3f9b15..aad4a580cf 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
+++ b/tests/auto/corelib/text/qstring/tst_qstring_mac.mm
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <QtCore/QString>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp
index 47fbeb6069..dfd53bbb3a 100644
--- a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp
+++ b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/tst_qstring_no_cast_from_bytearray.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QtCore>
 
 class tst_QString_NoCastFromByteArray: public QObject
diff --git a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
index a457744867..38714ef580 100644
--- a/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
+++ b/tests/auto/corelib/text/qstringconverter/tst_qstringconverter.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qstringconverter.h>
 #include <qthreadpool.h>
diff --git a/tests/auto/corelib/text/qstringiterator/tst_qstringiterator.cpp b/tests/auto/corelib/text/qstringiterator/tst_qstringiterator.cpp
index 2ca1d13d4c..e9c36ec365 100644
--- a/tests/auto/corelib/text/qstringiterator/tst_qstringiterator.cpp
+++ b/tests/auto/corelib/text/qstringiterator/tst_qstringiterator.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QString>
 #include <private/qstringiterator_p.h>
 
diff --git a/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
index aaaf31593a..b9d24f2656 100644
--- a/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qlist.h>
 #include <qregularexpression.h>
 #include <qstringlist.h>
diff --git a/tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp
index 2be31e30df..42d39cc933 100644
--- a/tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp
+++ b/tests/auto/corelib/text/qstringmatcher/tst_qstringmatcher.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qstringmatcher.h>
 
 class tst_QStringMatcher : public QObject
diff --git a/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index bd9d91580d..b48b751ea0 100644
--- a/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QScopedValueRollback>
 
 #include <qtextboundaryfinder.h>
 #include <qfile.h>
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index 14d393aede..1f0d9e7779 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QAtomicInt>
 #include <QCoreApplication>
diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
index 8da52c95fb..dce27ee9c1 100644
--- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
@@ -50,7 +50,7 @@
 #  endif
 #endif
 
-#include <QtTest>
+#include <QTest>
 #include <QAtomicInt>
 
 #include <limits>
diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
index c2aff5a70a..6ca0d3c227 100644
--- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
+++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qatomic.h>
 #include <limits.h>
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index df8948f767..ac7564f36a 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -27,10 +27,14 @@
 ****************************************************************************/
 #include <QCoreApplication>
 #include <QDebug>
+#include <QSemaphore>
+#include <QTestEventLoop>
+#include <QTimer>
+#include <QSignalSpy>
 
 #define QFUTURE_TEST
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qfuture.h>
 #include <qfuturewatcher.h>
 #include <qresultstore.h>
diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
index a05687f4e5..ab42bdf341 100644
--- a/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
+++ b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include <QtCore/qfuturesynchronizer.h>
 #include <QtCore/qfuture.h>
diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
index e5952e7c8d..0d759eebd6 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -28,14 +28,14 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QElapsedTimer>
-#include <QtTest/QtTest>
+#include <QSignalSpy>
 
 #include <QtConcurrent>
 #include <private/qfutureinterface_p.h>
 
 using namespace QtConcurrent;
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 //#define PRINT
 
diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
index 88ecee7999..fb080a1a12 100644
--- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSemaphore>
 
 #include <qatomic.h>
 #include <qcoreapplication.h>
diff --git a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
index 30268890ed..d873291fd6 100644
--- a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
+++ b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QCoreApplication>
 #include <QMutexLocker>
diff --git a/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp b/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp
index fec23c1e81..2e7b8832d3 100644
--- a/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp
+++ b/tests/auto/corelib/thread/qpromise/snippet_qpromise.cpp
@@ -53,7 +53,7 @@
 //       snippet license.
 
 #include <QCoreApplication>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qfuture.h>
 #include <qfuturewatcher.h>
diff --git a/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp b/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp
index 74a3059699..b956619e11 100644
--- a/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp
+++ b/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp
@@ -30,7 +30,7 @@
 
 #define QPROMISE_TEST
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qfuture.h>
 #include <qfuturewatcher.h>
 #include <qpromise.h>
diff --git a/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
index 8f0b182d05..c270aa2683 100644
--- a/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
+++ b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QCoreApplication>
 #include <QReadLocker>
diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index 12bc4ba6af..ca282e2723 100644
--- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSemaphore>
 #include <qcoreapplication.h>
 #include <qreadwritelock.h>
 #include <qelapsedtimer.h>
diff --git a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
index dff599180c..10ac19137e 100644
--- a/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
+++ b/tests/auto/corelib/thread/qresultstore/tst_qresultstore.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qresultstore.h>
 
diff --git a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
index bce0088463..9f1512bc44 100644
--- a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
+++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qcoreapplication.h>
 #include <qthread.h>
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index 3f5b255be4..a34129d59a 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -26,7 +26,11 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTestEventLoop>
+#include <QSemaphore>
+#include <QAbstractEventDispatcher>
+#include <QWinEventNotifier>
 
 #include <qcoreapplication.h>
 #include <qelapsedtimer.h>
diff --git a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
index 76974fc5fb..7bb39da85c 100644
--- a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
+++ b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
@@ -27,7 +27,8 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSemaphore>
 
 #include <qcoreapplication.h>
 #include <qmutex.h>
diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index fb563609e2..eb9dbaa028 100644
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -26,7 +26,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest/QtTest>
+
+#include <QTest>
+#include <QSemaphore>
+
 #include <qelapsedtimer.h>
 #include <qthreadpool.h>
 #include <qstring.h>
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index dfb4953c9d..40bc815c33 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -26,7 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QProcess>
+#include <QTestEventLoop>
 
 #include <qcoreapplication.h>
 #include <qmutex.h>
diff --git a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
index 9706f34236..56ca0bc53d 100644
--- a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QReadWriteLock>
 
 #include <qatomic.h>
 #include <qcoreapplication.h>
diff --git a/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
index fd0f2d8d7e..2828b529a8 100644
--- a/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
+++ b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QCoreApplication>
 #include <QWriteLocker>
diff --git a/tests/auto/corelib/time/qcalendar/tst_qcalendar.cpp b/tests/auto/corelib/time/qcalendar/tst_qcalendar.cpp
index 822a893841..b0da158775 100644
--- a/tests/auto/corelib/time/qcalendar/tst_qcalendar.cpp
+++ b/tests/auto/corelib/time/qcalendar/tst_qcalendar.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QCalendar>
 Q_DECLARE_METATYPE(QCalendar::System)
diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp
index 3b55ad61ca..53cb70403c 100644
--- a/tests/auto/corelib/time/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include <private/qglobal_p.h> // for the icu feature test
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTimeZone>
 #include <qdatetime.h>
 #include <qlocale.h>
 
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index e28ae128c8..7507969362 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <time.h>
 #include <qdatetime.h>
 #include <private/qdatetime_p.h>
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
index 4af199b4f8..295454c472 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include <QtCore/QDateTime>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/corelib/time/qdatetimeparser/tst_qdatetimeparser.cpp b/tests/auto/corelib/time/qdatetimeparser/tst_qdatetimeparser.cpp
index 91b0bf6d1e..98dd36bc32 100644
--- a/tests/auto/corelib/time/qdatetimeparser/tst_qdatetimeparser.cpp
+++ b/tests/auto/corelib/time/qdatetimeparser/tst_qdatetimeparser.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <private/qdatetimeparser_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/corelib/time/qtime/tst_qtime.cpp b/tests/auto/corelib/time/qtime/tst_qtime.cpp
index 289a46e176..3626f61ac7 100644
--- a/tests/auto/corelib/time/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/time/qtime/tst_qtime.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <private/qglobal_p.h>
-#include <QtTest/QtTest>
+#include <QTest>
 #include "qdatetime.h"
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #  include <locale.h>
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
index eca258c52e..e33a8f482c 100644
--- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
@@ -26,11 +26,15 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qtimezone.h>
 #include <private/qtimezoneprivate_p.h>
 #include <qlocale.h>
 
+#if defined(Q_OS_WIN)
+#include <QOperatingSystemVersion>
+#endif
+
 #if defined(Q_OS_WIN) && !QT_CONFIG(icu)
 #  define USING_WIN_TZ
 #endif
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
index de801e55d0..040bd941ae 100644
--- a/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <QtCore/QTimeZone>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index d83c2fff22..34a352c614 100644
--- a/tests/auto/corelib/tools/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -61,7 +61,8 @@ void foo()
     vectorX = 0;
 }
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QVector>
 
 #include <algorithm>
 
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
index 924572343d..7eb4125553 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "qbytearray.h"
 #include "qdebug.h"
diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index 76ae592011..0b921ffdbe 100644
--- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include "../../../../../src/corelib/tools/qalgorithms.h"
-#include <QtTest/QtTest>
+#include <QTest>
 
 QT_WARNING_DISABLE_DEPRECATED
 
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 1963df1a0f..e29527cb00 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QString>
 #include <QtCore/qarraydata.h>
 
diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index b2c7915aa0..263083972c 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QBuffer>
 #include <QtCore/QDataStream>
 
diff --git a/tests/auto/corelib/tools/qcache/tst_qcache.cpp b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
index 54cf00f9da..8fb7644b65 100644
--- a/tests/auto/corelib/tools/qcache/tst_qcache.cpp
+++ b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qcache.h>
 
diff --git a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
index 493d8d4982..f8366d4142 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
+++ b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QProcess>
 #include <QtCore/QCommandLineParser>
 
 Q_DECLARE_METATYPE(char**)
diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index 436734f05a..ca4a6f7354 100644
--- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
@@ -28,7 +28,8 @@
 
 
 #include <QtCore/QCoreApplication>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QCryptographicHash>
 #include <QtCore/QMetaEnum>
 
 Q_DECLARE_METATYPE(QCryptographicHash::Algorithm)
diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
index 069f990e2c..09ab680b49 100644
--- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qeasingcurve.h>
 
diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
index 86b5c32cbf..8ff8a7309f 100644
--- a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QSharedData>
 
 /*!
diff --git a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
index dbde140d70..674d9fa6c0 100644
--- a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
+++ b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <private/qflatmap_p.h>
 #include <qbytearray.h>
diff --git a/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp b/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
index 06c2cf173a..5537c70c48 100644
--- a/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
+++ b/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
@@ -32,7 +32,7 @@
 #include <QtCore/QList>
 #include <QtCore/QThread>
 #include <private/qfreelist_p.h>
-#include <QtTest/QtTest>
+#include <QTest>
 
 class tst_QFreeList : public QObject
 {
diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index c6e26f24c0..a922ee55fe 100644
--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qhash.h>
 #include <qmap.h>
diff --git a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
index f04e1bdb12..d313fbb0b0 100644
--- a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
+++ b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qhash.h>
 
diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp
index f4ac51fc24..09001b778b 100644
--- a/tests/auto/corelib/tools/qline/tst_qline.cpp
+++ b/tests/auto/corelib/tools/qline/tst_qline.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qline.h>
 #include <qmath.h>
 
diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index 67f3849f94..3975bec678 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -26,10 +26,11 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QAtomicInt>
 #include <QThread>
 #include <QSemaphore>
+#include <QScopedValueRollback>
 #include <qlist.h>
 
 struct Movable {
diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
index 8f1069f419..56e9a2748d 100644
--- a/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <Foundation/Foundation.h>
 
diff --git a/tests/auto/corelib/tools/qmakearray/tst_qmakearray.cpp b/tests/auto/corelib/tools/qmakearray/tst_qmakearray.cpp
index e0d3f52719..2e27272364 100644
--- a/tests/auto/corelib/tools/qmakearray/tst_qmakearray.cpp
+++ b/tests/auto/corelib/tools/qmakearray/tst_qmakearray.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <private/qmakearray_p.h>
 
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index 5385471b8b..d8be138c0e 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <qmap.h>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QDebug>
 
 QT_WARNING_DISABLE_DEPRECATED
diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index 8d71ccf7ab..8eaa4edd3b 100644
--- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qmargins.h>
 
 Q_DECLARE_METATYPE(QMargins)
diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp b/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
index 7ed091e9c2..3c8f8e13d1 100644
--- a/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
+++ b/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
@@ -28,7 +28,10 @@
 
 
 #include <QtCore/QCoreApplication>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QCryptographicHash>
+#include <QMessageAuthenticationCode>
+#include <QBuffer>
 
 class tst_QMessageAuthenticationCode : public QObject
 {
diff --git a/tests/auto/corelib/tools/qoffsetstringarray/tst_qoffsetstringarray.cpp b/tests/auto/corelib/tools/qoffsetstringarray/tst_qoffsetstringarray.cpp
index dfa0450b18..9445366efc 100644
--- a/tests/auto/corelib/tools/qoffsetstringarray/tst_qoffsetstringarray.cpp
+++ b/tests/auto/corelib/tools/qoffsetstringarray/tst_qoffsetstringarray.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <private/qoffsetstringarray_p.h>
 
diff --git a/tests/auto/corelib/tools/qpair/tst_qpair.cpp b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
index 43ad0cfc83..3bdc7f8895 100644
--- a/tests/auto/corelib/tools/qpair/tst_qpair.cpp
+++ b/tests/auto/corelib/tools/qpair/tst_qpair.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QPair>
 #include <QSize>
diff --git a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
index 59ea28454e..3ce8c3942d 100644
--- a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
+++ b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QBuffer>
 
 #include <qpoint.h>
 
diff --git a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
index 21b9d56737..645c1ba210 100644
--- a/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
+++ b/tests/auto/corelib/tools/qpointf/tst_qpointf.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QBuffer>
 
 #include <qpoint.h>
 
diff --git a/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
index 6c391bd764..959927cab8 100644
--- a/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
+++ b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qqueue.h>
 
 class tst_QQueue : public QObject
diff --git a/tests/auto/corelib/tools/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
index d65dba6e37..4057eb67fb 100644
--- a/tests/auto/corelib/tools/qrect/tst_qrect.cpp
+++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qrect.h>
 #include <qmargins.h>
 #include <limits.h>
diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 10e6294b48..3b922de0ca 100644
--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QBuffer>
 
 #include <private/qringbuffer_p.h>
 #include <qlist.h>
diff --git a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
index 59b8b1bbcb..0cb6b59c02 100644
--- a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QScopedPointer>
 
 /*!
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp b/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
index 9b607db608..a05cf7ef33 100644
--- a/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QScopedValueRollback>
 
 /*!
diff --git a/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp b/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
index 74a123ef4e..21567137fd 100644
--- a/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
+++ b/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QScopeGuard>
 
 /*!
diff --git a/tests/auto/corelib/tools/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp
index 5c4cc1f1a4..6e69b034ec 100644
--- a/tests/auto/corelib/tools/qset/tst_qset.cpp
+++ b/tests/auto/corelib/tools/qset/tst_qset.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qset.h>
 #include <qdebug.h>
 
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
index 11487d4b3e..37a24b6b9b 100644
--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
@@ -343,7 +343,7 @@ namespace QTest {
         if (qtModules & QExternalTest::QtScript)
             sourceCode += "#include <QtScript/QtScript>\n";
         if (qtModules & QExternalTest::QtTest)
-            sourceCode += "#include <QtTest/QtTest>\n";
+            sourceCode += "#include <QTest>\n";
         if (qtModules & QExternalTest::QtDBus)
             sourceCode += "#include <QtDBus/QtDBus>\n";
         if (qtModules & QExternalTest::QtWebKit)
diff --git a/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp b/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp
index e0780f8a9a..fa52c4f6c5 100644
--- a/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp
@@ -40,7 +40,7 @@
  */
 
 #include <qsharedpointer.h>
-#include <QtTest>
+#include <QTest>
 
 #include "nontracked.h"
 
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 06c4091232..985564731d 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -30,7 +30,9 @@
 
 #define QT_SHAREDPOINTER_TRACK_POINTERS
 #include "qsharedpointer.h"
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QPointer>
+#include <QRandomGenerator>
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QMap>
diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index 6824bad9c8..1bac2bd19b 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qsize.h>
 
 Q_DECLARE_METATYPE(QMargins)
diff --git a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
index bbffa74a62..af45c3c91f 100644
--- a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
+++ b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qsize.h>
 
 Q_DECLARE_METATYPE(QMarginsF)
diff --git a/tests/auto/corelib/tools/qstl/tst_qstl.cpp b/tests/auto/corelib/tools/qstl/tst_qstl.cpp
index 6114da55b4..1cd74ad305 100644
--- a/tests/auto/corelib/tools/qstl/tst_qstl.cpp
+++ b/tests/auto/corelib/tools/qstl/tst_qstl.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qstring.h>
 
diff --git a/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp b/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp
index be4d338e95..dcc966fc2f 100644
--- a/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp
+++ b/tests/auto/corelib/tools/qtaggedpointer/tst_qtaggedpointer.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/qtaggedpointer.h>
 
 class tst_QTaggedPointer : public QObject
diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
index 45b0c47785..0869af31f7 100644
--- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 
 #include <qtimeline.h>
 
diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
index 346343b2ba..b0dbcb042d 100644
--- a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
+++ b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/qversionnumber.h>
 #include <QtCore/qlibraryinfo.h>
 
-- 
cgit v1.2.3