diff --git a/platform/Windows/include/SDL2/SDL_config_os2.h b/platform/Windows/include/SDL2/SDL_config_os2.h
index 9be6b2d50e..b2b061d716 100644
--- a/platform/Windows/include/SDL2/SDL_config_os2.h
+++ b/platform/Windows/include/SDL2/SDL_config_os2.h
@@ -114,9 +114,6 @@
 #define HAVE_MEMCPY 1
 #define HAVE_MEMMOVE 1
 #define HAVE_MEMCMP 1
-#define HAVE_WCSLEN 1
-#define HAVE_WCSLCPY 1
-#define HAVE_WCSLCAT 1
 #define HAVE_WCSCMP 1
 #define HAVE__WCSICMP 1
 #define HAVE__WCSNICMP 1
diff --git a/platform/Windows/include/SDL2/SDL_config_windows.h b/platform/Windows/include/SDL2/SDL_config_windows.h
index dba7808601..aae52ebc63 100644
--- a/platform/Windows/include/SDL2/SDL_config_windows.h
+++ b/platform/Windows/include/SDL2/SDL_config_windows.h
@@ -99,9 +99,11 @@ typedef unsigned int uintptr_t;
 #define HAVE_D3D11_H 1
 #define HAVE_ROAPI_H 1
 #endif
-#if defined(WDK_NTDDI_VERSION) && WDK_NTDDI_VERSION > 0x0A000008 /* 10.0.19041.0 */
+#if defined(__has_include)
+#if __has_include(<d3d12.h>) && __has_include(<d3d12sdklayers.h>)
 #define HAVE_D3D12_H 1
 #endif
+#endif
 #if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0603  /* Windows 8.1 SDK */
 #define HAVE_SHELLSCALINGAPI_H 1
 #endif
diff --git a/platform/Windows/include/SDL2/SDL_platform.h b/platform/Windows/include/SDL2/SDL_platform.h
index e8bf11acfd..2b11bf2016 100644
--- a/platform/Windows/include/SDL2/SDL_platform.h
+++ b/platform/Windows/include/SDL2/SDL_platform.h
@@ -73,7 +73,13 @@
 #if defined(__APPLE__)
 /* lets us know what version of Mac OS X we're compiling on */
 #include <AvailabilityMacros.h>
+#ifndef __has_extension /* Older compilers don't support this */
+#define __has_extension(x) 0
 #include <TargetConditionals.h>
+#undef __has_extension
+#else
+#include <TargetConditionals.h>
+#endif
 
 /* Fix building with older SDKs that don't define these
    See this for more information:
diff --git a/platform/Windows/include/SDL2/SDL_stdinc.h b/platform/Windows/include/SDL2/SDL_stdinc.h
index 8c22283af0..45e2a7830a 100644
--- a/platform/Windows/include/SDL2/SDL_stdinc.h
+++ b/platform/Windows/include/SDL2/SDL_stdinc.h
@@ -253,10 +253,10 @@ typedef uint64_t Uint64;
  * <stdint.h> should define these but this is not true all platforms.
  * (for example win32) */
 #ifndef SDL_PRIs64
-#ifdef PRIs64
-#define SDL_PRIs64 PRIs64
-#elif defined(__WIN32__) || defined(__GDK__)
+#if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIs64 "I64d"
+#elif defined(PRIs64)
+#define SDL_PRIs64 PRIs64
 #elif defined(__LP64__) && !defined(__APPLE__)
 #define SDL_PRIs64 "ld"
 #else
@@ -264,10 +264,10 @@ typedef uint64_t Uint64;
 #endif
 #endif
 #ifndef SDL_PRIu64
-#ifdef PRIu64
-#define SDL_PRIu64 PRIu64
-#elif defined(__WIN32__) || defined(__GDK__)
+#if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIu64 "I64u"
+#elif defined(PRIu64)
+#define SDL_PRIu64 PRIu64
 #elif defined(__LP64__) && !defined(__APPLE__)
 #define SDL_PRIu64 "lu"
 #else
@@ -275,10 +275,10 @@ typedef uint64_t Uint64;
 #endif
 #endif
 #ifndef SDL_PRIx64
-#ifdef PRIx64
-#define SDL_PRIx64 PRIx64
-#elif defined(__WIN32__) || defined(__GDK__)
+#if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIx64 "I64x"
+#elif defined(PRIx64)
+#define SDL_PRIx64 PRIx64
 #elif defined(__LP64__) && !defined(__APPLE__)
 #define SDL_PRIx64 "lx"
 #else
@@ -286,10 +286,10 @@ typedef uint64_t Uint64;
 #endif
 #endif
 #ifndef SDL_PRIX64
-#ifdef PRIX64
-#define SDL_PRIX64 PRIX64
-#elif defined(__WIN32__) || defined(__GDK__)
+#if defined(__WIN32__) || defined(__GDK__)
 #define SDL_PRIX64 "I64X"
+#elif defined(PRIX64)
+#define SDL_PRIX64 PRIX64
 #elif defined(__LP64__) && !defined(__APPLE__)
 #define SDL_PRIX64 "lX"
 #else
diff --git a/platform/Windows/include/SDL2/SDL_version.h b/platform/Windows/include/SDL2/SDL_version.h
index b7b7f39b60..d05fed77c2 100644
--- a/platform/Windows/include/SDL2/SDL_version.h
+++ b/platform/Windows/include/SDL2/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   30
-#define SDL_PATCHLEVEL      3
+#define SDL_PATCHLEVEL      4
 
 /**
  * Macro to determine SDL version program was compiled against.
diff --git a/platform/Windows/lib/32/libSDL2.a b/platform/Windows/lib/32/libSDL2.a
index 92aca42f47..ee70fc360c 100644
Binary files a/platform/Windows/lib/32/libSDL2.a and b/platform/Windows/lib/32/libSDL2.a differ
diff --git a/platform/Windows/lib/32/libSDL2main.a b/platform/Windows/lib/32/libSDL2main.a
index ed6ddef7d8..7518fcdbc8 100644
Binary files a/platform/Windows/lib/32/libSDL2main.a and b/platform/Windows/lib/32/libSDL2main.a differ
diff --git a/platform/Windows/lib/64/libSDL2.a b/platform/Windows/lib/64/libSDL2.a
index 3ccc8923fb..0ac6ec9930 100644
Binary files a/platform/Windows/lib/64/libSDL2.a and b/platform/Windows/lib/64/libSDL2.a differ
diff --git a/platform/Windows/lib/64/libSDL2main.a b/platform/Windows/lib/64/libSDL2main.a
index fb7a7438d5..45dc7af6b7 100644
Binary files a/platform/Windows/lib/64/libSDL2main.a and b/platform/Windows/lib/64/libSDL2main.a differ