diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
index 78d622f5e9..ace4c51d33 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@@ -63,6 +63,7 @@
 #define QT_FEATURE_jalalicalendar -1
 #define QT_FEATURE_journald -1
 #define QT_FEATURE_futimens -1
+#undef QT_FEATURE_future
 #define QT_FEATURE_future -1
 #define QT_FEATURE_itemmodel -1
 #define QT_FEATURE_library -1
@@ -81,7 +82,6 @@
 # define QT_FEATURE_renameat2 -1
 #endif
 #define QT_FEATURE_shortcut -1
-#define QT_FEATURE_signaling_nan -1
 #define QT_FEATURE_slog2 -1
 #ifdef __GLIBC_PREREQ
 # define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
@@ -92,6 +92,7 @@
 #define QT_NO_SYSTEMLOCALE
 #define QT_FEATURE_temporaryfile 1
 #define QT_FEATURE_textdate 1
+#undef QT_FEATURE_thread
 #define QT_FEATURE_thread -1
 #define QT_FEATURE_timezone -1
 #define QT_FEATURE_topleveldomain -1
diff --git a/src/corelib/global/qtconfiginclude.h b/src/corelib/global/qtconfiginclude.h
index 98f104b0e4..8b22a47ac7 100644
--- a/src/corelib/global/qtconfiginclude.h
+++ b/src/corelib/global/qtconfiginclude.h
@@ -8,13 +8,14 @@
 #  pragma qt_sync_stop_processing
 #endif
 
+#include <QtCore/qconfig.h>
+
 #ifdef QT_BOOTSTRAPPED
 // qconfig-bootstrapped.h is not supposed to be a part of the synced header files. So we find it by
 // the include path specified for Bootstrap library in the source tree instead of the build tree as
 // it's done for regular header files.
 #include "qconfig-bootstrapped.h"
 #else
-#include <QtCore/qconfig.h>
 #include <QtCore/qtcore-config.h>
 #endif