trim Experimentally off and uncommented hidden

sed -i -e '/Experimentally off - /d' $(grep -rl "Experimentally off - " *) sed -i -e '/^\/\*[[:space:]]*libc_hidden_proto(/d' $(grep -rl "libc_hidden_proto" *) should be a nop Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 2009-09-18 20:57:40 +0200
committer: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 2009-09-18 20:57:40 +0200
commit: 21730caa6647f645974e132ca8afec79b4eeab2b (patch)
tree: 6c0a0e491526f19ab08062d7f22448ac60ca4bf5 /libc
parent: 35c8387f6d3dd3d901bdc9bb7eb1c681cd1b2c0d (diff)
482 files changed, 7 insertions, 1837 deletions
diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index b371fa9ae..8bef59ffa 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -44,11 +44,8 @@
  * all else    -> decimal
  */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
-/* libc_hidden_proto(inet_aton) */
 int inet_aton(const char *cp, struct in_addr *addrptr)
 {
 	in_addr_t addr;
@@ -103,9 +100,7 @@ libc_hidden_def(inet_aton)
 #endif
 
 #ifdef L_inet_addr
-/* libc_hidden_proto(inet_aton) */
 
-/* libc_hidden_proto(inet_addr) */
 in_addr_t inet_addr(const char *cp)
 {
 	struct in_addr a;
@@ -122,7 +117,6 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
-/* libc_hidden_proto(inet_ntoa_r) */
 char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 {
 	in_addr_t addr = ntohl(in.s_addr);
@@ -144,7 +138,6 @@ char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 }
 libc_hidden_def(inet_ntoa_r)
 
-/* libc_hidden_proto(inet_ntoa) */
 char *inet_ntoa(struct in_addr in)
 {
 	static char buf[INET_NTOA_MAX_LEN];
@@ -156,13 +149,11 @@ libc_hidden_def(inet_ntoa)
 #ifdef L_inet_makeaddr
 
 /* for some reason it does not remove the jump relocation */
-/* Experimentally off - libc_hidden_proto(memmove) */
 
 /*
  * Formulate an Internet address from network + host.  Used in
  * building addresses stored in the ifnet structure.
  */
-/* libc_hidden_proto(inet_makeaddr) */
 struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
 {
 	in_addr_t addr;
@@ -206,7 +197,6 @@ in_addr_t inet_lnaof(struct in_addr in)
  * Return the network number from an internet
  * address; handles class a/b/c network #'s.
  */
-/* libc_hidden_proto(inet_netof) */
 in_addr_t
 inet_netof(struct in_addr in)
 {
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 2839bdaf4..a9fe3c884 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -70,26 +70,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <net/if.h>
 #include <ifaddrs.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(stpcpy) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getservbyname_r) */
-/* libc_hidden_proto(gethostbyname2_r) */
-/* libc_hidden_proto(gethostbyaddr_r) */
-/* libc_hidden_proto(inet_pton) */
-/* libc_hidden_proto(inet_ntop) */
-/* libc_hidden_proto(strtoul) */
-/* libc_hidden_proto(if_nametoindex) */
-/* libc_hidden_proto(__h_errno_location) */
-/* libc_hidden_proto(uname) */
 #ifdef __UCLIBC_HAS_IPV6__
-/* libc_hidden_proto(in6addr_loopback) */
 #endif
 
 #define GAIH_OKIFUNSPEC 0x0100
@@ -783,7 +764,6 @@ static const struct gaih gaih[] = {
 	{ PF_UNSPEC, NULL }
 };
 
-/* libc_hidden_proto(freeaddrinfo) */
 void
 freeaddrinfo(struct addrinfo *ai)
 {
@@ -797,7 +777,6 @@ freeaddrinfo(struct addrinfo *ai)
 }
 libc_hidden_def(freeaddrinfo)
 
-/* libc_hidden_proto(getaddrinfo) */
 int
 getaddrinfo(const char *name, const char *service,
 	     const struct addrinfo *hints, struct addrinfo **pai)
diff --git a/libc/inet/getnetbyad.c b/libc/inet/getnetbyad.c
index 735005a62..a4af1a844 100644
--- a/libc/inet/getnetbyad.c
+++ b/libc/inet/getnetbyad.c
@@ -20,9 +20,6 @@
 #include <netdb.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setnetent) */
-/* libc_hidden_proto(getnetent) */
-/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetbynm.c b/libc/inet/getnetbynm.c
index d3f283106..eab04045b 100644
--- a/libc/inet/getnetbynm.c
+++ b/libc/inet/getnetbynm.c
@@ -21,10 +21,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(setnetent) */
-/* libc_hidden_proto(getnetent) */
-/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 746f8b704..e9b45ba7e 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -23,12 +23,6 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(inet_network) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -44,7 +38,6 @@ static char *net_aliases[MAXALIASES];
 
 smallint _net_stayopen attribute_hidden;
 
-/* libc_hidden_proto(setnetent) */
 void setnetent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -58,7 +51,6 @@ void setnetent(int f)
 }
 libc_hidden_def(setnetent)
 
-/* libc_hidden_proto(endnetent) */
 void endnetent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -84,7 +76,6 @@ static char * any(register char *cp, char *match)
     return ((char *)0);
 }
 
-/* libc_hidden_proto(getnetent) */
 struct netent *getnetent(void)
 {
     char *p;
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index 837f1315f..c297a6549 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -62,14 +62,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fopen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -93,7 +85,6 @@ static void __initbuf(void)
     }
 }
 
-/* libc_hidden_proto(setprotoent) */
 void setprotoent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -106,7 +97,6 @@ void setprotoent(int f)
 }
 libc_hidden_def(setprotoent)
 
-/* libc_hidden_proto(endprotoent) */
 void endprotoent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -119,7 +109,6 @@ void endprotoent(void)
 }
 libc_hidden_def(endprotoent)
 
-/* libc_hidden_proto(getprotoent_r) */
 int getprotoent_r(struct protoent *result_buf,
 		  char *buf, size_t buflen,
 		  struct protoent **result)
@@ -210,7 +199,6 @@ struct protoent * getprotoent(void)
 }
 
 
-/* libc_hidden_proto(getprotobyname_r) */
 int getprotobyname_r(const char *name,
 		    struct protoent *result_buf,
 		    char *buf, size_t buflen,
@@ -247,7 +235,6 @@ struct protoent * getprotobyname(const char *name)
 }
 
 
-/* libc_hidden_proto(getprotobynumber_r) */
 int getprotobynumber_r (int proto_num,
 			struct protoent *result_buf,
 			char *buf, size_t buflen,
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index 904f0b79c..6d80a1b07 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -64,14 +64,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -96,7 +88,6 @@ static void __initbuf(void)
     }
 }
 
-/* libc_hidden_proto(setservent) */
 void setservent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -109,7 +100,6 @@ void setservent(int f)
 }
 libc_hidden_def(setservent)
 
-/* libc_hidden_proto(endservent) */
 void endservent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -122,7 +112,6 @@ void endservent(void)
 }
 libc_hidden_def(endservent)
 
-/* libc_hidden_proto(getservent_r) */
 int getservent_r(struct servent * result_buf,
 		 char * buf, size_t buflen,
 		 struct servent ** result)
@@ -213,7 +202,6 @@ struct servent * getservent(void)
     return result;
 }
 
-/* libc_hidden_proto(getservbyname_r) */
 int getservbyname_r(const char *name, const char *proto,
 	struct servent * result_buf, char * buf, size_t buflen,
 	struct servent ** result)
@@ -251,7 +239,6 @@ struct servent *getservbyname(const char *name, const char *proto)
 }
 
 
-/* libc_hidden_proto(getservbyport_r) */
 int getservbyport_r(int port, const char *proto,
 	struct servent * result_buf, char * buf,
 	size_t buflen, struct servent ** result)
@@ -273,7 +260,6 @@ int getservbyport_r(int port, const char *proto,
 }
 libc_hidden_def(getservbyport_r)
 
-/* libc_hidden_proto(getservbyport) */
 struct servent * getservbyport(int port, const char *proto)
 {
     struct servent *result;
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index 8f993a78c..a1f94ad64 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -23,8 +23,6 @@
 #include <string.h>
 #include <netdb.h>
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__h_errno_location) */
 
 static const char error_msg[] = "Resolver error";
 static const char *const h_errlist[] = {
@@ -39,7 +37,6 @@ static const int h_nerr = { sizeof(h_errlist)/sizeof(h_errlist[0]) };
 /*
  * herror -- print the error indicated by the h_errno value.
  */
-/* libc_hidden_proto(herror) */
 void herror(const char *s)
 {
 	static const char colon_space[] = ": ";
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index cadcd1b28..99346d7f8 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -15,15 +15,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(gethostname) */
 
 #define HOSTID "/etc/hostid"
 
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 090b52a15..36012975f 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -37,7 +37,6 @@
 
 extern int __opensock(void) attribute_hidden;
 
-/* libc_hidden_proto(if_nametoindex) */
 unsigned int
 if_nametoindex(const char* ifname)
 {
@@ -68,7 +67,6 @@ if_nametoindex(const char* ifname)
 }
 libc_hidden_def(if_nametoindex)
 
-/* libc_hidden_proto(if_freenameindex) */
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
@@ -82,7 +80,6 @@ if_freenameindex (struct if_nameindex *ifn)
 }
 libc_hidden_def(if_freenameindex)
 
-/* libc_hidden_proto(if_nameindex) */
 #if !__ASSUME_NETLINK_SUPPORT
 struct if_nameindex *
 if_nameindex (void)
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index 77ca7ce02..3b8b674c2 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -39,17 +39,6 @@
 
 #include "netlinkaccess.h"
 
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* Experimentally off - libc_hidden_proto(time) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* 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(abort) */
 
 #ifndef __libc_use_alloca
 # define __libc_use_alloca(x) (x < __MAX_ALLOCA_CUTOFF)
diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c
index eb096f9e3..321a9f66a 100644
--- a/libc/inet/in6_addr.c
+++ b/libc/inet/in6_addr.c
@@ -24,7 +24,6 @@
 #ifdef __UCLIBC_HAS_IPV6__
 const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-/* libc_hidden_proto(in6addr_loopback) */
 const struct in6_addr in6addr_loopback =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
 libc_hidden_data_def(in6addr_loopback)
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 477d67dc9..6bade8aee 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -39,9 +39,7 @@
 #include <arpa/inet.h>
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /*
@@ -49,7 +47,6 @@
  * The library routines call this routine to interpret
  * network numbers.
  */
-/* libc_hidden_proto(inet_network) */
 in_addr_t
 inet_network(const char *cp)
 {
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index 4583fc47f..57a0b8ccd 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -30,13 +30,6 @@
 #include <string.h>
 #include <ctype.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(tolower) */
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
@@ -352,7 +345,6 @@ inet_pton6(const char *src, u_char *dst)
  * author:
  *	Paul Vixie, 1996.
  */
-/* libc_hidden_proto(inet_ntop) */
 const char *
 inet_ntop(int af, const void *src, char *dst, socklen_t size)
 {
@@ -383,7 +375,6 @@ libc_hidden_def(inet_ntop)
  * author:
  *	Paul Vixie, 1996.
  */
-/* libc_hidden_proto(inet_pton) */
 int
 inet_pton(int af, const char *src, void *dst)
 {
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 478315b8f..c48bbfea9 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -39,8 +39,6 @@
 #include <features.h>
 #include "rpc_private.h"
 
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_opaque_auth) */
 
 #define MAX_MARSHAL_SIZE 20
 
@@ -74,7 +72,6 @@ struct authnone_private_s {
 static struct authnone_private_s *authnone_private;
 #endif
 
-/* libc_hidden_proto(authnone_create) */
 AUTH *
 authnone_create (void)
 {
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 9f5d8b4d7..f71a426f8 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -56,21 +56,7 @@
 # include <wchar.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(getgroups) */
-/* libc_hidden_proto(gethostname) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_authunix_parms) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(gettimeofday) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(abort) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 /*
@@ -109,7 +95,6 @@ static bool_t marshal_new_auth (AUTH *) internal_function;
  * Create a unix style authenticator.
  * Returns an auth handle with the given stuff in it.
  */
-/* libc_hidden_proto(authunix_create) */
 AUTH *
 authunix_create (char *machname, uid_t uid, gid_t gid, int len,
 		 gid_t *aup_gids)
@@ -182,7 +167,6 @@ libc_hidden_def(authunix_create)
  * Returns an auth handle with parameters determined by doing lots of
  * syscalls.
  */
-/* libc_hidden_proto(authunix_create_default) */
 AUTH *
 authunix_create_default (void)
 {
diff --git a/libc/inet/rpc/authunix_prot.c b/libc/inet/rpc/authunix_prot.c
index 2739e7658..272990056 100644
--- a/libc/inet/rpc/authunix_prot.c
+++ b/libc/inet/rpc/authunix_prot.c
@@ -39,17 +39,11 @@
 #include <rpc/auth.h>
 #include <rpc/auth_unix.h>
 
-/* libc_hidden_proto(xdr_string) */
-/* libc_hidden_proto(xdr_u_int) */
-/* libc_hidden_proto(xdr_array) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_u_short) */
 
 /*
  * XDR for unix authentication parameters.
  * Unfortunately, none of these can be declared const.
  */
-/* libc_hidden_proto(xdr_authunix_parms) */
 bool_t
 xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
 {
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index b9e77f3cd..fc077af67 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -40,14 +40,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
  */
-/* libc_hidden_proto(bindresvport) */
 int
 bindresvport (int sd, struct sockaddr_in *sin)
 {
diff --git a/libc/inet/rpc/clnt_generic.c b/libc/inet/rpc/clnt_generic.c
index 165f42aeb..8aeae1ec4 100644
--- a/libc/inet/rpc/clnt_generic.c
+++ b/libc/inet/rpc/clnt_generic.c
@@ -40,16 +40,6 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* libc_hidden_proto(clnttcp_create) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(clntunix_create) */
-/* libc_hidden_proto(getprotobyname_r) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index 201a3a353..b3aedc558 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -51,13 +51,7 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
@@ -186,7 +180,6 @@ static const struct rpc_errtab rpc_errlist[] =
 /*
  * This interface for use by clntrpc
  */
-/* libc_hidden_proto(clnt_sperrno) */
 char *
 clnt_sperrno (enum clnt_stat stat)
 {
@@ -217,7 +210,6 @@ clnt_perrno (enum clnt_stat num)
 /*
  * Print reply error info
  */
-/* libc_hidden_proto(clnt_sperror) */
 char *
 clnt_sperror (CLIENT * rpch, const char *msg)
 {
@@ -303,7 +295,6 @@ clnt_sperror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_sperror)
 
-/* libc_hidden_proto(clnt_perror) */
 void
 clnt_perror (CLIENT * rpch, const char *msg)
 {
@@ -316,7 +307,6 @@ clnt_perror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_perror)
 
-/* libc_hidden_proto(clnt_spcreateerror) */
 char *
 clnt_spcreateerror (const char *msg)
 {
diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c
index 792796a5f..4c4c8251d 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -48,14 +48,6 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/svc.h>
 #include <rpc/xdr.h>
 
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(svc_getreq) */
-/* libc_hidden_proto(_seterr_reply) */
 
 #define MCALL_MSG_SIZE 24
 
diff --git a/libc/inet/rpc/clnt_simple.c b/libc/inet/rpc/clnt_simple.c
index 938a4d621..f66228a5f 100644
--- a/libc/inet/rpc/clnt_simple.c
+++ b/libc/inet/rpc/clnt_simple.c
@@ -50,12 +50,6 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strncpy) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(gethostbyname_r) */
 
 struct callrpc_private_s
   {
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 42bef0793..a6d4fbd42 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -65,28 +65,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 # include <wchar.h>
 #endif
 
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 extern u_long _create_xid (void) attribute_hidden;
@@ -141,7 +120,6 @@ static const struct clnt_ops tcp_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-/* libc_hidden_proto(clnttcp_create) */
 CLIENT *
 clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
 		int *sockp, u_int sendsz, u_int recvsz)
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index e7e816c39..ff04cbba5 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -54,7 +54,6 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <net/if.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 #ifdef IP_RECVERR
@@ -62,28 +61,8 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/uio.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
-/* libc_hidden_proto(__cmsg_nxthdr) */
-
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
+
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -144,7 +123,6 @@ struct cu_data
  * sendsz and recvsz are the maximum allowable packet sizes that can be
  * sent and received.
  */
-/* libc_hidden_proto(clntudp_bufcreate) */
 CLIENT *
 clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
 		   struct timeval wait, int *sockp, u_int sendsz,
@@ -245,7 +223,6 @@ fooy:
 }
 libc_hidden_def(clntudp_bufcreate)
 
-/* libc_hidden_proto(clntudp_create) */
 CLIENT *
 clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version, struct timeval wait, int *sockp)
 {
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 3a1e13c05..f66ce66e2 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -60,33 +60,8 @@
 #include <rpc/pmap_clnt.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -140,7 +115,6 @@ static const struct clnt_ops unix_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-/* libc_hidden_proto(clntunix_create) */
 CLIENT *
 clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
 		 int *sockp, u_int sendsz, u_int recvsz)
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index 0f045b9c1..3b4e8c08d 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -25,9 +25,6 @@
 #include <sys/time.h>
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(lrand48_r) */
-/* libc_hidden_proto(srand48_r) */
-/* libc_hidden_proto(gettimeofday) */
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
 
diff --git a/libc/inet/rpc/get_myaddress.c b/libc/inet/rpc/get_myaddress.c
index 0006be803..ab4ac3345 100644
--- a/libc/inet/rpc/get_myaddress.c
+++ b/libc/inet/rpc/get_myaddress.c
@@ -50,11 +50,6 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(exit) */
 
 /*
  * don't use gethostbyname, which would invoke yellow pages
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index 7ba4e65c5..de20d64d4 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -44,16 +44,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
 
 /*
  * Internet version.
@@ -84,7 +74,6 @@ static struct rpcdata *_rpcdata(void)
 	return d;
 }
 
-/* libc_hidden_proto(endrpcent) */
 void endrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -102,7 +91,6 @@ void endrpcent(void)
 }
 libc_hidden_def(endrpcent)
 
-/* libc_hidden_proto(setrpcent) */
 void setrpcent(int f)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -128,7 +116,6 @@ static struct rpcent *__get_next_rpcent(struct rpcdata *d)
 	return interpret(d);
 }
 
-/* libc_hidden_proto(getrpcent) */
 struct rpcent *getrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -141,7 +128,6 @@ struct rpcent *getrpcent(void)
 }
 libc_hidden_def(getrpcent)
 
-/* libc_hidden_proto(getrpcbynumber) */
 struct rpcent *getrpcbynumber(register int number)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -159,7 +145,6 @@ struct rpcent *getrpcbynumber(register int number)
 }
 libc_hidden_def(getrpcbynumber)
 
-/* libc_hidden_proto(getrpcbyname) */
 struct rpcent *getrpcbyname(const char *name)
 {
 	struct rpcent *rpc;
diff --git a/libc/inet/rpc/getrpcport.c b/libc/inet/rpc/getrpcport.c
index d831e6719..9c4f443e4 100644
--- a/libc/inet/rpc/getrpcport.c
+++ b/libc/inet/rpc/getrpcport.c
@@ -48,9 +48,6 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(gethostbyname_r) */
 
 int
 getrpcport (const char *host, u_long prognum, u_long versnum, u_int proto)
diff --git a/libc/inet/rpc/pm_getmaps.c b/libc/inet/rpc/pm_getmaps.c
index bcdbbf4e0..e7b97e631 100644
--- a/libc/inet/rpc/pm_getmaps.c
+++ b/libc/inet/rpc/pm_getmaps.c
@@ -48,11 +48,6 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(clnt_perror) */
-/* libc_hidden_proto(clnttcp_create) */
-/* libc_hidden_proto(xdr_pmap) */
-/* libc_hidden_proto(xdr_pmaplist) */
-/* libc_hidden_proto(xdr_void) */
 
 /*
  * Get a copy of the current port maps.
diff --git a/libc/inet/rpc/pm_getport.c b/libc/inet/rpc/pm_getport.c
index fa9780c22..712ba2a8e 100644
--- a/libc/inet/rpc/pm_getport.c
+++ b/libc/inet/rpc/pm_getport.c
@@ -44,10 +44,6 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-/* libc_hidden_proto(clntudp_bufcreate) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
-/* libc_hidden_proto(xdr_u_short) */
-/* libc_hidden_proto(xdr_pmap) */
 
 static const struct timeval timeout =
 {5, 0};
@@ -59,7 +55,6 @@ static const struct timeval tottimeout =
  * Calls the pmap service remotely to do the lookup.
  * Returns 0 if no map exists.
  */
-/* libc_hidden_proto(pmap_getport) */
 u_short
 pmap_getport (address, program, version, protocol)
      struct sockaddr_in *address;
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index 948d9dc2e..c35a2e97f 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -48,15 +48,6 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(clnt_perror) */
-/* libc_hidden_proto(clntudp_bufcreate) */
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * Same as get_myaddress, but we try to use the loopback
@@ -122,7 +113,6 @@ static const struct timeval tottimeout = {60, 0};
  * Set a mapping between program,version and port.
  * Calls the pmap service remotely to do the mapping.
  */
-/* libc_hidden_proto(pmap_set) */
 bool_t
 pmap_set (u_long program, u_long version, int protocol, u_short port)
 {
@@ -159,7 +149,6 @@ libc_hidden_def (pmap_set)
  * Remove the mapping between program,version and port.
  * Calls the pmap service remotely to do the un-mapping.
  */
-/* libc_hidden_proto(pmap_unset) */
 bool_t
 pmap_unset (u_long program, u_long version)
 {
diff --git a/libc/inet/rpc/pmap_prot.c b/libc/inet/rpc/pmap_prot.c
index a5c4d166b..c2081f9cf 100644
--- a/libc/inet/rpc/pmap_prot.c
+++ b/libc/inet/rpc/pmap_prot.c
@@ -42,9 +42,7 @@ static char sccsid[] = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-/* libc_hidden_proto(xdr_u_long) */
 
-/* libc_hidden_proto(xdr_pmap) */
 bool_t
 xdr_pmap (xdrs, regs)
      XDR *xdrs;
diff --git a/libc/inet/rpc/pmap_prot2.c b/libc/inet/rpc/pmap_prot2.c
index 21def3c4f..5492fc13e 100644
--- a/libc/inet/rpc/pmap_prot2.c
+++ b/libc/inet/rpc/pmap_prot2.c
@@ -42,9 +42,6 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(xdr_reference) */
-/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * What is going on with linked lists? (!)
@@ -84,7 +81,6 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
  * the net, yet is the data that the pointer points to which is interesting;
  * this sounds like a job for xdr_reference!
  */
-/* libc_hidden_proto(xdr_pmaplist) */
 bool_t
 xdr_pmaplist (xdrs, rp)
      XDR *xdrs;
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index a1f8f71a8..d6e8fcf85 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -59,28 +59,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #include <arpa/inet.h>
 #define MAX_BROADCAST_SIZE 1400
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(authunix_create_default) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_reference) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(xdr_rmtcallres) */
-/* libc_hidden_proto(xdr_rmtcall_args) */
-/* libc_hidden_proto(inet_makeaddr) */
-/* libc_hidden_proto(inet_netof) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(poll) */
-/* 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 17af69ee5..f34e92db6 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -87,59 +87,10 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif
 #include <sys/uio.h>
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(memmove) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(fcntl) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(lstat) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(tolower) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getline) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(seteuid) */
-/* libc_hidden_proto(getpwnam_r) */
-/* libc_hidden_proto(gethostbyname) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(sleep) */
-/* libc_hidden_proto(inet_addr) */
-/* libc_hidden_proto(inet_ntoa) */
-/* libc_hidden_proto(herror) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(sigblock) */
-/* libc_hidden_proto(snprintf) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* 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(__h_errno_location) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* 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) */
 #endif
 
-/* libc_hidden_proto(rresvport) */
 
 /* some forward declarations */
 static int __ivaliduser2(FILE *hostf, u_int32_t raddr,
diff --git a/libc/inet/rpc/rpc_cmsg.c b/libc/inet/rpc/rpc_cmsg.c
index 0d8aac627..a8c257344 100644
--- a/libc/inet/rpc/rpc_cmsg.c
+++ b/libc/inet/rpc/rpc_cmsg.c
@@ -45,17 +45,10 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/param.h>
 #include <rpc/rpc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(xdr_enum) */
-/* libc_hidden_proto(xdr_opaque) */
-/* libc_hidden_proto(xdr_u_int) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_opaque_auth) */
 
 /*
  * XDR a call message
  */
-/* libc_hidden_proto(xdr_callmsg) */
 bool_t
 xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
 {
diff --git a/libc/inet/rpc/rpc_dtablesize.c b/libc/inet/rpc/rpc_dtablesize.c
index fe3d4a39f..692e8fce7 100644
--- a/libc/inet/rpc/rpc_dtablesize.c
+++ b/libc/inet/rpc/rpc_dtablesize.c
@@ -38,13 +38,11 @@ static char sccsid[] = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 #include <unistd.h>
 #include <rpc/clnt.h>
 
-/* libc_hidden_proto(getdtablesize) */
 
 /*
  * Cache the result of getdtablesize(), so we don't have to do an
  * expensive system call every time.
  */
-/* libc_hidden_proto(_rpc_dtablesize) */
 int
 _rpc_dtablesize(void)
 {
diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h
index 24112a468..ede3ddfc0 100644
--- a/libc/inet/rpc/rpc_private.h
+++ b/libc/inet/rpc/rpc_private.h
@@ -4,7 +4,6 @@
 /* Now define the internal interfaces.  */
 extern u_long _create_xid (void) attribute_hidden;
 
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Multi-threaded support
diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c
index ddfabe035..2b1609ea9 100644
--- a/libc/inet/rpc/rpc_prot.c
+++ b/libc/inet/rpc/rpc_prot.c
@@ -51,11 +51,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(xdr_bytes) */
-/* libc_hidden_proto(xdr_union) */
-/* libc_hidden_proto(xdr_enum) */
-/* libc_hidden_proto(xdr_opaque) */
-/* libc_hidden_proto(xdr_u_long) */
 
 /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
 
@@ -63,7 +58,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
  * XDR an opaque authentication struct
  * (see auth.h)
  */
-/* libc_hidden_proto(xdr_opaque_auth) */
 bool_t
 xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
 {
@@ -89,7 +83,6 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
 /*
  * XDR the MSG_ACCEPTED part of a reply message union
  */
-/* libc_hidden_proto(xdr_accepted_reply) */
 bool_t
 xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
 {
@@ -116,7 +109,6 @@ libc_hidden_def(xdr_accepted_reply)
 /*
  * XDR the MSG_DENIED part of a reply message union
  */
-/* libc_hidden_proto(xdr_rejected_reply) */
 bool_t
 xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
 {
@@ -146,7 +138,6 @@ static const struct xdr_discrim reply_dscrm[3] =
 /*
  * XDR a reply message
  */
-/* libc_hidden_proto(xdr_replymsg) */
 bool_t
 xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg)
 {
@@ -166,7 +157,6 @@ libc_hidden_def(xdr_replymsg)
  * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers.
  * The rm_xid is not really static, but the user can easily munge on the fly.
  */
-/* libc_hidden_proto(xdr_callhdr) */
 bool_t
 xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg)
 {
@@ -247,7 +237,6 @@ rejected (enum reject_stat rjct_stat,
 /*
  * given a reply message, fills in the error
  */
-/* libc_hidden_proto(_seterr_reply) */
 void
 _seterr_reply (struct rpc_msg *msg,
 	       struct rpc_err *error)
diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c
index 0e0078c2c..54781d040 100644
--- a/libc/inet/rpc/rpc_thread.c
+++ b/libc/inet/rpc/rpc_thread.c
@@ -10,10 +10,6 @@
 #include <assert.h>
 #include "rpc_private.h"
 
-/* libc_hidden_proto(__rpc_thread_svc_fdset) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index 08bdf9396..f9f1d9e9d 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -58,14 +58,6 @@ static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
 #include <errno.h>
 #include <netinet/in.h>
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(rtime) */
 
 #define NYEARS	(u_long)(1970 - 1900)
 #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 3b0dc924a..c422a0510 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -42,27 +42,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
-/* Experimentally off - libc_hidden_proto(strncasecmp) */
-/* libc_hidden_proto(getenv) */
-/* libc_hidden_proto(printf) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(__fsetlocking) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(gethostname) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #define _(X)  (X)
 /* #include "ftp_var.h" */
@@ -114,7 +93,6 @@ static const struct toktab {
 
 /* ruserpass - remote password check.
    This function also exists in glibc but is undocumented */
-/* libc_hidden_proto(ruserpass) */
 int ruserpass(const char *host, const char **aname, const char **apass)
 {
 	char *hdir, *buf, *tmp;
diff --git a/libc/inet/rpc/svc.c b/libc/inet/rpc/svc.c
index 38811f5b7..0f5300c8b 100644
--- a/libc/inet/rpc/svc.c
+++ b/libc/inet/rpc/svc.c
@@ -46,16 +46,8 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/poll.h>
 
-/* Experimentally off - libc_hidden_proto(ffs) */
-/* libc_hidden_proto(pmap_set) */
-/* libc_hidden_proto(pmap_unset) */
-/* libc_hidden_proto(_authenticate) */
-/* libc_hidden_proto(_rpc_dtablesize) */
 /* used by svc_[max_]pollfd */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 /* used by svc_fdset */
-/* libc_hidden_proto(__rpc_thread_svc_fdset) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 #define xports (*(SVCXPRT ***)&RPC_THREAD_VARIABLE(svc_xports_s))
@@ -85,7 +77,6 @@ static struct svc_callout *svc_head;
 /* ***************  SVCXPRT related stuff **************** */
 
 /* Activate a transport handle. */
-/* libc_hidden_proto(xprt_register) */
 void
 xprt_register (SVCXPRT *xprt)
 {
@@ -129,7 +120,6 @@ xprt_register (SVCXPRT *xprt)
 libc_hidden_def(xprt_register)
 
 /* De-activate a transport handle. */
-/* libc_hidden_proto(xprt_unregister) */
 void
 xprt_unregister (SVCXPRT *xprt)
 {
@@ -175,7 +165,6 @@ done:
 /* Add a service program to the callout list.
    The dispatch routine will be called when a rpc request for this
    program number comes in. */
-/* libc_hidden_proto(svc_register) */
 bool_t
 svc_register (SVCXPRT * xprt, rpcprog_t prog, rpcvers_t vers,
 	      void (*dispatch) (struct svc_req *, SVCXPRT *),
@@ -210,7 +199,6 @@ pmap_it:
 libc_hidden_def(svc_register)
 
 /* Remove a service program from the callout list. */
-/* libc_hidden_proto(svc_unregister) */
 void
 svc_unregister (rpcprog_t prog, rpcvers_t vers)
 {
@@ -235,7 +223,6 @@ libc_hidden_def(svc_unregister)
 /* ******************* REPLY GENERATION ROUTINES  ************ */
 
 /* Send a reply to an rpc request */
-/* libc_hidden_proto(svc_sendreply) */
 bool_t
 svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
 	       caddr_t xdr_location)
@@ -266,7 +253,6 @@ svcerr_noproc (register SVCXPRT *xprt)
 }
 
 /* Can't decode args error reply */
-/* libc_hidden_proto(svcerr_decode) */
 void
 svcerr_decode (register SVCXPRT *xprt)
 {
@@ -294,7 +280,6 @@ svcerr_systemerr (register SVCXPRT *xprt)
 }
 
 /* Authentication error reply */
-/* libc_hidden_proto(svcerr_auth) */
 void
 svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
 {
@@ -316,7 +301,6 @@ svcerr_weakauth (SVCXPRT *xprt)
 }
 
 /* Program unavailable error reply */
-/* libc_hidden_proto(svcerr_noprog) */
 void
 svcerr_noprog (register SVCXPRT *xprt)
 {
@@ -331,7 +315,6 @@ svcerr_noprog (register SVCXPRT *xprt)
 libc_hidden_def(svcerr_noprog)
 
 /* Program version mismatch error reply */
-/* libc_hidden_proto(svcerr_progvers) */
 void
 svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
 		 rpcvers_t high_vers)
@@ -366,7 +349,6 @@ libc_hidden_def(svcerr_progvers)
  * is mallocated in kernel land.
  */
 
-/* libc_hidden_proto(svc_getreq_common) */
 void
 svc_getreq_common (const int fd)
 {
@@ -458,7 +440,6 @@ svc_getreq_common (const int fd)
 }
 libc_hidden_def(svc_getreq_common)
 
-/* libc_hidden_proto(svc_getreqset) */
 void
 svc_getreqset (fd_set *readfds)
 {
@@ -476,7 +457,6 @@ svc_getreqset (fd_set *readfds)
 }
 libc_hidden_def(svc_getreqset)
 
-/* libc_hidden_proto(svc_getreq) */
 void
 svc_getreq (int rdfds)
 {
@@ -488,7 +468,6 @@ svc_getreq (int rdfds)
 }
 libc_hidden_def(svc_getreq)
 
-/* libc_hidden_proto(svc_getreq_poll) */
 void
 svc_getreq_poll (struct pollfd *pfdp, int pollretval)
 {
diff --git a/libc/inet/rpc/svc_auth.c b/libc/inet/rpc/svc_auth.c
index 52208c1ee..ae02a44ba 100644
--- a/libc/inet/rpc/svc_auth.c
+++ b/libc/inet/rpc/svc_auth.c
@@ -101,7 +101,6 @@ svcauthsw[] =
  * There is an assumption that any flavour less than AUTH_NULL is
  * invalid.
  */
-/* libc_hidden_proto(_authenticate) */
 enum auth_stat
 _authenticate (register struct svc_req *rqst, struct rpc_msg *msg)
 {
diff --git a/libc/inet/rpc/svc_authux.c b/libc/inet/rpc/svc_authux.c
index 556cdde30..03ec4d3b8 100644
--- a/libc/inet/rpc/svc_authux.c
+++ b/libc/inet/rpc/svc_authux.c
@@ -46,10 +46,6 @@
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(printf) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_authunix_parms) */
 
 /*
  * Unix longhand authenticator
diff --git a/libc/inet/rpc/svc_raw.c b/libc/inet/rpc/svc_raw.c
index 075fbad95..1fadb3075 100644
--- a/libc/inet/rpc/svc_raw.c
+++ b/libc/inet/rpc/svc_raw.c
@@ -45,9 +45,6 @@ static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 #include "rpc_private.h"
 #include <rpc/svc.h>
 
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
 
 /*
  * This is the "network" that we will be moving data over
diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c
index 49d52d01b..1442cba55 100644
--- a/libc/inet/rpc/svc_run.c
+++ b/libc/inet/rpc/svc_run.c
@@ -39,12 +39,7 @@
 #include <sys/poll.h>
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(svc_getreq_poll) */
-/* libc_hidden_proto(poll) */
 /* used by svc_[max_]pollfd */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 
 /* This function can be used as a signal handler to terminate the
    server loop.  */
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index d50f014a8..dceb6acb7 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -55,18 +55,6 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(asprintf) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(svc_sendreply) */
-/* libc_hidden_proto(svc_register) */
-/* libc_hidden_proto(svcerr_decode) */
-/* libc_hidden_proto(svcudp_create) */
-/* libc_hidden_proto(pmap_unset) */
-/* libc_hidden_proto(xdr_void) */
 
 struct proglst_
   {
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 0e5c5c727..363f20315 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -59,30 +59,6 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdrrec_eof) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for TCP/IP based rpc service handle
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 866e5275a..af0dc9a5a 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -57,30 +57,8 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fprintf) */
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX
@@ -134,7 +112,6 @@ struct svcudp_data
  * see (svc.h, xprt_register).
  * The routines returns NULL if a problem occurred.
  */
-/* libc_hidden_proto(svcudp_bufcreate) */
 SVCXPRT *
 svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 {
@@ -226,7 +203,6 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 }
 libc_hidden_def(svcudp_bufcreate)
 
-/* libc_hidden_proto(svcudp_create) */
 SVCXPRT *
 svcudp_create (int sock)
 {
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 3670bb1ec..61859773d 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -55,33 +55,6 @@
 # include <wchar.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdrrec_eof) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for AF_UNIX based rpc service handle
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index f76cc6a88..78f4d04ba 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -53,11 +53,8 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fputs) */
 
 /*
  * constants specific to the xdr "protocol"
@@ -87,7 +84,6 @@ xdr_free (xdrproc_t proc, char *objp)
 /*
  * XDR nothing
  */
-/* libc_hidden_proto(xdr_void) */
 bool_t
 xdr_void (void)
 {
@@ -100,7 +96,6 @@ libc_hidden_def(xdr_void)
  * The definition of xdr_long() is kept for backward
  * compatibility. Instead xdr_int() should be used.
  */
-/* libc_hidden_proto(xdr_long) */
 bool_t
 xdr_long (XDR *xdrs, long *lp)
 {
@@ -122,7 +117,6 @@ libc_hidden_def(xdr_long)
 /*
  * XDR short integers
  */
-/* libc_hidden_proto(xdr_short) */
 bool_t
 xdr_short (XDR *xdrs, short *sp)
 {
@@ -152,7 +146,6 @@ libc_hidden_def(xdr_short)
 /*
  * XDR integers
  */
-/* libc_hidden_proto(xdr_int) */
 bool_t
 xdr_int (XDR *xdrs, int *ip)
 {
@@ -191,7 +184,6 @@ libc_hidden_def(xdr_int)
  * The definition of xdr_u_long() is kept for backward
  * compatibility. Instead xdr_u_int() should be used.
  */
-/* libc_hidden_proto(xdr_u_long) */
 bool_t
 xdr_u_long (XDR *xdrs, u_long *ulp)
 {
@@ -225,7 +217,6 @@ libc_hidden_def(xdr_u_long)
 /*
  * XDR unsigned integers
  */
-/* libc_hidden_proto(xdr_u_int) */
 bool_t
 xdr_u_int (XDR *xdrs, u_int *up)
 {
@@ -262,7 +253,6 @@ libc_hidden_def(xdr_u_int)
  * XDR hyper integers
  * same as xdr_u_hyper - open coded to save a proc call!
  */
-/* libc_hidden_proto(xdr_hyper) */
 bool_t
 xdr_hyper (XDR *xdrs, quad_t *llp)
 {
@@ -298,7 +288,6 @@ libc_hidden_def(xdr_hyper)
  * XDR hyper integers
  * same as xdr_hyper - open coded to save a proc call!
  */
-/* libc_hidden_proto(xdr_u_hyper) */
 bool_t
 xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
 {
@@ -343,7 +332,6 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
 /*
  * XDR unsigned short integers
  */
-/* libc_hidden_proto(xdr_u_short) */
 bool_t
 xdr_u_short (XDR *xdrs, u_short *usp)
 {
@@ -408,7 +396,6 @@ xdr_u_char (XDR *xdrs, u_char *cp)
 /*
  * XDR booleans
  */
-/* libc_hidden_proto(xdr_bool) */
 bool_t
 xdr_bool (XDR *xdrs, bool_t *bp)
 {
@@ -438,7 +425,6 @@ libc_hidden_def(xdr_bool)
 /*
  * XDR enumerations
  */
-/* libc_hidden_proto(xdr_enum) */
 bool_t
 xdr_enum (XDR *xdrs, enum_t *ep)
 {
@@ -492,7 +478,6 @@ libc_hidden_def(xdr_enum)
  * Allows the specification of a fixed size sequence of opaque bytes.
  * cp points to the opaque object and cnt gives the byte length.
  */
-/* libc_hidden_proto(xdr_opaque) */
 bool_t
 xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
 {
@@ -544,7 +529,6 @@ libc_hidden_def(xdr_opaque)
  * *cpp is a pointer to the bytes, *sizep is the count.
  * If *cpp is NULL maxsize bytes are allocated
  */
-/* libc_hidden_proto(xdr_bytes) */
 bool_t
 xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
 {
@@ -628,7 +612,6 @@ xdr_netobj (xdrs, np)
  * routine may be called.
  * If there is no specific or default routine an error is returned.
  */
-/* libc_hidden_proto(xdr_union) */
 bool_t
 xdr_union (XDR *xdrs, enum_t *dscmp, char *unp, const struct xdr_discrim *choices, xdrproc_t dfault)
 {
@@ -675,7 +658,6 @@ libc_hidden_def(xdr_union)
  * storage is allocated.  The last parameter is the max allowed length
  * of the string as specified by a protocol.
  */
-/* libc_hidden_proto(xdr_string) */
 bool_t
 xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
 {
diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c
index ec5c0b367..bb3e51e33 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -51,12 +51,8 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(xdr_u_int) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -68,7 +64,6 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
  * elsize is the size (in bytes) of each element, and elproc is the
  * xdr procedure to call to handle each element of the array.
  */
-/* libc_hidden_proto(xdr_array) */
 bool_t
 xdr_array (XDR *xdrs, caddr_t *addrp, u_int *sizep, u_int maxsize, u_int elsize, xdrproc_t elproc)
 {
diff --git a/libc/inet/rpc/xdr_mem.c b/libc/inet/rpc/xdr_mem.c
index 451751e45..9892dd936 100644
--- a/libc/inet/rpc/xdr_mem.c
+++ b/libc/inet/rpc/xdr_mem.c
@@ -43,7 +43,6 @@
 #include <limits.h>
 #include <rpc/rpc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static bool_t xdrmem_getlong (XDR *, long *);
 static bool_t xdrmem_putlong (XDR *, const long *);
@@ -74,7 +73,6 @@ static const struct xdr_ops xdrmem_ops =
  * The procedure xdrmem_create initializes a stream descriptor for a
  * memory buffer.
  */
-/* libc_hidden_proto(xdrmem_create) */
 void
 xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
 {
diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c
index b010ab446..1e02e7f44 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -57,12 +57,8 @@
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(lseek) */
 
 static bool_t xdrrec_getbytes (XDR *, caddr_t, u_int);
 static bool_t xdrrec_putbytes (XDR *, const char *, u_int);
@@ -153,7 +149,6 @@ static bool_t get_input_bytes (RECSTREAM *, caddr_t, int) internal_function;
  * write respectively.   They are like the system
  * calls expect that they take an opaque handle rather than an fd.
  */
-/* libc_hidden_proto(xdrrec_create) */
 void
 xdrrec_create (XDR *xdrs, u_int sendsize,
 	       u_int recvsize, caddr_t tcp_handle,
@@ -460,7 +455,6 @@ xdrrec_destroy (XDR *xdrs)
  * Before reading (deserializing from the stream, one should always call
  * this procedure to guarantee proper record alignment.
  */
-/* libc_hidden_proto(xdrrec_skiprecord) */
 bool_t
 xdrrec_skiprecord (XDR *xdrs)
 {
@@ -484,7 +478,6 @@ libc_hidden_def(xdrrec_skiprecord)
  * Returns TRUE iff there is no more input in the buffer
  * after consuming the rest of the current record.
  */
-/* libc_hidden_proto(xdrrec_eof) */
 bool_t
 xdrrec_eof (XDR *xdrs)
 {
@@ -510,7 +503,6 @@ libc_hidden_def(xdrrec_eof)
  * (output) tcp stream.  (This lets the package support batched or
  * pipelined procedure calls.)  TRUE => immediate flush to tcp connection.
  */
-/* libc_hidden_proto(xdrrec_endofrecord) */
 bool_t
 xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
 {
diff --git a/libc/inet/rpc/xdr_reference.c b/libc/inet/rpc/xdr_reference.c
index 9cdeed129..937b0ccb3 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -52,12 +52,8 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(fputs) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -70,7 +66,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
  * size is the size of the referneced structure.
  * proc is the routine to handle the referenced structure.
  */
-/* libc_hidden_proto(xdr_reference) */
 bool_t
 xdr_reference (XDR *xdrs, caddr_t *pp, u_int size, xdrproc_t proc)
 {
diff --git a/libc/inet/rpc/xdr_stdio.c b/libc/inet/rpc/xdr_stdio.c
index 91ce8b828..a087c9c6a 100644
--- a/libc/inet/rpc/xdr_stdio.c
+++ b/libc/inet/rpc/xdr_stdio.c
@@ -49,11 +49,6 @@
 # define fwrite(p, m, n, s) _IO_fwrite (p, m, n, s)
 #endif
 
-/* libc_hidden_proto(fread) */
-/* libc_hidden_proto(fwrite) */
-/* libc_hidden_proto(fseek) */
-/* libc_hidden_proto(fflush) */
-/* libc_hidden_proto(ftell) */
 
 static bool_t xdrstdio_getlong (XDR *, long *);
 static bool_t xdrstdio_putlong (XDR *, const long *);
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index c88f239b8..8bb09cabb 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -57,7 +57,6 @@ strong_alias(accept,__libc_accept)
 #endif
 
 #ifdef L_bind
-/* libc_hidden_proto(bind) */
 #ifdef __NR_bind
 _syscall3(int, bind, int, sockfd, const struct sockaddr *, myaddr, socklen_t, addrlen)
 #elif defined(__NR_socketcall)
@@ -113,7 +112,6 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t * paddrlen)
 #endif
 
 #ifdef L_getsockname
-/* libc_hidden_proto(getsockname) */
 #ifdef __NR_getsockname
 _syscall3(int, getsockname, int, sockfd, struct sockaddr *, addr, socklen_t *,paddrlen)
 #elif defined(__NR_socketcall)
@@ -150,7 +148,6 @@ int getsockopt(int fd, int level, int optname, __ptr_t optval,
 #endif
 
 #ifdef L_listen
-/* libc_hidden_proto(listen) */
 #ifdef __NR_listen
 _syscall2(int, listen, int, sockfd, int, backlog)
 #elif defined(__NR_socketcall)
@@ -326,7 +323,6 @@ strong_alias(sendto,__libc_sendto)
 #endif
 
 #ifdef L_setsockopt
-/* libc_hidden_proto(setsockopt) */
 #ifdef __NR_setsockopt
 _syscall5(int, setsockopt, int, fd, int, level, int, optname, const void *, optval, socklen_t, optlen)
 #elif defined(__NR_socketcall)
@@ -364,7 +360,6 @@ int shutdown(int sockfd, int how)
 #endif
 
 #ifdef L_socket
-/* libc_hidden_proto(socket) */
 #ifdef __NR_socket
 _syscall3(int, socket, int, family, int, type, int, protocol)
 #elif defined(__NR_socketcall)
diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index c6132924d..ff9e47dcf 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -32,15 +32,12 @@
 #include <unistd.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(abort) */
 
 /* Get the prototype from assert.h as a double-check. */
 #undef NDEBUG
 #include <assert.h>
 #undef assert
 
-/* libc_hidden_proto(__assert) */
 
 #define ASSERT_SHOW_PROGNAME 1
 
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index f90b40537..6abb49ac4 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -36,9 +36,7 @@
 #include <assert.h>
 #include <locale.h>
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
@@ -165,8 +163,6 @@ int CTYPE_NAME(NAME) (int c) \
 #ifdef L___ctype_assert
 #ifdef __UCLIBC_HAS_CTYPE_ENFORCED__
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(abort) */
 
 attribute_hidden void __isctype_assert(int c, int mask)
 {
@@ -281,11 +277,8 @@ IS_FUNC_BODY(xdigit);
 
 #undef tolower
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
 int tolower(int c)
@@ -311,7 +304,6 @@ libc_hidden_def(tolower)
 #ifdef L_tolower_l
 
 #undef tolower_l
-/* libc_hidden_proto(tolower_l) */
 int tolower_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -329,11 +321,8 @@ libc_hidden_def(tolower_l)
 
 #undef toupper
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_toupper) */
 #endif
-/* libc_hidden_proto(toupper) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
 int toupper(int c)
@@ -359,7 +348,6 @@ libc_hidden_def(toupper)
 #ifdef L_toupper_l
 
 #undef toupper_l
-/* libc_hidden_proto(toupper_l) */
 int toupper_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -446,7 +434,6 @@ libc_hidden_def(__ctype_b_loc)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_tolower_loc) */
 const __ctype_touplow_t **__ctype_tolower_loc(void)
 {
 	return &(__UCLIBC_CURLOCALE->__ctype_tolower);
@@ -461,7 +448,6 @@ libc_hidden_def(__ctype_tolower_loc)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_toupper_loc) */
 const __ctype_touplow_t **__ctype_toupper_loc(void)
 {
 	return &(__UCLIBC_CURLOCALE->__ctype_toupper);
@@ -863,7 +849,6 @@ static const __ctype_mask_t __C_ctype_b_data[] = {
 	/*  255  M-^? */ 0
 };
 
-/* 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 +964,12 @@ static const __ctype_touplow_t __C_ctype_tolower_data[] = {
 	 252,          253,          254,          255
 };
 
-/* 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) */
 const __ctype_touplow_t *__ctype_tolower =
 		__C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_tolower)
@@ -1098,14 +1081,12 @@ static const __ctype_touplow_t __C_ctype_toupper_data[] = {
 	 252,          253,          254,          255
 };
 
-/* 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)
 
 #ifndef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_toupper) */
 const __ctype_touplow_t *__ctype_toupper =
 		__C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_toupper)
diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c
index 466e600ac..cca03b8f7 100644
--- a/libc/misc/dirent/closedir.c
+++ b/libc/misc/dirent/closedir.c
@@ -10,8 +10,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(close) */
 
 int closedir(DIR * dir)
 {
diff --git a/libc/misc/dirent/dirfd.c b/libc/misc/dirent/dirfd.c
index e5b41bc6b..649dd4ad8 100644
--- a/libc/misc/dirent/dirfd.c
+++ b/libc/misc/dirent/dirfd.c
@@ -8,7 +8,6 @@
 #include <errno.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(dirfd) */
 
 int dirfd(DIR * dir)
 {
diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c
index e92c4ad58..4fcd1cc72 100644
--- a/libc/misc/dirent/readdir.c
+++ b/libc/misc/dirent/readdir.c
@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(readdir) */
 
 struct dirent *readdir(DIR * dir)
 {
diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c
index 3aaef5139..1264c38b1 100644
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(readdir64) */
 struct dirent64 *readdir64(DIR * dir)
 {
 	ssize_t bytes;
diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c
index d394fdb8f..ba726003d 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -13,9 +13,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* libc_hidden_proto(readdir64_r) */
 int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c
index 51f483ba5..d08997ffa 100644
--- a/libc/misc/dirent/readdir_r.c
+++ b/libc/misc/dirent/readdir_r.c
@@ -11,9 +11,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* libc_hidden_proto(readdir_r) */
 int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/rewinddir.c b/libc/misc/dirent/rewinddir.c
index 99aa6b263..0a8f14740 100644
--- a/libc/misc/dirent/rewinddir.c
+++ b/libc/misc/dirent/rewinddir.c
@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(lseek) */
 
 /* rewinddir() just does an lseek(fd,0,0) - see close for comments */
 void rewinddir(DIR * dir)
diff --git a/libc/misc/dirent/seekdir.c b/libc/misc/dirent/seekdir.c
index 19661509d..eaf447ea2 100644
--- a/libc/misc/dirent/seekdir.c
+++ b/libc/misc/dirent/seekdir.c
@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(lseek) */
 
 void seekdir(DIR * dir, long int offset)
 {
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index d30efbe37..9ddb59624 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -21,16 +21,7 @@
 
 #if defined __USE_BSD
 
-/* libc_hidden_proto(vwarn) */
-/* libc_hidden_proto(vwarnx) */
-/* libc_hidden_proto(verr) */
-/* libc_hidden_proto(verrx) */
-
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(__xpg_strerror_r) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(vfprintf) */
+
 
 static void vwarn_work(const char *format, va_list args, int showerr)
 {
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 7518ff5e5..a30a4decf 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -26,15 +26,6 @@
 #include <string.h>
 #include <error.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strerror) */
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(putc) */
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(fflush) */
-/* libc_hidden_proto(fputc) */
-/* libc_hidden_proto(__fputc_unlocked) */
 
 /* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count = 0;
diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c
index 58fcdad0a..b37ace408 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -24,11 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-/* libc_hidden_proto(lockf) */
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fcntl) */
-/* libc_hidden_proto(getpid) */
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index e4f6f5cce..177942445 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -32,17 +32,12 @@
 #define F_GETLK F_GETLK64
 #undef F_SETLK
 #define F_SETLK F_SETLK64
-/* libc_hidden_proto(fcntl64) */
 #else
-/* libc_hidden_proto(fcntl) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(getpid) */
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
-/* libc_hidden_proto(lockf64) */
 int lockf64 (int fd, int cmd, off64_t len64)
 {
     struct flock fl;
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index cf3086715..28f744a26 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -62,25 +62,9 @@
 
 #ifdef __UCLIBC__
 #define __memset memset
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/*libc_hidden_proto(strchr)*/
-/*libc_hidden_proto(strchrnul)*/
-/* 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) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
-/* libc_hidden_proto(fnmatch) */
-/* libc_hidden_proto(getenv) */
 #endif
 
 /* For platform which support the ISO C amendement 1 functionality we
@@ -90,19 +74,7 @@
 # include <wchar.h>
 # include <wctype.h>
 # ifdef __UCLIBC__
-/* libc_hidden_proto(wctype) */
-/* libc_hidden_proto(iswctype) */
-/* libc_hidden_proto(btowc) */
 #  ifdef __UCLIBC_HAS_LOCALE__
-/* libc_hidden_proto(wmemchr) */
-/* libc_hidden_proto(wmempcpy) */
-/* libc_hidden_proto(wcscat) */
-/* libc_hidden_proto(wcschr) */
-/* libc_hidden_proto(wcschrnul) */
-/* libc_hidden_proto(wcslen) */
-/* libc_hidden_proto(wcscoll) */
-/* libc_hidden_proto(towlower) */
-/* libc_hidden_proto(mbsrtowcs) */
 #  endif
 # endif
 #endif
@@ -376,7 +348,6 @@ is_char_class (const wchar_t *wcs)
 # endif
 
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #else
 #undef MB_CUR_MAX
 #define MB_CUR_MAX 1
diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c
index 69a8ede50..2dece85dc 100644
--- a/libc/misc/fnmatch/fnmatch_old.c
+++ b/libc/misc/fnmatch/fnmatch_old.c
@@ -23,9 +23,7 @@ Cambridge, MA 02139, USA.  */
 #include <fnmatch.h>
 #include <ctype.h>
 
-/* libc_hidden_proto(fnmatch) */
 
-/* libc_hidden_proto(tolower) */
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
    Library, but also included in many other GNU distributions.  Compiling
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 9325ab745..74f6e1354 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -83,27 +83,8 @@ char *alloca ();
 # include <sys/stat.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(dirfd) */
-/* libc_hidden_proto(tsearch) */
-/* libc_hidden_proto(tfind) */
-/* libc_hidden_proto(tdestroy) */
-/* libc_hidden_proto(getcwd) */
-/* libc_hidden_proto(chdir) */
-/* libc_hidden_proto(fchdir) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(opendir) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(readdir64) */
-/* libc_hidden_proto(lstat64) */
-/* libc_hidden_proto(stat64) */
 #endif
-/* libc_hidden_proto(closedir) */
-/* Experimentally off - libc_hidden_proto(stpcpy) */
-/* libc_hidden_proto(lstat) */
-/* libc_hidden_proto(stat) */
 
 #if !defined _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy
 char *stpcpy ();
diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c
index 8ee0f1a37..b242a45fa 100644
--- a/libc/misc/glob/glob-susv3.c
+++ b/libc/misc/glob/glob-susv3.c
@@ -23,16 +23,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(opendir) */
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(qsort) */
-/* libc_hidden_proto(fnmatch) */
 
 struct match
 {
@@ -53,12 +43,8 @@ extern int __glob_match_in_dir(const char *d, const char *p, int flags, int (*er
 # define stat stat64
 # define readdir_r readdir64_r
 # define dirent dirent64
-/* libc_hidden_proto(readdir64_r) */
-/* libc_hidden_proto(stat64) */
 # define struct_stat struct stat64
 #else
-/* libc_hidden_proto(readdir_r) */
-/* libc_hidden_proto(stat) */
 # define struct_stat struct stat
 #endif
 
@@ -224,9 +210,7 @@ int __glob_sort(const void *a, const void *b)
 #endif /* !__GLOB64 */
 
 #ifdef __GLOB64
-/* libc_hidden_proto(glob64) */
 #else
-/* libc_hidden_proto(glob) */
 #endif
 int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g)
 {
@@ -302,9 +286,7 @@ libc_hidden_def(glob)
 #endif
 
 #ifdef __GLOB64
-/* libc_hidden_proto(globfree64) */
 #else
-/* libc_hidden_proto(globfree) */
 #endif
 void globfree(glob_t *g)
 {
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index 5736f4981..8f27443ff 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -31,24 +31,10 @@
 #include <fnmatch.h>
 #include <glob.h>
 
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(fnmatch) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(opendir) */
-/* libc_hidden_proto(qsort) */
-/* libc_hidden_proto(readdir) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcoll) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strrchr) */
 
 
 #ifdef ENABLE_GLOB_TILDE_EXPANSION
 #include <pwd.h>
-/* libc_hidden_proto(getpwnam_r) */
 #endif
 
 #ifdef COMPILE_GLOB64
@@ -62,19 +48,15 @@
 #define glob_t glob64_t
 #define glob(pattern, flags, errfunc, pglob) glob64 (pattern, flags, errfunc, pglob)
 #define globfree(pglob) globfree64 (pglob)
-/* libc_hidden_proto(stat64) */
-/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir readdir
 #ifdef __UCLIBC_HAS_LFS__
 #define __readdir64 readdir64
-/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir64 readdir
 #endif
 #define struct_stat64          struct stat
 #define __stat64(fname, buf)   stat (fname, buf)
-/* libc_hidden_proto(stat) */
 #endif
 
 
@@ -132,7 +114,6 @@ extern int __prefix_array (const char *dirname, char **array, size_t n) attribut
 extern const char *__next_brace_sub (const char *cp, int flags) attribute_hidden;
 #endif
 
-/* libc_hidden_proto(glob_pattern_p) */
 #ifndef COMPILE_GLOB64
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
@@ -489,11 +470,7 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags,
 }
 
 #ifdef COMPILE_GLOB64
-/* libc_hidden_proto(glob64) */
-/* libc_hidden_proto(globfree64) */
 #else
-/* libc_hidden_proto(glob) */
-/* libc_hidden_proto(globfree) */
 #endif
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
index 4401ba249..487a9c2c5 100644
--- a/libc/misc/internals/__errno_location.c
+++ b/libc/misc/internals/__errno_location.c
@@ -7,7 +7,6 @@
 #include "internal_errno.h"
 
 /* psm: moved to bits/errno.h: */
-/* libc_hidden_proto(__errno_location) */
 int * weak_const_function __errno_location (void)
 {
     return &errno;
diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
index f4a587e96..213d39894 100644
--- a/libc/misc/internals/__h_errno_location.c
+++ b/libc/misc/internals/__h_errno_location.c
@@ -6,7 +6,6 @@
 
 #include "internal_errno.h"
 
-/* libc_hidden_proto(__h_errno_location) */
 int * weak_const_function __h_errno_location (void)
 {
     return &h_errno;
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 7de372387..3588768a3 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -27,19 +27,10 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-/* libc_hidden_proto(exit) */
 
 #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
-/* Experimentally off - libc_hidden_proto(strrchr) */
 #endif
 #ifndef __ARCH_HAS_NO_LDSO__
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(abort) */
 
 #endif
 
diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c
index 20b26b2b6..65728f863 100644
--- a/libc/misc/internals/errno.c
+++ b/libc/misc/internals/errno.c
@@ -1,8 +1,6 @@
 #include "internal_errno.h"
 
 #ifdef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(errno) */
-/* libc_hidden_proto(h_errno) */
 #endif
 int errno = 0;
 int h_errno = 0;
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index 10d00041c..e0bf922c4 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -45,19 +45,8 @@
 #include <sys/time.h>
 #include "tempname.h"
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(mkdir) */
-/* libc_hidden_proto(open) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(open64) */
 #endif
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(stat) */
-/* libc_hidden_proto(gettimeofday) */
 
 /* Return nonzero if DIR is an existent directory.  */
 static int direxists (const char *dir)
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index ec6189279..a9fd952f9 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -58,19 +58,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__C_ctype_toupper) */
 #endif
-/*libc_hidden_proto(fflush)*/
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #ifdef L_setlocale
@@ -193,8 +182,6 @@ static const char utf8[] = "UTF-8";
  */
 static char hr_locale[(MAX_LOCALE_CATEGORY_STR * LC_ALL) + MAX_LOCALE_STR];
 
-/* Experimentally off - libc_hidden_proto(stpcpy) */
-/* libc_hidden_proto(newlocale) */
 
 static void update_hr_locale(const unsigned char *spec)
 {
@@ -304,7 +291,6 @@ char *setlocale(int category, const char *locale)
  * placement of the fields in the struct.  If necessary, we could ensure
  * this usings an array of offsets but at some size cost. */
 
-/* libc_hidden_proto(localeconv) */
 
 #ifdef __LOCALE_C_ONLY
 
@@ -365,12 +351,7 @@ 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) */
 #ifndef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b) */
-/* libc_hidden_proto(__ctype_tolower) */
-/* libc_hidden_proto(__ctype_toupper) */
 #endif
 
 struct __uclibc_locale_struct __global_locale_data;
@@ -1027,7 +1008,6 @@ static const unsigned char nl_data[C_LC_ALL + 1 + 90 + 320] = {
 	   ']', '\x00',    '^',    '[',    'n',    'N',    ']', '\x00',
 };
 
-/* libc_hidden_proto(nl_langinfo) */
 char *nl_langinfo(nl_item item)
 {
 	unsigned int c;
@@ -1047,9 +1027,7 @@ libc_hidden_def(nl_langinfo)
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-/* libc_hidden_proto(nl_langinfo) */
 
-/* libc_hidden_proto(nl_langinfo_l) */
 
 char *nl_langinfo(nl_item item)
 {
@@ -1085,8 +1063,6 @@ libc_hidden_def(__XL_NPP(nl_langinfo))
 /**********************************************************************/
 #ifdef L_newlocale
 
-/* Experimentally off - libc_hidden_proto(stpcpy) */
-/* libc_hidden_proto(newlocale) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning TODO: Move posix and utf8 strings.
@@ -1338,7 +1314,6 @@ libc_hidden_def(newlocale)
 /**********************************************************************/
 #ifdef L_duplocale
 
-/* libc_hidden_proto(duplocale) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning REMINDER: When we allocate ctype tables, remember to dup them.
@@ -1390,7 +1365,6 @@ void freelocale(__locale_t dataset)
 /**********************************************************************/
 #ifdef L_uselocale
 
-/* libc_hidden_proto(uselocale) */
 __locale_t uselocale(__locale_t dataset)
 {
 	__locale_t old;
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index 55f672a3c..608f84c1a 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -12,19 +12,7 @@
 
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
 
-/* libc_hidden_proto(getmntent_r) */
-/* libc_hidden_proto(setmntent) */
-/* libc_hidden_proto(endmntent) */
-
-/* Experimentally off - libc_hidden_proto(strstr) */
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(fseek) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
-/* libc_hidden_proto(fprintf) */
+
 
 /* Reentrant version of getmntent.  */
 struct mntent *getmntent_r (FILE *filep,
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 0c348a48d..ada380632 100644
--- a/libc/misc/regex/regcomp.c
+++ b/libc/misc/regex/regcomp.c
@@ -792,7 +792,6 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length,
    as the initial length of some arrays.  */
 
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #endif
 
 static reg_errcode_t
diff --git a/libc/misc/search/_hsearch_r.c b/libc/misc/search/_hsearch_r.c
index 85475cf5e..aef12e61b 100644
--- a/libc/misc/search/_hsearch_r.c
+++ b/libc/misc/search/_hsearch_r.c
@@ -64,7 +64,6 @@ static int isprime (unsigned int number)
    indexing as explained in the comment for the hsearch function.
    The contents of the table is zeroed, especially the field used
    becomes zero.  */
-/* libc_hidden_proto(hcreate_r) */
 int hcreate_r (size_t nel, struct hsearch_data *htab)
 {
   /* Test for correct arguments.  */
@@ -100,7 +99,6 @@ libc_hidden_def(hcreate_r)
 #ifdef L_hdestroy_r
 /* After using the hash table it has to be destroyed. The used memory can
    be freed and the local static variable can be marked as not used.  */
-/* libc_hidden_proto(hdestroy_r) */
 void hdestroy_r (struct hsearch_data *htab)
 {
   /* Test for correct arguments.  */
@@ -134,10 +132,7 @@ libc_hidden_def(hdestroy_r)
    equality of the stored and the parameter value. This helps to prevent
    unnecessary expensive calls of strcmp.  */
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 
-/* libc_hidden_proto(hsearch_r) */
 int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
 	       struct hsearch_data *htab)
 {
diff --git a/libc/misc/search/_lsearch.c b/libc/misc/search/_lsearch.c
index da737bab4..0cf496e26 100644
--- a/libc/misc/search/_lsearch.c
+++ b/libc/misc/search/_lsearch.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <search.h>
 
-/* libc_hidden_proto(lfind) */
 
 #ifdef L_lfind
 
@@ -34,7 +33,6 @@ libc_hidden_def(lfind)
 
 #ifdef L_lsearch
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 void *lsearch(const void *key, void *base, size_t *nmemb,
 	size_t size, int (*compar)(const void *, const void *))
diff --git a/libc/misc/search/_tsearch.c b/libc/misc/search/_tsearch.c
index 5f3706d64..20b04af78 100644
--- a/libc/misc/search/_tsearch.c
+++ b/libc/misc/search/_tsearch.c
@@ -50,7 +50,6 @@ register node	**rootp;	 address of tree root
 int	(*compar)();		 ordering function
 */
 
-/* libc_hidden_proto(tsearch) */
 void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
 {
     register node *q;
@@ -81,7 +80,6 @@ libc_hidden_def(tsearch)
 #endif
 
 #ifdef L_tfind
-/* libc_hidden_proto(tfind) */
 void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar)
 {
     register node **rootp = (node **) vrootp;
@@ -208,7 +206,6 @@ tdestroy_recurse (node *root, __free_fn_t freefct)
     free (root);
 }
 
-/* libc_hidden_proto(tdestroy) */
 void tdestroy (void *vroot, __free_fn_t freefct)
 {
     node *root = (node *) vroot;
diff --git a/libc/misc/search/hsearch.c b/libc/misc/search/hsearch.c
index 3ecc42567..d011997bb 100644
--- a/libc/misc/search/hsearch.c
+++ b/libc/misc/search/hsearch.c
@@ -19,9 +19,6 @@
 
 #include <search.h>
 
-/* libc_hidden_proto(hdestroy_r) */
-/* libc_hidden_proto(hsearch_r) */
-/* libc_hidden_proto(hcreate_r) */
 
 /* The non-reentrant version use a global space for storing the table.  */
 static struct hsearch_data htab;
diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c
index 6bcc86540..27bb8d602 100644
--- a/libc/misc/statfs/fstatfs64.c
+++ b/libc/misc/statfs/fstatfs64.c
@@ -25,11 +25,9 @@
 #include <sys/statvfs.h>
 #include <stddef.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 extern __typeof(fstatfs) __libc_fstatfs;
 
 /* Return information about the filesystem on which FD resides.  */
-/* libc_hidden_proto(fstatfs64) */
 int fstatfs64 (int fd, struct statfs64 *buf)
 {
     struct statfs buf32;
diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c
index 3f3d76a8b..63fce0fa0 100644
--- a/libc/misc/statfs/fstatvfs.c
+++ b/libc/misc/statfs/fstatvfs.c
@@ -27,13 +27,6 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strsep) */
-/* libc_hidden_proto(setmntent) */
-/* libc_hidden_proto(getmntent_r) */
-/* libc_hidden_proto(endmntent) */
-/* libc_hidden_proto(stat) */
 
 #ifndef __USE_FILE_OFFSET64
 extern int fstatfs (int __fildes, struct statfs *__buf)
@@ -48,9 +41,6 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf),
 #endif
 
 extern __typeof(fstatfs) __libc_fstatfs;
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(stat) */
-/* libc_hidden_proto(fstatvfs) */
 
 int fstatvfs (int fd, struct statvfs *buf)
 {
diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c
index f06836265..efaea03c2 100644
--- a/libc/misc/statfs/fstatvfs64.c
+++ b/libc/misc/statfs/fstatvfs64.c
@@ -29,22 +29,12 @@
 #include <sys/statvfs.h>
 
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strsep) */
-/* libc_hidden_proto(setmntent) */
-/* libc_hidden_proto(getmntent_r) */
-/* libc_hidden_proto(endmntent) */
 
 #undef stat
 #define stat stat64
 #if !defined __UCLIBC_LINUX_SPECIFIC__
-/* libc_hidden_proto(fstatvfs) */
 #else
-/* libc_hidden_proto(fstatfs64) */
 #endif
-/* libc_hidden_proto(fstat64) */
-/* libc_hidden_proto(stat) */
 
 int fstatvfs64 (int fd, struct statvfs64 *buf)
 {
diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c
index 8bb1ad9ed..0cc8595d6 100644
--- a/libc/misc/statfs/statfs64.c
+++ b/libc/misc/statfs/statfs64.c
@@ -23,11 +23,9 @@
 #include <stddef.h>
 #include <sys/statfs.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 extern __typeof(statfs) __libc_statfs;
 
 /* Return information about the filesystem on which FILE resides.  */
-/* libc_hidden_proto(statfs64) */
 int statfs64 (const char *file, struct statfs64 *buf)
 {
     struct statfs buf32;
diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c
index 42d2d0d17..5ac38ed59 100644
--- a/libc/misc/statfs/statvfs.c
+++ b/libc/misc/statfs/statvfs.c
@@ -27,17 +27,9 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strsep) */
-/* libc_hidden_proto(setmntent) */
-/* libc_hidden_proto(getmntent_r) */
-/* libc_hidden_proto(endmntent) */
 
 extern __typeof(statfs) __libc_statfs;
-/* libc_hidden_proto(stat) */
 
-/* libc_hidden_proto(statvfs) */
 int statvfs (const char *file, struct statvfs *buf)
 {
     struct statfs fsbuf;
diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c
index 3f1defefc..8716b1517 100644
--- a/libc/misc/statfs/statvfs64.c
+++ b/libc/misc/statfs/statvfs64.c
@@ -28,21 +28,12 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strsep) */
-/* libc_hidden_proto(setmntent) */
-/* libc_hidden_proto(getmntent_r) */
-/* libc_hidden_proto(endmntent) */
 
 #undef stat
 #define stat stat64
 #if defined __UCLIBC_LINUX_SPECIFIC__
-/* libc_hidden_proto(statfs64) */
 #else
-/* libc_hidden_proto(statvfs) */
 #endif
-/* libc_hidden_proto(stat64) */
 
 int statvfs64 (const char *file, struct statvfs64 *buf)
 {
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index dbb1e0d01..794c0c17f 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -79,30 +79,7 @@
 #include <ctype.h>
 #include <signal.h>
 
-/* libc_hidden_proto(openlog) */
-/* libc_hidden_proto(syslog) */
-/* libc_hidden_proto(vsyslog) */
-/* libc_hidden_proto(closelog) */
-
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memmove) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncpy) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(fcntl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(ctime) */
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigemptyset) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(vsnprintf) */
-/* Experimentally off - libc_hidden_proto(time) */
+
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
diff --git a/libc/misc/sysvipc/ftok.c b/libc/misc/sysvipc/ftok.c
index 200d5cf90..d855e3d28 100644
--- a/libc/misc/sysvipc/ftok.c
+++ b/libc/misc/sysvipc/ftok.c
@@ -20,7 +20,6 @@
 #include <sys/ipc.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(stat) */
 
 key_t ftok (const char *pathname, int proj_id)
 {
diff --git a/libc/misc/sysvipc/shm.c b/libc/misc/sysvipc/shm.c
index 164580efe..4b7ea0753 100644
--- a/libc/misc/sysvipc/shm.c
+++ b/libc/misc/sysvipc/shm.c
@@ -38,7 +38,6 @@ _syscall3(void *, shmat, int, shmid, const void *,shmaddr, int, shmflg)
 #else
 /* psm: don't remove this, else mips will fail */
 #include <unistd.h>
-/* libc_hidden_proto(getpagesize) */
 
 void * shmat (int shmid, const void *shmaddr, int shmflg)
 {
diff --git a/libc/misc/time/adjtime.c b/libc/misc/time/adjtime.c
index 808046eef..1e8087104 100644
--- a/libc/misc/time/adjtime.c
+++ b/libc/misc/time/adjtime.c
@@ -9,7 +9,6 @@
 #include <sys/timex.h>
 #include <errno.h>
 
-/* libc_hidden_proto(adjtimex) */
 
 #define MAX_SEC	(LONG_MAX / 1000000L - 2)
 #define MIN_SEC	(LONG_MIN / 1000000L + 2)
diff --git a/libc/misc/time/ftime.c b/libc/misc/time/ftime.c
index 867f4fd2f..b2273860c 100644
--- a/libc/misc/time/ftime.c
+++ b/libc/misc/time/ftime.c
@@ -19,7 +19,6 @@
 #include <sys/timeb.h>
 #include <sys/time.h>
 
-/* libc_hidden_proto(gettimeofday) */
 
 int ftime(struct timeb *timebuf)
 {
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index dd6d9ad62..f28385d35 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -38,21 +38,8 @@
 #include <pthread.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* libc_hidden_proto(__fsetlocking) */
-/* libc_hidden_proto(rewind) */
-/* 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(abort) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 static char zapchar;
@@ -102,7 +89,6 @@ static char * value(register char *p)
     return ((p = strchr(p, '=')) ? ++p : NULL);
 }
 
-/* libc_hidden_proto(setttyent) */
 int setttyent(void)
 {
 
@@ -120,7 +106,6 @@ int setttyent(void)
 }
 libc_hidden_def(setttyent)
 
-/* libc_hidden_proto(getttyent) */
 struct ttyent * getttyent(void)
 {
     register int c;
@@ -201,7 +186,6 @@ struct ttyent * getttyent(void)
 }
 libc_hidden_def(getttyent)
 
-/* libc_hidden_proto(endttyent) */
 int endttyent(void)
 {
     int rval;
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 9b7196238..448baafa1 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -174,9 +174,7 @@ extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
 /**********************************************************************/
 #ifdef L_btowc
 
-/* libc_hidden_proto(mbrtowc) */
 
-/* libc_hidden_proto(btowc) */
 wint_t btowc(int c)
 {
 #ifdef __CTYPE_HAS_8_BIT_LOCALES
@@ -215,7 +213,6 @@ libc_hidden_def(btowc)
 
 /* Note: We completely ignore ps in all currently supported conversions. */
 
-/* libc_hidden_proto(wcrtomb) */
 
 int wctob(wint_t c)
 {
@@ -246,7 +243,6 @@ int wctob(wint_t c)
 /**********************************************************************/
 #ifdef L_mbsinit
 
-/* libc_hidden_proto(mbsinit) */
 int mbsinit(const mbstate_t *ps)
 {
 	return !ps || !ps->__mask;
@@ -257,9 +253,7 @@ libc_hidden_def(mbsinit)
 /**********************************************************************/
 #ifdef L_mbrlen
 
-/* libc_hidden_proto(mbrtowc) */
 
-/* libc_hidden_proto(mbrlen) */
 size_t mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps)
 {
 	static mbstate_t mbstate;	/* Rely on bss 0-init. */
@@ -272,9 +266,7 @@ libc_hidden_def(mbrlen)
 /**********************************************************************/
 #ifdef L_mbrtowc
 
-/* libc_hidden_proto(mbsnrtowcs) */
 
-/* libc_hidden_proto(mbrtowc) */
 size_t mbrtowc(wchar_t *__restrict pwc, const char *__restrict s,
 			   size_t n, mbstate_t *__restrict ps)
 {
@@ -338,12 +330,10 @@ libc_hidden_def(mbrtowc)
 /**********************************************************************/
 #ifdef L_wcrtomb
 
-/* libc_hidden_proto(wcsnrtombs) */
 
 /* Note: We completely ignore ps in all currently supported conversions. */
 /* TODO: Check for valid state anyway? */
 
-/* libc_hidden_proto(wcrtomb) */
 size_t wcrtomb(register char *__restrict s, wchar_t wc,
 			   mbstate_t *__restrict ps)
 {
@@ -372,9 +362,7 @@ libc_hidden_def(wcrtomb)
 /**********************************************************************/
 #ifdef L_mbsrtowcs
 
-/* libc_hidden_proto(mbsnrtowcs) */
 
-/* libc_hidden_proto(mbsrtowcs) */
 size_t mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src,
 				 size_t len, mbstate_t *__restrict ps)
 {
@@ -393,9 +381,7 @@ libc_hidden_def(mbsrtowcs)
 
  * TODO: Check for valid state anyway? */
 
-/* libc_hidden_proto(wcsnrtombs) */
 
-/* libc_hidden_proto(wcsrtombs) */
 size_t wcsrtombs(char *__restrict dst, const wchar_t **__restrict src,
 				 size_t len, mbstate_t *__restrict ps)
 {
@@ -700,7 +686,6 @@ size_t attribute_hidden _wchar_wcsntoutf8s(char *__restrict s, size_t n,
 
 /* WARNING: We treat len as SIZE_MAX when dst is NULL! */
 
-/* libc_hidden_proto(mbsnrtowcs) */
 size_t mbsnrtowcs(wchar_t *__restrict dst, const char **__restrict src,
 					size_t NMC, size_t len, mbstate_t *__restrict ps)
 {
@@ -810,7 +795,6 @@ libc_hidden_def(mbsnrtowcs)
 /* Note: We completely ignore ps in all currently supported conversions.
  * TODO: Check for valid state anyway? */
 
-/* libc_hidden_proto(wcsnrtombs) */
 size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src,
 					size_t NWC, size_t len, mbstate_t *__restrict ps)
 {
@@ -924,7 +908,6 @@ libc_hidden_def(wcsnrtombs)
 /**********************************************************************/
 #ifdef L_wcswidth
 
-/* libc_hidden_proto(wcswidth) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning REMINDER: If we start doing translit, wcwidth and wcswidth will need updating.
@@ -1040,7 +1023,6 @@ static const signed char new_wtbl[] = {
 	0,    2,    1,    2,    1,    0,    1,
 };
 
-/* libc_hidden_proto(wcsnrtombs) */
 
 int wcswidth(const wchar_t *pwcs, size_t n)
 {
@@ -1175,7 +1157,6 @@ libc_hidden_def(wcswidth)
 /**********************************************************************/
 #ifdef L_wcwidth
 
-/* libc_hidden_proto(wcswidth) */
 
 int wcwidth(wchar_t wc)
 {
@@ -1288,7 +1269,6 @@ enum {
 	IC_ASCII = 1
 };
 
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
 
 static int find_codeset(const char *name)
 {
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c
index 0b7bd5c2c..6ab6bab77 100644
--- a/libc/misc/wctype/_wctype.c
+++ b/libc/misc/wctype/_wctype.c
@@ -37,13 +37,6 @@
 #include <stdint.h>
 #include <bits/uClibc_uwchar.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(tolower) */
-/* libc_hidden_proto(toupper) */
-/* libc_hidden_proto(towlower) */
-/* libc_hidden_proto(towupper) */
-/* libc_hidden_proto(towctrans) */
-/* libc_hidden_proto(iswctype) */
 
 #if defined(__LOCALE_C_ONLY) && defined(__UCLIBC_DO_XLOCALE)
 #error xlocale functionality is not supported in stub locale mode.
@@ -51,17 +44,10 @@
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 #include <xlocale.h>
-/* libc_hidden_proto(towlower_l) */
-/* 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) */
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
-/* 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. */
@@ -465,7 +451,6 @@ libc_hidden_def(towupper)
 
 static const unsigned char typestring[] = __CTYPE_TYPESTRING;
 
-/* libc_hidden_proto(wctype) */
 wctype_t wctype(const char *property)
 {
 	const unsigned char *p;
@@ -494,9 +479,7 @@ libc_hidden_def(wctype)
 #warning REMINDER: Currently wctype_l simply calls wctype.
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-/* libc_hidden_proto(wctype) */
 
-/* libc_hidden_proto(wctype_l) */
 wctype_t wctype_l (const char *property, __locale_t locale)
 {
 	return wctype(property);
@@ -861,7 +844,6 @@ libc_hidden_def(towctrans)
 
 static const char transstring[] = __CTYPE_TRANSTRING;
 
-/* libc_hidden_proto(wctrans) */
 wctrans_t wctrans(const char *property)
 {
 	const unsigned char *p;
@@ -890,7 +872,6 @@ libc_hidden_def(wctrans)
 #warning REMINDER: Currently wctrans_l simply calls wctrans.
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-/* libc_hidden_proto(wctrans) */
 
 wctrans_t wctrans_l(const char *property, __locale_t locale)
 {
diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c
index 8c75afb0a..b4f6c98f7 100644
--- a/libc/pwd_grp/pwd_grp.c
+++ b/libc/pwd_grp/pwd_grp.c
@@ -36,22 +36,8 @@
 #endif
 #include <bits/uClibc_mutex.h>
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(strtoul) */
-/* libc_hidden_proto(rewind) */
-/* 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) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /**********************************************************************/
@@ -84,7 +70,6 @@ extern gid_t* __getgrouplist_internal(const char *user, gid_t gid, int *ngroups)
 #ifdef L_fgetpwent_r
 
 #ifdef __USE_SVID
-/* libc_hidden_proto(fgetpwent_r) */
 int fgetpwent_r(FILE *__restrict stream, struct passwd *__restrict resultbuf,
 				char *__restrict buffer, size_t buflen,
 				struct passwd **__restrict result)
@@ -107,7 +92,6 @@ libc_hidden_def(fgetpwent_r)
 #ifdef L_fgetgrent_r
 
 #ifdef __USE_SVID
-/* libc_hidden_proto(fgetgrent_r) */
 int fgetgrent_r(FILE *__restrict stream, struct group *__restrict resultbuf,
 				char *__restrict buffer, size_t buflen,
 				struct group **__restrict result)
@@ -129,7 +113,6 @@ libc_hidden_def(fgetgrent_r)
 /**********************************************************************/
 #ifdef L_fgetspent_r
 
-/* libc_hidden_proto(fgetspent_r) */
 int fgetspent_r(FILE *__restrict stream, struct spwd *__restrict resultbuf,
 				char *__restrict buffer, size_t buflen,
 				struct spwd **__restrict result)
@@ -155,7 +138,6 @@ libc_hidden_def(fgetspent_r)
 #ifdef L_fgetpwent
 
 #ifdef __USE_SVID
-/* libc_hidden_proto(fgetpwent_r) */
 
 struct passwd *fgetpwent(FILE *stream)
 {
@@ -173,7 +155,6 @@ struct passwd *fgetpwent(FILE *stream)
 #ifdef L_fgetgrent
 
 #ifdef __USE_SVID
-/* libc_hidden_proto(fgetgrent_r) */
 
 struct group *fgetgrent(FILE *stream)
 {
@@ -190,7 +171,6 @@ struct group *fgetgrent(FILE *stream)
 /**********************************************************************/
 #ifdef L_fgetspent
 
-/* libc_hidden_proto(fgetspent_r) */
 
 struct spwd *fgetspent(FILE *stream)
 {
@@ -206,7 +186,6 @@ struct spwd *fgetspent(FILE *stream)
 /**********************************************************************/
 #ifdef L_sgetspent_r
 
-/* libc_hidden_proto(sgetspent_r) */
 int sgetspent_r(const char *string, struct spwd *result_buf,
 				char *buffer, size_t buflen, struct spwd **result)
 {
@@ -296,7 +275,6 @@ libc_hidden_def(sgetspent_r)
 /**********************************************************************/
 #ifdef L_getpwuid
 
-/* libc_hidden_proto(getpwuid_r) */
 
 struct passwd *getpwuid(uid_t uid)
 {
@@ -312,7 +290,6 @@ struct passwd *getpwuid(uid_t uid)
 /**********************************************************************/
 #ifdef L_getgrgid
 
-/* libc_hidden_proto(getgrgid_r) */
 
 struct group *getgrgid(gid_t gid)
 {
@@ -332,8 +309,6 @@ struct group *getgrgid(gid_t gid)
  * to have been created as a reentrant version of the non-standard
  * functions getspuid.  Why getspuid was added, I do not know. */
 
-/* libc_hidden_proto(getpwuid_r) */
-/* libc_hidden_proto(getspnam_r) */
 
 int getspuid_r(uid_t uid, struct spwd *__restrict resultbuf,
 		       char *__restrict buffer, size_t buflen,
@@ -373,7 +348,6 @@ struct spwd *getspuid(uid_t uid)
 /**********************************************************************/
 #ifdef L_getpwnam
 
-/* libc_hidden_proto(getpwnam_r) */
 
 struct passwd *getpwnam(const char *name)
 {
@@ -389,7 +363,6 @@ struct passwd *getpwnam(const char *name)
 /**********************************************************************/
 #ifdef L_getgrnam
 
-/* libc_hidden_proto(getgrnam_r) */
 
 struct group *getgrnam(const char *name)
 {
@@ -405,7 +378,6 @@ struct group *getgrnam(const char *name)
 /**********************************************************************/
 #ifdef L_getspnam
 
-/* libc_hidden_proto(getspnam_r) */
 
 struct spwd *getspnam(const char *name)
 {
@@ -421,7 +393,6 @@ struct spwd *getspnam(const char *name)
 /**********************************************************************/
 #ifdef L_getpw
 
-/* libc_hidden_proto(getpwuid_r) */
 
 int getpw(uid_t uid, char *buf)
 {
@@ -474,7 +445,6 @@ void endpwent(void)
 }
 
 
-/* libc_hidden_proto(getpwent_r) */
 int getpwent_r(struct passwd *__restrict resultbuf,
 			   char *__restrict buffer, size_t buflen,
 			   struct passwd **__restrict result)
@@ -531,7 +501,6 @@ void endgrent(void)
 	__UCLIBC_MUTEX_UNLOCK(mylock);
 }
 
-/* libc_hidden_proto(getgrent_r) */
 int getgrent_r(struct group *__restrict resultbuf,
 			   char *__restrict buffer, size_t buflen,
 			   struct group **__restrict result)
@@ -588,7 +557,6 @@ void endspent(void)
 	__UCLIBC_MUTEX_UNLOCK(mylock);
 }
 
-/* libc_hidden_proto(getspent_r) */
 int getspent_r(struct spwd *resultbuf, char *buffer,
 			   size_t buflen, struct spwd **result)
 {
@@ -622,7 +590,6 @@ libc_hidden_def(getspent_r)
 /**********************************************************************/
 #ifdef L_getpwent
 
-/* libc_hidden_proto(getpwent_r) */
 
 struct passwd *getpwent(void)
 {
@@ -638,7 +605,6 @@ struct passwd *getpwent(void)
 /**********************************************************************/
 #ifdef L_getgrent
 
-/* libc_hidden_proto(getgrent_r) */
 
 struct group *getgrent(void)
 {
@@ -654,7 +620,6 @@ struct group *getgrent(void)
 /**********************************************************************/
 #ifdef L_getspent
 
-/* libc_hidden_proto(getspent_r) */
 
 struct spwd *getspent(void)
 {
@@ -670,7 +635,6 @@ struct spwd *getspent(void)
 /**********************************************************************/
 #ifdef L_sgetspent
 
-/* libc_hidden_proto(sgetspent_r) */
 
 struct spwd *sgetspent(const char *string)
 {
@@ -773,7 +737,6 @@ int getgrouplist(const char *user, gid_t gid, gid_t *groups, int *ngroups)
 #ifdef L_initgroups
 
 #ifdef __USE_BSD
-/* libc_hidden_proto(setgroups) */
 
 int initgroups(const char *user, gid_t gid)
 {
diff --git a/libc/signal/killpg.c b/libc/signal/killpg.c
index 0e0d8f687..c2dc713d9 100644
--- a/libc/signal/killpg.c
+++ b/libc/signal/killpg.c
@@ -19,7 +19,6 @@
 #include <errno.h>
 #include <signal.h>
 
-/* libc_hidden_proto(kill) */
 
 /* Send SIG to all processes in process group PGRP.
    If PGRP is zero, send SIG to all processes in
diff --git a/libc/signal/raise.c b/libc/signal/raise.c
index fcd114cc4..1ac549d2f 100644
--- a/libc/signal/raise.c
+++ b/libc/signal/raise.c
@@ -8,14 +8,11 @@
 #include <sys/types.h>
 
 
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(kill) */
 
 int __raise (int signo)  attribute_hidden;
 int __raise(int signo)
 {
     return kill(getpid(), signo);
 }
-/* libc_hidden_proto(raise) */
 weak_alias(__raise,raise)
 libc_hidden_def(raise)
diff --git a/libc/signal/sigaddset.c b/libc/signal/sigaddset.c
index f8b117591..7577d37c2 100644
--- a/libc/signal/sigaddset.c
+++ b/libc/signal/sigaddset.c
@@ -19,7 +19,6 @@
 #include "sigsetops.h"
 
 /* Add SIGNO to SET.  */
-/* libc_hidden_proto(sigaddset) */
 int
 sigaddset (sigset_t *set, int signo)
 {
diff --git a/libc/signal/sigblock.c b/libc/signal/sigblock.c
index 5a16f336b..c3b79d9ab 100644
--- a/libc/signal/sigblock.c
+++ b/libc/signal/sigblock.c
@@ -21,12 +21,10 @@
 #include <signal.h>
 #include <string.h>
 
-/* libc_hidden_proto(sigprocmask) */
 
 #include "sigset-cvt-mask.h"
 
 /* Block signals in MASK, returning the old mask.  */
-/* libc_hidden_proto(sigblock) */
 int sigblock (int mask)
 {
   sigset_t set, oset;
diff --git a/libc/signal/sigdelset.c b/libc/signal/sigdelset.c
index fb5658a11..ff30303ea 100644
--- a/libc/signal/sigdelset.c
+++ b/libc/signal/sigdelset.c
@@ -19,7 +19,6 @@
 #include "sigsetops.h"
 
 /* Add SIGNO to SET.  */
-/* libc_hidden_proto(sigdelset) */
 int sigdelset (sigset_t *set, int signo)
 {
   if (set == NULL || signo <= 0 || signo >= NSIG)
diff --git a/libc/signal/sigempty.c b/libc/signal/sigempty.c
index 56b62bc65..b4f180bbc 100644
--- a/libc/signal/sigempty.c
+++ b/libc/signal/sigempty.c
@@ -20,10 +20,8 @@
 #include <signal.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 /* Clear all signals from SET.  */
-/* libc_hidden_proto(sigemptyset) */
 int sigemptyset (sigset_t *set)
 {
 #if 0 /* is it really required by standards?! */
diff --git a/libc/signal/sigfillset.c b/libc/signal/sigfillset.c
index b0b093032..951e76b79 100644
--- a/libc/signal/sigfillset.c
+++ b/libc/signal/sigfillset.c
@@ -20,10 +20,8 @@
 #include <signal.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 /* Set all signals in SET.  */
-/* libc_hidden_proto(sigfillset) */
 int
 sigfillset (sigset_t *set)
 {
diff --git a/libc/signal/siggetmask.c b/libc/signal/siggetmask.c
index 82d2a97bc..3992a7a0a 100644
--- a/libc/signal/siggetmask.c
+++ b/libc/signal/siggetmask.c
@@ -20,7 +20,6 @@
 #define __UCLIBC_HIDE_DEPRECATED__
 #include <signal.h>
 
-/* libc_hidden_proto(sigblock) */
 
 int
 siggetmask (void)
diff --git a/libc/signal/sighold.c b/libc/signal/sighold.c
index fde0a0c2a..6a2e718cd 100644
--- a/libc/signal/sighold.c
+++ b/libc/signal/sighold.c
@@ -22,8 +22,6 @@
 #include <stddef.h>
 #include <signal.h>
 
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(sigaddset) */
 
 int sighold (int sig)
 {
diff --git a/libc/signal/sigignore.c b/libc/signal/sigignore.c
index f484e29fc..a74c10522 100644
--- a/libc/signal/sigignore.c
+++ b/libc/signal/sigignore.c
@@ -24,7 +24,6 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-/* libc_hidden_proto(sigaction) */
 
 int sigignore (int sig)
 {
diff --git a/libc/signal/sigintr.c b/libc/signal/sigintr.c
index 1a8d60eb2..10567e939 100644
--- a/libc/signal/sigintr.c
+++ b/libc/signal/sigintr.c
@@ -20,7 +20,6 @@
 #include <signal.h>
 #include <errno.h>
 
-/* libc_hidden_proto(sigaction) */
 
 /* If INTERRUPT is nonzero, make signal SIG interrupt system calls
    (causing them to fail with EINTR); if INTERRUPT is zero, make system
diff --git a/libc/signal/sigjmp.c b/libc/signal/sigjmp.c
index 646949935..0dcbc8b02 100644
--- a/libc/signal/sigjmp.c
+++ b/libc/signal/sigjmp.c
@@ -21,7 +21,6 @@
 #include <signal.h>
 #include <libc-internal.h>
 
-/* libc_hidden_proto(sigprocmask) */
 
 /* This function is called by the `sigsetjmp' macro
    before doing a `__setjmp' on ENV[0].__jmpbuf.
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index 152f9ca32..1c72cc173 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -25,15 +25,11 @@
 #include <stddef.h>		/* For NULL.  */
 #include <string.h>
 
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(sigdelset) */
-/* libc_hidden_proto(sigsuspend) */
 
 #include "sigset-cvt-mask.h"
 
 /* Set the mask of blocked signals to MASK,
    wait for a signal to arrive, and then restore the mask.  */
-/* libc_hidden_proto(__sigpause) */
 int __sigpause (int sig_or_mask, int is_sig)
 {
   sigset_t set;
@@ -58,7 +54,6 @@ libc_hidden_def(__sigpause)
 /* We have to provide a default version of this function since the
    standards demand it.  The version which is a bit more reasonable is
    the BSD version.  So make this the default.  */
-/* libc_hidden_proto(sigpause) */
 int sigpause (int mask)
 {
   return __sigpause (mask, 0);
diff --git a/libc/signal/sigrelse.c b/libc/signal/sigrelse.c
index 1a7141ac5..07e7fddf3 100644
--- a/libc/signal/sigrelse.c
+++ b/libc/signal/sigrelse.c
@@ -22,8 +22,6 @@
 #include <stddef.h>
 #include <signal.h>
 
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(sigdelset) */
 
 int sigrelse (int sig)
 {
diff --git a/libc/signal/sigset.c b/libc/signal/sigset.c
index 03f3dc869..b91ce8083 100644
--- a/libc/signal/sigset.c
+++ b/libc/signal/sigset.c
@@ -22,8 +22,6 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigprocmask) */
 
 /* Set the disposition for SIG.  */
 __sighandler_t sigset (int sig, __sighandler_t disp)
diff --git a/libc/signal/sigsetmask.c b/libc/signal/sigsetmask.c
index f8784e288..6d0a505a7 100644
--- a/libc/signal/sigsetmask.c
+++ b/libc/signal/sigsetmask.c
@@ -21,12 +21,10 @@
 #include <signal.h>
 #include <string.h>
 
-/* libc_hidden_proto(sigprocmask) */
 
 #include "sigset-cvt-mask.h"
 
 /* Set the mask of blocked signals to MASK, returning the old mask.  */
-/* libc_hidden_proto(sigsetmask) */
 int
 sigsetmask (int mask)
 {
diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c
index bed7f979a..2cdc3acac 100644
--- a/libc/signal/sigwait.c
+++ b/libc/signal/sigwait.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #if defined __UCLIBC_HAS_REALTIME__
-/* libc_hidden_proto(sigwaitinfo) */
 
 int __sigwait (const sigset_t *set, int *sig) attribute_hidden;
 int __sigwait (const sigset_t *set, int *sig)
@@ -37,9 +36,6 @@ int __sigwait (const sigset_t *set, int *sig)
 }
 #else /* __UCLIBC_HAS_REALTIME__ */
 /* variant without REALTIME extensions */
-/* libc_hidden_proto(sigfillset) */
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigsuspend) */
 
 static smallint was_sig; /* obviously not thread-safe */
 static void ignore_signal(int sig)
@@ -98,6 +94,5 @@ int __sigwait (const sigset_t *set, int *sig)
   return was_sig == -1 ? -1 : 0;
 }
 #endif /* __UCLIBC_HAS_REALTIME__ */
-/* libc_hidden_proto(sigwait) */
 weak_alias(__sigwait,sigwait)
 libc_hidden_def(sigwait)
diff --git a/libc/signal/sysv_signal.c b/libc/signal/sysv_signal.c
index 118094b27..a696a5426 100644
--- a/libc/signal/sysv_signal.c
+++ b/libc/signal/sysv_signal.c
@@ -20,7 +20,6 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-/* libc_hidden_proto(sigaction) */
 
 /* Tolerate non-threads versions of Posix */
 #ifndef SA_ONESHOT
diff --git a/libc/stdio/_READ.c b/libc/stdio/_READ.c
index 0531b2ef2..02601c090 100644
--- a/libc/stdio/_READ.c
+++ b/libc/stdio/_READ.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(abort) */
 
 /* Given a reading stream without its end-of-file indicator set and
  * with no buffered input or ungots, read at most 'bufsize' bytes
diff --git a/libc/stdio/_WRITE.c b/libc/stdio/_WRITE.c
index 3d6174325..10b3b9584 100644
--- a/libc/stdio/_WRITE.c
+++ b/libc/stdio/_WRITE.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(write) */
 
 /* Given a writing stream with no buffered output, write the
  * data in 'buf' (which may be the stream's bufstart) of size
diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c
index 2011cc78c..6d4fc18b8 100644
--- a/libc/stdio/__fsetlocking.c
+++ b/libc/stdio/__fsetlocking.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-/* libc_hidden_proto(__fsetlocking) */
 
 /* Not threadsafe. */
 
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 69a04bcc8..49b636b19 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -7,13 +7,8 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(lseek64) */
 #else
-/* libc_hidden_proto(lseek) */
 #endif
 
 /**********************************************************************/
diff --git a/libc/stdio/_flushlbf.c b/libc/stdio/_flushlbf.c
index 7146e9bc9..c322c3e33 100644
--- a/libc/stdio/_flushlbf.c
+++ b/libc/stdio/_flushlbf.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-/* libc_hidden_proto(fflush_unlocked) */
 
 /* Solaris function --
  * Flush all line buffered (writing) streams.
diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index 51d1cf9bf..96377ee44 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -7,9 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(isatty) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(fcntl) */
 
 /*
  * Cases:
diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c
index 0aab23364..1332a20e7 100644
--- a/libc/stdio/_fpmaxtostr.c
+++ b/libc/stdio/_fpmaxtostr.c
@@ -11,7 +11,6 @@
 #include <locale.h>
 #include <bits/uClibc_fpmax.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len,
 								intptr_t buf);
diff --git a/libc/stdio/_fwrite.c b/libc/stdio/_fwrite.c
index ba4b02fb1..47860afbf 100644
--- a/libc/stdio/_fwrite.c
+++ b/libc/stdio/_fwrite.c
@@ -7,9 +7,6 @@
 
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memrchr) */
 
 #ifdef __STDIO_BUFFERS
 
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 9189a52e1..11d5c7854 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -77,31 +77,10 @@
 #include <bits/uClibc_fpmax.h>
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(ungetc) */
-/* libc_hidden_proto(vfscanf) */
-/* libc_hidden_proto(vsscanf) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(wcslen) */
-/* libc_hidden_proto(vfwscanf) */
-/* libc_hidden_proto(vswscanf) */
-/* libc_hidden_proto(mbsrtowcs) */
-/* libc_hidden_proto(mbrtowc) */
-/* libc_hidden_proto(wcrtomb) */
-/* libc_hidden_proto(ungetwc) */
-/* libc_hidden_proto(iswspace) */
-/* libc_hidden_proto(fgetwc_unlocked) */
 #endif
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
@@ -165,7 +144,6 @@ _stdlib_strto_l(register const char * __restrict str,
 /**********************************************************************/
 #ifdef L_fscanf
 
-/* libc_hidden_proto(fscanf) */
 int fscanf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -201,7 +179,6 @@ int scanf(const char * __restrict format, ...)
 
 #ifdef __STDIO_HAS_VSSCANF
 
-/* libc_hidden_proto(sscanf) */
 int sscanf(const char * __restrict str, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -223,7 +200,6 @@ libc_hidden_def(sscanf)
 /**********************************************************************/
 #ifdef L_vscanf
 
-/* libc_hidden_proto(vscanf) */
 int vscanf(const char * __restrict format, va_list arg)
 {
 	return vfscanf(stdin, format, arg);
diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c
index 3c3ce59c7..3c8d667d2 100644
--- a/libc/stdio/_stdio.c
+++ b/libc/stdio/_stdio.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(isatty) */
 
 /* This is pretty much straight from uClibc, but with one important
  * difference.
diff --git a/libc/stdio/_trans2w.c b/libc/stdio/_trans2w.c
index 57a06d336..c72237939 100644
--- a/libc/stdio/_trans2w.c
+++ b/libc/stdio/_trans2w.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fseek) */
 
 /* Function to handle transition to writing.
  *   Initialize or verify the stream's orientation (even if readonly).
diff --git a/libc/stdio/_uintmaxtostr.c b/libc/stdio/_uintmaxtostr.c
index 086f6abd1..4be2c462f 100644
--- a/libc/stdio/_uintmaxtostr.c
+++ b/libc/stdio/_uintmaxtostr.c
@@ -11,7 +11,6 @@
 #include <locale.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* Avoid using long long / and % operations to cut down dependencies on
  * libgcc.a.  Definitely helps on i386 at least. */
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index c9d0f6bb9..d651cc965 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -115,21 +115,7 @@
 #include <bits/uClibc_uintmaxtostr.h>
 #include <bits/uClibc_va_copy.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(fputs_unlocked) */
-/* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(wcslen) */
-/* libc_hidden_proto(wcsnlen) */
-/* libc_hidden_proto(mbsrtowcs) */
-/* libc_hidden_proto(wcsrtombs) */
-/* libc_hidden_proto(btowc) */
-/* libc_hidden_proto(wcrtomb) */
-/* libc_hidden_proto(fputws) */
 #endif
 
 /* Some older or broken gcc toolchains define LONG_LONG_MAX but not
@@ -729,9 +715,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs)
 #ifdef L__ppfs_parsespec
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /* Notes: argtype differs from glibc for the following:
@@ -1860,7 +1844,6 @@ static int _do_one_spec(FILE * __restrict stream,
 	return 0;
 }
 
-/* libc_hidden_proto(fprintf) */
 
 int VFPRINTF_internal (FILE * __restrict stream,
 			  const FMT_TYPE * __restrict format,
diff --git a/libc/stdio/_wfwrite.c b/libc/stdio/_wfwrite.c
index 81f5bd4e8..517e3a7a3 100644
--- a/libc/stdio/_wfwrite.c
+++ b/libc/stdio/_wfwrite.c
@@ -16,8 +16,6 @@
 #warning TODO: Fix prototype.
 #endif
 
-/* libc_hidden_proto(wmemcpy) */
-/* libc_hidden_proto(wcsnrtombs) */
 
 size_t attribute_hidden _wstdio_fwrite(const wchar_t *__restrict ws, size_t n,
 					  register FILE *__restrict stream)
diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c
index 8c6420936..6334cc72a 100644
--- a/libc/stdio/asprintf.c
+++ b/libc/stdio/asprintf.c
@@ -11,9 +11,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(asprintf) */
 
-/* libc_hidden_proto(vasprintf) */
 
 #ifndef __STDIO_HAS_VSNPRINTF
 #warning Skipping asprintf and __asprintf since no vsnprintf!
diff --git a/libc/stdio/ctermid.c b/libc/stdio/ctermid.c
index 26369d6f5..854c526ea 100644
--- a/libc/stdio/ctermid.c
+++ b/libc/stdio/ctermid.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
 
 char *ctermid(register char *s)
 {
diff --git a/libc/stdio/dprintf.c b/libc/stdio/dprintf.c
index 0123c501a..3fab12739 100644
--- a/libc/stdio/dprintf.c
+++ b/libc/stdio/dprintf.c
@@ -11,7 +11,6 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vdprintf) */
 
 int dprintf(int filedes, const char * __restrict format, ...)
 {
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index 7d2138130..3417b2678 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -6,10 +6,7 @@
  */
 
 #include "_stdio.h"
-/* libc_hidden_proto(fclose) */
 
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(fflush_unlocked) */
 
 int fclose(register FILE *stream)
 {
diff --git a/libc/stdio/fcloseall.c b/libc/stdio/fcloseall.c
index b13da31a1..4d78b37d6 100644
--- a/libc/stdio/fcloseall.c
+++ b/libc/stdio/fcloseall.c
@@ -10,7 +10,6 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* 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/fdopen.c b/libc/stdio/fdopen.c
index 85ece2a5f..76c239f4d 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fdopen) */
-/* libc_hidden_proto(fcntl) */
 
 FILE *fdopen(int filedes, const char *mode)
 {
diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index 01564a936..8b918d6bb 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fflush_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -179,14 +178,12 @@ int fflush_unlocked(register FILE *stream)
 libc_hidden_def(fflush_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fflush) */
 strong_alias(fflush_unlocked,fflush)
 libc_hidden_def(fflush)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fflush) */
 int fflush(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index dfe57a6cd..fc25002ee 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -13,11 +13,9 @@
 #undef getc
 #undef getc_unlocked
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(fflush_unlocked) */
 
 int __fgetc_unlocked(FILE *stream)
 {
@@ -75,7 +73,6 @@ int __fgetc_unlocked(FILE *stream)
 }
 libc_hidden_def(__fgetc_unlocked)
 
-/* libc_hidden_proto(fgetc_unlocked) */
 strong_alias(__fgetc_unlocked,fgetc_unlocked)
 libc_hidden_def(fgetc_unlocked)
 
@@ -83,12 +80,10 @@ libc_hidden_def(fgetc_unlocked)
 //strong_alias(__fgetc_unlocked,__getc_unlocked)
 //libc_hidden_def(__getc_unlocked)
 
-/* libc_hidden_proto(getc_unlocked) */
 strong_alias(__fgetc_unlocked,getc_unlocked)
 libc_hidden_def(getc_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fgetc) */
 strong_alias(__fgetc_unlocked,fgetc)
 libc_hidden_def(fgetc)
 
@@ -97,7 +92,6 @@ strong_alias(__fgetc_unlocked,getc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgetc) */
 int fgetc(register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index 0c7b97ecd..bc710c764 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -7,11 +7,9 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fgets_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 char *fgets_unlocked(char *__restrict s, int n,
 					   register FILE * __restrict stream)
@@ -64,14 +62,12 @@ char *fgets_unlocked(char *__restrict s, int n,
 libc_hidden_def(fgets_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fgets) */
 strong_alias(fgets_unlocked,fgets)
 libc_hidden_def(fgets)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgets) */
 char *fgets(char *__restrict s, int n,
 			register FILE * __restrict stream)
 {
diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index 18a6b5bb5..32d9e0ea3 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fgetwc_unlocked) */
 
-/* libc_hidden_proto(mbrtowc) */
 
 #ifdef __DO_UNLOCKED
 
@@ -113,7 +111,6 @@ libc_hidden_def(fgetwc_unlocked)
 
 strong_alias(fgetwc_unlocked,getwc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fgetwc) */
 strong_alias(fgetwc_unlocked,fgetwc)
 libc_hidden_def(fgetwc)
 
@@ -122,7 +119,6 @@ strong_alias(fgetwc_unlocked,getwc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgetwc) */
 wint_t fgetwc(register FILE *stream)
 {
 	wint_t retval;
diff --git a/libc/stdio/fgetws.c b/libc/stdio/fgetws.c
index 80af1a217..b59d74b15 100644
--- a/libc/stdio/fgetws.c
+++ b/libc/stdio/fgetws.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fgetws_unlocked) */
 
-/* libc_hidden_proto(fgetwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index faed620d8..452572bae 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fileno_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -25,14 +24,12 @@ int fileno_unlocked(register FILE *stream)
 libc_hidden_def(fileno_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fileno) */
 strong_alias(fileno_unlocked,fileno)
 libc_hidden_def(fileno)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fileno) */
 int fileno(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c
index 269c7ec6d..4a67376f5 100644
--- a/libc/stdio/fmemopen.c
+++ b/libc/stdio/fmemopen.c
@@ -10,8 +10,6 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
diff --git a/libc/stdio/fopen.c b/libc/stdio/fopen.c
index d33e28aa1..a2d6617e8 100644
--- a/libc/stdio/fopen.c
+++ b/libc/stdio/fopen.c
@@ -14,7 +14,6 @@
 # undef fopen64
 #endif
 
-/* libc_hidden_proto(fopen) */
 FILE *fopen(const char * __restrict filename, const char * __restrict mode)
 {
 	return _stdio_fopen(((intptr_t) filename), mode, NULL, FILEDES_ARG);
diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c
index ac2c33483..c4927e0bd 100644
--- a/libc/stdio/fopencookie.c
+++ b/libc/stdio/fopencookie.c
@@ -31,7 +31,6 @@
 /* Currently no real reentrancy issues other than a possible double close(). */
 
 #ifndef __BCC__
-/* libc_hidden_proto(fopencookie) */
 FILE *fopencookie(void * __restrict cookie, const char * __restrict mode,
 				  cookie_io_functions_t io_functions)
 #else
diff --git a/libc/stdio/fprintf.c b/libc/stdio/fprintf.c
index 4e3246ec8..fb7549566 100644
--- a/libc/stdio/fprintf.c
+++ b/libc/stdio/fprintf.c
@@ -8,9 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vfprintf) */
 
-/* libc_hidden_proto(fprintf) */
 int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c
index f426161d2..b49f868f1 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -12,7 +12,6 @@
 #undef putc
 #undef putc_unlocked
 
-/* libc_hidden_proto(__fputc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -72,26 +71,21 @@ int __fputc_unlocked(int c, register FILE *stream)
 }
 libc_hidden_def(__fputc_unlocked)
 
-/* libc_hidden_proto(fputc_unlocked) */
 strong_alias(__fputc_unlocked,fputc_unlocked)
 libc_hidden_def(fputc_unlocked)
 
-/* libc_hidden_proto(putc_unlocked) */
 strong_alias(__fputc_unlocked,putc_unlocked)
 libc_hidden_def(putc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fputc) */
 strong_alias(__fputc_unlocked,fputc)
 libc_hidden_def(fputc)
 
-/* libc_hidden_proto(putc) */
 strong_alias(__fputc_unlocked,putc)
 libc_hidden_def(putc)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fputc) */
 int fputc(int c, register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
@@ -106,7 +100,6 @@ int fputc(int c, register FILE *stream)
 }
 libc_hidden_def(fputc)
 
-/* libc_hidden_proto(putc) */
 strong_alias(fputc,putc)
 libc_hidden_def(putc)
 
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index 08da59c40..b3ede6871 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -7,10 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fputs_unlocked) */
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fwrite_unlocked) */
 
 /* Note: The standard says fputs returns a nonnegative number on
  * success.  In this implementation, we return the length of the
@@ -29,14 +26,12 @@ int fputs_unlocked(register const char * __restrict s,
 libc_hidden_def(fputs_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fputs) */
 strong_alias(fputs_unlocked,fputs)
 libc_hidden_def(fputs)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fputs) */
 int fputs(const char * __restrict s, register FILE * __restrict stream)
 {
 	int retval;
diff --git a/libc/stdio/fputwc.c b/libc/stdio/fputwc.c
index 6c7d6b263..7f46f48b8 100644
--- a/libc/stdio/fputwc.c
+++ b/libc/stdio/fputwc.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fputwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c
index a4fadb428..7a1892188 100644
--- a/libc/stdio/fputws.c
+++ b/libc/stdio/fputws.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fputws_unlocked) */
 
-/* libc_hidden_proto(wcslen) */
 
 #ifdef __DO_UNLOCKED
 
@@ -23,14 +21,12 @@ int fputws_unlocked(const wchar_t *__restrict ws,
 libc_hidden_def(fputws_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fputws) */
 strong_alias(fputws_unlocked,fputws)
 libc_hidden_def(fputws)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fputws) */
 int fputws(const wchar_t *__restrict ws, register FILE *__restrict stream)
 {
 	int retval;
diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c
index 55d3cb2d3..d2fcc70d5 100644
--- a/libc/stdio/fread.c
+++ b/libc/stdio/fread.c
@@ -7,12 +7,9 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fread_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fflush_unlocked) */
 
 size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,
 						FILE * __restrict stream)
@@ -90,14 +87,12 @@ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,
 libc_hidden_def(fread_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fread) */
 strong_alias(fread_unlocked,fread)
 libc_hidden_def(fread)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fread) */
 size_t fread(void * __restrict ptr, size_t size, size_t nmemb,
 			 register FILE * __restrict stream)
 {
diff --git a/libc/stdio/freopen.c b/libc/stdio/freopen.c
index d51a549b9..f48a43b73 100644
--- a/libc/stdio/freopen.c
+++ b/libc/stdio/freopen.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fclose) */
 
 #ifndef __DO_LARGEFILE
 # define FILEDES_ARG    (-1)
diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c
index a7f8b8dc1..5f3bbbb98 100644
--- a/libc/stdio/fseeko.c
+++ b/libc/stdio/fseeko.c
@@ -17,9 +17,7 @@
 #endif
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(fseeko64) */
 #endif
-/* libc_hidden_proto(fseek) */
 
 int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence)
 {
diff --git a/libc/stdio/ftello.c b/libc/stdio/ftello.c
index f6adf3874..ad8f4df60 100644
--- a/libc/stdio/ftello.c
+++ b/libc/stdio/ftello.c
@@ -8,9 +8,7 @@
 #include "_stdio.h"
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(ftello64) */
 #endif
-/* libc_hidden_proto(ftell) */
 
 #ifndef __DO_LARGEFILE
 # define FTELL         ftell
diff --git a/libc/stdio/fwprintf.c b/libc/stdio/fwprintf.c
index 6bae0c7a4..2f2dddc10 100644
--- a/libc/stdio/fwprintf.c
+++ b/libc/stdio/fwprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vfwprintf) */
 
 int fwprintf(FILE * __restrict stream, const wchar_t * __restrict format, ...)
 {
diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c
index 180fa9249..71793ff26 100644
--- a/libc/stdio/fwrite.c
+++ b/libc/stdio/fwrite.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fwrite_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -38,14 +37,12 @@ size_t fwrite_unlocked(const void * __restrict ptr, size_t size,
 libc_hidden_def(fwrite_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fwrite) */
 strong_alias(fwrite_unlocked,fwrite)
 libc_hidden_def(fwrite)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fwrite) */
 size_t fwrite(const void * __restrict ptr, size_t size,
 			  size_t nmemb, register FILE * __restrict stream)
 {
diff --git a/libc/stdio/getchar.c b/libc/stdio/getchar.c
index 2ef7220e4..b6c650c9b 100644
--- a/libc/stdio/getchar.c
+++ b/libc/stdio/getchar.c
@@ -7,14 +7,12 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #undef getchar
 #ifdef __DO_UNLOCKED
 
 /* the only use of the hidden getchar_unlocked is in gets.c */
 #undef getchar_unlocked
-/* libc_hidden_proto(getchar_unlocked) */
 int getchar_unlocked(void)
 {
 	register FILE *stream = stdin;
diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
index 30fca81d7..987e32a19 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -10,9 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* libc_hidden_proto(getdelim) */
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 /* Note: There is a defect in this function.  (size_t vs ssize_t). */
 
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
index 8123b0c95..98ce8d108 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -10,9 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* libc_hidden_proto(getline) */
 
-/* libc_hidden_proto(getdelim) */
 
 ssize_t getline(char **__restrict lineptr, size_t *__restrict n,
 				FILE *__restrict stream)
diff --git a/libc/stdio/gets.c b/libc/stdio/gets.c
index c8271977e..515e966d1 100644
--- a/libc/stdio/gets.c
+++ b/libc/stdio/gets.c
@@ -13,7 +13,6 @@ link_warning(gets, "the 'gets' function is dangerous and should not be used.")
 
 /* disable macro, force actual function call */
 #undef getchar_unlocked
-/* libc_hidden_proto(getchar_unlocked) */
 
 char *gets(char *s)
 {
diff --git a/libc/stdio/getw.c b/libc/stdio/getw.c
index 75255aae9..625f17f3e 100644
--- a/libc/stdio/getw.c
+++ b/libc/stdio/getw.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fread_unlocked) */
 
 /* SUSv2 Legacy function -- need not be reentrant. */
 
diff --git a/libc/stdio/getwchar.c b/libc/stdio/getwchar.c
index c17f0c71c..75266de3a 100644
--- a/libc/stdio/getwchar.c
+++ b/libc/stdio/getwchar.c
@@ -9,7 +9,6 @@
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(fgetwc_unlocked) */
 
 wint_t getwchar_unlocked(void)
 {
@@ -22,7 +21,6 @@ strong_alias(getwchar_unlocked,getwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgetwc) */
 
 wint_t getwchar(void)
 {
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index e3a817368..7d4bfea6a 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -143,12 +143,6 @@
 #include <pthread.h>
 #endif /* __UCLIBC_HAS_THREADS__ */
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(putc_unlocked) */
-/* libc_hidden_proto(__fputc_unlocked) */
-/* libc_hidden_proto(__glibc_strerror_r) */
 
 /*  #undef __UCLIBC_HAS_FLOATS__ */
 /*  #undef WANT_FLOAT_ERROR */
@@ -343,7 +337,6 @@ static const char u_spec[] = "%nbopxXudics";
 /* u_radix[i] <-> u_spec[i+2] for unsigned entries only */
 static const char u_radix[] = "\x02\x08\x10\x10\x10\x0a";
 
-/* libc_hidden_proto(vfprintf) */
 int vfprintf(FILE * __restrict op, register const char * __restrict fmt,
 			 va_list ap)
 {
diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c
index 46142a089..8b552c796 100644
--- a/libc/stdio/open_memstream.c
+++ b/libc/stdio/open_memstream.c
@@ -10,9 +10,6 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
@@ -131,7 +128,6 @@ static const cookie_io_functions_t _oms_io_funcs = {
  * (ie replace the FILE buffer with the cookie buffer and update FILE bufstart,
  * etc. whenever we seek). */
 
-/* libc_hidden_proto(open_memstream) */
 FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc)
 {
 	register __oms_cookie *cookie;
diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c
index a01c4fe18..8b943e467 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -7,14 +7,11 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__glibc_strerror_r) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning CONSIDER: Increase buffer size for error message (non-%m case)?
 #endif
 
-/* libc_hidden_proto(perror) */
 void perror(register const char *s)
 {
 	/* If the program is calling perror, it's a safe bet that printf and
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index e920b8d7e..d5c60cf2a 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -26,15 +26,6 @@
 #warning "hmm... susv3 says Pipe streams are byte-oriented."
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(waitpid) */
-/* libc_hidden_proto(execl) */
-/* libc_hidden_proto(dup2) */
-/* libc_hidden_proto(fdopen) */
-/* libc_hidden_proto(pipe) */
-/* libc_hidden_proto(vfork) */
-/* libc_hidden_proto(fclose) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
@@ -42,7 +33,6 @@
 # define vfork fork
 # define VFORK_LOCK		((void) 0)
 # define VFORK_UNLOCK		((void) 0)
-/* libc_hidden_proto(fork) */
 #endif
 
 #ifndef VFORK_LOCK
diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c
index 2f4a36e95..8cd3db9f1 100644
--- a/libc/stdio/printf.c
+++ b/libc/stdio/printf.c
@@ -8,9 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vfprintf) */
 
-/* libc_hidden_proto(printf) */
 int printf(const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/putchar.c b/libc/stdio/putchar.c
index 65d8f64c1..583e90f44 100644
--- a/libc/stdio/putchar.c
+++ b/libc/stdio/putchar.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(__fputc_unlocked) */
 
 #undef putchar
 #ifdef __DO_UNLOCKED
diff --git a/libc/stdio/puts.c b/libc/stdio/puts.c
index 3ece1ba68..67775ff7c 100644
--- a/libc/stdio/puts.c
+++ b/libc/stdio/puts.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(__fputc_unlocked) */
-/* libc_hidden_proto(fputs_unlocked) */
 
 int puts(register const char * __restrict s)
 {
diff --git a/libc/stdio/putw.c b/libc/stdio/putw.c
index 5074117b6..ffdb11478 100644
--- a/libc/stdio/putw.c
+++ b/libc/stdio/putw.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fwrite_unlocked) */
 
 /* SUSv2 Legacy function -- need not be reentrant. */
 
diff --git a/libc/stdio/putwchar.c b/libc/stdio/putwchar.c
index aa6531988..3fadb61db 100644
--- a/libc/stdio/putwchar.c
+++ b/libc/stdio/putwchar.c
@@ -9,7 +9,6 @@
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(fputwc_unlocked) */
 
 wint_t putwchar_unlocked(wchar_t wc)
 {
@@ -22,9 +21,7 @@ strong_alias(putwchar_unlocked,putwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(__fputc_unlocked) */
 /* psm: should this be fputwc? */
-/* libc_hidden_proto(fputc) */
 
 wint_t putwchar(wchar_t wc)
 {
diff --git a/libc/stdio/rewind.c b/libc/stdio/rewind.c
index 600f8cd0e..1b170443a 100644
--- a/libc/stdio/rewind.c
+++ b/libc/stdio/rewind.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fseek) */
 
-/* libc_hidden_proto(rewind) */
 void rewind(register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
diff --git a/libc/stdio/setbuf.c b/libc/stdio/setbuf.c
index b9bdc8b5b..e6080a522 100644
--- a/libc/stdio/setbuf.c
+++ b/libc/stdio/setbuf.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(setvbuf) */
 
 void setbuf(FILE * __restrict stream, register char * __restrict buf)
 {
diff --git a/libc/stdio/setbuffer.c b/libc/stdio/setbuffer.c
index 428b38936..b566bfc39 100644
--- a/libc/stdio/setbuffer.c
+++ b/libc/stdio/setbuffer.c
@@ -9,7 +9,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(setvbuf) */
 
 /* A BSD function.  The implementation matches the linux man page,
  * except that we do not bother calling setvbuf if not configured
diff --git a/libc/stdio/setlinebuf.c b/libc/stdio/setlinebuf.c
index 564776989..932338886 100644
--- a/libc/stdio/setlinebuf.c
+++ b/libc/stdio/setlinebuf.c
@@ -9,7 +9,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(setvbuf) */
 
 /* A BSD function.  The implementation matches the linux man page,
  * except that we do not bother calling setvbuf if not configured
diff --git a/libc/stdio/setvbuf.c b/libc/stdio/setvbuf.c
index 7f0c6f6f3..0b0ea0dde 100644
--- a/libc/stdio/setvbuf.c
+++ b/libc/stdio/setvbuf.c
@@ -14,7 +14,6 @@
 #error Assumption violated for buffering mode flags
 #endif
 
-/* libc_hidden_proto(setvbuf) */
 int setvbuf(register FILE * __restrict stream, register char * __restrict buf,
 			int mode, size_t size)
 {
diff --git a/libc/stdio/snprintf.c b/libc/stdio/snprintf.c
index 1b1f089cd..e0902ac70 100644
--- a/libc/stdio/snprintf.c
+++ b/libc/stdio/snprintf.c
@@ -12,9 +12,7 @@
 #warning Skipping snprintf since no vsnprintf!
 #else
 
-/* libc_hidden_proto(vsnprintf) */
 
-/* libc_hidden_proto(snprintf) */
 int snprintf(char *__restrict buf, size_t size,
 			 const char * __restrict format, ...)
 {
diff --git a/libc/stdio/sprintf.c b/libc/stdio/sprintf.c
index 594c51b86..44304b5da 100644
--- a/libc/stdio/sprintf.c
+++ b/libc/stdio/sprintf.c
@@ -12,9 +12,7 @@
 #warning Skipping sprintf since no vsnprintf!
 #else
 
-/* libc_hidden_proto(vsnprintf) */
 
-/* libc_hidden_proto(sprintf) */
 int sprintf(char *__restrict buf, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/swprintf.c b/libc/stdio/swprintf.c
index 4af8a6b11..8e037d20d 100644
--- a/libc/stdio/swprintf.c
+++ b/libc/stdio/swprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vswprintf) */
 
 #ifndef __STDIO_BUFFERS
 #warning Skipping swprintf since no buffering!
diff --git a/libc/stdio/tempnam.c b/libc/stdio/tempnam.c
index 3673f4bda..faf7c5ecb 100644
--- a/libc/stdio/tempnam.c
+++ b/libc/stdio/tempnam.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include "../misc/internals/tempname.h"
 
-/* Experimentally off - libc_hidden_proto(strdup) */
 
 /* Generate a unique temporary filename using up to five characters of PFX
    if it is not NULL.  The directory to put this file in is searched for
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
index bb843affd..2f973c329 100644
--- a/libc/stdio/tmpfile.c
+++ b/libc/stdio/tmpfile.c
@@ -21,9 +21,6 @@
 #include <unistd.h>
 #include "../misc/internals/tempname.h"
 
-/* libc_hidden_proto(fdopen) */
-/* libc_hidden_proto(remove) */
-/* libc_hidden_proto(close) */
 
 /* This returns a new stream opened on a temporary file (generated
    by tmpnam).  The file is opened with mode "w+b" (binary read/write).
diff --git a/libc/stdio/tmpnam.c b/libc/stdio/tmpnam.c
index 8df6ff57f..1f180e08a 100644
--- a/libc/stdio/tmpnam.c
+++ b/libc/stdio/tmpnam.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include "../misc/internals/tempname.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static char tmpnam_buffer[L_tmpnam];
 
diff --git a/libc/stdio/ungetc.c b/libc/stdio/ungetc.c
index dcec91904..ea4edd22c 100644
--- a/libc/stdio/ungetc.c
+++ b/libc/stdio/ungetc.c
@@ -24,7 +24,6 @@
  *     (See section 7.19.6.2 of the C9X rationale -- WG14/N897.)
  */
 
-/* libc_hidden_proto(ungetc) */
 int ungetc(int c, register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
diff --git a/libc/stdio/ungetwc.c b/libc/stdio/ungetwc.c
index 438cb7572..25b12b887 100644
--- a/libc/stdio/ungetwc.c
+++ b/libc/stdio/ungetwc.c
@@ -12,7 +12,6 @@
  * as reset stream->__ungot_width[1] for use by _stdio_adjpos().
  */
 
-/* libc_hidden_proto(ungetwc) */
 wint_t ungetwc(wint_t c, register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index 02f495efb..175c497a5 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -23,14 +23,9 @@
 #else
 
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
-/* libc_hidden_proto(open_memstream) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(vfprintf) */
 #else
-/* libc_hidden_proto(vsnprintf) */
 #endif
 
-/* libc_hidden_proto(vasprintf) */
 int vasprintf(char **__restrict buf, const char * __restrict format,
 			 va_list arg)
 {
diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c
index b51aba4be..8e9926ff0 100644
--- a/libc/stdio/vdprintf.c
+++ b/libc/stdio/vdprintf.c
@@ -12,11 +12,8 @@
 #include <stdarg.h>
 
 #ifdef __USE_OLD_VFPRINTF__
-/* libc_hidden_proto(vfprintf) */
 #endif
-/* libc_hidden_proto(fflush_unlocked) */
 
-/* libc_hidden_proto(vdprintf) */
 int vdprintf(int filedes, const char * __restrict format, va_list arg)
 {
 	FILE f;
diff --git a/libc/stdio/vprintf.c b/libc/stdio/vprintf.c
index b01b2310f..853f340cc 100644
--- a/libc/stdio/vprintf.c
+++ b/libc/stdio/vprintf.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vfprintf) */
 
 int vprintf(const char * __restrict format, va_list arg)
 {
diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c
index 01ffb4ba0..7eb91eeff 100644
--- a/libc/stdio/vsnprintf.c
+++ b/libc/stdio/vsnprintf.c
@@ -8,10 +8,8 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vsnprintf) */
 
 #ifdef __USE_OLD_VFPRINTF__
-/* libc_hidden_proto(vfprintf) */
 #endif
 
 #ifdef __UCLIBC_MJN3_ONLY__
diff --git a/libc/stdio/vsprintf.c b/libc/stdio/vsprintf.c
index b44789e69..d87090147 100644
--- a/libc/stdio/vsprintf.c
+++ b/libc/stdio/vsprintf.c
@@ -12,7 +12,6 @@
 #warning Skipping vsprintf since no vsnprintf!
 #else
 
-/* libc_hidden_proto(vsnprintf) */
 
 int vsprintf(char *__restrict buf, const char * __restrict format,
 			 va_list arg)
diff --git a/libc/stdio/vswprintf.c b/libc/stdio/vswprintf.c
index 10f7cc467..e509216e9 100644
--- a/libc/stdio/vswprintf.c
+++ b/libc/stdio/vswprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vswprintf) */
 
 /* NB: this file is not used if __USE_OLD_VFPRINTF__ */
 
diff --git a/libc/stdio/vwprintf.c b/libc/stdio/vwprintf.c
index 4e666cb54..25dd5b3fa 100644
--- a/libc/stdio/vwprintf.c
+++ b/libc/stdio/vwprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vfwprintf) */
 
 int vwprintf(const wchar_t * __restrict format, va_list arg)
 {
diff --git a/libc/stdio/wprintf.c b/libc/stdio/wprintf.c
index 80d76d5bb..b3a6318a5 100644
--- a/libc/stdio/wprintf.c
+++ b/libc/stdio/wprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vfwprintf) */
 
 int wprintf(const wchar_t * __restrict format, ...)
 {
diff --git a/libc/stdlib/__uc_malloc.c b/libc/stdlib/__uc_malloc.c
index 38457596f..2a2e223ef 100644
--- a/libc/stdlib/__uc_malloc.c
+++ b/libc/stdlib/__uc_malloc.c
@@ -22,9 +22,6 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(__uc_malloc) */
-/* libc_hidden_proto(__uc_malloc_failed) */
 
 void (*__uc_malloc_failed)(size_t size) = NULL;
 /* Seemingly superfluous assigment of NULL above prevents gas error
diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
index 884032bba..0d420d3c9 100644
--- a/libc/stdlib/_atexit.c
+++ b/libc/stdlib/_atexit.c
@@ -46,8 +46,6 @@
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_EXTERN(__atexit_lock);
 
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(_exit) */
 
 
 typedef void (*aefuncp) (void);         /* atexit function pointer */
diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c
index 6a3d246ea..71fba8248 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -110,12 +110,10 @@
 # include <wchar.h>
 # include <wctype.h>
 # include <bits/uClibc_uwchar.h>
-/* libc_hidden_proto(iswspace) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 # include <xlocale.h>
-/* libc_hidden_proto(iswspace_l) */
 #endif
 
 /* Handle _STRTOD_HEXADECIMAL_FLOATS via uClibc config now. */
@@ -175,10 +173,7 @@ 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) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
 
 #if defined(L___wcstofpmax) || defined(L___wcstofpmax_l)
@@ -214,7 +209,6 @@ __fpmax_t attribute_hidden __strtofpmax(const Wchar *str, Wchar **endptr, int ex
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
 
 __fpmax_t attribute_hidden __XL_NPP(__strtofpmax)(const Wchar *str, Wchar **endptr, int exponent_power
 								 __LOCALE_PARAM )
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index fcf90187c..3cc796370 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -26,13 +26,7 @@ Cambridge, MA 02139, USA.  */
 #include <signal.h>
 #include <errno.h>
 
-/* libc_hidden_proto(abort) */
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(raise) */
-/* libc_hidden_proto(_exit) */
 
 /* Our last ditch effort to commit suicide */
 #ifdef __UCLIBC_ABORT_INSTRUCTION__
diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c
index e7d69f168..416db6d0c 100644
--- a/libc/stdlib/arc4random.c
+++ b/libc/stdlib/arc4random.c
@@ -38,10 +38,6 @@
 //libc_hidden_proto(sysctl)
 #endif
 
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(gettimeofday) */
 
 struct arc4_stream {
 	uint8_t i;
@@ -168,7 +164,6 @@ arc4_getword(as)
 	return val;
 }
 
-/* libc_hidden_proto(arc4random_stir) */
 void
 arc4random_stir(void)
 {
diff --git a/libc/stdlib/bsd_getpt.c b/libc/stdlib/bsd_getpt.c
index c7582e855..e704e235f 100644
--- a/libc/stdlib/bsd_getpt.c
+++ b/libc/stdlib/bsd_getpt.c
@@ -23,8 +23,6 @@
 #include <unistd.h>
 
 #if defined __USE_BSD
-/* libc_hidden_proto(open) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
 
 /* Prefix for master pseudo terminal nodes.  */
 #define _PATH_PTY "/dev/pty"
diff --git a/libc/stdlib/drand48.c b/libc/stdlib/drand48.c
index f0d20de61..8c9017b11 100644
--- a/libc/stdlib/drand48.c
+++ b/libc/stdlib/drand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(erand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/drand48_r.c b/libc/stdlib/drand48_r.c
index 96fb186f4..df07b0752 100644
--- a/libc/stdlib/drand48_r.c
+++ b/libc/stdlib/drand48_r.c
@@ -21,7 +21,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(erand48_r) */
 
 int drand48_r (struct drand48_data *buffer, double *result)
 {
diff --git a/libc/stdlib/erand48.c b/libc/stdlib/erand48.c
index 913d6ed84..ee28d9635 100644
--- a/libc/stdlib/erand48.c
+++ b/libc/stdlib/erand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(erand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/erand48_r.c b/libc/stdlib/erand48_r.c
index f367f8dc6..e36e73eb2 100644
--- a/libc/stdlib/erand48_r.c
+++ b/libc/stdlib/erand48_r.c
@@ -24,7 +24,6 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-/* libc_hidden_proto(erand48_r) */
 int erand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, double *result)
 {
     union ieee754_double temp;
diff --git a/libc/stdlib/gcvt.c b/libc/stdlib/gcvt.c
index 6c61ee1e4..3c27b62c4 100644
--- a/libc/stdlib/gcvt.c
+++ b/libc/stdlib/gcvt.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(sprintf) */
 
 #ifdef __UCLIBC_HAS_FLOATS__
 #define MAX_NDIGIT 17
diff --git a/libc/stdlib/getenv.c b/libc/stdlib/getenv.c
index e0193e223..d5db1785c 100644
--- a/libc/stdlib/getenv.c
+++ b/libc/stdlib/getenv.c
@@ -8,9 +8,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(getenv) */
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 
 /* IEEE Std 1003.1-2001 says getenv need not be thread safe, so
  * don't bother locking access to __environ */
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index f39e79664..2d8b207d3 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -27,8 +27,6 @@
 
 extern __typeof(statfs) __libc_statfs;
 
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
 
 #if !defined __ASSUME_DEVPTS__
 
diff --git a/libc/stdlib/jrand48.c b/libc/stdlib/jrand48.c
index 7bfc9d608..163c5408e 100644
--- a/libc/stdlib/jrand48.c
+++ b/libc/stdlib/jrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(jrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/jrand48_r.c b/libc/stdlib/jrand48_r.c
index da2a1506d..24f7075f5 100644
--- a/libc/stdlib/jrand48_r.c
+++ b/libc/stdlib/jrand48_r.c
@@ -22,7 +22,6 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-/* libc_hidden_proto(jrand48_r) */
 int jrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, long int *result)
 {
     /* Compute next state.  */
diff --git a/libc/stdlib/lrand48.c b/libc/stdlib/lrand48.c
index 33d0e91ef..a0b15caff 100644
--- a/libc/stdlib/lrand48.c
+++ b/libc/stdlib/lrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(nrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/lrand48_r.c b/libc/stdlib/lrand48_r.c
index c3aa89a24..5a425d1e9 100644
--- a/libc/stdlib/lrand48_r.c
+++ b/libc/stdlib/lrand48_r.c
@@ -19,9 +19,7 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(nrand48_r) */
 
-/* libc_hidden_proto(lrand48_r) */
 int lrand48_r (struct drand48_data *buffer, long int *result)
 {
     /* Be generous for the arguments, detect some errors.  */
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
index e729494e0..36355c1e9 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -17,10 +17,6 @@
 #include <sys/mman.h>
 #include <malloc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/*libc_hidden_proto(memset)*/
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(munmap) */
 
 #ifdef L_malloc
 void *malloc(size_t size)
diff --git a/libc/stdlib/malloc-standard/calloc.c b/libc/stdlib/malloc-standard/calloc.c
index 80ba3d04a..a70516f0e 100644
--- a/libc/stdlib/malloc-standard/calloc.c
+++ b/libc/stdlib/malloc-standard/calloc.c
@@ -16,7 +16,6 @@
 
 #include "malloc.h"
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 /* ------------------------------ calloc ------------------------------ */
 void* calloc(size_t n_elements, size_t elem_size)
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c
index 9fbf563ab..39e54d635 100644
--- a/libc/stdlib/malloc-standard/free.c
+++ b/libc/stdlib/malloc-standard/free.c
@@ -16,7 +16,6 @@
 
 #include "malloc.h"
 
-/* libc_hidden_proto(munmap) */
 
 /* ------------------------- __malloc_trim -------------------------
    __malloc_trim is an inverse of sorts to __malloc_alloc.  It gives memory
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index 4ebbe8b49..d60d6d9b5 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -16,10 +16,8 @@
 
 #include "malloc.h"
 
-/* libc_hidden_proto(fprintf) */
 
 /* ------------------------------ mallinfo ------------------------------ */
-/* libc_hidden_proto(mallinfo) */
 struct mallinfo mallinfo(void)
 {
     mstate av;
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index 524468cbe..90c9fd14d 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -24,10 +24,6 @@
 #include <sys/mman.h>
 #include <bits/uClibc_mutex.h>
 
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(sbrk) */
-/* libc_hidden_proto(abort) */
 
 
 __UCLIBC_MUTEX_EXTERN(__malloc_lock);
diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c
index 95eb0d38a..e060b70ea 100644
--- a/libc/stdlib/malloc-standard/realloc.c
+++ b/libc/stdlib/malloc-standard/realloc.c
@@ -16,8 +16,6 @@
 
 #include "malloc.h"
 
-/* libc_hidden_proto(mremap) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* ------------------------------ realloc ------------------------------ */
 void* realloc(void* oldmem, size_t bytes)
diff --git a/libc/stdlib/malloc/calloc.c b/libc/stdlib/malloc/calloc.c
index 79e6ec6c7..7ac94b83d 100644
--- a/libc/stdlib/malloc/calloc.c
+++ b/libc/stdlib/malloc/calloc.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 void * calloc(size_t nmemb, size_t lsize)
 {
diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c
index 5dd3a7625..c17e7ec2a 100644
--- a/libc/stdlib/malloc/free.c
+++ b/libc/stdlib/malloc/free.c
@@ -15,8 +15,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(munmap) */
-/* libc_hidden_proto(sbrk) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/heap_debug.c b/libc/stdlib/malloc/heap_debug.c
index f1ccc6f2d..5f17aae04 100644
--- a/libc/stdlib/malloc/heap_debug.c
+++ b/libc/stdlib/malloc/heap_debug.c
@@ -17,9 +17,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(_exit) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c
index 19877db89..f4bbc71a2 100644
--- a/libc/stdlib/malloc/malloc.c
+++ b/libc/stdlib/malloc/malloc.c
@@ -16,8 +16,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(sbrk) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/malloc_debug.c b/libc/stdlib/malloc/malloc_debug.c
index 01f9bfd6f..1a5374faa 100644
--- a/libc/stdlib/malloc/malloc_debug.c
+++ b/libc/stdlib/malloc/malloc_debug.c
@@ -16,10 +16,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(putc) */
-/* libc_hidden_proto(getenv) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/realloc.c b/libc/stdlib/malloc/realloc.c
index a8271995b..fa779205a 100644
--- a/libc/stdlib/malloc/realloc.c
+++ b/libc/stdlib/malloc/realloc.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/mrand48.c b/libc/stdlib/mrand48.c
index 131c4b991..b209acd57 100644
--- a/libc/stdlib/mrand48.c
+++ b/libc/stdlib/mrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(jrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/mrand48_r.c b/libc/stdlib/mrand48_r.c
index 0127fddb5..86fd6a2b9 100644
--- a/libc/stdlib/mrand48_r.c
+++ b/libc/stdlib/mrand48_r.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(jrand48_r) */
 
 int mrand48_r (struct drand48_data *buffer, long int *result)
 {
diff --git a/libc/stdlib/nrand48.c b/libc/stdlib/nrand48.c
index e69afd78b..97c197caa 100644
--- a/libc/stdlib/nrand48.c
+++ b/libc/stdlib/nrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(nrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/nrand48_r.c b/libc/stdlib/nrand48_r.c
index acf813e9b..0710e90ef 100644
--- a/libc/stdlib/nrand48_r.c
+++ b/libc/stdlib/nrand48_r.c
@@ -22,7 +22,6 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-/* libc_hidden_proto(nrand48_r) */
 int nrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, long int *result)
 {
     /* Compute next state.  */
diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c
index 3e4a1cfe1..ff3823301 100644
--- a/libc/stdlib/ptsname.c
+++ b/libc/stdlib/ptsname.c
@@ -29,13 +29,6 @@
 #include <unistd.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(isatty) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(stat) */
 
 #if !defined __UNIX98PTY_ONLY__
 
@@ -68,7 +61,6 @@ extern const char __libc_ptyname2[] attribute_hidden;
 /* Store at most BUFLEN characters of the pathname of the slave pseudo
    terminal associated with the master FD is open on in BUF.
    Return 0 on success, otherwise an error number.  */
-/* libc_hidden_proto(ptsname_r) */
 int ptsname_r (int fd, char *buf, size_t buflen)
 {
   int save_errno = errno;
diff --git a/libc/stdlib/rand.c b/libc/stdlib/rand.c
index 93fc01483..4b899c0fc 100644
--- a/libc/stdlib/rand.c
+++ b/libc/stdlib/rand.c
@@ -7,7 +7,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(random) */
 
 int rand(void)
 {
diff --git a/libc/stdlib/random.c b/libc/stdlib/random.c
index 967a1e52a..b009c4310 100644
--- a/libc/stdlib/random.c
+++ b/libc/stdlib/random.c
@@ -27,10 +27,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(random_r) */
-/* libc_hidden_proto(srandom_r) */
-/* libc_hidden_proto(setstate_r) */
-/* libc_hidden_proto(initstate_r) */
 
 /* POSIX.1c requires that there is mutual exclusion for the `rand' and
    `srand' functions to prevent concurrent calls from modifying common
@@ -235,7 +231,6 @@ char * setstate (char *arg_state)
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-/* libc_hidden_proto(random) */
 long int random (void)
 {
   int32_t retval;
diff --git a/libc/stdlib/random_r.c b/libc/stdlib/random_r.c
index cb70b7dc4..4b2b3f85d 100644
--- a/libc/stdlib/random_r.c
+++ b/libc/stdlib/random_r.c
@@ -131,7 +131,6 @@ static const struct random_poly_info random_poly_info =
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-/* libc_hidden_proto(random_r) */
 int random_r(struct random_data *buf, int32_t *result)
 {
     int32_t *state;
@@ -189,7 +188,6 @@ libc_hidden_def(random_r)
    information a given number of times to get rid of any initial dependencies
    introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
    for default usage relies on values produced by this routine.  */
-/* libc_hidden_proto(srandom_r) */
 int srandom_r (unsigned int seed, struct random_data *buf)
 {
     int type;
@@ -257,7 +255,6 @@ libc_hidden_def(srandom_r)
    Note: The first thing we do is save the current state, if any, just like
    setstate so that it doesn't matter when initstate is called.
    Returns a pointer to the old state.  */
-/* libc_hidden_proto(initstate_r) */
 int initstate_r (unsigned int seed, char *arg_state, size_t n, struct random_data *buf)
 {
     int type;
@@ -316,7 +313,6 @@ libc_hidden_def(initstate_r)
    to the order in which things are done, it is OK to call setstate with the
    same state as the current state
    Returns a pointer to the old state information.  */
-/* libc_hidden_proto(setstate_r) */
 int setstate_r (char *arg_state, struct random_data *buf)
 {
     int32_t *new_state = 1 + (int32_t *) arg_state;
diff --git a/libc/stdlib/realpath.c b/libc/stdlib/realpath.c
index 3a4789152..1a00c3112 100644
--- a/libc/stdlib/realpath.c
+++ b/libc/stdlib/realpath.c
@@ -21,11 +21,6 @@
 
 #include <sys/stat.h>			/* for S_IFLNK */
 
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(readlink) */
-/* libc_hidden_proto(getcwd) */
 
 #ifndef PATH_MAX
 #ifdef _POSIX_VERSION
diff --git a/libc/stdlib/seed48.c b/libc/stdlib/seed48.c
index c688c1aa6..9ff8a480a 100644
--- a/libc/stdlib/seed48.c
+++ b/libc/stdlib/seed48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(seed48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/seed48_r.c b/libc/stdlib/seed48_r.c
index 4347383f8..0d5872238 100644
--- a/libc/stdlib/seed48_r.c
+++ b/libc/stdlib/seed48_r.c
@@ -21,9 +21,7 @@
 #include <string.h>
 #include <limits.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* libc_hidden_proto(seed48_r) */
 int seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
 {
     /* Save old value at a private place to be used as return value.  */
diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c
index 6598a6c52..8da2fae5c 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -25,12 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(strndup) */
-/* libc_hidden_proto(unsetenv) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -121,7 +115,6 @@ static int __add_to_environ(const char *name, const char *value,
 	return rv;
 }
 
-/* libc_hidden_proto(setenv) */
 int setenv(const char *name, const char *value, int replace)
 {
 	/* NB: setenv("VAR", NULL, 1) inserts "VAR=" string */
@@ -129,7 +122,6 @@ int setenv(const char *name, const char *value, int replace)
 }
 libc_hidden_def(setenv)
 
-/* libc_hidden_proto(unsetenv) */
 int unsetenv(const char *name)
 {
 	const char *eq;
diff --git a/libc/stdlib/srand48.c b/libc/stdlib/srand48.c
index 5f593223a..817d068c3 100644
--- a/libc/stdlib/srand48.c
+++ b/libc/stdlib/srand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(srand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/srand48_r.c b/libc/stdlib/srand48_r.c
index 33c241560..4347fef69 100644
--- a/libc/stdlib/srand48_r.c
+++ b/libc/stdlib/srand48_r.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <limits.h>
 
-/* libc_hidden_proto(srand48_r) */
 int srand48_r (long int seedval, struct drand48_data *buffer)
 {
     /* The standards say we only have 32 bits.  */
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index 05cc68bdb..c7bff6473 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -197,7 +197,6 @@ _stdlib_wcsto_ll(register const wchar_t * __restrict str,
 /**********************************************************************/
 #ifdef L_atof
 
-/* libc_hidden_proto(strtod) */
 
 double atof(const char *nptr)
 {
@@ -269,9 +268,7 @@ strong_alias(llabs,imaxabs)
 
 #if INT_MAX < LONG_MAX
 
-/* libc_hidden_proto(strtol) */
 
-/* libc_hidden_proto(atoi) */
 int atoi(const char *nptr)
 {
 	return (int) strtol(nptr, (char **) NULL, 10);
@@ -284,9 +281,7 @@ libc_hidden_def(atoi)
 /**********************************************************************/
 #ifdef L_atol
 
-/* libc_hidden_proto(strtol) */
 
-/* libc_hidden_proto(atol) */
 long atol(const char *nptr)
 {
 	return strtol(nptr, (char **) NULL, 10);
@@ -313,7 +308,6 @@ strong_alias(atol,atoll)
 
 #if defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX)
 
-/* libc_hidden_proto(strtoll) */
 
 long long atoll(const char *nptr)
 {
@@ -468,10 +462,8 @@ strong_alias(strtoull,strtouq)
 #define Wuchar __uwchar_t
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) iswspace_l((C), locale_arg)
-/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -480,10 +472,8 @@ strong_alias(strtoull,strtouq)
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -504,9 +494,7 @@ unsigned long attribute_hidden _stdlib_strto_l(register const Wchar * __restrict
  * strtoul (sflag = 0). */
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar * __restrict str,
@@ -623,10 +611,8 @@ unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar *
 #define Wuchar __uwchar_t
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) iswspace_l((C), locale_arg)
-/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -635,10 +621,8 @@ unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar *
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -656,7 +640,6 @@ 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) */
 #endif
 /* This is the main work fuction which handles both strtoll (sflag = 1) and
  * strtoull (sflag = 0). */
@@ -771,7 +754,6 @@ unsigned long long attribute_hidden __XL_NPP(_stdlib_strto_ll)(register const Wc
 /**********************************************************************/
 /* Made _Exit() an alias for _exit(), as per C99. */
 /*  #ifdef L__Exit */
-/*  libc_hidden_proto(_exit) */
 /*  void _Exit(int status) */
 /*  { */
 /*  	_exit(status); */
@@ -819,7 +801,6 @@ void *bsearch(const void *key, const void *base, size_t /* nmemb */ high,
  * calculation, as well as to reduce the generated code size with
  * bcc and gcc. */
 
-/* libc_hidden_proto(qsort) */
 void qsort(void  *base,
            size_t nel,
            size_t width,
@@ -915,7 +896,6 @@ void ssort(void  *base,
 /**********************************************************************/
 #ifdef L__stdlib_mb_cur_max
 
-/* libc_hidden_proto(_stdlib_mb_cur_max) */
 size_t _stdlib_mb_cur_max(void)
 {
 #ifdef __CTYPE_HAS_UTF_8_LOCALES
@@ -959,7 +939,6 @@ static __always_inline int is_stateful(unsigned char encoding)
 /**********************************************************************/
 #ifdef L_mblen
 
-/* libc_hidden_proto(mbrlen) */
 
 int mblen(register const char *s, size_t n)
 {
@@ -991,7 +970,6 @@ int mblen(register const char *s, size_t n)
 /**********************************************************************/
 #ifdef L_mbtowc
 
-/* libc_hidden_proto(mbrtowc) */
 
 int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 {
@@ -1026,7 +1004,6 @@ int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 
 /* Note: We completely ignore state in all currently supported conversions. */
 
-/* libc_hidden_proto(wcrtomb) */
 
 int wctomb(register char *__restrict s, wchar_t swc)
 {
@@ -1045,7 +1022,6 @@ int wctomb(register char *__restrict s, wchar_t swc)
 /**********************************************************************/
 #ifdef L_mbstowcs
 
-/* libc_hidden_proto(mbsrtowcs) */
 
 size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {
@@ -1062,7 +1038,6 @@ size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 
 /* Note: We completely ignore state in all currently supported conversions. */
 
-/* libc_hidden_proto(wcsrtombs) */
 
 size_t wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
 {
diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c
index 9244892ab..99f7970c8 100644
--- a/libc/stdlib/system.c
+++ b/libc/stdlib/system.c
@@ -11,17 +11,11 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(wait4) */
-/* libc_hidden_proto(execl) */
-/* libc_hidden_proto(signal) */
-/* libc_hidden_proto(vfork) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
 #ifndef __NR_vfork
 # define vfork fork
-/* libc_hidden_proto(fork) */
 #endif
 
 extern __typeof(system) __libc_system;
diff --git a/libc/stdlib/unix_grantpt.c b/libc/stdlib/unix_grantpt.c
index 25c335239..1be0a7ddb 100644
--- a/libc/stdlib/unix_grantpt.c
+++ b/libc/stdlib/unix_grantpt.c
@@ -30,20 +30,6 @@
 #include <unistd.h>
 #include "pty-private.h"
 
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(setrlimit) */
-/* libc_hidden_proto(waitpid) */
-/* libc_hidden_proto(dup2) */
-/* libc_hidden_proto(chmod) */
-/* libc_hidden_proto(chown) */
-/* libc_hidden_proto(vfork) */
-/* libc_hidden_proto(fork) */
-/* libc_hidden_proto(stat) */
-/* libc_hidden_proto(ptsname_r) */
-/* libc_hidden_proto(execle) */
-/* libc_hidden_proto(_exit) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
diff --git a/libc/stdlib/unlockpt.c b/libc/stdlib/unlockpt.c
index 731a11a85..5dfea15d7 100644
--- a/libc/stdlib/unlockpt.c
+++ b/libc/stdlib/unlockpt.c
@@ -22,7 +22,6 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 
-/* libc_hidden_proto(ioctl) */
 
 /* Unlock the slave pseudo terminal associated with the master pseudo
    terminal specified by FD.  */
diff --git a/libc/stdlib/valloc.c b/libc/stdlib/valloc.c
index d2aca4072..c5197b2ba 100644
--- a/libc/stdlib/valloc.c
+++ b/libc/stdlib/valloc.c
@@ -24,7 +24,6 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-/* libc_hidden_proto(getpagesize) */
 
 static size_t pagesize;
 
diff --git a/libc/string/__glibc_strerror_r.c b/libc/string/__glibc_strerror_r.c
index 2b856e9f5..e97e55234 100644
--- a/libc/string/__glibc_strerror_r.c
+++ b/libc/string/__glibc_strerror_r.c
@@ -8,8 +8,6 @@
 #include <features.h>
 #include <string.h>
 
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(__xpg_strerror_r) */
 
 char *__glibc_strerror_r(int errnum, char *strerrbuf, size_t buflen)
 {
diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c
index 274b6cec8..fb4d44004 100644
--- a/libc/string/__xpg_strerror_r.c
+++ b/libc/string/__xpg_strerror_r.c
@@ -15,9 +15,6 @@
 
 #undef strerror_r
 
-/* libc_hidden_proto(__xpg_strerror_r) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 
 #ifdef __UCLIBC_HAS_ERRNO_MESSAGES__
 
diff --git a/libc/string/_collate.c b/libc/string/_collate.c
index 9cc9ed055..eadbd6c6e 100644
--- a/libc/string/_collate.c
+++ b/libc/string/_collate.c
@@ -19,13 +19,7 @@
 #include <errno.h>
 #include <assert.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strlcpy) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
 #ifdef WANT_WIDE
-/* libc_hidden_proto(wcsxfrm) */
-/* libc_hidden_proto(wcscmp) */
 #endif
 
 #ifdef __UCLIBC_HAS_LOCALE__
@@ -59,18 +53,14 @@
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-/* libc_hidden_proto(wcscoll_l) */
 
-/* libc_hidden_proto(wcscoll) */
 int wcscoll (const Wchar *s0, const Wchar *s1)
 {
 	return wcscoll_l(s0, s1, __UCLIBC_CURLOCALE );
 }
 libc_hidden_def(wcscoll)
 
-/* libc_hidden_proto(wcsxfrm_l) */
 
-/* libc_hidden_proto(wcsxfrm) */
 size_t wcsxfrm(Wchar *__restrict ws1, const Wchar *__restrict ws2, size_t n)
 {
 	return wcsxfrm_l(ws1, ws2, n, __UCLIBC_CURLOCALE );
diff --git a/libc/string/basename.c b/libc/string/basename.c
index a076c20e9..29e7a2a82 100644
--- a/libc/string/basename.c
+++ b/libc/string/basename.c
@@ -8,7 +8,6 @@
 #include "_string.h"
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(basename) */
 
 char *basename(const char *path)
 {
diff --git a/libc/string/bcopy.c b/libc/string/bcopy.c
index 3aa7eab1e..4b718f98d 100644
--- a/libc/string/bcopy.c
+++ b/libc/string/bcopy.c
@@ -9,7 +9,6 @@
 
 #ifdef __UCLIBC_SUSV3_LEGACY__
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 
 void bcopy(const void *s2, void *s1, size_t n)
 {
diff --git a/libc/string/bzero.c b/libc/string/bzero.c
index 7498f795f..364456fff 100644
--- a/libc/string/bzero.c
+++ b/libc/string/bzero.c
@@ -9,7 +9,6 @@
 
 #ifdef __UCLIBC_SUSV3_LEGACY__
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 void bzero(void *s, size_t n)
 {
diff --git a/libc/string/cris/memcpy.c b/libc/string/cris/memcpy.c
index 94ece0512..94e576f4f 100644
--- a/libc/string/cris/memcpy.c
+++ b/libc/string/cris/memcpy.c
@@ -44,7 +44,6 @@
 /* No name ambiguities in this file.  */
 __asm__ (".syntax no_register_prefix");
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 void *
 memcpy(void *pdst, const void *psrc, size_t pn)
 {
diff --git a/libc/string/cris/memmove.c b/libc/string/cris/memmove.c
index fa495eba4..4184fc96d 100644
--- a/libc/string/cris/memmove.c
+++ b/libc/string/cris/memmove.c
@@ -27,7 +27,6 @@
 #include "memcopy.h"
 #include "../generic/pagecopy.h"
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 void *memmove (void *dest, const void *src, size_t len)
 {
   unsigned long int dstp = (long int) dest;
diff --git a/libc/string/cris/memset.c b/libc/string/cris/memset.c
index f4c5bb685..fab4e8b66 100644
--- a/libc/string/cris/memset.c
+++ b/libc/string/cris/memset.c
@@ -46,7 +46,6 @@
 /* No name ambiguities in this file.  */
 __asm__ (".syntax no_register_prefix");
 
-/* Experimentally off - libc_hidden_proto(memset) */
 void *memset(void *pdst, int c, unsigned int plen)
 {
   /* Now we want the parameters in special registers.  Make sure the
diff --git a/libc/string/cris/strcpy.c b/libc/string/cris/strcpy.c
index 955a990b7..40e6389b9 100644
--- a/libc/string/cris/strcpy.c
+++ b/libc/string/cris/strcpy.c
@@ -6,7 +6,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
 char *strcpy(char *dest, const char *src)
 {
   char *ret = dest;
diff --git a/libc/string/cris/strncpy.c b/libc/string/cris/strncpy.c
index 3f2775bdd..8d074071a 100644
--- a/libc/string/cris/strncpy.c
+++ b/libc/string/cris/strncpy.c
@@ -6,9 +6,7 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
-/* Experimentally off - libc_hidden_proto(strncpy) */
 char *strncpy(char *dest, const char *src, size_t count)
 {
   char *ret = dest;
diff --git a/libc/string/ffs.c b/libc/string/ffs.c
index 241b7456f..22efe4a1e 100644
--- a/libc/string/ffs.c
+++ b/libc/string/ffs.c
@@ -9,7 +9,6 @@
 
 #include "_string.h"
 
-/* Experimentally off - libc_hidden_proto(ffs) */
 
 int ffs(int i)
 {
diff --git a/libc/string/frv/memset.S b/libc/string/frv/memset.S
index 477597dcd..a3e76c491 100644
--- a/libc/string/frv/memset.S
+++ b/libc/string/frv/memset.S
@@ -155,4 +155,3 @@ memset:
 	bralr
 	.size		memset, .-memset
 
-/* Experimentally off - libc_hidden_proto(memset) */
diff --git a/libc/string/generic/memcmp.c b/libc/string/generic/memcmp.c
index 27db6b3d3..62600cd08 100644
--- a/libc/string/generic/memcmp.c
+++ b/libc/string/generic/memcmp.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
 
 #include <endian.h>
 
diff --git a/libc/string/generic/memcpy.c b/libc/string/generic/memcpy.c
index a19e0c335..7dd7118fd 100644
--- a/libc/string/generic/memcpy.c
+++ b/libc/string/generic/memcpy.c
@@ -24,7 +24,6 @@
 #include "pagecopy.h"
 #include "_memcpy_fwd.c"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 void *memcpy (void *dstpp, const void *srcpp, size_t len)
 {
diff --git a/libc/string/generic/memmem.c b/libc/string/generic/memmem.c
index c75bb2426..0fccac77f 100644
--- a/libc/string/generic/memmem.c
+++ b/libc/string/generic/memmem.c
@@ -20,8 +20,6 @@
 #include <stddef.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(memmem) */
-/* Experimentally off - libc_hidden_proto(memcmp) */
 
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */
 void *memmem (const void *haystack, size_t haystack_len,
diff --git a/libc/string/generic/memmove.c b/libc/string/generic/memmove.c
index 7f945b150..b564a7d10 100644
--- a/libc/string/generic/memmove.c
+++ b/libc/string/generic/memmove.c
@@ -29,8 +29,6 @@
 #include "_memcpy_fwd.c"
 #endif
 
-/* Experimentally off - libc_hidden_proto(memmove) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static void _wordcopy_bwd_aligned (long int dstp, long int srcp, size_t len)
 {
diff --git a/libc/string/generic/memrchr.c b/libc/string/generic/memrchr.c
index 95fe1d4d8..c03a77037 100644
--- a/libc/string/generic/memrchr.c
+++ b/libc/string/generic/memrchr.c
@@ -27,8 +27,6 @@
 #include <limits.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(memrchr) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/memset.c b/libc/string/generic/memset.c
index 62cc36fe3..7be572765 100644
--- a/libc/string/generic/memset.c
+++ b/libc/string/generic/memset.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(memset) */
 void *memset (void *dstpp, int c, size_t len)
 {
   long int dstp = (long int) dstpp;
diff --git a/libc/string/generic/rawmemchr.c b/libc/string/generic/rawmemchr.c
index 5242734f1..ddefb0997 100644
--- a/libc/string/generic/rawmemchr.c
+++ b/libc/string/generic/rawmemchr.c
@@ -26,8 +26,6 @@
 #include <limits.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(rawmemchr) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strcat.c b/libc/string/generic/strcat.c
index e00494038..b19a0dbd5 100644
--- a/libc/string/generic/strcat.c
+++ b/libc/string/generic/strcat.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strcat) */
 /* Append SRC on the end of DEST.  */
 char *strcat (char *dest, const char *src)
 {
diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c
index 91de3f4aa..836ccddbf 100644
--- a/libc/string/generic/strchr.c
+++ b/libc/string/generic/strchr.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strchrnul.c b/libc/string/generic/strchrnul.c
index 6a25b1c0c..9984d6161 100644
--- a/libc/string/generic/strchrnul.c
+++ b/libc/string/generic/strchrnul.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(strchrnul) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c
index 50acd3548..502b80fb3 100644
--- a/libc/string/generic/strcmp.c
+++ b/libc/string/generic/strcmp.c
@@ -20,7 +20,6 @@
 
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
 /* Compare S1 and S2, returning less than, equal to or
    greater than zero if S1 is lexicographically less than,
    equal to or greater than S2.  */
@@ -44,7 +43,6 @@ int strcmp (const char *p1, const char *p2)
 libc_hidden_weak(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-/* Experimentally off - libc_hidden_proto(strcoll) */
 strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/generic/strcpy.c b/libc/string/generic/strcpy.c
index b9a0a286a..4d070531f 100644
--- a/libc/string/generic/strcpy.c
+++ b/libc/string/generic/strcpy.c
@@ -21,7 +21,6 @@
 
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
 /* Copy SRC to DEST.  */
 char *strcpy(char *dest, const char *src)
 {
diff --git a/libc/string/generic/strcspn.c b/libc/string/generic/strcspn.c
index b65b3b995..f1f39df8c 100644
--- a/libc/string/generic/strcspn.c
+++ b/libc/string/generic/strcspn.c
@@ -18,8 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcspn) */
-/* Experimentally off - libc_hidden_proto(strchr) */
 
 /* Return the length of the maximum initial segment of S
    which contains no characters from REJECT.  */
diff --git a/libc/string/generic/strlen.c b/libc/string/generic/strlen.c
index be899d330..9b6d81dfe 100644
--- a/libc/string/generic/strlen.c
+++ b/libc/string/generic/strlen.c
@@ -22,8 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(abort) */
 
 /* Return the length of the null-terminated string STR.  Scan for
    the null terminator quickly by testing four bytes at a time.  */
diff --git a/libc/string/generic/strncat.c b/libc/string/generic/strncat.c
index 8e3423e49..0863d3669 100644
--- a/libc/string/generic/strncat.c
+++ b/libc/string/generic/strncat.c
@@ -20,7 +20,6 @@
 
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strncat) */
 char *strncat (char *s1, const char *s2, size_t n)
 {
   reg_char c;
diff --git a/libc/string/generic/strncmp.c b/libc/string/generic/strncmp.c
index c49f36d8b..04d6cf2ac 100644
--- a/libc/string/generic/strncmp.c
+++ b/libc/string/generic/strncmp.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strncmp) */
 /* Compare no more than N characters of S1 and S2,
    returning less than, equal to or greater than zero
    if S1 is lexicographically less than, equal to or
diff --git a/libc/string/generic/strncpy.c b/libc/string/generic/strncpy.c
index d2d693f2b..26b45bb8c 100644
--- a/libc/string/generic/strncpy.c
+++ b/libc/string/generic/strncpy.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strncpy) */
 char *strncpy (char *s1, const char *s2, size_t n)
 {
   reg_char c;
diff --git a/libc/string/generic/strnlen.c b/libc/string/generic/strnlen.c
index 0bc517a84..85819aaa6 100644
--- a/libc/string/generic/strnlen.c
+++ b/libc/string/generic/strnlen.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* libc_hidden_proto(abort) */
 
 /* Find the length of S, but scan at most MAXLEN characters.  If no
    '\0' terminator is found in that many characters, return MAXLEN.  */
diff --git a/libc/string/generic/strrchr.c b/libc/string/generic/strrchr.c
index c85707241..7d169260a 100644
--- a/libc/string/generic/strrchr.c
+++ b/libc/string/generic/strrchr.c
@@ -18,8 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strrchr) */
-/* Experimentally off - libc_hidden_proto(strchr) */
 
 /* Find the last occurrence of C in S.  */
 char *strrchr (const char *s, int c)
diff --git a/libc/string/generic/strsep.c b/libc/string/generic/strsep.c
index e02e57068..91dfade85 100644
--- a/libc/string/generic/strsep.c
+++ b/libc/string/generic/strsep.c
@@ -20,10 +20,7 @@
 
 #ifdef __USE_BSD
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
 
-/* Experimentally off - libc_hidden_proto(strsep) */
 char *strsep (char **stringp, const char *delim)
 {
   char *begin, *end;
diff --git a/libc/string/generic/strspn.c b/libc/string/generic/strspn.c
index 010567744..1d9ec4022 100644
--- a/libc/string/generic/strspn.c
+++ b/libc/string/generic/strspn.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strspn) */
 /* Return the length of the maximum initial segment
    of S which contains only characters in ACCEPT.  */
 size_t strspn (const char *s, const char *accept)
diff --git a/libc/string/generic/strstr.c b/libc/string/generic/strstr.c
index c12dceb33..c3b886a0d 100644
--- a/libc/string/generic/strstr.c
+++ b/libc/string/generic/strstr.c
@@ -28,7 +28,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strstr) */
 
 typedef unsigned chartype;
 
diff --git a/libc/string/generic/strtok_r.c b/libc/string/generic/strtok_r.c
index 7648212f7..75ce5be2a 100644
--- a/libc/string/generic/strtok_r.c
+++ b/libc/string/generic/strtok_r.c
@@ -19,15 +19,10 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* Experimentally off - libc_hidden_proto(strspn) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
 #ifdef __USE_GNU
 # define __rawmemchr rawmemchr
-/* Experimentally off - libc_hidden_proto(rawmemchr) */
 #else
 # define __rawmemchr strchr
-/* Experimentally off - libc_hidden_proto(strchr) */
 #endif
 #if 0
    Parse S into tokens separated by characters in DELIM.
diff --git a/libc/string/i386/strcat.c b/libc/string/i386/strcat.c
index 2cf0237a6..e71aad4f7 100644
--- a/libc/string/i386/strcat.c
+++ b/libc/string/i386/strcat.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcat) */
 char *strcat(char * dest, const char * src)
 {
     int d0, d1, d2, d3;
diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c
index eff230c5c..9621f66f8 100644
--- a/libc/string/i386/strcmp.c
+++ b/libc/string/i386/strcmp.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
 int strcmp(const char *cs, const char *ct)
 {
     int d0, d1;
@@ -55,7 +54,6 @@ int strcmp(const char *cs, const char *ct)
 libc_hidden_def(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-/* Experimentally off - libc_hidden_proto(strcoll) */
 strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/i386/strrchr.c b/libc/string/i386/strrchr.c
index 9f2c74923..5c349f683 100644
--- a/libc/string/i386/strrchr.c
+++ b/libc/string/i386/strrchr.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strrchr) */
 char *strrchr(const char *s, int c)
 {
 	char *eax;
diff --git a/libc/string/memcmp.c b/libc/string/memcmp.c
index 762fc23c1..6cb37f417 100644
--- a/libc/string/memcmp.c
+++ b/libc/string/memcmp.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wmemcmp wmemcmp
 #else
-/* Experimentally off - libc_hidden_proto(memcmp) */
 # define Wmemcmp memcmp
 #endif
 
diff --git a/libc/string/memmem.c b/libc/string/memmem.c
index 9dcd4c4c0..f568a4261 100644
--- a/libc/string/memmem.c
+++ b/libc/string/memmem.c
@@ -8,7 +8,6 @@
 #include "_string.h"
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(memmem) */
 void *memmem(const void *haystack, size_t haystacklen,
 		     const void *needle, size_t needlelen)
 {
diff --git a/libc/string/memmove.c b/libc/string/memmove.c
index 0bea9b497..8dcc6e49b 100644
--- a/libc/string/memmove.c
+++ b/libc/string/memmove.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wmemmove wmemmove
 #else
-/* Experimentally off - libc_hidden_proto(memmove) */
 # define Wmemmove memmove
 #endif
 
diff --git a/libc/string/memrchr.c b/libc/string/memrchr.c
index 48ec50a4e..3a7e22f9b 100644
--- a/libc/string/memrchr.c
+++ b/libc/string/memrchr.c
@@ -9,7 +9,6 @@
 
 #ifdef __USE_GNU
 
-/* Experimentally off - libc_hidden_proto(memrchr) */
 
 void *memrchr(const void *s, int c, size_t n)
 {
diff --git a/libc/string/powerpc/memmove.c b/libc/string/powerpc/memmove.c
index 8badae37d..6bd79915d 100644
--- a/libc/string/powerpc/memmove.c
+++ b/libc/string/powerpc/memmove.c
@@ -21,9 +21,7 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 void *memmove(void *to, const void *from, size_t n)
 {
 	unsigned long rem, chunks, tmp1, tmp2;
diff --git a/libc/string/powerpc/memset.c b/libc/string/powerpc/memset.c
index 1cbfd04fc..a900b92cb 100644
--- a/libc/string/powerpc/memset.c
+++ b/libc/string/powerpc/memset.c
@@ -21,7 +21,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 static __inline__ int expand_byte_word(int c){
 	/* this does:
diff --git a/libc/string/psignal.c b/libc/string/psignal.c
index e4498528a..3e1f68b94 100644
--- a/libc/string/psignal.c
+++ b/libc/string/psignal.c
@@ -10,8 +10,6 @@
 #include <string.h>
 #include <signal.h>
 
-/* 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/rawmemchr.c b/libc/string/rawmemchr.c
index 3cddefa10..f0cb7ee47 100644
--- a/libc/string/rawmemchr.c
+++ b/libc/string/rawmemchr.c
@@ -8,7 +8,6 @@
 #include "_string.h"
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(rawmemchr) */
 void *rawmemchr(const void *s, int c)
 {
 	register const unsigned char *r = s;
diff --git a/libc/string/stpncpy.c b/libc/string/stpncpy.c
index dac8471fd..0524ee93e 100644
--- a/libc/string/stpncpy.c
+++ b/libc/string/stpncpy.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstpncpy wcpncpy
 #else
-/* Experimentally off - libc_hidden_proto(stpncpy) */
 # define Wstpncpy stpncpy
 #endif
 
diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index 94c8ff492..20b3cd8d7 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -12,28 +12,19 @@
 #ifdef WANT_WIDE
 # define strcasecmp wcscasecmp
 # define strcasecmp_l wcscasecmp_l
-/* libc_hidden_proto(wcscasecmp) */
 # if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-/* libc_hidden_proto(wcscasecmp_l) */
 # endif
 # ifdef __UCLIBC_DO_XLOCALE
-/* libc_hidden_proto(towlower_l) */
 #  define TOLOWER(C) towlower_l((C), locale_arg)
 # else
-/* libc_hidden_proto(towlower) */
 #  define TOLOWER(C) towlower((C))
 # endif
 #else
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
-/* Experimentally off - libc_hidden_proto(strcasecmp_l) */
 # ifdef __UCLIBC_DO_XLOCALE
-/* 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) */
 #endif
-/* libc_hidden_proto(tolower) */
 #  define TOLOWER(C) tolower((C))
 # endif
 #endif
@@ -48,7 +39,6 @@ libc_hidden_def(strcasecmp)
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-/* Experimentally off - libc_hidden_proto(__XL_NPP(strcasecmp)) */
 int __XL_NPP(strcasecmp)(register const Wchar *s1, register const Wchar *s2
 					  __LOCALE_PARAM )
 {
diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c
index 4804494cc..3ca4df088 100644
--- a/libc/string/strcasestr.c
+++ b/libc/string/strcasestr.c
@@ -9,11 +9,8 @@
 #include <ctype.h>
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
 
 char *strcasestr(const char *s1, const char *s2)
 {
diff --git a/libc/string/strcspn.c b/libc/string/strcspn.c
index 1ec460a15..0466af99b 100644
--- a/libc/string/strcspn.c
+++ b/libc/string/strcspn.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrcspn wcscspn
 #else
-/* Experimentally off - libc_hidden_proto(strcspn) */
 # define Wstrcspn strcspn
 #endif
 
diff --git a/libc/string/strdup.c b/libc/string/strdup.c
index 9eb28630e..049a23f63 100644
--- a/libc/string/strdup.c
+++ b/libc/string/strdup.c
@@ -9,16 +9,12 @@
 #include <stdlib.h>
 
 #ifdef WANT_WIDE
-/* libc_hidden_proto(wcslen) */
 # define Wstrdup wcsdup
 # define Wstrlen wcslen
 #else
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 # define Wstrdup strdup
 # define Wstrlen strlen
 #endif
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 Wchar *Wstrdup(register const Wchar *s1)
 {
diff --git a/libc/string/strerror.c b/libc/string/strerror.c
index a52c407f8..7250da07d 100644
--- a/libc/string/strerror.c
+++ b/libc/string/strerror.c
@@ -9,8 +9,6 @@
 #include <string.h>
 #include "_syserrmsg.h"
 
-/* Experimentally off - libc_hidden_proto(strerror) */
-/* libc_hidden_proto(__xpg_strerror_r) */
 
 char *strerror(int errnum)
 {
diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index a9e7245a8..8f768d6f1 100644
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -12,28 +12,19 @@
 #ifdef WANT_WIDE
 # define strncasecmp wcsncasecmp
 # define strncasecmp_l wcsncasecmp_l
-/* libc_hidden_proto(wcsncasecmp) */
 # if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-/* libc_hidden_proto(wcsncasecmp_l) */
 # endif
 # ifdef __UCLIBC_DO_XLOCALE
-/* libc_hidden_proto(towlower_l) */
 #  define TOLOWER(C) towlower_l((C), locale_arg)
 # else
-/* libc_hidden_proto(towlower) */
 #  define TOLOWER(C) towlower((C))
 # endif
 #else
-/* Experimentally off - libc_hidden_proto(strncasecmp) */
-/* Experimentally off - libc_hidden_proto(strncasecmp_l) */
 # ifdef __UCLIBC_DO_XLOCALE
-/* 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) */
 #endif
-/* libc_hidden_proto(tolower) */
 #  define TOLOWER(C) tolower((C))
 # endif
 #endif
@@ -48,7 +39,6 @@ libc_hidden_def(strncasecmp)
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-/* Experimentally off - libc_hidden_proto(__XL_NPP(strncasecmp)) */
 int __XL_NPP(strncasecmp)(register const Wchar *s1, register const Wchar *s2,
 					  size_t n   __LOCALE_PARAM )
 {
diff --git a/libc/string/strncat.c b/libc/string/strncat.c
index 0180d1328..cbbb0c540 100644
--- a/libc/string/strncat.c
+++ b/libc/string/strncat.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrncat wcsncat
 #else
-/* Experimentally off - libc_hidden_proto(strncat) */
 # define Wstrncat strncat
 #endif
 
diff --git a/libc/string/strncmp.c b/libc/string/strncmp.c
index 59e4a2c22..2da61771c 100644
--- a/libc/string/strncmp.c
+++ b/libc/string/strncmp.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrncmp wcsncmp
 #else
-/* Experimentally off - libc_hidden_proto(strncmp) */
 # define Wstrncmp strncmp
 #endif
 
diff --git a/libc/string/strncpy.c b/libc/string/strncpy.c
index d93561294..ccf031b1b 100644
--- a/libc/string/strncpy.c
+++ b/libc/string/strncpy.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrncpy wcsncpy
 #else
-/* Experimentally off - libc_hidden_proto(strncpy) */
 # define Wstrncpy strncpy
 #endif
 
diff --git a/libc/string/strndup.c b/libc/string/strndup.c
index 96a36d404..8e608669c 100644
--- a/libc/string/strndup.c
+++ b/libc/string/strndup.c
@@ -8,9 +8,6 @@
 #include "_string.h"
 #include <stdlib.h>
 
-/* Experimentally off - libc_hidden_proto(strndup) */
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 char *strndup(register const char *s1, size_t n)
 {
diff --git a/libc/string/strrchr.c b/libc/string/strrchr.c
index 253c4166d..db12bbc7c 100644
--- a/libc/string/strrchr.c
+++ b/libc/string/strrchr.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrrchr wcsrchr
 #else
-/* Experimentally off - libc_hidden_proto(strrchr) */
 # define Wstrrchr strrchr
 #endif
 
diff --git a/libc/string/strsep.c b/libc/string/strsep.c
index 373b00a71..ce17dcf89 100644
--- a/libc/string/strsep.c
+++ b/libc/string/strsep.c
@@ -9,10 +9,7 @@
 
 #ifdef __USE_BSD
 
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* Experimentally off - libc_hidden_proto(strcspn) */
 
-/* Experimentally off - libc_hidden_proto(strsep) */
 char *strsep(char ** __restrict s1, const char * __restrict s2)
 {
 	register char *s = *s1;
diff --git a/libc/string/strstr.c b/libc/string/strstr.c
index 11417fb78..7e2a64e7d 100644
--- a/libc/string/strstr.c
+++ b/libc/string/strstr.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrstr wcsstr
 #else
-/* Experimentally off - libc_hidden_proto(strstr) */
 # define Wstrstr strstr
 #endif
 
diff --git a/libc/string/strtok.c b/libc/string/strtok.c
index 159dd6b6a..c337d81a7 100644
--- a/libc/string/strtok.c
+++ b/libc/string/strtok.c
@@ -15,7 +15,6 @@
 # define Wstrtok_r strtok_r
 #endif
 
-/* Experimentally off - libc_hidden_proto(Wstrtok_r) */
 
 Wchar *Wstrtok(Wchar * __restrict s1, const Wchar * __restrict s2)
 {
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index c81231997..2026888f8 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -8,15 +8,10 @@
 #include "_string.h"
 
 #ifdef WANT_WIDE
-/* libc_hidden_proto(wcsspn) */
-/* libc_hidden_proto(wcspbrk) */
 # define Wstrtok_r wcstok
 # define Wstrspn wcsspn
 # define Wstrpbrk wcspbrk
 #else
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* Experimentally off - libc_hidden_proto(strspn) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
 # define Wstrtok_r strtok_r
 # define Wstrspn strspn
 # define Wstrpbrk strpbrk
diff --git a/libc/sysdeps/linux/alpha/sigprocmask.c b/libc/sysdeps/linux/alpha/sigprocmask.c
index a3384603c..9d611e279 100644
--- a/libc/sysdeps/linux/alpha/sigprocmask.c
+++ b/libc/sysdeps/linux/alpha/sigprocmask.c
@@ -28,7 +28,6 @@
 
 static __inline__ _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval)
 
-/* libc_hidden_proto(sigprocmask) */
 int
 sigprocmask (int how, const sigset_t *set, sigset_t *oset)
 {
diff --git a/libc/sysdeps/linux/arm/aeabi_assert.c b/libc/sysdeps/linux/arm/aeabi_assert.c
index 348ca9b96..a725ad45d 100644
--- a/libc/sysdeps/linux/arm/aeabi_assert.c
+++ b/libc/sysdeps/linux/arm/aeabi_assert.c
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(__assert) */
 
 void __aeabi_assert(const char *assertion, const char *file, unsigned int line);
 void __aeabi_assert(const char *assertion, const char *file, unsigned int line)
diff --git a/libc/sysdeps/linux/arm/aeabi_localeconv.c b/libc/sysdeps/linux/arm/aeabi_localeconv.c
index 4c34f573f..0cd0f37f2 100644
--- a/libc/sysdeps/linux/arm/aeabi_localeconv.c
+++ b/libc/sysdeps/linux/arm/aeabi_localeconv.c
@@ -18,7 +18,6 @@
 
 #include <locale.h>
 
-/* libc_hidden_proto(localeconv) */
 
 struct lconv * __aeabi_localeconv (void);
 struct lconv * __aeabi_localeconv (void)
diff --git a/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c b/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
index 109feb11d..941e5a625 100644
--- a/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
+++ b/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #endif
 
 int
diff --git a/libc/sysdeps/linux/arm/aeabi_memclr.c b/libc/sysdeps/linux/arm/aeabi_memclr.c
index 9125bac04..c6e2e3a7f 100644
--- a/libc/sysdeps/linux/arm/aeabi_memclr.c
+++ b/libc/sysdeps/linux/arm/aeabi_memclr.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 /* Clear memory.  Can't alias to bzero because it's not defined in the
    same translation unit.  */
diff --git a/libc/sysdeps/linux/arm/aeabi_memcpy.c b/libc/sysdeps/linux/arm/aeabi_memcpy.c
index 604c139f3..2fce4fd29 100644
--- a/libc/sysdeps/linux/arm/aeabi_memcpy.c
+++ b/libc/sysdeps/linux/arm/aeabi_memcpy.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* Copy memory like memcpy, but no return value required.  Can't alias
    to memcpy because it's not defined in the same translation
diff --git a/libc/sysdeps/linux/arm/aeabi_memmove.c b/libc/sysdeps/linux/arm/aeabi_memmove.c
index 7ecfbb7b9..8a5f33a7f 100644
--- a/libc/sysdeps/linux/arm/aeabi_memmove.c
+++ b/libc/sysdeps/linux/arm/aeabi_memmove.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 
 /* Copy memory like memmove, but no return value required.  Can't
    alias to memmove because it's not defined in the same translation
diff --git a/libc/sysdeps/linux/arm/aeabi_memset.c b/libc/sysdeps/linux/arm/aeabi_memset.c
index a37e21fda..eca59b135 100644
--- a/libc/sysdeps/linux/arm/aeabi_memset.c
+++ b/libc/sysdeps/linux/arm/aeabi_memset.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 /* Set memory like memset, but different argument order and no return
    value required.  */
diff --git a/libc/sysdeps/linux/arm/brk.c b/libc/sysdeps/linux/arm/brk.c
index aaa71cc6d..9e41c5708 100644
--- a/libc/sysdeps/linux/arm/brk.c
+++ b/libc/sysdeps/linux/arm/brk.c
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index d5e642ca7..a7f6c3067 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -46,19 +46,7 @@
 #include <sys/sysctl.h>
 #include <sys/io.h>
 
-/* libc_hidden_proto(ioperm) */
-
-/* libc_hidden_proto(readlink) */
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(sscanf) */
-/* libc_hidden_proto(fscanf) */
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
+
 
 #include <linux/version.h>
 
diff --git a/libc/sysdeps/linux/arm/iopl.c b/libc/sysdeps/linux/arm/iopl.c
index ecb1cd15d..df953d3c8 100644
--- a/libc/sysdeps/linux/arm/iopl.c
+++ b/libc/sysdeps/linux/arm/iopl.c
@@ -21,7 +21,6 @@
 #include <sys/io.h>
 #include <errno.h>
 
-/* libc_hidden_proto(ioperm) */
 
 #define MAX_PORT	0x10000
 
diff --git a/libc/sysdeps/linux/avr32/brk.c b/libc/sysdeps/linux/avr32/brk.c
index 7d34405dc..58f04f95d 100644
--- a/libc/sysdeps/linux/avr32/brk.c
+++ b/libc/sysdeps/linux/avr32/brk.c
@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(brk) */
 
 void *__curbrk attribute_hidden = 0;
 
diff --git a/libc/sysdeps/linux/avr32/mmap.c b/libc/sysdeps/linux/avr32/mmap.c
index b3d8b98c1..dee88aaf2 100644
--- a/libc/sysdeps/linux/avr32/mmap.c
+++ b/libc/sysdeps/linux/avr32/mmap.c
@@ -11,7 +11,6 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 
 static _syscall6(__ptr_t, mmap2, __ptr_t, addr, size_t, len, int, prot,
 		 int, flags, int, fd, __off_t, pgoff)
diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
index 6dc8725f6..f9ec0eabf 100644
--- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c
+++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
@@ -12,8 +12,6 @@
 #define __need_NULL
 #include <stddef.h>
 
-/* libc_hidden_proto(sigwaitinfo) */
-/* libc_hidden_proto(sigtimedwait) */
 
 #ifdef __NR_rt_sigtimedwait
 #define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
diff --git a/libc/sysdeps/linux/common/_exit.c b/libc/sysdeps/linux/common/_exit.c
index a8b3ffcb9..fbeed0d8a 100644
--- a/libc/sysdeps/linux/common/_exit.c
+++ b/libc/sysdeps/linux/common/_exit.c
@@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(_exit) */
 
 void attribute_noreturn _exit(int status)
 {
diff --git a/libc/sysdeps/linux/common/adjtimex.c b/libc/sysdeps/linux/common/adjtimex.c
index 725c82994..45cb38495 100644
--- a/libc/sysdeps/linux/common/adjtimex.c
+++ b/libc/sysdeps/linux/common/adjtimex.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/timex.h>
 
-/* libc_hidden_proto(adjtimex) */
 
 _syscall1(int, adjtimex, struct timex *, buf)
 libc_hidden_def(adjtimex)
diff --git a/libc/sysdeps/linux/common/alarm.c b/libc/sysdeps/linux/common/alarm.c
index 10d4123a7..cfd68fe1b 100644
--- a/libc/sysdeps/linux/common/alarm.c
+++ b/libc/sysdeps/linux/common/alarm.c
@@ -10,14 +10,12 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(alarm) */
 
 #ifdef __NR_alarm
 _syscall1(unsigned int, alarm, unsigned int, seconds)
 #else
 #include <sys/time.h>
 
-/* libc_hidden_proto(setitimer) */
 
 unsigned int alarm(unsigned int seconds)
 {
diff --git a/libc/sysdeps/linux/common/chdir.c b/libc/sysdeps/linux/common/chdir.c
index 05441eb82..e13810196 100644
--- a/libc/sysdeps/linux/common/chdir.c
+++ b/libc/sysdeps/linux/common/chdir.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-/* libc_hidden_proto(chdir) */
 
 #define __NR___syscall_chdir __NR_chdir
 static __inline__ _syscall1(int, __syscall_chdir, const char *, path)
diff --git a/libc/sysdeps/linux/common/chmod.c b/libc/sysdeps/linux/common/chmod.c
index a4524ba1f..871e0233d 100644
--- a/libc/sysdeps/linux/common/chmod.c
+++ b/libc/sysdeps/linux/common/chmod.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(chmod) */
 
 #define __NR___syscall_chmod __NR_chmod
 static __inline__ _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode)
diff --git a/libc/sysdeps/linux/common/chown.c b/libc/sysdeps/linux/common/chown.c
index 2e7784a0c..f2c60e0b7 100644
--- a/libc/sysdeps/linux/common/chown.c
+++ b/libc/sysdeps/linux/common/chown.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-/* libc_hidden_proto(chown) */
 
 #if (__WORDSIZE == 32 && defined(__NR_chown32)) || __WORDSIZE == 64
 # ifdef __NR_chown32
diff --git a/libc/sysdeps/linux/common/clock_getres.c b/libc/sysdeps/linux/common/clock_getres.c
index 4964ec57c..61413b6c4 100644
--- a/libc/sysdeps/linux/common/clock_getres.c
+++ b/libc/sysdeps/linux/common/clock_getres.c
@@ -14,7 +14,6 @@
 #ifdef __NR_clock_getres
 _syscall2(int, clock_getres, clockid_t, clock_id, struct timespec*, res)
 #else
-/* libc_hidden_proto(sysconf) */
 
 int clock_getres(clockid_t clock_id, struct timespec* res)
 {
diff --git a/libc/sysdeps/linux/common/clock_gettime.c b/libc/sysdeps/linux/common/clock_gettime.c
index f1db8ad7c..888cd64b0 100644
--- a/libc/sysdeps/linux/common/clock_gettime.c
+++ b/libc/sysdeps/linux/common/clock_gettime.c
@@ -15,7 +15,6 @@
 #ifdef __NR_clock_gettime
 _syscall2(int, clock_gettime, clockid_t, clock_id, struct timespec*, tp)
 #else
-/* libc_hidden_proto(gettimeofday) */
 
 int clock_gettime(clockid_t clock_id, struct timespec* tp)
 {
diff --git a/libc/sysdeps/linux/common/clock_settime.c b/libc/sysdeps/linux/common/clock_settime.c
index f11088a37..0c9c840ac 100644
--- a/libc/sysdeps/linux/common/clock_settime.c
+++ b/libc/sysdeps/linux/common/clock_settime.c
@@ -14,7 +14,6 @@
 #ifdef __NR_clock_settime
 _syscall2(int, clock_settime, clockid_t, clock_id, const struct timespec*, tp)
 #else
-/* libc_hidden_proto(settimeofday) */
 
 int clock_settime(clockid_t clock_id, const struct timespec* tp)
 {
diff --git a/libc/sysdeps/linux/common/cmsg_nxthdr.c b/libc/sysdeps/linux/common/cmsg_nxthdr.c
index 5230fc6be..0360b479b 100644
--- a/libc/sysdeps/linux/common/cmsg_nxthdr.c
+++ b/libc/sysdeps/linux/common/cmsg_nxthdr.c
@@ -23,7 +23,6 @@
 #undef __USE_EXTERN_INLINES
 #include <sys/socket.h>
 
-/* libc_hidden_proto(__cmsg_nxthdr) */
 
 struct cmsghdr *
 __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
diff --git a/libc/sysdeps/linux/common/dl-osinfo.h b/libc/sysdeps/linux/common/dl-osinfo.h
index 195c64803..649d203f8 100644
--- a/libc/sysdeps/linux/common/dl-osinfo.h
+++ b/libc/sysdeps/linux/common/dl-osinfo.h
@@ -21,10 +21,6 @@
 
 #  ifdef IS_IN_libc
 #include <fcntl.h>
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(gettimeofday) */
 #   define OPEN open
 #   define READ read
 #   define CLOSE close
diff --git a/libc/sysdeps/linux/common/dup2.c b/libc/sysdeps/linux/common/dup2.c
index 2a315fed4..006f06b69 100644
--- a/libc/sysdeps/linux/common/dup2.c
+++ b/libc/sysdeps/linux/common/dup2.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(dup2) */
 
 _syscall2(int, dup2, int, oldfd, int, newfd)
 libc_hidden_def(dup2)
diff --git a/libc/sysdeps/linux/common/execve.c b/libc/sysdeps/linux/common/execve.c
index 53efd78fb..e8568df2b 100644
--- a/libc/sysdeps/linux/common/execve.c
+++ b/libc/sysdeps/linux/common/execve.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <sys/param.h>
 
-/* libc_hidden_proto(execve) */
 _syscall3(int, execve, const char *, filename,
 		  char *const *, argv, char *const *, envp)
 libc_hidden_def(execve)
diff --git a/libc/sysdeps/linux/common/fchdir.c b/libc/sysdeps/linux/common/fchdir.c
index 45236f177..4d54ef821 100644
--- a/libc/sysdeps/linux/common/fchdir.c
+++ b/libc/sysdeps/linux/common/fchdir.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fchdir) */
 
 _syscall1(int, fchdir, int, fd)
 libc_hidden_def(fchdir)
diff --git a/libc/sysdeps/linux/common/fork.c b/libc/sysdeps/linux/common/fork.c
index 5993387f0..26a20d987 100644
--- a/libc/sysdeps/linux/common/fork.c
+++ b/libc/sysdeps/linux/common/fork.c
@@ -16,7 +16,6 @@
 extern __typeof(fork) __libc_fork;
 #define __NR___libc_fork __NR_fork
 _syscall0(pid_t, __libc_fork)
-/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
 #endif
@@ -28,7 +27,6 @@ pid_t __libc_fork(void)
 	__set_errno(ENOSYS);
 	return -1;
 }
-/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
 link_warning(fork, "fork: this function is not implemented on no-mmu systems")
diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c
index a57b4f6f5..60613433b 100644
--- a/libc/sysdeps/linux/common/fstat64.c
+++ b/libc/sysdeps/linux/common/fstat64.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 #include "xstatconv.h"
 
-/* libc_hidden_proto(fstat64) */
 
 #define __NR___syscall_fstat64 __NR_fstat64
 static __inline__ _syscall2(int, __syscall_fstat64,
diff --git a/libc/sysdeps/linux/common/ftruncate.c b/libc/sysdeps/linux/common/ftruncate.c
index a7a6ea69d..3bdef3f46 100644
--- a/libc/sysdeps/linux/common/ftruncate.c
+++ b/libc/sysdeps/linux/common/ftruncate.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(ftruncate) */
 
 _syscall2(int, ftruncate, int, fd, __off_t, length)
 libc_hidden_def(ftruncate)
diff --git a/libc/sysdeps/linux/common/ftruncate64.c b/libc/sysdeps/linux/common/ftruncate64.c
index 4d00b0294..c5a616007 100644
--- a/libc/sysdeps/linux/common/ftruncate64.c
+++ b/libc/sysdeps/linux/common/ftruncate64.c
@@ -21,7 +21,6 @@
 # include <sys/types.h>
 # include <sys/syscall.h>
 
-/* libc_hidden_proto(ftruncate64) */
 
 # ifdef __NR_ftruncate64
 
@@ -52,7 +51,6 @@ int ftruncate64 (int fd, __off64_t length)
 
 # else  /* __NR_ftruncate64 */
 
-/* libc_hidden_proto(ftruncate) */
 
 int ftruncate64 (int fd, __off64_t length)
 {
diff --git a/libc/sysdeps/linux/common/getcwd.c b/libc/sysdeps/linux/common/getcwd.c
index 13619159d..75d7a1c8b 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -15,17 +15,7 @@
 #include <sys/param.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(getcwd) */
-/* libc_hidden_proto(getpagesize) */
-
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strncpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(opendir) */
-/* libc_hidden_proto(readdir) */
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(stat) */
+
 
 #ifdef __NR_getcwd
 
diff --git a/libc/sysdeps/linux/common/getdirname.c b/libc/sysdeps/linux/common/getdirname.c
index 4b793faf0..63b9b750e 100644
--- a/libc/sysdeps/linux/common/getdirname.c
+++ b/libc/sysdeps/linux/common/getdirname.c
@@ -25,13 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* libc_hidden_proto(getcwd) */
-/* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(stat64) */
 #else
-/* libc_hidden_proto(stat) */
 #endif
 
 /* Return a malloc'd string containing the current directory name.
diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c
index cdea2172a..8590283f5 100644
--- a/libc/sysdeps/linux/common/getdomainname.c
+++ b/libc/sysdeps/linux/common/getdomainname.c
@@ -12,9 +12,6 @@
 #include <sys/utsname.h>
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* libc_hidden_proto(uname) */
 
 int
 #ifndef __UCLIBC_BSD_SPECIFIC__
diff --git a/libc/sysdeps/linux/common/getdtablesize.c b/libc/sysdeps/linux/common/getdtablesize.c
index 183c09e1f..7dd3a54d9 100644
--- a/libc/sysdeps/linux/common/getdtablesize.c
+++ b/libc/sysdeps/linux/common/getdtablesize.c
@@ -11,9 +11,7 @@
 
 /* XXX: _BSD || _XOPEN_SOURCE >= 500 */
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-/* libc_hidden_proto(getdtablesize) */
 
-/* libc_hidden_proto(getrlimit) */
 
 #define __LOCAL_OPEN_MAX	    256
 
diff --git a/libc/sysdeps/linux/common/getegid.c b/libc/sysdeps/linux/common/getegid.c
index 20a679156..f2b6401cf 100644
--- a/libc/sysdeps/linux/common/getegid.c
+++ b/libc/sysdeps/linux/common/getegid.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(getegid) */
 
 #if defined(__NR_getegid32)
 # undef __NR_getegid
@@ -25,7 +24,6 @@ gid_t getegid(void)
 	return (__syscall_getegid());
 }
 #else
-/* libc_hidden_proto(getgid) */
 
 gid_t getegid(void)
 {
diff --git a/libc/sysdeps/linux/common/geteuid.c b/libc/sysdeps/linux/common/geteuid.c
index b9332a9f2..6111e5d1b 100644
--- a/libc/sysdeps/linux/common/geteuid.c
+++ b/libc/sysdeps/linux/common/geteuid.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(geteuid) */
 
 #if defined(__NR_geteuid32)
 # undef __NR_geteuid
@@ -26,7 +25,6 @@ uid_t geteuid(void)
 }
 
 #else
-/* libc_hidden_proto(getuid) */
 uid_t geteuid(void)
 {
 	return (getuid());
diff --git a/libc/sysdeps/linux/common/getgid.c b/libc/sysdeps/linux/common/getgid.c
index f42a1731c..80c60034e 100644
--- a/libc/sysdeps/linux/common/getgid.c
+++ b/libc/sysdeps/linux/common/getgid.c
@@ -19,6 +19,5 @@
 # define __NR_getgid __NR_getgid32
 #endif
 
-/* libc_hidden_proto(getgid) */
 _syscall0(gid_t, getgid)
 libc_hidden_def(getgid)
diff --git a/libc/sysdeps/linux/common/getgroups.c b/libc/sysdeps/linux/common/getgroups.c
index 67d2f4faa..ddc2caee4 100644
--- a/libc/sysdeps/linux/common/getgroups.c
+++ b/libc/sysdeps/linux/common/getgroups.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <grp.h>
 
-/* libc_hidden_proto(getgroups) */
 
 #if defined(__NR_getgroups32)
 # undef __NR_getgroups
@@ -24,7 +23,6 @@ _syscall2(int, getgroups, int, size, gid_t *, list)
 
 #else
 
-/* libc_hidden_proto(sysconf) */
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
 #define __NR___syscall_getgroups __NR_getgroups
diff --git a/libc/sysdeps/linux/common/gethostname.c b/libc/sysdeps/linux/common/gethostname.c
index e06fee98d..3b59e5671 100644
--- a/libc/sysdeps/linux/common/gethostname.c
+++ b/libc/sysdeps/linux/common/gethostname.c
@@ -9,11 +9,7 @@
 #include <sys/utsname.h>
 #include <errno.h>
 
-/* libc_hidden_proto(gethostname) */
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* libc_hidden_proto(uname) */
 
 int
 gethostname(char *name, size_t len)
diff --git a/libc/sysdeps/linux/common/getpagesize.c b/libc/sysdeps/linux/common/getpagesize.c
index 96ed17b04..1faa54886 100644
--- a/libc/sysdeps/linux/common/getpagesize.c
+++ b/libc/sysdeps/linux/common/getpagesize.c
@@ -43,6 +43,5 @@ int __getpagesize(void)
 #endif	/* NBPG.  */
 #endif	/* EXEC_PAGESIZE.  */
 }
-/* libc_hidden_proto(getpagesize) */
 strong_alias(__getpagesize,getpagesize)
 libc_hidden_def(getpagesize)
diff --git a/libc/sysdeps/linux/common/getpid.c b/libc/sysdeps/linux/common/getpid.c
index d78c6e906..8041022e7 100644
--- a/libc/sysdeps/linux/common/getpid.c
+++ b/libc/sysdeps/linux/common/getpid.c
@@ -16,6 +16,5 @@ extern __typeof(getpid) __libc_getpid;
 #endif
 #define __NR___libc_getpid __NR_getpid
 _syscall0(pid_t, __libc_getpid)
-/* libc_hidden_proto(getpid) */
 weak_alias(__libc_getpid, getpid)
 libc_hidden_weak(getpid)
diff --git a/libc/sysdeps/linux/common/getppid.c b/libc/sysdeps/linux/common/getppid.c
index 7adeb2f8b..4f2b0e933 100644
--- a/libc/sysdeps/linux/common/getppid.c
+++ b/libc/sysdeps/linux/common/getppid.c
@@ -12,7 +12,6 @@
 #ifdef	__NR_getppid
 _syscall0(pid_t, getppid)
 #else
-/* libc_hidden_proto(getpid) */
 pid_t getppid(void)
 {
 	return getpid();
diff --git a/libc/sysdeps/linux/common/getpriority.c b/libc/sysdeps/linux/common/getpriority.c
index 58fb2b31f..eba54a5fd 100644
--- a/libc/sysdeps/linux/common/getpriority.c
+++ b/libc/sysdeps/linux/common/getpriority.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-/* libc_hidden_proto(getpriority) */
 
 #define __NR___syscall_getpriority __NR_getpriority
 static __inline__ _syscall2(int, __syscall_getpriority,
diff --git a/libc/sysdeps/linux/common/getrlimit.c b/libc/sysdeps/linux/common/getrlimit.c
index 6297516f0..4d3163f7e 100644
--- a/libc/sysdeps/linux/common/getrlimit.c
+++ b/libc/sysdeps/linux/common/getrlimit.c
@@ -13,7 +13,6 @@
 #include <sys/resource.h>
 #undef getrlimit64
 
-/* libc_hidden_proto(getrlimit) */
 
 /* Only wrap getrlimit if the new ugetrlimit is not present and getrlimit sucks */
 
diff --git a/libc/sysdeps/linux/common/getrlimit64.c b/libc/sysdeps/linux/common/getrlimit64.c
index 14335778c..d537241eb 100644
--- a/libc/sysdeps/linux/common/getrlimit64.c
+++ b/libc/sysdeps/linux/common/getrlimit64.c
@@ -26,7 +26,6 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-/* libc_hidden_proto(getrlimit) */
 
 /* Put the soft and hard limits for RESOURCE in *RLIMITS.
    Returns 0 if successful, -1 if not (and sets errno).  */
diff --git a/libc/sysdeps/linux/common/getsid.c b/libc/sysdeps/linux/common/getsid.c
index 1b22451f8..5a178bba1 100644
--- a/libc/sysdeps/linux/common/getsid.c
+++ b/libc/sysdeps/linux/common/getsid.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 
 #ifdef __USE_XOPEN_EXTENDED
-/* libc_hidden_proto(getsid) */
 
 #define __NR___syscall_getsid __NR_getsid
 static __inline__ _syscall1(__kernel_pid_t, __syscall_getsid, __kernel_pid_t, pid)
diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c
index 663cc3b50..52490fec4 100644
--- a/libc/sysdeps/linux/common/gettimeofday.c
+++ b/libc/sysdeps/linux/common/gettimeofday.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-/* libc_hidden_proto(gettimeofday) */
 #ifdef __USE_BSD
 _syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz)
 #else
diff --git a/libc/sysdeps/linux/common/getuid.c b/libc/sysdeps/linux/common/getuid.c
index ab0ea150b..b6f813a06 100644
--- a/libc/sysdeps/linux/common/getuid.c
+++ b/libc/sysdeps/linux/common/getuid.c
@@ -19,6 +19,5 @@
 # define __NR_getuid __NR_getuid32
 #endif
 
-/* libc_hidden_proto(getuid) */
 _syscall0(uid_t, getuid)
 libc_hidden_def(getuid)
diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c
index 990558ef1..7ac8f16c2 100644
--- a/libc/sysdeps/linux/common/ioctl.c
+++ b/libc/sysdeps/linux/common/ioctl.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <sys/ioctl.h>
 
-/* libc_hidden_proto(ioctl) */
 
 #define __NR___syscall_ioctl __NR_ioctl
 static __always_inline
diff --git a/libc/sysdeps/linux/common/kill.c b/libc/sysdeps/linux/common/kill.c
index 3578673b8..c11a0ed08 100644
--- a/libc/sysdeps/linux/common/kill.c
+++ b/libc/sysdeps/linux/common/kill.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <signal.h>
 
-/* libc_hidden_proto(kill) */
 
 #define __NR___syscall_kill __NR_kill
 static __inline__ _syscall2(int, __syscall_kill, __kernel_pid_t, pid, int, sig)
diff --git a/libc/sysdeps/linux/common/longjmp.c b/libc/sysdeps/linux/common/longjmp.c
index e600c7f13..4d1442414 100644
--- a/libc/sysdeps/linux/common/longjmp.c
+++ b/libc/sysdeps/linux/common/longjmp.c
@@ -20,7 +20,6 @@
 #include <setjmp.h>
 #include <signal.h>
 
-/* libc_hidden_proto(sigprocmask) */
 
 extern void __longjmp (__jmp_buf __env, int __val) attribute_noreturn;
 libc_hidden_proto(__longjmp)
diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c
index 8d7ce1921..235b76d4a 100644
--- a/libc/sysdeps/linux/common/lstat64.c
+++ b/libc/sysdeps/linux/common/lstat64.c
@@ -14,7 +14,6 @@
 # include <sys/stat.h>
 # include "xstatconv.h"
 
-/* libc_hidden_proto(lstat64) */
 
 # define __NR___syscall_lstat64 __NR_lstat64
 static __inline__ _syscall2(int, __syscall_lstat64, const char *, file_name,
diff --git a/libc/sysdeps/linux/common/mkdir.c b/libc/sysdeps/linux/common/mkdir.c
index 73234f287..fbc587d3d 100644
--- a/libc/sysdeps/linux/common/mkdir.c
+++ b/libc/sysdeps/linux/common/mkdir.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(mkdir) */
 
 #define __NR___syscall_mkdir __NR_mkdir
 static __inline__ _syscall2(int, __syscall_mkdir, const char *, pathname,
diff --git a/libc/sysdeps/linux/common/mkfifo.c b/libc/sysdeps/linux/common/mkfifo.c
index f6f03a746..061681415 100644
--- a/libc/sysdeps/linux/common/mkfifo.c
+++ b/libc/sysdeps/linux/common/mkfifo.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-/* libc_hidden_proto(mknod) */
 
 /* Create a named pipe (FIFO) named PATH with protections MODE.  */
 int
diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c
index d5b0b85df..89958985e 100644
--- a/libc/sysdeps/linux/common/mmap.c
+++ b/libc/sysdeps/linux/common/mmap.c
@@ -14,7 +14,6 @@
 
 #ifdef __NR_mmap
 
-/* libc_hidden_proto(mmap) */
 
 #ifdef __UCLIBC_MMAP_HAS_6_ARGS__
 
@@ -45,7 +44,6 @@ libc_hidden_def(mmap)
 
 #elif defined(__NR_mmap2)
 
-/* libc_hidden_proto(mmap) */
 
 #define __NR___syscall_mmap2 __NR_mmap2
 static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
index d0e87afb5..4ef039710 100644
--- a/libc/sysdeps/linux/common/mmap64.c
+++ b/libc/sysdeps/linux/common/mmap64.c
@@ -15,7 +15,6 @@
 #include <sys/syscall.h>
 #include <bits/uClibc_page.h>
 
-/* libc_hidden_proto(mmap) */
 
 # if !defined __NR_mmap2
 
diff --git a/libc/sysdeps/linux/common/munmap.c b/libc/sysdeps/linux/common/munmap.c
index 37b939993..736bffee2 100644
--- a/libc/sysdeps/linux/common/munmap.c
+++ b/libc/sysdeps/linux/common/munmap.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(munmap) */
 
 _syscall2(int, munmap, void *, start, size_t, length)
 libc_hidden_def(munmap)
diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c
index 51997ca13..3694db882 100644
--- a/libc/sysdeps/linux/common/nice.c
+++ b/libc/sysdeps/linux/common/nice.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <sys/resource.h>
 
-/* libc_hidden_proto(getpriority) */
 
 #ifdef __NR_nice
 
@@ -23,7 +22,6 @@ static __inline__ _syscall1(int, __syscall_nice, int, incr)
 
 # include <limits.h>
 
-/* libc_hidden_proto(setpriority) */
 
 static __inline__ int int_add_no_wrap(int a, int b)
 {
diff --git a/libc/sysdeps/linux/common/ntp_gettime.c b/libc/sysdeps/linux/common/ntp_gettime.c
index ff933fed4..83959e860 100644
--- a/libc/sysdeps/linux/common/ntp_gettime.c
+++ b/libc/sysdeps/linux/common/ntp_gettime.c
@@ -18,7 +18,6 @@
 
 #include <sys/timex.h>
 
-/* libc_hidden_proto(adjtimex) */
 
 int ntp_gettime(struct ntptimeval *ntv)
 {
diff --git a/libc/sysdeps/linux/common/pipe.c b/libc/sysdeps/linux/common/pipe.c
index 02b173853..8eae27ca4 100644
--- a/libc/sysdeps/linux/common/pipe.c
+++ b/libc/sysdeps/linux/common/pipe.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(pipe) */
 
 _syscall1(int, pipe, int *, filedes)
 libc_hidden_def(pipe)
diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
index 1d7a04ecb..c9efe8d08 100644
--- a/libc/sysdeps/linux/common/ppoll.c
+++ b/libc/sysdeps/linux/common/ppoll.c
@@ -23,7 +23,6 @@
 
 #if defined __NR_ppoll && defined __UCLIBC_LINUX_SPECIFIC__
 
-/* libc_hidden_proto(ppoll) */
 
 int
 ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index 83d5fdfb0..88e6957ab 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -75,9 +75,6 @@ weak_alias(__libc_pwrite64,pwrite64)
 #endif /* __NR_pwrite */
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
@@ -117,7 +114,6 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(lseek64) */
 
 static ssize_t __fake_pread_write64(int fd, void *buf,
 		size_t count, off64_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/common/pselect.c b/libc/sysdeps/linux/common/pselect.c
index dce5e879c..63ab0dbb1 100644
--- a/libc/sysdeps/linux/common/pselect.c
+++ b/libc/sysdeps/linux/common/pselect.c
@@ -25,8 +25,6 @@
 
 extern __typeof(pselect) __libc_pselect;
 
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(select) */
 
 
 /* Check the first NFDS descriptors each in READFDS (if not NULL) for read
diff --git a/libc/sysdeps/linux/common/readlink.c b/libc/sysdeps/linux/common/readlink.c
index 36e0f8942..ef9e83539 100644
--- a/libc/sysdeps/linux/common/readlink.c
+++ b/libc/sysdeps/linux/common/readlink.c
@@ -10,6 +10,5 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(readlink) */
 _syscall3(ssize_t, readlink, const char *, path, char *, buf, size_t, bufsiz)
 libc_hidden_def(readlink)
diff --git a/libc/sysdeps/linux/common/rmdir.c b/libc/sysdeps/linux/common/rmdir.c
index 221c29f46..bad66544b 100644
--- a/libc/sysdeps/linux/common/rmdir.c
+++ b/libc/sysdeps/linux/common/rmdir.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(rmdir) */
 
 _syscall1(int, rmdir, const char *, pathname)
 libc_hidden_def(rmdir)
diff --git a/libc/sysdeps/linux/common/sbrk.c b/libc/sysdeps/linux/common/sbrk.c
index 9ec1db3db..4f0a8c40d 100644
--- a/libc/sysdeps/linux/common/sbrk.c
+++ b/libc/sysdeps/linux/common/sbrk.c
@@ -7,7 +7,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-/* libc_hidden_proto(brk) */
 
 /* Defined in brk.c.  */
 extern void *__curbrk attribute_hidden;
@@ -15,7 +14,6 @@ extern void *__curbrk attribute_hidden;
 /* Extend the process's data space by INCREMENT.
    If INCREMENT is negative, shrink data space by - INCREMENT.
    Return start of new space allocated, or -1 for errors.  */
-/* libc_hidden_proto(sbrk) */
 void * sbrk (intptr_t increment)
 {
     void *oldbrk;
diff --git a/libc/sysdeps/linux/common/sched_setaffinity.c b/libc/sysdeps/linux/common/sched_setaffinity.c
index 6705d0c68..1a0f55f75 100644
--- a/libc/sysdeps/linux/common/sched_setaffinity.c
+++ b/libc/sysdeps/linux/common/sched_setaffinity.c
@@ -28,7 +28,6 @@
 #include <alloca.h>
 
 #if defined __NR_sched_setaffinity
-/* libc_hidden_proto(getpid) */
 
 #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity
 static __inline__ _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid,
diff --git a/libc/sysdeps/linux/common/select.c b/libc/sysdeps/linux/common/select.c
index 5d56c7480..caff28d7c 100644
--- a/libc/sysdeps/linux/common/select.c
+++ b/libc/sysdeps/linux/common/select.c
@@ -61,6 +61,5 @@ _syscall5(int, __libc_select, int, n, fd_set *, readfds, fd_set *, writefds,
 
 #endif
 
-/* libc_hidden_proto(select) */
 weak_alias(__libc_select,select)
 libc_hidden_weak(select)
diff --git a/libc/sysdeps/linux/common/setegid.c b/libc/sysdeps/linux/common/setegid.c
index 30921a8b3..d1daf319b 100644
--- a/libc/sysdeps/linux/common/setegid.c
+++ b/libc/sysdeps/linux/common/setegid.c
@@ -12,9 +12,7 @@
 #include <sys/syscall.h>
 
 #if (defined __NR_setresgid || defined __NR_setresgid32) && defined __USE_GNU
-/* libc_hidden_proto(setresgid) */
 #endif
-/* libc_hidden_proto(setregid) */
 
 int setegid(gid_t gid)
 {
diff --git a/libc/sysdeps/linux/common/seteuid.c b/libc/sysdeps/linux/common/seteuid.c
index 6f2c5e92a..44f085406 100644
--- a/libc/sysdeps/linux/common/seteuid.c
+++ b/libc/sysdeps/linux/common/seteuid.c
@@ -16,12 +16,9 @@
 #undef __NR_setresuid32
 #endif
 
-/* libc_hidden_proto(seteuid) */
 
 #if (defined __NR_setresuid || defined __NR_setresuid32) && defined __USE_GNU
-/* libc_hidden_proto(setresuid) */
 #endif
-/* libc_hidden_proto(setreuid) */
 
 int seteuid(uid_t uid)
 {
diff --git a/libc/sysdeps/linux/common/setgroups.c b/libc/sysdeps/linux/common/setgroups.c
index d7a94944c..72c987837 100644
--- a/libc/sysdeps/linux/common/setgroups.c
+++ b/libc/sysdeps/linux/common/setgroups.c
@@ -14,7 +14,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(setgroups) */
 
 #if defined(__NR_setgroups32)
 # undef __NR_setgroups
@@ -26,7 +25,6 @@ _syscall2(int, setgroups, size_t, size, const gid_t *, list)
 
 #else
 
-/* libc_hidden_proto(sysconf) */
 
 #define __NR___syscall_setgroups __NR_setgroups
 static __inline__ _syscall2(int, __syscall_setgroups,
diff --git a/libc/sysdeps/linux/common/setitimer.c b/libc/sysdeps/linux/common/setitimer.c
index df65808d2..427ff1eff 100644
--- a/libc/sysdeps/linux/common/setitimer.c
+++ b/libc/sysdeps/linux/common/setitimer.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-/* libc_hidden_proto(setitimer) */
 
 _syscall3(int, setitimer, __itimer_which_t, which,
 		  const struct itimerval *, new, struct itimerval *, old)
diff --git a/libc/sysdeps/linux/common/setpgid.c b/libc/sysdeps/linux/common/setpgid.c
index 664da1ad2..0410c64f3 100644
--- a/libc/sysdeps/linux/common/setpgid.c
+++ b/libc/sysdeps/linux/common/setpgid.c
@@ -12,7 +12,6 @@
 #if defined __USE_UNIX98 || defined __USE_SVID
 #include <unistd.h>
 
-/* libc_hidden_proto(setpgid) */
 
 #define __NR___syscall_setpgid __NR_setpgid
 static __inline__ _syscall2(int, __syscall_setpgid,
diff --git a/libc/sysdeps/linux/common/setpgrp.c b/libc/sysdeps/linux/common/setpgrp.c
index 9f71aa26f..1a82ac884 100644
--- a/libc/sysdeps/linux/common/setpgrp.c
+++ b/libc/sysdeps/linux/common/setpgrp.c
@@ -7,7 +7,6 @@
 #include <syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setpgid) */
 
 int setpgrp(void)
 {
diff --git a/libc/sysdeps/linux/common/setpriority.c b/libc/sysdeps/linux/common/setpriority.c
index 3b98c3f58..05d5dd995 100644
--- a/libc/sysdeps/linux/common/setpriority.c
+++ b/libc/sysdeps/linux/common/setpriority.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-/* libc_hidden_proto(setpriority) */
 
 _syscall3(int, setpriority, __priority_which_t, which, id_t, who, int, prio)
 libc_hidden_def(setpriority)
diff --git a/libc/sysdeps/linux/common/setregid.c b/libc/sysdeps/linux/common/setregid.c
index 332599431..15d590a68 100644
--- a/libc/sysdeps/linux/common/setregid.c
+++ b/libc/sysdeps/linux/common/setregid.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-/* libc_hidden_proto(setregid) */
 
 #if (__WORDSIZE == 32 && defined(__NR_setregid32)) || __WORDSIZE == 64
 # ifdef __NR_setregid32
diff --git a/libc/sysdeps/linux/common/setresgid.c b/libc/sysdeps/linux/common/setresgid.c
index e99708e0d..95decc29e 100644
--- a/libc/sysdeps/linux/common/setresgid.c
+++ b/libc/sysdeps/linux/common/setresgid.c
@@ -15,7 +15,6 @@
 # undef __NR_setresgid
 # define __NR_setresgid __NR_setresgid32
 
-/* libc_hidden_proto(setresgid) */
 _syscall3(int, setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
 libc_hidden_def(setresgid)
 
@@ -25,7 +24,6 @@ libc_hidden_def(setresgid)
 static __inline__ _syscall3(int, __syscall_setresgid,
 		__kernel_gid_t, rgid, __kernel_gid_t, egid, __kernel_gid_t, sgid)
 
-/* libc_hidden_proto(setresgid) */
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid)
 {
 	if (((rgid + 1) > (gid_t) ((__kernel_gid_t) - 1U))
diff --git a/libc/sysdeps/linux/common/setresuid.c b/libc/sysdeps/linux/common/setresuid.c
index c1e395a40..022ccfe64 100644
--- a/libc/sysdeps/linux/common/setresuid.c
+++ b/libc/sysdeps/linux/common/setresuid.c
@@ -15,7 +15,6 @@
 # undef __NR_setresuid
 # define __NR_setresuid __NR_setresuid32
 
-/* libc_hidden_proto(setresuid) */
 _syscall3(int, setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
 libc_hidden_def(setresuid)
 
@@ -25,7 +24,6 @@ libc_hidden_def(setresuid)
 static __inline__ _syscall3(int, __syscall_setresuid,
 		__kernel_uid_t, rgid, __kernel_uid_t, egid, __kernel_uid_t, sgid)
 
-/* libc_hidden_proto(setresuid) */
 int setresuid(uid_t ruid, uid_t euid, uid_t suid)
 {
 	if (((ruid + 1) > (uid_t) ((__kernel_uid_t) - 1U))
diff --git a/libc/sysdeps/linux/common/setreuid.c b/libc/sysdeps/linux/common/setreuid.c
index bb7b6a9c5..a9eea6dc4 100644
--- a/libc/sysdeps/linux/common/setreuid.c
+++ b/libc/sysdeps/linux/common/setreuid.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-/* libc_hidden_proto(setreuid) */
 
 #if (__WORDSIZE == 32 && defined(__NR_setreuid32)) || __WORDSIZE == 64
 # ifdef __NR_setreuid32
diff --git a/libc/sysdeps/linux/common/setrlimit.c b/libc/sysdeps/linux/common/setrlimit.c
index 87f96cb21..ed773f7ae 100644
--- a/libc/sysdeps/linux/common/setrlimit.c
+++ b/libc/sysdeps/linux/common/setrlimit.c
@@ -13,7 +13,6 @@
 #include <sys/resource.h>
 #undef setrlimit64
 
-/* libc_hidden_proto(setrlimit) */
 
 /* Only wrap setrlimit if the new usetrlimit is not present and setrlimit sucks */
 
diff --git a/libc/sysdeps/linux/common/setrlimit64.c b/libc/sysdeps/linux/common/setrlimit64.c
index 3233ed696..8705c6f59 100644
--- a/libc/sysdeps/linux/common/setrlimit64.c
+++ b/libc/sysdeps/linux/common/setrlimit64.c
@@ -26,7 +26,6 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-/* libc_hidden_proto(setrlimit) */
 
 /* Set the soft and hard limits for RESOURCE to *RLIMITS.
    Only the super-user can increase hard limits.
diff --git a/libc/sysdeps/linux/common/setsid.c b/libc/sysdeps/linux/common/setsid.c
index d0fc9b010..4ca95fcc6 100644
--- a/libc/sysdeps/linux/common/setsid.c
+++ b/libc/sysdeps/linux/common/setsid.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setsid) */
 
 _syscall0(pid_t, setsid)
 libc_hidden_def(setsid)
diff --git a/libc/sysdeps/linux/common/settimeofday.c b/libc/sysdeps/linux/common/settimeofday.c
index 361eb3532..7e508aea0 100644
--- a/libc/sysdeps/linux/common/settimeofday.c
+++ b/libc/sysdeps/linux/common/settimeofday.c
@@ -12,7 +12,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(settimeofday) */
 
 _syscall2(int, settimeofday, const struct timeval *, tv,
 		  const struct timezone *, tz)
diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c
index febdca014..13bb2beb7 100644
--- a/libc/sysdeps/linux/common/sigprocmask.c
+++ b/libc/sysdeps/linux/common/sigprocmask.c
@@ -14,7 +14,6 @@
 
 #undef sigprocmask
 
-/* libc_hidden_proto(sigprocmask) */
 
 #ifdef __NR_rt_sigprocmask
 
diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c
index 1b997dcd7..e55d3b343 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -24,9 +24,6 @@
 #include <sys/syscall.h>
 #if defined __USE_POSIX199309
 
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(getuid) */
-/* Experimentally off - libc_hidden_proto(memset) */
 
 #ifdef __NR_rt_sigqueueinfo
 
diff --git a/libc/sysdeps/linux/common/sigsuspend.c b/libc/sysdeps/linux/common/sigsuspend.c
index a5ce43007..3648e76b5 100644
--- a/libc/sysdeps/linux/common/sigsuspend.c
+++ b/libc/sysdeps/linux/common/sigsuspend.c
@@ -32,7 +32,6 @@ int __libc_sigsuspend(const sigset_t * set)
 	return __syscall_sigsuspend(0, 0, set->__val[0]);
 }
 #endif
-/* libc_hidden_proto(sigsuspend) */
 weak_alias(__libc_sigsuspend,sigsuspend)
 libc_hidden_weak(sigsuspend)
 #endif
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index 8682ddcf2..69611cab5 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -32,19 +32,8 @@
 #if defined __UCLIBC_HAS_SYSLOG__
 #include <sys/syslog.h>
 
-/* libc_hidden_proto(openlog) */
-/* libc_hidden_proto(syslog) */
-/* libc_hidden_proto(closelog) */
 #endif
 
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigfillset) */
-/* libc_hidden_proto(sigdelset) */
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(kill) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(_exit) */
 
 static void block_signals(void)
 {
diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c
index 11f836bac..a76f182d4 100644
--- a/libc/sysdeps/linux/common/stat64.c
+++ b/libc/sysdeps/linux/common/stat64.c
@@ -11,7 +11,6 @@
 #include <sys/stat.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_stat64
-/* libc_hidden_proto(stat64) */
 
 # define __NR___syscall_stat64 __NR_stat64
 # include <unistd.h>
diff --git a/libc/sysdeps/linux/common/stime.c b/libc/sysdeps/linux/common/stime.c
index de060c8a2..cb7e8040c 100644
--- a/libc/sysdeps/linux/common/stime.c
+++ b/libc/sysdeps/linux/common/stime.c
@@ -15,7 +15,6 @@
 #ifdef __NR_stime
 _syscall1(int, stime, const time_t *, t)
 #else
-/* libc_hidden_proto(settimeofday) */
 
 int stime(const time_t * when)
 {
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c
index a40d8fc53..0d9e412bf 100644
--- a/libc/sysdeps/linux/common/time.c
+++ b/libc/sysdeps/linux/common/time.c
@@ -11,12 +11,10 @@
 #include <time.h>
 #include <sys/time.h>
 
-/* Experimentally off - libc_hidden_proto(time) */
 
 #ifdef __NR_time
 _syscall1(time_t, time, time_t *, t)
 #else
-/* libc_hidden_proto(gettimeofday) */
 
 time_t time(time_t * t)
 {
diff --git a/libc/sysdeps/linux/common/times.c b/libc/sysdeps/linux/common/times.c
index a0644ef1f..e71d1bd71 100644
--- a/libc/sysdeps/linux/common/times.c
+++ b/libc/sysdeps/linux/common/times.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/times.h>
 
-/* libc_hidden_proto(times) */
 
 _syscall1(clock_t, times, struct tms *, buf)
 libc_hidden_def(times)
diff --git a/libc/sysdeps/linux/common/truncate.c b/libc/sysdeps/linux/common/truncate.c
index 22da552da..2331bddb1 100644
--- a/libc/sysdeps/linux/common/truncate.c
+++ b/libc/sysdeps/linux/common/truncate.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(truncate) */
 
 _syscall2(int, truncate, const char *, path, __off_t, length)
 libc_hidden_def(truncate)
diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c
index 73f652942..1f6c4596a 100644
--- a/libc/sysdeps/linux/common/truncate64.c
+++ b/libc/sysdeps/linux/common/truncate64.c
@@ -49,7 +49,6 @@ int truncate64(const char * path, __off64_t length)
 
 #else  /* __NR_truncate64 */
 
-/* libc_hidden_proto(truncate) */
 
 int truncate64(const char * path, __off64_t length)
 {
diff --git a/libc/sysdeps/linux/common/ulimit.c b/libc/sysdeps/linux/common/ulimit.c
index 3c1a0cc1c..74b453375 100644
--- a/libc/sysdeps/linux/common/ulimit.c
+++ b/libc/sysdeps/linux/common/ulimit.c
@@ -19,9 +19,6 @@ _syscall2(long, ulimit, int, cmd, long, arg)
 #include <ulimit.h>
 #include <sys/resource.h>
 
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getrlimit) */
-/* libc_hidden_proto(setrlimit) */
 
 long int ulimit(int cmd, ...)
 {
diff --git a/libc/sysdeps/linux/common/uname.c b/libc/sysdeps/linux/common/uname.c
index 1e29b9f23..0feec9343 100644
--- a/libc/sysdeps/linux/common/uname.c
+++ b/libc/sysdeps/linux/common/uname.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 
-/* libc_hidden_proto(uname) */
 
 _syscall1(int, uname, struct utsname *, buf)
 libc_hidden_def(uname)
diff --git a/libc/sysdeps/linux/common/unlink.c b/libc/sysdeps/linux/common/unlink.c
index 1ad1f2c6d..513cdd5e1 100644
--- a/libc/sysdeps/linux/common/unlink.c
+++ b/libc/sysdeps/linux/common/unlink.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(unlink) */
 
 _syscall1(int, unlink, const char *, pathname)
 libc_hidden_def(unlink)
diff --git a/libc/sysdeps/linux/common/utime.c b/libc/sysdeps/linux/common/utime.c
index f87afcfc4..a9f988a43 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <utime.h>
 
-/* libc_hidden_proto(utime) */
 
 #ifdef __NR_utime
 _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
@@ -18,8 +17,6 @@ _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
 #include <stdlib.h>
 #include <sys/time.h>
 
-/* libc_hidden_proto(utimes) */
-/* libc_hidden_proto(gettimeofday) */
 
 int utime(const char *file, const struct utimbuf *times)
 {
diff --git a/libc/sysdeps/linux/common/utimes.c b/libc/sysdeps/linux/common/utimes.c
index 191b1afd8..f4781e0a4 100644
--- a/libc/sysdeps/linux/common/utimes.c
+++ b/libc/sysdeps/linux/common/utimes.c
@@ -11,14 +11,12 @@
 #include <utime.h>
 #include <sys/time.h>
 
-/* libc_hidden_proto(utimes) */
 
 #ifdef __NR_utimes
 _syscall2(int, utimes, const char *, file, const struct timeval *, tvp)
 #else
 #include <stdlib.h>
 
-/* libc_hidden_proto(utime) */
 
 int utimes(const char *file, const struct timeval tvp[2])
 {
diff --git a/libc/sysdeps/linux/common/wait3.c b/libc/sysdeps/linux/common/wait3.c
index 11985e3db..0d480ec54 100644
--- a/libc/sysdeps/linux/common/wait3.c
+++ b/libc/sysdeps/linux/common/wait3.c
@@ -11,7 +11,6 @@
 
 #if defined __USE_BSD
 
-/* libc_hidden_proto(wait4) */
 
 /* Wait for a child to exit.  When one does, put its status in *STAT_LOC and
  * return its process ID.  For errors return (pid_t) -1.  If USAGE is not nil,
diff --git a/libc/sysdeps/linux/common/wait4.c b/libc/sysdeps/linux/common/wait4.c
index 4fd866996..dceab41b6 100644
--- a/libc/sysdeps/linux/common/wait4.c
+++ b/libc/sysdeps/linux/common/wait4.c
@@ -12,7 +12,6 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-/* libc_hidden_proto(wait4) */
 
 #define __NR___syscall_wait4 __NR_wait4
 static __inline__ _syscall4(int, __syscall_wait4, __kernel_pid_t, pid,
diff --git a/libc/sysdeps/linux/common/waitid.c b/libc/sysdeps/linux/common/waitid.c
index b7930a02d..af55c914a 100644
--- a/libc/sysdeps/linux/common/waitid.c
+++ b/libc/sysdeps/linux/common/waitid.c
@@ -23,7 +23,6 @@ static _syscall5(int, waitid5, idtype_t, idtype, id_t, id, siginfo_t*, infop,
                  int, options, struct rusage*, ru)
 # endif
 
-/* libc_hidden_proto(waitpid) */
 int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
 {
 # ifdef __NR_waitid
diff --git a/libc/sysdeps/linux/cris/brk.c b/libc/sysdeps/linux/cris/brk.c
index f58773880..6c877bb9a 100644
--- a/libc/sysdeps/linux/cris/brk.c
+++ b/libc/sysdeps/linux/cris/brk.c
@@ -12,7 +12,6 @@
 extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 
-/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
 	if (__init_brk () == 0) {
diff --git a/libc/sysdeps/linux/cris/fork.c b/libc/sysdeps/linux/cris/fork.c
index e548e80ec..19aa17271 100644
--- a/libc/sysdeps/linux/cris/fork.c
+++ b/libc/sysdeps/linux/cris/fork.c
@@ -14,6 +14,5 @@ SYSCALL__ (__libc_fork, 0)
 	   R0&-1==R0, and the child gets R0&0==0.  */
      /* i dunno what the blurb above is useful for. we just return. */
 __asm__("ret\n\tnop");
-/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
diff --git a/libc/sysdeps/linux/cris/sbrk.c b/libc/sysdeps/linux/cris/sbrk.c
index f9b55be7a..fa04b20b0 100644
--- a/libc/sysdeps/linux/cris/sbrk.c
+++ b/libc/sysdeps/linux/cris/sbrk.c
@@ -13,7 +13,6 @@
 extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 
-/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/e1/longjmp.c b/libc/sysdeps/linux/e1/longjmp.c
index bd1b82976..3d188c423 100644
--- a/libc/sysdeps/linux/e1/longjmp.c
+++ b/libc/sysdeps/linux/e1/longjmp.c
@@ -43,7 +43,6 @@ void longjmp(jmp_buf state, int value )
 #undef _state_
 }
 
-/* libc_hidden_proto(sigprocmask) */
 
 void siglongjmp(sigjmp_buf state, int value )
 {
diff --git a/libc/sysdeps/linux/e1/setjmp.c b/libc/sysdeps/linux/e1/setjmp.c
index 2d2edec5d..e8a758c9b 100644
--- a/libc/sysdeps/linux/e1/setjmp.c
+++ b/libc/sysdeps/linux/e1/setjmp.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <signal.h>
 
-/* libc_hidden_proto(sigprocmask) */
 
 int setjmp( jmp_buf state)
 {
diff --git a/libc/sysdeps/linux/e1/vfork.c b/libc/sysdeps/linux/e1/vfork.c
index abcd200e7..c7caafd32 100644
--- a/libc/sysdeps/linux/e1/vfork.c
+++ b/libc/sysdeps/linux/e1/vfork.c
@@ -10,6 +10,5 @@
 
 #define __NR___vfork __NR_vfork
 attribute_hidden _syscall0(pid_t, __vfork)
-/* libc_hidden_proto(vfork) */
 weak_alias(__vfork,vfork)
 libc_hidden_weak(vfork)
diff --git a/libc/sysdeps/linux/frv/brk.c b/libc/sysdeps/linux/frv/brk.c
index cac45bae2..a98cd5446 100644
--- a/libc/sysdeps/linux/frv/brk.c
+++ b/libc/sysdeps/linux/frv/brk.c
@@ -13,7 +13,6 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/frv/fstat.c b/libc/sysdeps/linux/frv/fstat.c
index c6aceb62f..45d2746b3 100644
--- a/libc/sysdeps/linux/frv/fstat.c
+++ b/libc/sysdeps/linux/frv/fstat.c
@@ -13,6 +13,5 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(fstat) */
 _syscall2(int, fstat, int, fd, struct stat *, buf)
 libc_hidden_def(fstat)
diff --git a/libc/sysdeps/linux/frv/fstat64.c b/libc/sysdeps/linux/frv/fstat64.c
index ee0347288..f795342ff 100644
--- a/libc/sysdeps/linux/frv/fstat64.c
+++ b/libc/sysdeps/linux/frv/fstat64.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(fstat64) */
 _syscall2(int, fstat64, int, fd, struct stat64 *, buf)
 libc_hidden_def(fstat64)
 #endif
diff --git a/libc/sysdeps/linux/frv/lstat.c b/libc/sysdeps/linux/frv/lstat.c
index ad87db6fc..94f722f42 100644
--- a/libc/sysdeps/linux/frv/lstat.c
+++ b/libc/sysdeps/linux/frv/lstat.c
@@ -13,6 +13,5 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(lstat) */
 _syscall2(int, lstat, const char *, file_name, struct stat *, buf)
 libc_hidden_def(lstat)
diff --git a/libc/sysdeps/linux/frv/lstat64.c b/libc/sysdeps/linux/frv/lstat64.c
index d4e139314..f038fb0e3 100644
--- a/libc/sysdeps/linux/frv/lstat64.c
+++ b/libc/sysdeps/linux/frv/lstat64.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(lstat64) */
 _syscall2(int, lstat64, const char *, file_name, struct stat64 *, buf)
 libc_hidden_def(lstat64)
 #endif
diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c
index 360b102a1..cb9112483 100644
--- a/libc/sysdeps/linux/frv/mmap.c
+++ b/libc/sysdeps/linux/frv/mmap.c
@@ -29,7 +29,6 @@
 #include <sys/syscall.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(mmap) */
 
 #define __NR___syscall_mmap2	    __NR_mmap2
 static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
diff --git a/libc/sysdeps/linux/frv/sbrk.c b/libc/sysdeps/linux/frv/sbrk.c
index 616b81318..2dc719a16 100644
--- a/libc/sysdeps/linux/frv/sbrk.c
+++ b/libc/sysdeps/linux/frv/sbrk.c
@@ -8,7 +8,6 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/frv/stat.c b/libc/sysdeps/linux/frv/stat.c
index 611bddf61..74e310071 100644
--- a/libc/sysdeps/linux/frv/stat.c
+++ b/libc/sysdeps/linux/frv/stat.c
@@ -13,6 +13,5 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(stat) */
 _syscall2(int, stat, const char *, file_name, struct stat *, buf)
 libc_hidden_def(stat)
diff --git a/libc/sysdeps/linux/frv/stat64.c b/libc/sysdeps/linux/frv/stat64.c
index 45320ecd7..675e6349a 100644
--- a/libc/sysdeps/linux/frv/stat64.c
+++ b/libc/sysdeps/linux/frv/stat64.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(stat64) */
 _syscall2(int, stat64, const char *, file_name, struct stat64 *, buf)
 libc_hidden_def(stat64)
 #endif
diff --git a/libc/sysdeps/linux/h8300/brk.c b/libc/sysdeps/linux/h8300/brk.c
index 44c867417..b33781374 100644
--- a/libc/sysdeps/linux/h8300/brk.c
+++ b/libc/sysdeps/linux/h8300/brk.c
@@ -12,7 +12,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/hppa/brk.c b/libc/sysdeps/linux/hppa/brk.c
index 5dd407bf7..10e1fc8bd 100644
--- a/libc/sysdeps/linux/hppa/brk.c
+++ b/libc/sysdeps/linux/hppa/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/hppa/mmap.c b/libc/sysdeps/linux/hppa/mmap.c
index 9c5077acb..bb1352f9e 100644
--- a/libc/sysdeps/linux/hppa/mmap.c
+++ b/libc/sysdeps/linux/hppa/mmap.c
@@ -13,7 +13,6 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 
 _syscall6(void *, mmap, void *, start, size_t, length, int, prot,
           int, flags, int, fd, off_t, offset)
diff --git a/libc/sysdeps/linux/i386/brk.c b/libc/sysdeps/linux/i386/brk.c
index 4b47a3b19..51aa6f85e 100644
--- a/libc/sysdeps/linux/i386/brk.c
+++ b/libc/sysdeps/linux/i386/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk(void *addr)
 {
 	void *newbrk;
diff --git a/libc/sysdeps/linux/m68k/brk.c b/libc/sysdeps/linux/m68k/brk.c
index f04a4ab91..40ebf4fc7 100644
--- a/libc/sysdeps/linux/m68k/brk.c
+++ b/libc/sysdeps/linux/m68k/brk.c
@@ -9,7 +9,6 @@
 #include <sys/syscall.h>
 #include <errno.h>
 
-/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void * __curbrk = 0;
diff --git a/libc/sysdeps/linux/microblaze/mmap.c b/libc/sysdeps/linux/microblaze/mmap.c
index be780eba3..41cf6f45b 100644
--- a/libc/sysdeps/linux/microblaze/mmap.c
+++ b/libc/sysdeps/linux/microblaze/mmap.c
@@ -10,7 +10,6 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 
 _syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset)
diff --git a/libc/sysdeps/linux/mips/brk.c b/libc/sysdeps/linux/mips/brk.c
index e1c682902..f0462d663 100644
--- a/libc/sysdeps/linux/mips/brk.c
+++ b/libc/sysdeps/linux/mips/brk.c
@@ -23,7 +23,6 @@
 
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
   void *newbrk;
diff --git a/libc/sysdeps/linux/mips/mmap.c b/libc/sysdeps/linux/mips/mmap.c
index ff923cf63..be96451ef 100644
--- a/libc/sysdeps/linux/mips/mmap.c
+++ b/libc/sysdeps/linux/mips/mmap.c
@@ -10,7 +10,6 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 
 #if 0
 /* For now, leave mmap using mmap1 since mmap2 seems
diff --git a/libc/sysdeps/linux/nios/brk.c b/libc/sysdeps/linux/nios/brk.c
index fb4ea94b6..c88b692a0 100644
--- a/libc/sysdeps/linux/nios/brk.c
+++ b/libc/sysdeps/linux/nios/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/nios2/brk.c b/libc/sysdeps/linux/nios2/brk.c
index 6f69932a3..24bd719b9 100644
--- a/libc/sysdeps/linux/nios2/brk.c
+++ b/libc/sysdeps/linux/nios2/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/powerpc/ioctl.c b/libc/sysdeps/linux/powerpc/ioctl.c
index 06f12eed4..26bab0d03 100644
--- a/libc/sysdeps/linux/powerpc/ioctl.c
+++ b/libc/sysdeps/linux/powerpc/ioctl.c
@@ -22,10 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(ioctl) */
 
-/* libc_hidden_proto(tcsetattr) */
-/* libc_hidden_proto(tcgetattr) */
 
 /* The user-visible size of struct termios has changed.  Catch ioctl calls
    using the new-style struct termios, and translate them to old-style.  */
diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c
index dcdb39be1..83628512a 100644
--- a/libc/sysdeps/linux/powerpc/pread_write.c
+++ b/libc/sysdeps/linux/powerpc/pread_write.c
@@ -68,9 +68,6 @@ weak_alias(__libc_pwrite64,pwrite64)
 
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
@@ -110,7 +107,6 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(lseek64) */
 
 static ssize_t __fake_pread_write64(int fd, void *buf,
 		size_t count, off64_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/sh/brk.c b/libc/sysdeps/linux/sh/brk.c
index cac45bae2..a98cd5446 100644
--- a/libc/sysdeps/linux/sh/brk.c
+++ b/libc/sysdeps/linux/sh/brk.c
@@ -13,7 +13,6 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/sh/mmap.c b/libc/sysdeps/linux/sh/mmap.c
index 2d77a5d98..b14181cb2 100644
--- a/libc/sysdeps/linux/sh/mmap.c
+++ b/libc/sysdeps/linux/sh/mmap.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(mmap) */
 
 #ifdef HIOS
 # define __SH_SYSCALL6_TRAPA 0x2E
diff --git a/libc/sysdeps/linux/sh/pipe.c b/libc/sysdeps/linux/sh/pipe.c
index 56ae46c00..799f51839 100644
--- a/libc/sysdeps/linux/sh/pipe.c
+++ b/libc/sysdeps/linux/sh/pipe.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <syscall.h>
 
-/* libc_hidden_proto(pipe) */
 
 int pipe(int *fd)
 {
diff --git a/libc/sysdeps/linux/sh/sbrk.c b/libc/sysdeps/linux/sh/sbrk.c
index 616b81318..2dc719a16 100644
--- a/libc/sysdeps/linux/sh/sbrk.c
+++ b/libc/sysdeps/linux/sh/sbrk.c
@@ -8,7 +8,6 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/sh64/brk.c b/libc/sysdeps/linux/sh64/brk.c
index cac45bae2..a98cd5446 100644
--- a/libc/sysdeps/linux/sh64/brk.c
+++ b/libc/sysdeps/linux/sh64/brk.c
@@ -13,7 +13,6 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/sh64/sbrk.c b/libc/sysdeps/linux/sh64/sbrk.c
index 616b81318..2dc719a16 100644
--- a/libc/sysdeps/linux/sh64/sbrk.c
+++ b/libc/sysdeps/linux/sh64/sbrk.c
@@ -8,7 +8,6 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/sparc/brk.c b/libc/sysdeps/linux/sparc/brk.c
index 37415d49d..513975c7e 100644
--- a/libc/sysdeps/linux/sparc/brk.c
+++ b/libc/sysdeps/linux/sparc/brk.c
@@ -25,7 +25,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/v850/mmap.c b/libc/sysdeps/linux/v850/mmap.c
index 7732b07f3..7fb3f22a4 100644
--- a/libc/sysdeps/linux/v850/mmap.c
+++ b/libc/sysdeps/linux/v850/mmap.c
@@ -10,7 +10,6 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 
 _syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset)
diff --git a/libc/sysdeps/linux/vax/brk.c b/libc/sysdeps/linux/vax/brk.c
index 53652f922..c72ae369b 100644
--- a/libc/sysdeps/linux/vax/brk.c
+++ b/libc/sysdeps/linux/vax/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = NULL;
 
-/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/vax/mmap.c b/libc/sysdeps/linux/vax/mmap.c
index 2df685c21..2bc347f4d 100644
--- a/libc/sysdeps/linux/vax/mmap.c
+++ b/libc/sysdeps/linux/vax/mmap.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 _syscall6 (void *, mmap, void *, start, size_t, length, int, prot, int, flags,
 		int, fd, off_t, offset)
 libc_hidden_def(mmap)
diff --git a/libc/sysdeps/linux/x86_64/brk.c b/libc/sysdeps/linux/x86_64/brk.c
index b1ee640af..4e9447e10 100644
--- a/libc/sysdeps/linux/x86_64/brk.c
+++ b/libc/sysdeps/linux/x86_64/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int brk(void *addr)
 {
 	void *newbrk;
diff --git a/libc/sysdeps/linux/x86_64/mmap.c b/libc/sysdeps/linux/x86_64/mmap.c
index 9c5077acb..bb1352f9e 100644
--- a/libc/sysdeps/linux/x86_64/mmap.c
+++ b/libc/sysdeps/linux/x86_64/mmap.c
@@ -13,7 +13,6 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(mmap) */
 
 _syscall6(void *, mmap, void *, start, size_t, length, int, prot,
           int, flags, int, fd, off_t, offset)
diff --git a/libc/sysdeps/linux/xtensa/brk.c b/libc/sysdeps/linux/xtensa/brk.c
index b7a783f61..8e98c312c 100644
--- a/libc/sysdeps/linux/xtensa/brk.c
+++ b/libc/sysdeps/linux/xtensa/brk.c
@@ -24,7 +24,6 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c
index bf69452d2..71ba22bb9 100644
--- a/libc/sysdeps/linux/xtensa/pread_write.c
+++ b/libc/sysdeps/linux/xtensa/pread_write.c
@@ -77,9 +77,6 @@ weak_alias(__libc_pwrite64,pwrite64)
 #endif /* __NR_pwrite */
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
@@ -119,7 +116,6 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(lseek64) */
 
 static ssize_t __fake_pread_write64(int fd, void *buf,
 		size_t count, off64_t offset, int do_pwrite)
diff --git a/libc/termios/cfsetspeed.c b/libc/termios/cfsetspeed.c
index bbafda0af..b1d54cb9f 100644
--- a/libc/termios/cfsetspeed.c
+++ b/libc/termios/cfsetspeed.c
@@ -22,8 +22,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(cfsetispeed) */
-/* libc_hidden_proto(cfsetospeed) */
 
 struct speed_struct
 {
diff --git a/libc/termios/isatty.c b/libc/termios/isatty.c
index 071bb35d9..9e865225f 100644
--- a/libc/termios/isatty.c
+++ b/libc/termios/isatty.c
@@ -19,8 +19,6 @@
 #include <unistd.h>
 #include <termios.h>
 
-/* libc_hidden_proto(isatty) */
-/* libc_hidden_proto(tcgetattr) */
 
 /* Return 1 if FD is a terminal, 0 if not.  */
 int isatty (int fd)
diff --git a/libc/termios/speed.c b/libc/termios/speed.c
index d4eabd9a1..33b9c4a96 100644
--- a/libc/termios/speed.c
+++ b/libc/termios/speed.c
@@ -22,8 +22,6 @@
 #include <errno.h>
 #include <termios.h>
 
-/* libc_hidden_proto(cfsetispeed) */
-/* libc_hidden_proto(cfsetospeed) */
 
 /* This is a gross hack around a kernel bug.  If the cfsetispeed functions
    is called with the SPEED argument set to zero this means use the same
diff --git a/libc/termios/tcflow.c b/libc/termios/tcflow.c
index 6a1bf12f6..35ae1b2a6 100644
--- a/libc/termios/tcflow.c
+++ b/libc/termios/tcflow.c
@@ -21,7 +21,6 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-/* libc_hidden_proto(ioctl) */
 
 /* Suspend or restart transmission on FD.  */
 int tcflow (int fd, int action)
diff --git a/libc/termios/tcflush.c b/libc/termios/tcflush.c
index 28e88c854..7c9d1c584 100644
--- a/libc/termios/tcflush.c
+++ b/libc/termios/tcflush.c
@@ -21,7 +21,6 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-/* libc_hidden_proto(ioctl) */
 
 /* Flush pending data on FD.  */
 int
diff --git a/libc/termios/tcgetattr.c b/libc/termios/tcgetattr.c
index 47b885800..0bdc70b3c 100644
--- a/libc/termios/tcgetattr.c
+++ b/libc/termios/tcgetattr.c
@@ -23,11 +23,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-/* libc_hidden_proto(ioctl) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(tcgetattr) */
 
 /* The difference here is that the termios structure used in the
    kernel is not the same as we use in the libc.  Therefore we must
diff --git a/libc/termios/tcgetpgrp.c b/libc/termios/tcgetpgrp.c
index 677e8b4dc..e2509c830 100644
--- a/libc/termios/tcgetpgrp.c
+++ b/libc/termios/tcgetpgrp.c
@@ -21,8 +21,6 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-/* libc_hidden_proto(tcgetpgrp) */
-/* libc_hidden_proto(ioctl) */
 
 /* Return the foreground process group ID of FD.  */
 pid_t tcgetpgrp (int fd)
diff --git a/libc/termios/tcgetsid.c b/libc/termios/tcgetsid.c
index b5d7cb697..b5da2e76e 100644
--- a/libc/termios/tcgetsid.c
+++ b/libc/termios/tcgetsid.c
@@ -22,9 +22,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(getsid) */
-/* libc_hidden_proto(tcgetpgrp) */
 
 /* Return the session ID of FD.  */
 pid_t
diff --git a/libc/termios/tcsendbrk.c b/libc/termios/tcsendbrk.c
index 53ea662a7..322956c75 100644
--- a/libc/termios/tcsendbrk.c
+++ b/libc/termios/tcsendbrk.c
@@ -22,7 +22,6 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-/* libc_hidden_proto(ioctl) */
 
 /* Send zero bits on FD.  */
 int
diff --git a/libc/termios/tcsetattr.c b/libc/termios/tcsetattr.c
index 9f5533e08..786fc69c5 100644
--- a/libc/termios/tcsetattr.c
+++ b/libc/termios/tcsetattr.c
@@ -22,9 +22,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-/* libc_hidden_proto(tcsetattr) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(ioctl) */
 
 /* The difference here is that the termios structure used in the
    kernel is not the same as we use in the libc.  Therefore we must
diff --git a/libc/termios/tcsetpgrp.c b/libc/termios/tcsetpgrp.c
index dbf07f216..6a3b8d827 100644
--- a/libc/termios/tcsetpgrp.c
+++ b/libc/termios/tcsetpgrp.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(ioctl) */
 
 /* Set the foreground process group ID of FD set PGRP_ID.  */
 int tcsetpgrp (int fd, pid_t pgrp_id)
diff --git a/libc/termios/ttyname.c b/libc/termios/ttyname.c
index ac25c7658..5fcf23b64 100644
--- a/libc/termios/ttyname.c
+++ b/libc/termios/ttyname.c
@@ -31,15 +31,6 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
-/* libc_hidden_proto(ttyname_r) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(lstat) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(opendir) */
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(readdir) */
-/* libc_hidden_proto(isatty) */
 
 #define TTYNAME_BUFLEN		32
 
diff --git a/libc/unistd/confstr.c b/libc/unistd/confstr.c
index 67a9d585a..16b57bee9 100644
--- a/libc/unistd/confstr.c
+++ b/libc/unistd/confstr.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 #define CS_PATH "/bin:/usr/bin"
 
diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
index 91ba7bba8..7d24072e7 100644
--- a/libc/unistd/exec.c
+++ b/libc/unistd/exec.c
@@ -27,19 +27,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(execl) */
-/* libc_hidden_proto(execle) */
-/* libc_hidden_proto(execlp) */
-/* libc_hidden_proto(execv) */
-/* libc_hidden_proto(execvp) */
-
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(execve) */
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(munmap) */
-/* libc_hidden_proto(getenv) */
+
 
 /**********************************************************************/
 #define EXEC_FUNC_COMMON 0
@@ -233,7 +221,6 @@ libc_hidden_def(execlp)
 /**********************************************************************/
 #ifdef L_execvp
 
-/* Experimentally off - libc_hidden_proto(strchrnul) */
 
 /* Use a default path that matches glibc behavior, since SUSv3 says
  * this is implementation-defined.  The default is current working dir,
diff --git a/libc/unistd/fpathconf.c b/libc/unistd/fpathconf.c
index 439525a2a..6f618ee0c 100644
--- a/libc/unistd/fpathconf.c
+++ b/libc/unistd/fpathconf.c
@@ -28,7 +28,6 @@
 
 //#include "linux_fsinfo.h"
 
-/* libc_hidden_proto(fstat) */
 
 #ifndef __USE_FILE_OFFSET64
 extern int fstatfs (int __fildes, struct statfs *__buf)
diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c
index e97b662f1..b855e50ac 100644
--- a/libc/unistd/getlogin.c
+++ b/libc/unistd/getlogin.c
@@ -10,9 +10,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strncpy) */
-/* libc_hidden_proto(getenv) */
 
 /* uClibc makes it policy to not mess with the utmp file whenever
  * possible, since I consider utmp a complete waste of time.  Since
@@ -20,7 +17,6 @@
  * the user specify whatever they want via the LOGNAME environment
  * variable, or we return NULL if getenv() fails to find anything */
 
-/* libc_hidden_proto(getlogin) */
 char * getlogin(void)
 {
 	return (getenv("LOGNAME"));
diff --git a/libc/unistd/getopt-susv3.c b/libc/unistd/getopt-susv3.c
index 00c08d114..d7b8d0dca 100644
--- a/libc/unistd/getopt-susv3.c
+++ b/libc/unistd/getopt-susv3.c
@@ -23,8 +23,6 @@
 #include <stdio.h>
 #include <getopt.h>
 
-/* libc_hidden_proto(fprintf) */
-/* Experimentally off - libc_hidden_proto(strchr) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning TODO: Enable gettext awareness.
@@ -46,7 +44,6 @@ int optind = 1;
 int optopt = 0;
 char *optarg = NULL;
 
-/* libc_hidden_proto(getopt) */
 int getopt(int argc, char * const argv[], const char *optstring)
 {
 	static const char *o;		/* multi opt position */
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index d2020fe03..f4c113092 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -121,12 +121,6 @@
 #include <getopt.h>
 #include "getopt_int.h"
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* libc_hidden_proto(getenv) */
-/* 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/getopt_long-simple.c b/libc/unistd/getopt_long-simple.c
index 233884438..47612dfe6 100644
--- a/libc/unistd/getopt_long-simple.c
+++ b/libc/unistd/getopt_long-simple.c
@@ -8,7 +8,6 @@
 #include <getopt.h>
 #include <stdio.h>
 
-/* libc_hidden_proto(getopt) */
 
 static int __getopt_long(int argc, char *const *argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
 {
diff --git a/libc/unistd/getpass.c b/libc/unistd/getpass.c
index ee54429a0..8d8018231 100644
--- a/libc/unistd/getpass.c
+++ b/libc/unistd/getpass.c
@@ -23,19 +23,6 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(tcsetattr) */
-/* libc_hidden_proto(tcgetattr) */
-/* libc_hidden_proto(setvbuf) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(fflush) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fputc) */
-/* libc_hidden_proto(putc) */
-/* libc_hidden_proto(__fputc_unlocked) */
 
 /* It is desirable to use this bit on systems that have it.
    The only bit of terminal state we want to twiddle is echoing, which is
diff --git a/libc/unistd/getsubopt-susv3.c b/libc/unistd/getsubopt-susv3.c
index 10c97ca9a..9ff33ef11 100644
--- a/libc/unistd/getsubopt-susv3.c
+++ b/libc/unistd/getsubopt-susv3.c
@@ -7,9 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
 
 int getsubopt(char **opt, char *const *keys, char **val)
 {
diff --git a/libc/unistd/getsubopt.c b/libc/unistd/getsubopt.c
index 301410232..4ff615b6c 100644
--- a/libc/unistd/getsubopt.c
+++ b/libc/unistd/getsubopt.c
@@ -21,9 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(strchrnul) */
 
 /* Parse comma separated suboption from *OPTIONP and match against
    strings in TOKENS.  If found return index and set *VALUEP to
diff --git a/libc/unistd/pathconf.c b/libc/unistd/pathconf.c
index 9895e028a..bbdceabcc 100644
--- a/libc/unistd/pathconf.c
+++ b/libc/unistd/pathconf.c
@@ -32,7 +32,6 @@
 //#include <sys/statvfs.h>
 
 extern __typeof(statfs) __libc_statfs;
-/* libc_hidden_proto(stat) */
 
 
 /* The Linux kernel headers mention this as a kind of generic value. */
diff --git a/libc/unistd/sleep.c b/libc/unistd/sleep.c
index 4d55d843d..de4c14a24 100644
--- a/libc/unistd/sleep.c
+++ b/libc/unistd/sleep.c
@@ -23,17 +23,13 @@
 #include <signal.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(sleep) */
 
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigprocmask) */
 
 /* version perusing nanosleep */
 #if defined __UCLIBC_HAS_REALTIME__
 //libc_hidden_proto(__sigaddset)
 //libc_hidden_proto(__sigemptyset)
 //libc_hidden_proto(__sigismember)
-/*libc_hidden_proto(nanosleep) need the reloc for cancellation*/
 
 #if 0
 /* This is a quick and dirty, but not 100% compliant with
@@ -109,7 +105,6 @@ unsigned int sleep (unsigned int seconds)
 }
 #endif
 #else /* __UCLIBC_HAS_REALTIME__ */
-/* libc_hidden_proto(sigaction) */
 /* no nanosleep, use signals and alarm() */
 static void sleep_alarm_handler(int attribute_unused sig)
 {
diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c
index 82bcf2284..87206648e 100644
--- a/libc/unistd/sysconf.c
+++ b/libc/unistd/sysconf.c
@@ -44,10 +44,7 @@
 # define num_online_cpus() (1)
 #endif
 
-/* libc_hidden_proto(sysconf) */
 
-/* libc_hidden_proto(getpagesize) */
-/* libc_hidden_proto(getdtablesize) */
 
 #ifndef __UCLIBC_CLK_TCK_CONST
 #error __UCLIBC_CLK_TCK_CONST not defined!
diff --git a/libc/unistd/ualarm.c b/libc/unistd/ualarm.c
index 191f996b5..82eb972b2 100644
--- a/libc/unistd/ualarm.c
+++ b/libc/unistd/ualarm.c
@@ -9,7 +9,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setitimer) */
 
 useconds_t ualarm(useconds_t value, useconds_t interval)
 {
diff --git a/libc/unistd/usershell.c b/libc/unistd/usershell.c
index 9896bd3ef..46b1b98ad 100644
--- a/libc/unistd/usershell.c
+++ b/libc/unistd/usershell.c
@@ -42,16 +42,8 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(fopen) */
-/* 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) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /*
diff --git a/libc/unistd/usleep.c b/libc/unistd/usleep.c
index daeda0982..61ddb900a 100644
--- a/libc/unistd/usleep.c
+++ b/libc/unistd/usleep.c
@@ -11,7 +11,6 @@
 
 #if defined __USE_BSD || defined __USE_POSIX98
 #if defined __UCLIBC_HAS_REALTIME__
-/*libc_hidden_proto(nanosleep) need the reloc for cancellation*/
 
 int usleep (__useconds_t usec)
 {
@@ -22,7 +21,6 @@ int usleep (__useconds_t usec)
     return(nanosleep(&ts, NULL));
 }
 #else /* __UCLIBC_HAS_REALTIME__ */
-/* libc_hidden_proto(select) */
 int usleep (__useconds_t usec)
 {
 	struct timeval tv;
author	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>	2009-09-18 20:57:40 +0200
committer	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>	2009-09-18 20:57:40 +0200
commit	21730caa6647f645974e132ca8afec79b4eeab2b (patch)
tree	6c0a0e491526f19ab08062d7f22448ac60ca4bf5 /libc
parent	35c8387f6d3dd3d901bdc9bb7eb1c681cd1b2c0d (diff)