diff --git a/third_party/spirv-tools.lua b/third_party/spirv-tools.lua
index bb35e2859..6b3f66fa3 100644
--- a/third_party/spirv-tools.lua
+++ b/third_party/spirv-tools.lua
@@ -15,24 +15,21 @@ project("spirv-tools")
   })
   files({
     "spirv-tools/include/spirv-tools/libspirv.h",
-    -- "spirv-tools/source/opt/basic_block.h",
-    -- "spirv-tools/source/opt/function.cpp",
-    -- "spirv-tools/source/opt/function.h",
-    -- "spirv-tools/source/opt/instruction.cpp",
-    -- "spirv-tools/source/opt/instruction.h",
-    -- "spirv-tools/source/opt/ir_loader.cpp",
-    -- "spirv-tools/source/opt/ir_loader.h",
-    -- "spirv-tools/source/opt/module.cpp",
-    -- "spirv-tools/source/opt/module.h",
-    -- "spirv-tools/source/opt/reflect.h",
-    "spirv-tools/source/val/BasicBlock.cpp",
-    "spirv-tools/source/val/BasicBlock.h",
-    "spirv-tools/source/val/Construct.cpp",
-    "spirv-tools/source/val/Construct.h",
-    "spirv-tools/source/val/Function.cpp",
-    "spirv-tools/source/val/Function.h",
-    "spirv-tools/source/val/ValidationState.cpp",
-    "spirv-tools/source/val/ValidationState.h",
+    "spirv-tools/source/val/basic_block.cpp",
+    "spirv-tools/source/val/basic_block.h",
+    "spirv-tools/source/val/construct.cpp",
+    "spirv-tools/source/val/construct.h",
+    "spirv-tools/source/val/function.cpp",
+    "spirv-tools/source/val/function.h",
+    "spirv-tools/source/val/validation_state.cpp",
+    "spirv-tools/source/val/validation_state.h",
+    "spirv-tools/source/util/*.cpp",
+    "spirv-tools/source/util/*.h",
+    "spirv-tools/source/val/*.cpp",
+    "spirv-tools/source/val/*.h",
+    "spirv-tools/source/*.inc",
+    "spirv-tools/source/*.cpp",
+    "spirv-tools/source/*.h",
     "spirv-tools/source/assembly_grammar.cpp",
     "spirv-tools/source/assembly_grammar.h",
     "spirv-tools/source/binary.cpp",
@@ -42,7 +39,6 @@ project("spirv-tools")
     "spirv-tools/source/disassemble.cpp",
     "spirv-tools/source/ext_inst.cpp",
     "spirv-tools/source/ext_inst.h",
-    "spirv-tools/source/instruction.cpp",
     "spirv-tools/source/instruction.h",
     "spirv-tools/source/macro.h",
     "spirv-tools/source/opcode.cpp",
@@ -70,7 +66,6 @@ project("spirv-tools")
     "spirv-tools/source/validate_id.cpp",
     "spirv-tools/source/validate_instruction.cpp",
     "spirv-tools/source/validate_layout.cpp",
-    "spirv-tools/source/validate_ssa.cpp",
     "spirv-tools/source/util/bitutils.h",
     "spirv-tools/source/util/hex_float.h",
   })