make DODEBUG=y happy, update sysdeps/common/* copyright

37 files changed, 114 insertions, 107 deletions

diff --git a/libc/inet/addr.c b/libc/inet/addr.c
index 7c73e2a88..538d9fb8e 100644
--- a/libc/inet/addr.c
+++ b/libc/inet/addr.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
 #ifdef L_inet_aton
@@ -42,6 +43,7 @@
  * leading 0   -> octal
  * all else    -> decimal
  */
+libc_hidden_proto(inet_aton)
 int inet_aton(const char *cp, struct in_addr *addrptr)
 {
 	in_addr_t addr;
@@ -88,7 +90,6 @@ int inet_aton(const char *cp, struct in_addr *addrptr)
 
 	return 1;
 }
-libc_hidden_proto(inet_aton)
 libc_hidden_def(inet_aton)
 #endif
 
@@ -96,6 +97,7 @@ libc_hidden_def(inet_aton)
 #include <arpa/inet.h>
 libc_hidden_proto(inet_aton)
 
+libc_hidden_proto(inet_addr)
 in_addr_t inet_addr(const char *cp)
 {
 	struct in_addr a;
@@ -105,7 +107,6 @@ in_addr_t inet_addr(const char *cp)
 	else
 		return a.s_addr;
 }
-libc_hidden_proto(inet_addr)
 libc_hidden_def(inet_addr)
 #endif
 
@@ -113,6 +114,8 @@ libc_hidden_def(inet_addr)
 
 #define INET_NTOA_MAX_LEN	16	/* max 12 digits + 3 '.'s + 1 nul */
 
+extern char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN]);
+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);
@@ -132,15 +135,14 @@ char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 
 	return p+1;
 }
-libc_hidden_proto(inet_ntoa_r)
 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];
 	return(inet_ntoa_r(in, buf));
 }
-libc_hidden_proto(inet_ntoa)
 libc_hidden_def(inet_ntoa)
 #endif
 
@@ -153,6 +155,7 @@ 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;
@@ -168,7 +171,6 @@ struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
 	addr = htonl(addr);
 	return (*(struct in_addr *)&addr);
 }
-libc_hidden_proto(inet_makeaddr)
 libc_hidden_def(inet_makeaddr)
 #endif
 
@@ -197,6 +199,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)
 in_addr_t
 inet_netof(struct in_addr in)
 {
@@ -209,6 +212,5 @@ inet_netof(struct in_addr in)
 	else
 	return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
 }
-libc_hidden_proto(inet_netof)
 libc_hidden_def(inet_netof)
 #endif
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 225bc75c6..48cb3a19d 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -785,6 +785,7 @@ static struct gaih gaih[] =
     { PF_UNSPEC, NULL }
 };
 
+libc_hidden_proto(freeaddrinfo)
 void
 freeaddrinfo (struct addrinfo *ai)
 {
@@ -797,9 +798,9 @@ freeaddrinfo (struct addrinfo *ai)
 	free (p);
     }
 }
-libc_hidden_proto(freeaddrinfo)
 libc_hidden_def(freeaddrinfo)
 
+libc_hidden_proto(getaddrinfo)
 int
 getaddrinfo (const char *name, const char *service,
 	     const struct addrinfo *hints, struct addrinfo **pai)
@@ -899,5 +900,4 @@ getaddrinfo (const char *name, const char *service,
 
     return last_i ? -(last_i & GAIH_EAI) : EAI_NONAME;
 }
-libc_hidden_proto(getaddrinfo)
 libc_hidden_def(getaddrinfo)
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 4413811a3..d3fdb988a 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -47,6 +47,7 @@ static char *net_aliases[MAXALIASES];
 
 int _net_stayopen attribute_hidden;
 
+libc_hidden_proto(setnetent)
 void setnetent(int f)
 {
     LOCK;
@@ -58,9 +59,9 @@ void setnetent(int f)
     UNLOCK;
     return;
 }
-libc_hidden_proto(setnetent)
 libc_hidden_def(setnetent)
 
+libc_hidden_proto(endnetent)
 void endnetent(void)
 {
     LOCK;
@@ -71,7 +72,6 @@ void endnetent(void)
     _net_stayopen = 0;
     UNLOCK;
 }
-libc_hidden_proto(endnetent)
 libc_hidden_def(endnetent)
 
 static char * any(register char *cp, char *match)
@@ -87,6 +87,7 @@ static char * any(register char *cp, char *match)
     return ((char *)0);
 }
 
+libc_hidden_proto(getnetent)
 struct netent *getnetent(void)
 {
     char *p;
@@ -146,5 +147,4 @@ again:
     UNLOCK;
     return (&net);
 }
-libc_hidden_proto(getnetent)
 libc_hidden_def(getnetent)
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index e5a11d2c7..0871d17c6 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -97,6 +97,7 @@ static void __initbuf(void)
     }
 }
 
+libc_hidden_proto(setprotoent)
 void setprotoent(int f)
 {
     LOCK;
@@ -107,9 +108,9 @@ void setprotoent(int f)
     proto_stayopen |= f;
     UNLOCK;
 }
-libc_hidden_proto(setprotoent)
 libc_hidden_def(setprotoent)
 
+libc_hidden_proto(endprotoent)
 void endprotoent(void)
 {
     LOCK;
@@ -120,9 +121,9 @@ void endprotoent(void)
     proto_stayopen = 0;
     UNLOCK;
 }
-libc_hidden_proto(endprotoent)
 libc_hidden_def(endprotoent)
 
+libc_hidden_proto(getprotoent_r)
 int getprotoent_r(struct protoent *result_buf,
 		  char *buf, size_t buflen,
 		  struct protoent **result)
@@ -199,7 +200,6 @@ again:
     UNLOCK;
     return 0;
 }
-libc_hidden_proto(getprotoent_r)
 libc_hidden_def(getprotoent_r)
 
 struct protoent * getprotoent(void)
@@ -212,6 +212,7 @@ struct protoent * getprotoent(void)
 }
 
 
+libc_hidden_proto(getprotobyname_r)
 int getprotobyname_r(const char *name,
 		    struct protoent *result_buf,
 		    char *buf, size_t buflen,
@@ -235,7 +236,6 @@ found:
     UNLOCK;
     return *result?0:ret;
 }
-libc_hidden_proto(getprotobyname_r)
 libc_hidden_def(getprotobyname_r)
 
 
@@ -249,6 +249,7 @@ 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,
@@ -266,7 +267,6 @@ int getprotobynumber_r (int proto_num,
     UNLOCK;
     return *result?0:ret;
 }
-libc_hidden_proto(getprotobynumber_r)
 libc_hidden_def(getprotobynumber_r)
 
 struct protoent * getprotobynumber(int proto_num)
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index 254f638f2..9a2df8c12 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -100,6 +100,7 @@ static void __initbuf(void)
     }
 }
 
+libc_hidden_proto(setservent)
 void setservent(int f)
 {
     LOCK;
@@ -110,9 +111,9 @@ void setservent(int f)
     serv_stayopen |= f;
     UNLOCK;
 }
-libc_hidden_proto(setservent)
 libc_hidden_def(setservent)
 
+libc_hidden_proto(endservent)
 void endservent(void)
 {
     LOCK;
@@ -123,9 +124,9 @@ void endservent(void)
     serv_stayopen = 0;
     UNLOCK;
 }
-libc_hidden_proto(endservent)
 libc_hidden_def(endservent)
 
+libc_hidden_proto(getservent_r)
 int getservent_r(struct servent * result_buf,
 		 char * buf, size_t buflen,
 		 struct servent ** result)
@@ -205,7 +206,6 @@ again:
     UNLOCK;
     return 0;
 }
-libc_hidden_proto(getservent_r)
 libc_hidden_def(getservent_r)
 
 struct servent * getservent(void)
@@ -217,6 +217,7 @@ 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)
@@ -242,7 +243,6 @@ gotname:
     UNLOCK;
     return *result?0:ret;
 }
-libc_hidden_proto(getservbyname_r)
 libc_hidden_def(getservbyname_r)
 
 struct servent *getservbyname(const char *name, const char *proto)
@@ -255,6 +255,7 @@ 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)
@@ -274,9 +275,9 @@ int getservbyport_r(int port, const char *proto,
     UNLOCK;
     return *result?0:ret;
 }
-libc_hidden_proto(getservbyport_r)
 libc_hidden_def(getservbyport_r)
 
+libc_hidden_proto(getservbyport)
 struct servent * getservbyport(int port, const char *proto)
 {
     struct servent *result;
@@ -285,5 +286,4 @@ struct servent * getservbyport(int port, const char *proto)
     getservbyport_r(port, proto, &serv, servbuf, SBUFSIZE, &result);
     return result;
 }
-libc_hidden_proto(getservbyport)
 libc_hidden_def(getservbyport)
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index 6efbc2f93..cfcf0e23a 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -38,6 +38,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)
 void herror(const char *s)
 {
 	static const char colon_space[] = ": ";
@@ -54,7 +55,6 @@ void herror(const char *s)
 	}
 	fprintf(stderr, "%s%s%s\n", s, c, p);
 }
-libc_hidden_proto(herror)
 libc_hidden_def(herror)
 
 
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index fd0b901a1..2a687bb89 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -44,6 +44,7 @@ libc_hidden_proto(close)
 
 extern int __opensock(void) attribute_hidden;
 
+libc_hidden_proto(if_nametoindex)
 unsigned int
 if_nametoindex(const char* ifname) 
 {
@@ -71,9 +72,9 @@ if_nametoindex(const char* ifname)
   return ifr.ifr_ifindex;
 #endif
 }
-libc_hidden_proto(if_nametoindex)
 libc_hidden_def(if_nametoindex)
 
+libc_hidden_proto(if_freenameindex)
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
@@ -85,9 +86,9 @@ if_freenameindex (struct if_nameindex *ifn)
     }
   free (ifn);
 }
-libc_hidden_proto(if_freenameindex)
 libc_hidden_def(if_freenameindex)
 
+libc_hidden_proto(if_nameindex)
 #if !__ASSUME_NETLINK_SUPPORT
 struct if_nameindex *
 if_nameindex (void)
@@ -283,7 +284,6 @@ if_nameindex (void)
   return idx;
 }
 #endif
-libc_hidden_proto(if_nameindex)
 libc_hidden_def(if_nameindex)
 
 #if 0
diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c
index 29226c01a..59cf36022 100644
--- a/libc/inet/inet_net.c
+++ b/libc/inet/inet_net.c
@@ -36,12 +36,14 @@
 #include <features.h>
 #include <ctype.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 /*
  * Internet network address interpretation routine.
  * The library routines call this routine to interpret
  * network numbers.
  */
+libc_hidden_proto(inet_network)
 in_addr_t
 inet_network(const char *cp)
 {
@@ -98,5 +100,4 @@ again:
 	}
 	return (val);
 }
-libc_hidden_proto(inet_network)
 libc_hidden_def(inet_network)
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index 16b089f3f..88ff6a150 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -356,6 +356,7 @@ 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)
 {
@@ -372,7 +373,6 @@ inet_ntop(int af, const void *src, char *dst, socklen_t size)
 	}
 	/* NOTREACHED */
 }
-libc_hidden_proto(inet_ntop)
 libc_hidden_def(inet_ntop)
 
 
@@ -387,6 +387,7 @@ libc_hidden_def(inet_ntop)
  * author:
  *	Paul Vixie, 1996.
  */
+libc_hidden_proto(inet_pton)
 int
 inet_pton(int af, const char *src, void *dst)
 {
@@ -403,5 +404,4 @@ inet_pton(int af, const char *src, void *dst)
 	}
 	/* NOTREACHED */
 }
-libc_hidden_proto(inet_pton)
 libc_hidden_def(inet_pton)
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 1e0392059..8be057aeb 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -1740,6 +1740,7 @@ int attribute_hidden __get_hosts_byaddr_r(const char * addr, int len, int type,
 # define min(x,y) (((x) > (y)) ? (y) : (x))
 #endif /* min */
 
+libc_hidden_proto(getnameinfo)
 int getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
 	     socklen_t hostlen, char *serv, socklen_t servlen,
 	     unsigned int flags)
@@ -1926,7 +1927,6 @@ int getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
 	errno = serrno;
 	return 0;
 }
-libc_hidden_proto(getnameinfo)
 libc_hidden_def(getnameinfo)
 #endif
 
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 06f65904a..e69dc2233 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -72,6 +72,7 @@ struct authnone_private_s {
 static struct authnone_private_s *authnone_private;
 #endif
 
+libc_hidden_proto(authnone_create)
 AUTH *
 authnone_create (void)
 {
@@ -101,7 +102,6 @@ authnone_create (void)
     }
   return (&ap->no_client);
 }
-libc_hidden_proto(authnone_create)
 libc_hidden_def(authnone_create)
 
 /*ARGSUSED */
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index dffdc6fad..80b60b56b 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -109,6 +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)
 AUTH *
 authunix_create (char *machname, uid_t uid, gid_t gid, int len,
 		 gid_t *aup_gids)
@@ -175,13 +176,13 @@ no_memory:
   marshal_new_auth (auth);
   return auth;
 }
-libc_hidden_proto(authunix_create)
 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)
 {
@@ -215,7 +216,6 @@ authunix_create_default (void)
     free (gids);
   return ret_auth;
 }
-libc_hidden_proto(authunix_create_default)
 libc_hidden_def(authunix_create_default)
 
 /*
diff --git a/libc/inet/rpc/authunix_prot.c b/libc/inet/rpc/authunix_prot.c
index 1587b5688..ad26f2c1e 100644
--- a/libc/inet/rpc/authunix_prot.c
+++ b/libc/inet/rpc/authunix_prot.c
@@ -49,6 +49,7 @@ libc_hidden_proto(xdr_u_long)
  * 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)
 {
@@ -69,5 +70,4 @@ xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
     }
   return FALSE;
 }
-libc_hidden_proto(xdr_authunix_parms)
 libc_hidden_def(xdr_authunix_parms)
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index 68b44d26a..32055cdf6 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -47,6 +47,7 @@ libc_hidden_proto(getpid)
 /*
  * Bind a socket to a privileged IP port
  */
+libc_hidden_proto(bindresvport)
 int
 bindresvport (int sd, struct sockaddr_in *sin)
 {
@@ -90,5 +91,4 @@ bindresvport (int sd, struct sockaddr_in *sin)
 
   return res;
 }
-libc_hidden_proto(bindresvport)
 libc_hidden_def(bindresvport)
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index c01390598..ef3ed2d30 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -186,6 +186,7 @@ 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)
 {
@@ -200,7 +201,6 @@ clnt_sperrno (enum clnt_stat stat)
     }
   return _("RPC: (unknown error code)");
 }
-libc_hidden_proto(clnt_sperrno)
 libc_hidden_def(clnt_sperrno)
 
 void
@@ -217,6 +217,7 @@ clnt_perrno (enum clnt_stat num)
 /*
  * Print reply error info
  */
+libc_hidden_proto(clnt_sperror)
 char *
 clnt_sperror (CLIENT * rpch, const char *msg)
 {
@@ -300,9 +301,9 @@ clnt_sperror (CLIENT * rpch, const char *msg)
   *++str = '\0';
   return (strstart);
 }
-libc_hidden_proto(clnt_sperror)
 libc_hidden_def(clnt_sperror)
 
+libc_hidden_proto(clnt_perror)
 void
 clnt_perror (CLIENT * rpch, const char *msg)
 {
@@ -313,9 +314,9 @@ clnt_perror (CLIENT * rpch, const char *msg)
 #endif
     (void) fputs (clnt_sperror (rpch, msg), stderr);
 }
-libc_hidden_proto(clnt_perror)
 libc_hidden_def(clnt_perror)
 
+libc_hidden_proto(clnt_spcreateerror)
 char *
 clnt_spcreateerror (const char *msg)
 {
@@ -359,7 +360,6 @@ clnt_spcreateerror (const char *msg)
   *++cp = '\0';
   return str;
 }
-libc_hidden_proto(clnt_spcreateerror)
 libc_hidden_def(clnt_spcreateerror)
 
 void
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 8837062c9..50e5c4cc1 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -140,6 +140,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)
 CLIENT *
 clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
 		int *sockp, u_int sendsz, u_int recvsz)
@@ -257,7 +258,6 @@ fooy:
   mem_free ((caddr_t) h, sizeof (CLIENT));
   return ((CLIENT *) NULL);
 }
-libc_hidden_proto(clnttcp_create)
 libc_hidden_def(clnttcp_create)
 
 static enum clnt_stat
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 8f3cad926..9e3444069 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -144,6 +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)
 CLIENT *
 clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
 		   struct timeval wait, int *sockp, u_int sendsz,
@@ -242,9 +243,9 @@ fooy:
     mem_free ((caddr_t) cl, sizeof (CLIENT));
   return (CLIENT *) NULL;
 }
-libc_hidden_proto(clntudp_bufcreate)
 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)
 {
@@ -252,7 +253,6 @@ clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version, struc
   return clntudp_bufcreate (raddr, program, version, wait, sockp,
 			    UDPMSGSIZE, UDPMSGSIZE);
 }
-libc_hidden_proto(clntudp_create)
 libc_hidden_def(clntudp_create)
 
 static int
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 29944af0f..ee4dba6d0 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -139,6 +139,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)
 CLIENT *
 clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
 		 int *sockp, u_int sendsz, u_int recvsz)
@@ -237,7 +238,6 @@ fooy:
   mem_free ((caddr_t) h, sizeof (CLIENT));
   return (CLIENT *) NULL;
 }
-libc_hidden_proto(clntunix_create)
 libc_hidden_def(clntunix_create)
 
 static enum clnt_stat
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index 83dcc7e78..428fbcc31 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -84,6 +84,7 @@ static struct rpcdata *_rpcdata(void)
 	return d;
 }
 
+libc_hidden_proto(endrpcent)
 void endrpcent(void)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -101,9 +102,9 @@ void endrpcent(void)
 		d->rpcf = NULL;
 	}
 }
-libc_hidden_proto(endrpcent)
 libc_hidden_def(endrpcent)
 
+libc_hidden_proto(setrpcent)
 void setrpcent(int f)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -119,7 +120,6 @@ void setrpcent(int f)
 	d->current = NULL;
 	d->stayopen |= f;
 }
-libc_hidden_proto(setrpcent)
 libc_hidden_def(setrpcent)
 
 static struct rpcent *interpret(struct rpcdata *);
@@ -131,6 +131,7 @@ 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,9 +142,9 @@ struct rpcent *getrpcent(void)
 		return NULL;
 	return __get_next_rpcent(d);
 }
-libc_hidden_proto(getrpcent)
 libc_hidden_def(getrpcent)
 
+libc_hidden_proto(getrpcbynumber)
 struct rpcent *getrpcbynumber(register int number)
 {
 	register struct rpcdata *d = _rpcdata();
@@ -159,9 +160,9 @@ struct rpcent *getrpcbynumber(register int number)
 	endrpcent();
 	return rpc;
 }
-libc_hidden_proto(getrpcbynumber)
 libc_hidden_def(getrpcbynumber)
 
+libc_hidden_proto(getrpcbyname)
 struct rpcent *getrpcbyname(const char *name)
 {
 	struct rpcent *rpc;
@@ -179,7 +180,6 @@ struct rpcent *getrpcbyname(const char *name)
 	endrpcent();
 	return NULL;
 }
-libc_hidden_proto(getrpcbyname)
 libc_hidden_def(getrpcbyname)
 
 #ifdef __linux__
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index 8fe014186..03a1d3321 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -121,6 +121,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)
 bool_t
 pmap_set (u_long program, u_long version, int protocol, u_short port)
 {
@@ -151,13 +152,13 @@ pmap_set (u_long program, u_long version, int protocol, u_short port)
   /* (void)close(socket); CLNT_DESTROY closes it */
   return rslt;
 }
-libc_hidden_proto(pmap_set)
 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)
 {
@@ -182,5 +183,4 @@ pmap_unset (u_long program, u_long version)
   /* (void)close(socket); CLNT_DESTROY already closed it */
   return rslt;
 }
-libc_hidden_proto(pmap_unset)
 libc_hidden_def(pmap_unset)
diff --git a/libc/inet/rpc/pmap_getport.c b/libc/inet/rpc/pmap_getport.c
index c841ee9ef..b5e82924d 100644
--- a/