diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt
index ae8dde0d513..089983eed20 100644
--- a/base/system/msiexec/CMakeLists.txt
+++ b/base/system/msiexec/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
     msiexec.c
     service.c
diff --git a/dll/win32/combase/CMakeLists.txt b/dll/win32/combase/CMakeLists.txt
index 0ea142d3b40..cea67795657 100644
--- a/dll/win32/combase/CMakeLists.txt
+++ b/dll/win32/combase/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS -D_WIN32_WINNT=0x502)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
diff --git a/dll/win32/coml2/CMakeLists.txt b/dll/win32/coml2/CMakeLists.txt
index aad24768a0c..deb67b633c0 100644
--- a/dll/win32/coml2/CMakeLists.txt
+++ b/dll/win32/coml2/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(coml2.dll coml2.spec ADD_IMPORTLIB)
 
diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt
index a56560d1462..1d7aec86a4f 100644
--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T)
diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt
index bf8be52beaa..69063acd0fc 100644
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -3,9 +3,6 @@
 # Global compile options
 ###############################################################################
 
-# Use conforming swprintfs
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 # This requires NT6
 remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
 add_definitions(-D_WIN32_WINNT=0x601 -DWINVER=0x601)
diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt
index a30dfcb9eb5..6b788595ece 100644
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
diff --git a/dll/win32/propsys/CMakeLists.txt b/dll/win32/propsys/CMakeLists.txt
index 8b785cb644d..a0122540914 100644
--- a/dll/win32/propsys/CMakeLists.txt
+++ b/dll/win32/propsys/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D_PROPSYS_)
 spec2def(propsys.dll propsys.spec ADD_IMPORTLIB)
 
diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt
index 9ff318b9089..cd492c33b2b 100644
--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 spec2def(riched20.dll riched20.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
diff --git a/dll/win32/ucrtbase/CMakeLists.txt b/dll/win32/ucrtbase/CMakeLists.txt
index 27c9c17f681..c5ea55f2601 100644
--- a/dll/win32/ucrtbase/CMakeLists.txt
+++ b/dll/win32/ucrtbase/CMakeLists.txt
@@ -7,8 +7,6 @@ list(REMOVE_ITEM INCLUDE_DIRS "${REACTOS_SOURCE_DIR}/sdk/include/crt")
 set_property(DIRECTORY . PROPERTY INCLUDE_DIRECTORIES ${INCLUDE_DIRS})
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/ucrt)
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 add_compile_definitions(
     _UCRT
     _CORECRT_BUILD
diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt
index 2f6177c3e38..6f92c886045 100644
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -5,7 +5,6 @@ add_definitions(
     -DWINE_REGISTER_DLL)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(
diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index a635649a0c1..32f1a8488f4 100644
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt
index 63c74eadab5..d5cc834464e 100644
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
diff --git a/modules/rosapps/applications/fraginator/CMakeLists.txt b/modules/rosapps/applications/fraginator/CMakeLists.txt
index 9ee2404fdc6..77d46795308 100644
--- a/modules/rosapps/applications/fraginator/CMakeLists.txt
+++ b/modules/rosapps/applications/fraginator/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
 	Fraginator.cpp
 	MainDialog.cpp
diff --git a/modules/rostests/winetests/combase/CMakeLists.txt b/modules/rostests/winetests/combase/CMakeLists.txt
index 6eb47e2576c..018f0ea0cbe 100644
--- a/modules/rostests/winetests/combase/CMakeLists.txt
+++ b/modules/rostests/winetests/combase/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 add_definitions(-D__ROS_LONG64__)
 add_definitions(-DUSE_WINE_TODOS)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(wine.combase.test.dll wine.combase.test.spec)
diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt
index 518e005ab18..c968cd80b52 100644
--- a/modules/rostests/winetests/kernel32/CMakeLists.txt
+++ b/modules/rostests/winetests/kernel32/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
-remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 add_definitions(-DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000007)
 
 # Comment this block out if you want to debug the heap issue with these tests on ROS x64. ROSTESTS-415
diff --git a/modules/rostests/winetests/mscoree/CMakeLists.txt b/modules/rostests/winetests/mscoree/CMakeLists.txt
index 89f6a4bdd1c..6568e9daf83 100644
--- a/modules/rostests/winetests/mscoree/CMakeLists.txt
+++ b/modules/rostests/winetests/mscoree/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-DUSE_WINE_TODOS)
 
 add_executable(mscoree_winetest
diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt
index 44fc2334eef..8d833d52f12 100644
--- a/modules/rostests/winetests/msvcrt/CMakeLists.txt
+++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
     cpp.c
     data.c
diff --git a/modules/rostests/winetests/msxml4/CMakeLists.txt b/modules/rostests/winetests/msxml4/CMakeLists.txt
index cf4883b3bb7..b26e5d63ef5 100644
--- a/modules/rostests/winetests/msxml4/CMakeLists.txt
+++ b/modules/rostests/winetests/msxml4/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
diff --git a/modules/rostests/winetests/msxml6/CMakeLists.txt b/modules/rostests/winetests/msxml6/CMakeLists.txt
index 17d8e5f20ff..8d703e02c5d 100644
--- a/modules/rostests/winetests/msxml6/CMakeLists.txt
+++ b/modules/rostests/winetests/msxml6/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt
index 1b939d1bf8c..06da990f6c5 100644
--- a/modules/rostests/winetests/ntdll/CMakeLists.txt
+++ b/modules/rostests/winetests/ntdll/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D__WINESRC__ -DWINETEST_USE_DBGSTR_LONGLONG)
 
 remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
diff --git a/modules/rostests/winetests/uiautomationcore/CMakeLists.txt b/modules/rostests/winetests/uiautomationcore/CMakeLists.txt
index 66bfd44b7c0..cd7794ca2d2 100644
--- a/modules/rostests/winetests/uiautomationcore/CMakeLists.txt
+++ b/modules/rostests/winetests/uiautomationcore/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt
index 2a609895a01..bd4db85695e 100644
--- a/modules/rostests/winetests/user32/CMakeLists.txt
+++ b/modules/rostests/winetests/user32/CMakeLists.txt
@@ -2,8 +2,6 @@
 remove_definitions(-DWINVER=0x502 -D_WIN32_WINNT=0x502)
 add_definitions(-DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000005)
 
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
     broadcast.c
     class.c
diff --git a/modules/rostests/winetests/winhttp/CMakeLists.txt b/modules/rostests/winetests/winhttp/CMakeLists.txt
index 2b4a890170a..66725934496 100644
--- a/modules/rostests/winetests/winhttp/CMakeLists.txt
+++ b/modules/rostests/winetests/winhttp/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 add_definitions(-DUSE_WINE_TODOS)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 
 list(APPEND SOURCE
     notification.c