diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index 1d1aae4..323760f 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -201,8 +201,8 @@ jobs:
     - name: Generate coverage report
       if: always() && matrix.codecov
       run: |
-        python3 -u -m pip install --user gcovr
-        python3 -m gcovr \
+        brew install gcovr
+        gcovr \
           --exclude-unreachable-branches \
           --gcov-ignore-parse-errors \
           --root . \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b41fc6..c6b80e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,13 +138,14 @@ endif()
 
 if(WIN32)
     add_compile_definitions(
-        _CRT_SECURE_NO_WARNINGS=1
-        _CRT_NONSTDC_NO_WARNINGS=1
-        _WINSOCK_DEPRECATED_NO_WARNINGS=1
-        COBJMACROS)
+        _CRT_SECURE_NO_WARNINGS
+        _CRT_NONSTDC_NO_WARNINGS
+        _WINSOCK_DEPRECATED_NO_WARNINGS
+        COBJMACROS
+        WIN32_LEAN_AND_MEAN)
 elseif(APPLE)
 elseif(UNIX)
-    add_compile_definitions(_GNU_SOURCE=1)
+    add_compile_definitions(_GNU_SOURCE)
 endif()
 
 add_compile_definitions($<IF:$<CONFIG:Debug>,_DEBUG,_NDEBUG>)
@@ -252,10 +253,10 @@ if(PROXYRES_CURL AND (PROXYRES_EXECUTE OR PROXYRES_BUILD_CLI))
 endif()
 
 if(PROXYRES_EXECUTE)
-    target_compile_definitions(proxyres PUBLIC PROXYRES_EXECUTE=1)
+    target_compile_definitions(proxyres PUBLIC PROXYRES_EXECUTE)
 
     if(TARGET CURL::libcurl)
-        target_compile_definitions(proxyres PUBLIC HAVE_CURL=1)
+        target_compile_definitions(proxyres PUBLIC HAVE_CURL)
         target_sources(proxyres PRIVATE fetch_curl.c)
         target_link_libraries(proxyres CURL::libcurl)
     else()
diff --git a/config_win.c b/config_win.c
index a9f7719..af2c7a0 100644
--- a/config_win.c
+++ b/config_win.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdlib.h>
 
 #include <windows.h>
 #include <wininet.h>
diff --git a/execute_wsh.c b/execute_wsh.c
index 57c0fef..7352423 100644
--- a/execute_wsh.c
+++ b/execute_wsh.c
@@ -6,6 +6,7 @@
 #include <initguid.h>
 #include <activscp.h>
 #include <activdbg.h>
+#include <cguid.h>
 
 #include "execute.h"
 #include "execute_i.h"
diff --git a/resolver.c b/resolver.c
index 54acc7b..4451c6f 100644
--- a/resolver.c
+++ b/resolver.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #ifdef _WIN32
 #  include <windows.h>
+#  include <winsock2.h>
 #endif
 
 #include "config.h"
diff --git a/resolver_win8.c b/resolver_win8.c
index 60f8508..2032631 100644
--- a/resolver_win8.c
+++ b/resolver_win8.c
@@ -2,6 +2,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <inttypes.h>
 
 #include <windows.h>
diff --git a/resolver_winxp.c b/resolver_winxp.c
index d72a64a..4ad81f5 100644
--- a/resolver_winxp.c
+++ b/resolver_winxp.c
@@ -2,6 +2,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <inttypes.h>
 
 #include <windows.h>
diff --git a/threadpool_winvista.c b/threadpool_winvista.c
index b614df6..8b57f76 100644
--- a/threadpool_winvista.c
+++ b/threadpool_winvista.c
@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <inttypes.h>
 
 #include <windows.h>
diff --git a/util_win.c b/util_win.c
index 7725532..5c6df70 100644
--- a/util_win.c
+++ b/util_win.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <wchar.h>
 
 #include <windows.h>
diff --git a/wpad_dhcp_win.c b/wpad_dhcp_win.c
index 9097b5e..138a118 100644
--- a/wpad_dhcp_win.c
+++ b/wpad_dhcp_win.c
@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <windows.h>
 #include <dhcpcsdk.h>