libc_hidden_proto removal, just a few functions

72 files changed, 81 insertions, 82 deletions

diff --git a/include/locale.h b/include/locale.h
index c708d4435..241e3f057 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -215,6 +215,7 @@ extern void freelocale (__locale_t __dataset) __THROW;
    for all threads and can also be installed any time, meaning
    the thread uses the global settings controlled by `setlocale'.  */
 extern __locale_t uselocale (__locale_t __dataset) __THROW;
+libc_hidden_proto(uselocale)
 
 /* This value can be passed to `uselocale' and may be returned by it.
    Passing this value to any other function has undefined behavior.  */
diff --git a/include/stdlib.h b/include/stdlib.h
index b87dfd921..657167541 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -498,6 +498,7 @@ extern int posix_memalign (void **__memptr, size_t __alignment, size_t __size)
 __BEGIN_NAMESPACE_STD
 /* Abort execution and generate a core-dump.  */
 extern void abort (void) __THROW __attribute__ ((__noreturn__));
+libc_hidden_proto(abort)
 
 
 /* Register a function to be called when `exit' is called.  */
@@ -516,6 +517,7 @@ __BEGIN_NAMESPACE_STD
    in the reverse of the order in which they were registered
    perform stdio cleanup, and terminate program execution with STATUS.  */
 extern void exit (int __status) __THROW __attribute__ ((__noreturn__));
+libc_hidden_proto(exit)
 __END_NAMESPACE_STD
 
 #ifdef __USE_ISOC99
diff --git a/include/time.h b/include/time.h
index f6863ed84..25e00f639 100644
--- a/include/time.h
+++ b/include/time.h
@@ -187,6 +187,7 @@ extern clock_t clock (void) __THROW;
 
 /* Return the current time and put it in *TIMER if TIMER is not NULL.  */
 extern time_t time (time_t *__timer) __THROW;
+libc_hidden_proto(time)
 
 #ifdef __UCLIBC_HAS_FLOATS__
 /* Return the difference between TIME1 and TIME0.  */
@@ -433,13 +434,6 @@ extern int getdate_r (__const char *__restrict __string,
 
 __END_DECLS
 
-
-#ifdef UCLIBC_INTERNAL
-/* Experiment. Grep for 'libc_hidden_proto(time)' if need to revert */
-libc_hidden_proto(time)
-#endif
-
-
 #endif /* <time.h> included.  */
 
 #endif /* <time.h> not already included.  */
diff --git a/include/unistd.h b/include/unistd.h
index f981d2116..bf94fe4fc 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -316,6 +316,7 @@ extern __off64_t lseek64 (int __fd, __off64_t __offset, int __whence)
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int close (int __fd);
+libc_hidden_proto(close)
 
 /* Read NBYTES into BUF from FD.  Return the
    number read, -1 for errors or 0 for EOF.
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 0fe3fdf22..8046f9afe 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -78,7 +78,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(getservbyname_r)
 libc_hidden_proto(gethostbyname2_r)
 libc_hidden_proto(gethostbyaddr_r)
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 863266d48..5e9a075e6 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -28,7 +28,7 @@ libc_hidden_proto(fclose)
 libc_hidden_proto(inet_network)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index a079f6487..f24d03f0d 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -69,7 +69,7 @@ libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
 libc_hidden_proto(fclose)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index bb1d6d2e4..9912fa1df 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -71,7 +71,7 @@ libc_hidden_proto(fclose)
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index 4972dcec2..f16e97131 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -17,7 +17,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(open)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(read)
 libc_hidden_proto(write)
 libc_hidden_proto(getuid)
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 36c6be45c..3badfa55e 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -38,7 +38,7 @@
 /* Experimentally off - libc_hidden_proto(strncpy) */
 /* Experimentally off - libc_hidden_proto(strdup) */
 libc_hidden_proto(ioctl)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 #if __ASSUME_NETLINK_SUPPORT
 /* Experimentally off - libc_hidden_proto(strndup) */
 #endif
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index 46be5f6b5..7e65f8bc2 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -40,7 +40,7 @@
 #include "netlinkaccess.h"
 
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 /* Experimentally off - libc_hidden_proto(time) */
 libc_hidden_proto(sendto)
 libc_hidden_proto(recvmsg)
@@ -49,7 +49,7 @@ libc_hidden_proto(bind)
 /* Experimentally off - libc_hidden_proto(mempcpy) */
 libc_hidden_proto(getsockname)
 libc_hidden_proto(fclose)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #ifndef __libc_use_alloca
 # define __libc_use_alloca(x) (x < __MAX_ALLOCA_CUTOFF)
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 4de47b010..793b4a756 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -178,7 +178,7 @@
 /* Experimentally off - libc_hidden_proto(strstr) */
 /* Experimentally off - libc_hidden_proto(strcasecmp) */
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 libc_hidden_proto(random)
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 0654b51c1..52d9fc770 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -68,7 +68,7 @@ libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(gettimeofday)
 libc_hidden_proto(fputs)
 libc_hidden_proto(perror)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 #ifdef USE_IN_LIBIO
 libc_hidden_proto(fwprintf)
 #endif
diff --git a/libc/inet/rpc/clnt_simple.c b/libc/inet/rpc/clnt_simple.c
index 745a50213..52fb756a0 100644
--- a/libc/inet/rpc/clnt_simple.c
+++ b/libc/inet/rpc/clnt_simple.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 /* 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(close) */
 libc_hidden_proto(clntudp_create)
 libc_hidden_proto(gethostbyname_r)
 
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 23e4ca863..473543c9c 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -68,7 +68,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 libc_hidden_proto(socket)
 libc_hidden_proto(read)
 libc_hidden_proto(write)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(authnone_create)
 libc_hidden_proto(xdrrec_create)
 libc_hidden_proto(xdrrec_endofrecord)
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 1d7cb4863..8e6d74b5e 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -65,7 +65,7 @@ libc_hidden_proto(fwprintf)
 /* Experimentally off - libc_hidden_proto(memcmp) */
 libc_hidden_proto(ioctl)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 /* CMSG_NXTHDR is using it */
 libc_hidden_proto(__cmsg_nxthdr)
 
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 73be74288..902e37317 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -66,7 +66,7 @@ libc_hidden_proto(fwprintf)
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(getpid)
 libc_hidden_proto(authnone_create)
 libc_hidden_proto(xdrrec_create)
diff --git a/libc/inet/rpc/get_myaddress.c b/libc/inet/rpc/get_myaddress.c
index a6ba07811..79d48ac4b 100644
--- a/libc/inet/rpc/get_myaddress.c
+++ b/libc/inet/rpc/get_myaddress.c
@@ -52,9 +52,9 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 
 libc_hidden_proto(ioctl)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(perror)
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 
 /*
  * don't use gethostbyname, which would invoke yellow pages
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index 8ac41f281..ac1b6b00d 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -50,9 +50,9 @@
 
 libc_hidden_proto(ioctl)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(perror)
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 libc_hidden_proto(clnt_perror)
 libc_hidden_proto(clntudp_bufcreate)
 libc_hidden_proto(xdr_bool)
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 759534aa7..349cf8b03 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -63,7 +63,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 libc_hidden_proto(ioctl)
 libc_hidden_proto(perror)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(authunix_create_default)
 libc_hidden_proto(xdrmem_create)
 libc_hidden_proto(xdr_callmsg)
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index cd8d620c0..d10f015fd 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -97,7 +97,7 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 /* Experimentally off - libc_hidden_proto(memmove) */
 libc_hidden_proto(getpid)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(fcntl)
 libc_hidden_proto(read)
 libc_hidden_proto(write)
diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c
index 2eb567ed2..d40a04f6a 100644
--- a/libc/inet/rpc/rexec.c
+++ b/libc/inet/rpc/rexec.c
@@ -47,7 +47,7 @@
 /* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(read)
 libc_hidden_proto(write)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(socket)
 libc_hidden_proto(perror)
 libc_hidden_proto(sprintf)
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index 6190868ad..ab3110543 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -60,7 +60,7 @@ 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(close) */
 libc_hidden_proto(connect)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index 72c272aa7..a757a281f 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 libc_hidden_proto(asprintf)
 libc_hidden_proto(fputs)
 libc_hidden_proto(write)
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 libc_hidden_proto(svc_sendreply)
 libc_hidden_proto(svc_register)
 libc_hidden_proto(svcerr_decode)
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 5e4667940..598b0fc72 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(read)
 libc_hidden_proto(write)
 libc_hidden_proto(perror)
@@ -82,7 +82,7 @@ libc_hidden_proto(accept)
 libc_hidden_proto(listen)
 libc_hidden_proto(fputs)
 libc_hidden_proto(fclose)
-libc_hidden_proto(abort)
+/* 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 e2c97bdc5..ffbbd4681 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -65,7 +65,7 @@ libc_hidden_proto(fwprintf)
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(perror)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(xprt_register)
 libc_hidden_proto(xprt_unregister)
 libc_hidden_proto(xdrmem_create)
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 2d7790450..48fba8977 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -59,7 +59,7 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(perror)
 libc_hidden_proto(getpid)
 libc_hidden_proto(xdrrec_create)
@@ -81,7 +81,7 @@ libc_hidden_proto(poll)
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
 libc_hidden_proto(fputs)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /*
  * Ops vector for AF_UNIX based rpc service handle
diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index 7a2fa1dce..f25cd184b 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -33,7 +33,7 @@
 #include <bits/uClibc_uintmaxtostr.h>
 
 libc_hidden_proto(fprintf)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /* Get the prototype from assert.h as a double-check. */
 #undef NDEBUG
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index abb76ebdc..8afaab3b0 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -162,7 +162,7 @@ int CTYPE_NAME(NAME) (int c) \
 #ifdef __UCLIBC_HAS_CTYPE_ENFORCED__
 
 libc_hidden_proto(fprintf)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 attribute_hidden void __isctype_assert(int c, int mask)
 {
diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c
index 3dc0bd17a..33ef6098c 100644
--- a/libc/misc/dirent/closedir.c
+++ b/libc/misc/dirent/closedir.c
@@ -11,7 +11,7 @@
 #include "dirstream.h"
 
 libc_hidden_proto(closedir)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 
 int closedir(DIR * dir)
 {
diff --git a/libc/misc/dirent/opendir.c b/libc/misc/dirent/opendir.c
index 26ab91511..e1be80ed3 100644
--- a/libc/misc/dirent/opendir.c
+++ b/libc/misc/dirent/opendir.c
@@ -17,7 +17,7 @@
 libc_hidden_proto(opendir)
 libc_hidden_proto(open)
 libc_hidden_proto(fcntl)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(stat)
 libc_hidden_proto(fstat)
 
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index ab9c8b72b..ce20003f5 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -29,7 +29,7 @@ libc_hidden_proto(verrx)
 libc_hidden_proto(fprintf)
 libc_hidden_proto(vfprintf)
 libc_hidden_proto(__xpg_strerror_r)
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 libc_hidden_proto(vfprintf)
 
 static void vwarn_work(const char *format, va_list args, int showerr)
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index ed4a62ef6..fa3f3c4ab 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -29,7 +29,7 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strerror) */
 libc_hidden_proto(fprintf)
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 libc_hidden_proto(putc)
 libc_hidden_proto(vfprintf)
 libc_hidden_proto(fflush)
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 6c0dab7fe..f33ecf79f 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 
 #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
 /* Experimentally off - libc_hidden_proto(strrchr) */
@@ -39,7 +39,7 @@ libc_hidden_proto(getuid)
 libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(fstat)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 extern __typeof(open) __libc_open;
 libc_hidden_proto(__libc_open)
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index c963eae1f..5b7b4f7f9 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -54,7 +54,7 @@ libc_hidden_proto(open)
 libc_hidden_proto(open64)
 #endif
 libc_hidden_proto(read)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(getpid)
 libc_hidden_proto(stat)
 libc_hidden_proto(gettimeofday)
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index 6df88a7f4..df29ce730 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -1382,7 +1382,7 @@ void freelocale(__locale_t dataset)
 /**********************************************************************/
 #ifdef L_uselocale
 
-libc_hidden_proto(uselocale)
+/* libc_hidden_proto(uselocale) */
 __locale_t uselocale(__locale_t dataset)
 {
 	__locale_t old;
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index 4d23aef00..22acbdd5e 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -23,7 +23,7 @@ libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 libc_hidden_proto(fseek)
 libc_hidden_proto(fgets)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 libc_hidden_proto(fprintf)
 
 /* Reentrant version of getmntent.  */
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index 10229a265..cf0ed62b7 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -87,7 +87,7 @@ libc_hidden_proto(tolower)
 /* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(getenv)
 /* Experimentally off - libc_hidden_proto(strcasecmp) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(mempcpy) */
 #endif
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index a8a8cc79a..3aecf243f 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -44,7 +44,7 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(printf)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(mempcpy) */
 #endif
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index c90703ab8..f98a25719 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -93,7 +93,7 @@ libc_hidden_proto(closelog)
 libc_hidden_proto(open)
 libc_hidden_proto(fcntl)
 libc_hidden_proto(socket)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(write)
 libc_hidden_proto(getpid)
 libc_hidden_proto(ctime)
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 97fbad560..a53580911 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -169,7 +169,7 @@ libc_hidden_proto(localtime_r)
 /* libc_hidden_proto(sprintf) */
 libc_hidden_proto(open)
 libc_hidden_proto(read)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(getenv)
 libc_hidden_proto(tzset)
 libc_hidden_proto(gettimeofday)
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index b55cdb267..fb2b88591 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -48,7 +48,7 @@ libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
 libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c
index 6c1793e65..c3f4e1314 100644
--- a/libc/misc/utmp/utent.c
+++ b/libc/misc/utmp/utent.c
@@ -27,7 +27,7 @@ libc_hidden_proto(read)
 libc_hidden_proto(write)
 libc_hidden_proto(open)
 libc_hidden_proto(fcntl)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(lseek)
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c
index 9430bbb19..a5df5a609 100644
--- a/libc/misc/utmp/wtent.c
+++ b/libc/misc/utmp/wtent.c
@@ -21,7 +21,7 @@ libc_hidden_proto(updwtmp)
 #endif
 libc_hidden_proto(open)
 libc_hidden_proto(write)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(lockf)
 libc_hidden_proto(gettimeofday)
 
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index d8b2db16f..cfddcba5c 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -58,13 +58,13 @@ libc_hidden_proto(fnmatch)
 libc_hidden_proto(pipe)
 libc_hidden_proto(fork)
 libc_hidden_proto(open)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(read)
 libc_hidden_proto(getenv)
 libc_hidden_proto(getpid)
 libc_hidden_proto(sprintf)
 libc_hidden_proto(fprintf)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 libc_hidden_proto(glob)
 libc_hidden_proto(globfree)
 libc_hidden_proto(wordfree)
diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c
index 0b0fb471b..1d0779725 100644
--- a/libc/pwd_grp/lckpwdf.c
+++ b/libc/pwd_grp/lckpwdf.c
@@ -31,7 +31,7 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(open)
 libc_hidden_proto(fcntl)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(sigfillset)
 libc_hidden_proto(sigaction)
 libc_hidden_proto(sigprocmask)
diff --git a/libc/stdio/_READ.c b/libc/stdio/_READ.c
index bafa8dffe..09fca91c7 100644
--- a/libc/stdio/_READ.c
+++ b/libc/stdio/_READ.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 
 libc_hidden_proto(read)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /* Given a reading stream without its end-of-file indicator set and
  * with no buffered input or ungots, read at most 'bufsize' bytes
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 38a8351e5..8f83aa229 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -9,7 +9,7 @@
 
 libc_hidden_proto(read)
 libc_hidden_proto(write)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(lseek64)
 #else
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index 61a730d75..604e73c3b 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -121,7 +121,7 @@
 /* Experimentally off - libc_hidden_proto(strnlen) */
 libc_hidden_proto(__glibc_strerror_r)
 libc_hidden_proto(fputs_unlocked)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_WCHAR__
 libc_hidden_proto(wcslen)
 libc_hidden_proto(wcsnlen)
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index 27d3c7e96..45a614351 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 libc_hidden_proto(fclose)
 
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(fflush_unlocked)
 
 int fclose(register FILE *stream)
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index 43d07fa0f..4fd25072a 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -26,7 +26,7 @@
 #warning "hmm... susv3 says Pipe streams are byte-oriented."
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(_exit)
 libc_hidden_proto(waitpid)
 libc_hidden_proto(execl)
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
index f83944539..05143d3ea 100644
--- a/libc/stdio/tmpfile.c
+++ b/libc/stdio/tmpfile.c
@@ -23,7 +23,7 @@
 
 libc_hidden_proto(fdopen)
 libc_hidden_proto(remove)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 
 /* This returns a new stream opened on a temporary file (generated
    by tmpnam).  The file is opened with mode "w+b" (binary read/write).
diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
index e5840f471..38d2d78a0 100644
--- a/libc/stdlib/_atexit.c
+++ b/libc/stdlib/_atexit.c
@@ -46,7 +46,7 @@
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_EXTERN(__atexit_lock);
 
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 libc_hidden_proto(_exit)
 
 
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index b71512f33..82a9a5e80 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -26,7 +26,7 @@ Cambridge, MA 02139, USA.  */
 #include <signal.h>
 #include <errno.h>
 
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(sigaction)
diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c
index bf6a4cd30..5355713bf 100644
--- a/libc/stdlib/arc4random.c
+++ b/libc/stdlib/arc4random.c
@@ -40,7 +40,7 @@
 
 libc_hidden_proto(open)
 libc_hidden_proto(read)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(gettimeofday)
 
 struct arc4_stream {
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index 5b067438f..5fb142d4b 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -29,7 +29,7 @@ extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
 
 libc_hidden_proto(open)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 
 #if !defined __ASSUME_DEVPTS__
 
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index e0f3658b7..d4259d526 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -27,7 +27,7 @@
 libc_hidden_proto(mmap)
 libc_hidden_proto(sysconf)
 libc_hidden_proto(sbrk)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 
 __UCLIBC_MUTEX_EXTERN(__malloc_lock);
diff --git a/libc/string/generic/memchr.c b/libc/string/generic/memchr.c
index 3c7c997bc..8ea3f539a 100644
--- a/libc/string/generic/memchr.c
+++ b/libc/string/generic/memchr.c
@@ -26,7 +26,7 @@
 #include <limits.h>
 
 /* Experimentally off - libc_hidden_proto(memchr) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/memrchr.c b/libc/string/generic/memrchr.c
index 9ab805cf7..95fe1d4d8 100644
--- a/libc/string/generic/memrchr.c
+++ b/libc/string/generic/memrchr.c
@@ -28,7 +28,7 @@
 
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(memrchr) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/rawmemchr.c b/libc/string/generic/rawmemchr.c
index f8b97a61d..5242734f1 100644
--- a/libc/string/generic/rawmemchr.c
+++ b/libc/string/generic/rawmemchr.c
@@ -27,7 +27,7 @@
 
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(rawmemchr) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c
index 66aed1e25..91de3f4aa 100644
--- a/libc/string/generic/strchr.c
+++ b/libc/string/generic/strchr.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 /* Experimentally off - libc_hidden_proto(strchr) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strchrnul.c b/libc/string/generic/strchrnul.c
index 72cab2891..6a25b1c0c 100644
--- a/libc/string/generic/strchrnul.c
+++ b/libc/string/generic/strchrnul.c
@@ -26,7 +26,7 @@
 
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(strchrnul) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strlen.c b/libc/string/generic/strlen.c
index 764dae18d..be899d330 100644
--- a/libc/string/generic/strlen.c
+++ b/libc/string/generic/strlen.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /* Return the length of the null-terminated string STR.  Scan for
    the null terminator quickly by testing four bytes at a time.  */
diff --git a/libc/string/generic/strnlen.c b/libc/string/generic/strnlen.c
index d9ba76129..0bc517a84 100644
--- a/libc/string/generic/strnlen.c
+++ b/libc/string/generic/strnlen.c
@@ -26,7 +26,7 @@
 
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(strnlen) */
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /* Find the length of S, but scan at most MAXLEN characters.  If no
    '\0' terminator is found in that many characters, return MAXLEN.  */
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index 708e8ec49..a2082a0f0 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -58,7 +58,7 @@ libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 /* Experimentally off - libc_hidden_proto(strcmp) */
 libc_hidden_proto(open)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 
 #include <linux/version.h>
 
diff --git a/libc/sysdeps/linux/common/close.c b/libc/sysdeps/linux/common/close.c
index c6ddbeddd..6a160b43e 100644
--- a/libc/sysdeps/linux/common/close.c
+++ b/libc/sysdeps/linux/common/close.c
@@ -13,6 +13,6 @@
 extern __typeof(close) __libc_close;
 #define __NR___libc_close __NR_close
 _syscall1(int, __libc_close, int, fd)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 weak_alias(__libc_close,close)
 libc_hidden_weak(close)
diff --git a/libc/sysdeps/linux/common/dl-osinfo.h b/libc/sysdeps/linux/common/dl-osinfo.h
index 5155322e0..a038ea31e 100644
--- a/libc/sysdeps/linux/common/dl-osinfo.h
+++ b/libc/sysdeps/linux/common/dl-osinfo.h
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 libc_hidden_proto(open)
 libc_hidden_proto(read)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(gettimeofday)
 #   define OPEN open
 #   define READ read
diff --git a/libc/unistd/daemon.c b/libc/unistd/daemon.c
index d565ed41d..db09b6575 100644
--- a/libc/unistd/daemon.c
+++ b/libc/unistd/daemon.c
@@ -49,7 +49,7 @@
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 
 libc_hidden_proto(open)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(_exit)
 libc_hidden_proto(dup2)
 libc_hidden_proto(setsid)
diff --git a/libpthread/linuxthreads.old/forward.c b/libpthread/linuxthreads.old/forward.c
index 5dc9cf4c0..aa5c8abd9 100644
--- a/libpthread/linuxthreads.old/forward.c
+++ b/libpthread/linuxthreads.old/forward.c
@@ -22,9 +22,9 @@
 #include <dlfcn.h>
 
 /* psm: keep this before internals.h */
-libc_hidden_proto(exit)
 #if 0
 vda: here is why:
+headers contain libc_hidden_proto(foo).
 In libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
 adding libc_hidden_proto(foo) just before weak_extern (__pthread_initialize)
 will not warn:
@@ -38,6 +38,7 @@ TODO: determine whether it is a gcc bug or what
 For now, just include all headers before internals.h
 (they are again included in internals.h - maybe remove them there later)
 #endif
+
 #include <string.h>
 #include <limits.h>
 #include <setjmp.h>
diff --git a/libpthread/linuxthreads.old/libc_pthread_init.c b/libpthread/linuxthreads.old/libc_pthread_init.c
index 09606effb..6cdad844d 100644
--- a/libpthread/linuxthreads.old/libc_pthread_init.c
+++ b/libpthread/linuxthreads.old/libc_pthread_init.c
@@ -27,7 +27,7 @@
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
 #if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(uselocale)
+/* libc_hidden_proto(uselocale) */
 #endif
 
 int __libc_multiple_threads attribute_hidden __attribute__((nocommon));
diff --git a/libpthread/linuxthreads/forward.c b/libpthread/linuxthreads/forward.c
index 2cd019651..f9f8ea1ba 100644
--- a/libpthread/linuxthreads/forward.c
+++ b/libpthread/linuxthreads/forward.c
@@ -22,7 +22,7 @@
 #include <dlfcn.h>
 
 /* psm: keep this before internals.h */
-libc_hidden_proto(exit)
+/* libc_hidden_proto(exit) */
 
 #include "internals.h"
 
diff --git a/libpthread/linuxthreads/libc_pthread_init.c b/libpthread/linuxthreads/libc_pthread_init.c
index f89c2872e..30490de27 100644
--- a/libpthread/linuxthreads/libc_pthread_init.c
+++ b/libpthread/linuxthreads/libc_pthread_init.c
@@ -30,7 +30,7 @@
 #endif
 
 #if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(uselocale)
+/* libc_hidden_proto(uselocale) */
 #endif
 
 int *