diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig
index bf0cba81..fca11c14 100644
--- a/gpu-dawn/build.zig
+++ b/gpu-dawn/build.zig
@@ -861,12 +861,14 @@ fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep, options: Options) *
     }
 
     // libtint_sem_src
-    sources.appendSlice(&.{
-        thisDir() ++ "/src/dawn/sources/tint_sem_src.cc",
-        thisDir() ++ "/src/dawn/sources/tint_sem_src_2.cc",
-        thisDir() ++ "/libs/dawn/third_party/tint/src/sem/node.cc",
-        thisDir() ++ "/libs/dawn/third_party/tint/src/sem/texture_type.cc",
-    }) catch unreachable;
+    scanSources(
+        b,
+        &sources,
+        "libs/dawn/third_party/tint/src/sem/",
+        &.{ ".cpp", ".c", ".cc" },
+        &.{},
+        &.{"test", "benchmark"},
+    ) catch unreachable;
 
     // libtint_spv_reader_src
     scanSources(
diff --git a/gpu-dawn/src/dawn/sources/tint_sem_src.cc b/gpu-dawn/src/dawn/sources/tint_sem_src.cc
deleted file mode 100644
index dc7bdb35..00000000
--- a/gpu-dawn/src/dawn/sources/tint_sem_src.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "third_party/tint/src/sem/array.cc"
-#include "third_party/tint/src/sem/atomic_type.cc"
-#include "third_party/tint/src/sem/behavior.cc"
-#include "third_party/tint/src/sem/block_statement.cc"
-#include "third_party/tint/src/sem/bool_type.cc"
-#include "third_party/tint/src/sem/call.cc"
-#include "third_party/tint/src/sem/call_target.cc"
-#include "third_party/tint/src/sem/constant.cc"
-#include "third_party/tint/src/sem/depth_multisampled_texture_type.cc"
-#include "third_party/tint/src/sem/external_texture_type.cc"
-#include "third_party/tint/src/sem/f32_type.cc"
-#include "third_party/tint/src/sem/for_loop_statement.cc"
-#include "third_party/tint/src/sem/function.cc"
-#include "third_party/tint/src/sem/i32_type.cc"
-#include "third_party/tint/src/sem/if_statement.cc"
-#include "third_party/tint/src/sem/info.cc"
-#include "third_party/tint/src/sem/intrinsic.cc"
-#include "third_party/tint/src/sem/intrinsic_type.cc"
-#include "third_party/tint/src/sem/loop_statement.cc"
-#include "third_party/tint/src/sem/matrix_type.cc"
-#include "third_party/tint/src/sem/member_accessor_expression.cc"
-#include "third_party/tint/src/sem/multisampled_texture_type.cc"
-#include "third_party/tint/src/sem/parameter_usage.cc"
-#include "third_party/tint/src/sem/pointer_type.cc"
-#include "third_party/tint/src/sem/reference_type.cc"
-#include "third_party/tint/src/sem/sampled_texture_type.cc"
-#include "third_party/tint/src/sem/sampler_type.cc"
-#include "third_party/tint/src/sem/storage_texture_type.cc"
-#include "third_party/tint/src/sem/struct.cc"
-#include "third_party/tint/src/sem/switch_statement.cc"
-#include "third_party/tint/src/sem/type_constructor.cc"
-#include "third_party/tint/src/sem/type_conversion.cc"
-#include "third_party/tint/src/sem/type_manager.cc"
-#include "third_party/tint/src/sem/u32_type.cc"
-#include "third_party/tint/src/sem/variable.cc"
-#include "third_party/tint/src/sem/vector_type.cc"
-#include "third_party/tint/src/sem/void_type.cc"
diff --git a/gpu-dawn/src/dawn/sources/tint_sem_src_2.cc b/gpu-dawn/src/dawn/sources/tint_sem_src_2.cc
deleted file mode 100644
index 7f79da68..00000000
--- a/gpu-dawn/src/dawn/sources/tint_sem_src_2.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "third_party/tint/src/sem/depth_texture_type.cc"
-#include "third_party/tint/src/sem/expression.cc"
-#include "third_party/tint/src/sem/statement.cc"
-#include "third_party/tint/src/sem/type.cc"