--- CMakeLists.txt.orig	2026-01-07 13:28:32 UTC
+++ CMakeLists.txt
@@ -488,7 +488,7 @@ if(NOT LIBRETRO)
 
 			# DreamPicoPort-API
 			option(DREAMPICOPORT_ADD_LIBUSB "Add internal libusb library" OFF) # Already included above, when applicable
-			add_subdirectory(core/deps/DreamPicoPort-API)
+			add_subdirectory(core/deps/DreamPicoPort-API EXCLUDE_FROM_ALL)
 			target_link_libraries(${PROJECT_NAME} PRIVATE dream_pico_port_api)
 		endif()
 
@@ -1001,8 +1001,11 @@ if(NOT LIBRETRO)
 			core/deps/rcheevos/src/rhash/aes.c
 			core/deps/rcheevos/src/rhash/cdreader.c
 			core/deps/rcheevos/src/rhash/hash.c
-			core/deps/rcheevos/src/rhash/md5.c
-			core/deps/rcheevos/src/rurl/url.c)
+			core/deps/rcheevos/src/rhash/hash_disc.c
+			core/deps/rcheevos/src/rhash/hash_encrypted.c
+			core/deps/rcheevos/src/rhash/hash_rom.c
+			core/deps/rcheevos/src/rhash/hash_zip.c
+			core/deps/rcheevos/src/rhash/md5.c)
 	target_include_directories(${PROJECT_NAME} PRIVATE core/deps/rcheevos/include)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_RACHIEVEMENTS RC_DISABLE_LUA)
 endif()
@@ -1080,8 +1083,7 @@ if(USE_VULKAN)
 		target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_METAL_EXT)
 	endif()
 
-	add_subdirectory(core/deps/Vulkan-Headers)
-	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers)
+	find_package(VulkanHeaders)
 
 	add_subdirectory(core/deps/VulkanMemoryAllocator)
 	target_compile_options(VulkanMemoryAllocator INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:AppleClang,Clang>>:-Wno-nullability-completeness>)