diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 67c80ab2d6..3058e22bb5 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -766,12 +766,13 @@ function(qt_register_target_dependencies target public_libs private_libs)
         set(target_deps "")
     endif()
 
-    # TODO: should this also be in extend_target ? From the looks of it I would say that
-    # it is not necessary but I'm not sure
     foreach(lib IN LISTS public_libs private_libs)
         if ("${lib}" MATCHES "^Qt::(.*)")
             set(lib "${CMAKE_MATCH_1}")
-            if (lib STREQUAL Platform OR lib STREQUAL GlobalConfig)
+            if (lib STREQUAL Platform OR lib STREQUAL GlobalConfig
+                    OR lib STREQUAL PlatformModuleInternal
+                    OR lib STREQUAL PlatformPluginInternal
+                    OR lib STREQUAL PlatformToolInternal)
                 list(APPEND target_deps "Qt5\;${PROJECT_VERSION}")
             elseif ("${lib}" MATCHES "(.*)Private")
                 list(APPEND target_deps "${INSTALL_CMAKE_NAMESPACE}${CMAKE_MATCH_1}\;${PROJECT_VERSION}")
@@ -871,7 +872,9 @@ function(extend_target target)
         if(TARGET "${target_private}")
           target_link_libraries("${target_private}" INTERFACE "${target}" "${qt_libs_private}")
         endif()
-        qt_register_target_dependencies("${target}" "${arg_PUBLIC_LIBRARIES}" "${qt_libs_private}")
+        qt_register_target_dependencies("${target}"
+                                        "${arg_PUBLIC_LIBRARIES}"
+                                        "${qt_libs_private};${arg_LIBRARIES}")
 
 
         qt_autogen_tools(${target}
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake
index dc16514825..568719d4f0 100644
--- a/cmake/QtPostProcess.cmake
+++ b/cmake/QtPostProcess.cmake
@@ -171,6 +171,8 @@ endfunction()
 
 function(qt_internal_create_plugin_depends_file target)
     get_target_property(qt_module "${target}" QT_MODULE)
+    get_target_property(depends "${target}" LINK_LIBRARIES)
+    get_target_property(public_depends "${target}" INTERFACE_LINK_LIBRARIES)
     get_target_property(target_deps "${target}" _qt_target_deps)
     set(target_deps_seen "")