--- a/src/haptic/windows/SDL_dinputhaptic.c	Thu May 28 01:08:33 2015 -0400
+++ b/src/haptic/windows/SDL_dinputhaptic.c	Thu May 28 01:16:55 2015 -0400
@@ -20,11 +20,12 @@
 */
 #include "../../SDL_internal.h"
 
+#include "SDL_error.h"
+#include "SDL_haptic.h"
+
 #if SDL_HAPTIC_DINPUT
 
-#include "SDL_error.h"
 #include "SDL_stdinc.h"
-#include "SDL_haptic.h"
 #include "SDL_timer.h"
 #include "SDL_windowshaptic_c.h"
 #include "SDL_dinputhaptic_c.h"
@@ -1180,6 +1181,8 @@
 
 #else /* !SDL_HAPTIC_DINPUT */
 
+typedef struct DIDEVICEINSTANCE DIDEVICEINSTANCE;
+
 int
 SDL_DINPUT_HapticInit(void)
 {

--- a/src/haptic/windows/SDL_xinputhaptic.c	Thu May 28 01:08:33 2015 -0400
+++ b/src/haptic/windows/SDL_xinputhaptic.c	Thu May 28 01:16:55 2015 -0400
@@ -20,11 +20,12 @@
 */
 #include "../../SDL_internal.h"
 
+#include "SDL_error.h"
+#include "SDL_haptic.h"
+
 #if SDL_HAPTIC_XINPUT
 
 #include "SDL_assert.h"
-#include "SDL_error.h"
-#include "SDL_haptic.h"
 #include "SDL_hints.h"
 #include "SDL_timer.h"
 #include "SDL_windowshaptic_c.h"