12 files changed, 62 insertions, 31 deletions
diff --git a/lib/libc/ctype/isalpha.c b/lib/libc/ctype/isalpha.c
index a1b89762..6727d22a 100644
--- a/lib/libc/ctype/isalpha.c
+++ b/lib/libc/ctype/isalpha.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isalpha, isalpha_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isalpha(int c)
 {
 	return ((unsigned)c | 32) - 'a' < 26;
 }
 
-weak_reference(isalpha, isalpha_l);
+__weak int isalpha_l(int c, locale_t __unused locale)
+{
+	return isalpha(c);
+}
diff --git a/lib/libc/ctype/isblank.c b/lib/libc/ctype/isblank.c
index c4dacfb2..dfe9472c 100644
--- a/lib/libc/ctype/isblank.c
+++ b/lib/libc/ctype/isblank.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isblank, isblank_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isblank(int c)
 {
 	return (c == ' ' || c == '\t');
 }
 
-weak_reference(isblank, isblank_l);
+__weak int isblank_l(int c, locale_t __unused locale)
+{
+	return isblank(c);
+}
diff --git a/lib/libc/ctype/iscntrl.c b/lib/libc/ctype/iscntrl.c
index c25773b6..53b8616a 100644
--- a/lib/libc/ctype/iscntrl.c
+++ b/lib/libc/ctype/iscntrl.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for iscntrl, iscntrl_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int iscntrl(int c)
 {
 	return (unsigned)c < 0x20 || c == 0x7f;
 }
 
-weak_reference(iscntrl, iscntrl_l);
+__weak int iscntrl_l(int c, locale_t __unused locale)
+{
+	return iscntrl(c);
+}
diff --git a/lib/libc/ctype/isdigit.c b/lib/libc/ctype/isdigit.c
index fa36222d..c33dc1b9 100644
--- a/lib/libc/ctype/isdigit.c
+++ b/lib/libc/ctype/isdigit.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isdigit, isdigit_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isdigit(int c)
 {
 	return (unsigned)c - '0' < 10;
 }
 
-weak_reference(isdigit, isdigit_l);
+__weak int isdigit_l(int c, locale_t __unused locale)
+{
+	return isdigit(c);
+}
diff --git a/lib/libc/ctype/isgraph.c b/lib/libc/ctype/isgraph.c
index 07df57d0..39e72159 100644
--- a/lib/libc/ctype/isgraph.c
+++ b/lib/libc/ctype/isgraph.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isgraph, isgraph_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isgraph(int c)
 {
 	return (unsigned)c - 0x21 < 0x5e;
 }
 
-weak_reference(isgraph, isgraph_l);
+__weak int isgraph_l(int c, locale_t __unused locale)
+{
+	return isgraph(c);
+}
diff --git a/lib/libc/ctype/islower.c b/lib/libc/ctype/islower.c
index a6108e39..8438c8d1 100644
--- a/lib/libc/ctype/islower.c
+++ b/lib/libc/ctype/islower.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for islower, islower_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int islower(int c)
 {
 	return (unsigned)c - 'a' < 26;
 }
 
-weak_reference(islower, islower_l);
+__weak int islower_l(int c, locale_t __unused locale)
+{
+	return islower(c);
+}
diff --git a/lib/libc/ctype/isprint.c b/lib/libc/ctype/isprint.c
index dbd381e7..b1d75a31 100644
--- a/lib/libc/ctype/isprint.c
+++ b/lib/libc/ctype/isprint.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isprint, isprint_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isprint(int c)
 {
 	return (unsigned)c - 0x20 < 0x5f;
 }
 
-weak_reference(isprint, isprint_l);
+__weak int isprint_l(int c, locale_t __unused locale)
+{
+	return isprint(c);
+}
diff --git a/lib/libc/ctype/ispunct.c b/lib/libc/ctype/ispunct.c
index e0029757..fc60287f 100644
--- a/lib/libc/ctype/ispunct.c
+++ b/lib/libc/ctype/ispunct.c
@@ -1,8 +1,6 @@
-#include "features.h" // for __weak
-
-#include <ctype.h>  // for isalnum, isgraph, ispunct, ispunct_l
-#include <libc.h>   // for __unused
-#include <locale.h> // for locale_t
+#include <ctype.h>     // for isalnum, isgraph, ispunct, ispunct_l
+#include <locale.h>    // for locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int ispunct(int c)
 {
diff --git a/lib/libc/ctype/isspace.c b/lib/libc/ctype/isspace.c
index 468e755b..201daca0 100644
--- a/lib/libc/ctype/isspace.c
+++ b/lib/libc/ctype/isspace.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isspace, isspace_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isspace(int c)
 {
 	return c == ' ' || (unsigned)c - '\t' < 5;
 }
 
-weak_reference(isspace, isspace_l);
+__weak int isspace_l(int c, locale_t __unused locale)
+{
+	return isspace(c);
+}
diff --git a/lib/libc/ctype/isupper.c b/lib/libc/ctype/isupper.c
index b46dce41..d831a3fa 100644
--- a/lib/libc/ctype/isupper.c
+++ b/lib/libc/ctype/isupper.c
@@ -1,8 +1,12 @@
-#include <libc.h> // for weak_reference
+#include <ctype.h>     // for isupper, isupper_l, locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int isupper(int c)
 {
 	return (unsigned)c - 'A' < 26;
 }
 
-weak_reference(isupper, isupper_l);
+__weak int isupper_l(int c, locale_t __unused locale)
+{
+	return isupper(c);
+}
diff --git a/lib/libc/ctype/tolower.c b/lib/libc/ctype/tolower.c
index af196d05..fcb1de85 100644
--- a/lib/libc/ctype/tolower.c
+++ b/lib/libc/ctype/tolower.c
@@ -1,8 +1,6 @@
-#include "features.h" // for __weak
-
-#include <ctype.h>  // for isupper, tolower, tolower_l
-#include <libc.h>   // for __unused
-#include <locale.h> // for locale_t
+#include <ctype.h>     // for isupper, tolower, tolower_l
+#include <locale.h>    // for locale_t
+#include <sys/cdefs.h> // for __unused, __weak
 
 int tolower(int c)
 {
diff --git a/lib/libc/ctype/toupper.c b/lib/libc/ctype/toupper.c
index 3f7ebf43..9dd4c8da 100644
--- a/lib/libc/ctype/toupper.c
+++ b/lib/libc/ctype/toupper.c
@@ -1,6 +1,5 @@
-#include <ctype.h>  // for islower, toupper, toupper_l
-#include <libc.h>   // for __unused
-#include <locale.h> // for locale_t
+#include <ctype.h>     // for islower, toupper, locale_t, toupper_l
+#include <sys/cdefs.h> // for __unused
 
 int toupper(int c)
 {