diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec24d4c1915d646e78c26ee167f3e121cb4774ae..d8d78793cf25b294d6be89eb9af9fa64773dfcad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,7 +305,8 @@ file(WRITE "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" "${__modulemap_e
 set(ROOT_CXXMODULES_WRITE_TO_CURRENT_DIR ON)
 
 get_property(__allHeaders GLOBAL PROPERTY ROOT_HEADER_TARGETS)
-add_custom_target(move_headers ALL DEPENDS ${__allHeaders})
+get_property(__allBuiltins GLOBAL PROPERTY ROOT_BUILTIN_TARGETS)
+add_custom_target(move_headers ALL DEPENDS ${__allHeaders} ${__allBuiltins})
 
 #---Global PCH-----------------------------------------------------------------------------------
 get_property(__allTargets GLOBAL PROPERTY ROOT_DICTIONARY_TARGETS)
diff --git a/builtins/lz4/CMakeLists.txt b/builtins/lz4/CMakeLists.txt
index b900957fc3d9e0784ae9902fce54030638822e8e..dc31d47379a0261f365253602cd9824597157c99 100644
--- a/builtins/lz4/CMakeLists.txt
+++ b/builtins/lz4/CMakeLists.txt
@@ -44,3 +44,5 @@ add_library(LZ4::LZ4 ALIAS lz4)
 
 set(LZ4_LIBRARY $<TARGET_FILE:lz4> CACHE INTERNAL "")
 set(LZ4_LIBRARIES LZ4::LZ4 CACHE INTERNAL "")
+
+set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS LZ4::LZ4)
diff --git a/builtins/xxhash/CMakeLists.txt b/builtins/xxhash/CMakeLists.txt
index 46f975ed43cb2b13654620e302bcd18de1ec731d..b44391bff849a824d374b56ba17cae2ab4621935 100644
--- a/builtins/xxhash/CMakeLists.txt
+++ b/builtins/xxhash/CMakeLists.txt
@@ -24,3 +24,5 @@ add_library(xxHash::xxHash ALIAS xxhash)
 
 set(xxHash_LIBRARY $<TARGET_FILE:xxhash> CACHE INTERNAL "")
 set(xxHash_LIBRARIES xxHash::xxHash CACHE INTERNAL "")
+
+set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS xxHash::xxHash)
diff --git a/builtins/zlib/CMakeLists.txt b/builtins/zlib/CMakeLists.txt
index e7bdb2e52e5ec6c98df66c01dd232619b603c6f1..431b9b9476e896c330c9d8090eb54f8ac731a64b 100644
--- a/builtins/zlib/CMakeLists.txt
+++ b/builtins/zlib/CMakeLists.txt
@@ -73,3 +73,5 @@ endif()
 if(DEFINED ZLIB_LIBRARY_RELEASE)
   set(ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARY} CACHE INTERNAL "")
 endif()
+
+set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS ZLIB::ZLIB)