diff --git a/src/app/filelogger.cpp b/src/app/filelogger.cpp
index 9199cb45a..743c9bcad 100644
--- a/src/app/filelogger.cpp
+++ b/src/app/filelogger.cpp
@@ -33,6 +33,7 @@
 #include <QDateTime>
 #include <QDir>
 #include <QTextStream>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/logger.h"
diff --git a/src/app/upgrade.cpp b/src/app/upgrade.cpp
index 0c49c2988..66ff575a7 100644
--- a/src/app/upgrade.cpp
+++ b/src/app/upgrade.cpp
@@ -29,6 +29,7 @@
 #include "upgrade.h"
 
 #include <QFile>
+#include <QVector>
 
 #include "base/logger.h"
 #include "base/profile.h"
diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h
index ca1a9d125..d63188c94 100644
--- a/src/base/bittorrent/session.h
+++ b/src/base/bittorrent/session.h
@@ -41,6 +41,7 @@
 #include <QHash>
 #include <QPointer>
 #include <QSet>
+#include <QtContainerFwd>
 #include <QVector>
 
 #include "base/settingvalue.h"
@@ -58,7 +59,6 @@ class QFile;
 class QNetworkConfiguration;
 class QNetworkConfigurationManager;
 class QString;
-class QStringList;
 class QThread;
 class QTimer;
 class QUrl;
diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
index 05671f938..b66a15990 100644
--- a/src/base/bittorrent/torrenthandle.cpp
+++ b/src/base/bittorrent/torrenthandle.cpp
@@ -31,6 +31,8 @@
 
 #include <type_traits>
 
+#include <QHash>
+
 namespace BitTorrent
 {
     uint qHash(const TorrentState key, const uint seed)
diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h
index 00e351ae6..76234af08 100644
--- a/src/base/bittorrent/torrenthandle.h
+++ b/src/base/bittorrent/torrenthandle.h
@@ -29,15 +29,12 @@
 
 #pragma once
 
-#include <QHash>
 #include <QMetaType>
-#include <QSet>
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QBitArray;
 class QDateTime;
-class QStringList;
 class QUrl;
 
 namespace BitTorrent
diff --git a/src/base/bittorrent/torrentinfo.cpp b/src/base/bittorrent/torrentinfo.cpp
index d49061be8..654e2b847 100644
--- a/src/base/bittorrent/torrentinfo.cpp
+++ b/src/base/bittorrent/torrentinfo.cpp
@@ -40,6 +40,7 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
+#include <QVector>
 
 #include "base/exceptions.h"
 #include "base/global.h"
diff --git a/src/base/bittorrent/torrentinfo.h b/src/base/bittorrent/torrentinfo.h
index de3448f94..0b69a4a18 100644
--- a/src/base/bittorrent/torrentinfo.h
+++ b/src/base/bittorrent/torrentinfo.h
@@ -32,14 +32,13 @@
 #include <libtorrent/torrent_info.hpp>
 
 #include <QCoreApplication>
-#include <QVector>
+#include <QtContainerFwd>
 
 #include "base/indexrange.h"
 
 class QByteArray;
 class QDateTime;
 class QString;
-class QStringList;
 class QUrl;
 
 namespace BitTorrent
diff --git a/src/base/filesystemwatcher.h b/src/base/filesystemwatcher.h
index 2e733498d..537e7e5cb 100644
--- a/src/base/filesystemwatcher.h
+++ b/src/base/filesystemwatcher.h
@@ -32,11 +32,10 @@
 #include <QDir>
 #include <QFileSystemWatcher>
 #include <QHash>
+#include <QtContainerFwd>
 #include <QTimer>
 #include <QVector>
 
-class QStringList;
-
 /*
  * Subclassing QFileSystemWatcher in order to support Network File
  * System watching (NFS, CIFS) on Linux and Mac OS.
diff --git a/src/base/logger.cpp b/src/base/logger.cpp
index b55fee3e1..fc5c358e6 100644
--- a/src/base/logger.cpp
+++ b/src/base/logger.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 
 #include <QDateTime>
+#include <QVector>
 
 namespace
 {
diff --git a/src/base/logger.h b/src/base/logger.h
index 7a22438b5..ae5996fe5 100644
--- a/src/base/logger.h
+++ b/src/base/logger.h
@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QReadWriteLock>
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 const int MAX_LOG_MESSAGES = 20000;
 
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index 13e7f40df..4e2856330 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -41,6 +41,7 @@
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>
+#include <QList>
 #include <QLocale>
 #include <QNetworkCookie>
 #include <QSettings>
diff --git a/src/base/preferences.h b/src/base/preferences.h
index f0744f931..9310a150d 100644
--- a/src/base/preferences.h
+++ b/src/base/preferences.h
@@ -30,16 +30,15 @@
 #ifndef PREFERENCES_H
 #define PREFERENCES_H
 
-#include <QList>
+#include <QtContainerFwd>
+#include <QVariant>
 
 #include "base/utils/net.h"
 
 class QDateTime;
 class QNetworkCookie;
 class QSize;
-class QStringList;
 class QTime;
-class QVariant;
 
 enum SchedulerDays
 {
diff --git a/src/base/scanfoldersmodel.h b/src/base/scanfoldersmodel.h
index ad78fb2c3..64fd31882 100644
--- a/src/base/scanfoldersmodel.h
+++ b/src/base/scanfoldersmodel.h
@@ -31,8 +31,7 @@
 
 #include <QAbstractListModel>
 #include <QList>
-
-class QStringList;
+#include <QtContainerFwd>
 
 class FileSystemWatcher;
 
diff --git a/src/base/search/searchhandler.cpp b/src/base/search/searchhandler.cpp
index 0d71d8c3b..6438f0cc9 100644
--- a/src/base/search/searchhandler.cpp
+++ b/src/base/search/searchhandler.cpp
@@ -31,6 +31,7 @@
 
 #include <QProcess>
 #include <QTimer>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/utils/foreignapps.h"
diff --git a/src/base/search/searchhandler.h b/src/base/search/searchhandler.h
index c084fa82d..421060136 100644
--- a/src/base/search/searchhandler.h
+++ b/src/base/search/searchhandler.h
@@ -33,7 +33,7 @@
 #include <QList>
 #include <QObject>
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QProcess;
 class QTimer;
diff --git a/src/base/types.h b/src/base/types.h
index bd18b1a40..f9ab0b026 100644
--- a/src/base/types.h
+++ b/src/base/types.h
@@ -29,7 +29,7 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-#include <QMap>
+#include <QtContainerFwd>
 
 const qlonglong MAX_ETA = 8640000;
 
diff --git a/src/base/utils/bytearray.cpp b/src/base/utils/bytearray.cpp
index 3c8817e5a..79eed420a 100644
--- a/src/base/utils/bytearray.cpp
+++ b/src/base/utils/bytearray.cpp
@@ -29,6 +29,7 @@
 #include "bytearray.h"
 
 #include <QByteArray>
+#include <QVector>
 
 QVector<QByteArray> Utils::ByteArray::splitToViews(const QByteArray &in, const QByteArray &sep, const QString::SplitBehavior behavior)
 {
diff --git a/src/base/utils/bytearray.h b/src/base/utils/bytearray.h
index f0d055ecf..1c1dd2dbb 100644
--- a/src/base/utils/bytearray.h
+++ b/src/base/utils/bytearray.h
@@ -29,7 +29,7 @@
 #pragma once
 
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QByteArray;
 
diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
index b5fc3c76f..5656f1042 100644
--- a/src/base/utils/misc.cpp
+++ b/src/base/utils/misc.cpp
@@ -52,6 +52,7 @@
 #include <QRegularExpression>
 #include <QSet>
 #include <QSysInfo>
+#include <QVector>
 
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB)
 #include <QDBusInterface>
diff --git a/src/base/utils/net.cpp b/src/base/utils/net.cpp
index 6d148c7b2..d95c4a636 100644
--- a/src/base/utils/net.cpp
+++ b/src/base/utils/net.cpp
@@ -28,10 +28,13 @@
 
 #include "net.h"
 
+#include <QList>
 #include <QNetworkInterface>
+#include <QPair>
 #include <QSslCertificate>
 #include <QSslKey>
 #include <QString>
+#include <QVector>
 
 namespace Utils
 {
diff --git a/src/base/utils/net.h b/src/base/utils/net.h
index e5ceb4074..502b60a27 100644
--- a/src/base/utils/net.h
+++ b/src/base/utils/net.h
@@ -30,9 +30,7 @@
 #define BASE_UTILS_NET_H
 
 #include <QHostAddress>
-#include <QList>
-#include <QPair>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QSslCertificate;
 class QSslKey;
diff --git a/src/base/utils/password.cpp b/src/base/utils/password.cpp
index 4fe12a0bd..4b1ee81cc 100644
--- a/src/base/utils/password.cpp
+++ b/src/base/utils/password.cpp
@@ -34,6 +34,7 @@
 
 #include <QByteArray>
 #include <QString>
+#include <QVector>
 
 #include "bytearray.h"
 #include "random.h"
diff --git a/src/base/utils/string.cpp b/src/base/utils/string.cpp
index 1505f0e96..95c109e2c 100644
--- a/src/base/utils/string.cpp
+++ b/src/base/utils/string.cpp
@@ -35,6 +35,7 @@
 #include <QLocale>
 #include <QRegExp>
 #include <QtGlobal>
+#include <QVector>
 
 #if defined(Q_OS_MACOS) || defined(__MINGW32__)
 #define QBT_USES_QTHREADSTORAGE
diff --git a/src/base/utils/string.h b/src/base/utils/string.h
index aef5d3a9a..e40469fd1 100644
--- a/src/base/utils/string.h
+++ b/src/base/utils/string.h
@@ -31,9 +31,10 @@
 #define UTILS_STRING_H
 
 #include <QChar>
-#include <QVector>
+#include <QString>
+#include <Qt>
+#include <QtContainerFwd>
 
-class QString;
 class QStringRef;
 
 class TriStateBool;
diff --git a/src/gui/fspathedit_p.h b/src/gui/fspathedit_p.h
index b386e915d..838ca4488 100644
--- a/src/gui/fspathedit_p.h
+++ b/src/gui/fspathedit_p.h
@@ -32,15 +32,14 @@
 #include <QComboBox>
 #include <QFileIconProvider>
 #include <QLineEdit>
+#include <QtContainerFwd>
 #include <QValidator>
-#include <QVector>
 
 class QAction;
 class QCompleter;
 class QContextMenuEvent;
 class QFileSystemModel;
 class QKeyEvent;
-class QStringList;
 class QStringRef;
 
 namespace Private
diff --git a/src/gui/properties/downloadedpiecesbar.cpp b/src/gui/properties/downloadedpiecesbar.cpp
index db0f25a13..12a69cd3b 100644
--- a/src/gui/properties/downloadedpiecesbar.cpp
+++ b/src/gui/properties/downloadedpiecesbar.cpp
@@ -31,6 +31,7 @@
 #include <cmath>
 
 #include <QDebug>
+#include <QVector>
 
 namespace
 {
diff --git a/src/gui/properties/downloadedpiecesbar.h b/src/gui/properties/downloadedpiecesbar.h
index 42f4bb96f..40ee6f90a 100644
--- a/src/gui/properties/downloadedpiecesbar.h
+++ b/src/gui/properties/downloadedpiecesbar.h
@@ -30,7 +30,7 @@
 #define DOWNLOADEDPIECESBAR_H
 
 #include <QBitArray>
-#include <QVector>
+#include <QtContainerFwd>
 
 #include "piecesbar.h"
 
diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp
index 5d1676ba9..ea33606c4 100644
--- a/src/gui/properties/trackerlistwidget.cpp
+++ b/src/gui/properties/trackerlistwidget.cpp
@@ -42,6 +42,7 @@
 #include <QTableView>
 #include <QTreeWidgetItem>
 #include <QUrl>
+#include <QVector>
 
 #include "base/bittorrent/peerinfo.h"
 #include "base/bittorrent/session.h"
diff --git a/src/gui/properties/trackerlistwidget.h b/src/gui/properties/trackerlistwidget.h
index 16d9ee2f1..21daa5d35 100644
--- a/src/gui/properties/trackerlistwidget.h
+++ b/src/gui/properties/trackerlistwidget.h
@@ -30,7 +30,7 @@
 #define TRACKERLIST_H
 
 #include <QTreeWidget>
-#include <QVector>
+#include <QtContainerFwd>
 
 class PropertiesWidget;
 
diff --git a/src/gui/properties/trackersadditiondialog.h b/src/gui/properties/trackersadditiondialog.h
index 29566079b..ddcfe2b6e 100644
--- a/src/gui/properties/trackersadditiondialog.h
+++ b/src/gui/properties/trackersadditiondialog.h
@@ -30,9 +30,9 @@
 #define TRACKERSADDITION_H
 
 #include <QDialog>
+#include <QtContainerFwd>
 
 class QString;
-class QStringList;
 
 namespace BitTorrent
 {
diff --git a/src/gui/search/pluginselectdialog.h b/src/gui/search/pluginselectdialog.h
index f1896b41f..7a2d737d6 100644
--- a/src/gui/search/pluginselectdialog.h
+++ b/src/gui/search/pluginselectdialog.h
@@ -31,11 +31,11 @@
 #define PLUGINSELECTDIALOG_H
 
 #include <QDialog>
+#include <QStringList>
 
 #include "base/search/searchpluginmanager.h"
 
 class QDropEvent;
-class QStringList;
 class QTreeWidgetItem;
 
 namespace Net
diff --git a/src/gui/tagfiltermodel.cpp b/src/gui/tagfiltermodel.cpp
index a5d538da7..8e81e3e0a 100644
--- a/src/gui/tagfiltermodel.cpp
+++ b/src/gui/tagfiltermodel.cpp
@@ -30,6 +30,8 @@
 
 #include <QDebug>
 #include <QIcon>
+#include <QSet>
+#include <QVector>
 
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
diff --git a/src/gui/tagfiltermodel.h b/src/gui/tagfiltermodel.h
index 0cfb4ce0f..e482df8e4 100644
--- a/src/gui/tagfiltermodel.h
+++ b/src/gui/tagfiltermodel.h
@@ -30,8 +30,7 @@
 #define TAGFILTERMODEL_H
 
 #include <QAbstractListModel>
-#include <QSet>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QModelIndex;
 
diff --git a/src/gui/trackerentriesdialog.cpp b/src/gui/trackerentriesdialog.cpp
index 42be37240..62d2db1e0 100644
--- a/src/gui/trackerentriesdialog.cpp
+++ b/src/gui/trackerentriesdialog.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 
 #include <QHash>
+#include <QVector>
 
 #include "base/bittorrent/trackerentry.h"
 #include "ui_trackerentriesdialog.h"
diff --git a/src/gui/trackerentriesdialog.h b/src/gui/trackerentriesdialog.h
index d85d0273c..53d4dfe82 100644
--- a/src/gui/trackerentriesdialog.h
+++ b/src/gui/trackerentriesdialog.h
@@ -29,7 +29,7 @@
 #pragma once
 
 #include <QDialog>
-#include <QVector>
+#include <QtContainerFwd>
 
 #include "base/settingvalue.h"
 
diff --git a/src/webui/api/apicontroller.cpp b/src/webui/api/apicontroller.cpp
index 03d2a1ea0..1c7352bab 100644
--- a/src/webui/api/apicontroller.cpp
+++ b/src/webui/api/apicontroller.cpp
@@ -30,8 +30,10 @@
 
 #include <algorithm>
 
+#include <QHash>
 #include <QJsonDocument>
 #include <QMetaObject>
+#include <QVector>
 
 #include "apierror.h"
 
diff --git a/src/webui/api/apicontroller.h b/src/webui/api/apicontroller.h
index ad4c192a9..501781328 100644
--- a/src/webui/api/apicontroller.h
+++ b/src/webui/api/apicontroller.h
@@ -28,10 +28,9 @@
 
 #pragma once
 
-#include <QHash>
 #include <QObject>
 #include <QVariant>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QString;
 
diff --git a/src/webui/api/logcontroller.cpp b/src/webui/api/logcontroller.cpp
index 9941cd5c9..aeea35316 100644
--- a/src/webui/api/logcontroller.cpp
+++ b/src/webui/api/logcontroller.cpp
@@ -30,6 +30,7 @@
 
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/logger.h"
diff --git a/src/webui/api/rsscontroller.cpp b/src/webui/api/rsscontroller.cpp
index 457cd7e6a..dac9e58b1 100644
--- a/src/webui/api/rsscontroller.cpp
+++ b/src/webui/api/rsscontroller.cpp
@@ -32,6 +32,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
+#include <QVector>
 
 #include "base/rss/rss_article.h"
 #include "base/rss/rss_autodownloader.h"
diff --git a/src/webui/api/searchcontroller.cpp b/src/webui/api/searchcontroller.cpp
index b48c64ee0..319e51473 100644
--- a/src/webui/api/searchcontroller.cpp
+++ b/src/webui/api/searchcontroller.cpp
@@ -30,8 +30,10 @@
 
 #include <limits>
 
+#include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QSharedPointer>
 
 #include "base/global.h"
diff --git a/src/webui/api/searchcontroller.h b/src/webui/api/searchcontroller.h
index cbdf1c8b7..551fa6510 100644
--- a/src/webui/api/searchcontroller.h
+++ b/src/webui/api/searchcontroller.h
@@ -28,15 +28,13 @@
 
 #pragma once
 
-#include <QHash>
-#include <QList>
+#include <QtContainerFwd>
 
 #include "base/search/searchpluginmanager.h"
 #include "apicontroller.h"
 
 class QJsonArray;
 class QJsonObject;
-class QStringList;
 
 struct ISession;
 struct SearchResult;
diff --git a/src/webui/api/serialize/serialize_torrent.cpp b/src/webui/api/serialize/serialize_torrent.cpp
index 2bae34570..6b46ac3b3 100644
--- a/src/webui/api/serialize/serialize_torrent.cpp
+++ b/src/webui/api/serialize/serialize_torrent.cpp
@@ -29,6 +29,8 @@
 #include "serialize_torrent.h"
 
 #include <QDateTime>
+#include <QSet>
+#include <QVector>
 
 #include "base/bittorrent/infohash.h"
 #include "base/bittorrent/torrenthandle.h"