diff --git a/src/joystick/win32/SDL_dxjoystick.c b/src/joystick/win32/SDL_dxjoystick.c
index ac7d2f1e8..7f6c53a56 100644
--- a/src/joystick/win32/SDL_dxjoystick.c
+++ b/src/joystick/win32/SDL_dxjoystick.c
@@ -38,6 +38,7 @@
 #include "SDL_joystick.h"
 #include "../SDL_sysjoystick.h"
 #include "../SDL_joystick_c.h"
+#define INITGUID /* Only set here, if set twice will cause mingw32 to break. */
 #include "SDL_dxjoystick_c.h"
 
 
diff --git a/src/joystick/win32/SDL_dxjoystick_c.h b/src/joystick/win32/SDL_dxjoystick_c.h
index 9abc74f01..35383b60e 100644
--- a/src/joystick/win32/SDL_dxjoystick_c.h
+++ b/src/joystick/win32/SDL_dxjoystick_c.h
@@ -37,7 +37,6 @@
 #include <windows.h>
 
 #define DIRECTINPUT_VERSION 0x0700      /* Need version 7 for force feedback. */
-#define INITGUID
 #include <dinput.h>