Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

370 files changed, 1184 insertions, 1176 deletions

diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index ad9539e82..b371fa9ae 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -48,7 +48,7 @@
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_b) */
 #endif
-libc_hidden_proto(inet_aton)
+/* libc_hidden_proto(inet_aton) */
 int inet_aton(const char *cp, struct in_addr *addrptr)
 {
 	in_addr_t addr;
@@ -103,9 +103,9 @@ libc_hidden_def(inet_aton)
 #endif
 
 #ifdef L_inet_addr
-libc_hidden_proto(inet_aton)
+/* libc_hidden_proto(inet_aton) */
 
-libc_hidden_proto(inet_addr)
+/* libc_hidden_proto(inet_addr) */
 in_addr_t inet_addr(const char *cp)
 {
 	struct in_addr a;
@@ -122,7 +122,7 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
-libc_hidden_proto(inet_ntoa_r)
+/* 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 +144,7 @@ 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)
+/* libc_hidden_proto(inet_ntoa) */
 char *inet_ntoa(struct in_addr in)
 {
 	static char buf[INET_NTOA_MAX_LEN];
@@ -162,7 +162,7 @@ libc_hidden_def(inet_ntoa)
  * Formulate an Internet address from network + host.  Used in
  * building addresses stored in the ifnet structure.
  */
-libc_hidden_proto(inet_makeaddr)
+/* libc_hidden_proto(inet_makeaddr) */
 struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
 {
 	in_addr_t addr;
@@ -206,7 +206,7 @@ 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)
+/* libc_hidden_proto(inet_netof) */
 in_addr_t
 inet_netof(struct in_addr in)
 {
diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 8ce61d241..82b067157 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -31,7 +31,7 @@
 #include <netinet/ether.h>
 #include <netinet/if_ether.h>
 
-libc_hidden_proto(ether_ntoa_r)
+/* libc_hidden_proto(ether_ntoa_r) */
 /* libc_hidden_proto(sprintf) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 189d52f1a..41abbe2de 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -79,17 +79,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* 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(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)
+/* libc_hidden_proto(in6addr_loopback) */
 #endif
 
 #define GAIH_OKIFUNSPEC 0x0100
@@ -775,7 +775,7 @@ static const struct gaih gaih[] = {
 	{ PF_UNSPEC, NULL }
 };
 
-libc_hidden_proto(freeaddrinfo)
+/* libc_hidden_proto(freeaddrinfo) */
 void
 freeaddrinfo(struct addrinfo *ai)
 {
@@ -789,7 +789,7 @@ freeaddrinfo(struct addrinfo *ai)
 }
 libc_hidden_def(freeaddrinfo)
 
-libc_hidden_proto(getaddrinfo)
+/* 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 c916a18cf..735005a62 100644
--- a/libc/inet/getnetbyad.c
+++ b/libc/inet/getnetbyad.c
@@ -20,9 +20,9 @@
 #include <netdb.h>
 #include <unistd.h>
 
-libc_hidden_proto(setnetent)
-libc_hidden_proto(getnetent)
-libc_hidden_proto(endnetent)
+/* 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 9f3655121..d3f283106 100644
--- a/libc/inet/getnetbynm.c
+++ b/libc/inet/getnetbynm.c
@@ -22,9 +22,9 @@
 #include <unistd.h>
 
 /* Experimentally off - libc_hidden_proto(strcmp) */
-libc_hidden_proto(setnetent)
-libc_hidden_proto(getnetent)
-libc_hidden_proto(endnetent)
+/* 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 4f164237c..746f8b704 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -25,8 +25,8 @@
 
 /* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(inet_network)
-libc_hidden_proto(rewind)
+/* libc_hidden_proto(inet_network) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
@@ -44,7 +44,7 @@ static char *net_aliases[MAXALIASES];
 
 smallint _net_stayopen attribute_hidden;
 
-libc_hidden_proto(setnetent)
+/* libc_hidden_proto(setnetent) */
 void setnetent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -58,7 +58,7 @@ void setnetent(int f)
 }
 libc_hidden_def(setnetent)
 
-libc_hidden_proto(endnetent)
+/* libc_hidden_proto(endnetent) */
 void endnetent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -84,7 +84,7 @@ static char * any(register char *cp, char *match)
     return ((char *)0);
 }
 
-libc_hidden_proto(getnetent)
+/* libc_hidden_proto(getnetent) */
 struct netent *getnetent(void)
 {
     char *p;
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index bfaf4917f..837f1315f 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -65,8 +65,8 @@
 /* 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(atoi) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
@@ -93,7 +93,7 @@ static void __initbuf(void)
     }
 }
 
-libc_hidden_proto(setprotoent)
+/* libc_hidden_proto(setprotoent) */
 void setprotoent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -106,7 +106,7 @@ void setprotoent(int f)
 }
 libc_hidden_def(setprotoent)
 
-libc_hidden_proto(endprotoent)
+/* libc_hidden_proto(endprotoent) */
 void endprotoent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -119,7 +119,7 @@ void endprotoent(void)
 }
 libc_hidden_def(endprotoent)
 
-libc_hidden_proto(getprotoent_r)
+/* libc_hidden_proto(getprotoent_r) */
 int getprotoent_r(struct protoent *result_buf,
 		  char *buf, size_t buflen,
 		  struct protoent **result)
@@ -210,7 +210,7 @@ struct protoent * getprotoent(void)
 }
 
 
-libc_hidden_proto(getprotobyname_r)
+/* libc_hidden_proto(getprotobyname_r) */
 int getprotobyname_r(const char *name,
 		    struct protoent *result_buf,
 		    char *buf, size_t buflen,
@@ -247,7 +247,7 @@ struct protoent * getprotobyname(const char *name)
 }
 
 
-libc_hidden_proto(getprotobynumber_r)
+/* 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 d427adff9..904f0b79c 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -68,8 +68,8 @@
 /* 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(atoi) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
@@ -96,7 +96,7 @@ static void __initbuf(void)
     }
 }
 
-libc_hidden_proto(setservent)
+/* libc_hidden_proto(setservent) */
 void setservent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -109,7 +109,7 @@ void setservent(int f)
 }
 libc_hidden_def(setservent)
 
-libc_hidden_proto(endservent)
+/* libc_hidden_proto(endservent) */
 void endservent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -122,7 +122,7 @@ void endservent(void)
 }
 libc_hidden_def(endservent)
 
-libc_hidden_proto(getservent_r)
+/* libc_hidden_proto(getservent_r) */
 int getservent_r(struct servent * result_buf,
 		 char * buf, size_t buflen,
 		 struct servent ** result)
@@ -213,7 +213,7 @@ struct servent * getservent(void)
     return result;
 }
 
-libc_hidden_proto(getservbyname_r)
+/* 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 +251,7 @@ struct servent *getservbyname(const char *name, const char *proto)
 }
 
 
-libc_hidden_proto(getservbyport_r)
+/* 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 +273,7 @@ int getservbyport_r(int port, const char *proto,
 }
 libc_hidden_def(getservbyport_r)
 
-libc_hidden_proto(getservbyport)
+/* 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 2c671e9e2..8f993a78c 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -24,7 +24,7 @@
 #include <netdb.h>
 
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(__h_errno_location)
+/* libc_hidden_proto(__h_errno_location) */
 
 static const char error_msg[] = "Resolver error";
 static const char *const h_errlist[] = {
@@ -39,7 +39,7 @@ 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)
+/* 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 e4c592b86..42ee53fbd 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -20,10 +20,10 @@
 /* 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)
+/* 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 a5b073091..4100bbf17 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -45,7 +45,7 @@
 
 extern int __opensock(void) attribute_hidden;
 
-libc_hidden_proto(if_nametoindex)
+/* libc_hidden_proto(if_nametoindex) */
 unsigned int
 if_nametoindex(const char* ifname)
 {
@@ -75,7 +75,7 @@ if_nametoindex(const char* ifname)
 }
 libc_hidden_def(if_nametoindex)
 
-libc_hidden_proto(if_freenameindex)
+/* libc_hidden_proto(if_freenameindex) */
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
@@ -89,7 +89,7 @@ if_freenameindex (struct if_nameindex *ifn)
 }
 libc_hidden_def(if_freenameindex)
 
-libc_hidden_proto(if_nameindex)
+/* 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 bdacd62df..3afc6b923 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -42,12 +42,12 @@
 /* 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)
+/* 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(getsockname) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c
index c2ab375e6..eb096f9e3 100644
--- a/libc/inet/in6_addr.c
+++ b/libc/inet/in6_addr.c
@@ -24,7 +24,7 @@
 #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)
+/* 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 93457e7ae..477d67dc9 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -49,7 +49,7 @@
  * The library routines call this routine to interpret
  * network numbers.
  */
-libc_hidden_proto(inet_network)
+/* 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 e24ac8de1..dbc71815a 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -358,7 +358,7 @@ inet_pton6(const char *src, u_char *dst)
  * author:
  *	Paul Vixie, 1996.
  */
-libc_hidden_proto(inet_ntop)
+/* libc_hidden_proto(inet_ntop) */
 const char *
 inet_ntop(int af, const void *src, char *dst, socklen_t size)
 {
@@ -389,7 +389,7 @@ libc_hidden_def(inet_ntop)
  * author:
  *	Paul Vixie, 1996.
  */
-libc_hidden_proto(inet_pton)
+/* libc_hidden_proto(inet_pton) */
 int
 inet_pton(int af, const char *src, void *dst)
 {
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 901a7d828..d421aae4b 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -181,44 +181,45 @@
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(random)
-libc_hidden_proto(getservbyport)
-libc_hidden_proto(gethostname)
-libc_hidden_proto(uname)
-libc_hidden_proto(inet_addr)
-libc_hidden_proto(inet_aton)
-libc_hidden_proto(inet_pton)
-libc_hidden_proto(inet_ntop)
-libc_hidden_proto(connect)
+/* libc_hidden_proto(random) */
+/* libc_hidden_proto(getservbyport) */
+/* libc_hidden_proto(gethostname) */
+/* libc_hidden_proto(uname) */
+/* libc_hidden_proto(inet_addr) */
+/* libc_hidden_proto(inet_aton) */
+/* libc_hidden_proto(inet_pton) */
+/* libc_hidden_proto(inet_ntop) */
+/* libc_hidden_proto(connect) */
 /* libc_hidden_proto(poll) */
-libc_hidden_proto(select)
-libc_hidden_proto(recv)
-libc_hidden_proto(send)
+/* libc_hidden_proto(select) */
+/* libc_hidden_proto(recv) */
+/* libc_hidden_proto(send) */
 /* libc_hidden_proto(printf) */
 /* libc_hidden_proto(sprintf) */
-libc_hidden_proto(snprintf)
+/* libc_hidden_proto(snprintf) */
 /* libc_hidden_proto(fgets) */
-libc_hidden_proto(getnameinfo)
-libc_hidden_proto(gethostbyname)
-libc_hidden_proto(gethostbyname_r)
-libc_hidden_proto(gethostbyname2_r)
-libc_hidden_proto(gethostbyaddr)
-libc_hidden_proto(gethostbyaddr_r)
-libc_hidden_proto(ns_name_uncompress)
-libc_hidden_proto(ns_name_unpack)
-libc_hidden_proto(ns_name_ntop)
-libc_hidden_proto(res_init)
-libc_hidden_proto(res_query)
-libc_hidden_proto(res_querydomain)
-libc_hidden_proto(gethostent_r)
+/* libc_hidden_proto(getnameinfo) */
+/* libc_hidden_proto(gethostbyname) */
+/* libc_hidden_proto(gethostbyname_r) */
+/* libc_hidden_proto(gethostbyname2_r) */
+/* libc_hidden_proto(gethostbyaddr) */
+/* libc_hidden_proto(gethostbyaddr_r) */
+/* libc_hidden_proto(ns_name_uncompress) */
+/* libc_hidden_proto(ns_name_unpack) */
+/* libc_hidden_proto(ns_name_ntop) */
+/* libc_hidden_proto(res_init) */
+/* libc_hidden_proto(res_query) */
+/* libc_hidden_proto(res_querydomain) */
+/* libc_hidden_proto(gethostent_r) */
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(__h_errno_location)
+/* libc_hidden_proto(__h_errno_location) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_b) */
 #endif
-int __libc_getdomainname(char *name, size_t len);
+
+extern int __libc_getdomainname(char *name, size_t len);
 libc_hidden_proto(__libc_getdomainname)
 
 
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 30649f91c..478315b8f 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -40,7 +40,7 @@
 #include "rpc_private.h"
 
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_opaque_auth)
+/* libc_hidden_proto(xdr_opaque_auth) */
 
 #define MAX_MARSHAL_SIZE 20
 
@@ -74,7 +74,7 @@ struct authnone_private_s {
 static struct authnone_private_s *authnone_private;
 #endif
 
-libc_hidden_proto(authnone_create)
+/* 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 2364aff68..9f5d8b4d7 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -57,14 +57,14 @@
 #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(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(xdr_authunix_parms) */
+/* libc_hidden_proto(xdr_opaque_auth) */
 /* libc_hidden_proto(gettimeofday) */
 /* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(perror) */
@@ -109,7 +109,7 @@ 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)
+/* libc_hidden_proto(authunix_create) */
 AUTH *
 authunix_create (char *machname, uid_t uid, gid_t gid, int len,
 		 gid_t *aup_gids)
@@ -182,7 +182,7 @@ libc_hidden_def(authunix_create)
  * Returns an auth handle with parameters determined by doing lots of
  * syscalls.
  */
-libc_hidden_proto(authunix_create_default)
+/* 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 62d1cb724..2739e7658 100644
--- a/libc/inet/rpc/authunix_prot.c
+++ b/libc/inet/rpc/authunix_prot.c
@@ -39,17 +39,17 @@
 #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)
+/* 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)
+/* 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 457f1f97f..b9e77f3cd 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -41,13 +41,13 @@
 #include <netinet/in.h>
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(bind)
+/* libc_hidden_proto(bind) */
 /* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
  */
-libc_hidden_proto(bindresvport)
+/* 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 54bd0e914..165f42aeb 100644
--- a/libc/inet/rpc/clnt_generic.c
+++ b/libc/inet/rpc/clnt_generic.c
@@ -44,12 +44,12 @@
 /* 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)
+/* 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 e700e4137..201a3a353 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 /* 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(__glibc_strerror_r) */
 /* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
 /* libc_hidden_proto(fwprintf) */
@@ -186,7 +186,7 @@ static const struct rpc_errtab rpc_errlist[] =
 /*
  * This interface for use by clntrpc
  */
-libc_hidden_proto(clnt_sperrno)
+/* libc_hidden_proto(clnt_sperrno) */
 char *
 clnt_sperrno (enum clnt_stat stat)
 {
@@ -217,7 +217,7 @@ clnt_perrno (enum clnt_stat num)
 /*
  * Print reply error info
  */
-libc_hidden_proto(clnt_sperror)
+/* libc_hidden_proto(clnt_sperror) */
 char *
 clnt_sperror (CLIENT * rpch, const char *msg)
 {
@@ -303,7 +303,7 @@ clnt_sperror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_sperror)
 
-libc_hidden_proto(clnt_perror)
+/* libc_hidden_proto(clnt_perror) */
 void
 clnt_perror (CLIENT * rpch, const char *msg)
 {
@@ -316,7 +316,7 @@ clnt_perror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_perror)
 
-libc_hidden_proto(clnt_spcreateerror)
+/* 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 9941e0894..91340d85a 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -49,13 +49,13 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 
 /* libc_hidden_proto(perror) */
-libc_hidden_proto(authnone_create)
+/* libc_hidden_proto(authnone_create) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callhdr)
+/* 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)
+/* 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 52fb756a0..938a4d621 100644
--- a/libc/inet/rpc/clnt_simple.c
+++ b/libc/inet/rpc/clnt_simple.c
@@ -54,8 +54,8 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 /* 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)
+/* 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 553b11bef..622d44552 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -69,22 +69,22 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 /* 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(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(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(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)
+/* libc_hidden_proto(__rpc_thread_createerr) */
 #ifdef USE_IN_LIBIO
 /* libc_hidden_proto(fwprintf) */
 #endif
@@ -141,7 +141,7 @@ static 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)
+/* 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 3763db680..84eb5ed10 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -67,23 +67,23 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
-libc_hidden_proto(__cmsg_nxthdr)
+/* libc_hidden_proto(__cmsg_nxthdr) */
 
-libc_hidden_proto(authnone_create)
+/* libc_hidden_proto(authnone_create) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callhdr)
+/* 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(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)
+/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -144,7 +144,7 @@ struct cu_data
  * sendsz and recvsz are the maximum allowable packet sizes that can be
  * sent and received.
  */
-libc_hidden_proto(clntudp_bufcreate)
+/* 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 +245,7 @@ fooy:
 }
 libc_hidden_def(clntudp_bufcreate)
 
-libc_hidden_proto(clntudp_create)
+/* 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 6de4e63b1..b412ccb7d 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -68,25 +68,25 @@
 /* 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(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(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(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)
+/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -140,7 +140,7 @@ static 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)
+/* 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 b46062657..be24d660c 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -25,8 +25,8 @@
 #include <sys/time.h>
 #include <rpc/rpc.h>
 
-libc_hidden_proto(lrand48_r)
-libc_hidden_proto(srand48_r)
+/* 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/getrpcent.c b/libc/inet/rpc/getrpcent.c
index 2730a644a..2a98544f1 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -51,8 +51,8 @@
 /* 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(atoi) */
+/* libc_hidden_proto(rewind) */
 /* libc_hidden_proto(fgets) */
 
 /*
@@ -84,7 +84,7 @@ static struct rpcdata *_rpcdata(void)
 	return d;
 }
 
-libc_hidden_proto(endrpcent)
+/* libc_hidden_proto(endrpcent) */
 void endrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -102,7 +102,7 @@ void endrpcent(void)
 }
 libc_hidden_def(endrpcent)
 
-libc_hidden_proto(setrpcent)
+/* libc_hidden_proto(setrpcent) */
 void setrpcent(int f)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -128,7 +128,7 @@ static struct rpcent *__get_next_rpcent(struct rpcdata *d)
 	return interpret(d);
 }
 
-libc_hidden_proto(getrpcent)
+/* libc_hidden_proto(getrpcent) */
 struct rpcent *getrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -141,7 +141,7 @@ struct rpcent *getrpcent(void)
 }
 libc_hidden_def(getrpcent)
 
-libc_hidden_proto(getrpcbynumber)
+/* libc_hidden_proto(getrpcbynumber) */
 struct rpcent *getrpcbynumber(register int number)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -159,7 +159,7 @@ struct rpcent *getrpcbynumber(register int number)
 }
 libc_hidden_def(getrpcbynumber)
 
-libc_hidden_proto(getrpcbyname)
+/* 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 0a57d1da9..d831e6719 100644
--- a/libc/inet/rpc/getrpcport.c
+++ b/libc/inet/rpc/getrpcport.c
@@ -49,8 +49,8 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 #include <sys/socket.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(pmap_getport)
-libc_hidden_proto(gethostbyname_r)
+/* 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 1760adf37..bcdbbf4e0 100644
--- a/libc/inet/rpc/pm_getmaps.c
+++ b/libc/inet/rpc/pm_getmaps.c
@@ -48,11 +48,11 @@ 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)
+/* 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 327fb9101..fa9780c22 100644
--- a/libc/inet/rpc/pm_getport.c
+++ b/libc/inet/rpc/pm_getport.c
@@ -44,10 +44,10 @@ 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)
+/* 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 +59,7 @@ 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)
+/* 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 d71378068..948d9dc2e 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -53,10 +53,10 @@
 /* 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)
+/* 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 +122,7 @@ 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)
+/* libc_hidden_proto(pmap_set) */
 bool_t
 pmap_set (u_long program, u_long version, int protocol, u_short port)
 {
@@ -159,7 +159,7 @@ 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)
+/* 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 0ae2c88f3..a5c4d166b 100644
--- a/libc/inet/rpc/pmap_prot.c
+++ b/libc/inet/rpc/pmap_prot.c
@@ -42,9 +42,9 @@ 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_u_long) */
 
-libc_hidden_proto(xdr_pmap)
+/* 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 5adc4ee2e..21def3c4f 100644
--- a/libc/inet/rpc/pmap_prot2.c
+++ b/libc/inet/rpc/pmap_prot2.c
@@ -42,9 +42,9 @@ 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)
+/* libc_hidden_proto(xdr_bool) */
+/* libc_hidden_proto(xdr_reference) */
+/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * What is going on with linked lists? (!)
@@ -84,7 +84,7 @@ libc_hidden_proto(xdr_pmap)
  * 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)
+/* 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 037b3ede0..a1f8f71a8 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -64,21 +64,21 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 /* libc_hidden_proto(perror) */
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(authunix_create_default)
+/* libc_hidden_proto(authunix_create_default) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callmsg)
+/* 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(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) */
 
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index b8e54b61e..17af69ee5 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -105,32 +105,32 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 /* 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(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(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)
+/* libc_hidden_proto(__h_errno_location) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
 /* libc_hidden_proto(__ctype_tolower_loc) */
@@ -139,7 +139,7 @@ libc_hidden_proto(__h_errno_location)
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
 
-libc_hidden_proto(rresvport)
+/* libc_hidden_proto(rresvport) */
 
 /* some forward declarations */
 static int __ivaliduser2(FILE *hostf, u_int32_t raddr,
diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c
index 4a3141b6b..12df3ab8f 100644
--- a/libc/inet/rpc/rexec.c
+++ b/libc/inet/rpc/rexec.c
@@ -51,17 +51,17 @@
 /* libc_hidden_proto(socket) */
 /* libc_hidden_proto(perror) */
 /* libc_hidden_proto(sprintf) */
-libc_hidden_proto(snprintf)
-libc_hidden_proto(getsockname)
-libc_hidden_proto(getnameinfo)
-libc_hidden_proto(getaddrinfo)
-libc_hidden_proto(freeaddrinfo)
-libc_hidden_proto(sleep)
-libc_hidden_proto(atoi)
-libc_hidden_proto(connect)
-libc_hidden_proto(accept)
-libc_hidden_proto(listen)
-libc_hidden_proto(ruserpass)
+/* libc_hidden_proto(snprintf) */
+/* libc_hidden_proto(getsockname) */
+/* libc_hidden_proto(getnameinfo) */
+/* libc_hidden_proto(getaddrinfo) */
+/* libc_hidden_proto(freeaddrinfo) */
+/* libc_hidden_proto(sleep) */
+/* libc_hidden_proto(atoi) */
+/* libc_hidden_proto(connect) */
+/* libc_hidden_proto(accept) */
+/* libc_hidden_proto(listen) */
+/* libc_hidden_proto(ruserpass) */
 
 #define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
 extern int __libc_sa_len (sa_family_t __af) __THROW attribute_hidden;
@@ -69,7 +69,7 @@ extern int __libc_sa_len (sa_family_t __af) __THROW attribute_hidden;
 int	rexecoptions;
 char	ahostbuf[NI_MAXHOST] attribute_hidden;
 
-libc_hidden_proto(rexec_af)
+/* libc_hidden_proto(rexec_af) */
 int
 rexec_af(char **ahost, int rport, const char *name, const char *pass, const char *cmd, int *fd2p, sa_family_t af)
 {
diff --git a/libc/inet/rpc/rpc_cmsg.c b/libc/inet/rpc/rpc_cmsg.c
index 3206aae55..0d8aac627 100644
--- a/libc/inet/rpc/rpc_cmsg.c
+++ b/libc/inet/rpc/rpc_cmsg.c
@@ -46,16 +46,16 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #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)
+/* 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)
+/* 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 11a7ad457..fe3d4a39f 100644
--- a/libc/inet/rpc/rpc_dtablesize.c
+++ b/libc/inet/rpc/rpc_dtablesize.c
@@ -38,13 +38,13 @@ 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)
+/* 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)
+/* 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 15250059a..24112a468 100644
--- a/libc/inet/rpc/rpc_private.h
+++ b/libc/inet/rpc/rpc_private.h
@@ -4,7 +4,7 @@
 /* Now define the internal interfaces.  */
 extern u_long _create_xid (void) attribute_hidden;
 
-libc_hidden_proto(__rpc_thread_createerr)
+/* 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 418aae900..ddfabe035 100644
--- a/libc/inet/rpc/rpc_prot.c
+++ b/libc/inet/rpc/rpc_prot.c
@@ -51,11 +51,11 @@ 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)
+/* 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 +63,7 @@ libc_hidden_proto(xdr_u_long)
  * XDR an opaque authentication struct
  * (see auth.h)
  */
-libc_hidden_proto(xdr_opaque_auth)
+/* libc_hidden_proto(xdr_opaque_auth) */
 bool_t
 xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
 {
@@ -89,7 +89,7 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
 /*
  * XDR the MSG_ACCEPTED part of a reply message union
  */
-libc_hidden_proto(xdr_accepted_reply)
+/* libc_hidden_proto(xdr_accepted_reply) */
 bool_t
 xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
 {
@@ -116,7 +116,7 @@ libc_hidden_def(xdr_accepted_reply)
 /*
  * XDR the MSG_DENIED part of a reply message union
  */
-libc_hidden_proto(xdr_rejected_reply)
+/* libc_hidden_proto(xdr_rejected_reply) */
 bool_t
 xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
 {
@@ -166,7 +166,7 @@ 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)
+/* libc_hidden_proto(xdr_callhdr) */
 bool_t
 xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg)
 {
@@ -247,7 +247,7 @@ rejected (enum reject_stat rjct_stat,
 /*
  * given a reply message, fills in the error
  */
-libc_hidden_proto(_seterr_reply)
+/* 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 43d2fc547..0e0078c2c 100644
--- a/libc/inet/rpc/rpc_thread.c
+++ b/libc/inet/rpc/rpc_thread.c
@@ -10,10 +10,10 @@
 #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)
+/* 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 80962a2b7..08bdf9396 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -61,11 +61,11 @@ static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
 /* 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(connect) */
+/* libc_hidden_proto(recvfrom) */
+/* libc_hidden_proto(sendto) */
 /* libc_hidden_proto(poll) */
-libc_hidden_proto(rtime)
+/* 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 0586516aa..3b0dc924a 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -52,17 +52,17 @@
 /* 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(__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)
+/* libc_hidden_proto(getc_unlocked) */
+/* libc_hidden_proto(__fgetc_unlocked) */
 
 #define _(X)  (X)
 /* #include "ftp_var.h" */
@@ -114,7 +114,7 @@ static const struct toktab {
 
 /* ruserpass - remote password check.
    This function also exists in glibc but is undocumented */
-libc_hidden_proto(ruserpass)
+/* 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 253c06379..38811f5b7 100644
--- a/libc/inet/rpc/svc.c
+++ b/libc/inet/rpc/svc.c
@@ -47,15 +47,15 @@
 #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)
+/* 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)
+/* 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)
+/* libc_hidden_proto(__rpc_thread_svc_fdset) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 #define xports (*(SVCXPRT ***)&RPC_THREAD_VARIABLE(svc_xports_s))
@@ -85,7 +85,7 @@ static struct svc_callout *svc_head;
 /* ***************  SVCXPRT related stuff **************** */
 
 /* Activate a transport handle. */
-libc_hidden_proto(xprt_register)
+/* libc_hidden_proto(xprt_register) */
 void
 xprt_register (SVCXPRT *xprt)
 {
@@ -129,7 +129,7 @@ xprt_register (SVCXPRT *xprt)
 libc_hidden_def(xprt_register)
 
 /* De-activate a transport handle. */
-libc_hidden_proto(xprt_unregister)
+/* libc_hidden_proto(xprt_unregister) */
 void
 xprt_unregister (SVCXPRT *xprt)
 {
@@ -175,7 +175,7 @@ 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)
+/* 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 +210,7 @@ pmap_it:
 libc_hidden_def(svc_register)
 
 /* Remove a service program from the callout list. */
-libc_hidden_proto(svc_unregister)
+/* libc_hidden_proto(svc_unregister) */
 void
 svc_unregister (rpcprog_t prog, rpcvers_t vers)
 {
@@ -235,7 +235,7 @@ libc_hidden_def(svc_unregister)
 /* ******************* REPLY GENERATION ROUTINES  ************ */
 
 /* Send a reply to an rpc request */
-libc_hidden_proto(svc_sendreply)
+/* libc_hidden_proto(svc_sendreply) */
 bool_t
 svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
 	       caddr_t xdr_location)
@@ -266,7 +266,7 @@ svcerr_noproc (register SVCXPRT *xprt)
 }
 
 /* Can't decode args error reply */
-libc_hidden_proto(svcerr_decode)
+/* libc_hidden_proto(svcerr_decode) */
 void
 svcerr_decode (register SVCXPRT *xprt)
 {
@@ -294,7 +294,7 @@ svcerr_systemerr (register SVCXPRT *xprt)
 }
 
 /* Authentication error reply */
-libc_hidden_proto(svcerr_auth)
+/* libc_hidden_proto(svcerr_auth) */
 void
 svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
 {
@@ -316,7 +316,7 @@ svcerr_weakauth (SVCXPRT *xprt)
 }
 
 /* Program unavailable error reply */
-libc_hidden_proto(svcerr_noprog)
+/* libc_hidden_proto(svcerr_noprog) */
 void
 svcerr_noprog (register SVCXPRT *xprt)
 {
@@ -331,7 +331,7 @@ svcerr_noprog (register SVCXPRT *xprt)
 libc_hidden_def(svcerr_noprog)
 
 /* Program version mismatch error reply */
-libc_hidden_proto(svcerr_progvers)
+/* libc_hidden_proto(svcerr_progvers) */
 void
 svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
 		 rpcvers_t high_vers)
@@ -366,7 +366,7 @@ libc_hidden_def(svcerr_progvers)
  * is mallocated in kernel land.
  */
 
-libc_hidden_proto(svc_getreq_common)
+/* libc_hidden_proto(svc_getreq_common) */
 void
 svc_getreq_common (const int fd)
 {
@@ -458,7 +458,7 @@ svc_getreq_common (const int fd)
 }
 libc_hidden_def(svc_getreq_common)
 
-libc_hidden_proto(svc_getreqset)
+/* libc_hidden_proto(svc_getreqset) */
 void
 svc_getreqset (fd_set *readfds)
 {
@@ -476,7 +476,7 @@ svc_getreqset (fd_set *readfds)
 }
 libc_hidden_def(svc_getreqset)
 
-libc_hidden_proto(svc_getreq)
+/* libc_hidden_proto(svc_getreq) */
 void
 svc_getreq (int rdfds)
 {
@@ -488,7 +488,7 @@ svc_getreq (int rdfds)
 }
 libc_hidden_def(svc_getreq)
 
-libc_hidden_proto(svc_getreq_poll)
+/* 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 1a5dcf0ca..52208c1ee 100644
--- a/libc/inet/rpc/svc_auth.c
+++ b/libc/inet/rpc/svc_auth.c
@@ -101,7 +101,7 @@ svcauthsw[] =
  * There is an assumption that any flavour less than AUTH_NULL is
  * invalid.
  */
-libc_hidden_proto(_authenticate)
+/* 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 9f2271ad2..556cdde30 100644
--- a/libc/inet/rpc/svc_authux.c
+++ b/libc/inet/rpc/svc_authux.c
@@ -49,7 +49,7 @@
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* libc_hidden_proto(printf) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_authunix_parms)
+/* 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 7f3f55bc6..075fbad95 100644
--- a/libc/inet/rpc/svc_raw.c
+++ b/libc/inet/rpc/svc_raw.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/svc.h>
 
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callmsg)
+/* libc_hidden_proto(xdr_callmsg) */
 /* libc_hidden_proto(xdr_replymsg) */
 
 /*
diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c
index 7ffff0772..49d52d01b 100644
--- a/libc/inet/rpc/svc_run.c
+++ b/libc/inet/rpc/svc_run.c
@@ -40,11 +40,11 @@
 #include <rpc/rpc.h>
 
 /* libc_hidden_proto(perror) */
-libc_hidden_proto(svc_getreq_poll)
+/* 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)
+/* 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 9373c8b65..d50f014a8 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -57,16 +57,16 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 
 /* Experimentally off - libc_hidden_proto(strdup) */
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(asprintf)
+/* 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)
+/* 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 e04c28f63..0e5c5c727 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -66,20 +66,20 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 /* 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(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(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(accept) */
+/* libc_hidden_proto(listen) */
 /* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 733ec3f33..866e5275a 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -66,19 +66,19 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 /* 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(xprt_register) */
+/* libc_hidden_proto(xprt_unregister) */
 /* libc_hidden_proto(xdrmem_create) */
-libc_hidden_proto(xdr_callmsg)
+/* 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(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) */
 
@@ -134,7 +134,7 @@ struct svcudp_data
  * see (svc.h, xprt_register).
  * The routines returns NULL if a problem occurred.
  */
-libc_hidden_proto(svcudp_bufcreate)
+/* libc_hidden_proto(svcudp_bufcreate) */
 SVCXPRT *
 svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 {
@@ -226,7 +226,7 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 }
 libc_hidden_def(svcudp_bufcreate)
 
-libc_hidden_proto(svcudp_create)
+/* 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 03c4336d1..3670bb1ec 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -62,24 +62,24 @@
 /* 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(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(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(accept) */
+/* libc_hidden_proto(listen) */
 /* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index 335702c0f..11e52136d 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -87,7 +87,7 @@ xdr_free (xdrproc_t proc, char *objp)
 /*
  * XDR nothing
  */
-libc_hidden_proto(xdr_void)
+/* libc_hidden_proto(xdr_void) */
 bool_t
 xdr_void (void)
 {
@@ -100,7 +100,7 @@ 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)
+/* libc_hidden_proto(xdr_long) */
 bool_t
 xdr_long (XDR *xdrs, long *lp)
 {
@@ -123,7 +123,7 @@ libc_hidden_def(xdr_long)
 /*
  * XDR short integers
  */
-libc_hidden_proto(xdr_short)
+/* libc_hidden_proto(xdr_short) */
 bool_t
 xdr_short (XDR *xdrs, short *sp)
 {
@@ -153,7 +153,7 @@ libc_hidden_def(xdr_short)
 /*
  * XDR integers
  */
-libc_hidden_proto(xdr_int)
+/* libc_hidden_proto(xdr_int) */
 bool_t
 xdr_int (XDR *xdrs, int *ip)
 {
@@ -192,7 +192,7 @@ 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)
+/* libc_hidden_proto(xdr_u_long) */
 bool_t
 xdr_u_long (XDR *xdrs, u_long *ulp)
 {
@@ -226,7 +226,7 @@ libc_hidden_def(xdr_u_long)
 /*
  * XDR unsigned integers
  */
-libc_hidden_proto(xdr_u_int)
+/* libc_hidden_proto(xdr_u_int) */
 bool_t
 xdr_u_int (XDR *xdrs, u_int *up)
 {
@@ -263,7 +263,7 @@ 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)
+/* libc_hidden_proto(xdr_hyper) */
 bool_t
 xdr_hyper (XDR *xdrs, quad_t *llp)
 {
@@ -298,7 +298,7 @@ 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)
+/* libc_hidden_proto(xdr_u_hyper) */
 bool_t
 xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
 {
@@ -343,7 +343,7 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
 /*
  * XDR unsigned short integers
  */
-libc_hidden_proto(xdr_u_short)
+/* libc_hidden_proto(xdr_u_short) */
 bool_t
 xdr_u_short (XDR *xdrs, u_short *usp)
 {
@@ -408,7 +408,7 @@ xdr_u_char (XDR *xdrs, u_char *cp)
 /*
  * XDR booleans
  */
-libc_hidden_proto(xdr_bool)
+/* libc_hidden_proto(xdr_bool) */
 bool_t
 xdr_bool (XDR *xdrs, bool_t *bp)
 {
@@ -438,7 +438,7 @@ libc_hidden_def(xdr_bool)
 /*
  * XDR enumerations
  */
-libc_hidden_proto(xdr_enum)
+/* libc_hidden_proto(xdr_enum) */
 bool_t
 xdr_enum (XDR *xdrs, enum_t *ep)
 {
@@ -492,7 +492,7 @@ 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)
+/* libc_hidden_proto(xdr_opaque) */
 bool_t
 xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
 {
@@ -544,7 +544,7 @@ 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)
+/* libc_hidden_proto(xdr_bytes) */
 bool_t
 xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
 {
@@ -628,7 +628,7 @@ 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)
+/* 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 +675,7 @@ 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)
+/* 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 f8f8a1f86..ec5c0b367 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -56,7 +56,7 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 
 /* Experimentally off - libc_hidden_proto(memset) */
 /* libc_hidden_proto(fputs) */
-libc_hidden_proto(xdr_u_int)
+/* libc_hidden_proto(xdr_u_int) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -68,7 +68,7 @@ libc_hidden_proto(xdr_u_int)
  * 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)
+/* 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_rec.c b/libc/inet/rpc/xdr_rec.c
index 38349f4ad..af5eb5217 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -146,7 +146,7 @@ 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)
+/* libc_hidden_proto(xdrrec_create) */
 void
 xdrrec_create (XDR *xdrs, u_int sendsize,
 	       u_int recvsize, caddr_t tcp_handle,
@@ -481,7 +481,7 @@ xdrrec_putint32 (XDR *xdrs, const int32_t *ip)
  * Before reading (deserializing from the stream, one should always call
  * this procedure to guarantee proper record alignment.
  */
-libc_hidden_proto(xdrrec_skiprecord)
+/* libc_hidden_proto(xdrrec_skiprecord) */
 bool_t
 xdrrec_skiprecord (XDR *xdrs)
 {
@@ -505,7 +505,7 @@ 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)
+/* libc_hidden_proto(xdrrec_eof) */
 bool_t
 xdrrec_eof (XDR *xdrs)
 {
@@ -531,7 +531,7 @@ 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)
+/* 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 dd8c063ba..9cdeed129 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -56,7 +56,7 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 #endif
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(xdr_bool)
+/* libc_hidden_proto(xdr_bool) */
 /* libc_hidden_proto(fputs) */
 
 #define LASTUNSIGNED	((u_int)0-1)
@@ -70,7 +70,7 @@ libc_hidden_proto(xdr_bool)
  * size is the size of the referneced structure.
  * proc is the routine to handle the referenced structure.
  */
-libc_hidden_proto(xdr_reference)
+/* 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 32689e132..91ce8b828 100644
--- a/libc/inet/rpc/xdr_stdio.c
+++ b/libc/inet/rpc/xdr_stdio.c
@@ -49,11 +49,11 @@
 # 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)
+/* 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 e262e03f8..d9103ea9f 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -50,13 +50,13 @@ int __libc_accept(int s, struct sockaddr *addr, socklen_t * addrlen)
 	return __socketcall(SYS_ACCEPT, args);
 }
 #endif
-libc_hidden_proto(accept)
+/* libc_hidden_proto(accept) */
 weak_alias(__libc_accept,accept)
 libc_hidden_weak(accept)
 #endif
 
 #ifdef L_bind
-libc_hidden_proto(bind)
+/* libc_hidden_proto(bind) */
 #ifdef __NR_bind
 _syscall3(int, bind, int, sockfd, const struct sockaddr *, myaddr, socklen_t, addrlen)
 #elif defined(__NR_socketcall)
@@ -89,7 +89,7 @@ int __libc_connect(int sockfd, const struct sockaddr *saddr, socklen_t addrlen)
 	return __socketcall(SYS_CONNECT, args);
 }
 #endif
-libc_hidden_proto(connect)
+/* libc_hidden_proto(connect) */
 weak_alias(__libc_connect,connect)
 libc_hidden_weak(connect)
 #endif
@@ -111,7 +111,7 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t * paddrlen)
 #endif
 
 #ifdef L_getsockname
-libc_hidden_proto(getsockname)
+/* libc_hidden_proto(getsockname) */
 #ifdef __NR_getsockname
 _syscall3(int, getsockname, int, sockfd, struct sockaddr *, addr, socklen_t *,paddrlen)
 #elif defined(__NR_socketcall)
@@ -148,7 +148,7 @@ int getsockopt(int fd, int level, int optname, __ptr_t optval,
 #endif
 
 #ifdef L_listen
-libc_hidden_proto(listen)
+/* libc_hidden_proto(listen) */
 #ifdef __NR_listen
 _syscall2(int, listen, int, sockfd, int, backlog)
 #elif defined(__NR_socketcall)
@@ -183,13 +183,13 @@ ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
 	return (__socketcall(SYS_RECV, args));
 }
 #elif defined(__NR_recvfrom)
-libc_hidden_proto(recvfrom)
+/* libc_hidden_proto(recvfrom) */
 ssize_t __libc_recv(int sockfd, __ptr_t buffer, size_t len, int flags)
 {
 	return (recvfrom(sockfd, buffer, len, flags, NULL, NULL));
 }
 #endif
-libc_hidden_proto(recv)
+/* libc_hidden_proto(recv) */
 weak_alias(__libc_recv,recv)
 libc_hidden_weak(recv)
 #endif
@@ -216,7 +216,7 @@ ssize_t __libc_recvfrom(int sockfd, __ptr_t buffer, size_t len, int flags,
 	return (__socketcall(SYS_RECVFROM, args));
 }
 #endif
-libc_hidden_proto(recvfrom)
+/* libc_hidden_proto(recvfrom) */
 weak_alias(__libc_recvfrom,recvfrom)
 libc_hidden_weak(recvfrom)
 #endif
@@ -237,7 +237,7 @@ ssize_t __libc_recvmsg(int sockfd, struct msghdr *msg, int flags)
 	return (__socketcall(SYS_RECVMSG, args));
 }
 #endif
-libc_hidden_proto(recvmsg)
+/* libc_hidden_proto(recvmsg) */
 weak_alias(__libc_recvmsg,recvmsg)
 libc_hidden_weak(recvmsg)
 #endif
@@ -260,13 +260,13 @@ ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
 	return (__socketcall(SYS_SEND, args));
 }
 #elif defined(__NR_sendto)
-libc_hidden_proto(sendto)
+/* libc_hidden_proto(sendto) */
 ssize_t __libc_send(int sockfd, const void *buffer, size_t len, int flags)
 {
 	return (sendto(sockfd, buffer, len, flags, NULL, 0));
 }
 #endif
-libc_hidden_proto(send)
+/* libc_hidden_proto(send) */
 weak_alias(__libc_send,send)
 libc_hidden_weak(send)
 #endif
@@ -287,7 +287,7 @@ ssize_t __libc_sendmsg(int sockfd, const struct msghdr *msg, int flags)
 	return (__socketcall(SYS_SENDMSG, args));
 }
 #endif
-libc_hidden_proto(sendmsg)
+/* libc_hidden_proto(sendmsg) */
 weak_alias(__libc_sendmsg,sendmsg)
 libc_hidden_weak(sendmsg)
 #endif
@@ -314,13 +314,13 @@ ssize_t __libc_sendto(int sockfd, const void *buffer, size_t len, int flags,
 	return (__socketcall(SYS_SENDTO, args));
 }
 #endif
-libc_hidden_proto(sendto)
+/* libc_hidden_proto(sendto) */
 weak_alias(__libc_sendto,sendto)
 libc_hidden_weak(sendto)
 #endif
 
 #ifdef L_setsockopt
-libc_hidden_proto(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)
diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index d00cdfac9..c6132924d 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 #undef assert
 
-libc_hidden_proto(__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 9c863e729..fe2cfb657 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -307,7 +307,7 @@ libc_hidden_def(tolower)
 #ifdef L_tolower_l
 
 #undef tolower_l
-libc_hidden_proto(tolower_l)
+/* libc_hidden_proto(tolower_l) */
 int tolower_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -326,7 +326,7 @@ weak_alias (tolower_l, __tolower_l)
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_toupper)
+/* libc_hidden_proto(__ctype_toupper) */
 #endif
 /* libc_hidden_proto(toupper) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
@@ -354,7 +354,7 @@ libc_hidden_def(toupper)
 #ifdef L_toupper_l
 
 #undef toupper_l
-libc_hidden_proto(toupper_l)
+/* libc_hidden_proto(toupper_l) */
 int toupper_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -379,7 +379,7 @@ int __XL_NPP(isascii)(int c)
 
 #else  /* __UCLIBC_HAS_CTYPE_TABLES__ */
 
-libc_hidden_proto(isascii)
+/* libc_hidden_proto(isascii) */
 int isascii(int c)
 {
 	return __isascii(c);		/* locale-independent */
@@ -468,6 +468,8 @@ libc_hidden_def(__ctype_toupper_loc)
 /**********************************************************************/
 #ifdef L___C_ctype_b
 
+//vda:TODO:make static
+
 extern const __ctype_mask_t __C_ctype_b_data[];
 libc_hidden_proto(__C_ctype_b_data)
 const __ctype_mask_t __C_ctype_b_data[] = {
@@ -875,6 +877,8 @@ libc_hidden_data_def(__ctype_b)
 /**********************************************************************/
 #ifdef L___C_ctype_tolower
 
+//vda:TODO: make static
+
 extern const __ctype_touplow_t __C_ctype_tolower_data[];
 libc_hidden_proto(__C_ctype_tolower_data)
 const __ctype_touplow_t __C_ctype_tolower_data[] = {
@@ -980,15 +984,15 @@ const __ctype_touplow_t __C_ctype_tolower_data[] = {
 libc_hidden_data_def(__C_ctype_tolower_data)
 
 /* libc_hidden_proto(__C_ctype_tolower) */
-const __ctype_touplow_t *__C_ctype_tolower = __C_ctype_tolower_data
-											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
+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;
+const __ctype_touplow_t *__ctype_tolower =
+		__C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_tolower)
 
 #endif
@@ -997,6 +1001,8 @@ libc_hidden_data_def(__ctype_tolower)
 /**********************************************************************/
 #ifdef L___C_ctype_toupper
 
+//vda:TODO: make static
+
 extern const __ctype_touplow_t __C_ctype_toupper_data[];
 libc_hidden_proto(__C_ctype_toupper_data)
 const __ctype_touplow_t __C_ctype_toupper_data[] = {
@@ -1102,15 +1108,15 @@ const __ctype_touplow_t __C_ctype_toupper_data[] = {
 libc_hidden_data_def(__C_ctype_toupper_data)
 
 /* libc_hidden_proto(__C_ctype_toupper) */
-const __ctype_touplow_t *__C_ctype_toupper = __C_ctype_toupper_data
-											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
+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_proto(__ctype_toupper) */
+const __ctype_touplow_t *__ctype_toupper =
+		__C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_toupper)
 
 #endif
diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c
index 33ef6098c..466e600ac 100644
--- a/libc/misc/dirent/closedir.c
+++ b/libc/misc/dirent/closedir.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-libc_hidden_proto(closedir)
+/* 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 c6f46e965..e5b41bc6b 100644
--- a/libc/misc/dirent/dirfd.c
+++ b/libc/misc/dirent/dirfd.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include "dirstream.h"
 
-libc_hidden_proto(dirfd)
+/* libc_hidden_proto(dirfd) */
 
 int dirfd(DIR * dir)
 {
diff --git a/libc/misc/dirent/opendir.c b/libc/misc/dirent/opendir.c
index 4a5a562f8..50e4082da 100644
--- a/libc/misc/dirent/opendir.c
+++ b/libc/misc/dirent/opendir.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include "dirstream.h"
 
-libc_hidden_proto(opendir)
+/* libc_hidden_proto(opendir) */
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(fcntl) */
 /* libc_hidden_proto(close) */
diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c
index 2fb7a7246..e92c4ad58 100644
--- a/libc/misc/dirent/readdir.c
+++ b/libc/misc/dirent/readdir.c
@@ -13,7 +13,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-libc_hidden_proto(readdir)
+/* libc_hidden_proto(readdir) */
 
 struct dirent *readdir(DIR * dir)
 {
diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c
index e8a29da96..3aaef5139 100644
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -13,7 +13,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-libc_hidden_proto(readdir64)
+/* 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 2958b1d1a..d394fdb8f 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -15,7 +15,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
-libc_hidden_proto(readdir64_r)
+/* 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 194af621f..51f483ba5 100644
--- a/libc/misc/dirent/readdir_r.c
+++ b/libc/misc/dirent/readdir_r.c
@@ -13,7 +13,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
-libc_hidden_proto(readdir_r)
+/* libc_hidden_proto(readdir_r) */
 int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/scandir.c b/libc/misc/dirent/scandir.c
index 9b0f7385a..9f1055439 100644
--- a/libc/misc/dirent/scandir.c
+++ b/libc/misc/dirent/scandir.c
@@ -13,10 +13,10 @@
 #include "dirstream.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(closedir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(readdir)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(readdir) */
 
 int scandir(const char *dir, struct dirent ***namelist,
 	int (*selector) (const struct dirent *),
diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c
index de294c63a..bbd452d50 100644
--- a/libc/misc/dirent/scandir64.c
+++ b/libc/misc/dirent/scandir64.c
@@ -31,10 +31,10 @@
 #include "dirstream.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(closedir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(readdir64) */
 
 int scandir64(const char *dir, struct dirent64 ***namelist,
 	int (*selector) (const struct dirent64 *),
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index 566410485..d30efbe37 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -21,14 +21,14 @@
 
 #if defined __USE_BSD
 
-libc_hidden_proto(vwarn)
-libc_hidden_proto(vwarnx)
-libc_hidden_proto(verr)
-libc_hidden_proto(verrx)
+/* 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(__xpg_strerror_r) */
 /* libc_hidden_proto(exit) */
 /* libc_hidden_proto(vfprintf) */
 
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 3cf8d34f2..7518ff5e5 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -30,11 +30,11 @@
 /* Experimentally off - libc_hidden_proto(strerror) */
 /* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(exit) */
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 /* libc_hidden_proto(vfprintf) */
-libc_hidden_proto(fflush)
-libc_hidden_proto(fputc)
-libc_hidden_proto(__fputc_unlocked)
+/* 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 bf14808de..58fcdad0a 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-libc_hidden_proto(lockf)
+/* libc_hidden_proto(lockf) */
 
 /* Experimentally off - libc_hidden_proto(memset) */
 /* libc_hidden_proto(fcntl) */
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index ba3887329..e4f6f5cce 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -32,7 +32,7 @@
 #define F_GETLK F_GETLK64
 #undef F_SETLK
 #define F_SETLK F_SETLK64
-libc_hidden_proto(fcntl64)
+/* libc_hidden_proto(fcntl64) */
 #else
 /* libc_hidden_proto(fcntl) */
 #endif
@@ -42,7 +42,7 @@ libc_hidden_proto(fcntl64)
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
-libc_hidden_proto(lockf64)
+/* 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 559a3ca2a..2256cb84c 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -72,7 +72,7 @@
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
 /* libc_hidden_proto(tolower) */
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(fnmatch) */
 /* libc_hidden_proto(getenv) */
 #endif
 
@@ -83,19 +83,19 @@ libc_hidden_proto(fnmatch)
 # include <wchar.h>
 # include <wctype.h>
 # ifdef __UCLIBC__
-libc_hidden_proto(wctype)
-libc_hidden_proto(iswctype)
-libc_hidden_proto(btowc)
+/* 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(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)
+/* libc_hidden_proto(wcslen) */
+/* libc_hidden_proto(wcscoll) */
+/* libc_hidden_proto(towlower) */
+/* libc_hidden_proto(mbsrtowcs) */
 #  endif
 # endif
 #endif
@@ -369,7 +369,7 @@ is_char_class (const wchar_t *wcs)
 # endif
 
 #ifdef __UCLIBC_HAS_WCHAR__
-libc_hidden_proto(_stdlib_mb_cur_max)
+/* 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 020d97bcf..839c77579 100644
--- a/libc/misc/fnmatch/fnmatch_old.c
+++ b/libc/misc/fnmatch/fnmatch_old.c
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA.  */
 #include <fnmatch.h>
 #include <ctype.h>
 
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(fnmatch) */
 
 /* libc_hidden_proto(tolower) */
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index a3a2002da..afc55f88a 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -86,21 +86,21 @@ char *alloca ();
 /* 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)
+/* 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)
+/* libc_hidden_proto(opendir) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(readdir64)
-libc_hidden_proto(lstat64)
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(readdir64) */
+/* libc_hidden_proto(lstat64) */
+/* libc_hidden_proto(stat64) */
 #endif
-libc_hidden_proto(closedir)
+/* libc_hidden_proto(closedir) */
 /* Experimentally off - libc_hidden_proto(stpcpy) */
 /* libc_hidden_proto(lstat) */
 /* libc_hidden_proto(stat) */
diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c
index b1f1a6ad7..8ee0f1a37 100644
--- a/libc/misc/glob/glob-susv3.c
+++ b/libc/misc/glob/glob-susv3.c
@@ -29,10 +29,10 @@
 /* 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)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(fnmatch) */
 
 struct match
 {
@@ -53,11 +53,11 @@ 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)
+/* libc_hidden_proto(readdir64_r) */
+/* libc_hidden_proto(stat64) */
 # define struct_stat struct stat64
 #else
-libc_hidden_proto(readdir_r)
+/* libc_hidden_proto(readdir_r) */
 /* libc_hidden_proto(stat) */
 # define struct_stat struct stat
 #endif
@@ -224,9 +224,9 @@ int __glob_sort(const void *a, const void *b)
 #endif /* !__GLOB64 */
 
 #ifdef __GLOB64
-libc_hidden_proto(glob64)
+/* libc_hidden_proto(glob64) */
 #else
-libc_hidden_proto(glob)
+/* libc_hidden_proto(glob) */
 #endif
 int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g)
 {
@@ -302,9 +302,9 @@ libc_hidden_def(glob)
 #endif
 
 #ifdef __GLOB64
-libc_hidden_proto(globfree64)
+/* libc_hidden_proto(globfree64) */
 #else
-libc_hidden_proto(globfree)
+/* 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 abc75dee5..5736f4981 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -31,13 +31,13 @@
 #include <fnmatch.h>
 #include <glob.h>
 
-libc_hidden_proto(closedir)
-libc_hidden_proto(fnmatch)
+/* 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)
+/* 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) */
@@ -48,7 +48,7 @@ libc_hidden_proto(readdir)
 
 #ifdef ENABLE_GLOB_TILDE_EXPANSION
 #include <pwd.h>
-libc_hidden_proto(getpwnam_r)
+/* libc_hidden_proto(getpwnam_r) */
 #endif
 
 #ifdef COMPILE_GLOB64
@@ -62,13 +62,13 @@ libc_hidden_proto(getpwnam_r)
 #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)
+/* libc_hidden_proto(stat64) */
+/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir readdir
 #ifdef __UCLIBC_HAS_LFS__
 #define __readdir64 readdir64
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir64 readdir
 #endif
@@ -132,7 +132,7 @@ 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)
+/* 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 +489,11 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags,
 }
 
 #ifdef COMPILE_GLOB64
-libc_hidden_proto(glob64)
-libc_hidden_proto(globfree64)
+/* libc_hidden_proto(glob64) */
+/* libc_hidden_proto(globfree64) */
 #else
-libc_hidden_proto(glob)
-libc_hidden_proto(globfree)
+/* 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 a44bf6062..4401ba249 100644
--- a/libc/misc/internals/__errno_location.c
+++ b/libc/misc/internals/__errno_location.c
@@ -6,8 +6,8 @@
 
 #include "internal_errno.h"
 
-/* psm: moved to bits/errno.h: libc_hidden_proto(__errno_location) */
-libc_hidden_proto(__errno_location)
+/* 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 2ac21774c..f4a587e96 100644
--- a/libc/misc/internals/__h_errno_location.c
+++ b/libc/misc/internals/__h_errno_location.c
@@ -6,7 +6,7 @@
 
 #include "internal_errno.h"
 
-libc_hidden_proto(__h_errno_location)
+/* 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 af4bfac42..5f31e347c 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -34,10 +34,10 @@
 #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(getgid) */
+/* libc_hidden_proto(getuid) */
+/* libc_hidden_proto(getegid) */
+/* libc_hidden_proto(geteuid) */
 /* libc_hidden_proto(fstat) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c
index fcf143fb5..20b26b2b6 100644
--- a/libc/misc/internals/errno.c
+++ b/libc/misc/internals/errno.c
@@ -1,8 +1,8 @@
 #include "internal_errno.h"
 
 #ifdef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(errno)
-libc_hidden_proto(h_errno)
+/* 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 8ce277555..10d00041c 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -48,10 +48,10 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* libc_hidden_proto(sprintf) */
-libc_hidden_proto(mkdir)
+/* libc_hidden_proto(mkdir) */
 /* libc_hidden_proto(open) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(open64)
+/* libc_hidden_proto(open64) */
 #endif
 /* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index c1f91bcee..71bd77951 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -194,7 +194,7 @@ 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)
+/* libc_hidden_proto(newlocale) */
 
 static void update_hr_locale(const unsigned char *spec)
 {
@@ -303,7 +303,7 @@ 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)
+/* libc_hidden_proto(localeconv) */
 
 #ifdef __LOCALE_C_ONLY
 
@@ -369,7 +369,7 @@ libc_hidden_def(localeconv)
 #ifndef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b) */
 /* libc_hidden_proto(__ctype_tolower) */
-libc_hidden_proto(__ctype_toupper)
+/* libc_hidden_proto(__ctype_toupper) */
 #endif
 
 __uclibc_locale_t __global_locale_data;
@@ -1026,7 +1026,7 @@ static const unsigned char nl_data[C_LC_ALL + 1 + 90 + 320] = {
 	   ']', '\x00',    '^',    '[',    'n',    'N',    ']', '\x00',
 };
 
-libc_hidden_proto(nl_langinfo)
+/* libc_hidden_proto(nl_langinfo) */
 char *nl_langinfo(nl_item item)
 {
 	unsigned int c;
@@ -1046,9 +1046,9 @@ libc_hidden_def(nl_langinfo)
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-libc_hidden_proto(nl_langinfo)
+/* libc_hidden_proto(nl_langinfo) */
 
-libc_hidden_proto(nl_langinfo_l)
+/* libc_hidden_proto(nl_langinfo_l) */
 
 char *nl_langinfo(nl_item item)
 {
@@ -1085,7 +1085,7 @@ libc_hidden_def(__XL_NPP(nl_langinfo))
 #ifdef L_newlocale
 
 /* Experimentally off - libc_hidden_proto(stpcpy) */
-libc_hidden_proto(newlocale)
+/* libc_hidden_proto(newlocale) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning TODO: Move posix and utf8 strings.
@@ -1330,7 +1330,7 @@ libc_hidden_def(newlocale)
 /**********************************************************************/
 #ifdef L_duplocale
 
-libc_hidden_proto(duplocale)
+/* libc_hidden_proto(duplocale) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning REMINDER: When we allocate ctype tables, remember to dup them.
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index 9730b5237..55f672a3c 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -12,16 +12,16 @@
 
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
 
-libc_hidden_proto(getmntent_r)
-libc_hidden_proto(setmntent)
-libc_hidden_proto(endmntent)
+/* 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(atoi) */
 /* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(fseek)
+/* libc_hidden_proto(fseek) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 /* libc_hidden_proto(fprintf) */
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 210ae05ee..0b3b585ce 100644
--- a/libc/misc/regex/regcomp.c
+++ b/libc/misc/regex/regcomp.c
@@ -806,7 +806,7 @@ 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)
+/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #endif
 
 static reg_errcode_t
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index 2dc196782..623a3c6bb 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -46,17 +46,17 @@
 #define __wcrtomb wcrtomb
 #define __btowc btowc
 #define __wctype wctype
-libc_hidden_proto(wcscoll)
-libc_hidden_proto(wcrtomb)
-libc_hidden_proto(mbrtowc)
-libc_hidden_proto(iswctype)
-libc_hidden_proto(iswlower)
-libc_hidden_proto(iswalnum)
-libc_hidden_proto(towlower)
-libc_hidden_proto(towupper)
-libc_hidden_proto(mbsinit)
-libc_hidden_proto(btowc)
-libc_hidden_proto(wctype)
+/* libc_hidden_proto(wcscoll) */
+/* libc_hidden_proto(wcrtomb) */
+/* libc_hidden_proto(mbrtowc) */
+/* libc_hidden_proto(iswctype) */
+/* libc_hidden_proto(iswlower) */
+/* libc_hidden_proto(iswalnum) */
+/* libc_hidden_proto(towlower) */
+/* libc_hidden_proto(towupper) */
+/* libc_hidden_proto(mbsinit) */
+/* libc_hidden_proto(btowc) */
+/* libc_hidden_proto(wctype) */
 
 #endif
 
@@ -71,9 +71,9 @@ libc_hidden_proto(wctype)
 /* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_b) */
-libc_hidden_proto(__ctype_toupper)
+/* libc_hidden_proto(__ctype_toupper) */
 #else
-libc_hidden_proto(isascii)
+/* libc_hidden_proto(isascii) */
 #endif
 /* libc_hidden_proto(toupper) */
 /* libc_hidden_proto(tolower) */
diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h
index 725e33a5a..f0499caf0 100644
--- a/libc/misc/regex/regex_internal.h
+++ b/libc/misc/regex/regex_internal.h
@@ -29,7 +29,7 @@
 
 #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC
 # include <langinfo.h>
-libc_hidden_proto(nl_langinfo)
+/* libc_hidden_proto(nl_langinfo) */
 #endif
 #if defined HAVE_LOCALE_H || defined _LIBC
 # include <locale.h>
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index e8201e90a..76350fc4e 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -75,14 +75,14 @@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
 #  include <wchar.h>
 #  include <wctype.h>
-libc_hidden_proto(wcslen)
-libc_hidden_proto(mbrtowc)
-libc_hidden_proto(wcrtomb)
-libc_hidden_proto(wcscoll)
-libc_hidden_proto(wctype)
-libc_hidden_proto(iswctype)
-libc_hidden_proto(iswalnum)
-libc_hidden_proto(btowc)
+/* libc_hidden_proto(wcslen) */
+/* libc_hidden_proto(mbrtowc) */
+/* libc_hidden_proto(wcrtomb) */
+/* libc_hidden_proto(wcscoll) */
+/* libc_hidden_proto(wctype) */
+/* libc_hidden_proto(iswctype) */
+/* libc_hidden_proto(iswalnum) */
+/* libc_hidden_proto(btowc) */
 
 # endif
 
diff --git a/libc/misc/search/_hsearch_r.c b/libc/misc/search/_hsearch_r.c
index c9c4a9ccf..85475cf5e 100644
--- a/libc/misc/search/_hsearch_r.c
+++ b/libc/misc/search/_hsearch_r.c
@@ -64,7 +64,7 @@ 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)
+/* libc_hidden_proto(hcreate_r) */
 int hcreate_r (size_t nel, struct hsearch_data *htab)
 {
   /* Test for correct arguments.  */
@@ -100,7 +100,7 @@ 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)
+/* libc_hidden_proto(hdestroy_r) */
 void hdestroy_r (struct hsearch_data *htab)
 {
   /* Test for correct arguments.  */
@@ -137,7 +137,7 @@ libc_hidden_def(hdestroy_r)
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 
-libc_hidden_proto(hsearch_r)
+/* 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 e446489ed..da737bab4 100644
--- a/libc/misc/search/_lsearch.c
+++ b/libc/misc/search/_lsearch.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <search.h>
 
-libc_hidden_proto(lfind)
+/* libc_hidden_proto(lfind) */
 
 #ifdef L_lfind
 
diff --git a/libc/misc/search/_tsearch.c b/libc/misc/search/_tsearch.c
index 3d43aa543..5f3706d64 100644
--- a/libc/misc/search/_tsearch.c
+++ b/libc/misc/search/_tsearch.c
@@ -50,7 +50,7 @@ register node	**rootp;	 address of tree root
 int	(*compar)();		 ordering function
 */
 
-libc_hidden_proto(tsearch)
+/* libc_hidden_proto(tsearch) */
 void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
 {
     register node *q;
@@ -81,7 +81,7 @@ libc_hidden_def(tsearch)
 #endif
 
 #ifdef L_tfind
-libc_hidden_proto(tfind)
+/* libc_hidden_proto(tfind) */
 void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar)
 {
     register node **rootp = (node **) vrootp;
@@ -208,7 +208,7 @@ tdestroy_recurse (node *root, __free_fn_t freefct)
     free (root);
 }
 
-libc_hidden_proto(tdestroy)
+/* 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 b1228e2ee..3ecc42567 100644
--- a/libc/misc/search/hsearch.c
+++ b/libc/misc/search/hsearch.c
@@ -19,9 +19,9 @@
 
 #include <search.h>
 
-libc_hidden_proto(hdestroy_r)
-libc_hidden_proto(hsearch_r)
-libc_hidden_proto(hcreate_r)
+/* 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 dfd027941..dc6027373 100644
--- a/libc/misc/statfs/fstatfs64.c
+++ b/libc/misc/statfs/fstatfs64.c
@@ -30,7 +30,7 @@ extern __typeof(fstatfs) __libc_fstatfs;
 libc_hidden_proto(__libc_fstatfs)
 
 /* Return information about the filesystem on which FD resides.  */
-libc_hidden_proto(fstatfs64)
+/* 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 9f2d1ed61..547a9c36a 100644
--- a/libc/misc/statfs/fstatvfs.c
+++ b/libc/misc/statfs/fstatvfs.c
@@ -30,9 +30,9 @@
 /* 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(setmntent) */
+/* libc_hidden_proto(getmntent_r) */
+/* libc_hidden_proto(endmntent) */
 /* libc_hidden_proto(stat) */
 
 #ifndef __USE_FILE_OFFSET64
@@ -51,7 +51,7 @@ extern __typeof(fstatfs) __libc_fstatfs;
 libc_hidden_proto(__libc_fstatfs)
 /* libc_hidden_proto(fstat) */
 /* libc_hidden_proto(stat) */
-libc_hidden_proto(fstatvfs)
+/* 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 906eed327..f06836265 100644
--- a/libc/misc/statfs/fstatvfs64.c
+++ b/libc/misc/statfs/fstatvfs64.c
@@ -32,18 +32,18 @@
 /* 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(setmntent) */
+/* libc_hidden_proto(getmntent_r) */
+/* libc_hidden_proto(endmntent) */
 
 #undef stat
 #define stat stat64
 #if !defined __UCLIBC_LINUX_SPECIFIC__
-libc_hidden_proto(fstatvfs)
+/* libc_hidden_proto(fstatvfs) */
 #else
-libc_hidden_proto(fstatfs64)
+/* libc_hidden_proto(fstatfs64) */
 #endif
-libc_hidden_proto(fstat64)
+/* 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 6b3558b5e..c73c6ae50 100644
--- a/libc/misc/statfs/statfs64.c
+++ b/libc/misc/statfs/statfs64.c
@@ -28,7 +28,7 @@ extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
 
 /* Return information about the filesystem on which FILE resides.  */
-libc_hidden_proto(statfs64)
+/* 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 795f19e79..9bfbe6ea9 100644
--- a/libc/misc/statfs/statvfs.c
+++ b/libc/misc/statfs/statvfs.c
@@ -30,15 +30,15 @@
 /* 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(setmntent) */
+/* libc_hidden_proto(getmntent_r) */
+/* libc_hidden_proto(endmntent) */
 
 extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
 /* libc_hidden_proto(stat) */
 
-libc_hidden_proto(statvfs)
+/* 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 008ba78c9..3f1defefc 100644
--- a/libc/misc/statfs/statvfs64.c
+++ b/libc/misc/statfs/statvfs64.c
@@ -31,18 +31,18 @@
 /* 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(setmntent) */
+/* libc_hidden_proto(getmntent_r) */
+/* libc_hidden_proto(endmntent) */
 
 #undef stat
 #define stat stat64
 #if defined __UCLIBC_LINUX_SPECIFIC__
-libc_hidden_proto(statfs64)
+/* libc_hidden_proto(statfs64) */
 #else
-libc_hidden_proto(statvfs)
+/* libc_hidden_proto(statvfs) */
 #endif
-libc_hidden_proto(stat64)
+/* 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 508cd7192..ccc71ddec 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -79,10 +79,10 @@
 #include <ctype.h>
 #include <signal.h>
 
-libc_hidden_proto(openlog)
-libc_hidden_proto(syslog)
-libc_hidden_proto(vsyslog)
-libc_hidden_proto(closelog)
+/* 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) */
@@ -96,12 +96,12 @@ libc_hidden_proto(closelog)
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(write) */
 /* libc_hidden_proto(getpid) */
-libc_hidden_proto(ctime)
+/* libc_hidden_proto(ctime) */
 /* libc_hidden_proto(sigaction) */
-libc_hidden_proto(sigemptyset)
-libc_hidden_proto(connect)
+/* libc_hidden_proto(sigemptyset) */
+/* libc_hidden_proto(connect) */
 /* libc_hidden_proto(sprintf) */
-libc_hidden_proto(vsnprintf)
+/* libc_hidden_proto(vsnprintf) */
 /* Experimentally off - libc_hidden_proto(time) */
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/misc/sysvipc/shm.c b/libc/misc/sysvipc/shm.c
index 9d71161cb..164580efe 100644
--- a/libc/misc/sysvipc/shm.c
+++ b/libc/misc/sysvipc/shm.c
@@ -38,7 +38,7 @@ _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)
+/* 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 cfa94339a..808046eef 100644
--- a/libc/misc/time/adjtime.c
+++ b/libc/misc/time/adjtime.c
@@ -9,7 +9,7 @@
 #include <sys/timex.h>
 #include <errno.h>
 
-libc_hidden_proto(adjtimex)
+/* libc_hidden_proto(adjtimex) */
 
 #define MAX_SEC	(LONG_MAX / 1000000L - 2)
 #define MIN_SEC	(LONG_MIN / 1000000L + 2)
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index ce58c8fe9..ae800e1ca 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -154,11 +154,11 @@
 #include <xlocale.h>
 #endif
 
-libc_hidden_proto(asctime)
-libc_hidden_proto(asctime_r)
-libc_hidden_proto(ctime)
-libc_hidden_proto(localtime)
-libc_hidden_proto(localtime_r)
+/* libc_hidden_proto(asctime) */
+/* libc_hidden_proto(asctime_r) */
+/* libc_hidden_proto(ctime) */
+/* libc_hidden_proto(localtime) */
+/* libc_hidden_proto(localtime_r) */
 
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
@@ -171,18 +171,18 @@ libc_hidden_proto(localtime_r)
 /* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(getenv) */
-libc_hidden_proto(tzset)
+/* libc_hidden_proto(tzset) */
 /* libc_hidden_proto(gettimeofday) */
 /* Experimentally off - libc_hidden_proto(strncasecmp) */
-libc_hidden_proto(strtol)
-libc_hidden_proto(strtoul)
-libc_hidden_proto(nl_langinfo)
+/* libc_hidden_proto(strtol) */
+/* libc_hidden_proto(strtoul) */
+/* libc_hidden_proto(nl_langinfo) */
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* Experimentally off - libc_hidden_proto(strncasecmp_l) */
-libc_hidden_proto(strtol_l)
-libc_hidden_proto(strtoul_l)
-libc_hidden_proto(nl_langinfo_l)
+/* libc_hidden_proto(strtol_l) */
+/* libc_hidden_proto(strtoul_l) */
+/* libc_hidden_proto(nl_langinfo_l) */
 /* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_b) */
@@ -433,7 +433,7 @@ libc_hidden_def(asctime_r)
 
 #include <sys/times.h>
 
-libc_hidden_proto(times)
+/* libc_hidden_proto(times) */
 
 #ifndef __BCC__
 #if CLOCKS_PER_SEC != 1000000L
@@ -809,9 +809,9 @@ time_t timegm(struct tm *timeptr)
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-libc_hidden_proto(strftime)
+/* libc_hidden_proto(strftime) */
 
-libc_hidden_proto(strftime_l)
+/* libc_hidden_proto(strftime_l) */
 
 size_t strftime(char *__restrict s, size_t maxsize,
 				const char *__restrict format,
@@ -1330,9 +1330,9 @@ libc_hidden_def(__XL_NPP(strftime))
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-libc_hidden_proto(strptime)
+/* libc_hidden_proto(strptime) */
 
-libc_hidden_proto(strptime_l)
+/* libc_hidden_proto(strptime_l) */
 
 char *strptime(const char *__restrict buf, const char *__restrict format,
 			   struct tm *__restrict tm)
@@ -1866,7 +1866,7 @@ ERROR:
 #endif /* __UCLIBC_HAS_TZ_FILE__ */
 
 #ifndef __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(isascii)
+/* libc_hidden_proto(isascii) */
 #endif
 
 void tzset(void)
@@ -2414,9 +2414,9 @@ DONE:
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-libc_hidden_proto(wcsftime)
+/* libc_hidden_proto(wcsftime) */
 
-libc_hidden_proto(wcsftime_l)
+/* libc_hidden_proto(wcsftime_l) */
 
 size_t wcsftime(wchar_t *__restrict s, size_t maxsize,
 				const wchar_t *__restrict format,
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index 88bc2be70..dd6d9ad62 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -41,11 +41,11 @@
 /* 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(__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) */
@@ -102,7 +102,7 @@ static char * value(register char *p)
     return ((p = strchr(p, '=')) ? ++p : NULL);
 }
 
-libc_hidden_proto(setttyent)
+/* libc_hidden_proto(setttyent) */
 int setttyent(void)
 {
 
@@ -120,7 +120,7 @@ int setttyent(void)
 }
 libc_hidden_def(setttyent)
 
-libc_hidden_proto(getttyent)
+/* libc_hidden_proto(getttyent) */
 struct ttyent * getttyent(void)
 {
     register int c;
@@ -201,7 +201,7 @@ struct ttyent * getttyent(void)
 }
 libc_hidden_def(getttyent)
 
-libc_hidden_proto(endttyent)
+/* libc_hidden_proto(endttyent) */
 int endttyent(void)
 {
     int rval;
diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c
index 627839715..cc036cb6d 100644
--- a/libc/misc/utmp/utent.c
+++ b/libc/misc/utmp/utent.c
@@ -68,7 +68,7 @@ bummer:
     return;
 }
 
-libc_hidden_proto(setutent)
+/* libc_hidden_proto(setutent) */
 void setutent(void)
 {
     __UCLIBC_MUTEX_LOCK(utmplock);
@@ -143,7 +143,7 @@ static struct utmp *__getutid(const struct utmp *utmp_entry)
     return NULL;
 }
 
-libc_hidden_proto(getutid)
+/* libc_hidden_proto(getutid) */
 struct utmp *getutid(const struct utmp *utmp_entry)
 {
     struct utmp *ret = NULL;
diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c
index 12ffc1a86..b7a581785 100644
--- a/libc/misc/utmp/wtent.c
+++ b/libc/misc/utmp/wtent.c
@@ -17,12 +17,12 @@
 #if 0
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
-libc_hidden_proto(updwtmp)
+/* libc_hidden_proto(updwtmp) */
 #endif
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(lockf)
+/* libc_hidden_proto(lockf) */
 /* libc_hidden_proto(gettimeofday) */
 
 #if 0
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 6214243e3..9a0ceb293 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -174,9 +174,9 @@ extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
 /**********************************************************************/
 #ifdef L_btowc
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 
-libc_hidden_proto(btowc)
+/* libc_hidden_proto(btowc) */
 wint_t btowc(int c)
 {
 #ifdef __CTYPE_HAS_8_BIT_LOCALES
@@ -215,7 +215,7 @@ libc_hidden_def(btowc)
 
 /* Note: We completely ignore ps in all currently supported conversions. */
 
-libc_hidden_proto(wcrtomb)
+/* libc_hidden_proto(wcrtomb) */
 
 int wctob(wint_t c)
 {
@@ -246,7 +246,7 @@ int wctob(wint_t c)
 /**********************************************************************/
 #ifdef L_mbsinit
 
-libc_hidden_proto(mbsinit)
+/* libc_hidden_proto(mbsinit) */
 int mbsinit(const mbstate_t *ps)
 {
 	return !ps || !ps->__mask;
@@ -257,9 +257,9 @@ libc_hidden_def(mbsinit)
 /**********************************************************************/
 #ifdef L_mbrlen
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 
-libc_hidden_proto(mbrlen)
+/* 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 +272,9 @@ libc_hidden_def(mbrlen)
 /**********************************************************************/
 #ifdef L_mbrtowc
 
-libc_hidden_proto(mbsnrtowcs)
+/* libc_hidden_proto(mbsnrtowcs) */
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 size_t mbrtowc(wchar_t *__restrict pwc, const char *__restrict s,
 			   size_t n, mbstate_t *__restrict ps)
 {
@@ -338,12 +338,12 @@ libc_hidden_def(mbrtowc)
 /**********************************************************************/
 #ifdef L_wcrtomb
 
-libc_hidden_proto(wcsnrtombs)
+/* libc_hidden_proto(wcsnrtombs) */
 
 /* Note: We completely ignore ps in all currently supported conversions. */
 /* TODO: Check for valid state anyway? */
 
-libc_hidden_proto(wcrtomb)
+/* libc_hidden_proto(wcrtomb) */
 size_t wcrtomb(register char *__restrict s, wchar_t wc,
 			   mbstate_t *__restrict ps)
 {
@@ -372,9 +372,9 @@ libc_hidden_def(wcrtomb)
 /**********************************************************************/
 #ifdef L_mbsrtowcs
 
-libc_hidden_proto(mbsnrtowcs)
+/* libc_hidden_proto(mbsnrtowcs) */
 
-libc_hidden_proto(mbsrtowcs)
+/* libc_hidden_proto(mbsrtowcs) */
 size_t mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src,
 				 size_t len, mbstate_t *__restrict ps)
 {
@@ -393,9 +393,9 @@ libc_hidden_def(mbsrtowcs)
 
  * TODO: Check for valid state anyway? */
 
-libc_hidden_proto(wcsnrtombs)
+/* libc_hidden_proto(wcsnrtombs) */
 
-libc_hidden_proto(wcsrtombs)
+/* libc_hidden_proto(wcsrtombs) */
 size_t wcsrtombs(char *__restrict dst, const wchar_t **__restrict src,
 				 size_t len, mbstate_t *__restrict ps)
 {
@@ -700,7 +700,7 @@ 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)
+/* 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 +810,7 @@ libc_hidden_def(mbsnrtowcs)
 /* Note: We completely ignore ps in all currently supported conversions.
  * TODO: Check for valid state anyway? */
 
-libc_hidden_proto(wcsnrtombs)
+/* 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 +924,7 @@ libc_hidden_def(wcsnrtombs)
 /**********************************************************************/
 #ifdef L_wcswidth
 
-libc_hidden_proto(wcswidth)
+/* libc_hidden_proto(wcswidth) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning REMINDER: If we start doing translit, wcwidth and wcswidth will need updating.
@@ -1040,7 +1040,7 @@ static const signed char new_wtbl[] = {
 	0,    2,    1,    2,    1,    0,    1,
 };
 
-libc_hidden_proto(wcsnrtombs)
+/* libc_hidden_proto(wcsnrtombs) */
 
 int wcswidth(const wchar_t *pwcs, size_t n)
 {
@@ -1168,7 +1168,7 @@ libc_hidden_def(wcswidth)
 /**********************************************************************/
 #ifdef L_wcwidth
 
-libc_hidden_proto(wcswidth)
+/* libc_hidden_proto(wcswidth) */
 
 int wcwidth(wchar_t wc)
 {
@@ -1238,8 +1238,10 @@ enum {
  *
  */
 
+//vda:TODO: make hidden
+
 extern const unsigned char __iconv_codesets[];
-libc_hidden_proto(__iconv_codesets)
+/* libc_hidden_proto(__iconv_codesets) */
 const unsigned char __iconv_codesets[] =
 	"\x0a\xe0""WCHAR_T\x00"		/* superset of UCS-4 but platform-endian */
 #if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c
index 4437d9181..16bc5237a 100644
--- a/libc/misc/wctype/_wctype.c
+++ b/libc/misc/wctype/_wctype.c
@@ -40,10 +40,10 @@
 /* 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)
+/* 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,10 +51,10 @@ libc_hidden_proto(iswctype)
 
 #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)
+/* 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__ */
@@ -504,7 +504,7 @@ libc_hidden_def(towupper)
 static const unsigned char typestring[] = __CTYPE_TYPESTRING;
 /*  extern const unsigned char typestring[]; */
 
-libc_hidden_proto(wctype)
+/* libc_hidden_proto(wctype) */
 wctype_t wctype(const char *property)
 {
 	const unsigned char *p;
@@ -533,9 +533,9 @@ libc_hidden_def(wctype)
 #warning REMINDER: Currently wctype_l simply calls wctype.
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-libc_hidden_proto(wctype)
+/* libc_hidden_proto(wctype) */
 
-libc_hidden_proto(wctype_l)
+/* libc_hidden_proto(wctype_l) */
 wctype_t wctype_l (const char *property, __locale_t locale)
 {
 	return wctype(property);
@@ -907,7 +907,7 @@ libc_hidden_def(towctrans)
 
 static const char transstring[] = __CTYPE_TRANSTRING;
 
-libc_hidden_proto(wctrans)
+/* libc_hidden_proto(wctrans) */
 wctrans_t wctrans(const char *property)
 {
 	const unsigned char *p;
@@ -936,7 +936,7 @@ libc_hidden_def(wctrans)
 #warning REMINDER: Currently wctrans_l simply calls wctrans.
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-libc_hidden_proto(wctrans)
+/* libc_hidden_proto(wctrans) */
 
 wctrans_t wctrans_l(const char *property, __locale_t locale)
 {
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index 4fb1aaa48..8167ed685 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -44,19 +44,19 @@
 /* Experimentally off - libc_hidden_proto(strndup) */
 /* Experimentally off - libc_hidden_proto(strspn) */
 /* Experimentally off - libc_hidden_proto(strcspn) */
-libc_hidden_proto(setenv)
-libc_hidden_proto(unsetenv)
-libc_hidden_proto(waitpid)
-libc_hidden_proto(kill)
-libc_hidden_proto(getuid)
-libc_hidden_proto(getpwnam_r)
-libc_hidden_proto(getpwuid_r)
-libc_hidden_proto(execve)
-libc_hidden_proto(dup2)
-libc_hidden_proto(atoi)
-libc_hidden_proto(fnmatch)
-libc_hidden_proto(pipe)
-libc_hidden_proto(fork)
+/* libc_hidden_proto(setenv) */
+/* libc_hidden_proto(unsetenv) */
+/* libc_hidden_proto(waitpid) */
+/* libc_hidden_proto(kill) */
+/* libc_hidden_proto(getuid) */
+/* libc_hidden_proto(getpwnam_r) */
+/* libc_hidden_proto(getpwuid_r) */
+/* libc_hidden_proto(execve) */
+/* libc_hidden_proto(dup2) */
+/* libc_hidden_proto(atoi) */
+/* libc_hidden_proto(fnmatch) */
+/* libc_hidden_proto(pipe) */
+/* libc_hidden_proto(fork) */
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(read) */
@@ -65,9 +65,9 @@ libc_hidden_proto(fork)
 /* libc_hidden_proto(sprintf) */
 /* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(abort) */
-libc_hidden_proto(glob)
-libc_hidden_proto(globfree)
-libc_hidden_proto(wordfree)
+/* libc_hidden_proto(glob) */
+/* libc_hidden_proto(globfree) */
+/* libc_hidden_proto(wordfree) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c
index 456cc8a55..a9601d45d 100644
--- a/libc/pwd_grp/lckpwdf.c
+++ b/libc/pwd_grp/lckpwdf.c
@@ -32,12 +32,12 @@
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(fcntl) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(sigfillset)
+/* libc_hidden_proto(sigfillset) */
 /* libc_hidden_proto(sigaction) */
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(sigaddset)
-libc_hidden_proto(sigemptyset)
-libc_hidden_proto(alarm)
+/* libc_hidden_proto(sigaddset) */
+/* libc_hidden_proto(sigemptyset) */
+/* libc_hidden_proto(alarm) */
 
 /* How long to wait for getting the lock before returning with an
    error.  */
diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c
index 6b1bd63b1..8c75afb0a 100644
--- a/libc/pwd_grp/pwd_grp.c
+++ b/libc/pwd_grp/pwd_grp.c
@@ -40,10 +40,10 @@
 /* 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(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) */
@@ -84,7 +84,7 @@ 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)
+/* 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 +107,7 @@ libc_hidden_def(fgetpwent_r)
 #ifdef L_fgetgrent_r
 
 #ifdef __USE_SVID
-libc_hidden_proto(fgetgrent_r)
+/* 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 +129,7 @@ libc_hidden_def(fgetgrent_r)
 /**********************************************************************/
 #ifdef L_fgetspent_r
 
-libc_hidden_proto(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 +155,7 @@ libc_hidden_def(fgetspent_r)
 #ifdef L_fgetpwent
 
 #ifdef __USE_SVID
-libc_hidden_proto(fgetpwent_r)
+/* libc_hidden_proto(fgetpwent_r) */
 
 struct passwd *fgetpwent(FILE *stream)
 {
@@ -173,7 +173,7 @@ struct passwd *fgetpwent(FILE *stream)
 #ifdef L_fgetgrent
 
 #ifdef __USE_SVID
-libc_hidden_proto(fgetgrent_r)
+/* libc_hidden_proto(fgetgrent_r) */
 
 struct group *fgetgrent(FILE *stream)
 {
@@ -190,7 +190,7 @@ struct group *fgetgrent(FILE *stream)
 /**********************************************************************/
 #ifdef L_fgetspent
 
-libc_hidden_proto(fgetspent_r)
+/* libc_hidden_proto(fgetspent_r) */
 
 struct spwd *fgetspent(FILE *stream)
 {
@@ -206,7 +206,7 @@ struct spwd *fgetspent(FILE *stream)
 /**********************************************************************/
 #ifdef L_sgetspent_r
 
-libc_hidden_proto(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 +296,7 @@ libc_hidden_def(sgetspent_r)
 /**********************************************************************/
 #ifdef L_getpwuid
 
-libc_hidden_proto(getpwuid_r)
+/* libc_hidden_proto(getpwuid_r) */
 
 struct passwd *getpwuid(uid_t uid)
 {
@@ -312,7 +312,7 @@ struct passwd *getpwuid(uid_t uid)
 /**********************************************************************/
 #ifdef L_getgrgid
 
-libc_hidden_proto(getgrgid_r)
+/* libc_hidden_proto(getgrgid_r) */
 
 struct group *getgrgid(gid_t gid)
 {
@@ -332,8 +332,8 @@ 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)
+/* 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,
@@ -359,8 +359,6 @@ int getspuid_r(uid_t uid, struct spwd *__restrict resultbuf,
 /* This function is non-standard and is currently not built.
  * Why it was added, I do not know. */
 
-libc_hidden_proto(getspuid_r)
-
 struct spwd *getspuid(uid_t uid)
 {
 	static char buffer[__UCLIBC_PWD_BUFFER_SIZE__];
@@ -375,7 +373,7 @@ struct spwd *getspuid(uid_t uid)
 /**********************************************************************/
 #ifdef L_getpwnam
 
-libc_hidden_proto(getpwnam_r)
+/* libc_hidden_proto(getpwnam_r) */
 
 struct passwd *getpwnam(const char *name)
 {
@@ -391,7 +389,7 @@ struct passwd *getpwnam(const char *name)
 /**********************************************************************/
 #ifdef L_getgrnam
 
-libc_hidden_proto(getgrnam_r)
+/* libc_hidden_proto(getgrnam_r) */
 
 struct group *getgrnam(const char *name)
 {
@@ -407,7 +405,7 @@ struct group *getgrnam(const char *name)
 /**********************************************************************/
 #ifdef L_getspnam
 
-libc_hidden_proto(getspnam_r)
+/* libc_hidden_proto(getspnam_r) */
 
 struct spwd *getspnam(const char *name)
 {
@@ -423,7 +421,7 @@ struct spwd *getspnam(const char *name)
 /**********************************************************************/
 #ifdef L_getpw
 
-libc_hidden_proto(getpwuid_r)
+/* libc_hidden_proto(getpwuid_r) */
 
 int getpw(uid_t uid, char *buf)
 {
@@ -476,7 +474,7 @@ void endpwent(void)
 }
 
 
-libc_hidden_proto(getpwent_r)
+/* libc_hidden_proto(getpwent_r) */
 int getpwent_r(struct passwd *__restrict resultbuf,
 			   char *__restrict buffer, size_t buflen,
 			   struct passwd **__restrict result)
@@ -533,7 +531,7 @@ void endgrent(void)
 	__UCLIBC_MUTEX_UNLOCK(mylock);
 }
 
-libc_hidden_proto(getgrent_r)
+/* libc_hidden_proto(getgrent_r) */
 int getgrent_r(struct group *__restrict resultbuf,
 			   char *__restrict buffer, size_t buflen,
 			   struct group **__restrict result)
@@ -590,7 +588,7 @@ void endspent(void)
 	__UCLIBC_MUTEX_UNLOCK(mylock);
 }
 
-libc_hidden_proto(getspent_r)
+/* libc_hidden_proto(getspent_r) */
 int getspent_r(struct spwd *resultbuf, char *buffer,
 			   size_t buflen, struct spwd **result)
 {
@@ -624,7 +622,7 @@ libc_hidden_def(getspent_r)
 /**********************************************************************/
 #ifdef L_getpwent
 
-libc_hidden_proto(getpwent_r)
+/* libc_hidden_proto(getpwent_r) */
 
 struct passwd *getpwent(void)
 {
@@ -640,7 +638,7 @@ struct passwd *getpwent(void)
 /**********************************************************************/
 #ifdef L_getgrent
 
-libc_hidden_proto(getgrent_r)
+/* libc_hidden_proto(getgrent_r) */
 
 struct group *getgrent(void)
 {
@@ -656,7 +654,7 @@ struct group *getgrent(void)
 /**********************************************************************/
 #ifdef L_getspent
 
-libc_hidden_proto(getspent_r)
+/* libc_hidden_proto(getspent_r) */
 
 struct spwd *getspent(void)
 {
@@ -672,7 +670,7 @@ struct spwd *getspent(void)
 /**********************************************************************/
 #ifdef L_sgetspent
 
-libc_hidden_proto(sgetspent_r)
+/* libc_hidden_proto(sgetspent_r) */
 
 struct spwd *sgetspent(const char *string)
 {
@@ -775,7 +773,7 @@ int getgrouplist(const char *user, gid_t gid, gid_t *groups, int *ngroups)
 #ifdef L_initgroups
 
 #ifdef __USE_BSD
-libc_hidden_proto(setgroups)
+/* 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 46b6e4b35..0e0d8f687 100644
--- a/libc/signal/killpg.c
+++ b/libc/signal/killpg.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <signal.h>
 
-libc_hidden_proto(kill)
+/* 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 e304786c1..fcd114cc4 100644
--- a/libc/signal/raise.c
+++ b/libc/signal/raise.c
@@ -9,13 +9,13 @@
 
 
 /* libc_hidden_proto(getpid) */
-libc_hidden_proto(kill)
+/* libc_hidden_proto(kill) */
 
 int __raise (int signo)  attribute_hidden;
 int __raise(int signo)
 {
     return kill(getpid(), signo);
 }
-libc_hidden_proto(raise)
+/* 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 9840a56bf..f8b117591 100644
--- a/libc/signal/sigaddset.c
+++ b/libc/signal/sigaddset.c
@@ -19,7 +19,7 @@
 #include "sigsetops.h"
 
 /* Add SIGNO to SET.  */
-libc_hidden_proto(sigaddset)
+/* libc_hidden_proto(sigaddset) */
 int
 sigaddset (sigset_t *set, int signo)
 {
diff --git a/libc/signal/sigblock.c b/libc/signal/sigblock.c
index 5aa3867e4..7051a94ce 100644
--- a/libc/signal/sigblock.c
+++ b/libc/signal/sigblock.c
@@ -25,7 +25,7 @@
 #include "sigset-cvt-mask.h"
 
 /* Block signals in MASK, returning the old mask.  */
-libc_hidden_proto(sigblock)
+/* 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 de988a7e8..fb5658a11 100644
--- a/libc/signal/sigdelset.c
+++ b/libc/signal/sigdelset.c
@@ -19,7 +19,7 @@
 #include "sigsetops.h"
 
 /* Add SIGNO to SET.  */
-libc_hidden_proto(sigdelset)
+/* 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 7d8687bd1..96260fb92 100644
--- a/libc/signal/sigempty.c
+++ b/libc/signal/sigempty.c
@@ -23,7 +23,7 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 
 /* Clear all signals from SET.  */
-libc_hidden_proto(sigemptyset)
+/* libc_hidden_proto(sigemptyset) */
 int sigemptyset (sigset_t *set)
 {
   if (set == NULL)
diff --git a/libc/signal/sigfillset.c b/libc/signal/sigfillset.c
index 96ab459dc..2f8fb8138 100644
--- a/libc/signal/sigfillset.c
+++ b/libc/signal/sigfillset.c
@@ -23,7 +23,7 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 
 /* Set all signals in SET.  */
-libc_hidden_proto(sigfillset)
+/* libc_hidden_proto(sigfillset) */
 int
 sigfillset (sigset_t *set)
 {
diff --git a/libc/signal/siggetmask.c b/libc/signal/siggetmask.c
index d3af43a12..82d2a97bc 100644
--- a/libc/signal/siggetmask.c
+++ b/libc/signal/siggetmask.c
@@ -20,7 +20,7 @@
 #define __UCLIBC_HIDE_DEPRECATED__
 #include <signal.h>
 
-libc_hidden_proto(sigblock)
+/* libc_hidden_proto(sigblock) */
 
 int
 siggetmask (void)
diff --git a/libc/signal/sighold.c b/libc/signal/sighold.c
index 728c10aef..f8003d60f 100644
--- a/libc/signal/sighold.c
+++ b/libc/signal/sighold.c
@@ -23,7 +23,7 @@
 #include <signal.h>
 
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(sigaddset)
+/* libc_hidden_proto(sigaddset) */
 
 int sighold (int sig)
 {
diff --git a/libc/signal/signal.c b/libc/signal/signal.c
index 04705703a..4d379606f 100644
--- a/libc/signal/signal.c
+++ b/libc/signal/signal.c
@@ -52,6 +52,6 @@ __bsd_signal (int sig, __sighandler_t handler)
   return oact.sa_handler;
 }
 strong_alias(__bsd_signal,bsd_signal)
-libc_hidden_proto(signal)
+/* libc_hidden_proto(signal) */
 strong_alias(__bsd_signal,signal)
 libc_hidden_def(signal)
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index 952350b6a..195e88efc 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -25,14 +25,14 @@
 #include <stddef.h>		/* For NULL.  */
 
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(sigdelset)
-libc_hidden_proto(sigsuspend)
+/* 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)
+/* libc_hidden_proto(__sigpause) */
 int __sigpause (int sig_or_mask, int is_sig)
 {
   sigset_t set;
@@ -57,7 +57,7 @@ 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)
+/* 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 61bd32df7..f5ee6fedc 100644
--- a/libc/signal/sigrelse.c
+++ b/libc/signal/sigrelse.c
@@ -23,7 +23,7 @@
 #include <signal.h>
 
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(sigdelset)
+/* libc_hidden_proto(sigdelset) */
 
 int sigrelse (int sig)
 {
diff --git a/libc/signal/sigsetmask.c b/libc/signal/sigsetmask.c
index ef8559ec8..5de4b59e4 100644
--- a/libc/signal/sigsetmask.c
+++ b/libc/signal/sigsetmask.c
@@ -25,7 +25,7 @@
 #include "sigset-cvt-mask.h"
 
 /* Set the mask of blocked signals to MASK, returning the old mask.  */
-libc_hidden_proto(sigsetmask)
+/* libc_hidden_proto(sigsetmask) */
 int
 sigsetmask (int mask)
 {
diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c
index 117c1c4b3..c902ee888 100644
--- a/libc/signal/sigwait.c
+++ b/libc/signal/sigwait.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #if defined __UCLIBC_HAS_REALTIME__
-libc_hidden_proto(sigwaitinfo)
+/* libc_hidden_proto(sigwaitinfo) */
 
 int __sigwait (const sigset_t *set, int *sig) attribute_hidden;
 int __sigwait (const sigset_t *set, int *sig)
@@ -37,9 +37,9 @@ int __sigwait (const sigset_t *set, int *sig)
 }
 #else /* __UCLIBC_HAS_REALTIME__ */
 /* variant without REALTIME extensions */
-libc_hidden_proto(sigfillset)
+/* libc_hidden_proto(sigfillset) */
 /* libc_hidden_proto(sigaction) */
-libc_hidden_proto(sigsuspend)
+/* libc_hidden_proto(sigsuspend) */
 
 static int was_sig; /* obviously not thread-safe */
 static void ignore_signal(int sig)
@@ -96,6 +96,6 @@ int __sigwait (const sigset_t *set, int *sig)
   return was_sig == -1 ? -1 : 0;
 }
 #endif /* __UCLIBC_HAS_REALTIME__ */
-libc_hidden_proto(sigwait)
+/* libc_hidden_proto(sigwait) */
 weak_alias(__sigwait,sigwait)
 libc_hidden_def(sigwait)
diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c
index 2e8710076..2011cc78c 100644
--- a/libc/stdio/__fsetlocking.c
+++ b/libc/stdio/__fsetlocking.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-libc_hidden_proto(__fsetlocking)
+/* libc_hidden_proto(__fsetlocking) */
 
 /* Not threadsafe. */
 
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 3cca7b9af..69a04bcc8 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -11,7 +11,7 @@
 /* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 #else
 /* libc_hidden_proto(lseek) */
 #endif
diff --git a/libc/stdio/_flushlbf.c b/libc/stdio/_flushlbf.c
index 8a551a746..7146e9bc9 100644
--- a/libc/stdio/_flushlbf.c
+++ b/libc/stdio/_flushlbf.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-libc_hidden_proto(fflush_unlocked)
+/* 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 d3240b77b..fcbe1e4c6 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(isatty)
+/* libc_hidden_proto(isatty) */
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(fcntl) */
 
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 5b9e7008a..1a42ffbfd 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -81,22 +81,22 @@
 /* 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(ungetc) */
+/* libc_hidden_proto(vfscanf) */
+/* libc_hidden_proto(vsscanf) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(getc_unlocked)
-libc_hidden_proto(__fgetc_unlocked)
+/* 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)
+/* 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) */
@@ -165,7 +165,7 @@ _stdlib_strto_l(register const char * __restrict str,
 /**********************************************************************/
 #ifdef L_fscanf
 
-libc_hidden_proto(fscanf)
+/* libc_hidden_proto(fscanf) */
 int fscanf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -201,7 +201,7 @@ int scanf(const char * __restrict format, ...)
 
 #ifdef __STDIO_HAS_VSSCANF
 
-libc_hidden_proto(sscanf)
+/* libc_hidden_proto(sscanf) */
 int sscanf(const char * __restrict str, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -223,7 +223,7 @@ libc_hidden_def(sscanf)
 /**********************************************************************/
 #ifdef L_vscanf
 
-libc_hidden_proto(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 d8c0ae20d..52e7295cf 100644
--- a/libc/stdio/_stdio.c
+++ b/libc/stdio/_stdio.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(isatty)
+/* 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 ed1a583fc..57a06d336 100644
--- a/libc/stdio/_trans2w.c
+++ b/libc/stdio/_trans2w.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fseek)
+/* 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/_vfprintf.c b/libc/stdio/_vfprintf.c
index 9d7f99cad..5ce3f8a59 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -119,17 +119,17 @@
 /* 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(__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)
+/* 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
diff --git a/libc/stdio/_wfwrite.c b/libc/stdio/_wfwrite.c
index fb5c6b3ee..8fa59f87d 100644
--- a/libc/stdio/_wfwrite.c
+++ b/libc/stdio/_wfwrite.c
@@ -16,8 +16,8 @@
 #warning TODO: Fix prototype.
 #endif
 
-libc_hidden_proto(wmemcpy)
-libc_hidden_proto(wcsnrtombs)
+/* 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 3f1992559..8c6420936 100644
--- a/libc/stdio/asprintf.c
+++ b/libc/stdio/asprintf.c
@@ -11,9 +11,9 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(asprintf)
+/* libc_hidden_proto(asprintf) */
 
-libc_hidden_proto(vasprintf)
+/* libc_hidden_proto(vasprintf) */
 
 #ifndef __STDIO_HAS_VSNPRINTF
 #warning Skipping asprintf and __asprintf since no vsnprintf!
diff --git a/libc/stdio/dprintf.c b/libc/stdio/dprintf.c
index a8b2704b2..0123c501a 100644
--- a/libc/stdio/dprintf.c
+++ b/libc/stdio/dprintf.c
@@ -11,7 +11,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(vdprintf)
+/* 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 eadfe74de..7d2138130 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -9,7 +9,7 @@
 /* libc_hidden_proto(fclose) */
 
 /* libc_hidden_proto(close) */
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 int fclose(register FILE *stream)
 {
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index fcd21f707..d47d6ea99 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fdopen)
+/* 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 e1527b3a3..cee712a92 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -179,14 +179,14 @@ int fflush_unlocked(register FILE *stream)
 libc_hidden_def(fflush_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fflush)
+/* libc_hidden_proto(fflush) */
 strong_alias(fflush_unlocked,fflush)
 libc_hidden_def(fflush)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fflush)
+/* libc_hidden_proto(fflush) */
 int fflush(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index 7eb2b6ea2..89c8fe35a 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -13,11 +13,11 @@
 #undef getc
 #undef getc_unlocked
 
-libc_hidden_proto(__fgetc_unlocked)
+/* libc_hidden_proto(__fgetc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 int __fgetc_unlocked(FILE *stream)
 {
@@ -75,7 +75,7 @@ int __fgetc_unlocked(FILE *stream)
 }
 libc_hidden_def(__fgetc_unlocked)
 
-libc_hidden_proto(fgetc_unlocked)
+/* libc_hidden_proto(fgetc_unlocked) */
 strong_alias(__fgetc_unlocked,fgetc_unlocked)
 libc_hidden_def(fgetc_unlocked)
 
@@ -83,12 +83,12 @@ libc_hidden_def(fgetc_unlocked)
 //strong_alias(__fgetc_unlocked,__getc_unlocked)
 //libc_hidden_def(__getc_unlocked)
 
-libc_hidden_proto(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)
+/* libc_hidden_proto(fgetc) */
 strong_alias(__fgetc_unlocked,fgetc)
 libc_hidden_def(fgetc)
 
@@ -97,7 +97,7 @@ strong_alias(__fgetc_unlocked,getc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fgetc)
+/* 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 5eb1aac31..0c7b97ecd 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -7,11 +7,11 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fgets_unlocked)
+/* libc_hidden_proto(fgets_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(__fgetc_unlocked)
+/* libc_hidden_proto(__fgetc_unlocked) */
 
 char *fgets_unlocked(char *__restrict s, int n,
 					   register FILE * __restrict stream)
diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index 062d825d6..34327434c 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fgetwc_unlocked)
+/* libc_hidden_proto(fgetwc_unlocked) */
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 
 #ifdef __DO_UNLOCKED
 
@@ -113,7 +113,7 @@ libc_hidden_def(fgetwc_unlocked)
 
 strong_alias(fgetwc_unlocked,getwc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fgetwc)
+/* libc_hidden_proto(fgetwc) */
 strong_alias(fgetwc_unlocked,fgetwc)
 libc_hidden_def(fgetwc)
 
@@ -122,7 +122,7 @@ strong_alias(fgetwc_unlocked,getwc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fgetwc)
+/* 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 c7dcc7d2b..80af1a217 100644
--- a/libc/stdio/fgetws.c
+++ b/libc/stdio/fgetws.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fgetws_unlocked)
+/* libc_hidden_proto(fgetws_unlocked) */
 
-libc_hidden_proto(fgetwc_unlocked)
+/* libc_hidden_proto(fgetwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index 929936bfd..faed620d8 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fileno_unlocked)
+/* libc_hidden_proto(fileno_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -25,14 +25,14 @@ int fileno_unlocked(register FILE *stream)
 libc_hidden_def(fileno_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fileno)
+/* libc_hidden_proto(fileno) */
 strong_alias(fileno_unlocked,fileno)
 libc_hidden_def(fileno)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fileno)
+/* libc_hidden_proto(fileno) */
 int fileno(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c
index ba194d726..269c7ec6d 100644
--- a/libc/stdio/fmemopen.c
+++ b/libc/stdio/fmemopen.c
@@ -11,7 +11,7 @@
 #include "_stdio.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(fopencookie)
+/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c
index 0b7ed84b1..ac2c33483 100644
--- a/libc/stdio/fopencookie.c
+++ b/libc/stdio/fopencookie.c
@@ -31,7 +31,7 @@
 /* Currently no real reentrancy issues other than a possible double close(). */
 
 #ifndef __BCC__
-libc_hidden_proto(fopencookie)
+/* 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/fputc.c b/libc/stdio/fputc.c
index ac3b23ec5..09d8ee138 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -12,7 +12,7 @@
 #undef putc
 #undef putc_unlocked
 
-libc_hidden_proto(__fputc_unlocked)
+/* libc_hidden_proto(__fputc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -78,22 +78,22 @@ strong_alias(__fputc_unlocked,fputc_unlocked)
 /* exposing these would be fundamentally *wrong*! fix you, instead! */
 /* libc_hidden_def(fputc_unlocked) */
 
-libc_hidden_proto(putc_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)
+/* libc_hidden_proto(fputc) */
 strong_alias(__fputc_unlocked,fputc)
 libc_hidden_def(fputc)
 
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 strong_alias(__fputc_unlocked,putc)
 libc_hidden_def(putc)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fputc)
+/* libc_hidden_proto(fputc) */
 int fputc(int c, register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
@@ -108,7 +108,7 @@ int fputc(int c, register FILE *stream)
 }
 libc_hidden_def(fputc)
 
-libc_hidden_proto(putc)
+/* 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 553fb2eb9..08da59c40 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -7,10 +7,10 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fputs_unlocked)
+/* libc_hidden_proto(fputs_unlocked) */
 
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(fwrite_unlocked)
+/* 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
diff --git a/libc/stdio/fputwc.c b/libc/stdio/fputwc.c
index 240c1e9c4..6c7d6b263 100644
--- a/libc/stdio/fputwc.c
+++ b/libc/stdio/fputwc.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fputwc_unlocked)
+/* libc_hidden_proto(fputwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c
index ecbc121dd..a4fadb428 100644
--- a/libc/stdio/fputws.c
+++ b/libc/stdio/fputws.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fputws_unlocked)
+/* libc_hidden_proto(fputws_unlocked) */
 
-libc_hidden_proto(wcslen)
+/* libc_hidden_proto(wcslen) */
 
 #ifdef __DO_UNLOCKED
 
@@ -23,14 +23,14 @@ int fputws_unlocked(const wchar_t *__restrict ws,
 libc_hidden_def(fputws_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fputws)
+/* libc_hidden_proto(fputws) */
 strong_alias(fputws_unlocked,fputws)
 libc_hidden_def(fputws)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fputws)
+/* 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 4f9c98465..55d3cb2d3 100644
--- a/libc/stdio/fread.c
+++ b/libc/stdio/fread.c
@@ -7,12 +7,12 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fread_unlocked)
+/* libc_hidden_proto(fread_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,
 						FILE * __restrict stream)
@@ -90,14 +90,14 @@ 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)
+/* libc_hidden_proto(fread) */
 strong_alias(fread_unlocked,fread)
 libc_hidden_def(fread)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fread)
+/* 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/fseeko.c b/libc/stdio/fseeko.c
index 251040231..a7f8b8dc1 100644
--- a/libc/stdio/fseeko.c
+++ b/libc/stdio/fseeko.c
@@ -17,9 +17,9 @@
 #endif
 
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(fseeko64)
+/* libc_hidden_proto(fseeko64) */
 #endif
-libc_hidden_proto(fseek)
+/* 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 bae1d877c..f6adf3874 100644
--- a/libc/stdio/ftello.c
+++ b/libc/stdio/ftello.c
@@ -8,9 +8,9 @@
 #include "_stdio.h"
 
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(ftello64)
+/* libc_hidden_proto(ftello64) */
 #endif
-libc_hidden_proto(ftell)
+/* libc_hidden_proto(ftell) */
 
 #ifndef __DO_LARGEFILE
 # define FTELL         ftell
diff --git a/libc/stdio/fwprintf.c b/libc/stdio/fwprintf.c
index f2a1afbec..a5f09cd2d 100644
--- a/libc/stdio/fwprintf.c
+++ b/libc/stdio/fwprintf.c
@@ -9,7 +9,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-libc_hidden_proto(vfwprintf)
+/* 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 7be794ab4..180fa9249 100644
--- a/libc/stdio/fwrite.c
+++ b/libc/stdio/fwrite.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fwrite_unlocked)
+/* libc_hidden_proto(fwrite_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -38,14 +38,14 @@ size_t fwrite_unlocked(const void * __restrict ptr, size_t size,
 libc_hidden_def(fwrite_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fwrite)
+/* libc_hidden_proto(fwrite) */
 strong_alias(fwrite_unlocked,fwrite)
 libc_hidden_def(fwrite)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fwrite)
+/* 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 e29c426c8..2ef7220e4 100644
--- a/libc/stdio/getchar.c
+++ b/libc/stdio/getchar.c
@@ -7,14 +7,14 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(__fgetc_unlocked)
+/* 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)
+/* 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 21c86f400..30fca81d7 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -10,9 +10,9 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-libc_hidden_proto(getdelim)
+/* libc_hidden_proto(getdelim) */
 
-libc_hidden_proto(__fgetc_unlocked)
+/* 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 22b67b831..8123b0c95 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -10,9 +10,9 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-libc_hidden_proto(getline)
+/* libc_hidden_proto(getline) */
 
-libc_hidden_proto(getdelim)
+/* 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 85bb8475a..c8271977e 100644
--- a/libc/stdio/gets.c
+++ b/libc/stdio/gets.c
@@ -13,7 +13,7 @@ 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)
+/* libc_hidden_proto(getchar_unlocked) */
 
 char *gets(char *s)
 {
diff --git a/libc/stdio/getw.c b/libc/stdio/getw.c
index e3aeda92c..75255aae9 100644
--- a/libc/stdio/getw.c
+++ b/libc/stdio/getw.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fread_unlocked)
+/* 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 9c480b564..c17f0c71c 100644
--- a/libc/stdio/getwchar.c
+++ b/libc/stdio/getwchar.c
@@ -9,7 +9,7 @@
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(fgetwc_unlocked)
+/* libc_hidden_proto(fgetwc_unlocked) */
 
 wint_t getwchar_unlocked(void)
 {
@@ -22,7 +22,7 @@ strong_alias(getwchar_unlocked,getwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fgetwc)
+/* libc_hidden_proto(fgetwc) */
 
 wint_t getwchar(void)
 {
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index 17969a4fa..e3a817368 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -146,9 +146,9 @@
 /* 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)
+/* libc_hidden_proto(putc_unlocked) */
+/* libc_hidden_proto(__fputc_unlocked) */
+/* libc_hidden_proto(__glibc_strerror_r) */
 
 /*  #undef __UCLIBC_HAS_FLOATS__ */
 /*  #undef WANT_FLOAT_ERROR */
diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c
index 5861017e4..46142a089 100644
--- a/libc/stdio/open_memstream.c
+++ b/libc/stdio/open_memstream.c
@@ -12,7 +12,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(fopencookie)
+/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
@@ -131,7 +131,7 @@ 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)
+/* 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 0f63c40bf..a01c4fe18 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(__glibc_strerror_r)
+/* libc_hidden_proto(__glibc_strerror_r) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning CONSIDER: Increase buffer size for error message (non-%m case)?
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index 21b1231ea..e920b8d7e 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -28,12 +28,12 @@
 
 /* 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(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 */
@@ -42,7 +42,7 @@ libc_hidden_proto(vfork)
 # define vfork fork
 # define VFORK_LOCK		((void) 0)
 # define VFORK_UNLOCK		((void) 0)
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 #endif
 
 #ifndef VFORK_LOCK
diff --git a/libc/stdio/putchar.c b/libc/stdio/putchar.c
index b54a7a815..65d8f64c1 100644
--- a/libc/stdio/putchar.c
+++ b/libc/stdio/putchar.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(__fputc_unlocked)
+/* libc_hidden_proto(__fputc_unlocked) */
 
 #undef putchar
 #ifdef __DO_UNLOCKED
diff --git a/libc/stdio/puts.c b/libc/stdio/puts.c
index 08525b2f6..3ece1ba68 100644
--- a/libc/stdio/puts.c
+++ b/libc/stdio/puts.c
@@ -7,8 +7,8 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(__fputc_unlocked)
-libc_hidden_proto(fputs_unlocked)
+/* 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 469e44aea..5074117b6 100644
--- a/libc/stdio/putw.c
+++ b/libc/stdio/putw.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fwrite_unlocked)
+/* 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 7a6501c28..aa6531988 100644
--- a/libc/stdio/putwchar.c
+++ b/libc/stdio/putwchar.c
@@ -9,7 +9,7 @@
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(fputwc_unlocked)
+/* libc_hidden_proto(fputwc_unlocked) */
 
 wint_t putwchar_unlocked(wchar_t wc)
 {
@@ -22,9 +22,9 @@ strong_alias(putwchar_unlocked,putwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(__fputc_unlocked)
+/* libc_hidden_proto(__fputc_unlocked) */
 /* psm: should this be fputwc? */
-libc_hidden_proto(fputc)
+/* libc_hidden_proto(fputc) */
 
 wint_t putwchar(wchar_t wc)
 {
diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c
index f322411e4..c186164b8 100644
--- a/libc/stdio/remove.c
+++ b/libc/stdio/remove.c
@@ -10,8 +10,8 @@
 #include <unistd.h>
 #include <errno.h>
 
-libc_hidden_proto(rmdir)
-libc_hidden_proto(unlink)
+/* libc_hidden_proto(rmdir) */
+/* libc_hidden_proto(unlink) */
 
 /* SUSv3 states:
  *   If path does not name a directory, remove(path) shall be equivalent
@@ -19,7 +19,7 @@ libc_hidden_proto(unlink)
  *   equivalent to rmdir(path).
  */
 
-libc_hidden_proto(remove)
+/* libc_hidden_proto(remove) */
 int remove(register const char *filename)
 {
 	int saved_errno = errno;
diff --git a/libc/stdio/rewind.c b/libc/stdio/rewind.c
index e04d7a086..600f8cd0e 100644
--- a/libc/stdio/rewind.c
+++ b/libc/stdio/rewind.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fseek)
+/* libc_hidden_proto(fseek) */
 
-libc_hidden_proto(rewind)
+/* 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 6de2c91a1..b9bdc8b5b 100644
--- a/libc/stdio/setbuf.c
+++ b/libc/stdio/setbuf.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(setvbuf)
+/* 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 ea2421aa8..428b38936 100644
--- a/libc/stdio/setbuffer.c
+++ b/libc/stdio/setbuffer.c
@@ -9,7 +9,7 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(setvbuf)
+/* 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 9b4be53eb..564776989 100644
--- a/libc/stdio/setlinebuf.c
+++ b/libc/stdio/setlinebuf.c
@@ -9,7 +9,7 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(setvbuf)
+/* 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 6dbb532db..7f0c6f6f3 100644
--- a/libc/stdio/setvbuf.c
+++ b/libc/stdio/setvbuf.c
@@ -14,7 +14,7 @@
 #error Assumption violated for buffering mode flags
 #endif
 
-libc_hidden_proto(setvbuf)
+/* 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 ef9c69215..1b1f089cd 100644
--- a/libc/stdio/snprintf.c
+++ b/libc/stdio/snprintf.c
@@ -12,9 +12,9 @@
 #warning Skipping snprintf since no vsnprintf!
 #else
 
-libc_hidden_proto(vsnprintf)
+/* libc_hidden_proto(vsnprintf) */
 
-libc_hidden_proto(snprintf)
+/* 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 2528720e4..594c51b86 100644
--- a/libc/stdio/sprintf.c
+++ b/libc/stdio/sprintf.c
@@ -12,7 +12,7 @@
 #warning Skipping sprintf since no vsnprintf!
 #else
 
-libc_hidden_proto(vsnprintf)
+/* libc_hidden_proto(vsnprintf) */
 
 /* libc_hidden_proto(sprintf) */
 int sprintf(char *__restrict buf, const char * __restrict format, ...)
diff --git a/libc/stdio/swprintf.c b/libc/stdio/swprintf.c
index 0c209fe4b..4af8a6b11 100644
--- a/libc/stdio/swprintf.c
+++ b/libc/stdio/swprintf.c
@@ -9,7 +9,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-libc_hidden_proto(vswprintf)
+/* libc_hidden_proto(vswprintf) */
 
 #ifndef __STDIO_BUFFERS
 #warning Skipping swprintf since no buffering!
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
index 05143d3ea..bb843affd 100644
--- a/libc/stdio/tmpfile.c
+++ b/libc/stdio/tmpfile.c
@@ -21,8 +21,8 @@
 #include <unistd.h>
 #include "../misc/internals/tempname.h"
 
-libc_hidden_proto(fdopen)
-libc_hidden_proto(remove)
+/* libc_hidden_proto(fdopen) */
+/* libc_hidden_proto(remove) */
 /* libc_hidden_proto(close) */
 
 /* This returns a new stream opened on a temporary file (generated
diff --git a/libc/stdio/ungetc.c b/libc/stdio/ungetc.c
index d900928b2..dcec91904 100644
--- a/libc/stdio/ungetc.c
+++ b/libc/stdio/ungetc.c
@@ -24,7 +24,7 @@
  *     (See section 7.19.6.2 of the C9X rationale -- WG14/N897.)
  */
 
-libc_hidden_proto(ungetc)
+/* 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 579022240..438cb7572 100644
--- a/libc/stdio/ungetwc.c
+++ b/libc/stdio/ungetwc.c
@@ -12,7 +12,7 @@
  * as reset stream->__ungot_width[1] for use by _stdio_adjpos().
  */
 
-libc_hidden_proto(ungetwc)
+/* 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 3c8256870..02f495efb 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -23,14 +23,14 @@
 #else
 
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
-libc_hidden_proto(open_memstream)
+/* libc_hidden_proto(open_memstream) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(vfprintf) */
 #else
-libc_hidden_proto(vsnprintf)
+/* libc_hidden_proto(vsnprintf) */
 #endif
 
-libc_hidden_proto(vasprintf)
+/* 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 f00df05bc..b51aba4be 100644
--- a/libc/stdio/vdprintf.c
+++ b/libc/stdio/vdprintf.c
@@ -14,9 +14,9 @@
 #ifdef __USE_OLD_VFPRINTF__
 /* libc_hidden_proto(vfprintf) */
 #endif
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
-libc_hidden_proto(vdprintf)
+/* libc_hidden_proto(vdprintf) */
 int vdprintf(int filedes, const char * __restrict format, va_list arg)
 {
 	FILE f;
diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c
index 06636c2f1..01ffb4ba0 100644
--- a/libc/stdio/vsnprintf.c
+++ b/libc/stdio/vsnprintf.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(vsnprintf)
+/* libc_hidden_proto(vsnprintf) */
 
 #ifdef __USE_OLD_VFPRINTF__
 /* libc_hidden_proto(vfprintf) */
diff --git a/libc/stdio/vsprintf.c b/libc/stdio/vsprintf.c
index 8e27c19d9..b44789e69 100644
--- a/libc/stdio/vsprintf.c
+++ b/libc/stdio/vsprintf.c
@@ -12,7 +12,7 @@
 #warning Skipping vsprintf since no vsnprintf!
 #else
 
-libc_hidden_proto(vsnprintf)
+/* 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 cddf1d5d9..beadb8a7d 100644
--- a/libc/stdio/vswprintf.c
+++ b/libc/stdio/vswprintf.c
@@ -9,7 +9,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-libc_hidden_proto(vswprintf)
+/* 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 1c32887a4..4e666cb54 100644
--- a/libc/stdio/vwprintf.c
+++ b/libc/stdio/vwprintf.c
@@ -9,7 +9,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-libc_hidden_proto(vfwprintf)
+/* 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 9dc274aec..80d76d5bb 100644
--- a/libc/stdio/wprintf.c
+++ b/libc/stdio/wprintf.c
@@ -9,7 +9,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-libc_hidden_proto(vfwprintf)
+/* 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 c98bcfa18..38457596f 100644
--- a/libc/stdlib/__uc_malloc.c
+++ b/libc/stdlib/__uc_malloc.c
@@ -23,8 +23,8 @@ Cambridge, MA 02139, USA.
 #include <malloc.h>
 
 /* libc_hidden_proto(_exit) */
-libc_hidden_proto(__uc_malloc)
-libc_hidden_proto(__uc_malloc_failed)
+/* 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/_strtod.c b/libc/stdlib/_strtod.c
index 3ceadce76..aac5b811b 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -111,12 +111,12 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <bits/uClibc_uwchar.h>
-libc_hidden_proto(iswspace)
+/* libc_hidden_proto(iswspace) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 #include <xlocale.h>
-libc_hidden_proto(iswspace_l)
+/* libc_hidden_proto(iswspace_l) */
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
 /* Handle _STRTOD_HEXADECIMAL_FLOATS via uClibc config now. */
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index 84251664b..7291d0ea4 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -31,7 +31,7 @@ Cambridge, MA 02139, USA.  */
 /* Experimentally off - libc_hidden_proto(memset) */
 /* libc_hidden_proto(sigaction) */
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(raise)
+/* libc_hidden_proto(raise) */
 /* libc_hidden_proto(_exit) */
 
 /* Our last ditch effort to commit suicide */
diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c
index 0fab85c96..e7d69f168 100644
--- a/libc/stdlib/arc4random.c
+++ b/libc/stdlib/arc4random.c
@@ -168,7 +168,7 @@ arc4_getword(as)
 	return val;
 }
 
-libc_hidden_proto(arc4random_stir)
+/* libc_hidden_proto(arc4random_stir) */
 void
 arc4random_stir(void)
 {
diff --git a/libc/stdlib/drand48.c b/libc/stdlib/drand48.c
index f96947cb2..f0d20de61 100644
--- a/libc/stdlib/drand48.c
+++ b/libc/stdlib/drand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(erand48_r)
+/* 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 1000a3acb..96fb186f4 100644
--- a/libc/stdlib/drand48_r.c
+++ b/libc/stdlib/drand48_r.c
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-libc_hidden_proto(erand48_r)
+/* 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 853c2c35a..913d6ed84 100644
--- a/libc/stdlib/erand48.c
+++ b/libc/stdlib/erand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(erand48_r)
+/* 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 42db6f74b..f367f8dc6 100644
--- a/libc/stdlib/erand48_r.c
+++ b/libc/stdlib/erand48_r.c
@@ -24,7 +24,7 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-libc_hidden_proto(erand48_r)
+/* 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/jrand48.c b/libc/stdlib/jrand48.c
index 6f812068b..7bfc9d608 100644
--- a/libc/stdlib/jrand48.c
+++ b/libc/stdlib/jrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(jrand48_r)
+/* 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 fe77c3c38..da2a1506d 100644
--- a/libc/stdlib/jrand48_r.c
+++ b/libc/stdlib/jrand48_r.c
@@ -22,7 +22,7 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-libc_hidden_proto(jrand48_r)
+/* 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 863951f07..33d0e91ef 100644
--- a/libc/stdlib/lrand48.c
+++ b/libc/stdlib/lrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(nrand48_r)
+/* 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 277fb9ae3..c3aa89a24 100644
--- a/libc/stdlib/lrand48_r.c
+++ b/libc/stdlib/lrand48_r.c
@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(nrand48_r)
+/* libc_hidden_proto(nrand48_r) */
 
-libc_hidden_proto(lrand48_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 c8aa1f497..e729494e0 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -20,7 +20,7 @@
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /*libc_hidden_proto(memset)*/
 /* libc_hidden_proto(mmap) */
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 
 #ifdef L_malloc
 void *malloc(size_t size)
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c
index 4d24697be..9fbf563ab 100644
--- a/libc/stdlib/malloc-standard/free.c
+++ b/libc/stdlib/malloc-standard/free.c
@@ -16,7 +16,7 @@
 
 #include "malloc.h"
 
-libc_hidden_proto(munmap)
+/* 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 d3b613576..4ebbe8b49 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -19,7 +19,7 @@
 /* libc_hidden_proto(fprintf) */
 
 /* ------------------------------ mallinfo ------------------------------ */
-libc_hidden_proto(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 b6a9130f6..524468cbe 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -25,7 +25,7 @@
 #include <bits/uClibc_mutex.h>
 
 /* libc_hidden_proto(mmap) */
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 /* libc_hidden_proto(sbrk) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c
index 41cae43d1..95eb0d38a 100644
--- a/libc/stdlib/malloc-standard/realloc.c
+++ b/libc/stdlib/malloc-standard/realloc.c
@@ -16,7 +16,7 @@
 
 #include "malloc.h"
 
-libc_hidden_proto(mremap)
+/* libc_hidden_proto(mremap) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* ------------------------------ realloc ------------------------------ */
diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c
index 95b7abcbe..5dd3a7625 100644
--- a/libc/stdlib/malloc/free.c
+++ b/libc/stdlib/malloc/free.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 /* libc_hidden_proto(sbrk) */
 
 #include "malloc.h"
diff --git a/libc/stdlib/malloc/malloc_debug.c b/libc/stdlib/malloc/malloc_debug.c
index c19059b43..01f9bfd6f 100644
--- a/libc/stdlib/malloc/malloc_debug.c
+++ b/libc/stdlib/malloc/malloc_debug.c
@@ -16,9 +16,9 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-libc_hidden_proto(atoi)
+/* libc_hidden_proto(atoi) */
 /* libc_hidden_proto(vfprintf) */
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 /* libc_hidden_proto(getenv) */
 
 #include "malloc.h"
diff --git a/libc/stdlib/mrand48.c b/libc/stdlib/mrand48.c
index 6905545bd..131c4b991 100644
--- a/libc/stdlib/mrand48.c
+++ b/libc/stdlib/mrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(jrand48_r)
+/* 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 ca2bd7bbb..0127fddb5 100644
--- a/libc/stdlib/mrand48_r.c
+++ b/libc/stdlib/mrand48_r.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(jrand48_r)
+/* 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 0199a30a5..e69afd78b 100644
--- a/libc/stdlib/nrand48.c
+++ b/libc/stdlib/nrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(nrand48_r)
+/* 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 63b0ac8ef..acf813e9b 100644
--- a/libc/stdlib/nrand48_r.c
+++ b/libc/stdlib/nrand48_r.c
@@ -22,7 +22,7 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-libc_hidden_proto(nrand48_r)
+/* 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 4ac2fcd21..3e4a1cfe1 100644
--- a/libc/stdlib/ptsname.c
+++ b/libc/stdlib/ptsname.c
@@ -32,7 +32,7 @@
 /* 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(isatty) */
 /* libc_hidden_proto(ioctl) */
 /* libc_hidden_proto(fstat) */
 /* libc_hidden_proto(stat) */
@@ -68,7 +68,7 @@ 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)
+/* 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 03323f501..61aaa9105 100644
--- a/libc/stdlib/rand.c
+++ b/libc/stdlib/rand.c
@@ -7,7 +7,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(random)
+/* libc_hidden_proto(random) */
 
 int rand (void)
 {
diff --git a/libc/stdlib/random.c b/libc/stdlib/random.c
index 3eb8aed8a..6d5d06e09 100644
--- a/libc/stdlib/random.c
+++ b/libc/stdlib/random.c
@@ -27,10 +27,10 @@
 #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)
+/* 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
@@ -244,7 +244,7 @@ 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)
+/* 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 ca80a7808..b6ff6afd2 100644
--- a/libc/stdlib/random_r.c
+++ b/libc/stdlib/random_r.c
@@ -133,7 +133,7 @@ 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)
+/* libc_hidden_proto(random_r) */
 int random_r(struct random_data *buf, int32_t *result)
 {
     int32_t *state;
@@ -191,7 +191,7 @@ 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)
+/* libc_hidden_proto(srandom_r) */
 int srandom_r (unsigned int seed, struct random_data *buf)
 {
     int type;
@@ -259,7 +259,7 @@ 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)
+/* libc_hidden_proto(initstate_r) */
 int initstate_r (unsigned int seed, char *arg_state, size_t n, struct random_data *buf)
 {
     int type;
@@ -318,7 +318,7 @@ 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)
+/* 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 e9eabdfaa..3a4789152 100644
--- a/libc/stdlib/realpath.c
+++ b/libc/stdlib/realpath.c
@@ -24,8 +24,8 @@
 /* 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)
+/* 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 f068b980d..c688c1aa6 100644
--- a/libc/stdlib/seed48.c
+++ b/libc/stdlib/seed48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(seed48_r)
+/* 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 3769e0fa7..4347383f8 100644
--- a/libc/stdlib/seed48_r.c
+++ b/libc/stdlib/seed48_r.c
@@ -23,7 +23,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
-libc_hidden_proto(seed48_r)
+/* 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 833bd8fcd..cf10804ec 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -30,7 +30,7 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
 /* Experimentally off - libc_hidden_proto(strndup) */
-libc_hidden_proto(unsetenv)
+/* libc_hidden_proto(unsetenv) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -133,14 +133,14 @@ int __add_to_environ (const char *name, const char *value,
     return rv;
 }
 
-libc_hidden_proto(setenv)
+/* libc_hidden_proto(setenv) */
 int setenv (const char *name, const char *value, int replace)
 {
     return __add_to_environ (name, value, NULL, replace);
 }
 libc_hidden_def(setenv)
 
-libc_hidden_proto(unsetenv)
+/* libc_hidden_proto(unsetenv) */
 int unsetenv (const char *name)
 {
     size_t len;
diff --git a/libc/stdlib/srand48.c b/libc/stdlib/srand48.c
index 42e90c9f9..5f593223a 100644
--- a/libc/stdlib/srand48.c
+++ b/libc/stdlib/srand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(srand48_r)
+/* 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 45bb75f11..33c241560 100644
--- a/libc/stdlib/srand48_r.c
+++ b/libc/stdlib/srand48_r.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-libc_hidden_proto(srand48_r)
+/* 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 aa55d12d6..7202182d9 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -197,7 +197,7 @@ _stdlib_wcsto_ll(register const wchar_t * __restrict str,
 /**********************************************************************/
 #ifdef L_atof
 
-libc_hidden_proto(strtod)
+/* libc_hidden_proto(strtod) */
 
 double atof(const char *nptr)
 {
@@ -269,9 +269,9 @@ strong_alias(llabs,imaxabs)
 
 #if INT_MAX < LONG_MAX
 
-libc_hidden_proto(strtol)
+/* libc_hidden_proto(strtol) */
 
-libc_hidden_proto(atoi)
+/* libc_hidden_proto(atoi) */
 int atoi(const char *nptr)
 {
 	return (int) strtol(nptr, (char **) NULL, 10);
@@ -284,9 +284,9 @@ libc_hidden_def(atoi)
 /**********************************************************************/
 #ifdef L_atol
 
-libc_hidden_proto(strtol)
+/* libc_hidden_proto(strtol) */
 
-libc_hidden_proto(atol)
+/* libc_hidden_proto(atol) */
 long atol(const char *nptr)
 {
 	return strtol(nptr, (char **) NULL, 10);
@@ -313,7 +313,7 @@ strong_alias(atol,atoll)
 
 #if defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX)
 
-libc_hidden_proto(strtoll)
+/* libc_hidden_proto(strtoll) */
 
 long long atoll(const char *nptr)
 {
@@ -465,10 +465,10 @@ 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)
+/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-libc_hidden_proto(iswspace)
+/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -477,10 +477,10 @@ libc_hidden_proto(iswspace)
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-libc_hidden_proto(isspace_l)
+/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-libc_hidden_proto(isspace)
+/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -620,10 +620,10 @@ 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)
+/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-libc_hidden_proto(iswspace)
+/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -632,10 +632,10 @@ libc_hidden_proto(iswspace)
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-libc_hidden_proto(isspace_l)
+/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-libc_hidden_proto(isspace)
+/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -816,7 +816,7 @@ 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)
+/* libc_hidden_proto(qsort) */
 void qsort(void  *base,
            size_t nel,
            size_t width,
@@ -912,7 +912,7 @@ void ssort(void  *base,
 /**********************************************************************/
 #ifdef L__stdlib_mb_cur_max
 
-libc_hidden_proto(_stdlib_mb_cur_max)
+/* libc_hidden_proto(_stdlib_mb_cur_max) */
 size_t _stdlib_mb_cur_max(void)
 {
 #ifdef __CTYPE_HAS_UTF_8_LOCALES
@@ -956,7 +956,7 @@ static __always_inline int is_stateful(unsigned char encoding)
 /**********************************************************************/
 #ifdef L_mblen
 
-libc_hidden_proto(mbrlen)
+/* libc_hidden_proto(mbrlen) */
 
 int mblen(register const char *s, size_t n)
 {
@@ -988,7 +988,7 @@ int mblen(register const char *s, size_t n)
 /**********************************************************************/
 #ifdef L_mbtowc
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 
 int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 {
@@ -1023,7 +1023,7 @@ 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)
+/* libc_hidden_proto(wcrtomb) */
 
 int wctomb(register char *__restrict s, wchar_t swc)
 {
@@ -1042,7 +1042,7 @@ int wctomb(register char *__restrict s, wchar_t swc)
 /**********************************************************************/
 #ifdef L_mbstowcs
 
-libc_hidden_proto(mbsrtowcs)
+/* libc_hidden_proto(mbsrtowcs) */
 
 size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {
@@ -1059,7 +1059,7 @@ 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)
+/* 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 33091da0a..9244892ab 100644
--- a/libc/stdlib/system.c
+++ b/libc/stdlib/system.c
@@ -12,16 +12,16 @@
 #include <stdlib.h>
 
 /* libc_hidden_proto(_exit) */
-libc_hidden_proto(wait4)
-libc_hidden_proto(execl)
-libc_hidden_proto(signal)
-libc_hidden_proto(vfork)
+/* 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)
+/* 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 5d62846ef..25c335239 100644
--- a/libc/stdlib/unix_grantpt.c
+++ b/libc/stdlib/unix_grantpt.c
@@ -31,18 +31,18 @@
 #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(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(ptsname_r) */
+/* libc_hidden_proto(execle) */
 /* libc_hidden_proto(_exit) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
diff --git a/libc/stdlib/valloc.c b/libc/stdlib/valloc.c
index 13dbe0f67..d2aca4072 100644
--- a/libc/stdlib/valloc.c
+++ b/libc/stdlib/valloc.c
@@ -24,7 +24,7 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-libc_hidden_proto(getpagesize)
+/* 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 0f9cd16a9..2b856e9f5 100644
--- a/libc/string/__glibc_strerror_r.c
+++ b/libc/string/__glibc_strerror_r.c
@@ -8,8 +8,8 @@
 #include <features.h>
 #include <string.h>
 
-libc_hidden_proto(__glibc_strerror_r)
-libc_hidden_proto(__xpg_strerror_r)
+/* 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 ff41192e5..274b6cec8 100644
--- a/libc/string/__xpg_strerror_r.c
+++ b/libc/string/__xpg_strerror_r.c
@@ -15,7 +15,7 @@
 
 #undef strerror_r
 
-libc_hidden_proto(__xpg_strerror_r)
+/* libc_hidden_proto(__xpg_strerror_r) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 
diff --git a/libc/string/_collate.c b/libc/string/_collate.c
index 64b5d9608..3c53404ad 100644
--- a/libc/string/_collate.c
+++ b/libc/string/_collate.c
@@ -24,8 +24,8 @@
 /* Experimentally off - libc_hidden_proto(strlcpy) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 #ifdef WANT_WIDE
-libc_hidden_proto(wcsxfrm)
-libc_hidden_proto(wcscmp)
+/* libc_hidden_proto(wcsxfrm) */
+/* libc_hidden_proto(wcscmp) */
 #endif
 
 #ifdef __UCLIBC_HAS_LOCALE__
@@ -59,18 +59,18 @@ libc_hidden_proto(wcscmp)
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-libc_hidden_proto(wcscoll_l)
+/* libc_hidden_proto(wcscoll_l) */
 
-libc_hidden_proto(wcscoll)
+/* 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_l) */
 
-libc_hidden_proto(wcsxfrm)
+/* 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/strcasecmp.c b/libc/string/strcasecmp.c
index a5254f327..94c8ff492 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -12,22 +12,22 @@
 #ifdef WANT_WIDE
 # define strcasecmp wcscasecmp
 # define strcasecmp_l wcscasecmp_l
-libc_hidden_proto(wcscasecmp)
+/* libc_hidden_proto(wcscasecmp) */
 # if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-libc_hidden_proto(wcscasecmp_l)
+/* libc_hidden_proto(wcscasecmp_l) */
 # endif
 # ifdef __UCLIBC_DO_XLOCALE
-libc_hidden_proto(towlower_l)
+/* libc_hidden_proto(towlower_l) */
 #  define TOLOWER(C) towlower_l((C), locale_arg)
 # else
-libc_hidden_proto(towlower)
+/* 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)
+/* libc_hidden_proto(tolower_l) */
 #  define TOLOWER(C) tolower_l((C), locale_arg)
 # else
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
diff --git a/libc/string/strdup.c b/libc/string/strdup.c
index 61fc186c8..9eb28630e 100644
--- a/libc/string/strdup.c
+++ b/libc/string/strdup.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 
 #ifdef WANT_WIDE
-libc_hidden_proto(wcslen)
+/* libc_hidden_proto(wcslen) */
 # define Wstrdup wcsdup
 # define Wstrlen wcslen
 #else
diff --git a/libc/string/strerror.c b/libc/string/strerror.c
index 355c7bdda..a52c407f8 100644
--- a/libc/string/strerror.c
+++ b/libc/string/strerror.c
@@ -10,7 +10,7 @@
 #include "_syserrmsg.h"
 
 /* Experimentally off - libc_hidden_proto(strerror) */
-libc_hidden_proto(__xpg_strerror_r)
+/* libc_hidden_proto(__xpg_strerror_r) */
 
 char *strerror(int errnum)
 {
diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index 9df9be59c..a9e7245a8 100644
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -12,22 +12,22 @@
 #ifdef WANT_WIDE
 # define strncasecmp wcsncasecmp
 # define strncasecmp_l wcsncasecmp_l
-libc_hidden_proto(wcsncasecmp)
+/* libc_hidden_proto(wcsncasecmp) */
 # if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-libc_hidden_proto(wcsncasecmp_l)
+/* libc_hidden_proto(wcsncasecmp_l) */
 # endif
 # ifdef __UCLIBC_DO_XLOCALE
-libc_hidden_proto(towlower_l)
+/* libc_hidden_proto(towlower_l) */
 #  define TOLOWER(C) towlower_l((C), locale_arg)
 # else
-libc_hidden_proto(towlower)
+/* 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)
+/* libc_hidden_proto(tolower_l) */
 #  define TOLOWER(C) tolower_l((C), locale_arg)
 # else
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index 2ad7746b1..c81231997 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -8,8 +8,8 @@
 #include "_string.h"
 
 #ifdef WANT_WIDE
-libc_hidden_proto(wcsspn)
-libc_hidden_proto(wcspbrk)
+/* libc_hidden_proto(wcsspn) */
+/* libc_hidden_proto(wcspbrk) */
 # define Wstrtok_r wcstok
 # define Wstrspn wcsspn
 # define Wstrpbrk wcspbrk
diff --git a/libc/sysdeps/linux/arm/aeabi_assert.c b/libc/sysdeps/linux/arm/aeabi_assert.c
index e0985b446..53943ac13 100644
--- a/libc/sysdeps/linux/arm/aeabi_assert.c
+++ b/libc/sysdeps/linux/arm/aeabi_assert.c
@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-libc_hidden_proto(__assert)
+/* libc_hidden_proto(__assert) */
 
 void
 __aeabi_assert (const char *assertion, const char *file,
diff --git a/libc/sysdeps/linux/arm/aeabi_localeconv.c b/libc/sysdeps/linux/arm/aeabi_localeconv.c
index c9e9dd23f..6fa29bbad 100644
--- a/libc/sysdeps/linux/arm/aeabi_localeconv.c
+++ b/libc/sysdeps/linux/arm/aeabi_localeconv.c
@@ -18,7 +18,7 @@
 
 #include <locale.h>
 
-libc_hidden_proto(localeconv)
+/* libc_hidden_proto(localeconv) */
 
 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 937a7fffb..109feb11d 100644
--- a/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
+++ b/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #ifdef __UCLIBC_HAS_WCHAR__
-libc_hidden_proto(_stdlib_mb_cur_max)
+/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #endif
 
 int
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index daa8b72a1..d5e642ca7 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -46,12 +46,12 @@
 #include <sys/sysctl.h>
 #include <sys/io.h>
 
-libc_hidden_proto(ioperm)
+/* libc_hidden_proto(ioperm) */
 
-libc_hidden_proto(readlink)
+/* libc_hidden_proto(readlink) */
 /* libc_hidden_proto(mmap) */
-libc_hidden_proto(sscanf)
-libc_hidden_proto(fscanf)
+/* libc_hidden_proto(sscanf) */
+/* libc_hidden_proto(fscanf) */
 /* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(fopen) */
diff --git a/libc/sysdeps/linux/arm/iopl.c b/libc/sysdeps/linux/arm/iopl.c
index 654a4158f..ecb1cd15d 100644
--- a/libc/sysdeps/linux/arm/iopl.c
+++ b/libc/sysdeps/linux/arm/iopl.c
@@ -21,7 +21,7 @@
 #include <sys/io.h>
 #include <errno.h>
 
-libc_hidden_proto(ioperm)
+/* libc_hidden_proto(ioperm) */
 
 #define MAX_PORT	0x10000
 
diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
index c018043bd..6dc8725f6 100644
--- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c
+++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
@@ -12,8 +12,8 @@
 #define __need_NULL
 #include <stddef.h>
 
-libc_hidden_proto(sigwaitinfo)
-libc_hidden_proto(sigtimedwait)
+/* 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/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index 3860050f8..e95c6fe2d 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -53,7 +53,7 @@ weak_alias(__libc_fcntl,fcntl)
 libc_hidden_weak(fcntl)
 #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__
 strong_alias(__libc_fcntl,__libc_fcntl64)
-libc_hidden_proto(fcntl64)
+/* libc_hidden_proto(fcntl64) */
 weak_alias(__libc_fcntl,fcntl64)
 libc_hidden_weak(fcntl64)
 #endif
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c
index 579e0e257..cd5c59bd2 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl64.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c
@@ -30,7 +30,7 @@ int __libc_fcntl64(int fd, int cmd, ...)
 }
 libc_hidden_def(__libc_fcntl64)
 
-libc_hidden_proto(fcntl64)
+/* libc_hidden_proto(fcntl64) */
 strong_alias(__libc_fcntl64,fcntl64)
 libc_hidden_weak(fcntl64)
 #endif
diff --git a/libc/sysdeps/linux/common/adjtimex.c b/libc/sysdeps/linux/common/adjtimex.c
index 05e3679ff..725c82994 100644
--- a/libc/sysdeps/linux/common/adjtimex.c
+++ b/libc/sysdeps/linux/common/adjtimex.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/timex.h>
 
-libc_hidden_proto(adjtimex)
+/* 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 224656c2e..6042ad270 100644
--- a/libc/sysdeps/linux/common/alarm.c
+++ b/libc/sysdeps/linux/common/alarm.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(alarm)
+/* libc_hidden_proto(alarm) */
 
 #ifdef __NR_alarm
 #define __NR___alarm __NR_alarm
@@ -18,7 +18,7 @@ _syscall1(unsigned int, alarm, unsigned int, seconds)
 #else
 #include <sys/time.h>
 
-libc_hidden_proto(setitimer)
+/* libc_hidden_proto(setitimer) */
 
 unsigned int alarm(unsigned int seconds)
 {
diff --git a/libc/sysdeps/linux/common/bits/errno.h b/libc/sysdeps/linux/common/bits/errno.h
index a5ac1a47f..92227fe73 100644
--- a/libc/sysdeps/linux/common/bits/errno.h
+++ b/libc/sysdeps/linux/common/bits/errno.h
@@ -41,6 +41,7 @@
 # ifndef __ASSEMBLER__
 /* Function to get address of global `errno' variable.  */
 extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+libc_hidden_proto(__errno_location)
 
 #  ifdef __UCLIBC_HAS_THREADS__
 /* When using threads, errno is a per-thread value.  */
diff --git a/libc/sysdeps/linux/common/bits/getopt.h b/libc/sysdeps/linux/common/bits/getopt.h
index a28d0a40b..0307757a6 100644
--- a/libc/sysdeps/linux/common/bits/getopt.h
+++ b/libc/sysdeps/linux/common/bits/getopt.h
@@ -153,8 +153,10 @@ struct option
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
        __THROW;
+libc_hidden_proto(getopt)
 #else /* not __GNU_LIBRARY__ */
 extern int getopt ();
+libc_hidden_proto(getopt)
 #endif /* __GNU_LIBRARY__ */
 
 #if defined __UCLIBC_HAS_GNU_GETOPT__ || defined __UCLIBC_HAS_GETOPT_LONG__
diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
index c352a1712..ac5a4336b 100644
--- a/libc/sysdeps/linux/common/bits/socket.h
+++ b/libc/sysdeps/linux/common/bits/socket.h
@@ -269,6 +269,7 @@ struct cmsghdr
 
 extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
 				      struct cmsghdr *__cmsg) __THROW;
+libc_hidden_proto(__cmsg_nxthdr)
 #ifdef __USE_EXTERN_INLINES
 # ifndef _EXTERN_INLINE
 #  define _EXTERN_INLINE extern __inline
diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
index 843a2f2c3..3631ef79f 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
@@ -382,7 +382,9 @@ extern void __stdio_init_mutex(__UCLIBC_MUTEX_TYPE *m) attribute_hidden;
 #endif
 
 extern int __fgetc_unlocked(FILE *__stream);
+libc_hidden_proto(__fgetc_unlocked)
 extern int __fputc_unlocked(int __c, FILE *__stream);
+libc_hidden_proto(__fputc_unlocked)
 
 /* First define the default definitions.
    They are overridden below as necessary. */
diff --git a/libc/sysdeps/linux/common/chdir.c b/libc/sysdeps/linux/common/chdir.c
index ee889bae3..05441eb82 100644
--- a/libc/sysdeps/linux/common/chdir.c
+++ b/libc/sysdeps/linux/common/chdir.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-libc_hidden_proto(chdir)
+/* 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 da0dff6d9..a4524ba1f 100644
--- a/libc/sysdeps/linux/common/chmod.c
+++ b/libc/sysdeps/linux/common/chmod.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(chmod)
+/* 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 f32507193..2e7784a0c 100644
--- a/libc/sysdeps/linux/common/chown.c
+++ b/libc/sysdeps/linux/common/chown.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-libc_hidden_proto(chown)
+/* 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 e0eb1b6d5..4964ec57c 100644
--- a/libc/sysdeps/linux/common/clock_getres.c
+++ b/libc/sysdeps/linux/common/clock_getres.c
@@ -14,7 +14,7 @@
 #ifdef __NR_clock_getres
 _syscall2(int, clock_getres, clockid_t, clock_id, struct timespec*, res)
 #else
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 
 int clock_getres(clockid_t clock_id, struct timespec* res)
 {
diff --git a/libc/sysdeps/linux/common/clock_settime.c b/libc/sysdeps/linux/common/clock_settime.c
index 652bcebd1..f11088a37 100644
--- a/libc/sysdeps/linux/common/clock_settime.c
+++ b/libc/sysdeps/linux/common/clock_settime.c
@@ -14,7 +14,7 @@
 #ifdef __NR_clock_settime
 _syscall2(int, clock_settime, clockid_t, clock_id, const struct timespec*, tp)
 #else
-libc_hidden_proto(settimeofday)
+/* 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 8350c3a4d..7dbf7bec5 100644
--- a/libc/sysdeps/linux/common/cmsg_nxthdr.c
+++ b/libc/sysdeps/linux/common/cmsg_nxthdr.c
@@ -21,7 +21,7 @@
 #include <features.h>
 #include <sys/socket.h>
 
-libc_hidden_proto(__cmsg_nxthdr)
+/* libc_hidden_proto(__cmsg_nxthdr) */
 
 struct cmsghdr *
 __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
diff --git a/libc/sysdeps/linux/common/creat64.c b/libc/sysdeps/linux/common/creat64.c
index f5f00182c..875606a1d 100644
--- a/libc/sysdeps/linux/common/creat64.c
+++ b/libc/sysdeps/linux/common/creat64.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 
 extern __typeof(open64) __libc_open64;
-libc_hidden_proto(__libc_open64)
+/* libc_hidden_proto(__libc_open64) */
 extern __typeof(creat64) __libc_creat64;
 
 /* Create FILE with protections MODE.  */
diff --git a/libc/sysdeps/linux/common/dup2.c b/libc/sysdeps/linux/common/dup2.c
index da885a981..2a315fed4 100644
--- a/libc/sysdeps/linux/common/dup2.c
+++ b/libc/sysdeps/linux/common/dup2.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(dup2)
+/* 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 5e947d648..53efd78fb 100644
--- a/libc/sysdeps/linux/common/execve.c
+++ b/libc/sysdeps/linux/common/execve.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <sys/param.h>
 
-libc_hidden_proto(execve)
+/* 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 00a857c1e..45236f177 100644
--- a/libc/sysdeps/linux/common/fchdir.c
+++ b/libc/sysdeps/linux/common/fchdir.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(fchdir)
+/* 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 7c1281468..5993387f0 100644
--- a/libc/sysdeps/linux/common/fork.c
+++ b/libc/sysdeps/linux/common/fork.c
@@ -16,7 +16,7 @@
 extern __typeof(fork) __libc_fork;
 #define __NR___libc_fork __NR_fork
 _syscall0(pid_t, __libc_fork)
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
 #endif
@@ -28,7 +28,7 @@ pid_t __libc_fork(void)
 	__set_errno(ENOSYS);
 	return -1;
 }
-libc_hidden_proto(fork)
+/* 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/fstat.c b/libc/sysdeps/linux/common/fstat.c
index 34a6e7b46..6d5cf8b9f 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -38,7 +38,7 @@ libc_hidden_def(fstat)
 
 #if ! defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__
 extern __typeof(fstat) fstat64;
-libc_hidden_proto(fstat64)
+/* libc_hidden_proto(fstat64) */
 strong_alias(fstat,fstat64)
 libc_hidden_def(fstat64)
 #endif
diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c
index 5dfb23d62..a57b4f6f5 100644
--- a/libc/sysdeps/linux/common/fstat64.c
+++ b/libc/sysdeps/linux/common/fstat64.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include "xstatconv.h"
 
-libc_hidden_proto(fstat64)
+/* 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 3449d8073..a7a6ea69d 100644
--- a/libc/sysdeps/linux/common/ftruncate.c
+++ b/libc/sysdeps/linux/common/ftruncate.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(ftruncate)
+/* 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 48760879a..132789144 100644
--- a/libc/sysdeps/linux/common/ftruncate64.c
+++ b/libc/sysdeps/linux/common/ftruncate64.c
@@ -21,7 +21,7 @@
 # include <sys/types.h>
 # include <sys/syscall.h>
 
-libc_hidden_proto(ftruncate64)
+/* libc_hidden_proto(ftruncate64) */
 
 # ifdef __NR_ftruncate64
 
@@ -64,7 +64,7 @@ int ftruncate64 (int fd, __off64_t length)
 
 # else  /* __NR_ftruncate64 */
 
-libc_hidden_proto(ftruncate)
+/* 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 07e1481e4..13619159d 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -15,16 +15,16 @@
 #include <sys/param.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(getcwd)
-libc_hidden_proto(getpagesize)
+/* 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(opendir) */
+/* libc_hidden_proto(readdir) */
+/* libc_hidden_proto(closedir) */
 /* libc_hidden_proto(stat) */
 
 #ifdef __NR_getcwd
diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c
index d789d0fe0..1864ff4fc 100644
--- a/libc/sysdeps/linux/common/getdents64.c
+++ b/libc/sysdeps/linux/common/getdents64.c
@@ -21,7 +21,7 @@
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_getdents64
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 
 # ifndef offsetof
 #  define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
diff --git a/libc/sysdeps/linux/common/getdirname.c b/libc/sysdeps/linux/common/getdirname.c
index 2eba80c6e..4b793faf0 100644
--- a/libc/sysdeps/linux/common/getdirname.c
+++ b/libc/sysdeps/linux/common/getdirname.c
@@ -26,10 +26,10 @@
 #include <string.h>
 
 /* Experimentally off - libc_hidden_proto(strdup) */
-libc_hidden_proto(getcwd)
+/* libc_hidden_proto(getcwd) */
 /* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(stat64) */
 #else
 /* libc_hidden_proto(stat) */
 #endif
diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c
index 86f6dfd32..c561aa305 100644
--- a/libc/sysdeps/linux/common/getdomainname.c
+++ b/libc/sysdeps/linux/common/getdomainname.c
@@ -14,7 +14,7 @@
 #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)
+/* libc_hidden_proto(uname) */
 
 #if !defined __UCLIBC_BSD_SPECIFIC__
 extern int getdomainname (char *__name, size_t __len)
@@ -50,7 +50,7 @@ int __libc_getdomainname(char *name, size_t len)
 }
 libc_hidden_def(__libc_getdomainname)
 #if defined __UCLIBC_BSD_SPECIFIC__
-libc_hidden_proto(getdomainname)
+/* libc_hidden_proto(getdomainname) */
 weak_alias(__libc_getdomainname,getdomainname)
 libc_hidden_weak(getdomainname)
 #endif /* __UCLIBC_BSD_SPECIFIC__ */
diff --git a/libc/sysdeps/linux/common/getdtablesize.c b/libc/sysdeps/linux/common/getdtablesize.c
index 44d21862f..183c09e1f 100644
--- a/libc/sysdeps/linux/common/getdtablesize.c
+++ b/libc/sysdeps/linux/common/getdtablesize.c
@@ -11,9 +11,9 @@
 
 /* XXX: _BSD || _XOPEN_SOURCE >= 500 */
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-libc_hidden_proto(getdtablesize)
+/* libc_hidden_proto(getdtablesize) */
 
-libc_hidden_proto(getrlimit)
+/* 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 ad80e3a97..20a679156 100644
--- a/libc/sysdeps/linux/common/getegid.c
+++ b/libc/sysdeps/linux/common/getegid.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(getegid)
+/* libc_hidden_proto(getegid) */
 
 #if defined(__NR_getegid32)
 # undef __NR_getegid
@@ -25,7 +25,7 @@ gid_t getegid(void)
 	return (__syscall_getegid());
 }
 #else
-libc_hidden_proto(getgid)
+/* 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 63ee1da62..b9332a9f2 100644
--- a/libc/sysdeps/linux/common/geteuid.c
+++ b/libc/sysdeps/linux/common/geteuid.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(geteuid)
+/* libc_hidden_proto(geteuid) */
 
 #if defined(__NR_geteuid32)
 # undef __NR_geteuid
@@ -26,7 +26,7 @@ uid_t geteuid(void)
 }
 
 #else
-libc_hidden_proto(getuid)
+/* 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 8fb633ba3..f42a1731c 100644
--- a/libc/sysdeps/linux/common/getgid.c
+++ b/libc/sysdeps/linux/common/getgid.c
@@ -19,6 +19,6 @@
 # define __NR_getgid __NR_getgid32
 #endif
 
-libc_hidden_proto(getgid)
+/* 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 ed02de106..67d2f4faa 100644
--- a/libc/sysdeps/linux/common/getgroups.c
+++ b/libc/sysdeps/linux/common/getgroups.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <grp.h>
 
-libc_hidden_proto(getgroups)
+/* libc_hidden_proto(getgroups) */
 
 #if defined(__NR_getgroups32)
 # undef __NR_getgroups
@@ -24,7 +24,7 @@ _syscall2(int, getgroups, int, size, gid_t *, list)
 
 #else
 
-libc_hidden_proto(sysconf)
+/* 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 8fc14ff32..e06fee98d 100644
--- a/libc/sysdeps/linux/common/gethostname.c
+++ b/libc/sysdeps/linux/common/gethostname.c
@@ -9,11 +9,11 @@
 #include <sys/utsname.h>
 #include <errno.h>
 
-libc_hidden_proto(gethostname)
+/* libc_hidden_proto(gethostname) */
 
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
-libc_hidden_proto(uname)
+/* 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 efb5fcb7f..96ed17b04 100644
--- a/libc/sysdeps/linux/common/getpagesize.c
+++ b/libc/sysdeps/linux/common/getpagesize.c
@@ -43,6 +43,6 @@ int __getpagesize(void)
 #endif	/* NBPG.  */
 #endif	/* EXEC_PAGESIZE.  */
 }
-libc_hidden_proto(getpagesize)
+/* libc_hidden_proto(getpagesize) */
 strong_alias(__getpagesize,getpagesize)
 libc_hidden_def(getpagesize)
diff --git a/libc/sysdeps/linux/common/getpriority.c b/libc/sysdeps/linux/common/getpriority.c
index 089d9b199..58fb2b31f 100644
--- a/libc/sysdeps/linux/common/getpriority.c
+++ b/libc/sysdeps/linux/common/getpriority.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(getpriority)
+/* 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 40b3c7368..6297516f0 100644
--- a/libc/sysdeps/linux/common/getrlimit.c
+++ b/libc/sysdeps/linux/common/getrlimit.c
@@ -13,7 +13,7 @@
 #include <sys/resource.h>
 #undef getrlimit64
 
-libc_hidden_proto(getrlimit)
+/* 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 ca7aa7310..14335778c 100644
--- a/libc/sysdeps/linux/common/getrlimit64.c
+++ b/libc/sysdeps/linux/common/getrlimit64.c
@@ -26,7 +26,7 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-libc_hidden_proto(getrlimit)
+/* 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 9c011f648..1b22451f8 100644
--- a/libc/sysdeps/linux/common/getsid.c
+++ b/libc/sysdeps/linux/common/getsid.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 
 #ifdef __USE_XOPEN_EXTENDED
-libc_hidden_proto(getsid)
+/* 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/getuid.c b/libc/sysdeps/linux/common/getuid.c
index 07ebf88f0..ab0ea150b 100644
--- a/libc/sysdeps/linux/common/getuid.c
+++ b/libc/sysdeps/linux/common/getuid.c
@@ -19,6 +19,6 @@
 # define __NR_getuid __NR_getuid32
 #endif
 
-libc_hidden_proto(getuid)
+/* libc_hidden_proto(getuid) */
 _syscall0(uid_t, getuid)
 libc_hidden_def(getuid)
diff --git a/libc/sysdeps/linux/common/kill.c b/libc/sysdeps/linux/common/kill.c
index 1ee1cffd2..3578673b8 100644
--- a/libc/sysdeps/linux/common/kill.c
+++ b/libc/sysdeps/linux/common/kill.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <signal.h>
 
-libc_hidden_proto(kill)
+/* 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/llseek.c b/libc/sysdeps/linux/common/llseek.c
index 4761b3307..1879464f7 100644
--- a/libc/sysdeps/linux/common/llseek.c
+++ b/libc/sysdeps/linux/common/llseek.c
@@ -30,14 +30,14 @@ loff_t __libc_lseek64(int fd, loff_t offset, int whence)
 }
 #else
 extern __typeof(lseek) __libc_lseek;
-libc_hidden_proto(__libc_lseek)
+/* libc_hidden_proto(__libc_lseek) */
 
 loff_t __libc_lseek64(int fd, loff_t offset, int whence)
 {
 	return(loff_t)(__libc_lseek(fd, (off_t) (offset), whence));
 }
 #endif
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 weak_alias(__libc_lseek64,lseek64)
 libc_hidden_weak(lseek64)
 /*strong_alias(__libc_lseek64,_llseek) */
diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c
index 8c0525d07..ee49c9f25 100644
--- a/libc/sysdeps/linux/common/lseek.c
+++ b/libc/sysdeps/linux/common/lseek.c
@@ -19,6 +19,7 @@ _syscall3(__off_t, __libc_lseek, int, fildes, __off_t, offset, int, whence)
 #else
 extern __typeof(lseek64) __libc_lseek64;
 libc_hidden_proto(__libc_lseek64)
+
 __off_t __libc_lseek(int fildes, __off_t offset, int whence)
 {
 	return __libc_lseek64(fildes, offset, whence);
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index fb07dfe10..1adbdcf87 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -39,7 +39,7 @@ libc_hidden_def(lstat)
 
 #if ! defined __NR_lstat64 && defined __UCLIBC_HAS_LFS__
 extern __typeof(lstat) lstat64;
-libc_hidden_proto(lstat64)
+/* libc_hidden_proto(lstat64) */
 strong_alias(lstat,lstat64)
 libc_hidden_def(lstat64)
 #endif
diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c
index 97e9528c1..8d7ce1921 100644
--- a/libc/sysdeps/linux/common/lstat64.c
+++ b/libc/sysdeps/linux/common/lstat64.c
@@ -14,7 +14,7 @@
 # include <sys/stat.h>
 # include "xstatconv.h"
 
-libc_hidden_proto(lstat64)
+/* 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 8591c497d..73234f287 100644
--- a/libc/sysdeps/linux/common/mkdir.c
+++ b/libc/sysdeps/linux/common/mkdir.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(mkdir)
+/* 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 cbde71e04..f6f03a746 100644
--- a/libc/sysdeps/linux/common/mkfifo.c
+++ b/libc/sysdeps/linux/common/mkfifo.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-libc_hidden_proto(mknod)
+/* libc_hidden_proto(mknod) */
 
 /* Create a named pipe (FIFO) named PATH with protections MODE.  */
 int
diff --git a/libc/sysdeps/linux/common/mknod.c b/libc/sysdeps/linux/common/mknod.c
index e16c49025..5c7f9a5fd 100644
--- a/libc/sysdeps/linux/common/mknod.c
+++ b/libc/sysdeps/linux/common/mknod.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-libc_hidden_proto(mknod)
+/* libc_hidden_proto(mknod) */
 
 #define __NR___syscall_mknod __NR_mknod
 static __inline__ _syscall3(int, __syscall_mknod, const char *, path,
diff --git a/libc/sysdeps/linux/common/mremap.c b/libc/sysdeps/linux/common/mremap.c
index e7c1caa95..70627af9e 100644
--- a/libc/sysdeps/linux/common/mremap.c
+++ b/libc/sysdeps/linux/common/mremap.c
@@ -12,13 +12,15 @@
 
 #ifdef __NR_mremap
 
+//vda:TODO: add comment and explain why??
+
 #define mremap _hidemremap
 #include <sys/mman.h>
 #undef mremap
 
 void *mremap(void *, size_t, size_t, int, void *);
-
 libc_hidden_proto(mremap)
+
 _syscall5(void *, mremap, void *, old_address, size_t, old_size, size_t,
 		  new_size, int, may_move, void *, new_address)
 libc_hidden_def(mremap)
diff --git a/libc/sysdeps/linux/common/munmap.c b/libc/sysdeps/linux/common/munmap.c
index 81a65fb15..37b939993 100644
--- a/libc/sysdeps/linux/common/munmap.c
+++ b/libc/sysdeps/linux/common/munmap.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 
 _syscall2(int, munmap, void *, start, size_t, length)
 libc_hidden_def(munmap)
diff --git a/libc/sysdeps/linux/common/nanosleep.c b/libc/sysdeps/linux/common/nanosleep.c
index 30a27dc32..24b2eb080 100644
--- a/libc/sysdeps/linux/common/nanosleep.c
+++ b/libc/sysdeps/linux/common/nanosleep.c
@@ -16,7 +16,7 @@ extern __typeof(nanosleep) __libc_nanosleep;
 #define __NR___libc_nanosleep __NR_nanosleep
 _syscall2(int, __libc_nanosleep, const struct timespec *, req,
 		  struct timespec *, rem)
-libc_hidden_proto(nanosleep)
+/* libc_hidden_proto(nanosleep) */
 weak_alias(__libc_nanosleep,nanosleep)
 libc_hidden_weak(nanosleep)
 #endif
diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c
index 86765a958..51997ca13 100644
--- a/libc/sysdeps/linux/common/nice.c
+++ b/libc/sysdeps/linux/common/nice.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(getpriority)
+/* libc_hidden_proto(getpriority) */
 
 #ifdef __NR_nice
 
@@ -23,7 +23,7 @@ static __inline__ _syscall1(int, __syscall_nice, int, incr)
 
 # include <limits.h>
 
-libc_hidden_proto(setpriority)
+/* 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 f32e05444..ff933fed4 100644
--- a/libc/sysdeps/linux/common/ntp_gettime.c
+++ b/libc/sysdeps/linux/common/ntp_gettime.c
@@ -18,7 +18,7 @@
 
 #include <sys/timex.h>
 
-libc_hidden_proto(adjtimex)
+/* libc_hidden_proto(adjtimex) */
 
 int ntp_gettime(struct ntptimeval *ntv)
 {
diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c
index 1c40b3e9b..4d965aeba 100644
--- a/libc/sysdeps/linux/common/open64.c
+++ b/libc/sysdeps/linux/common/open64.c
@@ -37,7 +37,7 @@ int __libc_open64 (const char *file, int oflag, ...)
 }
 libc_hidden_def(__libc_open64)
 
-libc_hidden_proto(open64)
+/* libc_hidden_proto(open64) */
 weak_alias(__libc_open64,open64)
 libc_hidden_weak(open64)
 #endif /* __UCLIBC_HAS_LFS__ */
diff --git a/libc/sysdeps/linux/common/pause.c b/libc/sysdeps/linux/common/pause.c
index 877717a0a..5c75211a7 100644
--- a/libc/sysdeps/linux/common/pause.c
+++ b/libc/sysdeps/linux/common/pause.c
@@ -17,8 +17,8 @@ extern __typeof(pause) __libc_pause;
 _syscall0(int, __libc_pause)
 #else
 #include <signal.h>
-libc_hidden_proto(__sigpause)
-libc_hidden_proto(sigblock)
+/* libc_hidden_proto(__sigpause) */
+/* libc_hidden_proto(sigblock) */
 
 int __libc_pause(void)
 {
diff --git a/libc/sysdeps/linux/common/pipe.c b/libc/sysdeps/linux/common/pipe.c
index fa0c211ab..02b173853 100644
--- a/libc/sysdeps/linux/common/pipe.c
+++ b/libc/sysdeps/linux/common/pipe.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(pipe)
+/* libc_hidden_proto(pipe) */
 
 _syscall1(int, pipe, int *, filedes)
 libc_hidden_def(pipe)
diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c
index 764a9aa7b..e5f5f771f 100644
--- a/libc/sysdeps/linux/common/poll.c
+++ b/libc/sysdeps/linux/common/poll.c
@@ -30,7 +30,7 @@ _syscall3(int, __libc_poll, struct pollfd *, fds,
 
 #elif defined(__NR_ppoll) && defined __UCLIBC_LINUX_SPECIFIC__
 
-libc_hidden_proto(ppoll)
+/* libc_hidden_proto(ppoll) */
 int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
 	struct timespec *ts = NULL, tval;
@@ -59,8 +59,8 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(getdtablesize)
-libc_hidden_proto(select)
+/* libc_hidden_proto(getdtablesize) */
+/* libc_hidden_proto(select) */
 
 /* uClinux 2.0 doesn't have poll, emulate it using select */
 
diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
index a203c0c55..edcb1dc66 100644
--- a/libc/sysdeps/linux/common/ppoll.c
+++ b/libc/sysdeps/linux/common/ppoll.c
@@ -22,7 +22,7 @@
 
 #if defined __NR_ppoll && defined __UCLIBC_LINUX_SPECIFIC__
 
-libc_hidden_proto(ppoll)
+/* libc_hidden_proto(ppoll) */
 
 # define __NR___libc_ppoll __NR_ppoll
 static __always_inline
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index 353cf1ac2..cb1d83820 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -117,7 +117,7 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lseek64)
+/* 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 567728f51..dce5e879c 100644
--- a/libc/sysdeps/linux/common/pselect.c
+++ b/libc/sysdeps/linux/common/pselect.c
@@ -26,7 +26,7 @@
 extern __typeof(pselect) __libc_pselect;
 
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(select)
+/* 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 716bfcc4d..36e0f8942 100644
--- a/libc/sysdeps/linux/common/readlink.c
+++ b/libc/sysdeps/linux/common/readlink.c
@@ -10,6 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(readlink)
+/* 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 63c5f2e7e..221c29f46 100644
--- a/libc/sysdeps/linux/common/rmdir.c
+++ b/libc/sysdeps/linux/common/rmdir.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(rmdir)
+/* libc_hidden_proto(rmdir) */
 
 _syscall1(int, rmdir, const char *, pathname)
 libc_hidden_def(rmdir)
diff --git a/libc/sysdeps/linux/common/select.c b/libc/sysdeps/linux/common/select.c
index 6d42285b3..4fc7a21a6 100644
--- a/libc/sysdeps/linux/common/select.c
+++ b/libc/sysdeps/linux/common/select.c
@@ -42,6 +42,6 @@ _syscall5(int, __libc_select, int, n, fd_set *, readfds, fd_set *, writefds,
 
 #endif
 
-libc_hidden_proto(select)
+/* 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 33c627c51..30921a8b3 100644
--- a/libc/sysdeps/linux/common/setegid.c
+++ b/libc/sysdeps/linux/common/setegid.c
@@ -12,9 +12,9 @@
 #include <sys/syscall.h>
 
 #if (defined __NR_setresgid || defined __NR_setresgid32) && defined __USE_GNU
-libc_hidden_proto(setresgid)
+/* libc_hidden_proto(setresgid) */
 #endif
-libc_hidden_proto(setregid)
+/* 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 5a6e9a25a..6f2c5e92a 100644
--- a/libc/sysdeps/linux/common/seteuid.c
+++ b/libc/sysdeps/linux/common/seteuid.c
@@ -16,12 +16,12 @@
 #undef __NR_setresuid32
 #endif
 
-libc_hidden_proto(seteuid)
+/* libc_hidden_proto(seteuid) */
 
 #if (defined __NR_setresuid || defined __NR_setresuid32) && defined __USE_GNU
-libc_hidden_proto(setresuid)
+/* libc_hidden_proto(setresuid) */
 #endif
-libc_hidden_proto(setreuid)
+/* 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 298252dfa..d7a94944c 100644
--- a/libc/sysdeps/linux/common/setgroups.c
+++ b/libc/sysdeps/linux/common/setgroups.c
@@ -14,7 +14,7 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(setgroups)
+/* libc_hidden_proto(setgroups) */
 
 #if defined(__NR_setgroups32)
 # undef __NR_setgroups
@@ -26,7 +26,7 @@ _syscall2(int, setgroups, size_t, size, const gid_t *, list)
 
 #else
 
-libc_hidden_proto(sysconf)
+/* 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 f57e6acef..df65808d2 100644
--- a/libc/sysdeps/linux/common/setitimer.c
+++ b/libc/sysdeps/linux/common/setitimer.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-libc_hidden_proto(setitimer)
+/* 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 1ec5e6240..664da1ad2 100644
--- a/libc/sysdeps/linux/common/setpgid.c
+++ b/libc/sysdeps/linux/common/setpgid.c
@@ -12,7 +12,7 @@
 #if defined __USE_UNIX98 || defined __USE_SVID
 #include <unistd.h>
 
-libc_hidden_proto(setpgid)
+/* 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 38300dc2e..9f71aa26f 100644
--- a/libc/sysdeps/linux/common/setpgrp.c
+++ b/libc/sysdeps/linux/common/setpgrp.c
@@ -7,7 +7,7 @@
 #include <syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(setpgid)
+/* libc_hidden_proto(setpgid) */
 
 int setpgrp(void)
 {
diff --git a/libc/sysdeps/linux/common/setpriority.c b/libc/sysdeps/linux/common/setpriority.c
index 9774348ce..3b98c3f58 100644
--- a/libc/sysdeps/linux/common/setpriority.c
+++ b/libc/sysdeps/linux/common/setpriority.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(setpriority)
+/* 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 b92b84468..332599431 100644
--- a/libc/sysdeps/linux/common/setregid.c
+++ b/libc/sysdeps/linux/common/setregid.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-libc_hidden_proto(setregid)
+/* 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 6018f1984..e99708e0d 100644
--- a/libc/sysdeps/linux/common/setresgid.c
+++ b/libc/sysdeps/linux/common/setresgid.c
@@ -15,7 +15,7 @@
 # undef __NR_setresgid
 # define __NR_setresgid __NR_setresgid32
 
-libc_hidden_proto(setresgid)
+/* libc_hidden_proto(setresgid) */
 _syscall3(int, setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
 libc_hidden_def(setresgid)
 
@@ -25,7 +25,7 @@ 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)
+/* 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 ab15be197..c1e395a40 100644
--- a/libc/sysdeps/linux/common/setresuid.c
+++ b/libc/sysdeps/linux/common/setresuid.c
@@ -15,7 +15,7 @@
 # undef __NR_setresuid
 # define __NR_setresuid __NR_setresuid32
 
-libc_hidden_proto(setresuid)
+/* libc_hidden_proto(setresuid) */
 _syscall3(int, setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
 libc_hidden_def(setresuid)
 
@@ -25,7 +25,7 @@ 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)
+/* 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 bf55843d8..bb7b6a9c5 100644
--- a/libc/sysdeps/linux/common/setreuid.c
+++ b/libc/sysdeps/linux/common/setreuid.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-libc_hidden_proto(setreuid)
+/* 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 3811cd7d4..87f96cb21 100644
--- a/libc/sysdeps/linux/common/setrlimit.c
+++ b/libc/sysdeps/linux/common/setrlimit.c
@@ -13,7 +13,7 @@
 #include <sys/resource.h>
 #undef setrlimit64
 
-libc_hidden_proto(setrlimit)
+/* 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 90b8eebd7..3233ed696 100644
--- a/libc/sysdeps/linux/common/setrlimit64.c
+++ b/libc/sysdeps/linux/common/setrlimit64.c
@@ -26,7 +26,7 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-libc_hidden_proto(setrlimit)
+/* 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 849c02ffc..d0fc9b010 100644
--- a/libc/sysdeps/linux/common/setsid.c
+++ b/libc/sysdeps/linux/common/setsid.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(setsid)
+/* 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 c6f2d798a..361eb3532 100644
--- a/libc/sysdeps/linux/common/settimeofday.c
+++ b/libc/sysdeps/linux/common/settimeofday.c
@@ -12,7 +12,7 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(settimeofday)
+/* libc_hidden_proto(settimeofday) */
 
 _syscall2(int, settimeofday, const struct timeval *, tv,
 		  const struct timezone *, tz)
diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c
index 5e79bc667..d610e8f6a 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -25,7 +25,7 @@
 #if defined __USE_POSIX199309
 
 /* libc_hidden_proto(getpid) */
-libc_hidden_proto(getuid)
+/* 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 6161acb29..a5ce43007 100644
--- a/libc/sysdeps/linux/common/sigsuspend.c
+++ b/libc/sysdeps/linux/common/sigsuspend.c
@@ -32,7 +32,7 @@ int __libc_sigsuspend(const sigset_t * set)
 	return __syscall_sigsuspend(0, 0, set->__val[0]);
 }
 #endif
-libc_hidden_proto(sigsuspend)
+/* libc_hidden_proto(sigsuspend) */
 weak_alias(__libc_sigsuspend,sigsuspend)
 libc_hidden_weak(sigsuspend)
 #endif
diff --git a/libc/sysdeps/linux/common/splice.c b/libc/sysdeps/linux/common/splice.c
index f1e0d821e..b21d10336 100644
--- a/libc/sysdeps/linux/common/splice.c
+++ b/libc/sysdeps/linux/common/splice.c
@@ -10,8 +10,6 @@
 #include <sys/syscall.h>
 #include <fcntl.h>
 
-libc_hidden_proto(splice)
-
 #ifdef __NR_splice
 _syscall6(ssize_t, splice, int, __fdin, __off64_t *, __offin, int, __fdout,
 	__off64_t *, __offout, size_t, __len, unsigned int, __flags)
@@ -23,6 +21,3 @@ ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
 	return -1;
 }
 #endif
-
-libc_hidden_def(splice)
-
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index b939b4ea0..73d7113b8 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -32,17 +32,17 @@
 #if defined __UCLIBC_HAS_SYSLOG__
 #include <sys/syslog.h>
 
-libc_hidden_proto(openlog)
-libc_hidden_proto(syslog)
-libc_hidden_proto(closelog)
+/* 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(sigfillset) */
+/* libc_hidden_proto(sigdelset) */
 /* libc_hidden_proto(sigprocmask) */
 /* libc_hidden_proto(write) */
-libc_hidden_proto(kill)
+/* libc_hidden_proto(kill) */
 /* libc_hidden_proto(getpid) */
 /* libc_hidden_proto(_exit) */
 
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index c2e02ae34..d563bcd88 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -40,7 +40,7 @@ libc_hidden_def(stat)
 
 #if ! defined __NR_stat64 && defined __UCLIBC_HAS_LFS__
 extern __typeof(stat) stat64;
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(stat64) */
 strong_alias(stat,stat64)
 libc_hidden_def(stat64)
 #endif
diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c
index c9ba2bc63..11f836bac 100644
--- a/libc/sysdeps/linux/common/stat64.c
+++ b/libc/sysdeps/linux/common/stat64.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_stat64
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(stat64) */
 
 # define __NR___syscall_stat64 __NR_stat64
 # include <unistd.h>
diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c
index 5f4133ad3..e892fb376 100644
--- a/libc/sysdeps/linux/common/statfs.c
+++ b/libc/sysdeps/linux/common/statfs.c
@@ -14,6 +14,7 @@
 
 extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
+
 #define __NR___libc_statfs __NR_statfs
 _syscall2(int, __libc_statfs, const char *, path, struct statfs *, buf)
 
diff --git a/libc/sysdeps/linux/common/stime.c b/libc/sysdeps/linux/common/stime.c
index 2b7ea6f2f..de060c8a2 100644
--- a/libc/sysdeps/linux/common/stime.c
+++ b/libc/sysdeps/linux/common/stime.c
@@ -15,7 +15,7 @@
 #ifdef __NR_stime
 _syscall1(int, stime, const time_t *, t)
 #else
-libc_hidden_proto(settimeofday)
+/* libc_hidden_proto(settimeofday) */
 
 int stime(const time_t * when)
 {
diff --git a/libc/sysdeps/linux/common/times.c b/libc/sysdeps/linux/common/times.c
index a6ea1fa51..a0644ef1f 100644
--- a/libc/sysdeps/linux/common/times.c
+++ b/libc/sysdeps/linux/common/times.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/times.h>
 
-libc_hidden_proto(times)
+/* 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 a40ec3030..22da552da 100644
--- a/libc/sysdeps/linux/common/truncate.c
+++ b/libc/sysdeps/linux/common/truncate.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(truncate)
+/* 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 3ab61657d..40989334f 100644
--- a/libc/sysdeps/linux/common/truncate64.c
+++ b/libc/sysdeps/linux/common/truncate64.c
@@ -62,7 +62,7 @@ int truncate64 (const char * path, __off64_t length)
 
 #else  /* __NR_truncate64 */
 
-libc_hidden_proto(truncate)
+/* 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 c02c19122..3c1a0cc1c 100644
--- a/libc/sysdeps/linux/common/ulimit.c
+++ b/libc/sysdeps/linux/common/ulimit.c
@@ -19,9 +19,9 @@ _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)
+/* 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 1b5168750..1e29b9f23 100644
--- a/libc/sysdeps/linux/common/uname.c
+++ b/libc/sysdeps/linux/common/uname.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 
-libc_hidden_proto(uname)
+/* 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 9b1f38b3c..1ad1f2c6d 100644
--- a/libc/sysdeps/linux/common/unlink.c
+++ b/libc/sysdeps/linux/common/unlink.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(unlink)
+/* 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 5c4207aaa..f87afcfc4 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <utime.h>
 
-libc_hidden_proto(utime)
+/* libc_hidden_proto(utime) */
 
 #ifdef __NR_utime
 _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
@@ -18,7 +18,7 @@ _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
 #include <stdlib.h>
 #include <sys/time.h>
 
-libc_hidden_proto(utimes)
+/* 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 e62faff7f..191b1afd8 100644
--- a/libc/sysdeps/linux/common/utimes.c
+++ b/libc/sysdeps/linux/common/utimes.c
@@ -11,14 +11,14 @@
 #include <utime.h>
 #include <sys/time.h>
 
-libc_hidden_proto(utimes)
+/* 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)
+/* libc_hidden_proto(utime) */
 
 int utimes(const char *file, const struct timeval tvp[2])
 {
diff --git a/libc/sysdeps/linux/common/vfork.c b/libc/sysdeps/linux/common/vfork.c
index f9634cd5c..eda76aeac 100644
--- a/libc/sysdeps/linux/common/vfork.c
+++ b/libc/sysdeps/linux/common/vfork.c
@@ -12,14 +12,14 @@
 #ifdef __ARCH_USE_MMU__
 
 #ifdef __NR_fork
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 
 extern __typeof(vfork) __vfork attribute_hidden;
 pid_t __vfork(void)
 {
     return fork();
 }
-libc_hidden_proto(vfork)
+/* libc_hidden_proto(vfork) */
 weak_alias(__vfork,vfork)
 libc_hidden_weak(vfork)
 #endif
diff --git a/libc/sysdeps/linux/common/vmsplice.c b/libc/sysdeps/linux/common/vmsplice.c
index 2d32f20f8..c5fd6c7ed 100644
--- a/libc/sysdeps/linux/common/vmsplice.c
+++ b/libc/sysdeps/linux/common/vmsplice.c
@@ -10,8 +10,6 @@
 #include <sys/syscall.h>
 #include <fcntl.h>
 
-libc_hidden_proto(vmsplice)
-
 #ifdef __NR_vmsplice
 _syscall4(ssize_t, vmsplice, int, __fdout, const struct iovec *, __iov,
 	size_t, __count, unsigned int, __flags)
@@ -23,6 +21,3 @@ ssize_t vmsplice(int __fdout, const struct iovec *__iov, size_t __count,
 	return -1;
 }
 #endif
-
-libc_hidden_def(vmsplice)
-
diff --git a/libc/sysdeps/linux/common/wait.c b/libc/sysdeps/linux/common/wait.c
index 39d0e47b9..e1b41112d 100644
--- a/libc/sysdeps/linux/common/wait.c
+++ b/libc/sysdeps/linux/common/wait.c
@@ -10,7 +10,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(wait4)
+/* libc_hidden_proto(wait4) */
 
 extern __typeof(wait) __libc_wait;
 
diff --git a/libc/sysdeps/linux/common/wait3.c b/libc/sysdeps/linux/common/wait3.c
index 8a2d43f7a..11985e3db 100644
--- a/libc/sysdeps/linux/common/wait3.c
+++ b/libc/sysdeps/linux/common/wait3.c
@@ -11,7 +11,7 @@
 
 #if defined __USE_BSD
 
-libc_hidden_proto(wait4)
+/* 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 c62a855fb..4fd866996 100644
--- a/libc/sysdeps/linux/common/wait4.c
+++ b/libc/sysdeps/linux/common/wait4.c
@@ -12,7 +12,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(wait4)
+/* 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 ce3d5dc05..6218cdd53 100644
--- a/libc/sysdeps/linux/common/waitid.c
+++ b/libc/sysdeps/linux/common/waitid.c
@@ -15,7 +15,7 @@
 _syscall4(int, waitid, idtype_t, idtype, id_t, id, siginfo_t*, infop, int, options)
 # else
 #  include <string.h>
-libc_hidden_proto(waitpid)
+/* libc_hidden_proto(waitpid) */
 int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
 {
 	switch (idtype) {
diff --git a/libc/sysdeps/linux/common/waitpid.c b/libc/sysdeps/linux/common/waitpid.c
index c1766be6b..d5afd8262 100644
--- a/libc/sysdeps/linux/common/waitpid.c
+++ b/libc/sysdeps/linux/common/waitpid.c
@@ -10,13 +10,13 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(wait4)
+/* libc_hidden_proto(wait4) */
 
 extern __typeof(waitpid) __libc_waitpid;
 __pid_t __libc_waitpid(__pid_t pid, int *wait_stat, int options)
 {
 	return wait4(pid, wait_stat, options, NULL);
 }
-libc_hidden_proto(waitpid)
+/* libc_hidden_proto(waitpid) */
 weak_alias(__libc_waitpid,waitpid)
 libc_hidden_weak(waitpid)
diff --git a/libc/sysdeps/linux/cris/fork.c b/libc/sysdeps/linux/cris/fork.c
index 20b546901..e548e80ec 100644
--- a/libc/sysdeps/linux/cris/fork.c
+++ b/libc/sysdeps/linux/cris/fork.c
@@ -14,6 +14,6 @@ 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)
+/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
diff --git a/libc/sysdeps/linux/e1/vfork.c b/libc/sysdeps/linux/e1/vfork.c
index 799a11208..abcd200e7 100644
--- a/libc/sysdeps/linux/e1/vfork.c
+++ b/libc/sysdeps/linux/e1/vfork.c
@@ -10,6 +10,6 @@
 
 #define __NR___vfork __NR_vfork
 attribute_hidden _syscall0(pid_t, __vfork)
-libc_hidden_proto(vfork)
+/* libc_hidden_proto(vfork) */
 weak_alias(__vfork,vfork)
 libc_hidden_weak(vfork)
diff --git a/libc/sysdeps/linux/frv/fstat64.c b/libc/sysdeps/linux/frv/fstat64.c
index 6b356e012..ee0347288 100644
--- a/libc/sysdeps/linux/frv/fstat64.c
+++ b/libc/sysdeps/linux/frv/fstat64.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(fstat64)
+/* libc_hidden_proto(fstat64) */
 _syscall2(int, fstat64, int, fd, struct stat64 *, buf)
 libc_hidden_def(fstat64)
 #endif
diff --git a/libc/sysdeps/linux/frv/lstat64.c b/libc/sysdeps/linux/frv/lstat64.c
index 1184a0aa4..d4e139314 100644
--- a/libc/sysdeps/linux/frv/lstat64.c
+++ b/libc/sysdeps/linux/frv/lstat64.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lstat64)
+/* 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/stat64.c b/libc/sysdeps/linux/frv/stat64.c
index daa5ac960..45320ecd7 100644
--- a/libc/sysdeps/linux/frv/stat64.c
+++ b/libc/sysdeps/linux/frv/stat64.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(stat64)
+/* 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/powerpc/ioctl.c b/libc/sysdeps/linux/powerpc/ioctl.c
index fe3a2eb20..06f12eed4 100644
--- a/libc/sysdeps/linux/powerpc/ioctl.c
+++ b/libc/sysdeps/linux/powerpc/ioctl.c
@@ -24,8 +24,8 @@
 
 /* libc_hidden_proto(ioctl) */
 
-libc_hidden_proto(tcsetattr)
-libc_hidden_proto(tcgetattr)
+/* 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 5850e3b64..dcdb39be1 100644
--- a/libc/sysdeps/linux/powerpc/pread_write.c
+++ b/libc/sysdeps/linux/powerpc/pread_write.c
@@ -110,7 +110,7 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lseek64)
+/* 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/pipe.c b/libc/sysdeps/linux/sh/pipe.c
index 432a5bc03..56ae46c00 100644
--- a/libc/sysdeps/linux/sh/pipe.c
+++ b/libc/sysdeps/linux/sh/pipe.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <syscall.h>
 
-libc_hidden_proto(pipe)
+/* libc_hidden_proto(pipe) */
 
 int pipe(int *fd)
 {
diff --git a/libc/sysdeps/linux/x86_64/sys/io.h b/libc/sysdeps/linux/x86_64/sys/io.h
index 802a0dfb4..ec1212560 100644
--- a/libc/sysdeps/linux/x86_64/sys/io.h
+++ b/libc/sysdeps/linux/x86_64/sys/io.h
@@ -32,6 +32,7 @@ __BEGIN_DECLS
    E.g., Linux/Alpha for Alpha PCs supports this.  */
 extern int ioperm (unsigned long int __from, unsigned long int __num,
                    int __turn_on) __THROW;
+libc_hidden_proto(ioperm)
 
 /* Set the I/O privilege level to LEVEL.  If LEVEL>3, permission to
    access any I/O port is granted.  This call requires root
diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c
index 0b2199977..212a40935 100644
--- a/libc/sysdeps/linux/xtensa/pread_write.c
+++ b/libc/sysdeps/linux/xtensa/pread_write.c
@@ -119,7 +119,7 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lseek64)
+/* 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 5d5eb8cda..bbafda0af 100644
--- a/libc/termios/cfsetspeed.c
+++ b/libc/termios/cfsetspeed.c
@@ -22,8 +22,8 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(cfsetispeed)
-libc_hidden_proto(cfsetospeed)
+/* libc_hidden_proto(cfsetispeed) */
+/* libc_hidden_proto(cfsetospeed) */
 
 struct speed_struct
 {
diff --git a/libc/termios/isatty.c b/libc/termios/isatty.c
index 7532f334b..071bb35d9 100644
--- a/libc/termios/isatty.c
+++ b/libc/termios/isatty.c
@@ -19,8 +19,8 @@
 #include <unistd.h>
 #include <termios.h>
 
-libc_hidden_proto(isatty)
-libc_hidden_proto(tcgetattr)
+/* 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 52647b9cc..d4eabd9a1 100644
--- a/libc/termios/speed.c
+++ b/libc/termios/speed.c
@@ -22,8 +22,8 @@
 #include <errno.h>
 #include <termios.h>
 
-libc_hidden_proto(cfsetispeed)
-libc_hidden_proto(cfsetospeed)
+/* 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/tcgetattr.c b/libc/termios/tcgetattr.c
index e431868c2..47b885800 100644
--- a/libc/termios/tcgetattr.c
+++ b/libc/termios/tcgetattr.c
@@ -27,7 +27,7 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
-libc_hidden_proto(tcgetattr)
+/* 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 ea42b3459..677e8b4dc 100644
--- a/libc/termios/tcgetpgrp.c
+++ b/libc/termios/tcgetpgrp.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-libc_hidden_proto(tcgetpgrp)
+/* libc_hidden_proto(tcgetpgrp) */
 /* libc_hidden_proto(ioctl) */
 
 /* Return the foreground process group ID of FD.  */
diff --git a/libc/termios/tcgetsid.c b/libc/termios/tcgetsid.c
index 711b3bd63..b5d7cb697 100644
--- a/libc/termios/tcgetsid.c
+++ b/libc/termios/tcgetsid.c
@@ -23,8 +23,8 @@
 #include <unistd.h>
 
 /* libc_hidden_proto(ioctl) */
-libc_hidden_proto(getsid)
-libc_hidden_proto(tcgetpgrp)
+/* libc_hidden_proto(getsid) */
+/* libc_hidden_proto(tcgetpgrp) */
 
 /* Return the session ID of FD.  */
 pid_t
diff --git a/libc/termios/tcsetattr.c b/libc/termios/tcsetattr.c
index 2aac81a77..9f5533e08 100644
--- a/libc/termios/tcsetattr.c
+++ b/libc/termios/tcsetattr.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-libc_hidden_proto(tcsetattr)
+/* libc_hidden_proto(tcsetattr) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* libc_hidden_proto(ioctl) */
 
diff --git a/libc/termios/ttyname.c b/libc/termios/ttyname.c
index 8af93e142..ac25c7658 100644
--- a/libc/termios/ttyname.c
+++ b/libc/termios/ttyname.c
@@ -31,15 +31,15 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(ttyname_r)
+/* 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)
+/* 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/daemon.c b/libc/unistd/daemon.c
index 29fd56ceb..5bd6f39ed 100644
--- a/libc/unistd/daemon.c
+++ b/libc/unistd/daemon.c
@@ -51,10 +51,10 @@
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
 /* libc_hidden_proto(_exit) */
-libc_hidden_proto(dup2)
-libc_hidden_proto(setsid)
-libc_hidden_proto(chdir)
-libc_hidden_proto(fork)
+/* libc_hidden_proto(dup2) */
+/* libc_hidden_proto(setsid) */
+/* libc_hidden_proto(chdir) */
+/* libc_hidden_proto(fork) */
 
 int daemon( int nochdir, int noclose )
 {
diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
index 057f7ff2c..91ba7bba8 100644
--- a/libc/unistd/exec.c
+++ b/libc/unistd/exec.c
@@ -27,18 +27,18 @@
 #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)
+/* 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(execve) */
 /* libc_hidden_proto(mmap) */
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 /* libc_hidden_proto(getenv) */
 
 /**********************************************************************/
diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c
index 25d99bd9d..e97b662f1 100644
--- a/libc/unistd/getlogin.c
+++ b/libc/unistd/getlogin.c
@@ -20,7 +20,7 @@
  * 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)
+/* 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 fc8e32111..00c08d114 100644
--- a/libc/unistd/getopt-susv3.c
+++ b/libc/unistd/getopt-susv3.c
@@ -46,7 +46,7 @@ int optind = 1;
 int optopt = 0;
 char *optarg = NULL;
 
-libc_hidden_proto(getopt)
+/* 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_long-simple.c b/libc/unistd/getopt_long-simple.c
index 2dae341a3..233884438 100644
--- a/libc/unistd/getopt_long-simple.c
+++ b/libc/unistd/getopt_long-simple.c
@@ -8,7 +8,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
-libc_hidden_proto(getopt)
+/* 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 5c1e09901..ee54429a0 100644
--- a/libc/unistd/getpass.c
+++ b/libc/unistd/getpass.c
@@ -24,18 +24,18 @@
 #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(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(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)
+/* 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/sleep.c b/libc/unistd/sleep.c
index 93d033ed1..e7152c46b 100644
--- a/libc/unistd/sleep.c
+++ b/libc/unistd/sleep.c
@@ -23,7 +23,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-libc_hidden_proto(sleep)
+/* libc_hidden_proto(sleep) */
 
 /* libc_hidden_proto(sigaction) */
 /* libc_hidden_proto(sigprocmask) */
diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c
index 549c13ca6..37ccd4d63 100644
--- a/libc/unistd/sysconf.c
+++ b/libc/unistd/sysconf.c
@@ -34,10 +34,10 @@
 #include <regex.h>
 #endif
 
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 
-libc_hidden_proto(getpagesize)
-libc_hidden_proto(getdtablesize)
+/* 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 07bea2a50..191f996b5 100644
--- a/libc/unistd/ualarm.c
+++ b/libc/unistd/ualarm.c
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-libc_hidden_proto(setitimer)
+/* 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 3021db8e1..9896bd3ef 100644
--- a/libc/unistd/usershell.c
+++ b/libc/unistd/usershell.c
@@ -45,9 +45,9 @@
 /* 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)
+/* 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__
diff --git a/libc/unistd/usleep.c b/libc/unistd/usleep.c
index 8a27f900a..daeda0982 100644
--- a/libc/unistd/usleep.c
+++ b/libc/unistd/usleep.c
@@ -22,7 +22,7 @@ int usleep (__useconds_t usec)
     return(nanosleep(&ts, NULL));
 }
 #else /* __UCLIBC_HAS_REALTIME__ */
-libc_hidden_proto(select)
+/* libc_hidden_proto(select) */
 int usleep (__useconds_t usec)
 {
 	struct timeval tv;