diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 97386e22d8..df9724765e 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -72,6 +72,7 @@ endfunction()
 
 add_library(PlatformCommonInternal INTERFACE)
 add_library(Qt::PlatformCommonInternal ALIAS PlatformCommonInternal)
+target_link_libraries(PlatformCommonInternal INTERFACE Platform)
 
 add_library(PlatformModuleInternal INTERFACE)
 add_library(Qt::PlatformModuleInternal ALIAS PlatformModuleInternal)
diff --git a/cmake/QtPublicTargetsHelpers.cmake b/cmake/QtPublicTargetsHelpers.cmake
index 2e5eb564f4..6558becf5c 100644
--- a/cmake/QtPublicTargetsHelpers.cmake
+++ b/cmake/QtPublicTargetsHelpers.cmake
@@ -1,5 +1,5 @@
-# Defines the public Qt::Platform target, which is used by both internal Qt builds as well as
-# public Qt consuming projects.
+# Defines the public Qt::Platform target, which serves as a dependency for all internal Qt target
+# as well as user projects consuming Qt.
 function(qt_internal_setup_public_platform_target)
     ## QtPlatform Target:
     add_library(Platform INTERFACE)
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 5e97a19751..37e07f2350 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -65,7 +65,6 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
 )
 qt_disable_warnings(BundledHarfbuzz)
 qt_set_symbol_visibility_hidden(BundledHarfbuzz)
-qt_set_msvc_cplusplus_options(BundledHarfbuzz PRIVATE)
 
 #### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/src/harfbuzz.cc"