diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig
index a5e98f7d..bf0cba81 100644
--- a/gpu-dawn/build.zig
+++ b/gpu-dawn/build.zig
@@ -869,7 +869,14 @@ fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *
     }) catch unreachable;
 
     // libtint_spv_reader_src
-    sources.append(thisDir() ++ "/src/dawn/sources/tint_spv_reader_src.cc") catch unreachable;
+    scanSources(
+        b,
+        &sources,
+        "libs/dawn/third_party/tint/src/reader/spirv/",
+        &.{ ".cpp", ".c", ".cc" },
+        &.{},
+        &.{"test", "benchmark"},
+    ) catch unreachable;
 
     // libtint_spv_writer_src
     scanSources(
diff --git a/gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc b/gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc
deleted file mode 100644
index 2fab7246..00000000
--- a/gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "third_party/tint/src/reader/spirv/construct.cc"
-#include "third_party/tint/src/reader/spirv/entry_point_info.cc"
-#include "third_party/tint/src/reader/spirv/enum_converter.cc"
-#include "third_party/tint/src/reader/spirv/function.cc"
-#include "third_party/tint/src/reader/spirv/namer.cc"
-#include "third_party/tint/src/reader/spirv/parser.cc"
-#include "third_party/tint/src/reader/spirv/parser_impl.cc"
-#include "third_party/tint/src/reader/spirv/parser_type.cc"
-#include "third_party/tint/src/reader/spirv/usage.cc"