diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h
index 5ff96324..580e0414 100644
--- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h
+++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h
@@ -159,8 +159,8 @@ void _ReadWriteBarrier(void);
 #elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
 #ifdef __thumb__
 /* The mcr instruction isn't available in thumb mode, use real functions */
-extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease();
-extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire();
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(void);
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(void);
 #else
 #define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
 #define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
index 56051a83..19974716 100644
--- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
+++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h
@@ -140,7 +140,7 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingStri
  *
  *  \return the number of mappings
  */
-extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings();
+extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void);
 
 /**
  *  Get the mapping at a particular index.
@@ -247,6 +247,12 @@ extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void);
 
 /**
  *  The list of axes available from a controller
+ *
+ *  Thumbstick axis values range from SDL_JOYSTICK_AXIS_MIN to SDL_JOYSTICK_AXIS_MAX,
+ *  and are centered within ~8000 of zero, though advanced UI will allow users to set
+ *  or autodetect the dead zone, which varies between controllers.
+ *
+ *  Trigger axis values range from 0 to SDL_JOYSTICK_AXIS_MAX.
  */
 typedef enum
 {
diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h
index 5a2e42ed..ff9cc4a9 100644
--- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h
+++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h
@@ -104,8 +104,8 @@
  * \endcode
  */
 
-#ifndef SDL_h_aptic_h
-#define SDL_h_aptic_h
+#ifndef SDL_haptic_h_
+#define SDL_haptic_h_
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
@@ -1218,6 +1218,6 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
 #endif
 #include "close_code.h"
 
-#endif /* SDL_h_aptic_h */
+#endif /* SDL_haptic_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h
index 6120b04f..849eb6f5 100644
--- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h
+++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h
@@ -36,8 +36,8 @@
  *  to how they would like the library to work.
  */
 
-#ifndef SDL_h_ints_h
-#define SDL_h_ints_h
+#ifndef SDL_hints_h_
+#define SDL_hints_h_
 
 #include "SDL_stdinc.h"
 
@@ -831,6 +831,6 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
 #endif
 #include "close_code.h"
 
-#endif /* SDL_h_ints_h */
+#endif /* SDL_hints_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h
index 7e63870c..c32badd8 100644
--- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h
+++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h
@@ -232,6 +232,8 @@ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
  */
 extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
 
+#define SDL_JOYSTICK_AXIS_MAX   32767
+#define SDL_JOYSTICK_AXIS_MIN   -32768
 /**
  *  Get the current state of an axis control on a joystick.
  *
diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h
index 7b80dd97..798de0f8 100644
--- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h
+++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h
@@ -1,2 +1,2 @@
-#define SDL_REVISION "hg-10712:47a5366726c0"
-#define SDL_REVISION_NUMBER 10712
+#define SDL_REVISION "hg-10735:754cac536474"
+#define SDL_REVISION_NUMBER 10735
diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2
index 3cf3bdc2..4d5953da 100755
Binary files a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 and b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 differ
diff --git a/quakespasm/Windows/SDL2/include/SDL_atomic.h b/quakespasm/Windows/SDL2/include/SDL_atomic.h
index 5ff96324..580e0414 100644
--- a/quakespasm/Windows/SDL2/include/SDL_atomic.h
+++ b/quakespasm/Windows/SDL2/include/SDL_atomic.h
@@ -159,8 +159,8 @@ void _ReadWriteBarrier(void);
 #elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
 #ifdef __thumb__
 /* The mcr instruction isn't available in thumb mode, use real functions */
-extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease();
-extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire();
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(void);
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(void);
 #else
 #define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
 #define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
diff --git a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h
index 56051a83..19974716 100644
--- a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h
+++ b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h
@@ -140,7 +140,7 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingStri
  *
  *  \return the number of mappings
  */
-extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings();
+extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void);
 
 /**
  *  Get the mapping at a particular index.
@@ -247,6 +247,12 @@ extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void);
 
 /**
  *  The list of axes available from a controller
+ *
+ *  Thumbstick axis values range from SDL_JOYSTICK_AXIS_MIN to SDL_JOYSTICK_AXIS_MAX,
+ *  and are centered within ~8000 of zero, though advanced UI will allow users to set
+ *  or autodetect the dead zone, which varies between controllers.
+ *
+ *  Trigger axis values range from 0 to SDL_JOYSTICK_AXIS_MAX.
  */
 typedef enum
 {
diff --git a/quakespasm/Windows/SDL2/include/SDL_haptic.h b/quakespasm/Windows/SDL2/include/SDL_haptic.h
index 5a2e42ed..ff9cc4a9 100644
--- a/quakespasm/Windows/SDL2/include/SDL_haptic.h
+++ b/quakespasm/Windows/SDL2/include/SDL_haptic.h
@@ -104,8 +104,8 @@
  * \endcode
  */
 
-#ifndef SDL_h_aptic_h
-#define SDL_h_aptic_h
+#ifndef SDL_haptic_h_
+#define SDL_haptic_h_
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
@@ -1218,6 +1218,6 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
 #endif
 #include "close_code.h"
 
-#endif /* SDL_h_aptic_h */
+#endif /* SDL_haptic_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/quakespasm/Windows/SDL2/include/SDL_hints.h b/quakespasm/Windows/SDL2/include/SDL_hints.h
index 6120b04f..849eb6f5 100644
--- a/quakespasm/Windows/SDL2/include/SDL_hints.h
+++ b/quakespasm/Windows/SDL2/include/SDL_hints.h
@@ -36,8 +36,8 @@
  *  to how they would like the library to work.
  */
 
-#ifndef SDL_h_ints_h
-#define SDL_h_ints_h
+#ifndef SDL_hints_h_
+#define SDL_hints_h_
 
 #include "SDL_stdinc.h"
 
@@ -831,6 +831,6 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
 #endif
 #include "close_code.h"
 
-#endif /* SDL_h_ints_h */
+#endif /* SDL_hints_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/quakespasm/Windows/SDL2/include/SDL_joystick.h b/quakespasm/Windows/SDL2/include/SDL_joystick.h
index 7e63870c..c32badd8 100644
--- a/quakespasm/Windows/SDL2/include/SDL_joystick.h
+++ b/quakespasm/Windows/SDL2/include/SDL_joystick.h
@@ -232,6 +232,8 @@ extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
  */
 extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
 
+#define SDL_JOYSTICK_AXIS_MAX   32767
+#define SDL_JOYSTICK_AXIS_MIN   -32768
 /**
  *  Get the current state of an axis control on a joystick.
  *
diff --git a/quakespasm/Windows/SDL2/include/SDL_revision.h b/quakespasm/Windows/SDL2/include/SDL_revision.h
index 7b80dd97..798de0f8 100644
--- a/quakespasm/Windows/SDL2/include/SDL_revision.h
+++ b/quakespasm/Windows/SDL2/include/SDL_revision.h
@@ -1,2 +1,2 @@
-#define SDL_REVISION "hg-10712:47a5366726c0"
-#define SDL_REVISION_NUMBER 10712
+#define SDL_REVISION "hg-10735:754cac536474"
+#define SDL_REVISION_NUMBER 10735
diff --git a/quakespasm/Windows/SDL2/lib/SDL2.dll b/quakespasm/Windows/SDL2/lib/SDL2.dll
index 5654bb84..8d52f4fd 100644
Binary files a/quakespasm/Windows/SDL2/lib/SDL2.dll and b/quakespasm/Windows/SDL2/lib/SDL2.dll differ
diff --git a/quakespasm/Windows/SDL2/lib64/SDL2.dll b/quakespasm/Windows/SDL2/lib64/SDL2.dll
index 4b2bd272..03105e93 100644
Binary files a/quakespasm/Windows/SDL2/lib64/SDL2.dll and b/quakespasm/Windows/SDL2/lib64/SDL2.dll differ