diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/analyze.hpp b/rpcsx-gpu2/lib/gcn-shader/include/shader/analyze.hpp
index d028de698..a4ce417d3 100644
--- a/rpcsx-gpu2/lib/gcn-shader/include/shader/analyze.hpp
+++ b/rpcsx-gpu2/lib/gcn-shader/include/shader/analyze.hpp
@@ -10,6 +10,7 @@
 #include "rx/TypeId.hpp"
 #include <map>
 #include <ostream>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/spv.hpp b/rpcsx-gpu2/lib/gcn-shader/include/shader/spv.hpp
index dcd7736aa..10586d21b 100644
--- a/rpcsx-gpu2/lib/gcn-shader/include/shader/spv.hpp
+++ b/rpcsx-gpu2/lib/gcn-shader/include/shader/spv.hpp
@@ -5,7 +5,6 @@
 #include "ir/RegionImpl.hpp"
 #include <optional>
 #include <span>
-#include <spirv-tools/optimizer.hpp>
 
 namespace shader::spv {
 
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/spv.cpp b/rpcsx-gpu2/lib/gcn-shader/src/spv.cpp
index 11fc1b8e8..6ddb37231 100644
--- a/rpcsx-gpu2/lib/gcn-shader/src/spv.cpp
+++ b/rpcsx-gpu2/lib/gcn-shader/src/spv.cpp
@@ -1,6 +1,7 @@
 #include "spv.hpp"
 #include "dialect.hpp"
 #include "ir/Kind.hpp"
+#include <spirv-tools/optimizer.hpp>
 #include <iostream>
 
 using namespace shader;