diff --git a/build_tools b/build_tools
index e28427bd7..8b40c477f 160000
--- a/build_tools
+++ b/build_tools
@@ -1 +1 @@
-Subproject commit e28427bd7d2eb82f630d22914eefebf430f6fff6
+Subproject commit 8b40c477f7036a35c2918e3931e0110f7d3da5c0
diff --git a/src/xenia/cpu/backend/x64/x64_assembler.cc b/src/xenia/cpu/backend/x64/x64_assembler.cc
index dff7477b6..a23729188 100644
--- a/src/xenia/cpu/backend/x64/x64_assembler.cc
+++ b/src/xenia/cpu/backend/x64/x64_assembler.cc
@@ -11,8 +11,8 @@
 
 #include <climits>
 
-#include "third_party/capstone/include/capstone.h"
-#include "third_party/capstone/include/x86.h"
+#include "third_party/capstone/include/capstone/capstone.h"
+#include "third_party/capstone/include/capstone/x86.h"
 #include "xenia/base/reset_scope.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/backend/x64/x64_emitter.h"
diff --git a/src/xenia/debug/debugger.cc b/src/xenia/debug/debugger.cc
index 6cb8e280e..fb6ffe144 100644
--- a/src/xenia/debug/debugger.cc
+++ b/src/xenia/debug/debugger.cc
@@ -14,8 +14,8 @@
 #include <algorithm>
 #include <utility>
 
-#include "third_party/capstone/include/capstone.h"
-#include "third_party/capstone/include/x86.h"
+#include "third_party/capstone/include/capstone/capstone.h"
+#include "third_party/capstone/include/capstone/x86.h"
 #include "xenia/base/debugging.h"
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"
diff --git a/src/xenia/debug/ui/debug_window.cc b/src/xenia/debug/ui/debug_window.cc
index 4a3dacdde..62bf5ccda 100644
--- a/src/xenia/debug/ui/debug_window.cc
+++ b/src/xenia/debug/ui/debug_window.cc
@@ -15,8 +15,8 @@
 #include <cinttypes>
 #include <utility>
 
-#include "third_party/capstone/include/capstone.h"
-#include "third_party/capstone/include/x86.h"
+#include "third_party/capstone/include/capstone/capstone.h"
+#include "third_party/capstone/include/capstone/x86.h"
 #include "third_party/elemental-forms/src/el/util/clipboard.h"
 #include "third_party/imgui/imgui.h"
 #include "third_party/imgui/imgui_internal.h"
diff --git a/third_party/capstone b/third_party/capstone
index bf7e96928..722aec780 160000
--- a/third_party/capstone
+++ b/third_party/capstone
@@ -1 +1 @@
-Subproject commit bf7e96928f7e171105fe45e2aee8894334b5c8aa
+Subproject commit 722aec78000533e36f752a3c3a3cdc53cfe61f0b
diff --git a/third_party/capstone.lua b/third_party/capstone.lua
index 621682f62..5a1b278f8 100644
--- a/third_party/capstone.lua
+++ b/third_party/capstone.lua
@@ -40,7 +40,10 @@ project("capstone")
     "capstone/arch/X86/*.h",
     "capstone/arch/X86/*.inc",
   })
-  force_compile_as_cc({"capstone/**.c"})
+  force_compile_as_c({
+    "capstone/**.c",
+    "capstone/arch/X86/**.c",
+  })
 
   filter("platforms:Linux")
     -- Capstone code is... not fantastic.