diff --git a/gfx/common/d3d10_common.c b/gfx/common/d3d10_common.c
index 5da28cbab6..8626132e06 100644
--- a/gfx/common/d3d10_common.c
+++ b/gfx/common/d3d10_common.c
@@ -14,6 +14,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include "d3d10_defines.h"
 #include "d3dcompiler_common.h"
diff --git a/gfx/common/d3d11_common.c b/gfx/common/d3d11_common.c
index ead91a8806..84ef7458f4 100644
--- a/gfx/common/d3d11_common.c
+++ b/gfx/common/d3d11_common.c
@@ -14,6 +14,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include <string.h>
 
diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 5f8dabc8d0..3e9b3ebc19 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -15,6 +15,8 @@
 
 #if !defined(_XBOX)
 
+#define WIN32_LEAN_AND_MEAN
+
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601 /* Windows 7 */
 #endif
diff --git a/gfx/display_servers/dispserv_win32.c b/gfx/display_servers/dispserv_win32.c
index ffb952b33a..884ca35cab 100644
--- a/gfx/display_servers/dispserv_win32.c
+++ b/gfx/display_servers/dispserv_win32.c
@@ -15,6 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 /* VC6 needs objbase included before initguid, but nothing else does */
 #include <objbase.h>
 #include <initguid.h>
diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
index 1184ecf8d8..4e9e2bcfa5 100644
--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@@ -22,6 +22,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 #define COBJMACROS
 
 #include <string.h>
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
index 1a702fafc6..b9dcbe9923 100644
--- a/gfx/drivers/d3d12.c
+++ b/gfx/drivers/d3d12.c
@@ -22,6 +22,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include <string.h>
 #include <malloc.h>
diff --git a/gfx/drivers_context/w_vk_ctx.c b/gfx/drivers_context/w_vk_ctx.c
index caaaae4869..c7dd29434a 100644
--- a/gfx/drivers_context/w_vk_ctx.c
+++ b/gfx/drivers_context/w_vk_ctx.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <math.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
 
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index cc44947d8a..3a7c990394 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <math.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
 
diff --git a/gfx/drivers_font/d3d9x_w32_font.c b/gfx/drivers_font/d3d9x_w32_font.c
index 261176e941..244247fe4e 100644
--- a/gfx/drivers_font/d3d9x_w32_font.c
+++ b/gfx/drivers_font/d3d9x_w32_font.c
@@ -15,6 +15,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include <tchar.h>
 
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 13a5f14a9f..9db7de4f49 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -18,6 +18,8 @@
 #pragma comment(lib, "dinput8")
 #endif
 
+#define WIN32_LEAN_AND_MEAN
+
 #undef DIRECTINPUT_VERSION
 #define DIRECTINPUT_VERSION 0x0800
 
diff --git a/input/drivers/winraw_input.c b/input/drivers/winraw_input.c
index 2054907403..0dae1e9346 100644
--- a/input/drivers/winraw_input.c
+++ b/input/drivers/winraw_input.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #ifdef CXX_BUILD
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 6063d6eeaf..0dd016b5cf 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windowsx.h>
 
 #include <dinput.h>
diff --git a/tasks/task_content.c b/tasks/task_content.c
index b96d30b5d1..6fb9f22f4c 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -32,6 +32,7 @@
 #else
 #include <io.h>
 #include <fcntl.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 #endif