diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c85c91889..fdf8900775 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -460,6 +460,9 @@ if (YUZU_USE_CPM)
         find_package(VulkanHeaders 1.3.274 REQUIRED)
     endif()
 
+    # SPIRV Headers
+    AddJsonPackage(spirv-headers)
+
     # SPIRV Tools
     AddJsonPackage(spirv-tools)
 
@@ -468,9 +471,6 @@ if (YUZU_USE_CPM)
         target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link)
     endif()
 
-    # SPIRV Headers
-    AddJsonPackage(spirv-headers)
-
     # mbedtls
     AddJsonPackage(mbedtls)
 else()