diff --git a/config.h.win32 b/config.h.win32
index 475ab5ba30..44ebffec15 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -242,9 +242,9 @@ typedef __int64 off_t;
 #include <io.h>
 #define isatty	_isatty
 
-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
-#endif
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1 /* Prevent inclusion of winsock.h in windows.h */
+#endif /* WIN32_LEAN_AND_MEAN */
 
 /*
  * Make the number of available sockets large
diff --git a/lib/isc/glob.c b/lib/isc/glob.c
index 559815525b..769acbda85 100644
--- a/lib/isc/glob.c
+++ b/lib/isc/glob.c
@@ -24,7 +24,6 @@
 #include <glob.h>
 #elif defined(_WIN32)
 #include <stdlib.h>
-#define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 
 #include <isc/list.h>
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 0b0bde191f..176043eb41 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -11,6 +11,7 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+#include <stdlib.h>
 
 #include <isc/assertions.h>
 #include <isc/condition.h>
diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index e2bf50b681..7f03d666a3 100644
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -41,6 +41,7 @@ typedef uint32_t socklen_t;
  * Limits
  */
 
+#include <stdlib.h>
 #ifndef NAME_MAX
 #define NAME_MAX _MAX_FNAME
 #endif
diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h
index aa028ceae2..fe19df001d 100644
--- a/lib/isc/win32/include/isc/stdatomic.h
+++ b/lib/isc/win32/include/isc/stdatomic.h
@@ -11,7 +11,6 @@
 
 #pragma once
 
-#define WIN32_LEAN_AND_MEAN
 #include <intrin.h>
 #include <stdbool.h>
 #include <stddef.h>