diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h
index b8daf0c3800..3775439aeb6 100644
--- a/src/corelib/kernel/qeventdispatcher_cf_p.h
+++ b/src/corelib/kernel/qeventdispatcher_cf_p.h
@@ -19,7 +19,6 @@
 #include <QtCore/private/qtimerinfo_unix_p.h>
 #include <QtCore/private/qcfsocketnotifier_p.h>
 #include <QtCore/private/qcore_mac_p.h>
-#include <QtCore/qdebug.h>
 #include <QtCore/qloggingcategory.h>
 
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/src/corelib/platform/android/qandroidmodelindexproxy_p.h b/src/corelib/platform/android/qandroidmodelindexproxy_p.h
index fd03b6423e4..ec139232084 100644
--- a/src/corelib/platform/android/qandroidmodelindexproxy_p.h
+++ b/src/corelib/platform/android/qandroidmodelindexproxy_p.h
@@ -10,7 +10,6 @@
 #include <QtCore/qjniobject.h>
 #include <QtCore/qjnienvironment.h>
 #include <QtCore/qjnitypes.h>
-#include <QDebug>
 
 //
 //  W A R N I N G
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index a07b6cca37d..5cc0dbd362d 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -22,8 +22,6 @@
 #include "QtCore/qshareddata.h"
 #include "QtCore/qvarlengtharray.h"
 
-#include <qdebug.h>
-
 #include <private/qvectorpath_p.h>
 #include <private/qstroker_p.h>
 
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
index 105e8efee26..9bb8c294ea5 100644
--- a/src/gui/rhi/qshader.cpp
+++ b/src/gui/rhi/qshader.cpp
@@ -5,6 +5,10 @@
 #include <QDataStream>
 #include <QBuffer>
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QtCore/qdebug.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h
index 3bf4e217a54..55acb280a52 100644
--- a/src/gui/rhi/qshader_p.h
+++ b/src/gui/rhi/qshader_p.h
@@ -19,7 +19,6 @@
 #include <rhi/qshader.h>
 #include <QtCore/QAtomicInt>
 #include <QtCore/QMap>
-#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index c01d3a07113..872426dfc08 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -22,7 +22,6 @@
 #include "QtGui/qtextoption.h"
 #include "QtGui/qtextlayout.h"
 
-#include "QtCore/qdebug.h"
 #include "QtCore/qlist.h"
 #include "QtCore/qnamespace.h"
 #include "QtCore/qset.h"
diff --git a/src/network/access/http2/bitstreams_p.h b/src/network/access/http2/bitstreams_p.h
index 8ccd074a9f2..e3cd0aa2db1 100644
--- a/src/network/access/http2/bitstreams_p.h
+++ b/src/network/access/http2/bitstreams_p.h
@@ -17,7 +17,9 @@
 //
 
 #include <QtCore/private/qtcoreglobal_p.h>
-#include <QtCore/qdebug.h>
+#include <QtCore/qassert.h>
+#include <QtCore/qtclasshelpermacros.h>
+#include <QtCore/qtypes.h>
 
 #include <type_traits>
 #include <algorithm>
@@ -26,6 +28,7 @@
 QT_BEGIN_NAMESPACE
 
 class QByteArray;
+class QByteArrayView;
 
 namespace HPack
 {
diff --git a/src/opengl/qopenglpaintengine_p.h b/src/opengl/qopenglpaintengine_p.h
index df407444bef..e2577bdf1b0 100644
--- a/src/opengl/qopenglpaintengine_p.h
+++ b/src/opengl/qopenglpaintengine_p.h
@@ -15,8 +15,6 @@
 // We mean it.
 //
 
-#include <QDebug>
-
 #include <qopenglpaintdevice.h>
 
 #include <private/qpaintengineex_p.h>
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
index 798d7c38b7b..3ad91df33fe 100644
--- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h
+++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
@@ -7,7 +7,6 @@
 
 #include "qmacstyle_mac_p.h"
 
-#include <QtCore/qdebug.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
diff --git a/src/tools/qlalr/recognizer.h b/src/tools/qlalr/recognizer.h
index 31d606e6578..9cbc9957d17 100644
--- a/src/tools/qlalr/recognizer.h
+++ b/src/tools/qlalr/recognizer.h
@@ -8,7 +8,6 @@
 
 #include "lalr.h"
 
-#include <QtCore/qdebug.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qtextstream.h>
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index d5ee1c537ba..19e5894b5ee 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -38,7 +38,6 @@
 #include <qcompleter.h>
 #endif
 #include <qpointer.h>
-#include <qdebug.h>
 #include "qsidebar_p.h"
 #if QT_CONFIG(fscompleter)
 #include "qfscompleter_p.h"
diff --git a/src/widgets/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h
index 9abd0e567c0..eea3e1a1aaf 100644
--- a/src/widgets/graphicsview/qgraph_p.h
+++ b/src/widgets/graphicsview/qgraph_p.h
@@ -19,7 +19,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QQueue>
 #include <QtCore/QString>
-#include <QtCore/QDebug>
 #include <QtCore/QSet>
 
 #include <functional> // for std::less
diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h
index 1a1a66682ac..df8233ea047 100644
--- a/src/widgets/itemviews/qabstractitemview_p.h
+++ b/src/widgets/itemviews/qabstractitemview_p.h
@@ -25,7 +25,6 @@
 #include "QtGui/qpainter.h"
 #include "QtGui/qregion.h"
 
-#include "QtCore/qdebug.h"
 #include "QtCore/qbasictimer.h"
 #include "QtCore/qelapsedtimer.h"
 #include <QtCore/qpointer.h>
diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
index 4de658736d9..30f82af64c3 100644
--- a/src/widgets/itemviews/qtableview_p.h
+++ b/src/widgets/itemviews/qtableview_p.h
@@ -23,7 +23,6 @@
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QSet>
-#include <QtCore/QDebug>
 #include "private/qabstractitemview_p.h"
 
 #include <array>
diff --git a/src/widgets/kernel/qwidgetrepaintmanager_p.h b/src/widgets/kernel/qwidgetrepaintmanager_p.h
index 13190a0bb0e..fb390501ccb 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager_p.h
+++ b/src/widgets/kernel/qwidgetrepaintmanager_p.h
@@ -16,7 +16,6 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include <QDebug>
 #include <QtWidgets/qwidget.h>
 #include <private/qwidget_p.h>
 #include <QtGui/qbackingstore.h>
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index c4a17598c24..5ed23ab67ac 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -34,7 +34,6 @@
 #include "QtWidgets/qcompleter.h"
 #endif
 #include "QtGui/qevent.h"
-#include "QtCore/qdebug.h"
 
 #include <limits.h>
 
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index 7b9109692d0..d3aaab344f5 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -27,7 +27,6 @@
 #include "private/qabstractspinbox_p.h"
 #include "private/qdatetimeparser_p.h"
 
-#include "qdebug.h"
 #include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 5d4faf4dd3d..314a294b667 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -28,7 +28,6 @@
 #endif
 #include <QBasicTimer>
 #include <QPointer>
-#include <QDebug>
 #include <private/qwidget_p.h>
 
 QT_REQUIRE_CONFIG(mdiarea);
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h
index 71238071c91..996396c74aa 100644
--- a/src/widgets/widgets/qtabbar_p.h
+++ b/src/widgets/widgets/qtabbar_p.h
@@ -22,7 +22,6 @@
 #include <qicon.h>
 #include <qtoolbutton.h>
 #include <qbasictimer.h>
-#include <qdebug.h>
 #if QT_CONFIG(animation)
 #include <qvariantanimation.h>
 #endif