diff --git a/include/inttypes.h b/include/inttypes.h
index f702d2c3ca3a..510939680f10 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -34,7 +34,7 @@
 
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
+typedef	___wchar_t	wchar_t;
 #define	_WCHAR_T_DECLARED
 #endif
 #endif
diff --git a/include/stddef.h b/include/stddef.h
index ea88214f7761..2c73a2e2d852 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -54,7 +54,7 @@ typedef	__size_t	size_t;
 
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
+typedef	___wchar_t	wchar_t;
 #define	_WCHAR_T_DECLARED
 #endif
 #endif
diff --git a/include/stdlib.h b/include/stdlib.h
index 93cf122b92e5..3ed07f398b47 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -51,7 +51,7 @@ typedef	__size_t	size_t;
 
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
+typedef	___wchar_t	wchar_t;
 #define	_WCHAR_T_DECLARED
 #endif
 #endif
diff --git a/include/wchar.h b/include/wchar.h
index 4a3fe5385541..8233bdff1014 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -78,7 +78,7 @@ typedef	__size_t	size_t;
 
 #ifndef	__cplusplus
 #ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
+typedef	___wchar_t	wchar_t;
 #define	_WCHAR_T_DECLARED
 #endif
 #endif
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index 7915d0b7cafd..e36699c553db 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -106,11 +106,11 @@ typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint32_t	__vm_size_t;
 
 #ifdef __ARM_EABI__
-typedef	unsigned int	__wchar_t;
+typedef	unsigned int	___wchar_t;
 #define	__WCHAR_MIN	0		/* min value for a wchar_t */
 #define	__WCHAR_MAX	__UINT_MAX	/* max value for a wchar_t */
 #else
-typedef	int		__wchar_t;
+typedef	int		___wchar_t;
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
 #define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
 #endif
diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h
index 2876648d6674..572b9694f2ce 100644
--- a/sys/ia64/include/_types.h
+++ b/sys/ia64/include/_types.h
@@ -96,7 +96,7 @@ typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_paddr_t;
 typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint64_t	__vm_size_t;
-typedef	int		__wchar_t;
+typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
 #define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index ba0ee302aec2..a05f01c8d7ff 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -145,7 +145,7 @@ typedef	__uint32_t	__vm_paddr_t;
 
 typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_pindex_t;
-typedef	int		__wchar_t;
+typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
 #define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index 55ec0617318a..2c5e27441b62 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -133,7 +133,7 @@ typedef	__uint32_t	__vm_size_t;
 #endif
 typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_pindex_t;
-typedef	int		__wchar_t;
+typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
 #define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h
index aa8a299a2f81..62e2fe9f0adb 100644
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -92,7 +92,7 @@ typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_paddr_t;
 typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint64_t	__vm_size_t;
-typedef	int		__wchar_t;
+typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
 #define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h
index b55d3888c261..0a6ae4677bdd 100644
--- a/sys/sys/stdatomic.h
+++ b/sys/sys/stdatomic.h
@@ -198,7 +198,7 @@ typedef _Atomic(long long)		atomic_llong;
 typedef _Atomic(unsigned long long)	atomic_ullong;
 typedef _Atomic(__char16_t)		atomic_char16_t;
 typedef _Atomic(__char32_t)		atomic_char32_t;
-typedef _Atomic(__wchar_t)		atomic_wchar_t;
+typedef _Atomic(___wchar_t)		atomic_wchar_t;
 typedef _Atomic(__int_least8_t)		atomic_int_least8_t;
 typedef _Atomic(__uint_least8_t)	atomic_uint_least8_t;
 typedef _Atomic(__int_least16_t)	atomic_int_least16_t;
diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h
index 2d6bfbca2bb7..816a30123270 100644
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -142,7 +142,7 @@ typedef	__uint32_t	__vm_size_t;
 #endif
 typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_pindex_t;
-typedef	int		__wchar_t;
+typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
 #define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */