diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ea9e24ec..f70d0e43 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -209,7 +209,7 @@ jobs:
             -DCMAKE_TOOLCHAIN_FILE="$vcpkgToolchain" `
             -DYAZE_BUILD_TESTS=OFF `
             -DYAZE_BUILD_EMU=OFF `
-            -DYAZE_BUILD_Z3ED=ON 2>&1 | Tee-Object -FilePath cmake_config.log
+            -DYAZE_BUILD_APP=ON 2>&1 | Tee-Object -FilePath cmake_config.log
           
           if ($LASTEXITCODE -ne 0) {
             Write-Host "::error::CMake configuration failed with exit code $LASTEXITCODE"
@@ -231,7 +231,7 @@ jobs:
             -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
             -DYAZE_BUILD_TESTS=OFF \
             -DYAZE_BUILD_EMU=OFF \
-            -DYAZE_BUILD_Z3ED=ON 2>&1 | tee cmake_config.log
+            -DYAZE_BUILD_APP=ON 2>&1 | tee cmake_config.log
           echo "::endgroup::"
       
       - name: "Configure (Linux)"
@@ -245,7 +245,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
             -DYAZE_BUILD_TESTS=OFF \
             -DYAZE_BUILD_EMU=OFF \
-            -DYAZE_BUILD_Z3ED=ON 2>&1 | tee cmake_config.log
+            -DYAZE_BUILD_APP=ON 2>&1 | tee cmake_config.log
           echo "::endgroup::"
       
       - name: "Report Configure Failure"
diff --git a/src/app/core/service/imgui_test_harness_service.cc b/src/app/core/service/imgui_test_harness_service.cc
index 64b871a8..05d2a6c2 100644
--- a/src/app/core/service/imgui_test_harness_service.cc
+++ b/src/app/core/service/imgui_test_harness_service.cc
@@ -4,6 +4,23 @@
 
 #include <SDL.h>
 
+// Undefine Windows macros that conflict with protobuf generated code
+// SDL.h includes Windows.h on Windows, which defines these macros
+#ifdef _WIN32
+#ifdef DWORD
+#undef DWORD
+#endif
+#ifdef ERROR
+#undef ERROR
+#endif
+#ifdef OVERFLOW
+#undef OVERFLOW
+#endif
+#ifdef IGNORE
+#undef IGNORE
+#endif
+#endif  // _WIN32
+
 #include <algorithm>
 #include <chrono>
 #include <deque>
diff --git a/src/app/core/service/screenshot_utils.cc b/src/app/core/service/screenshot_utils.cc
index 7f29045b..c9bc067f 100644
--- a/src/app/core/service/screenshot_utils.cc
+++ b/src/app/core/service/screenshot_utils.cc
@@ -4,6 +4,23 @@
 
 #include <SDL.h>
 
+// Undefine Windows macros that conflict with protobuf generated code
+// SDL.h includes Windows.h on Windows, which defines these macros
+#ifdef _WIN32
+#ifdef DWORD
+#undef DWORD
+#endif
+#ifdef ERROR
+#undef ERROR
+#endif
+#ifdef OVERFLOW
+#undef OVERFLOW
+#endif
+#ifdef IGNORE
+#undef IGNORE
+#endif
+#endif  // _WIN32
+
 #include <filesystem>
 #include <string>