libc_hidden_proto removal, a few more functions

52 files changed, 117 insertions, 106 deletions

diff --git a/include/ctype.h b/include/ctype.h
index 184b47b51..21314d152 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -101,17 +101,23 @@ enum
 
 /* Pointers to the default C-locale data. */
 extern const __ctype_mask_t *__C_ctype_b;
+libc_hidden_proto(__C_ctype_b)
 extern const __ctype_touplow_t *__C_ctype_toupper;
+libc_hidden_proto(__C_ctype_toupper)
 extern const __ctype_touplow_t *__C_ctype_tolower;
+libc_hidden_proto(__C_ctype_tolower)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
 extern __const __ctype_mask_t **__ctype_b_loc (void)
      __attribute__ ((__const));
+libc_hidden_proto(__ctype_b_loc)
 extern __const __ctype_touplow_t **__ctype_tolower_loc (void)
      __attribute__ ((__const));
+libc_hidden_proto(__ctype_tolower_loc)
 extern __const __ctype_touplow_t **__ctype_toupper_loc (void)
      __attribute__ ((__const));
+libc_hidden_proto(__ctype_toupper_loc)
 
 #define __UCLIBC_CTYPE_B	(*__ctype_b_loc())
 #define __UCLIBC_CTYPE_TOLOWER	(*__ctype_tolower_loc())
@@ -121,8 +127,11 @@ extern __const __ctype_touplow_t **__ctype_toupper_loc (void)
 
 /* Pointers to the current global locale data in use. */
 extern const __ctype_mask_t *__ctype_b;
+libc_hidden_proto(__ctype_b)
 extern const __ctype_touplow_t *__ctype_toupper;
+libc_hidden_proto(__ctype_toupper)
 extern const __ctype_touplow_t *__ctype_tolower;
+libc_hidden_proto(__ctype_tolower)
 
 #define __UCLIBC_CTYPE_B	(__ctype_b)
 #define __UCLIBC_CTYPE_TOLOWER	(__ctype_tolower)
diff --git a/include/stdio.h b/include/stdio.h
index f14016aa1..feb544de7 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -197,6 +197,7 @@ __BEGIN_NAMESPACE_STD
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern int fclose (FILE *__stream);
+libc_hidden_proto(fclose)
 /* Flush STREAM, or all streams if STREAM is NULL.
 
    This function is a possible cancellation point and therefore not
@@ -318,6 +319,7 @@ __BEGIN_NAMESPACE_STD
    marked with __THROW.  */
 extern int fprintf (FILE *__restrict __stream,
 		    __const char *__restrict __format, ...);
+libc_hidden_proto(fprintf)
 /* Write formatted output to stdout.
 
    This function is a possible cancellation point and therefore not
diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index 2a0bb84a8..ad9539e82 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -44,9 +44,9 @@
  * all else    -> decimal
  */
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 libc_hidden_proto(inet_aton)
 int inet_aton(const char *cp, struct in_addr *addrptr)
diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 8e19a0f09..914b77c69 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -34,11 +34,11 @@
 libc_hidden_proto(ether_ntoa_r)
 libc_hidden_proto(sprintf)
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
-libc_hidden_proto(__ctype_tolower_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
+/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_b) */
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 
 struct ether_addr *ether_aton_r(const char *asc, struct ether_addr *addr)
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 5e9a075e6..5a6af1b5a 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(inet_network)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index f24d03f0d..5b34d6de6 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -68,7 +68,7 @@ libc_hidden_proto(fopen)
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index 9912fa1df..affdc622f 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -67,7 +67,7 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strpbrk) */
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index b46578388..2c671e9e2 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <netdb.h>
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__h_errno_location)
 
 static const char error_msg[] = "Resolver error";
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index 7e65f8bc2..c5467fcca 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -48,7 +48,7 @@ libc_hidden_proto(bind)
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
 libc_hidden_proto(getsockname)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
 #ifndef __libc_use_alloca
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index e46c9a561..93457e7ae 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -39,9 +39,9 @@
 #include <arpa/inet.h>
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /*
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 793b4a756..c81249f02 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -180,7 +180,7 @@
 libc_hidden_proto(socket)
 /* libc_hidden_proto(close) */
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(random)
 libc_hidden_proto(getservbyport)
 libc_hidden_proto(gethostname)
@@ -211,12 +211,12 @@ libc_hidden_proto(res_init)
 libc_hidden_proto(res_query)
 libc_hidden_proto(res_querydomain)
 libc_hidden_proto(gethostent_r)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__h_errno_location)
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 int __libc_getdomainname(char *name, size_t len);
 libc_hidden_proto(__libc_getdomainname)
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index 186bd130f..fbf44bec2 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -50,7 +50,7 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 349cf8b03..0701d8ef4 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -80,7 +80,7 @@ libc_hidden_proto(setsockopt)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
 libc_hidden_proto(poll)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index d10f015fd..9636f99e6 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -128,15 +128,15 @@ libc_hidden_proto(sigsetmask)
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fclose) */
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__h_errno_location)
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
-libc_hidden_proto(__ctype_tolower_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
+/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_b) */
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 
 libc_hidden_proto(rresvport)
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index ad6e703c4..47226c55f 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -60,7 +60,7 @@ libc_hidden_proto(geteuid)
 libc_hidden_proto(gethostname)
 libc_hidden_proto(fileno)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
 
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 598b0fc72..51b3b764b 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -81,7 +81,7 @@ libc_hidden_proto(poll)
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
 libc_hidden_proto(fputs)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
 /*
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index ffbbd4681..0e008868b 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -80,7 +80,7 @@ libc_hidden_proto(sendto)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
 libc_hidden_proto(fputs)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX
diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index f25cd184b..d00cdfac9 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(abort) */
 
 /* Get the prototype from assert.h as a double-check. */
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index 8afaab3b0..fc779448e 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -36,9 +36,9 @@
 #include <assert.h>
 #include <locale.h>
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
@@ -161,7 +161,7 @@ int CTYPE_NAME(NAME) (int c) \
 #ifdef L___ctype_assert
 #ifdef __UCLIBC_HAS_CTYPE_ENFORCED__
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(abort) */
 
 attribute_hidden void __isctype_assert(int c, int mask)
@@ -277,9 +277,9 @@ IS_FUNC_BODY(xdigit);
 
 #undef tolower
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_tolower_loc)
+/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 libc_hidden_proto(tolower)
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
@@ -324,7 +324,7 @@ weak_alias (tolower_l, __tolower_l)
 
 #undef toupper
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_toupper_loc)
+/* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_toupper)
 #endif
@@ -440,7 +440,7 @@ libc_hidden_def(__ctype_b_loc)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
-libc_hidden_proto(__ctype_tolower_loc)
+/* libc_hidden_proto(__ctype_tolower_loc) */
 const __ctype_touplow_t **__ctype_tolower_loc(void)
 {
 	return &(__UCLIBC_CURLOCALE_DATA).__ctype_tolower;
@@ -455,7 +455,7 @@ libc_hidden_def(__ctype_tolower_loc)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
-libc_hidden_proto(__ctype_toupper_loc)
+/* libc_hidden_proto(__ctype_toupper_loc) */
 const __ctype_touplow_t **__ctype_toupper_loc(void)
 {
 	return &(__UCLIBC_CURLOCALE_DATA).__ctype_toupper;
@@ -860,7 +860,7 @@ const __ctype_mask_t __C_ctype_b_data[] = {
 };
 libc_hidden_data_def(__C_ctype_b_data)
 
-libc_hidden_proto(__C_ctype_b)
+/* libc_hidden_proto(__C_ctype_b) */
 const __ctype_mask_t *__C_ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_b)
 
@@ -979,14 +979,14 @@ const __ctype_touplow_t __C_ctype_tolower_data[] = {
 };
 libc_hidden_data_def(__C_ctype_tolower_data)
 
-libc_hidden_proto(__C_ctype_tolower)
+/* libc_hidden_proto(__C_ctype_tolower) */
 const __ctype_touplow_t *__C_ctype_tolower = __C_ctype_tolower_data
 											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_tolower)
 
 #ifndef __UCLIBC_HAS_XLOCALE__
 
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_tolower) */
 const __ctype_touplow_t *__ctype_tolower = __C_ctype_tolower_data
 											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_tolower)
@@ -1101,7 +1101,7 @@ const __ctype_touplow_t __C_ctype_toupper_data[] = {
 };
 libc_hidden_data_def(__C_ctype_toupper_data)
 
-libc_hidden_proto(__C_ctype_toupper)
+/* libc_hidden_proto(__C_ctype_toupper) */
 const __ctype_touplow_t *__C_ctype_toupper = __C_ctype_toupper_data
 											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_toupper)
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index ce20003f5..517e08630 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -26,7 +26,7 @@ libc_hidden_proto(vwarnx)
 libc_hidden_proto(verr)
 libc_hidden_proto(verrx)
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(vfprintf)
 libc_hidden_proto(__xpg_strerror_r)
 /* libc_hidden_proto(exit) */
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index fa3f3c4ab..c0f8f8d0a 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -28,7 +28,7 @@
 
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strerror) */
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(exit) */
 libc_hidden_proto(putc)
 libc_hidden_proto(vfprintf)
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 8592d4cf6..351abaf73 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -65,11 +65,11 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcoll) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
-libc_hidden_proto(__ctype_tolower_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
+/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_b) */
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 libc_hidden_proto(tolower)
 libc_hidden_proto(fnmatch)
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index df29ce730..d8c539728 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -68,7 +68,7 @@
 /* Experimentally off - libc_hidden_proto(strchr) */
 libc_hidden_proto(getenv)
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__C_ctype_toupper)
+/* libc_hidden_proto(__C_ctype_toupper) */
 #endif
 /*libc_hidden_proto(fflush)*/
 
@@ -364,11 +364,11 @@ libc_hidden_def(localeconv)
 /**********************************************************************/
 #if defined(L__locale_init) && !defined(__LOCALE_C_ONLY)
 
-libc_hidden_proto(__C_ctype_b)
-libc_hidden_proto(__C_ctype_tolower)
+/* libc_hidden_proto(__C_ctype_b) */
+/* libc_hidden_proto(__C_ctype_tolower) */
 #ifndef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b)
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_b) */
+/* libc_hidden_proto(__ctype_tolower) */
 libc_hidden_proto(__ctype_toupper)
 #endif
 
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index 22acbdd5e..a81a877bf 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -20,11 +20,11 @@ libc_hidden_proto(endmntent)
 /* Experimentally off - libc_hidden_proto(strtok_r) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(fseek)
 libc_hidden_proto(fgets)
 /* libc_hidden_proto(abort) */
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 /* Reentrant version of getmntent.  */
 struct mntent *getmntent_r (FILE *filep,
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index cf0ed62b7..80c95bba1 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -67,10 +67,10 @@ libc_hidden_proto(wctype)
 #endif
 #define __mempcpy mempcpy
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
-libc_hidden_proto(__ctype_toupper_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
+/* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 libc_hidden_proto(__ctype_toupper)
 #else
 libc_hidden_proto(isascii)
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index a53580911..13d62ad1b 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -183,9 +183,9 @@ libc_hidden_proto(nl_langinfo)
 libc_hidden_proto(strtol_l)
 libc_hidden_proto(strtoul_l)
 libc_hidden_proto(nl_langinfo_l)
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifndef __isleap
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index fb2b88591..059835d2e 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -47,12 +47,12 @@ libc_hidden_proto(fgets_unlocked)
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 static char zapchar;
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c
index 25419b500..5dd9a0764 100644
--- a/libc/misc/wctype/_wctype.c
+++ b/libc/misc/wctype/_wctype.c
@@ -56,12 +56,12 @@ libc_hidden_proto(towupper_l)
 libc_hidden_proto(towctrans_l)
 libc_hidden_proto(iswctype_l)
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__C_ctype_tolower)
-libc_hidden_proto(__C_ctype_toupper)
+/* libc_hidden_proto(__C_ctype_tolower) */
+/* libc_hidden_proto(__C_ctype_toupper) */
 #endif
 
 /* We know wide char support is enabled.  We wouldn't be here otherwise. */
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index cfddcba5c..05a2f0b46 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -63,15 +63,15 @@ libc_hidden_proto(read)
 libc_hidden_proto(getenv)
 libc_hidden_proto(getpid)
 libc_hidden_proto(sprintf)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(abort) */
 libc_hidden_proto(glob)
 libc_hidden_proto(globfree)
 libc_hidden_proto(wordfree)
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #define __WORDEXP_FULL
diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c
index 5af1f0c15..14c16604b 100644
--- a/libc/pwd_grp/pwd_grp.c
+++ b/libc/pwd_grp/pwd_grp.c
@@ -46,12 +46,12 @@ libc_hidden_proto(fgets_unlocked)
 libc_hidden_proto(__fputc_unlocked)
 libc_hidden_proto(sprintf)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fclose) */
+/* libc_hidden_proto(fprintf) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /**********************************************************************/
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 3b004d5f0..5b9e7008a 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -84,7 +84,7 @@
 libc_hidden_proto(ungetc)
 libc_hidden_proto(vfscanf)
 libc_hidden_proto(vsscanf)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
 #ifdef __UCLIBC_HAS_WCHAR__
@@ -99,9 +99,9 @@ libc_hidden_proto(iswspace)
 libc_hidden_proto(fgetwc_unlocked)
 #endif
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index 604e73c3b..9d7f99cad 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -729,9 +729,9 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs)
 #ifdef L__ppfs_parsespec
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /* Notes: argtype differs from glibc for the following:
@@ -1860,7 +1860,7 @@ static int _do_one_spec(FILE * __restrict stream,
 	return 0;
 }
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 int VFPRINTF_internal (FILE * __restrict stream,
 			  const FMT_TYPE * __restrict format,
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index 45a614351..eadfe74de 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -6,7 +6,7 @@
  */
 
 #include "_stdio.h"
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 /* libc_hidden_proto(close) */
 libc_hidden_proto(fflush_unlocked)
diff --git a/libc/stdio/fcloseall.c b/libc/stdio/fcloseall.c
index d3cbb67f8..b13da31a1 100644
--- a/libc/stdio/fcloseall.c
+++ b/libc/stdio/fcloseall.c
@@ -10,7 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 /* NOTE: GLIBC difference!!! -- fcloseall
  * According to the info pages, glibc actually fclose()s all open files.
diff --git a/libc/stdio/fprintf.c b/libc/stdio/fprintf.c
index 4f73441e1..b10340f65 100644
--- a/libc/stdio/fprintf.c
+++ b/libc/stdio/fprintf.c
@@ -10,7 +10,7 @@
 
 libc_hidden_proto(vfprintf)
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/freopen.c b/libc/stdio/freopen.c
index 942a67991..d51a549b9 100644
--- a/libc/stdio/freopen.c
+++ b/libc/stdio/freopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 #ifndef __DO_LARGEFILE
 # define FILEDES_ARG    (-1)
diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c
index 993fcf428..46881ea85 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__glibc_strerror_r)
 
 #ifdef __UCLIBC_MJN3_ONLY__
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index 4fd25072a..fc6979375 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -34,7 +34,7 @@ libc_hidden_proto(dup2)
 libc_hidden_proto(fdopen)
 libc_hidden_proto(pipe)
 libc_hidden_proto(vfork)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index b7e2e0852..98ca6c2a7 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -24,7 +24,7 @@
 
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 libc_hidden_proto(open_memstream)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(vfprintf)
 #else
 libc_hidden_proto(vsnprintf)
diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c
index 1b2adc986..3ceadce76 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -176,10 +176,10 @@ extern void __fp_range_check(__fpmax_t y, __fpmax_t x) attribute_hidden;
 #if defined(L___strtofpmax) || defined(L___strtofpmax_l) || defined(L___wcstofpmax) || defined(L___wcstofpmax_l)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_b) */
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 
 #if defined(L___wcstofpmax) || defined(L___wcstofpmax_l)
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index 18331010a..d3b613576 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -16,7 +16,7 @@
 
 #include "malloc.h"
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 /* ------------------------------ mallinfo ------------------------------ */
 libc_hidden_proto(mallinfo)
diff --git a/libc/stdlib/malloc/heap_debug.c b/libc/stdlib/malloc/heap_debug.c
index 59a1780cd..f51a68b57 100644
--- a/libc/stdlib/malloc/heap_debug.c
+++ b/libc/stdlib/malloc/heap_debug.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 libc_hidden_proto(vfprintf)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(_exit)
 
 #include "malloc.h"
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index 3c74be71a..aa55d12d6 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -501,9 +501,9 @@ unsigned long attribute_hidden _stdlib_strto_l(register const Wchar * __restrict
  * strtoul (sflag = 0). */
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar * __restrict str,
@@ -653,7 +653,7 @@ unsigned long long attribute_hidden _stdlib_strto_ll(register const Wchar * __re
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 /* This is the main work fuction which handles both strtoll (sflag = 1) and
  * strtoull (sflag = 0). */
diff --git a/libc/string/psignal.c b/libc/string/psignal.c
index 1ca8725db..e4498528a 100644
--- a/libc/string/psignal.c
+++ b/libc/string/psignal.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <signal.h>
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 /* Experimentally off - libc_hidden_proto(strsignal) */
 
 /* TODO: make this threadsafe with a reentrant version of strsignal? */
diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index f9852236b..5f2dc8e04 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -31,7 +31,7 @@ libc_hidden_proto(tolower_l)
 #  define TOLOWER(C) tolower_l((C), locale_arg)
 # else
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 libc_hidden_proto(tolower)
 #  define TOLOWER(C) tolower((C))
diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c
index 2671b4b98..143392d3a 100644
--- a/libc/string/strcasestr.c
+++ b/libc/string/strcasestr.c
@@ -9,9 +9,9 @@
 #include <ctype.h>
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_tolower_loc)
+/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 libc_hidden_proto(tolower)
 
diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index ed052fa21..83efd85a7 100644
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -31,7 +31,7 @@ libc_hidden_proto(tolower_l)
 #  define TOLOWER(C) tolower_l((C), locale_arg)
 # else
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_tolower)
+/* libc_hidden_proto(__ctype_tolower) */
 #endif
 libc_hidden_proto(tolower)
 #  define TOLOWER(C) tolower((C))
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index a2082a0f0..6a020365e 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -52,10 +52,10 @@ libc_hidden_proto(readlink)
 libc_hidden_proto(mmap)
 libc_hidden_proto(sscanf)
 libc_hidden_proto(fscanf)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(fgets)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 libc_hidden_proto(open)
 /* libc_hidden_proto(close) */
diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c
index c22dd9ffb..fc8e32111 100644
--- a/libc/unistd/getopt-susv3.c
+++ b/libc/unistd/getopt-susv3.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <getopt.h>
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 /* Experimentally off - libc_hidden_proto(strchr) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index ac005e4f8..cdd0c2029 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -126,7 +126,7 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
 libc_hidden_proto(getenv)
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
diff --git a/libc/unistd/getpass.c b/libc/unistd/getpass.c
index d1100b308..deaab122a 100644
--- a/libc/unistd/getpass.c
+++ b/libc/unistd/getpass.c
@@ -28,7 +28,7 @@ libc_hidden_proto(tcsetattr)
 libc_hidden_proto(tcgetattr)
 libc_hidden_proto(setvbuf)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(fileno)
 libc_hidden_proto(fflush)
 libc_hidden_proto(fgets)
diff --git a/libc/unistd/usershell.c b/libc/unistd/usershell.c
index 1bf143daf..219e3fdc8 100644
--- a/libc/unistd/usershell.c
+++ b/libc/unistd/usershell.c
@@ -44,14 +44,14 @@
 
 libc_hidden_proto(fstat)
 libc_hidden_proto(fopen)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(__fsetlocking)
 libc_hidden_proto(fileno)
 libc_hidden_proto(fgets_unlocked)
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /*