diff --git a/build.zig b/build.zig
index 136d48f8f..2fc89b07e 100644
--- a/build.zig
+++ b/build.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const fs = std.fs;
 const Builder = std.build.Builder;
 const LibExeObjStep = std.build.LibExeObjStep;
-const glfw = @import("vendor/mach/glfw/build.zig");
+const glfw = @import("vendor/mach/libs/glfw/build.zig");
 const fontconfig = @import("pkg/fontconfig/build.zig");
 const freetype = @import("pkg/freetype/build.zig");
 const harfbuzz = @import("pkg/harfbuzz/build.zig");
@@ -12,7 +12,7 @@ const libpng = @import("pkg/libpng/build.zig");
 const utf8proc = @import("pkg/utf8proc/build.zig");
 const zlib = @import("pkg/zlib/build.zig");
 const tracylib = @import("pkg/tracy/build.zig");
-const system_sdk = @import("vendor/mach/glfw/system_sdk.zig");
+const system_sdk = @import("vendor/mach/libs/glfw/system_sdk.zig");
 
 // Build options, see the build options help for more info.
 var tracy: bool = false;
diff --git a/flake.lock b/flake.lock
index 092e5053c..84e231df0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -109,11 +109,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1662668669,
-        "narHash": "sha256-91R5xjCt1cLJBbYygtiQwXCex596/2cxsTneKUdnVwc=",
+        "lastModified": 1663201789,
+        "narHash": "sha256-yFljEVJ38ublnig6vxa9HOqSybzhc00JkDtlGGTejxk=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "6ed17531becf61347f4f30b62ad22d21e14fc4da",
+        "rev": "0be33c4346338b983b4a67bbd3ee9a46cf97128f",
         "type": "github"
       },
       "original": {
diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig
index 6196e32b1..3dc3243c5 100644
--- a/pkg/fontconfig/build.zig
+++ b/pkg/fontconfig/build.zig
@@ -145,6 +145,9 @@ pub fn buildFontconfig(
         // https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/231
         "-fno-sanitize=undefined",
         "-fno-sanitize-trap=undefined",
+
+        "-Wno-int-conversion",
+        "-Wno-implicit-function-declaration",
     });
     const arch = target.cpu_arch orelse builtin.cpu.arch;
     switch (arch.ptrBitWidth()) {
diff --git a/src/Window.zig b/src/Window.zig
index 2dc67367a..2d3f91ca0 100644
--- a/src/Window.zig
+++ b/src/Window.zig
@@ -979,8 +979,6 @@ fn mouseButtonCallback(
     glfw_action: glfw.Action,
     mods: glfw.Mods,
 ) void {
-    _ = mods;
-
     const tracy = trace(@src());
     defer tracy.end();
 
diff --git a/vendor/mach b/vendor/mach
index 0d5b85344..9676665cc 160000
--- a/vendor/mach
+++ b/vendor/mach
@@ -1 +1 @@
-Subproject commit 0d5b85344376ac22440680c696fc42b2e3614972
+Subproject commit 9676665ccf332f5aee6b8ff92200c95212cc9c32