diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 208681d..a64d2d5 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -19,6 +19,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
          # For uninstalled prefix builds these will vary per module, via the
          # forwarding module pri files. Keep qt_module_pris.prf in sync with this!
          QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
+         QT_MODULE_HOST_INCLUDE_BASE = $$[QT_HOST_PREFIX]/include
          QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
          QT_MODULE_HOST_LIB_BASE = $$[QT_HOST_LIBS]
          QT_MODULE_PLUGIN_BASE = $$[QT_INSTALL_PLUGINS]
@@ -31,6 +32,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
    }
    QT_MODULES = $$unique(QT_MODULES)   # In case modules appear in multiple places
    unset(QT_MODULE_INCLUDE_BASE)
+   unset(QT_MODULE_HOST_INCLUDE_BASE)
    unset(QT_MODULE_LIB_BASE)
    unset(QT_MODULE_HOST_LIB_BASE)
    unset(QT_MODULE_PLUGIN_BASE)
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 900ade9..495b9ee 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -138,6 +138,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         MODULE_FWD_PRI_CONT = \
             "QT_MODULE_BIN_BASE = $$MODULE_BASE_OUTDIR/bin" \
             "QT_MODULE_INCLUDE_BASE = $$MODULE_BASE_INCDIR/include" \
+            "QT_MODULE_HOST_INCLUDE_BASE = $$[QT_HOST_PREFIX]/include" \
             "QT_MODULE_IMPORT_BASE = $$MODULE_BASE_OUTDIR/imports" \
             "QT_MODULE_QML_BASE = $$MODULE_BASE_OUTDIR/qml" \
             "QT_MODULE_LIB_BASE = $$MODULE_BASE_OUTDIR/lib" \
@@ -157,6 +158,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         # This is needed for the direct include() below. Mirrors qt_config.prf
         QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS]
         QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
+        QT_MODULE_HOST_INCLUDE_BASE = $$[QT_HOST_PREFIX]/include
         QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS]
         QT_MODULE_QML_BASE = $$[QT_INSTALL_QML]
         QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index dd51897..e382ce4 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -31,14 +31,14 @@ DEFINES += \
 DEFINES -= QT_EVAL
 
 MODULE_INCLUDES = \
-    \$\$QT_MODULE_INCLUDE_BASE \
-    \$\$QT_MODULE_INCLUDE_BASE/QtCore \
-    \$\$QT_MODULE_INCLUDE_BASE/QtXml
+    \$\$QT_MODULE_HOST_INCLUDE_BASE \
+    \$\$QT_MODULE_HOST_INCLUDE_BASE/QtCore \
+    \$\$QT_MODULE_HOST_INCLUDE_BASE/QtXml
 MODULE_PRIVATE_INCLUDES = \
-    \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION \
-    \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore \
-    \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \
-    \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml
+    \$\$QT_MODULE_HOST_INCLUDE_BASE/QtCore/$$QT_VERSION \
+    \$\$QT_MODULE_HOST_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore \
+    \$\$QT_MODULE_HOST_INCLUDE_BASE/QtXml/$$QT_VERSION \
+    \$\$QT_MODULE_HOST_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml
 
 # We need the forwarding headers before their respective modules are built,
 # so do a minimal syncqt run.
@@ -144,7 +144,7 @@ macx {
 
 *-g++*: QMAKE_CXXFLAGS += -ffunction-sections
 
-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
+if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
 else:include(../../3rdparty/zlib_dependency.pri)
 
 win32:LIBS += -luser32 -lole32 -ladvapi32