diff --git a/qtbase.pro b/qtbase.pro
index 93a2f6264f..481374b0da 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -148,21 +148,11 @@ FEATURES_PRI = \
     "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)"
 write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error()
 
-# Create forwarding headers for qconfig.h
-FWD_QCONFIG_H = \
-    '$${LITERAL_HASH}include "../../src/corelib/global/qconfig.h"'
-write_file($$OUT_PWD/include/QtCore/qconfig.h, FWD_QCONFIG_H)|error()
-FWD_QTCONFIG = \
-    '$${LITERAL_HASH}include "qconfig.h"'
-write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error()
-
 # Files created by us
 QMAKE_DISTCLEAN += \
     src/corelib/global/qfeatures.h \
     include/QtCore/qfeatures.h \
-    mkspecs/qfeatures.pri \
-    include/QtCore/qconfig.h \
-    include/QtCore/QtConfig
+    mkspecs/qfeatures.pri
 
 #mkspecs
 mkspecs.path = $$[QT_HOST_DATA]/mkspecs
diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h
index 9e4368e889..3daf1070c4 100644
--- a/src/3rdparty/zlib/gzguts.h
+++ b/src/3rdparty/zlib/gzguts.h
@@ -21,7 +21,9 @@
 #  endif
 #endif
 
-#include "qconfig.h"
+#ifndef QT_BOOTSTRAPPED
+#  include <qconfig.h>
+#endif
 #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) && defined(QT_VISIBILITY_AVAILABLE)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h
index 4d367a92db..881a7ecb3f 100644
--- a/src/3rdparty/zlib/zutil.h
+++ b/src/3rdparty/zlib/zutil.h
@@ -13,7 +13,9 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#include "qconfig.h"
+#ifndef QT_BOOTSTRAPPED
+#  include <qconfig.h>
+#endif
 #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) && defined(QT_VISIBILITY_AVAILABLE)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 3d8baf7188..d9ffca3810 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -56,7 +56,7 @@
 */
 #define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
-#if !defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_CONFIGURE)
+#ifndef QT_BOOTSTRAPPED
 #include <QtCore/qconfig.h>
 #include <QtCore/qfeatures.h>
 #endif
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index f763d0c8fe..b5015ed562 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -6,6 +6,10 @@ CONFIG += minimal_syncqt internal_module force_bootstrap
 
 MODULE_INCNAME = QtCore QtXml
 MODULE_DEFINES = \
+        QT_VERSION_STR=$$shell_quote(\"$$QT_VERSION\") \
+        QT_VERSION_MAJOR=$$QT_MAJOR_VERSION \
+        QT_VERSION_MINOR=$$QT_MINOR_VERSION \
+        QT_VERSION_PATCH=$$QT_PATCH_VERSION \
         QT_BOOTSTRAPPED \
         QT_LITE_UNICODE \
         QT_NO_CAST_TO_ASCII \