--- a/src/haptic/windows/SDL_dinputhaptic.c	Thu May 28 00:30:21 2015 -0400
+++ b/src/haptic/windows/SDL_dinputhaptic.c	Thu May 28 00:54:52 2015 -0400
@@ -20,6 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_HAPTIC_DINPUT
+
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
 #include "SDL_haptic.h"
@@ -29,9 +31,6 @@
 #include "../SDL_syshaptic.h"
 #include "../../joystick/windows/SDL_windowsjoystick_c.h"
 
-
-#if SDL_HAPTIC_DINPUT
-
 /*
  * External stuff.
  */
@@ -1181,7 +1180,6 @@
 
 #else /* !SDL_HAPTIC_DINPUT */
 
-
 int
 SDL_DINPUT_HapticInit(void)
 {

--- a/src/haptic/windows/SDL_xinputhaptic.c	Thu May 28 00:30:21 2015 -0400
+++ b/src/haptic/windows/SDL_xinputhaptic.c	Thu May 28 00:54:52 2015 -0400
@@ -20,6 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_HAPTIC_XINPUT
+
 #include "SDL_assert.h"
 #include "SDL_error.h"
 #include "SDL_haptic.h"
@@ -31,9 +33,6 @@
 #include "../../core/windows/SDL_xinput.h"
 #include "../../joystick/windows/SDL_windowsjoystick_c.h"
 
-
-#if SDL_HAPTIC_XINPUT
-
 /*
  * Internal stuff.
  */
@@ -488,4 +487,5 @@
 }
 
 #endif /* SDL_HAPTIC_XINPUT */
+
 /* vi: set ts=4 sw=4 expandtab: */

--- a/src/joystick/windows/SDL_dinputjoystick.c	Thu May 28 00:30:21 2015 -0400
+++ b/src/joystick/windows/SDL_dinputjoystick.c	Thu May 28 00:54:52 2015 -0400
@@ -20,14 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_JOYSTICK_DINPUT
+
 #include "../SDL_sysjoystick.h"
 #include "SDL_windowsjoystick_c.h"
 #include "SDL_dinputjoystick_c.h"
 #include "SDL_xinputjoystick_c.h"
 
-
-#if SDL_JOYSTICK_DINPUT
-
 #ifndef DIDFT_OPTIONAL
 #define DIDFT_OPTIONAL      0x80000000
 #endif

--- a/src/joystick/windows/SDL_xinputjoystick.c	Thu May 28 00:30:21 2015 -0400
+++ b/src/joystick/windows/SDL_xinputjoystick.c	Thu May 28 00:54:52 2015 -0400
@@ -20,15 +20,14 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_JOYSTICK_XINPUT
+
 #include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "../SDL_sysjoystick.h"
 #include "SDL_windowsjoystick_c.h"
 #include "SDL_xinputjoystick_c.h"
 
-
-#if SDL_JOYSTICK_XINPUT
-
 /*
  * Internal stuff.
  */