diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig
index b2dade2f..366c76e9 100644
--- a/gpu-dawn/build.zig
+++ b/gpu-dawn/build.zig
@@ -602,10 +602,22 @@ fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
         lib.linkFramework("IOSurface");
         lib.linkFramework("QuartzCore");
 
-        sources.appendSlice(&.{
-            thisDir() ++ "/src/dawn/sources/dawn_native_metal.mm",
-            thisDir() ++ "/libs/dawn/src/dawn_native/metal/BackendMTL.mm",
-        }) catch unreachable;
+        scanSources(
+            b,
+            &sources,
+            "libs/dawn/src/dawn_native/metal/",
+            &.{ ".cpp", ".c", ".cc", ".m", ".mm" },
+            &.{},
+            &.{ "test", "benchmark", "mock" },
+        ) catch unreachable;
+        scanSources(
+            b,
+            &sources,
+            "libs/dawn/src/dawn_native/",
+            &.{ ".m", ".mm" },
+            &.{},
+            &.{ "test", "benchmark", "mock" },
+        ) catch unreachable;
     }
 
     if (options.linux_window_manager != null and options.linux_window_manager.? == .X11) {
diff --git a/gpu-dawn/src/dawn/sources/dawn_native_metal.mm b/gpu-dawn/src/dawn/sources/dawn_native_metal.mm
deleted file mode 100644
index b2b0044c..00000000
--- a/gpu-dawn/src/dawn/sources/dawn_native_metal.mm
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "src/dawn_native/metal/MetalBackend.mm"
-#include "src/dawn_native/Surface_metal.mm"
-#include "src/dawn_native/metal/BindGroupLayoutMTL.mm"
-#include "src/dawn_native/metal/BindGroupMTL.mm"
-#include "src/dawn_native/metal/BufferMTL.mm"
-#include "src/dawn_native/metal/CommandBufferMTL.mm"
-#include "src/dawn_native/metal/CommandRecordingContext.mm"
-#include "src/dawn_native/metal/ComputePipelineMTL.mm"
-#include "src/dawn_native/metal/DeviceMTL.mm"
-#include "src/dawn_native/metal/PipelineLayoutMTL.mm"
-#include "src/dawn_native/metal/QuerySetMTL.mm"
-#include "src/dawn_native/metal/QueueMTL.mm"
-#include "src/dawn_native/metal/RenderPipelineMTL.mm"
-#include "src/dawn_native/metal/SamplerMTL.mm"
-#include "src/dawn_native/metal/ShaderModuleMTL.mm"
-#include "src/dawn_native/metal/StagingBufferMTL.mm"
-#include "src/dawn_native/metal/SwapChainMTL.mm"
-#include "src/dawn_native/metal/TextureMTL.mm"
-#include "src/dawn_native/metal/UtilsMetal.mm"