diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
index 1cdc8bafc0..e45d101dec 100644
--- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
@@ -70,13 +70,6 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(BundledHarfbuzz CONDITION APPLE
-    SOURCES
-        src/hb-coretext.cc src/hb-coretext.h
-    DEFINES
-        HAVE_CORETEXT
-)
-
 #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
 # SHAPERS = "coretext"
 
@@ -158,17 +151,6 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
         HAVE_OT
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION UIKIT
-    LIBRARIES
-        ${FWCoreGraphics}
-        ${FWCoreText}
-)
-
-qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT
-    LIBRARIES
-        ${FWApplicationServices}
-)
-
 qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
     SOURCES
         src/hb-fallback-shape.cc
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 07e0fdf836..c1925ad988 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -71,13 +71,6 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
 ## Scopes:
 #####################################################################
 
-qt_extend_target(BundledHarfbuzz CONDITION APPLE
-    SOURCES
-        src/hb-coretext.cc src/hb-coretext.h
-    DEFINES
-        HAVE_CORETEXT
-)
-
 #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
 # SHAPERS = "coretext"
 
@@ -159,17 +152,6 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
         HAVE_OT
 )
 
-qt_extend_target(BundledHarfbuzz CONDITION UIKIT
-    LIBRARIES
-        ${FWCoreGraphics}
-        ${FWCoreText}
-)
-
-qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT
-    LIBRARIES
-        ${FWApplicationServices}
-)
-
 qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
     SOURCES
         src/hb-fallback-shape.cc
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index d60945cee3..5d31f4c33a 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -214,7 +214,7 @@ qt_add_module(Core
         tools/qsimd.cpp tools/qsimd_p.h
         tools/qsize.cpp tools/qsize.h
         tools/qstack.h
-        tools/qtaggedpointer_p.h
+        tools/qtaggedpointer.h
         tools/qtools_p.h
         tools/qvarlengtharray.h
         tools/qvector.h