diff --git a/.gitmodules b/.gitmodules
index 03e721f6..367a42b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule "thirdparty/json"]
 	path = thirdparty/json
 	url = https://github.com/nlohmann/json
+[submodule "UnleashedRecomp/api"]
+	path = UnleashedRecomp/api
+	url = https://github.com/hedge-dev/SWA.git
diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt
index 500bc0d5..10863c02 100644
--- a/UnleashedRecomp/CMakeLists.txt
+++ b/UnleashedRecomp/CMakeLists.txt
@@ -441,35 +441,6 @@ compile_pixel_shader(resolve_msaa_depth_2x)
 compile_pixel_shader(resolve_msaa_depth_4x)
 compile_pixel_shader(resolve_msaa_depth_8x)
 
-function(generate_aggregate_header INPUT_DIRECTORY OUTPUT_FILE)
-    get_filename_component(ABS_OUTPUT_FILE "${OUTPUT_FILE}" ABSOLUTE)
-    file(GLOB_RECURSE HEADER_FILES "${INPUT_DIRECTORY}/*.h")
-    set(HEADER_CONTENT "#pragma once\n\n")
-
-    foreach(HEADER_FILE IN LISTS HEADER_FILES)
-        get_filename_component(ABS_HEADER_FILE "${HEADER_FILE}" ABSOLUTE)
-        if (ABS_HEADER_FILE STREQUAL ABS_OUTPUT_FILE)
-            continue()
-        endif()
-        file(RELATIVE_PATH RELATIVE_HEADER_FILE "${INPUT_DIRECTORY}" "${HEADER_FILE}")
-        string(APPEND HEADER_CONTENT "#include \"${RELATIVE_HEADER_FILE}\"\n")
-    endforeach()
-
-    if (EXISTS "${OUTPUT_FILE}")
-        file(READ "${OUTPUT_FILE}" EXISTING_CONTENT)
-        if (EXISTING_CONTENT STREQUAL HEADER_CONTENT)
-            return()
-        endif()
-    endif()
-
-    file(WRITE "${OUTPUT_FILE}" "${HEADER_CONTENT}")
-endfunction()
-
-generate_aggregate_header(
-    "${CMAKE_CURRENT_SOURCE_DIR}/api"
-    "${CMAKE_CURRENT_SOURCE_DIR}/api/SWA.h"
-)
-
 set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources")
 set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res")
 
diff --git a/UnleashedRecomp/api b/UnleashedRecomp/api
new file mode 160000
index 00000000..f299dd8c
--- /dev/null
+++ b/UnleashedRecomp/api
@@ -0,0 +1 @@
+Subproject commit f299dd8cf272a0110c91e54e2b6e308a2d897966