diff --git a/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake b/cmake/QtAndroidHelpers.cmake
similarity index 99%
rename from cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake
rename to cmake/QtAndroidHelpers.cmake
index 1d3997b0c9d..7e84c983a9c 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake
+++ b/cmake/QtAndroidHelpers.cmake
@@ -212,5 +212,3 @@ function(qt_android_dependencies target)
         COMPONENT
             Devel)
 endfunction()
-
-
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index 73bc83aca08..1f12b7206a7 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -57,10 +57,6 @@ qt_install(FILES
     DESTINATION "${__build_internals_install_dir}"
     COMPONENT Devel
 )
-qt_copy_or_install(
-    FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake"
-    DESTINATION "${__build_internals_install_dir}")
 qt_copy_or_install(
     DIRECTORY
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/${__build_internals_standalone_test_template_dir}"
@@ -149,6 +145,7 @@ qt_copy_or_install(FILES
                    cmake/ModuleDescription.json.in
                    cmake/Qt3rdPartyLibraryConfig.cmake.in
                    cmake/Qt3rdPartyLibraryHelpers.cmake
+                   cmake/QtAndroidHelpers.cmake
                    cmake/QtAppHelpers.cmake
                    cmake/QtAutogenHelpers.cmake
                    cmake/QtBuild.cmake
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index e62294c0455..1252ed2c3cd 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -490,5 +490,9 @@ include(QtToolHelpers)
 include(QtHeadersClean)
 include(QtJavaHelpers)
 
+if(ANDROID)
+    include(QtAndroidHelpers)
+endif()
+
 # This sets up the scope finalizer mechanism.
 variable_watch(CMAKE_CURRENT_LIST_DIR qt_watch_current_list_dir)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index bb2de0a0c25..d930e2a9636 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -568,12 +568,3 @@ macro(qt_examples_build_end)
 
     set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE})
 endmacro()
-
-if (ANDROID)
-    if(QT_SUPERBUILD)
-        include(QtBuildInternals/QtBuildInternalsAndroid)
-    else()
-        ### TODO: Find out why this is needed. See QTBUG-88718.
-        include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsAndroid.cmake)
-    endif()
-endif()