diff --git a/winpr/include/winpr/assert.h b/winpr/include/winpr/assert.h
index 25d8e66ab..9d4d2a4b0 100644
--- a/winpr/include/winpr/assert.h
+++ b/winpr/include/winpr/assert.h
@@ -69,9 +69,9 @@ extern "C"
 #define WINPR_STATIC_ASSERT(cond) static_assert(cond)
 #elif defined(__cplusplus) && (__cplusplus >= 201103L) // C++ 11
 #define WINPR_STATIC_ASSERT(cond) static_assert(cond, #cond)
-#elif defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L) // C23
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L) // C23
 #define WINPR_STATIC_ASSERT(cond) static_assert(cond)
-#elif defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) // C11
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) // C11
 #define WINPR_STATIC_ASSERT(cond) _Static_assert(cond, #cond)
 #else
 WINPR_PRAGMA_WARNING("static-assert macro not supported on this platform")
diff --git a/winpr/include/winpr/platform.h b/winpr/include/winpr/platform.h
index 537cd3ade..c0ac08fdb 100644
--- a/winpr/include/winpr/platform.h
+++ b/winpr/include/winpr/platform.h
@@ -32,7 +32,7 @@
 #endif
 
 // C99 related macros
-#if defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 #define WINPR_RESTRICT restrict
 #elif defined(_MSC_VER) && _MSC_VER >= 1900
 #define WINPR_RESTRICT __restrict
@@ -41,7 +41,7 @@
 #endif
 
 // C23 related macros
-#if defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)
 #define WINPR_FALLTHROUGH \
 	(void)0;              \
 	[[fallthrough]];
diff --git a/winpr/include/winpr/winpr.h b/winpr/include/winpr/winpr.h
index 715231f9a..16af05c51 100644
--- a/winpr/include/winpr/winpr.h
+++ b/winpr/include/winpr/winpr.h
@@ -65,7 +65,7 @@
 #define WINPR_FORMAT_ARG _Printf_format_string_
 #endif
 
-#if defined(__STDC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L)
 #define WINPR_DEPRECATED(obj) [[deprecated]] obj
 #define WINPR_DEPRECATED_VAR(text, obj) [[deprecated(text)]] obj
 #define WINPR_NORETURN(obj) [[noreturn]] obj