trim Experimentally off and uncommented hidden

  sed -i -e '/Experimentally off - /d' $(grep -rl "Experimentally off - " *)
  sed -i -e '/^\/\*[[:space:]]*libc_hidden_proto(/d' $(grep -rl "libc_hidden_proto" *)
  should be a nop

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

59 files changed, 1 insertions, 596 deletions

diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index b371fa9ae..8bef59ffa 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -44,11 +44,8 @@
  * all else    -> decimal
  */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
-/* libc_hidden_proto(inet_aton) */
 int inet_aton(const char *cp, struct in_addr *addrptr)
 {
 	in_addr_t addr;
@@ -103,9 +100,7 @@ libc_hidden_def(inet_aton)
 #endif
 
 #ifdef L_inet_addr
-/* libc_hidden_proto(inet_aton) */
 
-/* libc_hidden_proto(inet_addr) */
 in_addr_t inet_addr(const char *cp)
 {
 	struct in_addr a;
@@ -122,7 +117,6 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
-/* libc_hidden_proto(inet_ntoa_r) */
 char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 {
 	in_addr_t addr = ntohl(in.s_addr);
@@ -144,7 +138,6 @@ char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 }
 libc_hidden_def(inet_ntoa_r)
 
-/* libc_hidden_proto(inet_ntoa) */
 char *inet_ntoa(struct in_addr in)
 {
 	static char buf[INET_NTOA_MAX_LEN];
@@ -156,13 +149,11 @@ libc_hidden_def(inet_ntoa)
 #ifdef L_inet_makeaddr
 
 /* for some reason it does not remove the jump relocation */
-/* Experimentally off - libc_hidden_proto(memmove) */
 
 /*
  * Formulate an Internet address from network + host.  Used in
  * building addresses stored in the ifnet structure.
  */
-/* libc_hidden_proto(inet_makeaddr) */
 struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
 {
 	in_addr_t addr;
@@ -206,7 +197,6 @@ in_addr_t inet_lnaof(struct in_addr in)
  * Return the network number from an internet
  * address; handles class a/b/c network #'s.
  */
-/* libc_hidden_proto(inet_netof) */
 in_addr_t
 inet_netof(struct in_addr in)
 {
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 2839bdaf4..a9fe3c884 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -70,26 +70,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <net/if.h>
 #include <ifaddrs.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(stpcpy) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getservbyname_r) */
-/* libc_hidden_proto(gethostbyname2_r) */
-/* libc_hidden_proto(gethostbyaddr_r) */
-/* libc_hidden_proto(inet_pton) */
-/* libc_hidden_proto(inet_ntop) */
-/* libc_hidden_proto(strtoul) */
-/* libc_hidden_proto(if_nametoindex) */
-/* libc_hidden_proto(__h_errno_location) */
-/* libc_hidden_proto(uname) */
 #ifdef __UCLIBC_HAS_IPV6__
-/* libc_hidden_proto(in6addr_loopback) */
 #endif
 
 #define GAIH_OKIFUNSPEC 0x0100
@@ -783,7 +764,6 @@ static const struct gaih gaih[] = {
 	{ PF_UNSPEC, NULL }
 };
 
-/* libc_hidden_proto(freeaddrinfo) */
 void
 freeaddrinfo(struct addrinfo *ai)
 {
@@ -797,7 +777,6 @@ freeaddrinfo(struct addrinfo *ai)
 }
 libc_hidden_def(freeaddrinfo)
 
-/* libc_hidden_proto(getaddrinfo) */
 int
 getaddrinfo(const char *name, const char *service,
 	     const struct addrinfo *hints, struct addrinfo **pai)
diff --git a/libc/inet/getnetbyad.c b/libc/inet/getnetbyad.c
index 735005a62..a4af1a844 100644
--- a/libc/inet/getnetbyad.c
+++ b/libc/inet/getnetbyad.c
@@ -20,9 +20,6 @@
 #include <netdb.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setnetent) */
-/* libc_hidden_proto(getnetent) */
-/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetbynm.c b/libc/inet/getnetbynm.c
index d3f283106..eab04045b 100644
--- a/libc/inet/getnetbynm.c
+++ b/libc/inet/getnetbynm.c
@@ -21,10 +21,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(setnetent) */
-/* libc_hidden_proto(getnetent) */
-/* libc_hidden_proto(endnetent) */
 
 extern smallint _net_stayopen attribute_hidden;
 
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 746f8b704..e9b45ba7e 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -23,12 +23,6 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(inet_network) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -44,7 +38,6 @@ static char *net_aliases[MAXALIASES];
 
 smallint _net_stayopen attribute_hidden;
 
-/* libc_hidden_proto(setnetent) */
 void setnetent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -58,7 +51,6 @@ void setnetent(int f)
 }
 libc_hidden_def(setnetent)
 
-/* libc_hidden_proto(endnetent) */
 void endnetent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -84,7 +76,6 @@ static char * any(register char *cp, char *match)
     return ((char *)0);
 }
 
-/* libc_hidden_proto(getnetent) */
 struct netent *getnetent(void)
 {
     char *p;
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index 837f1315f..c297a6549 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -62,14 +62,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(fopen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -93,7 +85,6 @@ static void __initbuf(void)
     }
 }
 
-/* libc_hidden_proto(setprotoent) */
 void setprotoent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -106,7 +97,6 @@ void setprotoent(int f)
 }
 libc_hidden_def(setprotoent)
 
-/* libc_hidden_proto(endprotoent) */
 void endprotoent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -119,7 +109,6 @@ void endprotoent(void)
 }
 libc_hidden_def(endprotoent)
 
-/* libc_hidden_proto(getprotoent_r) */
 int getprotoent_r(struct protoent *result_buf,
 		  char *buf, size_t buflen,
 		  struct protoent **result)
@@ -210,7 +199,6 @@ struct protoent * getprotoent(void)
 }
 
 
-/* libc_hidden_proto(getprotobyname_r) */
 int getprotobyname_r(const char *name,
 		    struct protoent *result_buf,
 		    char *buf, size_t buflen,
@@ -247,7 +235,6 @@ struct protoent * getprotobyname(const char *name)
 }
 
 
-/* libc_hidden_proto(getprotobynumber_r) */
 int getprotobynumber_r (int proto_num,
 			struct protoent *result_buf,
 			char *buf, size_t buflen,
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index 904f0b79c..6d80a1b07 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -64,14 +64,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
-/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
@@ -96,7 +88,6 @@ static void __initbuf(void)
     }
 }
 
-/* libc_hidden_proto(setservent) */
 void setservent(int f)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -109,7 +100,6 @@ void setservent(int f)
 }
 libc_hidden_def(setservent)
 
-/* libc_hidden_proto(endservent) */
 void endservent(void)
 {
     __UCLIBC_MUTEX_LOCK(mylock);
@@ -122,7 +112,6 @@ void endservent(void)
 }
 libc_hidden_def(endservent)
 
-/* libc_hidden_proto(getservent_r) */
 int getservent_r(struct servent * result_buf,
 		 char * buf, size_t buflen,
 		 struct servent ** result)
@@ -213,7 +202,6 @@ struct servent * getservent(void)
     return result;
 }
 
-/* libc_hidden_proto(getservbyname_r) */
 int getservbyname_r(const char *name, const char *proto,
 	struct servent * result_buf, char * buf, size_t buflen,
 	struct servent ** result)
@@ -251,7 +239,6 @@ struct servent *getservbyname(const char *name, const char *proto)
 }
 
 
-/* libc_hidden_proto(getservbyport_r) */
 int getservbyport_r(int port, const char *proto,
 	struct servent * result_buf, char * buf,
 	size_t buflen, struct servent ** result)
@@ -273,7 +260,6 @@ int getservbyport_r(int port, const char *proto,
 }
 libc_hidden_def(getservbyport_r)
 
-/* libc_hidden_proto(getservbyport) */
 struct servent * getservbyport(int port, const char *proto)
 {
     struct servent *result;
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index 8f993a78c..a1f94ad64 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -23,8 +23,6 @@
 #include <string.h>
 #include <netdb.h>
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__h_errno_location) */
 
 static const char error_msg[] = "Resolver error";
 static const char *const h_errlist[] = {
@@ -39,7 +37,6 @@ static const int h_nerr = { sizeof(h_errlist)/sizeof(h_errlist[0]) };
 /*
  * herror -- print the error indicated by the h_errno value.
  */
-/* libc_hidden_proto(herror) */
 void herror(const char *s)
 {
 	static const char colon_space[] = ": ";
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index cadcd1b28..99346d7f8 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -15,15 +15,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(gethostname) */
 
 #define HOSTID "/etc/hostid"
 
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 090b52a15..36012975f 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -37,7 +37,6 @@
 
 extern int __opensock(void) attribute_hidden;
 
-/* libc_hidden_proto(if_nametoindex) */
 unsigned int
 if_nametoindex(const char* ifname)
 {
@@ -68,7 +67,6 @@ if_nametoindex(const char* ifname)
 }
 libc_hidden_def(if_nametoindex)
 
-/* libc_hidden_proto(if_freenameindex) */
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
@@ -82,7 +80,6 @@ if_freenameindex (struct if_nameindex *ifn)
 }
 libc_hidden_def(if_freenameindex)
 
-/* libc_hidden_proto(if_nameindex) */
 #if !__ASSUME_NETLINK_SUPPORT
 struct if_nameindex *
 if_nameindex (void)
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index 77ca7ce02..3b8b674c2 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -39,17 +39,6 @@
 
 #include "netlinkaccess.h"
 
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* Experimentally off - libc_hidden_proto(time) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(bind) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 #ifndef __libc_use_alloca
 # define __libc_use_alloca(x) (x < __MAX_ALLOCA_CUTOFF)
diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c
index eb096f9e3..321a9f66a 100644
--- a/libc/inet/in6_addr.c
+++ b/libc/inet/in6_addr.c
@@ -24,7 +24,6 @@
 #ifdef __UCLIBC_HAS_IPV6__
 const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-/* libc_hidden_proto(in6addr_loopback) */
 const struct in6_addr in6addr_loopback =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
 libc_hidden_data_def(in6addr_loopback)
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 477d67dc9..6bade8aee 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -39,9 +39,7 @@
 #include <arpa/inet.h>
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /*
@@ -49,7 +47,6 @@
  * The library routines call this routine to interpret
  * network numbers.
  */
-/* libc_hidden_proto(inet_network) */
 in_addr_t
 inet_network(const char *cp)
 {
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index 4583fc47f..57a0b8ccd 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -30,13 +30,6 @@
 #include <string.h>
 #include <ctype.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(tolower) */
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
@@ -352,7 +345,6 @@ inet_pton6(const char *src, u_char *dst)
  * author:
  *	Paul Vixie, 1996.
  */
-/* libc_hidden_proto(inet_ntop) */
 const char *
 inet_ntop(int af, const void *src, char *dst, socklen_t size)
 {
@@ -383,7 +375,6 @@ libc_hidden_def(inet_ntop)
  * author:
  *	Paul Vixie, 1996.
  */
-/* libc_hidden_proto(inet_pton) */
 int
 inet_pton(int af, const char *src, void *dst)
 {
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 478315b8f..c48bbfea9 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -39,8 +39,6 @@
 #include <features.h>
 #include "rpc_private.h"
 
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_opaque_auth) */
 
 #define MAX_MARSHAL_SIZE 20
 
@@ -74,7 +72,6 @@ struct authnone_private_s {
 static struct authnone_private_s *authnone_private;
 #endif
 
-/* libc_hidden_proto(authnone_create) */
 AUTH *
 authnone_create (void)
 {
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 9f5d8b4d7..f71a426f8 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -56,21 +56,7 @@
 # include <wchar.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(getgroups) */
-/* libc_hidden_proto(gethostname) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_authunix_parms) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(gettimeofday) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(abort) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 /*
@@ -109,7 +95,6 @@ static bool_t marshal_new_auth (AUTH *) internal_function;
  * Create a unix style authenticator.
  * Returns an auth handle with the given stuff in it.
  */
-/* libc_hidden_proto(authunix_create) */
 AUTH *
 authunix_create (char *machname, uid_t uid, gid_t gid, int len,
 		 gid_t *aup_gids)
@@ -182,7 +167,6 @@ libc_hidden_def(authunix_create)
  * Returns an auth handle with parameters determined by doing lots of
  * syscalls.
  */
-/* libc_hidden_proto(authunix_create_default) */
 AUTH *
 authunix_create_default (void)
 {
diff --git a/libc/inet/rpc/authunix_prot.c b/libc/inet/rpc/authunix_prot.c
index 2739e7658..272990056 100644
--- a/libc/inet/rpc/authunix_prot.c
+++ b/libc/inet/rpc/authunix_prot.c
@@ -39,17 +39,11 @@
 #include <rpc/auth.h>
 #include <rpc/auth_unix.h>
 
-/* libc_hidden_proto(xdr_string) */
-/* libc_hidden_proto(xdr_u_int) */
-/* libc_hidden_proto(xdr_array) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_u_short) */
 
 /*
  * XDR for unix authentication parameters.
  * Unfortunately, none of these can be declared const.
  */
-/* libc_hidden_proto(xdr_authunix_parms) */
 bool_t
 xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
 {
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index b9e77f3cd..fc077af67 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -40,14 +40,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
  */
-/* libc_hidden_proto(bindresvport) */
 int
 bindresvport (int sd, struct sockaddr_in *sin)
 {
diff --git a/libc/inet/rpc/clnt_generic.c b/libc/inet/rpc/clnt_generic.c
index 165f42aeb..8aeae1ec4 100644
--- a/libc/inet/rpc/clnt_generic.c
+++ b/libc/inet/rpc/clnt_generic.c
@@ -40,16 +40,6 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* libc_hidden_proto(clnttcp_create) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(clntunix_create) */
-/* libc_hidden_proto(getprotobyname_r) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index 201a3a353..b3aedc558 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -51,13 +51,7 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
@@ -186,7 +180,6 @@ static const struct rpc_errtab rpc_errlist[] =
 /*
  * This interface for use by clntrpc
  */
-/* libc_hidden_proto(clnt_sperrno) */
 char *
 clnt_sperrno (enum clnt_stat stat)
 {
@@ -217,7 +210,6 @@ clnt_perrno (enum clnt_stat num)
 /*
  * Print reply error info
  */
-/* libc_hidden_proto(clnt_sperror) */
 char *
 clnt_sperror (CLIENT * rpch, const char *msg)
 {
@@ -303,7 +295,6 @@ clnt_sperror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_sperror)
 
-/* libc_hidden_proto(clnt_perror) */
 void
 clnt_perror (CLIENT * rpch, const char *msg)
 {
@@ -316,7 +307,6 @@ clnt_perror (CLIENT * rpch, const char *msg)
 }
 libc_hidden_def(clnt_perror)
 
-/* libc_hidden_proto(clnt_spcreateerror) */
 char *
 clnt_spcreateerror (const char *msg)
 {
diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c
index 792796a5f..4c4c8251d 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -48,14 +48,6 @@ static char sccsid[] = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/svc.h>
 #include <rpc/xdr.h>
 
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(svc_getreq) */
-/* libc_hidden_proto(_seterr_reply) */
 
 #define MCALL_MSG_SIZE 24
 
diff --git a/libc/inet/rpc/clnt_simple.c b/libc/inet/rpc/clnt_simple.c
index 938a4d621..f66228a5f 100644
--- a/libc/inet/rpc/clnt_simple.c
+++ b/libc/inet/rpc/clnt_simple.c
@@ -50,12 +50,6 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strncpy) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(gethostbyname_r) */
 
 struct callrpc_private_s
   {
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 42bef0793..a6d4fbd42 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -65,28 +65,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 # include <wchar.h>
 #endif
 
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 #ifdef USE_IN_LIBIO
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 extern u_long _create_xid (void) attribute_hidden;
@@ -141,7 +120,6 @@ static const struct clnt_ops tcp_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-/* libc_hidden_proto(clnttcp_create) */
 CLIENT *
 clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
 		int *sockp, u_int sendsz, u_int recvsz)
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index e7e816c39..ff04cbba5 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -54,7 +54,6 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <net/if.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
 #ifdef IP_RECVERR
@@ -62,28 +61,8 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/uio.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
-/* libc_hidden_proto(__cmsg_nxthdr) */
-
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
+
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -144,7 +123,6 @@ struct cu_data
  * sendsz and recvsz are the maximum allowable packet sizes that can be
  * sent and received.
  */
-/* libc_hidden_proto(clntudp_bufcreate) */
 CLIENT *
 clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
 		   struct timeval wait, int *sockp, u_int sendsz,
@@ -245,7 +223,6 @@ fooy:
 }
 libc_hidden_def(clntudp_bufcreate)
 
-/* libc_hidden_proto(clntudp_create) */
 CLIENT *
 clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version, struct timeval wait, int *sockp)
 {
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 3a1e13c05..f66ce66e2 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -60,33 +60,8 @@
 #include <rpc/pmap_clnt.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(authnone_create) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdr_callhdr) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_opaque_auth) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(_seterr_reply) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 extern u_long _create_xid (void) attribute_hidden;
 
@@ -140,7 +115,6 @@ static const struct clnt_ops unix_ops =
  * NB: The rpch->cl_auth is set null authentication.  Caller may wish to set this
  * something more useful.
  */
-/* libc_hidden_proto(clntunix_create) */
 CLIENT *
 clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
 		 int *sockp, u_int sendsz, u_int recvsz)
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index 0f045b9c1..3b4e8c08d 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -25,9 +25,6 @@
 #include <sys/time.h>
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(lrand48_r) */
-/* libc_hidden_proto(srand48_r) */
-/* libc_hidden_proto(gettimeofday) */
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
 
diff --git a/libc/inet/rpc/get_myaddress.c b/libc/inet/rpc/get_myaddress.c
index 0006be803..ab4ac3345 100644
--- a/libc/inet/rpc/get_myaddress.c
+++ b/libc/inet/rpc/get_myaddress.c
@@ -50,11 +50,6 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(exit) */
 
 /*
  * don't use gethostbyname, which would invoke yellow pages
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index 7ba4e65c5..de20d64d4 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -44,16 +44,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(rewind) */
-/* libc_hidden_proto(fgets) */
 
 /*
  * Internet version.
@@ -84,7 +74,6 @@ static struct rpcdata *_rpcdata(void)
 	return d;
 }
 
-/* libc_hidden_proto(endrpcent) */
 void endrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -102,7 +91,6 @@ void endrpcent(void)
 }
 libc_hidden_def(endrpcent)
 
-/* libc_hidden_proto(setrpcent) */
 void setrpcent(int f)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -128,7 +116,6 @@ static struct rpcent *__get_next_rpcent(struct rpcdata *d)
 	return interpret(d);
 }
 
-/* libc_hidden_proto(getrpcent) */
 struct rpcent *getrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -141,7 +128,6 @@ struct rpcent *getrpcent(void)
 }
 libc_hidden_def(getrpcent)
 
-/* libc_hidden_proto(getrpcbynumber) */
 struct rpcent *getrpcbynumber(register int number)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -159,7 +145,6 @@ struct rpcent *getrpcbynumber(register int number)
 }
 libc_hidden_def(getrpcbynumber)
 
-/* libc_hidden_proto(getrpcbyname) */
 struct rpcent *getrpcbyname(const char *name)
 {
 	struct rpcent *rpc;
diff --git a/libc/inet/rpc/getrpcport.c b/libc/inet/rpc/getrpcport.c
index d831e6719..9c4f443e4 100644
--- a/libc/inet/rpc/getrpcport.c
+++ b/libc/inet/rpc/getrpcport.c
@@ -48,9 +48,6 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(pmap_getport) */
-/* libc_hidden_proto(gethostbyname_r) */
 
 int
 getrpcport (const char *host, u_long prognum, u_long versnum, u_int proto)
diff --git a/libc/inet/rpc/pm_getmaps.c b/libc/inet/rpc/pm_getmaps.c
index bcdbbf4e0..e7b97e631 100644
--- a/libc/inet/rpc/pm_getmaps.c
+++ b/libc/inet/rpc/pm_getmaps.c
@@ -48,11 +48,6 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(clnt_perror) */
-/* libc_hidden_proto(clnttcp_create) */
-/* libc_hidden_proto(xdr_pmap) */
-/* libc_hidden_proto(xdr_pmaplist) */
-/* libc_hidden_proto(xdr_void) */
 
 /*
  * Get a copy of the current port maps.
diff --git a/libc/inet/rpc/pm_getport.c b/libc/inet/rpc/pm_getport.c
index fa9780c22..712ba2a8e 100644
--- a/libc/inet/rpc/pm_getport.c
+++ b/libc/inet/rpc/pm_getport.c
@@ -44,10 +44,6 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-/* libc_hidden_proto(clntudp_bufcreate) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
-/* libc_hidden_proto(xdr_u_short) */
-/* libc_hidden_proto(xdr_pmap) */
 
 static const struct timeval timeout =
 {5, 0};
@@ -59,7 +55,6 @@ static const struct timeval tottimeout =
  * Calls the pmap service remotely to do the lookup.
  * Returns 0 if no map exists.
  */
-/* libc_hidden_proto(pmap_getport) */
 u_short
 pmap_getport (address, program, version, protocol)
      struct sockaddr_in *address;
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index 948d9dc2e..c35a2e97f 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -48,15 +48,6 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(clnt_perror) */
-/* libc_hidden_proto(clntudp_bufcreate) */
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * Same as get_myaddress, but we try to use the loopback
@@ -122,7 +113,6 @@ static const struct timeval tottimeout = {60, 0};
  * Set a mapping between program,version and port.
  * Calls the pmap service remotely to do the mapping.
  */
-/* libc_hidden_proto(pmap_set) */
 bool_t
 pmap_set (u_long program, u_long version, int protocol, u_short port)
 {
@@ -159,7 +149,6 @@ libc_hidden_def (pmap_set)
  * Remove the mapping between program,version and port.
  * Calls the pmap service remotely to do the un-mapping.
  */
-/* libc_hidden_proto(pmap_unset) */
 bool_t
 pmap_unset (u_long program, u_long version)
 {
diff --git a/libc/inet/rpc/pmap_prot.c b/libc/inet/rpc/pmap_prot.c
index a5c4d166b..c2081f9cf 100644
--- a/libc/inet/rpc/pmap_prot.c
+++ b/libc/inet/rpc/pmap_prot.c
@@ -42,9 +42,7 @@ static char sccsid[] = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-/* libc_hidden_proto(xdr_u_long) */
 
-/* libc_hidden_proto(xdr_pmap) */
 bool_t
 xdr_pmap (xdrs, regs)
      XDR *xdrs;
diff --git a/libc/inet/rpc/pmap_prot2.c b/libc/inet/rpc/pmap_prot2.c
index 21def3c4f..5492fc13e 100644
--- a/libc/inet/rpc/pmap_prot2.c
+++ b/libc/inet/rpc/pmap_prot2.c
@@ -42,9 +42,6 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
 
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(xdr_reference) */
-/* libc_hidden_proto(xdr_pmap) */
 
 /*
  * What is going on with linked lists? (!)
@@ -84,7 +81,6 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
  * the net, yet is the data that the pointer points to which is interesting;
  * this sounds like a job for xdr_reference!
  */
-/* libc_hidden_proto(xdr_pmaplist) */
 bool_t
 xdr_pmaplist (xdrs, rp)
      XDR *xdrs;
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index a1f8f71a8..d6e8fcf85 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -59,28 +59,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #include <arpa/inet.h>
 #define MAX_BROADCAST_SIZE 1400
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(ioctl) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(authunix_create_default) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xdr_reference) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_void) */
-/* libc_hidden_proto(xdr_rmtcallres) */
-/* libc_hidden_proto(xdr_rmtcall_args) */
-/* libc_hidden_proto(inet_makeaddr) */
-/* libc_hidden_proto(inet_netof) */
-/* libc_hidden_proto(clntudp_create) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(fprintf) */
 
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index 17af69ee5..f34e92db6 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -87,59 +87,10 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif
 #include <sys/uio.h>
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(memmove) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(fcntl) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(lstat) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(tolower) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(getline) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(seteuid) */
-/* libc_hidden_proto(getpwnam_r) */
-/* libc_hidden_proto(gethostbyname) */
-/* libc_hidden_proto(gethostbyname_r) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(sleep) */
-/* libc_hidden_proto(inet_addr) */
-/* libc_hidden_proto(inet_ntoa) */
-/* libc_hidden_proto(herror) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(sigblock) */
-/* libc_hidden_proto(snprintf) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(sigsetmask) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__h_errno_location) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
-/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
 
-/* libc_hidden_proto(rresvport) */
 
 /* some forward declarations */
 static int __ivaliduser2(FILE *hostf, u_int32_t raddr,
diff --git a/libc/inet/rpc/rpc_cmsg.c b/libc/inet/rpc/rpc_cmsg.c
index 0d8aac627..a8c257344 100644
--- a/libc/inet/rpc/rpc_cmsg.c
+++ b/libc/inet/rpc/rpc_cmsg.c
@@ -45,17 +45,10 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/param.h>
 #include <rpc/rpc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(xdr_enum) */
-/* libc_hidden_proto(xdr_opaque) */
-/* libc_hidden_proto(xdr_u_int) */
-/* libc_hidden_proto(xdr_u_long) */
-/* libc_hidden_proto(xdr_opaque_auth) */
 
 /*
  * XDR a call message
  */
-/* libc_hidden_proto(xdr_callmsg) */
 bool_t
 xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
 {
diff --git a/libc/inet/rpc/rpc_dtablesize.c b/libc/inet/rpc/rpc_dtablesize.c
index fe3d4a39f..692e8fce7 100644
--- a/libc/inet/rpc/rpc_dtablesize.c
+++ b/libc/inet/rpc/rpc_dtablesize.c
@@ -38,13 +38,11 @@ static char sccsid[] = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
 #include <unistd.h>
 #include <rpc/clnt.h>
 
-/* libc_hidden_proto(getdtablesize) */
 
 /*
  * Cache the result of getdtablesize(), so we don't have to do an
  * expensive system call every time.
  */
-/* libc_hidden_proto(_rpc_dtablesize) */
 int
 _rpc_dtablesize(void)
 {
diff --git a/libc/inet/rpc/rpc_private.h b/libc/inet/rpc/rpc_private.h
index 24112a468..ede3ddfc0 100644
--- a/libc/inet/rpc/rpc_private.h
+++ b/libc/inet/rpc/rpc_private.h
@@ -4,7 +4,6 @@
 /* Now define the internal interfaces.  */
 extern u_long _create_xid (void) attribute_hidden;
 
-/* libc_hidden_proto(__rpc_thread_createerr) */
 
 /*
  * Multi-threaded support
diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c
index ddfabe035..2b1609ea9 100644
--- a/libc/inet/rpc/rpc_prot.c
+++ b/libc/inet/rpc/rpc_prot.c
@@ -51,11 +51,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
 
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(xdr_bytes) */
-/* libc_hidden_proto(xdr_union) */
-/* libc_hidden_proto(xdr_enum) */
-/* libc_hidden_proto(xdr_opaque) */
-/* libc_hidden_proto(xdr_u_long) */
 
 /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
 
@@ -63,7 +58,6 @@ static char sccsid[] = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
  * XDR an opaque authentication struct
  * (see auth.h)
  */
-/* libc_hidden_proto(xdr_opaque_auth) */
 bool_t
 xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
 {
@@ -89,7 +83,6 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
 /*
  * XDR the MSG_ACCEPTED part of a reply message union
  */
-/* libc_hidden_proto(xdr_accepted_reply) */
 bool_t
 xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
 {
@@ -116,7 +109,6 @@ libc_hidden_def(xdr_accepted_reply)
 /*
  * XDR the MSG_DENIED part of a reply message union
  */
-/* libc_hidden_proto(xdr_rejected_reply) */
 bool_t
 xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
 {
@@ -146,7 +138,6 @@ static const struct xdr_discrim reply_dscrm[3] =
 /*
  * XDR a reply message
  */
-/* libc_hidden_proto(xdr_replymsg) */
 bool_t
 xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg)
 {
@@ -166,7 +157,6 @@ libc_hidden_def(xdr_replymsg)
  * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers.
  * The rm_xid is not really static, but the user can easily munge on the fly.
  */
-/* libc_hidden_proto(xdr_callhdr) */
 bool_t
 xdr_callhdr (XDR *xdrs, struct rpc_msg *cmsg)
 {
@@ -247,7 +237,6 @@ rejected (enum reject_stat rjct_stat,
 /*
  * given a reply message, fills in the error
  */
-/* libc_hidden_proto(_seterr_reply) */
 void
 _seterr_reply (struct rpc_msg *msg,
 	       struct rpc_err *error)
diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c
index 0e0078c2c..54781d040 100644
--- a/libc/inet/rpc/rpc_thread.c
+++ b/libc/inet/rpc/rpc_thread.c
@@ -10,10 +10,6 @@
 #include <assert.h>
 #include "rpc_private.h"
 
-/* libc_hidden_proto(__rpc_thread_svc_fdset) */
-/* libc_hidden_proto(__rpc_thread_createerr) */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index 08bdf9396..f9f1d9e9d 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -58,14 +58,6 @@ static char sccsid[] = "@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
 #include <errno.h>
 #include <netinet/in.h>
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(connect) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(rtime) */
 
 #define NYEARS	(u_long)(1970 - 1900)
 #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 3b0dc924a..c422a0510 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -42,27 +42,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
-/* Experimentally off - libc_hidden_proto(strncasecmp) */
-/* libc_hidden_proto(getenv) */
-/* libc_hidden_proto(printf) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(__fsetlocking) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(gethostname) */
-/* libc_hidden_proto(fileno) */
-/* libc_hidden_proto(fopen) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #define _(X)  (X)
 /* #include "ftp_var.h" */
@@ -114,7 +93,6 @@ static const struct toktab {
 
 /* ruserpass - remote password check.
    This function also exists in glibc but is undocumented */
-/* libc_hidden_proto(ruserpass) */
 int ruserpass(const char *host, const char **aname, const char **apass)
 {
 	char *hdir, *buf, *tmp;
diff --git a/libc/inet/rpc/svc.c b/libc/inet/rpc/svc.c
index 38811f5b7..0f5300c8b 100644
--- a/libc/inet/rpc/svc.c
+++ b/libc/inet/rpc/svc.c
@@ -46,16 +46,8 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/poll.h>
 
-/* Experimentally off - libc_hidden_proto(ffs) */
-/* libc_hidden_proto(pmap_set) */
-/* libc_hidden_proto(pmap_unset) */
-/* libc_hidden_proto(_authenticate) */
-/* libc_hidden_proto(_rpc_dtablesize) */
 /* used by svc_[max_]pollfd */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 /* used by svc_fdset */
-/* libc_hidden_proto(__rpc_thread_svc_fdset) */
 
 #ifdef __UCLIBC_HAS_THREADS__
 #define xports (*(SVCXPRT ***)&RPC_THREAD_VARIABLE(svc_xports_s))
@@ -85,7 +77,6 @@ static struct svc_callout *svc_head;
 /* ***************  SVCXPRT related stuff **************** */
 
 /* Activate a transport handle. */
-/* libc_hidden_proto(xprt_register) */
 void
 xprt_register (SVCXPRT *xprt)
 {
@@ -129,7 +120,6 @@ xprt_register (SVCXPRT *xprt)
 libc_hidden_def(xprt_register)
 
 /* De-activate a transport handle. */
-/* libc_hidden_proto(xprt_unregister) */
 void
 xprt_unregister (SVCXPRT *xprt)
 {
@@ -175,7 +165,6 @@ done:
 /* Add a service program to the callout list.
    The dispatch routine will be called when a rpc request for this
    program number comes in. */
-/* libc_hidden_proto(svc_register) */
 bool_t
 svc_register (SVCXPRT * xprt, rpcprog_t prog, rpcvers_t vers,
 	      void (*dispatch) (struct svc_req *, SVCXPRT *),
@@ -210,7 +199,6 @@ pmap_it:
 libc_hidden_def(svc_register)
 
 /* Remove a service program from the callout list. */
-/* libc_hidden_proto(svc_unregister) */
 void
 svc_unregister (rpcprog_t prog, rpcvers_t vers)
 {
@@ -235,7 +223,6 @@ libc_hidden_def(svc_unregister)
 /* ******************* REPLY GENERATION ROUTINES  ************ */
 
 /* Send a reply to an rpc request */
-/* libc_hidden_proto(svc_sendreply) */
 bool_t
 svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
 	       caddr_t xdr_location)
@@ -266,7 +253,6 @@ svcerr_noproc (register SVCXPRT *xprt)
 }
 
 /* Can't decode args error reply */
-/* libc_hidden_proto(svcerr_decode) */
 void
 svcerr_decode (register SVCXPRT *xprt)
 {
@@ -294,7 +280,6 @@ svcerr_systemerr (register SVCXPRT *xprt)
 }
 
 /* Authentication error reply */
-/* libc_hidden_proto(svcerr_auth) */
 void
 svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
 {
@@ -316,7 +301,6 @@ svcerr_weakauth (SVCXPRT *xprt)
 }
 
 /* Program unavailable error reply */
-/* libc_hidden_proto(svcerr_noprog) */
 void
 svcerr_noprog (register SVCXPRT *xprt)
 {
@@ -331,7 +315,6 @@ svcerr_noprog (register SVCXPRT *xprt)
 libc_hidden_def(svcerr_noprog)
 
 /* Program version mismatch error reply */
-/* libc_hidden_proto(svcerr_progvers) */
 void
 svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
 		 rpcvers_t high_vers)
@@ -366,7 +349,6 @@ libc_hidden_def(svcerr_progvers)
  * is mallocated in kernel land.
  */
 
-/* libc_hidden_proto(svc_getreq_common) */
 void
 svc_getreq_common (const int fd)
 {
@@ -458,7 +440,6 @@ svc_getreq_common (const int fd)
 }
 libc_hidden_def(svc_getreq_common)
 
-/* libc_hidden_proto(svc_getreqset) */
 void
 svc_getreqset (fd_set *readfds)
 {
@@ -476,7 +457,6 @@ svc_getreqset (fd_set *readfds)
 }
 libc_hidden_def(svc_getreqset)
 
-/* libc_hidden_proto(svc_getreq) */
 void
 svc_getreq (int rdfds)
 {
@@ -488,7 +468,6 @@ svc_getreq (int rdfds)
 }
 libc_hidden_def(svc_getreq)
 
-/* libc_hidden_proto(svc_getreq_poll) */
 void
 svc_getreq_poll (struct pollfd *pfdp, int pollretval)
 {
diff --git a/libc/inet/rpc/svc_auth.c b/libc/inet/rpc/svc_auth.c
index 52208c1ee..ae02a44ba 100644
--- a/libc/inet/rpc/svc_auth.c
+++ b/libc/inet/rpc/svc_auth.c
@@ -101,7 +101,6 @@ svcauthsw[] =
  * There is an assumption that any flavour less than AUTH_NULL is
  * invalid.
  */
-/* libc_hidden_proto(_authenticate) */
 enum auth_stat
 _authenticate (register struct svc_req *rqst, struct rpc_msg *msg)
 {
diff --git a/libc/inet/rpc/svc_authux.c b/libc/inet/rpc/svc_authux.c
index 556cdde30..03ec4d3b8 100644
--- a/libc/inet/rpc/svc_authux.c
+++ b/libc/inet/rpc/svc_authux.c
@@ -46,10 +46,6 @@
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(printf) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_authunix_parms) */
 
 /*
  * Unix longhand authenticator
diff --git a/libc/inet/rpc/svc_raw.c b/libc/inet/rpc/svc_raw.c
index 075fbad95..1fadb3075 100644
--- a/libc/inet/rpc/svc_raw.c
+++ b/libc/inet/rpc/svc_raw.c
@@ -45,9 +45,6 @@ static char sccsid[] = "@(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";
 #include "rpc_private.h"
 #include <rpc/svc.h>
 
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
 
 /*
  * This is the "network" that we will be moving data over
diff --git a/libc/inet/rpc/svc_run.c b/libc/inet/rpc/svc_run.c
index 49d52d01b..1442cba55 100644
--- a/libc/inet/rpc/svc_run.c
+++ b/libc/inet/rpc/svc_run.c
@@ -39,12 +39,7 @@
 #include <sys/poll.h>
 #include <rpc/rpc.h>
 
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(svc_getreq_poll) */
-/* libc_hidden_proto(poll) */
 /* used by svc_[max_]pollfd */
-/* libc_hidden_proto(__rpc_thread_svc_pollfd) */
-/* libc_hidden_proto(__rpc_thread_svc_max_pollfd) */
 
 /* This function can be used as a signal handler to terminate the
    server loop.  */
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index d50f014a8..dceb6acb7 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -55,18 +55,6 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(asprintf) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(svc_sendreply) */
-/* libc_hidden_proto(svc_register) */
-/* libc_hidden_proto(svcerr_decode) */
-/* libc_hidden_proto(svcudp_create) */
-/* libc_hidden_proto(pmap_unset) */
-/* libc_hidden_proto(xdr_void) */
 
 struct proglst_
   {
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 0e5c5c727..363f20315 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -59,30 +59,6 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdrrec_eof) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for TCP/IP based rpc service handle
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 866e5275a..af0dc9a5a 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -57,30 +57,8 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(xdrmem_create) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(bindresvport) */
-/* libc_hidden_proto(recvfrom) */
-/* libc_hidden_proto(sendto) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(fprintf) */
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX
@@ -134,7 +112,6 @@ struct svcudp_data
  * see (svc.h, xprt_register).
  * The routines returns NULL if a problem occurred.
  */
-/* libc_hidden_proto(svcudp_bufcreate) */
 SVCXPRT *
 svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 {
@@ -226,7 +203,6 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
 }
 libc_hidden_def(svcudp_bufcreate)
 
-/* libc_hidden_proto(svcudp_create) */
 SVCXPRT *
 svcudp_create (int sock)
 {
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 3670bb1ec..61859773d 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -55,33 +55,6 @@
 # include <wchar.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(socket) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(perror) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(xdrrec_create) */
-/* libc_hidden_proto(xdrrec_endofrecord) */
-/* libc_hidden_proto(xdrrec_skiprecord) */
-/* libc_hidden_proto(xdrrec_eof) */
-/* libc_hidden_proto(xdr_callmsg) */
-/* libc_hidden_proto(xdr_replymsg) */
-/* libc_hidden_proto(xprt_register) */
-/* libc_hidden_proto(xprt_unregister) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(getsockname) */
-/* libc_hidden_proto(setsockopt) */
-/* libc_hidden_proto(bind) */
-/* libc_hidden_proto(recvmsg) */
-/* libc_hidden_proto(sendmsg) */
-/* libc_hidden_proto(poll) */
-/* libc_hidden_proto(accept) */
-/* libc_hidden_proto(listen) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for AF_UNIX based rpc service handle
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index f76cc6a88..78f4d04ba 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -53,11 +53,8 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fputs) */
 
 /*
  * constants specific to the xdr "protocol"
@@ -87,7 +84,6 @@ xdr_free (xdrproc_t proc, char *objp)
 /*
  * XDR nothing
  */
-/* libc_hidden_proto(xdr_void) */
 bool_t
 xdr_void (void)
 {
@@ -100,7 +96,6 @@ libc_hidden_def(xdr_void)
  * The definition of xdr_long() is kept for backward
  * compatibility. Instead xdr_int() should be used.
  */
-/* libc_hidden_proto(xdr_long) */
 bool_t
 xdr_long (XDR *xdrs, long *lp)
 {
@@ -122,7 +117,6 @@ libc_hidden_def(xdr_long)
 /*
  * XDR short integers
  */
-/* libc_hidden_proto(xdr_short) */
 bool_t
 xdr_short (XDR *xdrs, short *sp)
 {
@@ -152,7 +146,6 @@ libc_hidden_def(xdr_short)
 /*
  * XDR integers
  */
-/* libc_hidden_proto(xdr_int) */
 bool_t
 xdr_int (XDR *xdrs, int *ip)
 {
@@ -191,7 +184,6 @@ libc_hidden_def(xdr_int)
  * The definition of xdr_u_long() is kept for backward
  * compatibility. Instead xdr_u_int() should be used.
  */
-/* libc_hidden_proto(xdr_u_long) */
 bool_t
 xdr_u_long (XDR *xdrs, u_long *ulp)
 {
@@ -225,7 +217,6 @@ libc_hidden_def(xdr_u_long)
 /*
  * XDR unsigned integers
  */
-/* libc_hidden_proto(xdr_u_int) */
 bool_t
 xdr_u_int (XDR *xdrs, u_int *up)
 {
@@ -262,7 +253,6 @@ libc_hidden_def(xdr_u_int)
  * XDR hyper integers
  * same as xdr_u_hyper - open coded to save a proc call!
  */
-/* libc_hidden_proto(xdr_hyper) */
 bool_t
 xdr_hyper (XDR *xdrs, quad_t *llp)
 {
@@ -298,7 +288,6 @@ libc_hidden_def(xdr_hyper)
  * XDR hyper integers
  * same as xdr_hyper - open coded to save a proc call!
  */
-/* libc_hidden_proto(xdr_u_hyper) */
 bool_t
 xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
 {
@@ -343,7 +332,6 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
 /*
  * XDR unsigned short integers
  */
-/* libc_hidden_proto(xdr_u_short) */
 bool_t
 xdr_u_short (XDR *xdrs, u_short *usp)
 {
@@ -408,7 +396,6 @@ xdr_u_char (XDR *xdrs, u_char *cp)
 /*
  * XDR booleans
  */
-/* libc_hidden_proto(xdr_bool) */
 bool_t
 xdr_bool (XDR *xdrs, bool_t *bp)
 {
@@ -438,7 +425,6 @@ libc_hidden_def(xdr_bool)
 /*
  * XDR enumerations
  */
-/* libc_hidden_proto(xdr_enum) */
 bool_t
 xdr_enum (XDR *xdrs, enum_t *ep)
 {
@@ -492,7 +478,6 @@ libc_hidden_def(xdr_enum)
  * Allows the specification of a fixed size sequence of opaque bytes.
  * cp points to the opaque object and cnt gives the byte length.
  */
-/* libc_hidden_proto(xdr_opaque) */
 bool_t
 xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
 {
@@ -544,7 +529,6 @@ libc_hidden_def(xdr_opaque)
  * *cpp is a pointer to the bytes, *sizep is the count.
  * If *cpp is NULL maxsize bytes are allocated
  */
-/* libc_hidden_proto(xdr_bytes) */
 bool_t
 xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
 {
@@ -628,7 +612,6 @@ xdr_netobj (xdrs, np)
  * routine may be called.
  * If there is no specific or default routine an error is returned.
  */
-/* libc_hidden_proto(xdr_union) */
 bool_t
 xdr_union (XDR *xdrs, enum_t *dscmp, char *unp, const struct xdr_discrim *choices, xdrproc_t dfault)
 {
@@ -675,7 +658,6 @@ libc_hidden_def(xdr_union)
  * storage is allocated.  The last parameter is the max allowed length
  * of the string as specified by a protocol.
  */
-/* libc_hidden_proto(xdr_string) */
 bool_t
 xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
 {
diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c
index ec5c0b367..bb3e51e33 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -51,12 +51,8 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(xdr_u_int) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -68,7 +64,6 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
  * elsize is the size (in bytes) of each element, and elproc is the
  * xdr procedure to call to handle each element of the array.
  */
-/* libc_hidden_proto(xdr_array) */
 bool_t
 xdr_array (XDR *xdrs, caddr_t *addrp, u_int *sizep, u_int maxsize, u_int elsize, xdrproc_t elproc)
 {
diff --git a/libc/inet/rpc/xdr_mem.c b/libc/inet/rpc/xdr_mem.c
index 451751e45..9892dd936 100644
--- a/libc/inet/rpc/xdr_mem.c
+++ b/libc/inet/rpc/xdr_mem.c
@@ -43,7 +43,6 @@
 #include <limits.h>
 #include <rpc/rpc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static bool_t xdrmem_getlong (XDR *, long *);
 static bool_t xdrmem_putlong (XDR *, const long *);
@@ -74,7 +73,6 @@ static const struct xdr_ops xdrmem_ops =
  * The procedure xdrmem_create initializes a stream descriptor for a
  * memory buffer.
  */
-/* libc_hidden_proto(xdrmem_create) */
 void
 xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
 {
diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c
index b010ab446..1e02e7f44 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -57,12 +57,8 @@
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fputs) */
-/* libc_hidden_proto(lseek) */
 
 static bool_t xdrrec_getbytes (XDR *, caddr_t, u_int);
 static bool_t xdrrec_putbytes (XDR *, const char *, u_int);
@@ -153,7 +149,6 @@ static bool_t get_input_bytes (RECSTREAM *, caddr_t, int) internal_function;
  * write respectively.   They are like the system
  * calls expect that they take an opaque handle rather than an fd.
  */
-/* libc_hidden_proto(xdrrec_create) */
 void
 xdrrec_create (XDR *xdrs, u_int sendsize,
 	       u_int recvsize, caddr_t tcp_handle,
@@ -460,7 +455,6 @@ xdrrec_destroy (XDR *xdrs)
  * Before reading (deserializing from the stream, one should always call
  * this procedure to guarantee proper record alignment.
  */
-/* libc_hidden_proto(xdrrec_skiprecord) */
 bool_t
 xdrrec_skiprecord (XDR *xdrs)
 {
@@ -484,7 +478,6 @@ libc_hidden_def(xdrrec_skiprecord)
  * Returns TRUE iff there is no more input in the buffer
  * after consuming the rest of the current record.
  */
-/* libc_hidden_proto(xdrrec_eof) */
 bool_t
 xdrrec_eof (XDR *xdrs)
 {
@@ -510,7 +503,6 @@ libc_hidden_def(xdrrec_eof)
  * (output) tcp stream.  (This lets the package support batched or
  * pipelined procedure calls.)  TRUE => immediate flush to tcp connection.
  */
-/* libc_hidden_proto(xdrrec_endofrecord) */
 bool_t
 xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
 {
diff --git a/libc/inet/rpc/xdr_reference.c b/libc/inet/rpc/xdr_reference.c
index 9cdeed129..937b0ccb3 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -52,12 +52,8 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-/* libc_hidden_proto(fwprintf) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(xdr_bool) */
-/* libc_hidden_proto(fputs) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -70,7 +66,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
  * size is the size of the referneced structure.
  * proc is the routine to handle the referenced structure.
  */
-/* libc_hidden_proto(xdr_reference) */
 bool_t
 xdr_reference (XDR *xdrs, caddr_t *pp, u_int size, xdrproc_t proc)
 {
diff --git a/libc/inet/rpc/xdr_stdio.c b/libc/inet/rpc/xdr_stdio.c
index 91ce8b828..a087c9c6a 100644
--- a/libc/inet/rpc/xdr_stdio.c
+++ b/libc/inet/rpc/xdr_stdio.c
@@ -49,11 +49,6 @@
 # define fwrite(p, m, n, s) _IO_fwrite (p, m, n, s)
 #endif
 
-/* libc_hidden_proto(fread) */
-/* libc_hidden_proto(fwrite) */
-/* libc_hidden_proto(fseek) */
-/* libc_hidden_proto(fflush) */
-/* libc_hidden_proto(ftell) */
 
 static bool_t xdrstdio_getlong (XDR *, long *);
 static bool_t xdrstdio_putlong (XDR *, const long *);
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index c88f239b8..8bb09cabb 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -57,7 +57,6 @@ strong_alias(accept,__libc_accept)
 #endif
 
 #ifdef L_bind
-/* libc_hidden_proto(bind) */
 #ifdef __NR_bind
 _syscall3(int, bind, int, sockfd, const struct sockaddr *, myaddr, socklen_t, addrlen)
 #elif defined(__NR_socketcall)
@@ -113,7 +112,6 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t * paddrlen)
 #endif
 
 #ifdef L_getsockname
-/* libc_hidden_proto(getsockname) */
 #ifdef __NR_getsockname
 _syscall3(int, getsockname, int, sockfd, struct sockaddr *, addr, socklen_t *,paddrlen)
 #elif defined(__NR_socketcall)
@@ -150,7 +148,6 @@ int getsockopt(int fd, int level, int optname, __ptr_t optval,
 #endif
 
 #ifdef L_listen
-/* libc_hidden_proto(listen) */
 #ifdef __NR_listen
 _syscall2(int, listen, int, sockfd, int, backlog)
 #elif defined(__NR_socketcall)
@@ -326,7 +323,6 @@ strong_alias(sendto,__libc_sendto)
 #endif
 
 #ifdef L_setsockopt
-/* libc_hidden_proto(setsockopt) */
 #ifdef __NR_setsockopt
 _syscall5(int, setsockopt, int, fd, int, level, int, optname, const void *, optval, socklen_t, optlen)
 #elif defined(__NR_socketcall)
@@ -364,7 +360,6 @@ int shutdown(int sockfd, int how)
 #endif
 
 #ifdef L_socket
-/* libc_hidden_proto(socket) */
 #ifdef __NR_socket
 _syscall3(int, socket, int, family, int, type, int, protocol)
 #elif defined(__NR_socketcall)