diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig
index a0cb2772..9ff6ff7f 100644
--- a/gpu-dawn/build.zig
+++ b/gpu-dawn/build.zig
@@ -1160,7 +1160,23 @@ fn buildLibDawnWire(b: *Builder, step: *std.build.LibExeObjStep, options: Option
         include("libs/dawn/out/Debug/gen/src"),
     }) catch unreachable;
 
-    lib.addCSourceFile(thisDir() ++ "/src/dawn/sources/dawn_wire_gen.cpp", flags.items);
+    var sources = std.ArrayList([]const u8).init(b.allocator);
+    inline for (&[_][]const u8{
+        "out/Debug/gen/src/dawn_wire/",
+        "out/Debug/gen/src/dawn_wire/client/",
+        "out/Debug/gen/src/dawn_wire/server/",
+        "src/dawn_wire/",
+        "src/dawn_wire/client/",
+        "src/dawn_wire/server/",
+    }) |dir| scanSources(
+        b,
+        &sources,
+        "libs/dawn/" ++ dir,
+        &.{ ".cpp", ".c", ".cc" },
+        &.{},
+        &.{ "test", "benchmark", "mock" },
+    ) catch unreachable;
+    lib.addCSourceFiles(sources.items, flags.items);
     return lib;
 }
 
diff --git a/gpu-dawn/src/dawn/sources/dawn_wire_gen.cpp b/gpu-dawn/src/dawn/sources/dawn_wire_gen.cpp
deleted file mode 100644
index 748ba234..00000000
--- a/gpu-dawn/src/dawn/sources/dawn_wire_gen.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "out/Debug/gen/src/dawn_wire/WireCmd_autogen.cpp"
-#include "out/Debug/gen/src/dawn_wire/client/ApiProcs_autogen.cpp"
-#include "out/Debug/gen/src/dawn_wire/client/ClientHandlers_autogen.cpp"
-#include "out/Debug/gen/src/dawn_wire/server/ServerDoers_autogen.cpp"
-#include "out/Debug/gen/src/dawn_wire/server/ServerHandlers_autogen.cpp"
-
-#include "src/dawn_wire/ChunkedCommandHandler.cpp"
-#include "src/dawn_wire/ChunkedCommandSerializer.cpp"
-#include "src/dawn_wire/SupportedFeatures.cpp"
-#include "src/dawn_wire/Wire.cpp"
-#include "src/dawn_wire/WireClient.cpp"
-#include "src/dawn_wire/WireDeserializeAllocator.cpp"
-#include "src/dawn_wire/WireServer.cpp"
-#include "src/dawn_wire/client/Adapter.cpp"
-#include "src/dawn_wire/client/Buffer.cpp"
-#include "src/dawn_wire/client/Client.cpp"
-#include "src/dawn_wire/client/ClientDoers.cpp"
-#include "src/dawn_wire/client/ClientInlineMemoryTransferService.cpp"
-#include "src/dawn_wire/client/Device.cpp"
-#include "src/dawn_wire/client/Instance.cpp"
-#include "src/dawn_wire/client/LimitsAndFeatures.cpp"
-#include "src/dawn_wire/client/Queue.cpp"
-#include "src/dawn_wire/client/ShaderModule.cpp"
-#include "src/dawn_wire/server/Server.cpp"
-#include "src/dawn_wire/server/ServerAdapter.cpp"
-#include "src/dawn_wire/server/ServerBuffer.cpp"
-#include "src/dawn_wire/server/ServerDevice.cpp"
-#include "src/dawn_wire/server/ServerInlineMemoryTransferService.cpp"
-#include "src/dawn_wire/server/ServerInstance.cpp"
-#include "src/dawn_wire/server/ServerQueue.cpp"
-#include "src/dawn_wire/server/ServerShaderModule.cpp"