diff -d -urpN uClibc.4/libc/inet/addr.c uClibc.5/libc/inet/addr.c
--- uClibc.4/libc/inet/addr.c	2008-02-12 15:43:54.000000000 +0100
+++ uClibc.5/libc/inet/addr.c	2008-04-10 13:41:21.000000000 +0200
@@ -122,8 +122,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)
+extern char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN]) attribute_hidden;
+/* libc_hidden_proto(inet_ntoa_r) - not exported to libc users yet */
 char *inet_ntoa_r(struct in_addr in, char buf[INET_NTOA_MAX_LEN])
 {
 	in_addr_t addr = ntohl(in.s_addr);
@@ -143,7 +143,7 @@ char *inet_ntoa_r(struct in_addr in, cha
 
 	return p+1;
 }
-libc_hidden_def(inet_ntoa_r)
+/* libc_hidden_def(inet_ntoa_r) - not exported to libc users yet */
 
 libc_hidden_proto(inet_ntoa)
 char *inet_ntoa(struct in_addr in)
diff -d -urpN uClibc.4/libc/inet/rpc/rexec.c uClibc.5/libc/inet/rpc/rexec.c
--- uClibc.4/libc/inet/rpc/rexec.c	2008-02-12 15:43:53.000000000 +0100
+++ uClibc.5/libc/inet/rpc/rexec.c	2008-04-10 13:46:14.000000000 +0200
@@ -67,8 +67,8 @@ extern int __libc_sa_len (sa_family_t __
 
 int	rexecoptions;
 char	ahostbuf[NI_MAXHOST] attribute_hidden;
+/* FIXME: should be in a .h file */
 extern int ruserpass(const char *host, const char **aname, const char **apass) attribute_hidden;
-libc_hidden_proto(ruserpass)
 
 libc_hidden_proto(rexec_af)
 int
diff -d -urpN uClibc.4/libc/inet/rpc/rpc_prot.c uClibc.5/libc/inet/rpc/rpc_prot.c
--- uClibc.4/libc/inet/rpc/rpc_prot.c	2008-02-12 15:43:53.000000000 +0100
+++ uClibc.5/libc/inet/rpc/rpc_prot.c	2008-04-10 13:47:44.000000000 +0200
@@ -89,8 +89,7 @@ xdr_des_block (XDR *xdrs, des_block *blk
 /*
  * XDR the MSG_ACCEPTED part of a reply message union
  */
-extern bool_t xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar);
-libc_hidden_proto(xdr_accepted_reply)
+extern bool_t xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar) attribute_hidden;
 bool_t
 xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
 {
@@ -112,13 +111,11 @@ xdr_accepted_reply (XDR *xdrs, struct ac
     }
   return TRUE;		/* TRUE => open ended set of problems */
 }
-libc_hidden_def(xdr_accepted_reply)
 
 /*
  * XDR the MSG_DENIED part of a reply message union
  */
-extern bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr);
-libc_hidden_proto(xdr_rejected_reply)
+extern bool_t xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr) attribute_hidden;
 bool_t
 xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
 {
@@ -137,7 +134,6 @@ xdr_rejected_reply (XDR *xdrs, struct re
     }
   return FALSE;
 }
-libc_hidden_def(xdr_rejected_reply)
 
 static const struct xdr_discrim reply_dscrm[3] =
 {
diff -d -urpN uClibc.4/libc/inet/rpc/ruserpass.c uClibc.5/libc/inet/rpc/ruserpass.c
--- uClibc.4/libc/inet/rpc/ruserpass.c	2008-02-12 20:29:29.000000000 +0100
+++ uClibc.5/libc/inet/rpc/ruserpass.c	2008-04-10 13:46:25.000000000 +0200
@@ -115,9 +115,8 @@ static const struct toktab {
 };
 
 
-
-extern int ruserpass(const char *host, const char **aname, const char **apass);
-libc_hidden_proto(ruserpass)
+/* FIXME: should be in a .h file */
+extern int ruserpass(const char *host, const char **aname, const char **apass) attribute_hidden;
 int ruserpass(const char *host, const char **aname, const char **apass)
 {
 	char *hdir, *buf, *tmp;
@@ -311,7 +310,6 @@ bad:
 	(void) fclose(cfile);
 	return (-1);
 }
-libc_hidden_def(ruserpass)
 
 static int
 token()
diff -d -urpN uClibc.4/libc/misc/time/time.c uClibc.5/libc/misc/time/time.c
--- uClibc.4/libc/misc/time/time.c	2008-02-12 15:44:08.000000000 +0100
+++ uClibc.5/libc/misc/time/time.c	2008-04-10 13:37:29.000000000 +0200
@@ -202,8 +202,7 @@ libc_hidden_proto(__ctype_b)
     ((defined(L_strftime) || defined(L_strftime_l)) && \
     defined(__UCLIBC_HAS_XLOCALE__))
 
-void _time_tzset(int use_old_rules);
-libc_hidden_proto(_time_tzset)
+void _time_tzset(int use_old_rules) attribute_hidden;
 
 #ifndef L__time_mktime