From 819e1bf91d791ba75cef3e4d51a86676357e0e44 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Tue, 8 Feb 2022 12:15:24 +0100
Subject: Tests: Do not depend on transitive includes

Change-Id: Ibc6a948480a904913a5427e6408d4d296784fb4f
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
---
 tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp    | 1 +
 .../qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp        | 1 +
 tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp          | 1 +
 .../qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp          | 1 +
 tests/auto/corelib/global/qlogging/tst_qlogging.cpp                    | 2 ++
 tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp                | 2 ++
 tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp    | 2 ++
 tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp        | 2 ++
 tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp                      | 2 ++
 tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp        | 2 ++
 tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp          | 2 ++
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp                    | 2 ++
 tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp               | 1 +
 tests/auto/corelib/serialization/json/tst_qtjson.cpp                   | 2 ++
 .../auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp | 3 +++
 tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp          | 1 +
 tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp  | 1 +
 tests/auto/corelib/thread/qfuture/tst_qfuture.cpp                      | 3 +++
 tests/auto/corelib/time/qdate/tst_qdate.cpp                            | 1 +
 .../corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp    | 2 ++
 tests/auto/corelib/tools/qarraydata/simplevector.h                     | 1 +
 tests/auto/corelib/tools/qhash/tst_qhash.cpp                           | 1 +
 tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp         | 1 +
 tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp               | 1 +
 tests/auto/gui/image/qimage/tst_qimage.cpp                             | 1 +
 tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp                  | 2 ++
 tests/auto/gui/qvulkan/tst_qvulkan.cpp                                 | 1 +
 tests/auto/gui/text/qstatictext/tst_qstatictext.cpp                    | 1 +
 tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp          | 2 ++
 tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp  | 1 +
 tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp                | 2 ++
 tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp                | 1 +
 tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp         | 1 +
 tests/auto/network/ssl/shared/qopenssl_symbols.h                       | 1 +
 tests/auto/other/gestures/tst_gestures.cpp                             | 1 +
 tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp             | 1 +
 .../tools/containers-associative/tst_bench_containers_associative.cpp  | 2 ++
 37 files changed, 55 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index f9e68bd5f6..d84492d37c 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -29,6 +29,7 @@
 #include <QCoreApplication>
 #include <QList>
 #include <QTest>
+#include <QSet>
 
 #include "../testhelper_functions.h"
 
diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 4163883a5b..c13b5004c9 100644
--- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -26,6 +26,7 @@
 **
 ****************************************************************************/
 #include <QThread>
+#include <QSet>
 
 struct TestIterator
 {
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 973a9b4fa5..5e1adb08dd 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -32,6 +32,7 @@
 #include <QThread>
 #include <QMutex>
 #include <QTest>
+#include <QSet>
 #include <QRandomGenerator>
 
 #include "../testhelper_functions.h"
diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index 12a7aa4bf0..f5d36af4f0 100644
--- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -30,6 +30,7 @@
 #include <QThread>
 #include <QElapsedTimer>
 #include <QTest>
+#include <QSet>
 
 using namespace QtConcurrent;
 
diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index 226a98dfd5..4d9dcc45ca 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -34,6 +34,8 @@
 # include <QtCore/QProcess>
 #endif
 #include <QtTest/QTest>
+#include <QList>
+#include <QMap>
 
 class tst_qmessagehandler : public QObject
 {
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
index 9761fbcfb3..77fbe3c2cd 100644
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@@ -34,6 +34,8 @@
 #include <qdiriterator.h>
 #include <qfileinfo.h>
 #include <qstringlist.h>
+#include <QSet>
+#include <QString>
 
 #include <QtCore/private/qfsfileengine_p.h>
 
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index eda146dd02..60c44ebe55 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -33,6 +33,8 @@
 #include <QFileSystemWatcher>
 #include <QElapsedTimer>
 #include <QTextStream>
+#include <QMap>
+#include <QString>
 #include <QDir>
 #include <QSignalSpy>
 #include <QTimer>
diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
index a2a96e32d3..c794cf91a0 100644
--- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
+++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
@@ -29,6 +29,8 @@
 #include <QTest>
 #include <QMutexLocker>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QStringList>
 
 Q_LOGGING_CATEGORY(TST_LOG, "tst.log")
 Q_LOGGING_CATEGORY(Digia_Oslo_Office_com, "Digia.Oslo.Office.com")
diff --git a/tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp b/tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp
index a550397ee8..d294c59bdf 100644
--- a/tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp
+++ b/tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp
@@ -29,6 +29,8 @@
 #include <QtCore/QUrl>
 #include <QtCore/QFile>
 #include <QTest>
+#include <QSet>
+#include <QByteArray>
 #include <algorithm>
 
 class tst_QUrlUts46 : public QObject
diff --git a/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp b/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
index f2e0328ddc..e599c9a972 100644
--- a/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
+++ b/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
@@ -29,6 +29,8 @@
 #include <QtTest/qtest.h>
 #include <QtCore/qcontainerinfo.h>
 #include <QtCore/qmetacontainer.h>
+#include <QtCore/QMap>
+#include <QtCore/QHash>
 
 #include <QtCore/qvector.h>
 #include <QtCore/qset.h>
diff --git a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
index 6638351928..c4da94cc32 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
+++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
@@ -32,6 +32,8 @@
 
 #include <qobject.h>
 #include <qmetaobject.h>
+#include <QMap>
+#include <QString>
 
 struct CustomType
 {
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 437e3ccba5..6beb06b023 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -31,6 +31,7 @@
 #include <QTest>
 #include <QQueue>
 #include <QStack>
+#include <QSet>
 
 #include <qvariant.h>
 #include <QtCore/private/qvariant_p.h>
@@ -38,6 +39,7 @@
 #include <qbytearraylist.h>
 #include <qdatetime.h>
 #include <qmap.h>
+#include <QHash>
 #include <qiodevice.h>
 #include <qurl.h>
 #include <qlocale.h>
diff --git a/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp b/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
index 6d180cd838..c083bb84bb 100644
--- a/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
+++ b/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
@@ -30,6 +30,7 @@
 
 #include <qmimetype.h>
 #include <qmimedatabase.h>
+#include <QVariantMap>
 
 #include <QTest>
 
diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index f9b4e9bbd1..f79393e457 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -28,6 +28,8 @@
 ****************************************************************************/
 
 #include <QTest>
+#include <QMap>
+#include <QVariantList>
 
 QT_WARNING_DISABLE_DEPRECATED
 
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 723dfef90b..f8a51c1704 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@@ -42,6 +42,9 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QVariant>
+#include <QVariantMap>
+#include <QVariantList>
 
 Q_DECLARE_METATYPE(QCborValue)
 
diff --git a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp
index 2953fc5c04..8e234d5863 100644
--- a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp
+++ b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp
@@ -33,6 +33,7 @@
 // for negative testing (can't convert from)
 #include <deque>
 #include <list>
+#include <QVarLengthArray>
 
 template <typename T>
 constexpr bool CanConvert = std::is_convertible_v<T, QByteArrayView>;
diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
index 08b2e61115..46691b45ff 100644
--- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
@@ -40,6 +40,7 @@
 #include <QStringTokenizer>
 #include <QStringView>
 #include <QTest>
+#include <QVarLengthArray>
 
 #include "../../../../shared/localechange.h"
 
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index a84b11ee68..4e19187d9d 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -33,6 +33,9 @@
 #include <QTestEventLoop>
 #include <QTimer>
 #include <QSignalSpy>
+#include <QVarLengthArray>
+#include <QSet>
+#include <QList>
 
 #include <QTest>
 #include <qfuture.h>
diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp
index 590bbc2d32..ac9c9db9d3 100644
--- a/tests/auto/corelib/time/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp
@@ -32,6 +32,7 @@
 #include <QTimeZone>
 #include <qdatetime.h>
 #include <qlocale.h>
+#include <QMap>
 
 class tst_QDate : public QObject
 {
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
index 33994dfccc..26fe1167d5 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -31,6 +31,8 @@
 #include "qbytearray.h"
 #include "qdebug.h"
 #include "qhash.h"
+#include "qmap.h"
+#include "qset.h"
 #include "qlist.h"
 #include "qstring.h"
 #include "qvarlengtharray.h"
diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h
index 1fc5e9b8e1..744fc2c93b 100644
--- a/tests/auto/corelib/tools/qarraydata/simplevector.h
+++ b/tests/auto/corelib/tools/qarraydata/simplevector.h
@@ -32,6 +32,7 @@
 
 #include <QtCore/qarraydata.h>
 #include <QtCore/qarraydatapointer.h>
+#include <QtCore/qvarlengtharray.h>
 
 #include <algorithm>
 
diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index bab22c454a..9ed1ce67aa 100644
--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@@ -30,6 +30,7 @@
 
 #include <qhash.h>
 #include <qmap.h>
+#include <qset.h>
 
 #include <algorithm>
 #include <vector>
diff --git a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
index 3281c4cefd..204447079c 100644
--- a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
+++ b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include <QTest>
+#include <QVarLengthArray>
 
 #include <qhash.h>
 
diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 6efa39f4f5..716bd69926 100644
--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@@ -28,6 +28,7 @@
 
 #include <QTest>
 #include <QBuffer>
+#include <QVarLengthArray>
 
 #include <private/qringbuffer_p.h>
 #include <qlist.h>
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 5abc164e1a..d36cda9299 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -33,6 +33,7 @@
 #include <qimage.h>
 #include <qimagereader.h>
 #include <qlist.h>
+#include <qset.h>
 #include <qtransform.h>
 #include <qrandom.h>
 #include <stdio.h>
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index cc86e866f6..f18871ed59 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -34,6 +34,8 @@
 #include <QtWidgets/QGraphicsWidget>
 #include <QtWidgets/QWidget>
 #include <QTest>
+#include <QSet>
+#include <QVarLengthArray>
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qwindowsysteminterface_p.h>
 #include <private/qevent_p.h>
diff --git a/tests/auto/gui/qvulkan/tst_qvulkan.cpp b/tests/auto/gui/qvulkan/tst_qvulkan.cpp
index b1cc2dd052..461b58f09f 100644
--- a/tests/auto/gui/qvulkan/tst_qvulkan.cpp
+++ b/tests/auto/gui/qvulkan/tst_qvulkan.cpp
@@ -29,6 +29,7 @@
 #include <QtGui/QVulkanInstance>
 #include <QtGui/QVulkanFunctions>
 #include <QtGui/QVulkanWindow>
+#include <QtCore/qvarlengtharray.h>
 
 #include <QTest>
 
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index d740739793..0c302d309e 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include <QTest>
+#include <QtCore/QSet>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QPainter>
 #include <QtGui/QImage>
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index a39e04e58e..86fc447711 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -40,6 +40,8 @@
 #include <QScopeGuard>
 #include <QBuffer>
 
+#include <QtCore/qlist.h>
+#include <QtCore/qset.h>
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QDataStream>
 #include <QtCore/QUrl>
diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index b5beee5499..eb3b6f911e 100644
--- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -30,6 +30,7 @@
 
 #include <QTest>
 #include <QtEndian>
+#include <QSet>
 
 #include <qcoreapplication.h>
 #include <qnetworkinterface.h>
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 4759ac292a..83356eb7c3 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -60,6 +60,8 @@
 #include <qnetworkinterface.h>
 
 #include <QNetworkProxy>
+#include <QSet>
+#include <QList>
 
 #include "../../../network-settings.h"
 
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 31fd1a3b30..8deb31df1a 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -53,6 +53,7 @@
 #include <QNetworkInterface>
 
 #include <qstringlist.h>
+#include <QSet>
 #include "../../../network-settings.h"
 #include <QtTest/private/qemulationdetector_p.h>
 
diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index d9e58c39c1..2fdef8b849 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -30,6 +30,7 @@
 #include <QTest>
 
 #include <QtNetwork/qtnetworkglobal.h>
+#include <QtCore/qset.h>
 
 #include <qsslcertificate.h>
 #include <qsslkey.h>
diff --git a/tests/auto/network/ssl/shared/qopenssl_symbols.h b/tests/auto/network/ssl/shared/qopenssl_symbols.h
index 4b6d1e6407..9e323d1706 100644
--- a/tests/auto/network/ssl/shared/qopenssl_symbols.h
+++ b/tests/auto/network/ssl/shared/qopenssl_symbols.h
@@ -71,6 +71,7 @@
 // reduced to the needs of our auto-tests, that have to mess with
 // OpenSSL calls directly.
 
+#include <QtCore/qset.h>
 #include <QtNetwork/private/qtnetworkglobal_p.h>
 
 QT_REQUIRE_CONFIG(openssl);
diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 48cd355554..28eec20741 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -31,6 +31,7 @@
 #include <QtTest/qtesttouch.h>
 
 #include <qevent.h>
+#include <QSet>
 #include <qpointingdevice.h>
 #include <qwidget.h>
 #include <qlayout.h>
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 1363479897..a1a4e8897f 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -31,6 +31,7 @@
 #include <QMessageBox>
 #include <QDebug>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QPointer>
 #include <QTimer>
diff --git a/tests/benchmarks/corelib/tools/containers-associative/tst_bench_containers_associative.cpp b/tests/benchmarks/corelib/tools/containers-associative/tst_bench_containers_associative.cpp
index 6bab99cad7..e50480dfa1 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/tst_bench_containers_associative.cpp
+++ b/tests/benchmarks/corelib/tools/containers-associative/tst_bench_containers_associative.cpp
@@ -26,6 +26,8 @@
 **
 ****************************************************************************/
 #include <QString>
+#include <QMap>
+#include <QHash>
 
 #include <qtest.h>
 
-- 
cgit v1.2.3