diff --git a/src/libs/ifc/xml/utils.h b/src/libs/ifc/xml/utils.h
index 3f9d7d94a..35ed166bc 100644
--- a/src/libs/ifc/xml/utils.h
+++ b/src/libs/ifc/xml/utils.h
@@ -28,6 +28,9 @@
 #ifndef UTILS_H
 #define UTILS_H
 
+#include <QtGlobal>
+#include <QtCore/qcontainerfwd.h>
+
 class QMimeType;
 class QString;
 class QMimeType;
diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h
index 0aa56ba77..6e5eb3e09 100644
--- a/src/libs/ifc/xml/vdomdocument.h
+++ b/src/libs/ifc/xml/vdomdocument.h
@@ -40,6 +40,7 @@
 #include <QLocale>
 #include <QLoggingCategory>
 #include <functional>
+#include <QtCore/qcontainerfwd.h>
 
 #include "../ifcdef.h"
 #include "../vmisc/def.h"
@@ -51,9 +52,6 @@
 
 class QDomElement;
 class QDomNode;
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-template <typename T> class QVector;
-#endif
 template <typename T> class QFutureWatcher;
 
 Q_DECLARE_LOGGING_CATEGORY(vXML)
diff --git a/src/libs/qmuparser/qmuparserbase.h b/src/libs/qmuparser/qmuparserbase.h
index 48072ea0d..d9a3a2daf 100644
--- a/src/libs/qmuparser/qmuparserbase.h
+++ b/src/libs/qmuparser/qmuparserbase.h
@@ -34,6 +34,7 @@
 #include <memory>
 #include <string>
 #include <QLocale>
+#include <QtCore/qcontainerfwd.h>
 
 #include "qmuparser_global.h"
 #include "qmuparserbytecode.h"
@@ -43,8 +44,6 @@
 #include "qmuparsertoken.h"
 #include "qmuparsertokenreader.h"
 
-template <class T> class QStack;
-
 namespace qmu
 {
 /**
diff --git a/src/libs/vdxf/dxfdef.h b/src/libs/vdxf/dxfdef.h
index 47a453c17..2f9d1984c 100644
--- a/src/libs/vdxf/dxfdef.h
+++ b/src/libs/vdxf/dxfdef.h
@@ -31,8 +31,7 @@
 
 #include <QtGlobal>
 #include <ciso646>
-
-template <class Key, class T> class QMap;
+#include <QtCore/qcontainerfwd.h>
 
 enum class VarMeasurement : quint8 { English=0, Metric=1 };
 
diff --git a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.h b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.h
index af38adf22..be9495d11 100644
--- a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.h
+++ b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <QtGlobal>
 #include "../drw_base.h"
+#include <QtCore/qcontainerfwd.h>
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include "../vmisc/vtextcodec.h"
@@ -16,8 +17,6 @@
 class QStringList;
 #endif
 
-template <class Key, class T> class QMap;
-
 class DRW_TextCodec
 {
 public:
diff --git a/src/libs/vlayout/vlayoutpaper.h b/src/libs/vlayout/vlayoutpaper.h
index 7955a8259..f83bd02ff 100644
--- a/src/libs/vlayout/vlayoutpaper.h
+++ b/src/libs/vlayout/vlayoutpaper.h
@@ -35,6 +35,7 @@
 #include <QtGlobal>
 #include <atomic>
 #include <QGraphicsPathItem>
+#include <QtCore/qcontainerfwd.h>
 
 #include "../vmisc/defglobal.h"
 
@@ -45,11 +46,6 @@ class QGraphicsRectItem;
 class QRectF;
 class QGraphicsItem;
 class QMutex;
-template <typename T> class QList;
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-template <typename T> class QVector;
-#endif
 
 class VLayoutPaper
 {
diff --git a/src/libs/vlayout/vposter.h b/src/libs/vlayout/vposter.h
index c30490f75..f5e6128b7 100644
--- a/src/libs/vlayout/vposter.h
+++ b/src/libs/vlayout/vposter.h
@@ -32,6 +32,7 @@
 #include <QCoreApplication>
 #include <QRect>
 #include <QtGlobal>
+#include <QtCore/qcontainerfwd.h>
 
 #include "../vmisc/def.h"
 #include "../vlayout/vtextmanager.h"
@@ -40,11 +41,6 @@ class QGraphicsItem;
 class QPrinter;
 struct VWatermarkData;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-template <class T> class QVector;
-#endif
-
-
 struct PosterData
 {
     PosterData()
diff --git a/src/libs/vmisc/literals.h b/src/libs/vmisc/literals.h
index 126e4b05e..a0dd738f1 100644
--- a/src/libs/vmisc/literals.h
+++ b/src/libs/vmisc/literals.h
@@ -28,6 +28,9 @@
 #ifndef LITERALS_H
 #define LITERALS_H
 
+#include <QtGlobal>
+#include <QtCore/qcontainerfwd.h>
+
 class QString;
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 class QStringList;
diff --git a/src/libs/vmisc/testpath.h b/src/libs/vmisc/testpath.h
index bda082a60..bd07476fc 100644
--- a/src/libs/vmisc/testpath.h
+++ b/src/libs/vmisc/testpath.h
@@ -35,11 +35,9 @@
 #include <QString>
 #include <QTemporaryFile>
 #include <QTextStream>
+#include <QtCore/qcontainerfwd.h>
 
 class QPointF;
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-template <class T> class QVector;
-#endif
 class VSAPoint;
 class VRawSAPoint;
 
diff --git a/src/libs/vpropertyexplorer/vproperty.h b/src/libs/vpropertyexplorer/vproperty.h
index a3a8c3700..e5fe1d578 100644
--- a/src/libs/vpropertyexplorer/vproperty.h
+++ b/src/libs/vpropertyexplorer/vproperty.h
@@ -34,6 +34,7 @@
 #include <QVariant>
 #include <Qt>
 #include <QtGlobal>
+#include <QtCore/qcontainerfwd.h>
 
 #include "vpropertyexplorer_global.h"
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
@@ -44,8 +45,6 @@
 
 #include "vpropertydef.h"
 
-template <typename T> class QList;
-
 namespace VPE
 {
 
diff --git a/src/libs/vpropertyexplorer/vpropertyset.h b/src/libs/vpropertyexplorer/vpropertyset.h
index e881be71a..a49c64604 100644
--- a/src/libs/vpropertyexplorer/vpropertyset.h
+++ b/src/libs/vpropertyexplorer/vpropertyset.h
@@ -25,13 +25,11 @@
 #include <QMap>
 #include <QString>
 #include <QtGlobal>
+#include <QtCore/qcontainerfwd.h>
 
 #include "vproperty.h"
 #include "vpropertyexplorer_global.h"
 
-template <class Key, class T> class QMap;
-template <typename T> class QList;
-
 namespace VPE
 {
 
diff --git a/src/libs/vtest/abstracttest.h b/src/libs/vtest/abstracttest.h
index d94e2b0df..d4215ef8d 100644
--- a/src/libs/vtest/abstracttest.h
+++ b/src/libs/vtest/abstracttest.h
@@ -37,16 +37,13 @@
 #include <QJsonArray>
 #include <qtestcase.h>
 #include <typeinfo>
+#include <QtCore/qcontainerfwd.h>
 
 #include "../vgeometry/vpointf.h"
 #include "../vlayout/vsapoint.h"
 #include "../vlayout/vrawsapoint.h"
 #include "../ifc/exception/vexception.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-template <class T> class QVector;
-#endif
-
 #include <ciso646>
 
 #ifdef __GNUC__
diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp
index beffaea60..c55c6ca5a 100644
--- a/src/libs/vtools/visualization/visualization.cpp
+++ b/src/libs/vtools/visualization/visualization.cpp
@@ -44,6 +44,7 @@
 #include <Qt>
 #include <QtDebug>
 #include <QtMath>
+#include <QtCore/qcontainerfwd.h>
 
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/vtranslatevars.h"
@@ -55,8 +56,6 @@
 #include "../vwidgets/scalesceneitems.h"
 #include "../vwidgets/global.h"
 
-template <class K, class V> class QHash;
-
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
 QT_WARNING_DISABLE_INTEL(1418)