diff --git a/.github/workflows/zig-builds.yml b/.github/workflows/zig-builds.yml
index ead9418..26e35c6 100644
--- a/.github/workflows/zig-builds.yml
+++ b/.github/workflows/zig-builds.yml
@@ -20,7 +20,6 @@ jobs:
       
       
       - name: Build - Zig test
-        if: (startsWith(matrix.runs-on, 'ubuntu')) || (startsWith(matrix.runs-on, 'macos'))
         run: zig build test -freference-trace
 
       - name: Build Summary
diff --git a/build.zig b/build.zig
index 6ad9cbc..a9d4a5b 100644
--- a/build.zig
+++ b/build.zig
@@ -104,20 +104,30 @@ fn buildCAsio(b: *std.Build, info: BuildInfo) *std.Build.CompileStep {
         .target = info.target,
         .optimize = info.optimize,
     });
+    lib.defineCMacro("ASIO_DISABLE_STD_FUTURE", null);
+    lib.defineCMacro("ASIO_DISABLE_STD_THREAD", null);
     lib.defineCMacro("ASIO_HAS_PTHREADS", null);
+    lib.defineCMacro("ASIO_HAS_NOEXCEPT", null);
+    lib.defineCMacro("ASIO_DISABLE_CO_AWAIT", null);
+    if (lib.optimize == .Debug)
+        lib.defineCMacro("ASIO_ENABLE_HANDLER_TRACKING", null);
     if (info.target.isWindows()) {
+        lib.defineCMacro("ASIO_DISABLE_STD_SYSTEM_ERROR", null);
+        lib.defineCMacro("ASIO_DISABLE_STD_EXCEPTION_PTR", null);
+        lib.defineCMacro("_WIN32_WINNT", "0x0A00"); // Win 10
         const libpthreads = windpthreads(b, info);
         lib.linkLibrary(libpthreads);
         for (libpthreads.include_dirs.items) |include| {
             lib.include_dirs.append(include) catch {};
         }
-        lib.defineCMacro("_WIN32_WINDOWS", null);
     }
     lib.addIncludePath("include");
     lib.addCSourceFile("src/asio_wrapper.cpp", &.{
         "-Wall",
         "-Wextra",
-        "-Werror",
+        // "-Werror",
+        // "-Wpedantic",
+        "-std=c++14",
     });
     lib.linkLibrary(libasio);
     for (libasio.include_dirs.items) |include| {