next portion of libc_hidden_proto removal

239 files changed, 436 insertions, 403 deletions

diff --git a/include/ctype.h b/include/ctype.h
index 21314d152..065dd5a49 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -175,9 +175,11 @@ __exctype (isxdigit);
 
 /* Return the lowercase version of C.  */
 extern int tolower (int __c) __THROW;
+libc_hidden_proto(tolower)
 
 /* Return the uppercase version of C.  */
 extern int toupper (int __c) __THROW;
+libc_hidden_proto(toupper)
 
 __END_NAMESPACE_STD
 
diff --git a/include/fcntl.h b/include/fcntl.h
index 3e0aab53e..31a0149a7 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -72,6 +72,7 @@ __BEGIN_DECLS
    __THROW.  */
 #ifndef __USE_FILE_OFFSET64
 extern int fcntl (int __fd, int __cmd, ...);
+libc_hidden_proto(fcntl)
 #else
 # ifdef __REDIRECT
 extern int __REDIRECT (fcntl, (int __fd, int __cmd, ...), fcntl64);
@@ -91,6 +92,7 @@ extern int fcntl64 (int __fd, int __cmd, ...);
    __THROW.  */
 #ifndef __USE_FILE_OFFSET64
 extern int open (__const char *__file, int __oflag, ...) __nonnull ((1));
+libc_hidden_proto(open)
 #else
 # ifdef __REDIRECT
 extern int __REDIRECT (open, (__const char *__file, int __oflag, ...), open64)
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 636d60ea9..c04f03cc6 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -187,6 +187,7 @@ extern bool_t	xdr_callhdr (XDR *__xdrs, struct rpc_msg *__cmsg) __THROW;
  * 	struct rpc_msg *rmsg;
  */
 extern bool_t	xdr_replymsg (XDR *__xdrs, struct rpc_msg *__rmsg) __THROW;
+libc_hidden_proto(xdr_replymsg)
 
 /*
  * Fills in the error part of a reply message.
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 25dd214ee..c885cdcb9 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -357,6 +357,7 @@ extern bool_t xdr_netobj (XDR *__xdrs, struct netobj *__np) __THROW;
 /* XDR using memory buffers */
 extern void xdrmem_create (XDR *__xdrs, __const caddr_t __addr,
 			   u_int __size, enum xdr_op __xop) __THROW;
+libc_hidden_proto(xdrmem_create)
 
 /* XDR using stdio library */
 extern void xdrstdio_create (XDR *__xdrs, FILE *__file, enum xdr_op __xop)
diff --git a/include/signal.h b/include/signal.h
index 610acdc70..5675cf172 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -246,6 +246,7 @@ extern int sigorset (sigset_t *__set, __const sigset_t *__left,
 /* Get and/or change the set of blocked signals.  */
 extern int sigprocmask (int __how, __const sigset_t *__restrict __set,
 			sigset_t *__restrict __oset) __THROW;
+libc_hidden_proto(sigprocmask)
 
 /* Change the set of blocked signals to SET,
    wait until a signal arrives, and restore the set of blocked signals.
@@ -257,6 +258,7 @@ extern int sigsuspend (__const sigset_t *__set) __nonnull ((1));
 /* Get and/or set the action for signal SIG.  */
 extern int sigaction (int __sig, __const struct sigaction *__restrict __act,
 		      struct sigaction *__restrict __oact) __THROW;
+libc_hidden_proto(sigaction)
 
 /* Put in SET all signals that are blocked and waiting to be delivered.  */
 extern int sigpending (sigset_t *__set) __THROW __nonnull ((1));
diff --git a/include/stdio.h b/include/stdio.h
index feb544de7..246a5bcb2 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -234,6 +234,7 @@ __BEGIN_NAMESPACE_STD
    marked with __THROW.  */
 extern FILE *fopen (__const char *__restrict __filename,
 		    __const char *__restrict __modes) __wur;
+libc_hidden_proto(fopen)
 /* Open a file, replacing an existing stream with it.
 
    This function is a possible cancellation point and therefore not
@@ -259,6 +260,7 @@ __END_NAMESPACE_STD
 #ifdef __USE_LARGEFILE64
 extern FILE *fopen64 (__const char *__restrict __filename,
 		      __const char *__restrict __modes) __wur;
+libc_hidden_proto(fopen64)
 extern FILE *freopen64 (__const char *__restrict __filename,
 			__const char *__restrict __modes,
 			FILE *__restrict __stream) __wur;
@@ -325,9 +327,11 @@ libc_hidden_proto(fprintf)
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern int printf (__const char *__restrict __format, ...);
+libc_hidden_proto(printf)
 /* Write formatted output to S.  */
 extern int sprintf (char *__restrict __s,
 		    __const char *__restrict __format, ...) __THROW;
+libc_hidden_proto(sprintf)
 
 /* Write formatted output to S from argument list ARG.
 
@@ -335,6 +339,7 @@ extern int sprintf (char *__restrict __s,
    marked with __THROW.  */
 extern int vfprintf (FILE *__restrict __s, __const char *__restrict __format,
 		     __gnuc_va_list __arg);
+libc_hidden_proto(vfprintf)
 /* Write formatted output to stdout from argument list ARG.
 
    This function is a possible cancellation point and therefore not
@@ -533,6 +538,7 @@ __BEGIN_NAMESPACE_STD
    marked with __THROW.  */
 extern char *fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
      __wur;
+libc_hidden_proto(fgets)
 
 /* Get a newline-terminated string from stdin, removing the newline.
    DO NOT USE THIS FUNCTION!!  There is no limit on how much it will read.
@@ -592,6 +598,7 @@ __BEGIN_NAMESPACE_STD
    This function is a possible cancellation points and therefore not
    marked with __THROW.  */
 extern int fputs (__const char *__restrict __s, FILE *__restrict __stream);
+libc_hidden_proto(fputs)
 
 /* Write a string, followed by a newline, to stdout.
 
@@ -749,6 +756,7 @@ __BEGIN_NAMESPACE_STD
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern void perror (__const char *__s);
+libc_hidden_proto(perror)
 __END_NAMESPACE_STD
 
 #ifdef __UCLIBC_HAS_SYS_ERRLIST__
diff --git a/include/stdlib.h b/include/stdlib.h
index 657167541..3a7c276af 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -532,6 +532,7 @@ __END_NAMESPACE_C99
 __BEGIN_NAMESPACE_STD
 /* Return the value of envariable NAME, or NULL if it doesn't exist.  */
 extern char *getenv (__const char *__name) __THROW __nonnull ((1)) __wur;
+libc_hidden_proto(getenv)
 __END_NAMESPACE_STD
 
 /* This function is similar to the above but returns NULL if the
diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index 6d8a0f40b..528403e71 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -40,6 +40,7 @@ __BEGIN_DECLS
    One argument may follow; its presence and type depend on REQUEST.
    Return value depends on REQUEST.  Usually -1 indicates error.  */
 extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
+libc_hidden_proto(ioctl)
 
 __END_DECLS
 
diff --git a/include/sys/mman.h b/include/sys/mman.h
index 7640955d7..d8e2c7a93 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -57,6 +57,7 @@ __BEGIN_DECLS
 #ifndef __USE_FILE_OFFSET64
 extern void *mmap (void *__addr, size_t __len, int __prot,
 		   int __flags, int __fd, __off_t __offset) __THROW;
+libc_hidden_proto(mmap)
 #else
 # ifdef __REDIRECT
 extern void * __REDIRECT (mmap,
diff --git a/include/sys/poll.h b/include/sys/poll.h
index a298dac15..c786a778a 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -58,6 +58,7 @@ __BEGIN_DECLS
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
+libc_hidden_proto(poll)
 
 #if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
 /* Like poll, but before waiting the threads signal mask is replaced
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 4ae1ea980..5b1298f4c 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -98,6 +98,7 @@ typedef union { __SOCKADDR_ALLTYPES
    protocol PROTOCOL.  If PROTOCOL is zero, one is chosen automatically.
    Returns a file descriptor for the new socket, or -1 for errors.  */
 extern int socket (int __domain, int __type, int __protocol) __THROW;
+libc_hidden_proto(socket)
 
 /* Create two new sockets, of type TYPE in domain DOMAIN and using
    protocol PROTOCOL, which are connected to each other, and put file
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 508239050..20d0f4bad 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -206,10 +206,12 @@ __BEGIN_DECLS
 /* Get file attributes for FILE and put them in BUF.  */
 extern int stat (__const char *__restrict __file,
 		 struct stat *__restrict __buf) __THROW __nonnull ((1, 2));
+libc_hidden_proto(stat)
 
 /* Get file attributes for the file, device, pipe, or socket
    that file descriptor FD is open on and put them in BUF.  */
 extern int fstat (int __fd, struct stat *__buf) __THROW __nonnull ((2));
+libc_hidden_proto(fstat)
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (stat, (__const char *__restrict __file,
@@ -258,6 +260,7 @@ extern int fstatat64 (int __fd, __const char *__restrict __file,
    If FILE is a symbolic link, do not follow it.  */
 extern int lstat (__const char *__restrict __file,
 		  struct stat *__restrict __buf) __THROW __nonnull ((1, 2));
+libc_hidden_proto(lstat)
 # else
 #  ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (lstat,
diff --git a/include/sys/time.h b/include/sys/time.h
index 66fb9e021..73eeb2a2f 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -71,6 +71,7 @@ typedef void *__restrict __timezone_ptr_t;
    Use the functions and variables declared in <time.h> instead.  */
 extern int gettimeofday (struct timeval *__restrict __tv,
 			 __timezone_ptr_t __tz) __THROW __nonnull ((1));
+libc_hidden_proto(gettimeofday)
 
 #ifdef __USE_BSD
 /* Set the current time of day and timezone information.
diff --git a/include/unistd.h b/include/unistd.h
index bf94fe4fc..2052a1279 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -297,6 +297,7 @@ extern int faccessat (int __fd, __const char *__file, int __type, int __flag)
    Return the new file position.  */
 #ifndef __USE_FILE_OFFSET64
 extern __off_t lseek (int __fd, __off_t __offset, int __whence) __THROW;
+libc_hidden_proto(lseek)
 #else
 # ifdef __REDIRECT_NTH
 extern __off64_t __REDIRECT_NTH (lseek,
@@ -324,12 +325,14 @@ libc_hidden_proto(close)
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern ssize_t read (int __fd, void *__buf, size_t __nbytes) __wur;
+libc_hidden_proto(read)
 
 /* Write N bytes of BUF to FD.  Return the number written, or -1.
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern ssize_t write (int __fd, __const void *__buf, size_t __n) __wur;
+libc_hidden_proto(write)
 
 #ifdef __USE_UNIX98
 # ifndef __USE_FILE_OFFSET64
@@ -545,6 +548,7 @@ extern int nice (int __inc) __THROW __wur;
 
 /* Terminate program execution with the low-order 8 bits of STATUS.  */
 extern void _exit (int __status) __attribute__ ((__noreturn__));
+libc_hidden_proto(_exit)
 
 
 /* Get the `_PC_*' symbols for the NAME argument to `pathconf' and `fpathconf';
@@ -570,6 +574,7 @@ extern size_t confstr (int __name, char *__buf, size_t __len) __THROW;
 
 /* Get the process ID of the calling process.  */
 extern __pid_t getpid (void) __THROW;
+libc_hidden_proto(getpid)
 
 /* Get the process ID of the calling process's parent.  */
 extern __pid_t getppid (void) __THROW;
@@ -998,12 +1003,14 @@ extern int ftruncate64 (int __fd, __off64_t __length) __THROW __wur;
 /* Set the end of accessible data space (aka "the break") to ADDR.
    Returns zero on success and -1 for errors (with errno set).  */
 extern int brk (void *__addr) __THROW __wur;
+libc_hidden_proto(brk)
 
 /* Increase or decrease the end of accessible data space by DELTA bytes.
    If successful, returns the address the previous end of data space
    (i.e. the beginning of the new space, if DELTA > 0);
    returns (void *) -1 for errors (with errno set).  */
 extern void *sbrk (intptr_t __delta) __THROW;
+libc_hidden_proto(sbrk)
 #endif
 
 
diff --git a/include/wchar.h b/include/wchar.h
index e461f7184..da6edae8c 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -520,6 +520,7 @@ extern int fwide (__FILE *__fp, int __mode) __THROW;
 extern int fwprintf (__FILE *__restrict __stream,
 		     __const wchar_t *__restrict __format, ...)
      /* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
+libc_hidden_proto(fwprintf)
 /* Write formatted output to stdout.
 
    This function is a possible cancellation point and therefore not
diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c
index 914b77c69..8ce61d241 100644
--- a/libc/inet/ether_addr.c
+++ b/libc/inet/ether_addr.c
@@ -32,7 +32,7 @@
 #include <netinet/if_ether.h>
 
 libc_hidden_proto(ether_ntoa_r)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
 /* libc_hidden_proto(__ctype_tolower_loc) */
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 8046f9afe..189d52f1a 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -77,7 +77,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* 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(socket) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(getservbyname_r)
 libc_hidden_proto(gethostbyname2_r)
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index 5a6af1b5a..4f164237c 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -23,11 +23,11 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(inet_network)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index 5b34d6de6..bfaf4917f 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -62,12 +62,12 @@
 #include <errno.h>
 #include <unistd.h>
 
-libc_hidden_proto(fopen)
+/* 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(fgets) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index affdc622f..d427adff9 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -66,11 +66,11 @@
 
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strpbrk) */
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 
 #include <bits/uClibc_mutex.h>
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
index f16e97131..e4c592b86 100644
--- a/libc/inet/hostid.c
+++ b/libc/inet/hostid.c
@@ -16,10 +16,10 @@
 #include <unistd.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
 libc_hidden_proto(getuid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(gethostbyname_r)
diff --git a/libc/inet/if_index.c b/libc/inet/if_index.c
index 3badfa55e..a5b073091 100644
--- a/libc/inet/if_index.c
+++ b/libc/inet/if_index.c
@@ -37,7 +37,7 @@
 
 /* Experimentally off - libc_hidden_proto(strncpy) */
 /* Experimentally off - libc_hidden_proto(strdup) */
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 /* libc_hidden_proto(close) */
 #if __ASSUME_NETLINK_SUPPORT
 /* Experimentally off - libc_hidden_proto(strndup) */
diff --git a/libc/inet/ifaddrs.c b/libc/inet/ifaddrs.c
index c5467fcca..bdacd62df 100644
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -39,7 +39,7 @@
 
 #include "netlinkaccess.h"
 
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
 /* Experimentally off - libc_hidden_proto(time) */
 libc_hidden_proto(sendto)
diff --git a/libc/inet/ntop.c b/libc/inet/ntop.c
index f19556dcd..e24ac8de1 100644
--- a/libc/inet/ntop.c
+++ b/libc/inet/ntop.c
@@ -35,8 +35,8 @@
 /* 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)
+/* libc_hidden_proto(sprintf) */
+/* libc_hidden_proto(tolower) */
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
diff --git a/libc/inet/opensock.c b/libc/inet/opensock.c
index a2c09dcf5..e80efb378 100644
--- a/libc/inet/opensock.c
+++ b/libc/inet/opensock.c
@@ -25,7 +25,7 @@
 #include <features.h>
 #include <libc-internal.h>
 
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 
 /* Return a socket of any type.  The socket can be used in subsequent
    ioctl calls to talk to the kernel.  */
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index c81249f02..901a7d828 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -177,9 +177,9 @@
 /* libc_hidden_proto(strnlen) */
 /* Experimentally off - libc_hidden_proto(strstr) */
 /* Experimentally off - libc_hidden_proto(strcasecmp) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(random)
 libc_hidden_proto(getservbyport)
@@ -190,14 +190,14 @@ libc_hidden_proto(inet_aton)
 libc_hidden_proto(inet_pton)
 libc_hidden_proto(inet_ntop)
 libc_hidden_proto(connect)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(select)
 libc_hidden_proto(recv)
 libc_hidden_proto(send)
-libc_hidden_proto(printf)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(printf) */
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(snprintf)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 libc_hidden_proto(getnameinfo)
 libc_hidden_proto(gethostbyname)
 libc_hidden_proto(gethostbyname_r)
diff --git a/libc/inet/rpc/auth_none.c b/libc/inet/rpc/auth_none.c
index 05851025f..30649f91c 100644
--- a/libc/inet/rpc/auth_none.c
+++ b/libc/inet/rpc/auth_none.c
@@ -39,7 +39,7 @@
 #include <features.h>
 #include "rpc_private.h"
 
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_opaque_auth)
 
 #define MAX_MARSHAL_SIZE 20
diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 52d9fc770..2364aff68 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -62,15 +62,15 @@ libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(getgroups)
 libc_hidden_proto(gethostname)
-libc_hidden_proto(xdrmem_create)
+/* 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(gettimeofday) */
+/* libc_hidden_proto(fputs) */
+/* libc_hidden_proto(perror) */
 /* libc_hidden_proto(abort) */
 #ifdef USE_IN_LIBIO
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /*
diff --git a/libc/inet/rpc/bindresvport.c b/libc/inet/rpc/bindresvport.c
index 3f266e6cc..457f1f97f 100644
--- a/libc/inet/rpc/bindresvport.c
+++ b/libc/inet/rpc/bindresvport.c
@@ -42,7 +42,7 @@
 
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(bind)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 
 /*
  * Bind a socket to a privileged IP port
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index 7e6c907ce..e700e4137 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -53,11 +53,11 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(__glibc_strerror_r)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 #ifdef USE_IN_LIBIO
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
diff --git a/libc/inet/rpc/clnt_raw.c b/libc/inet/rpc/clnt_raw.c
index b44bd38b8..9941e0894 100644
--- a/libc/inet/rpc/clnt_raw.c
+++ b/libc/inet/rpc/clnt_raw.c
@@ -48,11 +48,11 @@ 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(perror) */
 libc_hidden_proto(authnone_create)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_callhdr)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(svc_getreq)
 libc_hidden_proto(_seterr_reply)
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 473543c9c..553b11bef 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -65,28 +65,28 @@ 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(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_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(xdrmem_create)
+/* 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(poll) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(__rpc_thread_createerr)
 #ifdef USE_IN_LIBIO
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 8e6d74b5e..3763db680 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -54,7 +54,7 @@ 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)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 #ifdef IP_RECVERR
@@ -63,16 +63,16 @@ libc_hidden_proto(fwprintf)
 #endif
 
 /* Experimentally off - libc_hidden_proto(memcmp) */
-libc_hidden_proto(ioctl)
-libc_hidden_proto(socket)
+/* 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(xdrmem_create) */
 libc_hidden_proto(xdr_callhdr)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(pmap_getport)
 libc_hidden_proto(_seterr_reply)
@@ -81,8 +81,8 @@ 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(poll) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(__rpc_thread_createerr)
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 902e37317..6de4e63b1 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -60,22 +60,22 @@
 #include <rpc/pmap_clnt.h>
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(getpid)
+/* 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_replymsg) */
 libc_hidden_proto(xdr_opaque_auth)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_void)
 libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
@@ -84,8 +84,8 @@ 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(poll) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(__rpc_thread_createerr)
 
 extern u_long _create_xid (void) attribute_hidden;
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index e3ee4799b..b46062657 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -27,7 +27,7 @@
 
 libc_hidden_proto(lrand48_r)
 libc_hidden_proto(srand48_r)
-libc_hidden_proto(gettimeofday)
+/* 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 79d48ac4b..0006be803 100644
--- a/libc/inet/rpc/get_myaddress.c
+++ b/libc/inet/rpc/get_myaddress.c
@@ -50,10 +50,10 @@ 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(ioctl) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 /* libc_hidden_proto(exit) */
 
 /*
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c
index fbf44bec2..2730a644a 100644
--- a/libc/inet/rpc/getrpcent.c
+++ b/libc/inet/rpc/getrpcent.c
@@ -49,11 +49,11 @@
 /* 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(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 
 /*
  * Internet version.
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index ac1b6b00d..d71378068 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -48,10 +48,10 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 
-libc_hidden_proto(ioctl)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(ioctl) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 /* libc_hidden_proto(exit) */
 libc_hidden_proto(clnt_perror)
 libc_hidden_proto(clntudp_bufcreate)
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 0701d8ef4..037b3ede0 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -60,14 +60,14 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #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(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(xdrmem_create) */
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(xdr_reference)
 libc_hidden_proto(xdr_u_long)
 libc_hidden_proto(xdr_void)
@@ -79,7 +79,7 @@ libc_hidden_proto(clntudp_create)
 libc_hidden_proto(setsockopt)
 libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 /* libc_hidden_proto(fprintf) */
 
 
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index 9636f99e6..b8e54b61e 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -95,16 +95,16 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 /* 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(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(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)
@@ -121,13 +121,13 @@ libc_hidden_proto(bind)
 libc_hidden_proto(connect)
 libc_hidden_proto(sigblock)
 libc_hidden_proto(snprintf)
-libc_hidden_proto(poll)
+/* 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(fopen) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__h_errno_location)
diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c
index d40a04f6a..4a3141b6b 100644
--- a/libc/inet/rpc/rexec.c
+++ b/libc/inet/rpc/rexec.c
@@ -45,12 +45,12 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(socket)
-libc_hidden_proto(perror)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(socket) */
+/* libc_hidden_proto(perror) */
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(snprintf)
 libc_hidden_proto(getsockname)
 libc_hidden_proto(getnameinfo)
diff --git a/libc/inet/rpc/rpc_prot.c b/libc/inet/rpc/rpc_prot.c
index 74658e654..418aae900 100644
--- a/libc/inet/rpc/rpc_prot.c
+++ b/libc/inet/rpc/rpc_prot.c
@@ -146,7 +146,7 @@ static const struct xdr_discrim reply_dscrm[3] =
 /*
  * XDR a reply message
  */
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 bool_t
 xdr_replymsg (XDR *xdrs, struct rpc_msg *rmsg)
 {
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c
index ab3110543..80962a2b7 100644
--- a/libc/inet/rpc/rtime.c
+++ b/libc/inet/rpc/rtime.c
@@ -58,13 +58,13 @@ 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(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(poll) */
 libc_hidden_proto(rtime)
 
 #define NYEARS	(u_long)(1970 - 1900)
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index 47226c55f..0586516aa 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -49,9 +49,9 @@
 /* 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(getenv) */
+/* libc_hidden_proto(printf) */
+/* libc_hidden_proto(fstat) */
 libc_hidden_proto(__fsetlocking)
 libc_hidden_proto(getgid)
 libc_hidden_proto(getuid)
@@ -59,7 +59,7 @@ libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(gethostname)
 libc_hidden_proto(fileno)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
diff --git a/libc/inet/rpc/svc_authux.c b/libc/inet/rpc/svc_authux.c
index 64c911f93..9f2271ad2 100644
--- a/libc/inet/rpc/svc_authux.c
+++ b/libc/inet/rpc/svc_authux.c
@@ -47,8 +47,8 @@
 #include <rpc/svc.h>
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(printf)
-libc_hidden_proto(xdrmem_create)
+/* libc_hidden_proto(printf) */
+/* libc_hidden_proto(xdrmem_create) */
 libc_hidden_proto(xdr_authunix_parms)
 
 /*
diff --git a/libc/inet/rpc/svc_raw.c b/libc/inet/rpc/svc_raw.c
index 0cdbbb89a..7f3f55bc6 100644
--- a/libc/inet/rpc/svc_raw.c
+++ b/libc/inet/rpc/svc_raw.c
@@ -45,9 +45,9 @@ 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(xdrmem_create) */
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* 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 50e5fcd79..7ffff0772 100644
--- a/libc/inet/rpc/svc_run.c
+++ b/libc/inet/rpc/svc_run.c
@@ -39,9 +39,9 @@
 #include <sys/poll.h>
 #include <rpc/rpc.h>
 
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 libc_hidden_proto(svc_getreq_poll)
-libc_hidden_proto(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)
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index a757a281f..9373c8b65 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -58,8 +58,8 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 /* Experimentally off - libc_hidden_proto(strdup) */
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(asprintf)
-libc_hidden_proto(fputs)
-libc_hidden_proto(write)
+/* libc_hidden_proto(fputs) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(exit) */
 libc_hidden_proto(svc_sendreply)
 libc_hidden_proto(svc_register)
diff --git a/libc/inet/rpc/svc_tcp.c b/libc/inet/rpc/svc_tcp.c
index 51b3b764b..e04c28f63 100644
--- a/libc/inet/rpc/svc_tcp.c
+++ b/libc/inet/rpc/svc_tcp.c
@@ -61,26 +61,26 @@ 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(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(perror)
+/* 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(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(poll) */
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/inet/rpc/svc_udp.c b/libc/inet/rpc/svc_udp.c
index 0e008868b..733ec3f33 100644
--- a/libc/inet/rpc/svc_udp.c
+++ b/libc/inet/rpc/svc_udp.c
@@ -57,20 +57,20 @@ 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)
+/* 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(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(xdrmem_create) */
 libc_hidden_proto(xdr_callmsg)
-libc_hidden_proto(xdr_replymsg)
+/* libc_hidden_proto(xdr_replymsg) */
 libc_hidden_proto(getsockname)
 libc_hidden_proto(setsockopt)
 libc_hidden_proto(bind)
@@ -79,7 +79,7 @@ libc_hidden_proto(recvfrom)
 libc_hidden_proto(sendto)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(fprintf) */
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 48fba8977..03c4336d1 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -58,16 +58,16 @@
 /* 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(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(perror)
-libc_hidden_proto(getpid)
+/* 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(xdr_replymsg) */
 libc_hidden_proto(xprt_register)
 libc_hidden_proto(xprt_unregister)
 libc_hidden_proto(getegid)
@@ -77,10 +77,10 @@ libc_hidden_proto(setsockopt)
 libc_hidden_proto(bind)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(sendmsg)
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 libc_hidden_proto(accept)
 libc_hidden_proto(listen)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 /* libc_hidden_proto(abort) */
 
 /*
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index 54e716176..335702c0f 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -53,11 +53,11 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 
 #ifdef USE_IN_LIBIO
 # include <wchar.h>
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 
 /*
  * constants specific to the xdr "protocol"
diff --git a/libc/inet/rpc/xdr_array.c b/libc/inet/rpc/xdr_array.c
index a2299b683..f8f8a1f86 100644
--- a/libc/inet/rpc/xdr_array.c
+++ b/libc/inet/rpc/xdr_array.c
@@ -51,11 +51,11 @@ 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)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(xdr_u_int)
 
 #define LASTUNSIGNED	((u_int)0-1)
diff --git a/libc/inet/rpc/xdr_mem.c b/libc/inet/rpc/xdr_mem.c
index b7410c404..451751e45 100644
--- a/libc/inet/rpc/xdr_mem.c
+++ b/libc/inet/rpc/xdr_mem.c
@@ -74,7 +74,7 @@ static const struct xdr_ops xdrmem_ops =
  * The procedure xdrmem_create initializes a stream descriptor for a
  * memory buffer.
  */
-libc_hidden_proto(xdrmem_create)
+/* 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 ac331c4d3..38349f4ad 100644
--- a/libc/inet/rpc/xdr_rec.c
+++ b/libc/inet/rpc/xdr_rec.c
@@ -57,12 +57,12 @@
 # include <wchar.h>
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
-libc_hidden_proto(fwprintf)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(fputs)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(fputs) */
+/* libc_hidden_proto(lseek) */
 
 static bool_t xdrrec_getlong (XDR *, long *);
 static bool_t xdrrec_putlong (XDR *, const long *);
diff --git a/libc/inet/rpc/xdr_reference.c b/libc/inet/rpc/xdr_reference.c
index 6282f9cb1..dd8c063ba 100644
--- a/libc/inet/rpc/xdr_reference.c
+++ b/libc/inet/rpc/xdr_reference.c
@@ -52,12 +52,12 @@ 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)
+/* libc_hidden_proto(fwprintf) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(xdr_bool)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 
 #define LASTUNSIGNED	((u_int)0-1)
 
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index e57c0456d..e262e03f8 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -358,7 +358,7 @@ int shutdown(int sockfd, int how)
 #endif
 
 #ifdef L_socket
-libc_hidden_proto(socket)
+/* libc_hidden_proto(socket) */
 #ifdef __NR_socket
 _syscall3(int, socket, int, family, int, type, int, protocol)
 #elif defined(__NR_socketcall)
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index fc779448e..9c863e729 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -281,7 +281,7 @@ IS_FUNC_BODY(xdigit);
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(tolower) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
 int tolower(int c)
@@ -328,7 +328,7 @@ weak_alias (tolower_l, __tolower_l)
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__ctype_toupper)
 #endif
-libc_hidden_proto(toupper)
+/* libc_hidden_proto(toupper) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
 int toupper(int c)
diff --git a/libc/misc/dirent/opendir.c b/libc/misc/dirent/opendir.c
index e1be80ed3..4a5a562f8 100644
--- a/libc/misc/dirent/opendir.c
+++ b/libc/misc/dirent/opendir.c
@@ -15,11 +15,11 @@
 #include "dirstream.h"
 
 libc_hidden_proto(opendir)
-libc_hidden_proto(open)
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(fcntl) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(stat)
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(stat) */
+/* libc_hidden_proto(fstat) */
 
 /* opendir just makes an open() call - it return NULL if it fails
  * (open sets errno), otherwise it returns a DIR * pointer.
diff --git a/libc/misc/dirent/rewinddir.c b/libc/misc/dirent/rewinddir.c
index 1bbda0809..99aa6b263 100644
--- a/libc/misc/dirent/rewinddir.c
+++ b/libc/misc/dirent/rewinddir.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 
 /* rewinddir() just does an lseek(fd,0,0) - see close for comments */
 void rewinddir(DIR * dir)
diff --git a/libc/misc/dirent/seekdir.c b/libc/misc/dirent/seekdir.c
index c41844856..19661509d 100644
--- a/libc/misc/dirent/seekdir.c
+++ b/libc/misc/dirent/seekdir.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 
 void seekdir(DIR * dir, long int offset)
 {
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index 517e08630..566410485 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -27,10 +27,10 @@ libc_hidden_proto(verr)
 libc_hidden_proto(verrx)
 
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 libc_hidden_proto(__xpg_strerror_r)
 /* libc_hidden_proto(exit) */
-libc_hidden_proto(vfprintf)
+/* 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 c0f8f8d0a..3cf8d34f2 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -31,7 +31,7 @@
 /* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(exit) */
 libc_hidden_proto(putc)
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 libc_hidden_proto(fflush)
 libc_hidden_proto(fputc)
 libc_hidden_proto(__fputc_unlocked)
diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c
index 13b56aba4..bf14808de 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -27,8 +27,8 @@
 libc_hidden_proto(lockf)
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(fcntl)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(fcntl) */
+/* libc_hidden_proto(getpid) */
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index b2ffe5d8c..ba3887329 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -34,11 +34,11 @@
 #define F_SETLK F_SETLK64
 libc_hidden_proto(fcntl64)
 #else
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(fcntl) */
 #endif
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 351abaf73..559a3ca2a 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -71,9 +71,9 @@
 /* libc_hidden_proto(__ctype_b) */
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(tolower) */
 libc_hidden_proto(fnmatch)
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 #endif
 
 /* For platform which support the ISO C amendement 1 functionality we
diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c
index 577e35676..020d97bcf 100644
--- a/libc/misc/fnmatch/fnmatch_old.c
+++ b/libc/misc/fnmatch/fnmatch_old.c
@@ -25,7 +25,7 @@ Cambridge, MA 02139, USA.  */
 
 libc_hidden_proto(fnmatch)
 
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(tolower) */
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
    Library, but also included in many other GNU distributions.  Compiling
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index c136f1e8d..a3a2002da 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -102,8 +102,8 @@ libc_hidden_proto(stat64)
 #endif
 libc_hidden_proto(closedir)
 /* Experimentally off - libc_hidden_proto(stpcpy) */
-libc_hidden_proto(lstat)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(lstat) */
+/* libc_hidden_proto(stat) */
 
 #if ! _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy
 char *stpcpy ();
diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c
index 00963c36e..b1f1a6ad7 100644
--- a/libc/misc/glob/glob-susv3.c
+++ b/libc/misc/glob/glob-susv3.c
@@ -58,7 +58,7 @@ libc_hidden_proto(stat64)
 # define struct_stat struct stat64
 #else
 libc_hidden_proto(readdir_r)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 # define struct_stat struct stat
 #endif
 
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index 6ccbda4d7..abc75dee5 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -74,7 +74,7 @@ libc_hidden_proto(readdir64)
 #endif
 #define struct_stat64          struct stat
 #define __stat64(fname, buf)   stat (fname, buf)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 #endif
 
 
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 9e194983f..af4bfac42 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -38,7 +38,7 @@ libc_hidden_proto(getgid)
 libc_hidden_proto(getuid)
 libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(fstat) */
 /* libc_hidden_proto(abort) */
 
 extern __typeof(open) __libc_open;
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index 5b7b4f7f9..8ce277555 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -47,17 +47,17 @@
 
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(mkdir)
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(open64)
 #endif
-libc_hidden_proto(read)
+/* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(getpid)
-libc_hidden_proto(stat)
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(getpid) */
+/* libc_hidden_proto(stat) */
+/* libc_hidden_proto(gettimeofday) */
 
 /* Return nonzero if DIR is an existent directory.  */
 static int direxists (const char *dir)
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index d8c539728..c1f91bcee 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -66,7 +66,7 @@
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
 /* Experimentally off - libc_hidden_proto(strchr) */
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__C_ctype_toupper) */
 #endif
diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c
index a81a877bf..9730b5237 100644
--- a/libc/misc/mntent/mntent.c
+++ b/libc/misc/mntent/mntent.c
@@ -19,10 +19,10 @@ libc_hidden_proto(endmntent)
 /* Experimentally off - libc_hidden_proto(strstr) */
 /* Experimentally off - libc_hidden_proto(strtok_r) */
 libc_hidden_proto(atoi)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(fseek)
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 /* libc_hidden_proto(abort) */
 /* libc_hidden_proto(fprintf) */
 
diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c
index 80c95bba1..2dc196782 100644
--- a/libc/misc/regex/regex.c
+++ b/libc/misc/regex/regex.c
@@ -75,8 +75,8 @@ libc_hidden_proto(__ctype_toupper)
 #else
 libc_hidden_proto(isascii)
 #endif
-libc_hidden_proto(toupper)
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(toupper) */
+/* libc_hidden_proto(tolower) */
 /* Experimentally off - libc_hidden_proto(memcmp) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memmove) */
@@ -85,7 +85,7 @@ libc_hidden_proto(tolower)
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 /* Experimentally off - libc_hidden_proto(strcasecmp) */
 /* libc_hidden_proto(abort) */
 #ifdef __USE_GNU
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index 3aecf243f..e8201e90a 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -43,7 +43,7 @@
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(printf)
+/* libc_hidden_proto(printf) */
 /* libc_hidden_proto(abort) */
 #ifdef __USE_GNU
 /* Experimentally off - libc_hidden_proto(mempcpy) */
diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c
index 7956e014b..9f2d1ed61 100644
--- a/libc/misc/statfs/fstatvfs.c
+++ b/libc/misc/statfs/fstatvfs.c
@@ -33,7 +33,7 @@
 libc_hidden_proto(setmntent)
 libc_hidden_proto(getmntent_r)
 libc_hidden_proto(endmntent)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 #ifndef __USE_FILE_OFFSET64
 extern int fstatfs (int __fildes, struct statfs *__buf)
@@ -49,8 +49,8 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf),
 
 extern __typeof(fstatfs) __libc_fstatfs;
 libc_hidden_proto(__libc_fstatfs)
-libc_hidden_proto(fstat)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(fstat) */
+/* libc_hidden_proto(stat) */
 libc_hidden_proto(fstatvfs)
 
 int fstatvfs (int fd, struct statvfs *buf)
diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c
index 638a211a7..906eed327 100644
--- a/libc/misc/statfs/fstatvfs64.c
+++ b/libc/misc/statfs/fstatvfs64.c
@@ -44,7 +44,7 @@ libc_hidden_proto(fstatvfs)
 libc_hidden_proto(fstatfs64)
 #endif
 libc_hidden_proto(fstat64)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 int fstatvfs64 (int fd, struct statvfs64 *buf)
 {
diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c
index 5085a2a9e..795f19e79 100644
--- a/libc/misc/statfs/statvfs.c
+++ b/libc/misc/statfs/statvfs.c
@@ -36,7 +36,7 @@ libc_hidden_proto(endmntent)
 
 extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 libc_hidden_proto(statvfs)
 int statvfs (const char *file, struct statvfs *buf)
diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c
index f98a25719..508cd7192 100644
--- a/libc/misc/syslog/syslog.c
+++ b/libc/misc/syslog/syslog.c
@@ -90,17 +90,17 @@ libc_hidden_proto(closelog)
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
-libc_hidden_proto(open)
-libc_hidden_proto(fcntl)
-libc_hidden_proto(socket)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(fcntl) */
+/* libc_hidden_proto(socket) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(write)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(getpid) */
 libc_hidden_proto(ctime)
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 libc_hidden_proto(sigemptyset)
 libc_hidden_proto(connect)
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 libc_hidden_proto(vsnprintf)
 /* Experimentally off - libc_hidden_proto(time) */
 
diff --git a/libc/misc/sysvipc/ftok.c b/libc/misc/sysvipc/ftok.c
index 12627cad1..200d5cf90 100644
--- a/libc/misc/sysvipc/ftok.c
+++ b/libc/misc/sysvipc/ftok.c
@@ -20,7 +20,7 @@
 #include <sys/ipc.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 key_t ftok (const char *pathname, int proj_id)
 {
diff --git a/libc/misc/time/ftime.c b/libc/misc/time/ftime.c
index 49c137ce5..867f4fd2f 100644
--- a/libc/misc/time/ftime.c
+++ b/libc/misc/time/ftime.c
@@ -19,7 +19,7 @@
 #include <sys/timeb.h>
 #include <sys/time.h>
 
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 int ftime(struct timeb *timebuf)
 {
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 13d62ad1b..ce58c8fe9 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -167,12 +167,12 @@ libc_hidden_proto(localtime_r)
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
 /* libc_hidden_proto(sprintf) */
-libc_hidden_proto(open)
-libc_hidden_proto(read)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 libc_hidden_proto(tzset)
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 /* Experimentally off - libc_hidden_proto(strncasecmp) */
 libc_hidden_proto(strtol)
 libc_hidden_proto(strtoul)
diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c
index 059835d2e..88bc2be70 100644
--- a/libc/misc/ttyent/getttyent.c
+++ b/libc/misc/ttyent/getttyent.c
@@ -46,7 +46,7 @@ libc_hidden_proto(rewind)
 libc_hidden_proto(fgets_unlocked)
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_XLOCALE__
diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c
index c3f4e1314..627839715 100644
--- a/libc/misc/utmp/utent.c
+++ b/libc/misc/utmp/utent.c
@@ -23,12 +23,12 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strdup) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(open)
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(fcntl) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(utmplock, PTHREAD_MUTEX_INITIALIZER);
diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c
index a5df5a609..12ffc1a86 100644
--- a/libc/misc/utmp/wtent.c
+++ b/libc/misc/utmp/wtent.c
@@ -19,11 +19,11 @@
 /* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(updwtmp)
 #endif
-libc_hidden_proto(open)
-libc_hidden_proto(write)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(lockf)
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 #if 0
 /* This is enabled in uClibc/libutil/logwtmp.c */
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c
index 5dd9a0764..4437d9181 100644
--- a/libc/misc/wctype/_wctype.c
+++ b/libc/misc/wctype/_wctype.c
@@ -38,8 +38,8 @@
 #include <bits/uClibc_uwchar.h>
 
 /* Experimentally off - libc_hidden_proto(strcmp) */
-libc_hidden_proto(tolower)
-libc_hidden_proto(toupper)
+/* libc_hidden_proto(tolower) */
+/* libc_hidden_proto(toupper) */
 libc_hidden_proto(towlower)
 libc_hidden_proto(towupper)
 libc_hidden_proto(towctrans)
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index 05a2f0b46..4fb1aaa48 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -57,12 +57,12 @@ libc_hidden_proto(atoi)
 libc_hidden_proto(fnmatch)
 libc_hidden_proto(pipe)
 libc_hidden_proto(fork)
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(read)
-libc_hidden_proto(getenv)
-libc_hidden_proto(getpid)
-libc_hidden_proto(sprintf)
+/* 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(glob)
diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c
index 1d0779725..456cc8a55 100644
--- a/libc/pwd_grp/lckpwdf.c
+++ b/libc/pwd_grp/lckpwdf.c
@@ -29,12 +29,12 @@
 #include <shadow.h>
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(open)
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(fcntl) */
 /* libc_hidden_proto(close) */
 libc_hidden_proto(sigfillset)
-libc_hidden_proto(sigaction)
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigaction) */
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(sigaddset)
 libc_hidden_proto(sigemptyset)
 libc_hidden_proto(alarm)
diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c
index 14c16604b..6b1bd63b1 100644
--- a/libc/pwd_grp/pwd_grp.c
+++ b/libc/pwd_grp/pwd_grp.c
@@ -44,8 +44,8 @@ libc_hidden_proto(strtoul)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets_unlocked)
 libc_hidden_proto(__fputc_unlocked)
-libc_hidden_proto(sprintf)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(sprintf) */
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 /* libc_hidden_proto(fprintf) */
 #ifdef __UCLIBC_HAS_XLOCALE__
diff --git a/libc/signal/raise.c b/libc/signal/raise.c
index 28e511635..e304786c1 100644
--- a/libc/signal/raise.c
+++ b/libc/signal/raise.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 
 
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 libc_hidden_proto(kill)
 
 int __raise (int signo)  attribute_hidden;
diff --git a/libc/signal/sigaction.c b/libc/signal/sigaction.c
index 88fb6b7a4..221951eeb 100644
--- a/libc/signal/sigaction.c
+++ b/libc/signal/sigaction.c
@@ -109,7 +109,7 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/signal/sigblock.c b/libc/signal/sigblock.c
index 1f1a9fe98..5aa3867e4 100644
--- a/libc/signal/sigblock.c
+++ b/libc/signal/sigblock.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 #include "sigset-cvt-mask.h"
 
diff --git a/libc/signal/sighold.c b/libc/signal/sighold.c
index da723ac86..728c10aef 100644
--- a/libc/signal/sighold.c
+++ b/libc/signal/sighold.c
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(sigaddset)
 
 int sighold (int sig)
diff --git a/libc/signal/sigignore.c b/libc/signal/sigignore.c
index 17d93ce19..58d1c9bfd 100644
--- a/libc/signal/sigignore.c
+++ b/libc/signal/sigignore.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 
 int sigignore (int sig)
 {
diff --git a/libc/signal/sigintr.c b/libc/signal/sigintr.c
index 43136379f..351c82b75 100644
--- a/libc/signal/sigintr.c
+++ b/libc/signal/sigintr.c
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <errno.h>
 
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 
 /* If INTERRUPT is nonzero, make signal SIG interrupt system calls
    (causing them to fail with EINTR); if INTERRUPT is zero, make system
diff --git a/libc/signal/sigjmp.c b/libc/signal/sigjmp.c
index d143e9376..d83b49a0b 100644
--- a/libc/signal/sigjmp.c
+++ b/libc/signal/sigjmp.c
@@ -21,7 +21,7 @@
 #include <signal.h>
 #include <libc-internal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 /* This function is called by the `sigsetjmp' macro
    before doing a `__setjmp' on ENV[0].__jmpbuf.
diff --git a/libc/signal/signal.c b/libc/signal/signal.c
index 991a14f1b..04705703a 100644
--- a/libc/signal/signal.c
+++ b/libc/signal/signal.c
@@ -22,7 +22,7 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 
 sigset_t _sigintr attribute_hidden;		/* Set by siginterrupt.  */
 
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index 8c99af0a1..952350b6a 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <stddef.h>		/* For NULL.  */
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(sigdelset)
 libc_hidden_proto(sigsuspend)
 
diff --git a/libc/signal/sigrelse.c b/libc/signal/sigrelse.c
index 8532a88f3..61bd32df7 100644
--- a/libc/signal/sigrelse.c
+++ b/libc/signal/sigrelse.c
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(sigdelset)
 
 int sigrelse (int sig)
diff --git a/libc/signal/sigset.c b/libc/signal/sigset.c
index db1fb7d74..f4c04dc3e 100644
--- a/libc/signal/sigset.c
+++ b/libc/signal/sigset.c
@@ -22,8 +22,8 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-libc_hidden_proto(sigaction)
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigaction) */
+/* libc_hidden_proto(sigprocmask) */
 
 /* Set the disposition for SIG.  */
 __sighandler_t sigset (int sig, __sighandler_t disp)
diff --git a/libc/signal/sigsetmask.c b/libc/signal/sigsetmask.c
index 2c074674d..ef8559ec8 100644
--- a/libc/signal/sigsetmask.c
+++ b/libc/signal/sigsetmask.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 #include "sigset-cvt-mask.h"
 
diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c
index 99832f809..117c1c4b3 100644
--- a/libc/signal/sigwait.c
+++ b/libc/signal/sigwait.c
@@ -38,7 +38,7 @@ int __sigwait (const sigset_t *set, int *sig)
 #else /* __UCLIBC_HAS_REALTIME__ */
 /* variant without REALTIME extensions */
 libc_hidden_proto(sigfillset)
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 libc_hidden_proto(sigsuspend)
 
 static int was_sig; /* obviously not thread-safe */
diff --git a/libc/signal/sysv_signal.c b/libc/signal/sysv_signal.c
index 6eebf201b..c0cd19a95 100644
--- a/libc/signal/sysv_signal.c
+++ b/libc/signal/sysv_signal.c
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <string.h>	/* For the real memset prototype.  */
 
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 
 /* Tolerate non-threads versions of Posix */
 #ifndef SA_ONESHOT
diff --git a/libc/stdio/_READ.c b/libc/stdio/_READ.c
index 09fca91c7..0531b2ef2 100644
--- a/libc/stdio/_READ.c
+++ b/libc/stdio/_READ.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(read)
+/* libc_hidden_proto(read) */
 /* libc_hidden_proto(abort) */
 
 /* Given a reading stream without its end-of-file indicator set and
diff --git a/libc/stdio/_WRITE.c b/libc/stdio/_WRITE.c
index 83714bd4c..3d6174325 100644
--- a/libc/stdio/_WRITE.c
+++ b/libc/stdio/_WRITE.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(write)
+/* libc_hidden_proto(write) */
 
 /* Given a writing stream with no buffered output, write the
  * data in 'buf' (which may be the stream's bufstart) of size
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 8f83aa229..3cca7b9af 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -7,13 +7,13 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(read)
-libc_hidden_proto(write)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(lseek64)
 #else
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 #endif
 
 /**********************************************************************/
diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index 5243e33f7..d3240b77b 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -8,8 +8,8 @@
 #include "_stdio.h"
 
 libc_hidden_proto(isatty)
-libc_hidden_proto(open)
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(fcntl) */
 
 /*
  * Cases:
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index 635ab803d..fcd21f707 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 
 libc_hidden_proto(fdopen)
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(fcntl) */
 
 FILE *fdopen(int filedes, const char *mode)
 {
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index 5acaf91ed..5eb1aac31 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -64,14 +64,14 @@ char *fgets_unlocked(char *__restrict s, int n,
 libc_hidden_def(fgets_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 strong_alias(fgets_unlocked,fgets)
 libc_hidden_def(fgets)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fgets)
+/* libc_hidden_proto(fgets) */
 char *fgets(char *__restrict s, int n,
 			register FILE * __restrict stream)
 {
diff --git a/libc/stdio/fopen.c b/libc/stdio/fopen.c
index ec14b5956..b5fc85af9 100644
--- a/libc/stdio/fopen.c
+++ b/libc/stdio/fopen.c
@@ -14,7 +14,7 @@
 #undef fopen64
 #endif
 
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 FILE *fopen(const char * __restrict filename, const char * __restrict mode)
 {
 	return _stdio_fopen(((intptr_t) filename), mode, NULL, FILEDES_ARG);
diff --git a/libc/stdio/fprintf.c b/libc/stdio/fprintf.c
index b10340f65..4e3246ec8 100644
--- a/libc/stdio/fprintf.c
+++ b/libc/stdio/fprintf.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 
 /* libc_hidden_proto(fprintf) */
 int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index 8a5fd4087..553fb2eb9 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -29,14 +29,14 @@ int fputs_unlocked(register const char * __restrict s,
 libc_hidden_def(fputs_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 strong_alias(fputs_unlocked,fputs)
 libc_hidden_def(fputs)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fputs) */
 int fputs(const char * __restrict s, register FILE * __restrict stream)
 {
 	int retval;
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index a7ec28d8d..17969a4fa 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -343,7 +343,7 @@ static const char u_spec[] = "%nbopxXudics";
 /* u_radix[i] <-> u_spec[i+2] for unsigned entries only */
 static const char u_radix[] = "\x02\x08\x10\x10\x10\x0a";
 
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 int vfprintf(FILE * __restrict op, register const char * __restrict fmt,
 			 va_list ap)
 {
diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c
index 46881ea85..0f63c40bf 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -14,7 +14,7 @@ libc_hidden_proto(__glibc_strerror_r)
 #warning CONSIDER: Increase buffer size for error message (non-%m case)?
 #endif
 
-libc_hidden_proto(perror)
+/* libc_hidden_proto(perror) */
 void perror(register const char *s)
 {
 	/* If the program is calling perror, it's a safe bet that printf and
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index fc6979375..21b1231ea 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -27,7 +27,7 @@
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
 /* libc_hidden_proto(close) */
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 libc_hidden_proto(waitpid)
 libc_hidden_proto(execl)
 libc_hidden_proto(dup2)
diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c
index 617561fec..2f4a36e95 100644
--- a/libc/stdio/printf.c
+++ b/libc/stdio/printf.c
@@ -8,9 +8,9 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 
-libc_hidden_proto(printf)
+/* libc_hidden_proto(printf) */
 int printf(const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/sprintf.c b/libc/stdio/sprintf.c
index 360245366..2528720e4 100644
--- a/libc/stdio/sprintf.c
+++ b/libc/stdio/sprintf.c
@@ -14,7 +14,7 @@
 
 libc_hidden_proto(vsnprintf)
 
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 int sprintf(char *__restrict buf, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index 98ca6c2a7..3c8256870 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -25,7 +25,7 @@
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 libc_hidden_proto(open_memstream)
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 #else
 libc_hidden_proto(vsnprintf)
 #endif
diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c
index 6e28b14c0..f00df05bc 100644
--- a/libc/stdio/vdprintf.c
+++ b/libc/stdio/vdprintf.c
@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 #ifdef __USE_OLD_VFPRINTF__
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 #endif
 libc_hidden_proto(fflush_unlocked)
 
diff --git a/libc/stdio/vprintf.c b/libc/stdio/vprintf.c
index 7848a078d..b01b2310f 100644
--- a/libc/stdio/vprintf.c
+++ b/libc/stdio/vprintf.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 
 int vprintf(const char * __restrict format, va_list arg)
 {
diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c
index f7d2349c1..06636c2f1 100644
--- a/libc/stdio/vsnprintf.c
+++ b/libc/stdio/vsnprintf.c
@@ -11,7 +11,7 @@
 libc_hidden_proto(vsnprintf)
 
 #ifdef __USE_OLD_VFPRINTF__
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 #endif
 
 #ifdef __UCLIBC_MJN3_ONLY__
diff --git a/libc/stdlib/__uc_malloc.c b/libc/stdlib/__uc_malloc.c
index 81eee1343..c98bcfa18 100644
--- a/libc/stdlib/__uc_malloc.c
+++ b/libc/stdlib/__uc_malloc.c
@@ -22,7 +22,7 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 libc_hidden_proto(__uc_malloc)
 libc_hidden_proto(__uc_malloc_failed)
 
diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
index 38d2d78a0..884032bba 100644
--- a/libc/stdlib/_atexit.c
+++ b/libc/stdlib/_atexit.c
@@ -47,7 +47,7 @@
 __UCLIBC_MUTEX_EXTERN(__atexit_lock);
 
 /* libc_hidden_proto(exit) */
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 
 
 typedef void (*aefuncp) (void);         /* atexit function pointer */
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index 82a9a5e80..84251664b 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -29,10 +29,10 @@ Cambridge, MA 02139, USA.  */
 /* libc_hidden_proto(abort) */
 
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(sigaction)
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigaction) */
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(raise)
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 
 /* Our last ditch effort to commit suicide */
 #ifdef __UCLIBC_ABORT_INSTRUCTION__
diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c
index 5355713bf..0fab85c96 100644
--- a/libc/stdlib/arc4random.c
+++ b/libc/stdlib/arc4random.c
@@ -38,10 +38,10 @@
 //libc_hidden_proto(sysctl)
 #endif
 
-libc_hidden_proto(open)
-libc_hidden_proto(read)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 struct arc4_stream {
 	uint8_t i;
diff --git a/libc/stdlib/bsd_getpt.c b/libc/stdlib/bsd_getpt.c
index 1afd57f47..c7582e855 100644
--- a/libc/stdlib/bsd_getpt.c
+++ b/libc/stdlib/bsd_getpt.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #if defined __USE_BSD
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
 
 /* Prefix for master pseudo terminal nodes.  */
diff --git a/libc/stdlib/gcvt.c b/libc/stdlib/gcvt.c
index f1c1f4270..6c61ee1e4 100644
--- a/libc/stdlib/gcvt.c
+++ b/libc/stdlib/gcvt.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-libc_hidden_proto(sprintf)
+/* libc_hidden_proto(sprintf) */
 
 #ifdef __UCLIBC_HAS_FLOATS__
 #define MAX_NDIGIT 17
diff --git a/libc/stdlib/getenv.c b/libc/stdlib/getenv.c
index 7b3df7e64..e0193e223 100644
--- a/libc/stdlib/getenv.c
+++ b/libc/stdlib/getenv.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 /* Experimentally off - libc_hidden_proto(memcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index 5fb142d4b..54555cf07 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -28,7 +28,7 @@
 extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
 
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
 
 #if !defined __ASSUME_DEVPTS__
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
index 45faf62db..c8aa1f497 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -19,7 +19,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /*libc_hidden_proto(memset)*/
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 libc_hidden_proto(munmap)
 
 #ifdef L_malloc
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index d4259d526..b6a9130f6 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -24,9 +24,9 @@
 #include <sys/mman.h>
 #include <bits/uClibc_mutex.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 libc_hidden_proto(sysconf)
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 /* libc_hidden_proto(abort) */
 
 
diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c
index 91552919e..95b7abcbe 100644
--- a/libc/stdlib/malloc/free.c
+++ b/libc/stdlib/malloc/free.c
@@ -16,7 +16,7 @@
 #include <sys/mman.h>
 
 libc_hidden_proto(munmap)
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/heap_debug.c b/libc/stdlib/malloc/heap_debug.c
index f51a68b57..f1ccc6f2d 100644
--- a/libc/stdlib/malloc/heap_debug.c
+++ b/libc/stdlib/malloc/heap_debug.c
@@ -17,9 +17,9 @@
 #include <string.h>
 #include <unistd.h>
 
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/malloc.c b/libc/stdlib/malloc/malloc.c
index 620a9fbcc..19877db89 100644
--- a/libc/stdlib/malloc/malloc.c
+++ b/libc/stdlib/malloc/malloc.c
@@ -16,8 +16,8 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(mmap)
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(mmap) */
+/* libc_hidden_proto(sbrk) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/malloc_debug.c b/libc/stdlib/malloc/malloc_debug.c
index 39c3919c5..c19059b43 100644
--- a/libc/stdlib/malloc/malloc_debug.c
+++ b/libc/stdlib/malloc/malloc_debug.c
@@ -17,9 +17,9 @@
 #include <stdarg.h>
 
 libc_hidden_proto(atoi)
-libc_hidden_proto(vfprintf)
+/* libc_hidden_proto(vfprintf) */
 libc_hidden_proto(putc)
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c
index bd9c3cab2..4ac2fcd21 100644
--- a/libc/stdlib/ptsname.c
+++ b/libc/stdlib/ptsname.c
@@ -33,9 +33,9 @@
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(isatty)
-libc_hidden_proto(ioctl)
-libc_hidden_proto(fstat)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(ioctl) */
+/* libc_hidden_proto(fstat) */
+/* libc_hidden_proto(stat) */
 
 #if !defined __UNIX98PTY_ONLY__
 
diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c
index 4d75a4077..33091da0a 100644
--- a/libc/stdlib/system.c
+++ b/libc/stdlib/system.c
@@ -11,7 +11,7 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 libc_hidden_proto(wait4)
 libc_hidden_proto(execl)
 libc_hidden_proto(signal)
diff --git a/libc/stdlib/unix_grantpt.c b/libc/stdlib/unix_grantpt.c
index d1eef9efd..5d62846ef 100644
--- a/libc/stdlib/unix_grantpt.c
+++ b/libc/stdlib/unix_grantpt.c
@@ -40,10 +40,10 @@ libc_hidden_proto(chmod)
 libc_hidden_proto(chown)
 libc_hidden_proto(vfork)
 libc_hidden_proto(fork)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 libc_hidden_proto(ptsname_r)
 libc_hidden_proto(execle)
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
diff --git a/libc/stdlib/unlockpt.c b/libc/stdlib/unlockpt.c
index 8c426553c..731a11a85 100644
--- a/libc/stdlib/unlockpt.c
+++ b/libc/stdlib/unlockpt.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* Unlock the slave pseudo terminal associated with the master pseudo
    terminal specified by FD.  */
diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index 5f2dc8e04..a5254f327 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -33,7 +33,7 @@ libc_hidden_proto(tolower_l)
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(tolower) */
 #  define TOLOWER(C) tolower((C))
 # endif
 #endif
diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c
index 143392d3a..4804494cc 100644
--- a/libc/string/strcasestr.c
+++ b/libc/string/strcasestr.c
@@ -13,7 +13,7 @@
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(tolower) */
 
 char *strcasestr(const char *s1, const char *s2)
 {
diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index 83efd85a7..9df9be59c 100644
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -33,7 +33,7 @@ libc_hidden_proto(tolower_l)
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
-libc_hidden_proto(tolower)
+/* libc_hidden_proto(tolower) */
 #  define TOLOWER(C) tolower((C))
 # endif
 #endif
diff --git a/libc/sysdeps/linux/alpha/sigprocmask.c b/libc/sysdeps/linux/alpha/sigprocmask.c
index 32f0275d9..f5e3c8d91 100644
--- a/libc/sysdeps/linux/alpha/sigprocmask.c
+++ b/libc/sysdeps/linux/alpha/sigprocmask.c
@@ -27,7 +27,7 @@
 
 static __inline__ _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval)
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 int
 sigprocmask (int how, const sigset_t *set, sigset_t *oset)
 {
diff --git a/libc/sysdeps/linux/arm/brk.c b/libc/sysdeps/linux/arm/brk.c
index 47179901f..aaa71cc6d 100644
--- a/libc/sysdeps/linux/arm/brk.c
+++ b/libc/sysdeps/linux/arm/brk.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index 6a020365e..daa8b72a1 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -49,15 +49,15 @@
 libc_hidden_proto(ioperm)
 
 libc_hidden_proto(readlink)
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 libc_hidden_proto(sscanf)
 libc_hidden_proto(fscanf)
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(fgets)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fgets) */
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
 
 #include <linux/version.h>
diff --git a/libc/sysdeps/linux/arm/sigaction.c b/libc/sysdeps/linux/arm/sigaction.c
index 552ac17bf..9c1160866 100644
--- a/libc/sysdeps/linux/arm/sigaction.c
+++ b/libc/sysdeps/linux/arm/sigaction.c
@@ -120,7 +120,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/avr32/brk.c b/libc/sysdeps/linux/avr32/brk.c
index a54b49a61..7d34405dc 100644
--- a/libc/sysdeps/linux/avr32/brk.c
+++ b/libc/sysdeps/linux/avr32/brk.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 void *__curbrk attribute_hidden = 0;
 
diff --git a/libc/sysdeps/linux/avr32/mmap.c b/libc/sysdeps/linux/avr32/mmap.c
index 92d3fe45a..b3d8b98c1 100644
--- a/libc/sysdeps/linux/avr32/mmap.c
+++ b/libc/sysdeps/linux/avr32/mmap.c
@@ -11,7 +11,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 static _syscall6(__ptr_t, mmap2, __ptr_t, addr, size_t, len, int, prot,
 		 int, flags, int, fd, __off_t, pgoff)
diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c
index 5a1ec9eae..05caec7ee 100644
--- a/libc/sysdeps/linux/avr32/sigaction.c
+++ b/libc/sysdeps/linux/avr32/sigaction.c
@@ -55,7 +55,7 @@ int __libc_sigaction(int signum, const struct sigaction *act,
 }
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction, sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/bfin/brk.c b/libc/sysdeps/linux/bfin/brk.c
index 64480453e..88b82cf64 100644
--- a/libc/sysdeps/linux/bfin/brk.c
+++ b/libc/sysdeps/linux/bfin/brk.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void * __curbrk attribute_hidden = 0;
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index a3fb74fa3..3860050f8 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -48,7 +48,7 @@ int __libc_fcntl(int fd, int cmd, ...)
 }
 libc_hidden_def(__libc_fcntl)
 
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(fcntl) */
 weak_alias(__libc_fcntl,fcntl)
 libc_hidden_weak(fcntl)
 #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__
diff --git a/libc/sysdeps/linux/common/_exit.c b/libc/sysdeps/linux/common/_exit.c
index 4a654a6f1..518a6d2e8 100644
--- a/libc/sysdeps/linux/common/_exit.c
+++ b/libc/sysdeps/linux/common/_exit.c
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 
 #ifndef INLINE_SYSCALL
 #define INLINE_SYSCALL(name, nr, args...) __syscall_exit (args)
diff --git a/libc/sysdeps/linux/common/clock_gettime.c b/libc/sysdeps/linux/common/clock_gettime.c
index f0f1ae44f..f1db8ad7c 100644
--- a/libc/sysdeps/linux/common/clock_gettime.c
+++ b/libc/sysdeps/linux/common/clock_gettime.c
@@ -15,7 +15,7 @@
 #ifdef __NR_clock_gettime
 _syscall2(int, clock_gettime, clockid_t, clock_id, struct timespec*, tp)
 #else
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 int clock_gettime(clockid_t clock_id, struct timespec* tp)
 {
diff --git a/libc/sysdeps/linux/common/dl-osinfo.h b/libc/sysdeps/linux/common/dl-osinfo.h
index a038ea31e..195c64803 100644
--- a/libc/sysdeps/linux/common/dl-osinfo.h
+++ b/libc/sysdeps/linux/common/dl-osinfo.h
@@ -21,10 +21,10 @@
 
 #  ifdef IS_IN_libc
 #include <fcntl.h>
-libc_hidden_proto(open)
-libc_hidden_proto(read)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 #   define OPEN open
 #   define READ read
 #   define CLOSE close
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
index 8d1cfdcd0..34a6e7b46 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -18,7 +18,7 @@
 
 #undef fstat64
 
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(fstat) */
 
 #define __NR___syscall_fstat __NR_fstat
 static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf)
diff --git a/libc/sysdeps/linux/common/getcwd.c b/libc/sysdeps/linux/common/getcwd.c
index ddeb483d6..07e1481e4 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -25,7 +25,7 @@ libc_hidden_proto(getpagesize)
 libc_hidden_proto(opendir)
 libc_hidden_proto(readdir)
 libc_hidden_proto(closedir)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 #ifdef __NR_getcwd
 
diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c
index 17f1ddc52..0baf47eb4 100644
--- a/libc/sysdeps/linux/common/getdents.c
+++ b/libc/sysdeps/linux/common/getdents.c
@@ -72,7 +72,7 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes)
 #elif ! defined __UCLIBC_HAS_LFS__ || ! defined __NR_getdents64
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 
 ssize_t __getdents (int fd, char *buf, size_t nbytes)
 {
diff --git a/libc/sysdeps/linux/common/getdirname.c b/libc/sysdeps/linux/common/getdirname.c
index 5938d7257..2eba80c6e 100644
--- a/libc/sysdeps/linux/common/getdirname.c
+++ b/libc/sysdeps/linux/common/getdirname.c
@@ -27,11 +27,11 @@
 
 /* Experimentally off - libc_hidden_proto(strdup) */
 libc_hidden_proto(getcwd)
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(stat64)
 #else
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 #endif
 
 /* Return a malloc'd string containing the current directory name.
diff --git a/libc/sysdeps/linux/common/getpid.c b/libc/sysdeps/linux/common/getpid.c
index 47fc96735..d78c6e906 100644
--- a/libc/sysdeps/linux/common/getpid.c
+++ b/libc/sysdeps/linux/common/getpid.c
@@ -16,6 +16,6 @@ extern __typeof(getpid) __libc_getpid;
 #endif
 #define __NR___libc_getpid __NR_getpid
 _syscall0(pid_t, __libc_getpid)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 weak_alias(__libc_getpid, getpid)
 libc_hidden_weak(getpid)
diff --git a/libc/sysdeps/linux/common/getppid.c b/libc/sysdeps/linux/common/getppid.c
index a167750dd..7adeb2f8b 100644
--- a/libc/sysdeps/linux/common/getppid.c
+++ b/libc/sysdeps/linux/common/getppid.c
@@ -12,7 +12,7 @@
 #ifdef	__NR_getppid
 _syscall0(pid_t, getppid)
 #else
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 pid_t getppid(void)
 {
 	return getpid();
diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c
index 620eed3b2..663cc3b50 100644
--- a/libc/sysdeps/linux/common/gettimeofday.c
+++ b/libc/sysdeps/linux/common/gettimeofday.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 #ifdef __USE_BSD
 _syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz)
 #else
diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c
index 51f83a372..990558ef1 100644
--- a/libc/sysdeps/linux/common/ioctl.c
+++ b/libc/sysdeps/linux/common/ioctl.c
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <sys/ioctl.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 #define __NR___syscall_ioctl __NR_ioctl
 static __always_inline
diff --git a/libc/sysdeps/linux/common/longjmp.c b/libc/sysdeps/linux/common/longjmp.c
index a54f01f48..672754a73 100644
--- a/libc/sysdeps/linux/common/longjmp.c
+++ b/libc/sysdeps/linux/common/longjmp.c
@@ -20,7 +20,7 @@
 #include <setjmp.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 extern void __longjmp (__jmp_buf __env, int __val) attribute_noreturn;
 libc_hidden_proto(__longjmp)
diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c
index 61675cfd4..8c0525d07 100644
--- a/libc/sysdeps/linux/common/lseek.c
+++ b/libc/sysdeps/linux/common/lseek.c
@@ -26,6 +26,6 @@ __off_t __libc_lseek(int fildes, __off_t offset, int whence)
 #endif
 libc_hidden_def(__libc_lseek)
 
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 weak_alias(__libc_lseek,lseek)
 libc_hidden_weak(lseek)
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index 4c67c1987..fb07dfe10 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -18,7 +18,7 @@
 
 #undef lstat64
 
-libc_hidden_proto(lstat)
+/* libc_hidden_proto(lstat) */
 
 #define __NR___syscall_lstat __NR_lstat
 static __inline__ _syscall2(int, __syscall_lstat,
diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c
index af9685a00..d5b0b85df 100644
--- a/libc/sysdeps/linux/common/mmap.c
+++ b/libc/sysdeps/linux/common/mmap.c
@@ -14,7 +14,7 @@
 
 #ifdef __NR_mmap
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #ifdef __UCLIBC_MMAP_HAS_6_ARGS__
 
@@ -45,7 +45,7 @@ libc_hidden_def(mmap)
 
 #elif defined(__NR_mmap2)
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #define __NR___syscall_mmap2 __NR_mmap2
 static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
index 3abfd566b..2b10e5710 100644
--- a/libc/sysdeps/linux/common/mmap64.c
+++ b/libc/sysdeps/linux/common/mmap64.c
@@ -15,7 +15,7 @@
 #include <sys/syscall.h>
 #include <bits/uClibc_page.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 # if !defined __NR_mmap2 || !defined _syscall6
 
diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c
index f9b10d8c0..a39093bd1 100644
--- a/libc/sysdeps/linux/common/open.c
+++ b/libc/sysdeps/linux/common/open.c
@@ -37,7 +37,7 @@ int __libc_open(const char *file, int oflag, ...)
 }
 libc_hidden_def(__libc_open)
 
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 weak_alias(__libc_open,open)
 libc_hidden_weak(open)
 
diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c
index 256581c92..764a9aa7b 100644
--- a/libc/sysdeps/linux/common/poll.c
+++ b/libc/sysdeps/linux/common/poll.c
@@ -229,6 +229,6 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 }
 
 #endif
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 weak_alias(__libc_poll,poll)
 libc_hidden_weak(poll)
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index eb96c3e91..353cf1ac2 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -75,9 +75,9 @@ weak_alias(__libc_pwrite64,pwrite64)
 #endif /* __NR_pwrite */
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/common/pselect.c b/libc/sysdeps/linux/common/pselect.c
index 3a958fcfc..567728f51 100644
--- a/libc/sysdeps/linux/common/pselect.c
+++ b/libc/sysdeps/linux/common/pselect.c
@@ -25,7 +25,7 @@
 
 extern __typeof(pselect) __libc_pselect;
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(select)
 
 
diff --git a/libc/sysdeps/linux/common/read.c b/libc/sysdeps/linux/common/read.c
index 965787d52..cfa857319 100644
--- a/libc/sysdeps/linux/common/read.c
+++ b/libc/sysdeps/linux/common/read.c
@@ -13,6 +13,6 @@
 extern __typeof(read) __libc_read;
 #define __NR___libc_read __NR_read
 _syscall3(ssize_t, __libc_read, int, fd, __ptr_t, buf, size_t, count)
-libc_hidden_proto(read)
+/* libc_hidden_proto(read) */
 weak_alias(__libc_read,read)
 libc_hidden_weak(read)
diff --git a/libc/sysdeps/linux/common/sbrk.c b/libc/sysdeps/linux/common/sbrk.c
index 734a4ce01..9ec1db3db 100644
--- a/libc/sysdeps/linux/common/sbrk.c
+++ b/libc/sysdeps/linux/common/sbrk.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* Defined in brk.c.  */
 extern void *__curbrk attribute_hidden;
@@ -15,7 +15,7 @@ extern void *__curbrk attribute_hidden;
 /* Extend the process's data space by INCREMENT.
    If INCREMENT is negative, shrink data space by - INCREMENT.
    Return start of new space allocated, or -1 for errors.  */
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void * sbrk (intptr_t increment)
 {
     void *oldbrk;
diff --git a/libc/sysdeps/linux/common/sched_setaffinity.c b/libc/sysdeps/linux/common/sched_setaffinity.c
index 815fe8017..aec032eab 100644
--- a/libc/sysdeps/linux/common/sched_setaffinity.c
+++ b/libc/sysdeps/linux/common/sched_setaffinity.c
@@ -31,7 +31,7 @@
 #include <alloca.h>
 
 #if defined __NR_sched_setaffinity
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 
 #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity
 static __inline__ _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid,
diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c
index 7da17bc77..a9a913e10 100644
--- a/libc/sysdeps/linux/common/sigprocmask.c
+++ b/libc/sysdeps/linux/common/sigprocmask.c
@@ -14,7 +14,7 @@
 
 #undef sigprocmask
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 #ifdef __NR_rt_sigprocmask
 
diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c
index f941d6354..5e79bc667 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -24,7 +24,7 @@
 #include <sys/syscall.h>
 #if defined __USE_POSIX199309
 
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 libc_hidden_proto(getuid)
 /* Experimentally off - libc_hidden_proto(memset) */
 
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index 08ef00d6a..b939b4ea0 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -37,14 +37,14 @@ libc_hidden_proto(syslog)
 libc_hidden_proto(closelog)
 #endif
 
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 libc_hidden_proto(sigfillset)
 libc_hidden_proto(sigdelset)
-libc_hidden_proto(sigprocmask)
-libc_hidden_proto(write)
+/* libc_hidden_proto(sigprocmask) */
+/* libc_hidden_proto(write) */
 libc_hidden_proto(kill)
-libc_hidden_proto(getpid)
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(getpid) */
+/* libc_hidden_proto(_exit) */
 
 static void block_signals(void)
 {
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index 160f38aab..c2e02ae34 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -18,7 +18,7 @@
 
 #undef stat64
 
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 #define __NR___syscall_stat __NR_stat
 #undef stat
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c
index 9563b4113..a40d8fc53 100644
--- a/libc/sysdeps/linux/common/time.c
+++ b/libc/sysdeps/linux/common/time.c
@@ -16,7 +16,7 @@
 #ifdef __NR_time
 _syscall1(time_t, time, time_t *, t)
 #else
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 time_t time(time_t * t)
 {
diff --git a/libc/sysdeps/linux/common/utime.c b/libc/sysdeps/linux/common/utime.c
index fd528bd1d..5c4207aaa 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -19,7 +19,7 @@ _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
 #include <sys/time.h>
 
 libc_hidden_proto(utimes)
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 int utime(const char *file, const struct utimbuf *times)
 {
diff --git a/libc/sysdeps/linux/common/write.c b/libc/sysdeps/linux/common/write.c
index f280d909e..7776ec955 100644
--- a/libc/sysdeps/linux/common/write.c
+++ b/libc/sysdeps/linux/common/write.c
@@ -13,7 +13,7 @@
 extern __typeof(write) __libc_write;
 #define __NR___libc_write __NR_write
 _syscall3(ssize_t, __libc_write, int, fd, const __ptr_t, buf, size_t, count)
-libc_hidden_proto(write)
+/* libc_hidden_proto(write) */
 weak_alias(__libc_write,write)
 libc_hidden_weak(write)
 #if 0
diff --git a/libc/sysdeps/linux/cris/brk.c b/libc/sysdeps/linux/cris/brk.c
index ae99e109c..f58773880 100644
--- a/libc/sysdeps/linux/cris/brk.c
+++ b/libc/sysdeps/linux/cris/brk.c
@@ -12,7 +12,7 @@
 extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
 	if (__init_brk () == 0) {
diff --git a/libc/sysdeps/linux/cris/sbrk.c b/libc/sysdeps/linux/cris/sbrk.c
index 830d01dd6..f9b55be7a 100644
--- a/libc/sysdeps/linux/cris/sbrk.c
+++ b/libc/sysdeps/linux/cris/sbrk.c
@@ -13,7 +13,7 @@
 extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/e1/longjmp.c b/libc/sysdeps/linux/e1/longjmp.c
index 9f04e7b5c..bd1b82976 100644
--- a/libc/sysdeps/linux/e1/longjmp.c
+++ b/libc/sysdeps/linux/e1/longjmp.c
@@ -43,7 +43,7 @@ void longjmp(jmp_buf state, int value )
 #undef _state_
 }
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 void siglongjmp(sigjmp_buf state, int value )
 {
diff --git a/libc/sysdeps/linux/e1/setjmp.c b/libc/sysdeps/linux/e1/setjmp.c
index bda18b13a..2d2edec5d 100644
--- a/libc/sysdeps/linux/e1/setjmp.c
+++ b/libc/sysdeps/linux/e1/setjmp.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 int setjmp( jmp_buf state)
 {
diff --git a/libc/sysdeps/linux/frv/brk.c b/libc/sysdeps/linux/frv/brk.c
index c69c97ad6..cac45bae2 100644
--- a/libc/sysdeps/linux/frv/brk.c
+++ b/libc/sysdeps/linux/frv/brk.c
@@ -13,7 +13,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/frv/fstat.c b/libc/sysdeps/linux/frv/fstat.c
index 0153ebe8e..c6aceb62f 100644
--- a/libc/sysdeps/linux/frv/fstat.c
+++ b/libc/sysdeps/linux/frv/fstat.c
@@ -13,6 +13,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(fstat) */
 _syscall2(int, fstat, int, fd, struct stat *, buf)
 libc_hidden_def(fstat)
diff --git a/libc/sysdeps/linux/frv/lstat.c b/libc/sysdeps/linux/frv/lstat.c
index f2c7789fa..ad87db6fc 100644
--- a/libc/sysdeps/linux/frv/lstat.c
+++ b/libc/sysdeps/linux/frv/lstat.c
@@ -13,6 +13,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(lstat)
+/* libc_hidden_proto(lstat) */
 _syscall2(int, lstat, const char *, file_name, struct stat *, buf)
 libc_hidden_def(lstat)
diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c
index 7095bd24a..360b102a1 100644
--- a/libc/sysdeps/linux/frv/mmap.c
+++ b/libc/sysdeps/linux/frv/mmap.c
@@ -29,7 +29,7 @@
 #include <sys/syscall.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #define __NR___syscall_mmap2	    __NR_mmap2
 static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
diff --git a/libc/sysdeps/linux/frv/sbrk.c b/libc/sysdeps/linux/frv/sbrk.c
index a1ff2a148..616b81318 100644
--- a/libc/sysdeps/linux/frv/sbrk.c
+++ b/libc/sysdeps/linux/frv/sbrk.c
@@ -8,7 +8,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/frv/stat.c b/libc/sysdeps/linux/frv/stat.c
index ea9592f7a..611bddf61 100644
--- a/libc/sysdeps/linux/frv/stat.c
+++ b/libc/sysdeps/linux/frv/stat.c
@@ -13,6 +13,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 _syscall2(int, stat, const char *, file_name, struct stat *, buf)
 libc_hidden_def(stat)
diff --git a/libc/sysdeps/linux/h8300/brk.c b/libc/sysdeps/linux/h8300/brk.c
index 9eab66060..44c867417 100644
--- a/libc/sysdeps/linux/h8300/brk.c
+++ b/libc/sysdeps/linux/h8300/brk.c
@@ -12,7 +12,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/hppa/brk.c b/libc/sysdeps/linux/hppa/brk.c
index dab2d57ca..6b9604856 100644
--- a/libc/sysdeps/linux/hppa/brk.c
+++ b/libc/sysdeps/linux/hppa/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/hppa/mmap.c b/libc/sysdeps/linux/hppa/mmap.c
index faaaab9bd..9c5077acb 100644
--- a/libc/sysdeps/linux/hppa/mmap.c
+++ b/libc/sysdeps/linux/hppa/mmap.c
@@ -13,7 +13,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6(void *, mmap, void *, start, size_t, length, int, prot,
           int, flags, int, fd, off_t, offset)
diff --git a/libc/sysdeps/linux/i386/brk.c b/libc/sysdeps/linux/i386/brk.c
index eda8ad9ce..2be9c1802 100644
--- a/libc/sysdeps/linux/i386/brk.c
+++ b/libc/sysdeps/linux/i386/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *__unbounded newbrk, *__unbounded scratch;
diff --git a/libc/sysdeps/linux/i386/sigaction.c b/libc/sysdeps/linux/i386/sigaction.c
index 79eb6fde3..32c8f64bc 100644
--- a/libc/sysdeps/linux/i386/sigaction.c
+++ b/libc/sysdeps/linux/i386/sigaction.c
@@ -124,7 +124,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/m68k/brk.c b/libc/sysdeps/linux/m68k/brk.c
index 7daf1bd76..f04a4ab91 100644
--- a/libc/sysdeps/linux/m68k/brk.c
+++ b/libc/sysdeps/linux/m68k/brk.c
@@ -9,7 +9,7 @@
 #include <sys/syscall.h>
 #include <errno.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void * __curbrk = 0;
diff --git a/libc/sysdeps/linux/microblaze/mmap.c b/libc/sysdeps/linux/microblaze/mmap.c
index 9cb43b487..be780eba3 100644
--- a/libc/sysdeps/linux/microblaze/mmap.c
+++ b/libc/sysdeps/linux/microblaze/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset)
diff --git a/libc/sysdeps/linux/mips/brk.c b/libc/sysdeps/linux/mips/brk.c
index 36620b210..e1c682902 100644
--- a/libc/sysdeps/linux/mips/brk.c
+++ b/libc/sysdeps/linux/mips/brk.c
@@ -23,7 +23,7 @@
 
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
   void *newbrk;
diff --git a/libc/sysdeps/linux/mips/mmap.c b/libc/sysdeps/linux/mips/mmap.c
index 039d5ed01..ff923cf63 100644
--- a/libc/sysdeps/linux/mips/mmap.c
+++ b/libc/sysdeps/linux/mips/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #if 0
 /* For now, leave mmap using mmap1 since mmap2 seems
diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c
index 39d38b86f..edd265438 100644
--- a/libc/sysdeps/linux/mips/sigaction.c
+++ b/libc/sysdeps/linux/mips/sigaction.c
@@ -125,7 +125,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/nios/brk.c b/libc/sysdeps/linux/nios/brk.c
index ea2e45765..fb4ea94b6 100644
--- a/libc/sysdeps/linux/nios/brk.c
+++ b/libc/sysdeps/linux/nios/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/nios2/brk.c b/libc/sysdeps/linux/nios2/brk.c
index 0420798bc..6f69932a3 100644
--- a/libc/sysdeps/linux/nios2/brk.c
+++ b/libc/sysdeps/linux/nios2/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/powerpc/ioctl.c b/libc/sysdeps/linux/powerpc/ioctl.c
index e12362783..fe3a2eb20 100644
--- a/libc/sysdeps/linux/powerpc/ioctl.c
+++ b/libc/sysdeps/linux/powerpc/ioctl.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 libc_hidden_proto(tcsetattr)
 libc_hidden_proto(tcgetattr)
diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c
index b3175ec8b..5850e3b64 100644
--- a/libc/sysdeps/linux/powerpc/pread_write.c
+++ b/libc/sysdeps/linux/powerpc/pread_write.c
@@ -68,9 +68,9 @@ weak_alias(__libc_pwrite64,pwrite64)
 
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/sh/brk.c b/libc/sysdeps/linux/sh/brk.c
index c69c97ad6..cac45bae2 100644
--- a/libc/sysdeps/linux/sh/brk.c
+++ b/libc/sysdeps/linux/sh/brk.c
@@ -13,7 +13,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/sh/mmap.c b/libc/sysdeps/linux/sh/mmap.c
index 56566ea50..2d77a5d98 100644
--- a/libc/sysdeps/linux/sh/mmap.c
+++ b/libc/sysdeps/linux/sh/mmap.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #ifdef HIOS
 # define __SH_SYSCALL6_TRAPA 0x2E
diff --git a/libc/sysdeps/linux/sh/sbrk.c b/libc/sysdeps/linux/sh/sbrk.c
index a1ff2a148..616b81318 100644
--- a/libc/sysdeps/linux/sh/sbrk.c
+++ b/libc/sysdeps/linux/sh/sbrk.c
@@ -8,7 +8,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/sh64/brk.c b/libc/sysdeps/linux/sh64/brk.c
index c69c97ad6..cac45bae2 100644
--- a/libc/sysdeps/linux/sh64/brk.c
+++ b/libc/sysdeps/linux/sh64/brk.c
@@ -13,7 +13,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/sh64/sbrk.c b/libc/sysdeps/linux/sh64/sbrk.c
index a1ff2a148..616b81318 100644
--- a/libc/sysdeps/linux/sh64/sbrk.c
+++ b/libc/sysdeps/linux/sh64/sbrk.c
@@ -8,7 +8,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/sparc/brk.c b/libc/sysdeps/linux/sparc/brk.c
index 53f2c9c1d..37415d49d 100644
--- a/libc/sysdeps/linux/sparc/brk.c
+++ b/libc/sysdeps/linux/sparc/brk.c
@@ -25,7 +25,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/v850/mmap.c b/libc/sysdeps/linux/v850/mmap.c
index ca5eddd17..7732b07f3 100644
--- a/libc/sysdeps/linux/v850/mmap.c
+++ b/libc/sysdeps/linux/v850/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset)
diff --git a/libc/sysdeps/linux/vax/brk.c b/libc/sysdeps/linux/vax/brk.c
index 47fd3e529..53652f922 100644
--- a/libc/sysdeps/linux/vax/brk.c
+++ b/libc/sysdeps/linux/vax/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = NULL;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/vax/mmap.c b/libc/sysdeps/linux/vax/mmap.c
index 28e4077ef..2df685c21 100644
--- a/libc/sysdeps/linux/vax/mmap.c
+++ b/libc/sysdeps/linux/vax/mmap.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 _syscall6 (void *, mmap, void *, start, size_t, length, int, prot, int, flags,
 		int, fd, off_t, offset)
 libc_hidden_def(mmap)
diff --git a/libc/sysdeps/linux/x86_64/brk.c b/libc/sysdeps/linux/x86_64/brk.c
index eddfd9830..fc906abc1 100644
--- a/libc/sysdeps/linux/x86_64/brk.c
+++ b/libc/sysdeps/linux/x86_64/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
 	void *__unbounded newbrk;
diff --git a/libc/sysdeps/linux/x86_64/mmap.c b/libc/sysdeps/linux/x86_64/mmap.c
index faaaab9bd..9c5077acb 100644
--- a/libc/sysdeps/linux/x86_64/mmap.c
+++ b/libc/sysdeps/linux/x86_64/mmap.c
@@ -13,7 +13,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6(void *, mmap, void *, start, size_t, length, int, prot,
           int, flags, int, fd, off_t, offset)
diff --git a/libc/sysdeps/linux/x86_64/sigaction.c b/libc/sysdeps/linux/x86_64/sigaction.c
index aa5c0d472..3d9e4ea29 100644
--- a/libc/sysdeps/linux/x86_64/sigaction.c
+++ b/libc/sysdeps/linux/x86_64/sigaction.c
@@ -120,7 +120,7 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/xtensa/brk.c b/libc/sysdeps/linux/xtensa/brk.c
index 51f610b70..b7a783f61 100644
--- a/libc/sysdeps/linux/xtensa/brk.c
+++ b/libc/sysdeps/linux/xtensa/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c
index f44d97766..0b2199977 100644
--- a/libc/sysdeps/linux/xtensa/pread_write.c
+++ b/libc/sysdeps/linux/xtensa/pread_write.c
@@ -77,9 +77,9 @@ weak_alias(__libc_pwrite64,pwrite64)
 #endif /* __NR_pwrite */
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
diff --git a/libc/termios/tcdrain.c b/libc/termios/tcdrain.c
index a13374cb5..0158649bd 100644
--- a/libc/termios/tcdrain.c
+++ b/libc/termios/tcdrain.c
@@ -20,7 +20,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 extern __typeof(tcdrain) __libc_tcdrain;
 /* Wait for pending output to be written on FD.  */
diff --git a/libc/termios/tcflow.c b/libc/termios/tcflow.c
index 63f96a860..6a1bf12f6 100644
--- a/libc/termios/tcflow.c
+++ b/libc/termios/tcflow.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* Suspend or restart transmission on FD.  */
 int tcflow (int fd, int action)
diff --git a/libc/termios/tcflush.c b/libc/termios/tcflush.c
index 159231fb1..28e88c854 100644
--- a/libc/termios/tcflush.c
+++ b/libc/termios/tcflush.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* Flush pending data on FD.  */
 int
diff --git a/libc/termios/tcgetattr.c b/libc/termios/tcgetattr.c
index 541beb4f6..e431868c2 100644
--- a/libc/termios/tcgetattr.c
+++ b/libc/termios/tcgetattr.c
@@ -23,7 +23,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
diff --git a/libc/termios/tcgetpgrp.c b/libc/termios/tcgetpgrp.c
index 1ad317139..ea42b3459 100644
--- a/libc/termios/tcgetpgrp.c
+++ b/libc/termios/tcgetpgrp.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 
 libc_hidden_proto(tcgetpgrp)
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* Return the foreground process group ID of FD.  */
 pid_t tcgetpgrp (int fd)
diff --git a/libc/termios/tcgetsid.c b/libc/termios/tcgetsid.c
index 8d3a40242..711b3bd63 100644
--- a/libc/termios/tcgetsid.c
+++ b/libc/termios/tcgetsid.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 libc_hidden_proto(getsid)
 libc_hidden_proto(tcgetpgrp)
 
diff --git a/libc/termios/tcsendbrk.c b/libc/termios/tcsendbrk.c
index ae04cb947..53ea662a7 100644
--- a/libc/termios/tcsendbrk.c
+++ b/libc/termios/tcsendbrk.c
@@ -22,7 +22,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* Send zero bits on FD.  */
 int
diff --git a/libc/termios/tcsetattr.c b/libc/termios/tcsetattr.c
index d0d82c2ac..2aac81a77 100644
--- a/libc/termios/tcsetattr.c
+++ b/libc/termios/tcsetattr.c
@@ -24,7 +24,7 @@
 
 libc_hidden_proto(tcsetattr)
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* The difference here is that the termios structure used in the
    kernel is not the same as we use in the libc.  Therefore we must
diff --git a/libc/termios/tcsetpgrp.c b/libc/termios/tcsetpgrp.c
index 9bf1cdaef..dbf07f216 100644
--- a/libc/termios/tcsetpgrp.c
+++ b/libc/termios/tcsetpgrp.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 /* Set the foreground process group ID of FD set PGRP_ID.  */
 int tcsetpgrp (int fd, pid_t pgrp_id)
diff --git a/libc/termios/ttyname.c b/libc/termios/ttyname.c
index 9d6a8ce36..8af93e142 100644
--- a/libc/termios/ttyname.c
+++ b/libc/termios/ttyname.c
@@ -32,8 +32,8 @@
 #include <sys/stat.h>
 
 libc_hidden_proto(ttyname_r)
-libc_hidden_proto(fstat)
-libc_hidden_proto(lstat)
+/* libc_hidden_proto(fstat) */
+/* libc_hidden_proto(lstat) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(opendir)
diff --git a/libc/unistd/daemon.c b/libc/unistd/daemon.c
index db09b6575..29fd56ceb 100644
--- a/libc/unistd/daemon.c
+++ b/libc/unistd/daemon.c
@@ -48,9 +48,9 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 libc_hidden_proto(dup2)
 libc_hidden_proto(setsid)
 libc_hidden_proto(chdir)
diff --git a/libc/unistd/exec.c b/libc/unistd/exec.c
index 9134e4370..057f7ff2c 100644
--- a/libc/unistd/exec.c
+++ b/libc/unistd/exec.c
@@ -37,9 +37,9 @@ libc_hidden_proto(execvp)
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(execve)
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 libc_hidden_proto(munmap)
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 
 /**********************************************************************/
 #define EXEC_FUNC_COMMON 0
diff --git a/libc/unistd/fpathconf.c b/libc/unistd/fpathconf.c
index 7b0457c75..67345b8e0 100644
--- a/libc/unistd/fpathconf.c
+++ b/libc/unistd/fpathconf.c
@@ -28,7 +28,7 @@
 
 //#include "linux_fsinfo.h"
 
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(fstat) */
 
 #ifndef __USE_FILE_OFFSET64
 extern int fstatfs (int __fildes, struct statfs *__buf)
diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c
index 1998a7fc8..25d99bd9d 100644
--- a/libc/unistd/getlogin.c
+++ b/libc/unistd/getlogin.c
@@ -12,7 +12,7 @@
 
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 
 /* uClibc makes it policy to not mess with the utmp file whenever
  * possible, since I consider utmp a complete waste of time.  Since
diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c
index cdd0c2029..1721a2ae7 100644
--- a/libc/unistd/getopt.c
+++ b/libc/unistd/getopt.c
@@ -125,7 +125,7 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 /* libc_hidden_proto(fprintf) */
 
 /* For communication from `getopt' to the caller.
diff --git a/libc/unistd/getpass.c b/libc/unistd/getpass.c
index deaab122a..5c1e09901 100644
--- a/libc/unistd/getpass.c
+++ b/libc/unistd/getpass.c
@@ -27,12 +27,12 @@
 libc_hidden_proto(tcsetattr)
 libc_hidden_proto(tcgetattr)
 libc_hidden_proto(setvbuf)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(fileno)
 libc_hidden_proto(fflush)
-libc_hidden_proto(fgets)
-libc_hidden_proto(fputs)
+/* libc_hidden_proto(fgets) */
+/* libc_hidden_proto(fputs) */
 libc_hidden_proto(fputc)
 libc_hidden_proto(putc)
 libc_hidden_proto(__fputc_unlocked)
diff --git a/libc/unistd/pathconf.c b/libc/unistd/pathconf.c
index 7f7efbb7f..a5e6fdec5 100644
--- a/libc/unistd/pathconf.c
+++ b/libc/unistd/pathconf.c
@@ -33,7 +33,7 @@
 
 extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 
 /* The Linux kernel headers mention this as a kind of generic value. */
diff --git a/libc/unistd/sleep.c b/libc/unistd/sleep.c
index 435d105c5..93d033ed1 100644
--- a/libc/unistd/sleep.c
+++ b/libc/unistd/sleep.c
@@ -25,8 +25,8 @@
 
 libc_hidden_proto(sleep)
 
-libc_hidden_proto(sigaction)
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigaction) */
+/* libc_hidden_proto(sigprocmask) */
 
 /* version perusing nanosleep */
 #if defined __UCLIBC_HAS_REALTIME__
@@ -118,7 +118,7 @@ unsigned int sleep (unsigned int seconds)
 }
 #endif
 #else /* __UCLIBC_HAS_REALTIME__ */
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 /* no nanosleep, use signals and alarm() */
 static void sleep_alarm_handler(int attribute_unused sig)
 {
diff --git a/libc/unistd/usershell.c b/libc/unistd/usershell.c
index 219e3fdc8..3021db8e1 100644
--- a/libc/unistd/usershell.c
+++ b/libc/unistd/usershell.c
@@ -42,8 +42,8 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 
-libc_hidden_proto(fstat)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fstat) */
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 libc_hidden_proto(__fsetlocking)
 libc_hidden_proto(fileno)