diff --git a/src/corelib/global/qassert.h b/src/corelib/global/qassert.h
index 28c6b6c8fc..a3cd60b06a 100644
--- a/src/corelib/global/qassert.h
+++ b/src/corelib/global/qassert.h
@@ -7,6 +7,7 @@
 #include <QtCore/qcompilerdetection.h>
 #include <QtCore/qtconfigmacros.h>
 #include <QtCore/qtcoreexports.h>
+#include <QtCore/qtnoop.h>
 
 #if 0
 #pragma qt_class(QtAssert)
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 3a9d40a068..1009057bad 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -27,20 +27,21 @@
 
 #include <QtCore/qtpreprocessorsupport.h>
 
-#include <QtCore/qtnoop.h>
-
 #include <QtCore/qsystemdetection.h>
 #include <QtCore/qprocessordetection.h>
 #include <QtCore/qcompilerdetection.h>
 
-#include <QtCore/qassert.h>
-#include <QtCore/qtypes.h>
-#include <QtCore/qtclasshelpermacros.h>
-
+#ifndef __ASSEMBLER__
+#  include <QtCore/qassert.h>
+#  include <QtCore/qtnoop.h>
+#  include <QtCore/qtypes.h>
+#endif /* !__ASSEMBLER__ */
 #include <QtCore/qtversion.h>
 
 #if defined(__cplusplus)
 
+#include <QtCore/qtclasshelpermacros.h>
+
 // We need to keep QTypeInfo, QSysInfo, QFlags, qDebug & family in qglobal.h for compatibility with Qt 4.
 // Be careful when changing the order of these files.
 #include <QtCore/qtypeinfo.h>
diff --git a/src/corelib/global/qtypes.h b/src/corelib/global/qtypes.h
index f7757b4311..fa41f03c44 100644
--- a/src/corelib/global/qtypes.h
+++ b/src/corelib/global/qtypes.h
@@ -19,8 +19,6 @@
 #pragma qt_sync_stop_processing
 #endif
 
-#ifndef __ASSEMBLER__
-
 /*
    Useful type definitions for Qt
 */
@@ -158,6 +156,4 @@ using qsizetype = QIntegerForSizeof<std::size_t>::Signed;
 
 QT_END_NAMESPACE
 
-#endif // __ASSEMBLER__
-
 #endif // QTYPES_H