10 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index a2ee9e605b59..ec1c2ec2f403 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 unsigned long
 ___runetype(c)
-	_BSD_CT_RUNE_T_ c;
+	__ct_rune_t c;
 {
 	int x;
 	_RuneRange *rr = &_CurrentRuneLocale->runetype_ext;
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index 42392d75726e..f8caecba79ab 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <rune.h>
 
-_BSD_CT_RUNE_T_
+__ct_rune_t
 ___tolower(c)
-	_BSD_CT_RUNE_T_ c;
+	__ct_rune_t c;
 {
 	int x;
 	_RuneRange *rr = &_CurrentRuneLocale->maplower_ext;
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index 1871f8a0cc0b..6ce67577cde1 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <rune.h>
 
-_BSD_CT_RUNE_T_
+__ct_rune_t
 ___toupper(c)
-	_BSD_CT_RUNE_T_ c;
+	__ct_rune_t c;
 {
 	int x;
 	_RuneRange *rr = &_CurrentRuneLocale->mapupper_ext;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 4d8926a766cc..bfa4aab8b4cd 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -69,7 +69,7 @@ extern int	_fwalk(int (*)(FILE *));
 extern int	__swsetup(FILE *);
 extern int	__sflags(const char *, int *);
 extern int	__ungetc(int, FILE *);
-extern int	__vfprintf(FILE *, const char *, _BSD_VA_LIST_);
+extern int	__vfprintf(FILE *, const char *, __va_list);
 
 extern int	__sdidinit;
 
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 9d55725eae0a..9e8efcfb6ab0 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -39,7 +39,7 @@ int
 vasprintf(str, fmt, ap)
 	char **str;
 	const char *fmt;
-	_BSD_VA_LIST_ ap;
+	__va_list ap;
 {
 	int ret;
 	FILE f;
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 1f293d6d3cbe..253870cb8bae 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 
 int
-vprintf(const char *__restrict fmt, _BSD_VA_LIST_ ap)
+vprintf(const char *__restrict fmt, __va_list ap)
 {
 
 	return (vfprintf(stdout, fmt, ap));
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index beed0c223edc..92f55fcee382 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 int
 vscanf(fmt, ap)
 	const char *fmt;
-	_BSD_VA_LIST_ ap;
+	__va_list ap;
 {
 	int retval;
 
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index eae9adc58c83..7f18c8302111 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 
 int
 vsnprintf(char *__restrict str, size_t n, const char *__restrict fmt,
-    _BSD_VA_LIST_ ap)
+    __va_list ap)
 {
 	size_t on;
 	int ret;
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index b66b7c86db88..82e6297a47cb 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include "local.h"
 
 int
-vsprintf(char *__restrict str, const char *__restrict fmt, _BSD_VA_LIST_ ap)
+vsprintf(char *__restrict str, const char *__restrict fmt, __va_list ap)
 {
 	int ret;
 	FILE f;
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 58778f661ae3..81a241ca6e3d 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -62,7 +62,7 @@ int
 vsscanf(str, fmt, ap)
 	const char *str;
 	const char *fmt;
-	_BSD_VA_LIST_ ap;
+	__va_list ap;
 {
 	FILE f;
 	struct __sFILEX ext;