diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec
index 44fbe937898..793c3bb58da 100644
--- a/dll/ntdll/def/ntdll.spec
+++ b/dll/ntdll/def/ntdll.spec
@@ -1886,7 +1886,7 @@
 @ cdecl strstr(str str)
 @ cdecl strtol(str ptr long)
 @ cdecl strtoul(str ptr long)
-@ varargs swprintf(ptr wstr)
+@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
 @ cdecl -arch=i386,x86_64 tan(double)
 @ cdecl tolower(long)
 @ cdecl toupper(long) toupper_nt_mb
diff --git a/dll/win32/crtdll/crtdll.spec b/dll/win32/crtdll/crtdll.spec
index 987b38ac8d9..582da931005 100644
--- a/dll/win32/crtdll/crtdll.spec
+++ b/dll/win32/crtdll/crtdll.spec
@@ -482,7 +482,7 @@
 @ cdecl strtol(str ptr long)
 @ cdecl strtoul(str ptr long) CRTDLL_strtoul
 @ cdecl strxfrm(ptr str long)
-@ varargs swprintf(wstr wstr)
+@ varargs swprintf(wstr wstr) _swprintf # Non-conforming swprintf
 @ varargs swscanf(wstr wstr)
 @ cdecl system(str) CRTDLL_system
 @ cdecl tan(double)
@@ -500,7 +500,7 @@
 @ cdecl vfwprintf(ptr wstr long)
 @ cdecl vprintf(str long)
 @ cdecl vsprintf(ptr str ptr)
-@ cdecl vswprintf(ptr wstr ptr) _vswprintf
+@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
 @ cdecl vwprintf(wstr long)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec
index fb113c74f32..279ed0d3417 100644
--- a/dll/win32/msvcrt/msvcrt.spec
+++ b/dll/win32/msvcrt/msvcrt.spec
@@ -1460,7 +1460,7 @@
 @ cdecl strtoul(str ptr long)
 @ cdecl -impsym strtoull(str ptr long) _strtoui64
 @ cdecl strxfrm(ptr str long)
-@ varargs swprintf(ptr wstr) _swprintf
+@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
 @ varargs -version=0x600+ swprintf_s(ptr long wstr)
 @ varargs swscanf(wstr wstr)
 @ varargs -version=0x600+ swscanf_s(wstr wstr)
@@ -1492,7 +1492,7 @@
 @ cdecl -version=0x600+ vsnprintf(ptr long str ptr) _vsnprintf
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl -version=0x600+ vsprintf_s(ptr long str ptr)
-@ cdecl vswprintf(ptr wstr ptr) _vswprintf
+@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
 @ cdecl -version=0x600+ vswprintf_s(ptr long wstr ptr)
 @ cdecl vwprintf(wstr ptr)
 @ cdecl -version=0x600+ vwprintf_s(wstr ptr)
diff --git a/dll/win32/msvcrt20/msvcrt20.spec b/dll/win32/msvcrt20/msvcrt20.spec
index c3529bbca53..36b1aefd41c 100644
--- a/dll/win32/msvcrt20/msvcrt20.spec
+++ b/dll/win32/msvcrt20/msvcrt20.spec
@@ -1093,7 +1093,7 @@
 @ cdecl strtol(str ptr long)
 @ cdecl strtoul(str ptr long)
 @ cdecl strxfrm(ptr str long)
-@ varargs swprintf(ptr wstr)
+@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
 @ varargs swscanf(wstr wstr)
 @ cdecl system(str)
 @ cdecl tan(double)
@@ -1112,7 +1112,7 @@
 @ cdecl vfwprintf(ptr wstr ptr)
 @ cdecl vprintf(str ptr)
 @ cdecl vsprintf(ptr str ptr)
-@ cdecl vswprintf(ptr wstr ptr) _vswprintf
+@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
 @ cdecl vwprintf(wstr long)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
diff --git a/dll/win32/msvcrt40/msvcrt40.spec b/dll/win32/msvcrt40/msvcrt40.spec
index 9e4ef48a106..6c154217d32 100644
--- a/dll/win32/msvcrt40/msvcrt40.spec
+++ b/dll/win32/msvcrt40/msvcrt40.spec
@@ -1131,7 +1131,7 @@
 @ cdecl strtol(str ptr long)
 @ cdecl strtoul(str ptr long)
 @ cdecl strxfrm(ptr str long)
-@ varargs swprintf(ptr wstr)
+@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
 @ varargs swscanf(wstr wstr)
 @ cdecl system(str)
 @ cdecl tan(double)
@@ -1150,7 +1150,7 @@
 @ cdecl vfwprintf(ptr wstr long)
 @ cdecl vprintf(str long)
 @ cdecl vsprintf(ptr str ptr)
-@ cdecl vswprintf(ptr wstr ptr) _vswprintf
+@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
 @ cdecl vwprintf(wstr long)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec
index 751e9005158..6a7fb0759be 100644
--- a/ntoskrnl/ntoskrnl.spec
+++ b/ntoskrnl/ntoskrnl.spec
@@ -1622,7 +1622,7 @@
 @ cdecl strrchr()
 @ cdecl strspn()
 @ cdecl strstr()
-@ cdecl swprintf()
+@ cdecl swprintf() _swprintf # Non-conforming swprintf
 @ cdecl tolower()
 @ cdecl toupper() toupper_nt_mb
 @ cdecl towlower()
diff --git a/sdk/lib/crt/printf/vswprintf.c b/sdk/lib/crt/printf/_vswprintf.c
similarity index 91%
rename from sdk/lib/crt/printf/vswprintf.c
rename to sdk/lib/crt/printf/_vswprintf.c
index 99502b31ee0..32480d88028 100644
--- a/sdk/lib/crt/printf/vswprintf.c
+++ b/sdk/lib/crt/printf/_vswprintf.c
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Timo Kreuzer
  */
 
-#define _sxprintf vswprintf
+#define _sxprintf _vswprintf
 #define USE_COUNT 0
 #define USE_VARARGS 1
 #define _UNICODE
diff --git a/sdk/lib/crt/printf/printf.cmake b/sdk/lib/crt/printf/printf.cmake
index b5aacc09ca9..b6e62cdc8df 100644
--- a/sdk/lib/crt/printf/printf.cmake
+++ b/sdk/lib/crt/printf/printf.cmake
@@ -7,11 +7,10 @@ list(APPEND LIBCNTPR_PRINTF_SOURCE
     printf/_vscwprintf.c
     printf/_vsnprintf.c
     printf/_vsnwprintf.c
+    printf/_vswprintf.c
     printf/sprintf.c
     printf/streamout.c
-    printf/swprintf.c
     printf/vprintf.c
     printf/vsprintf.c
-    printf/vswprintf.c
     printf/wstreamout.c
 )
diff --git a/sdk/lib/crt/printf/swprintf.c b/sdk/lib/crt/printf/swprintf.c
deleted file mode 100644
index edb8f78584e..00000000000
--- a/sdk/lib/crt/printf/swprintf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
- * PROJECT:         ReactOS crt library
- * FILE:            lib/sdk/crt/printf/swprintf.c
- * PURPOSE:         Implementation of swprintf
- * PROGRAMMER:      Timo Kreuzer
- */
-
-#define _sxprintf swprintf
-#define USE_COUNT 0
-#define _UNICODE
-
-#include "_sxprintf.c"