diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7c268e5a..0a7b5b6e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,9 +16,6 @@ jobs:
       matrix:
         zig-version: [master]
         os: [ubuntu-latest, windows-latest]
-        include:
-          - zig-version: "0.15.0-dev.1218+bc8e1a74c"
-            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
diff --git a/build.zig.zon b/build.zig.zon
index e190839f..bb479fe0 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -115,15 +115,7 @@
         .xscrnsaver = .{
             // This dependency must be kept in sync with `xscrnsaver_windows` for similar reasons explained in the `pulseaudio` dependency.
             .url = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver/-/archive/libXScrnSaver-1.2.4/libxscrnsaver-libXScrnSaver-1.2.4.tar.gz",
-            .hash = "N-V-__8AAMXRAAAKIBB3YHvwcykG71lH-HtylfJ0AV048a7V",
-            .lazy = true,
-        },
-        .xscrnsaver_windows = .{
-            // This is a duplicate of `xscrnsaver`, but with a different hash due to a Zig bug that
-            // results in a different hash on Windows than Linux.
-            .url = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver/-/archive/libXScrnSaver-1.2.4/libxscrnsaver-libXScrnSaver-1.2.4.tar.gz",
             .hash = "N-V-__8AAEO3AADhS3i2HiVniZnPqWJh33VqmmUp7JO33xqe",
-            .lazy = true,
         },
         .alsa = .{
             .url = "https://github.com/alsa-project/alsa-lib/archive/refs/tags/v1.2.14.tar.gz",
diff --git a/src/linux.zig b/src/linux.zig
index 0792282a..7a055bc5 100644
--- a/src/linux.zig
+++ b/src/linux.zig
@@ -436,16 +436,6 @@ pub fn build(
             lib.addIncludePath(b.path("deps/alsa/include"));
         }
 
-        // Provide the xscrnsaver headers. Conditional is workaround for cross compilation, see
-        // comment in `build.zig.zon`
-        const xscrnsaver_name = switch (@import("builtin").os.tag) {
-            .windows => "xscrnsaver_windows",
-            else => "xscrnsaver",
-        };
-        if (b.lazyDependency(xscrnsaver_name, .{})) |xscrnsaver| {
-            lib.addIncludePath(xscrnsaver.path("include"));
-        }
-
         // Provide upstream headers that don't require any special handling
         lib.addIncludePath(b.dependency("egl", .{}).path("api"));
         lib.addIncludePath(b.dependency("opengl", .{}).path("api"));
@@ -457,6 +447,7 @@ pub fn build(
         lib.addIncludePath(b.dependency("xfixes", .{}).path("include"));
         lib.addIncludePath(b.dependency("xrandr", .{}).path("include"));
         lib.addIncludePath(b.dependency("xrender", .{}).path("include"));
+        lib.addIncludePath(b.dependency("xscrnsaver", .{}).path("include"));
         lib.addIncludePath(b.dependency("jack", .{}).path("common"));
         lib.addIncludePath(b.dependency("sndio", .{}).path("libsndio"));
         lib.addIncludePath(b.path("deps/wayland/protocols"));