diff --git a/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_os2.h b/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_os2.h
index d05d31bc..0342c818 100644
--- a/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_os2.h
+++ b/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_os2.h
@@ -27,17 +27,6 @@
 
 /* This is a set of defines to configure the SDL features */
 
-typedef signed char         int8_t;
-typedef unsigned char       uint8_t;
-typedef signed short        int16_t;
-typedef unsigned short      uint16_t;
-typedef signed int          int32_t;
-typedef unsigned int        uint32_t;
-typedef unsigned int        size_t;
-typedef unsigned long       uintptr_t;
-typedef signed long long    int64_t;
-typedef unsigned long long  uint64_t;
-
 #define SDL_HAS_64BIT_TYPE	1
 
 /* Use Watcom's LIBC */
@@ -67,7 +56,6 @@ typedef unsigned long long  uint64_t;
 #define HAVE_ALLOCA 1
 #define HAVE_GETENV 1
 #define HAVE_PUTENV 1
-/* #undef HAVE_UNSETENV */
 #define HAVE_QSORT 1
 #define HAVE_ABS 1
 #define HAVE_BCOPY 1
@@ -89,7 +77,6 @@ typedef unsigned long long  uint64_t;
 #define HAVE_STRSTR 1
 #define HAVE_ITOA 1
 #define HAVE__LTOA 1
-#define HAVE__UITOA 1
 #define HAVE__ULTOA 1
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
@@ -135,7 +122,7 @@ typedef unsigned long long  uint64_t;
 #define SDL_VIDEO_DRIVER_OS2FS	1
 
 /* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
+/* Nothing yet for OS/2. */
 
 /* Enable assembly routines where available */
 #define SDL_ASSEMBLY_ROUTINES	1
diff --git a/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_win32.h b/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_win32.h
index 8d8c5141..9b0b9bf6 100644
--- a/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_win32.h
+++ b/MacOSX/SDL.framework/Versions/A/Headers/SDL_config_win32.h
@@ -96,6 +96,7 @@ typedef unsigned int uintptr_t;
 #define HAVE_MEMMOVE 1
 #define HAVE_MEMCMP 1
 #define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
 #define HAVE__STRREV 1
 #define HAVE__STRUPR 1
 #define HAVE__STRLWR 1
@@ -105,9 +106,14 @@ typedef unsigned int uintptr_t;
 #define HAVE_ITOA 1
 #define HAVE__LTOA 1
 #define HAVE__ULTOA 1
+#define HAVE__I64TOA 1
+#define HAVE__UI64TOA 1
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
+#if defined(__MINGW32__) || defined(__WATCOMC__)
 #define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#endif
 #define HAVE_STRTOD 1
 #define HAVE_ATOI 1
 #define HAVE_ATOF 1
diff --git a/MacOSX/SDL.framework/Versions/A/Headers/SDL_platform.h b/MacOSX/SDL.framework/Versions/A/Headers/SDL_platform.h
index 48540a85..bcbd7b66 100644
--- a/MacOSX/SDL.framework/Versions/A/Headers/SDL_platform.h
+++ b/MacOSX/SDL.framework/Versions/A/Headers/SDL_platform.h
@@ -82,7 +82,7 @@
 #undef __OPENBSD__
 #define __OPENBSD__	1
 #endif
-#if defined(__OS2__)
+#if defined(__OS2__) || defined(__EMX__)
 #undef __OS2__
 #define __OS2__		1
 #endif
diff --git a/MacOSX/SDL.framework/Versions/A/Headers/begin_code.h b/MacOSX/SDL.framework/Versions/A/Headers/begin_code.h
index 27e2f7bc..1c8a2a03 100644
--- a/MacOSX/SDL.framework/Versions/A/Headers/begin_code.h
+++ b/MacOSX/SDL.framework/Versions/A/Headers/begin_code.h
@@ -58,24 +58,11 @@
 #   define DECLSPEC	__declspec(dllexport)
 #  endif
 # elif defined(__OS2__)
-#  ifdef __WATCOMC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC	__declspec(dllexport)
 #   else
 #    define DECLSPEC
 #   endif
-#  elif defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   ifdef BUILD_SDL
-#    define DECLSPEC    __declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
 # else
 #  if defined(__GNUC__) && __GNUC__ >= 4
 #   define DECLSPEC	__attribute__ ((visibility("default")))
@@ -93,16 +80,12 @@
 # if defined(__WIN32__) && !defined(__GNUC__)
 #  define SDLCALL __cdecl
 # elif defined(__OS2__)
-#  if defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   define SDLCALL _cdecl
-#  else
-#   /* On other compilers on OS/2, we use the _System calling convention */
-#   /* to be compatible with every compiler */
-#   define SDLCALL _System
+   /* But on OS/2, we use the _System calling convention */
+   /* to be compatible with every compiler */
+#  if defined (__GNUC__) && !defined(_System)
+#   define _System /* For compatibility with old GCC/EMX */
 #  endif
+#  define SDLCALL _System
 # else
 #  define SDLCALL
 # endif
diff --git a/MacOSX/SDL.framework/Versions/A/SDL b/MacOSX/SDL.framework/Versions/A/SDL
index b9de20e3..4f90ca43 100755
Binary files a/MacOSX/SDL.framework/Versions/A/SDL and b/MacOSX/SDL.framework/Versions/A/SDL differ
diff --git a/Windows/SDL/include/SDL_config_os2.h b/Windows/SDL/include/SDL_config_os2.h
index d05d31bc..0342c818 100644
--- a/Windows/SDL/include/SDL_config_os2.h
+++ b/Windows/SDL/include/SDL_config_os2.h
@@ -27,17 +27,6 @@
 
 /* This is a set of defines to configure the SDL features */
 
-typedef signed char         int8_t;
-typedef unsigned char       uint8_t;
-typedef signed short        int16_t;
-typedef unsigned short      uint16_t;
-typedef signed int          int32_t;
-typedef unsigned int        uint32_t;
-typedef unsigned int        size_t;
-typedef unsigned long       uintptr_t;
-typedef signed long long    int64_t;
-typedef unsigned long long  uint64_t;
-
 #define SDL_HAS_64BIT_TYPE	1
 
 /* Use Watcom's LIBC */
@@ -67,7 +56,6 @@ typedef unsigned long long  uint64_t;
 #define HAVE_ALLOCA 1
 #define HAVE_GETENV 1
 #define HAVE_PUTENV 1
-/* #undef HAVE_UNSETENV */
 #define HAVE_QSORT 1
 #define HAVE_ABS 1
 #define HAVE_BCOPY 1
@@ -89,7 +77,6 @@ typedef unsigned long long  uint64_t;
 #define HAVE_STRSTR 1
 #define HAVE_ITOA 1
 #define HAVE__LTOA 1
-#define HAVE__UITOA 1
 #define HAVE__ULTOA 1
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
@@ -135,7 +122,7 @@ typedef unsigned long long  uint64_t;
 #define SDL_VIDEO_DRIVER_OS2FS	1
 
 /* Enable OpenGL support */
-/* Nothing here yet for OS/2... :( */
+/* Nothing yet for OS/2. */
 
 /* Enable assembly routines where available */
 #define SDL_ASSEMBLY_ROUTINES	1
diff --git a/Windows/SDL/include/SDL_config_win32.h b/Windows/SDL/include/SDL_config_win32.h
index 8d8c5141..9b0b9bf6 100644
--- a/Windows/SDL/include/SDL_config_win32.h
+++ b/Windows/SDL/include/SDL_config_win32.h
@@ -96,6 +96,7 @@ typedef unsigned int uintptr_t;
 #define HAVE_MEMMOVE 1
 #define HAVE_MEMCMP 1
 #define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
 #define HAVE__STRREV 1
 #define HAVE__STRUPR 1
 #define HAVE__STRLWR 1
@@ -105,9 +106,14 @@ typedef unsigned int uintptr_t;
 #define HAVE_ITOA 1
 #define HAVE__LTOA 1
 #define HAVE__ULTOA 1
+#define HAVE__I64TOA 1
+#define HAVE__UI64TOA 1
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
+#if defined(__MINGW32__) || defined(__WATCOMC__)
 #define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#endif
 #define HAVE_STRTOD 1
 #define HAVE_ATOI 1
 #define HAVE_ATOF 1
diff --git a/Windows/SDL/include/SDL_platform.h b/Windows/SDL/include/SDL_platform.h
index 48540a85..bcbd7b66 100644
--- a/Windows/SDL/include/SDL_platform.h
+++ b/Windows/SDL/include/SDL_platform.h
@@ -82,7 +82,7 @@
 #undef __OPENBSD__
 #define __OPENBSD__	1
 #endif
-#if defined(__OS2__)
+#if defined(__OS2__) || defined(__EMX__)
 #undef __OS2__
 #define __OS2__		1
 #endif
diff --git a/Windows/SDL/include/begin_code.h b/Windows/SDL/include/begin_code.h
index 27e2f7bc..1c8a2a03 100644
--- a/Windows/SDL/include/begin_code.h
+++ b/Windows/SDL/include/begin_code.h
@@ -58,24 +58,11 @@
 #   define DECLSPEC	__declspec(dllexport)
 #  endif
 # elif defined(__OS2__)
-#  ifdef __WATCOMC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC	__declspec(dllexport)
 #   else
 #    define DECLSPEC
 #   endif
-#  elif defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   ifdef BUILD_SDL
-#    define DECLSPEC    __declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
 # else
 #  if defined(__GNUC__) && __GNUC__ >= 4
 #   define DECLSPEC	__attribute__ ((visibility("default")))
@@ -93,16 +80,12 @@
 # if defined(__WIN32__) && !defined(__GNUC__)
 #  define SDLCALL __cdecl
 # elif defined(__OS2__)
-#  if defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   define SDLCALL _cdecl
-#  else
-#   /* On other compilers on OS/2, we use the _System calling convention */
-#   /* to be compatible with every compiler */
-#   define SDLCALL _System
+   /* But on OS/2, we use the _System calling convention */
+   /* to be compatible with every compiler */
+#  if defined (__GNUC__) && !defined(_System)
+#   define _System /* For compatibility with old GCC/EMX */
 #  endif
+#  define SDLCALL _System
 # else
 #  define SDLCALL
 # endif
diff --git a/Windows/SDL/lib/SDL.dll b/Windows/SDL/lib/SDL.dll
index 7e5b56b6..dc236d70 100644
Binary files a/Windows/SDL/lib/SDL.dll and b/Windows/SDL/lib/SDL.dll differ
diff --git a/Windows/SDL/lib/SDL.lib b/Windows/SDL/lib/SDL.lib
index 776a0323..466fe1c1 100644
Binary files a/Windows/SDL/lib/SDL.lib and b/Windows/SDL/lib/SDL.lib differ
diff --git a/Windows/SDL/lib/libSDL.dll.a b/Windows/SDL/lib/libSDL.dll.a
index 86362de5..108f13bf 100644
Binary files a/Windows/SDL/lib/libSDL.dll.a and b/Windows/SDL/lib/libSDL.dll.a differ
diff --git a/Windows/SDL/lib64/SDL.dll b/Windows/SDL/lib64/SDL.dll
index 59e69dc1..9bf5b7fb 100644
Binary files a/Windows/SDL/lib64/SDL.dll and b/Windows/SDL/lib64/SDL.dll differ
diff --git a/Windows/SDL/lib64/SDL.lib b/Windows/SDL/lib64/SDL.lib
index 204353f1..e0db8692 100644
Binary files a/Windows/SDL/lib64/SDL.lib and b/Windows/SDL/lib64/SDL.lib differ
diff --git a/Windows/SDL/lib64/libSDL.dll.a b/Windows/SDL/lib64/libSDL.dll.a
index 31d09732..5ff56a86 100644
Binary files a/Windows/SDL/lib64/libSDL.dll.a and b/Windows/SDL/lib64/libSDL.dll.a differ
diff --git a/Windows/SDL/watcom/SDL.def b/Windows/SDL/watcom/SDL.def
index e646fefe..a4c6c311 100644
--- a/Windows/SDL/watcom/SDL.def
+++ b/Windows/SDL/watcom/SDL.def
@@ -199,7 +199,10 @@ SDL_iconv_string
 SDL_mutexP
 SDL_mutexV
 SDL_putenv
+SDL_revcpy
 SDL_snprintf
 SDL_strlcat
 SDL_strlcpy
+SDL_strtoll
+SDL_strtoull
 SDL_vsnprintf
diff --git a/Windows/SDL/watcom/SDL.exp b/Windows/SDL/watcom/SDL.exp
index 619aae2f..f79fe749 100644
--- a/Windows/SDL/watcom/SDL.exp
+++ b/Windows/SDL/watcom/SDL.exp
@@ -196,7 +196,10 @@
 ++'_SDL_mutexP'.'SDL.DLL'..'SDL_mutexP'
 ++'_SDL_mutexV'.'SDL.DLL'..'SDL_mutexV'
 ++'_SDL_putenv'.'SDL.DLL'..'SDL_putenv'
+++'_SDL_revcpy'.'SDL.DLL'..'SDL_revcpy'
 ++'_SDL_snprintf'.'SDL.DLL'..'SDL_snprintf'
 ++'_SDL_strlcat'.'SDL.DLL'..'SDL_strlcat'
 ++'_SDL_strlcpy'.'SDL.DLL'..'SDL_strlcpy'
+++'_SDL_strtoll'.'SDL.DLL'..'SDL_strtoll'
+++'_SDL_strtoull'.'SDL.DLL'..'SDL_strtoull'
 ++'_SDL_vsnprintf'.'SDL.DLL'..'SDL_vsnprintf'
diff --git a/Windows/SDL/watcom/SDL.lib b/Windows/SDL/watcom/SDL.lib
index aaad3db7..d07a56ee 100644
Binary files a/Windows/SDL/watcom/SDL.lib and b/Windows/SDL/watcom/SDL.lib differ