diff --git a/cmake/modulecppexports.h.in b/cmake/modulecppexports.h.in
index f4e976b540a..725d9d79f1f 100644
--- a/cmake/modulecppexports.h.in
+++ b/cmake/modulecppexports.h.in
@@ -1,11 +1,11 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
+#include <QtCore/qglobal.h>
+
 #ifndef @header_base_name_upper@_H
 #define @header_base_name_upper@_H
 
-#include <QtCore/qglobal.h>
-
 #if defined(QT_SHARED) || !defined(QT_STATIC)
 #  if defined(QT_BUILD_@module_define_infix@_LIB)
 #    define Q_@module_define_infix@_EXPORT Q_DECL_EXPORT
diff --git a/src/corelib/global/qmalloc.h b/src/corelib/global/qmalloc.h
index c83aecd47cf..83dfff358bb 100644
--- a/src/corelib/global/qmalloc.h
+++ b/src/corelib/global/qmalloc.h
@@ -4,7 +4,11 @@
 #ifndef QMALLOC_H
 #define QMALLOC_H
 
-#include <QtCore/qglobal.h>
+#include <QtCore/qcompilerdetection.h>
+#include <QtCore/qtconfigmacros.h>
+#include <QtCore/qtcoreexports.h>
+
+#include <cstddef> // size_t
 
 #if 0
 #pragma qt_class(QtMalloc)
diff --git a/src/corelib/global/qtenvironmentvariables.h b/src/corelib/global/qtenvironmentvariables.h
index 1d26bed316b..e7be1826779 100644
--- a/src/corelib/global/qtenvironmentvariables.h
+++ b/src/corelib/global/qtenvironmentvariables.h
@@ -4,7 +4,8 @@
 #ifndef QTENVIRONMENTVARIABLES_H
 #define QTENVIRONMENTVARIABLES_H
 
-#include <QtCore/qglobal.h>
+#include <QtCore/qtconfigmacros.h>
+#include <QtCore/qtcoreexports.h>
 #include <QtCore/qtdeprecationmarkers.h>
 
 #if 0
@@ -16,6 +17,7 @@ QT_BEGIN_NAMESPACE
 
 class QByteArray;
 class QByteArrayView;
+class QString;
 
 Q_CORE_EXPORT QByteArray qgetenv(const char *varName);
 // need it as two functions because QString is only forward-declared here
diff --git a/src/corelib/global/qttranslation.h b/src/corelib/global/qttranslation.h
index 6e8405789eb..fb0a2244cc0 100644
--- a/src/corelib/global/qttranslation.h
+++ b/src/corelib/global/qttranslation.h
@@ -4,7 +4,8 @@
 #ifndef QTTRANSLATION_H
 #define QTTRANSLATION_H
 
-#include <QtCore/qglobal.h>
+#include <QtCore/qtconfigmacros.h> // QT_NO_TRANSLATION should be defined here as well
+#include <QtCore/qtcoreexports.h>
 
 #if 0
 #pragma qt_class(QtTranslation)
@@ -13,6 +14,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QString;
+
 #define QT_TR_NOOP(x) x
 #define QT_TR_NOOP_UTF8(x) x
 #define QT_TRANSLATE_NOOP(scope, x) x