Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

101 files changed, 140 insertions, 140 deletions

diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
index c018043bd..6dc8725f6 100644
--- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c
+++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
@@ -12,8 +12,8 @@
 #define __need_NULL
 #include <stddef.h>
 
-libc_hidden_proto(sigwaitinfo)
-libc_hidden_proto(sigtimedwait)
+/* libc_hidden_proto(sigwaitinfo) */
+/* libc_hidden_proto(sigtimedwait) */
 
 #ifdef __NR_rt_sigtimedwait
 #define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index 3860050f8..e95c6fe2d 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -53,7 +53,7 @@ weak_alias(__libc_fcntl,fcntl)
 libc_hidden_weak(fcntl)
 #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__
 strong_alias(__libc_fcntl,__libc_fcntl64)
-libc_hidden_proto(fcntl64)
+/* libc_hidden_proto(fcntl64) */
 weak_alias(__libc_fcntl,fcntl64)
 libc_hidden_weak(fcntl64)
 #endif
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c
index 579e0e257..cd5c59bd2 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl64.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c
@@ -30,7 +30,7 @@ int __libc_fcntl64(int fd, int cmd, ...)
 }
 libc_hidden_def(__libc_fcntl64)
 
-libc_hidden_proto(fcntl64)
+/* libc_hidden_proto(fcntl64) */
 strong_alias(__libc_fcntl64,fcntl64)
 libc_hidden_weak(fcntl64)
 #endif
diff --git a/libc/sysdeps/linux/common/adjtimex.c b/libc/sysdeps/linux/common/adjtimex.c
index 05e3679ff..725c82994 100644
--- a/libc/sysdeps/linux/common/adjtimex.c
+++ b/libc/sysdeps/linux/common/adjtimex.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/timex.h>
 
-libc_hidden_proto(adjtimex)
+/* libc_hidden_proto(adjtimex) */
 
 _syscall1(int, adjtimex, struct timex *, buf)
 libc_hidden_def(adjtimex)
diff --git a/libc/sysdeps/linux/common/alarm.c b/libc/sysdeps/linux/common/alarm.c
index 224656c2e..6042ad270 100644
--- a/libc/sysdeps/linux/common/alarm.c
+++ b/libc/sysdeps/linux/common/alarm.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(alarm)
+/* libc_hidden_proto(alarm) */
 
 #ifdef __NR_alarm
 #define __NR___alarm __NR_alarm
@@ -18,7 +18,7 @@ _syscall1(unsigned int, alarm, unsigned int, seconds)
 #else
 #include <sys/time.h>
 
-libc_hidden_proto(setitimer)
+/* libc_hidden_proto(setitimer) */
 
 unsigned int alarm(unsigned int seconds)
 {
diff --git a/libc/sysdeps/linux/common/bits/errno.h b/libc/sysdeps/linux/common/bits/errno.h
index a5ac1a47f..92227fe73 100644
--- a/libc/sysdeps/linux/common/bits/errno.h
+++ b/libc/sysdeps/linux/common/bits/errno.h
@@ -41,6 +41,7 @@
 # ifndef __ASSEMBLER__
 /* Function to get address of global `errno' variable.  */
 extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+libc_hidden_proto(__errno_location)
 
 #  ifdef __UCLIBC_HAS_THREADS__
 /* When using threads, errno is a per-thread value.  */
diff --git a/libc/sysdeps/linux/common/bits/getopt.h b/libc/sysdeps/linux/common/bits/getopt.h
index a28d0a40b..0307757a6 100644
--- a/libc/sysdeps/linux/common/bits/getopt.h
+++ b/libc/sysdeps/linux/common/bits/getopt.h
@@ -153,8 +153,10 @@ struct option
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
        __THROW;
+libc_hidden_proto(getopt)
 #else /* not __GNU_LIBRARY__ */
 extern int getopt ();
+libc_hidden_proto(getopt)
 #endif /* __GNU_LIBRARY__ */
 
 #if defined __UCLIBC_HAS_GNU_GETOPT__ || defined __UCLIBC_HAS_GETOPT_LONG__
diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
index c352a1712..ac5a4336b 100644
--- a/libc/sysdeps/linux/common/bits/socket.h
+++ b/libc/sysdeps/linux/common/bits/socket.h
@@ -269,6 +269,7 @@ struct cmsghdr
 
 extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
 				      struct cmsghdr *__cmsg) __THROW;
+libc_hidden_proto(__cmsg_nxthdr)
 #ifdef __USE_EXTERN_INLINES
 # ifndef _EXTERN_INLINE
 #  define _EXTERN_INLINE extern __inline
diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
index 843a2f2c3..3631ef79f 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
@@ -382,7 +382,9 @@ extern void __stdio_init_mutex(__UCLIBC_MUTEX_TYPE *m) attribute_hidden;
 #endif
 
 extern int __fgetc_unlocked(FILE *__stream);
+libc_hidden_proto(__fgetc_unlocked)
 extern int __fputc_unlocked(int __c, FILE *__stream);
+libc_hidden_proto(__fputc_unlocked)
 
 /* First define the default definitions.
    They are overridden below as necessary. */
diff --git a/libc/sysdeps/linux/common/chdir.c b/libc/sysdeps/linux/common/chdir.c
index ee889bae3..05441eb82 100644
--- a/libc/sysdeps/linux/common/chdir.c
+++ b/libc/sysdeps/linux/common/chdir.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-libc_hidden_proto(chdir)
+/* libc_hidden_proto(chdir) */
 
 #define __NR___syscall_chdir __NR_chdir
 static __inline__ _syscall1(int, __syscall_chdir, const char *, path)
diff --git a/libc/sysdeps/linux/common/chmod.c b/libc/sysdeps/linux/common/chmod.c
index da0dff6d9..a4524ba1f 100644
--- a/libc/sysdeps/linux/common/chmod.c
+++ b/libc/sysdeps/linux/common/chmod.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(chmod)
+/* libc_hidden_proto(chmod) */
 
 #define __NR___syscall_chmod __NR_chmod
 static __inline__ _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode)
diff --git a/libc/sysdeps/linux/common/chown.c b/libc/sysdeps/linux/common/chown.c
index f32507193..2e7784a0c 100644
--- a/libc/sysdeps/linux/common/chown.c
+++ b/libc/sysdeps/linux/common/chown.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-libc_hidden_proto(chown)
+/* libc_hidden_proto(chown) */
 
 #if (__WORDSIZE == 32 && defined(__NR_chown32)) || __WORDSIZE == 64
 # ifdef __NR_chown32
diff --git a/libc/sysdeps/linux/common/clock_getres.c b/libc/sysdeps/linux/common/clock_getres.c
index e0eb1b6d5..4964ec57c 100644
--- a/libc/sysdeps/linux/common/clock_getres.c
+++ b/libc/sysdeps/linux/common/clock_getres.c
@@ -14,7 +14,7 @@
 #ifdef __NR_clock_getres
 _syscall2(int, clock_getres, clockid_t, clock_id, struct timespec*, res)
 #else
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 
 int clock_getres(clockid_t clock_id, struct timespec* res)
 {
diff --git a/libc/sysdeps/linux/common/clock_settime.c b/libc/sysdeps/linux/common/clock_settime.c
index 652bcebd1..f11088a37 100644
--- a/libc/sysdeps/linux/common/clock_settime.c
+++ b/libc/sysdeps/linux/common/clock_settime.c
@@ -14,7 +14,7 @@
 #ifdef __NR_clock_settime
 _syscall2(int, clock_settime, clockid_t, clock_id, const struct timespec*, tp)
 #else
-libc_hidden_proto(settimeofday)
+/* libc_hidden_proto(settimeofday) */
 
 int clock_settime(clockid_t clock_id, const struct timespec* tp)
 {
diff --git a/libc/sysdeps/linux/common/cmsg_nxthdr.c b/libc/sysdeps/linux/common/cmsg_nxthdr.c
index 8350c3a4d..7dbf7bec5 100644
--- a/libc/sysdeps/linux/common/cmsg_nxthdr.c
+++ b/libc/sysdeps/linux/common/cmsg_nxthdr.c
@@ -21,7 +21,7 @@
 #include <features.h>
 #include <sys/socket.h>
 
-libc_hidden_proto(__cmsg_nxthdr)
+/* libc_hidden_proto(__cmsg_nxthdr) */
 
 struct cmsghdr *
 __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
diff --git a/libc/sysdeps/linux/common/creat64.c b/libc/sysdeps/linux/common/creat64.c
index f5f00182c..875606a1d 100644
--- a/libc/sysdeps/linux/common/creat64.c
+++ b/libc/sysdeps/linux/common/creat64.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 
 extern __typeof(open64) __libc_open64;
-libc_hidden_proto(__libc_open64)
+/* libc_hidden_proto(__libc_open64) */
 extern __typeof(creat64) __libc_creat64;
 
 /* Create FILE with protections MODE.  */
diff --git a/libc/sysdeps/linux/common/dup2.c b/libc/sysdeps/linux/common/dup2.c
index da885a981..2a315fed4 100644
--- a/libc/sysdeps/linux/common/dup2.c
+++ b/libc/sysdeps/linux/common/dup2.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(dup2)
+/* libc_hidden_proto(dup2) */
 
 _syscall2(int, dup2, int, oldfd, int, newfd)
 libc_hidden_def(dup2)
diff --git a/libc/sysdeps/linux/common/execve.c b/libc/sysdeps/linux/common/execve.c
index 5e947d648..53efd78fb 100644
--- a/libc/sysdeps/linux/common/execve.c
+++ b/libc/sysdeps/linux/common/execve.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <sys/param.h>
 
-libc_hidden_proto(execve)
+/* libc_hidden_proto(execve) */
 _syscall3(int, execve, const char *, filename,
 		  char *const *, argv, char *const *, envp)
 libc_hidden_def(execve)
diff --git a/libc/sysdeps/linux/common/fchdir.c b/libc/sysdeps/linux/common/fchdir.c
index 00a857c1e..45236f177 100644
--- a/libc/sysdeps/linux/common/fchdir.c
+++ b/libc/sysdeps/linux/common/fchdir.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(fchdir)
+/* libc_hidden_proto(fchdir) */
 
 _syscall1(int, fchdir, int, fd)
 libc_hidden_def(fchdir)
diff --git a/libc/sysdeps/linux/common/fork.c b/libc/sysdeps/linux/common/fork.c
index 7c1281468..5993387f0 100644
--- a/libc/sysdeps/linux/common/fork.c
+++ b/libc/sysdeps/linux/common/fork.c
@@ -16,7 +16,7 @@
 extern __typeof(fork) __libc_fork;
 #define __NR___libc_fork __NR_fork
 _syscall0(pid_t, __libc_fork)
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
 #endif
@@ -28,7 +28,7 @@ pid_t __libc_fork(void)
 	__set_errno(ENOSYS);
 	return -1;
 }
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
 link_warning(fork, "fork: this function is not implemented on no-mmu systems")
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
index 34a6e7b46..6d5cf8b9f 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -38,7 +38,7 @@ libc_hidden_def(fstat)
 
 #if ! defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__
 extern __typeof(fstat) fstat64;
-libc_hidden_proto(fstat64)
+/* libc_hidden_proto(fstat64) */
 strong_alias(fstat,fstat64)
 libc_hidden_def(fstat64)
 #endif
diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c
index 5dfb23d62..a57b4f6f5 100644
--- a/libc/sysdeps/linux/common/fstat64.c
+++ b/libc/sysdeps/linux/common/fstat64.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include "xstatconv.h"
 
-libc_hidden_proto(fstat64)
+/* libc_hidden_proto(fstat64) */
 
 #define __NR___syscall_fstat64 __NR_fstat64
 static __inline__ _syscall2(int, __syscall_fstat64,
diff --git a/libc/sysdeps/linux/common/ftruncate.c b/libc/sysdeps/linux/common/ftruncate.c
index 3449d8073..a7a6ea69d 100644
--- a/libc/sysdeps/linux/common/ftruncate.c
+++ b/libc/sysdeps/linux/common/ftruncate.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(ftruncate)
+/* libc_hidden_proto(ftruncate) */
 
 _syscall2(int, ftruncate, int, fd, __off_t, length)
 libc_hidden_def(ftruncate)
diff --git a/libc/sysdeps/linux/common/ftruncate64.c b/libc/sysdeps/linux/common/ftruncate64.c
index 48760879a..132789144 100644
--- a/libc/sysdeps/linux/common/ftruncate64.c
+++ b/libc/sysdeps/linux/common/ftruncate64.c
@@ -21,7 +21,7 @@
 # include <sys/types.h>
 # include <sys/syscall.h>
 
-libc_hidden_proto(ftruncate64)
+/* libc_hidden_proto(ftruncate64) */
 
 # ifdef __NR_ftruncate64
 
@@ -64,7 +64,7 @@ int ftruncate64 (int fd, __off64_t length)
 
 # else  /* __NR_ftruncate64 */
 
-libc_hidden_proto(ftruncate)
+/* libc_hidden_proto(ftruncate) */
 
 int ftruncate64 (int fd, __off64_t length)
 {
diff --git a/libc/sysdeps/linux/common/getcwd.c b/libc/sysdeps/linux/common/getcwd.c
index 07e1481e4..13619159d 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -15,16 +15,16 @@
 #include <sys/param.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(getcwd)
-libc_hidden_proto(getpagesize)
+/* libc_hidden_proto(getcwd) */
+/* libc_hidden_proto(getpagesize) */
 
 /* Experimentally off - libc_hidden_proto(strcat) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strncpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(readdir)
-libc_hidden_proto(closedir)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(readdir) */
+/* libc_hidden_proto(closedir) */
 /* libc_hidden_proto(stat) */
 
 #ifdef __NR_getcwd
diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c
index d789d0fe0..1864ff4fc 100644
--- a/libc/sysdeps/linux/common/getdents64.c
+++ b/libc/sysdeps/linux/common/getdents64.c
@@ -21,7 +21,7 @@
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_getdents64
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 
 # ifndef offsetof
 #  define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
diff --git a/libc/sysdeps/linux/common/getdirname.c b/libc/sysdeps/linux/common/getdirname.c
index 2eba80c6e..4b793faf0 100644
--- a/libc/sysdeps/linux/common/getdirname.c
+++ b/libc/sysdeps/linux/common/getdirname.c
@@ -26,10 +26,10 @@
 #include <string.h>
 
 /* Experimentally off - libc_hidden_proto(strdup) */
-libc_hidden_proto(getcwd)
+/* libc_hidden_proto(getcwd) */
 /* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(stat64) */
 #else
 /* libc_hidden_proto(stat) */
 #endif
diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c
index 86f6dfd32..c561aa305 100644
--- a/libc/sysdeps/linux/common/getdomainname.c
+++ b/libc/sysdeps/linux/common/getdomainname.c
@@ -14,7 +14,7 @@
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
-libc_hidden_proto(uname)
+/* libc_hidden_proto(uname) */
 
 #if !defined __UCLIBC_BSD_SPECIFIC__
 extern int getdomainname (char *__name, size_t __len)
@@ -50,7 +50,7 @@ int __libc_getdomainname(char *name, size_t len)
 }
 libc_hidden_def(__libc_getdomainname)
 #if defined __UCLIBC_BSD_SPECIFIC__
-libc_hidden_proto(getdomainname)
+/* libc_hidden_proto(getdomainname) */
 weak_alias(__libc_getdomainname,getdomainname)
 libc_hidden_weak(getdomainname)
 #endif /* __UCLIBC_BSD_SPECIFIC__ */
diff --git a/libc/sysdeps/linux/common/getdtablesize.c b/libc/sysdeps/linux/common/getdtablesize.c
index 44d21862f..183c09e1f 100644
--- a/libc/sysdeps/linux/common/getdtablesize.c
+++ b/libc/sysdeps/linux/common/getdtablesize.c
@@ -11,9 +11,9 @@
 
 /* XXX: _BSD || _XOPEN_SOURCE >= 500 */
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-libc_hidden_proto(getdtablesize)
+/* libc_hidden_proto(getdtablesize) */
 
-libc_hidden_proto(getrlimit)
+/* libc_hidden_proto(getrlimit) */
 
 #define __LOCAL_OPEN_MAX	    256
 
diff --git a/libc/sysdeps/linux/common/getegid.c b/libc/sysdeps/linux/common/getegid.c
index ad80e3a97..20a679156 100644
--- a/libc/sysdeps/linux/common/getegid.c
+++ b/libc/sysdeps/linux/common/getegid.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(getegid)
+/* libc_hidden_proto(getegid) */
 
 #if defined(__NR_getegid32)
 # undef __NR_getegid
@@ -25,7 +25,7 @@ gid_t getegid(void)
 	return (__syscall_getegid());
 }
 #else
-libc_hidden_proto(getgid)
+/* libc_hidden_proto(getgid) */
 
 gid_t getegid(void)
 {
diff --git a/libc/sysdeps/linux/common/geteuid.c b/libc/sysdeps/linux/common/geteuid.c
index 63ee1da62..b9332a9f2 100644
--- a/libc/sysdeps/linux/common/geteuid.c
+++ b/libc/sysdeps/linux/common/geteuid.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(geteuid)
+/* libc_hidden_proto(geteuid) */
 
 #if defined(__NR_geteuid32)
 # undef __NR_geteuid
@@ -26,7 +26,7 @@ uid_t geteuid(void)
 }
 
 #else
-libc_hidden_proto(getuid)
+/* libc_hidden_proto(getuid) */
 uid_t geteuid(void)
 {
 	return (getuid());
diff --git a/libc/sysdeps/linux/common/getgid.c b/libc/sysdeps/linux/common/getgid.c
index 8fb633ba3..f42a1731c 100644
--- a/libc/sysdeps/linux/common/getgid.c
+++ b/libc/sysdeps/linux/common/getgid.c
@@ -19,6 +19,6 @@
 # define __NR_getgid __NR_getgid32
 #endif
 
-libc_hidden_proto(getgid)
+/* libc_hidden_proto(getgid) */
 _syscall0(gid_t, getgid)
 libc_hidden_def(getgid)
diff --git a/libc/sysdeps/linux/common/getgroups.c b/libc/sysdeps/linux/common/getgroups.c
index ed02de106..67d2f4faa 100644
--- a/libc/sysdeps/linux/common/getgroups.c
+++ b/libc/sysdeps/linux/common/getgroups.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <grp.h>
 
-libc_hidden_proto(getgroups)
+/* libc_hidden_proto(getgroups) */
 
 #if defined(__NR_getgroups32)
 # undef __NR_getgroups
@@ -24,7 +24,7 @@ _syscall2(int, getgroups, int, size, gid_t *, list)
 
 #else
 
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
 #define __NR___syscall_getgroups __NR_getgroups
diff --git a/libc/sysdeps/linux/common/gethostname.c b/libc/sysdeps/linux/common/gethostname.c
index 8fc14ff32..e06fee98d 100644
--- a/libc/sysdeps/linux/common/gethostname.c
+++ b/libc/sysdeps/linux/common/gethostname.c
@@ -9,11 +9,11 @@
 #include <sys/utsname.h>
 #include <errno.h>
 
-libc_hidden_proto(gethostname)
+/* libc_hidden_proto(gethostname) */
 
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
-libc_hidden_proto(uname)
+/* libc_hidden_proto(uname) */
 
 int
 gethostname(char *name, size_t len)
diff --git a/libc/sysdeps/linux/common/getpagesize.c b/libc/sysdeps/linux/common/getpagesize.c
index efb5fcb7f..96ed17b04 100644
--- a/libc/sysdeps/linux/common/getpagesize.c
+++ b/libc/sysdeps/linux/common/getpagesize.c
@@ -43,6 +43,6 @@ int __getpagesize(void)
 #endif	/* NBPG.  */
 #endif	/* EXEC_PAGESIZE.  */
 }
-libc_hidden_proto(getpagesize)
+/* libc_hidden_proto(getpagesize) */
 strong_alias(__getpagesize,getpagesize)
 libc_hidden_def(getpagesize)
diff --git a/libc/sysdeps/linux/common/getpriority.c b/libc/sysdeps/linux/common/getpriority.c
index 089d9b199..58fb2b31f 100644
--- a/libc/sysdeps/linux/common/getpriority.c
+++ b/libc/sysdeps/linux/common/getpriority.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(getpriority)
+/* libc_hidden_proto(getpriority) */
 
 #define __NR___syscall_getpriority __NR_getpriority
 static __inline__ _syscall2(int, __syscall_getpriority,
diff --git a/libc/sysdeps/linux/common/getrlimit.c b/libc/sysdeps/linux/common/getrlimit.c
index 40b3c7368..6297516f0 100644
--- a/libc/sysdeps/linux/common/getrlimit.c
+++ b/libc/sysdeps/linux/common/getrlimit.c
@@ -13,7 +13,7 @@
 #include <sys/resource.h>
 #undef getrlimit64
 
-libc_hidden_proto(getrlimit)
+/* libc_hidden_proto(getrlimit) */
 
 /* Only wrap getrlimit if the new ugetrlimit is not present and getrlimit sucks */
 
diff --git a/libc/sysdeps/linux/common/getrlimit64.c b/libc/sysdeps/linux/common/getrlimit64.c
index ca7aa7310..14335778c 100644
--- a/libc/sysdeps/linux/common/getrlimit64.c
+++ b/libc/sysdeps/linux/common/getrlimit64.c
@@ -26,7 +26,7 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-libc_hidden_proto(getrlimit)
+/* libc_hidden_proto(getrlimit) */
 
 /* Put the soft and hard limits for RESOURCE in *RLIMITS.
    Returns 0 if successful, -1 if not (and sets errno).  */
diff --git a/libc/sysdeps/linux/common/getsid.c b/libc/sysdeps/linux/common/getsid.c
index 9c011f648..1b22451f8 100644
--- a/libc/sysdeps/linux/common/getsid.c
+++ b/libc/sysdeps/linux/common/getsid.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 
 #ifdef __USE_XOPEN_EXTENDED
-libc_hidden_proto(getsid)
+/* libc_hidden_proto(getsid) */
 
 #define __NR___syscall_getsid __NR_getsid
 static __inline__ _syscall1(__kernel_pid_t, __syscall_getsid, __kernel_pid_t, pid)
diff --git a/libc/sysdeps/linux/common/getuid.c b/libc/sysdeps/linux/common/getuid.c
index 07ebf88f0..ab0ea150b 100644
--- a/libc/sysdeps/linux/common/getuid.c
+++ b/libc/sysdeps/linux/common/getuid.c
@@ -19,6 +19,6 @@
 # define __NR_getuid __NR_getuid32
 #endif
 
-libc_hidden_proto(getuid)
+/* libc_hidden_proto(getuid) */
 _syscall0(uid_t, getuid)
 libc_hidden_def(getuid)
diff --git a/libc/sysdeps/linux/common/kill.c b/libc/sysdeps/linux/common/kill.c
index 1ee1cffd2..3578673b8 100644
--- a/libc/sysdeps/linux/common/kill.c
+++ b/libc/sysdeps/linux/common/kill.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <signal.h>
 
-libc_hidden_proto(kill)
+/* libc_hidden_proto(kill) */
 
 #define __NR___syscall_kill __NR_kill
 static __inline__ _syscall2(int, __syscall_kill, __kernel_pid_t, pid, int, sig)
diff --git a/libc/sysdeps/linux/common/llseek.c b/libc/sysdeps/linux/common/llseek.c
index 4761b3307..1879464f7 100644
--- a/libc/sysdeps/linux/common/llseek.c
+++ b/libc/sysdeps/linux/common/llseek.c
@@ -30,14 +30,14 @@ loff_t __libc_lseek64(int fd, loff_t offset, int whence)
 }
 #else
 extern __typeof(lseek) __libc_lseek;
-libc_hidden_proto(__libc_lseek)
+/* libc_hidden_proto(__libc_lseek) */
 
 loff_t __libc_lseek64(int fd, loff_t offset, int whence)
 {
 	return(loff_t)(__libc_lseek(fd, (off_t) (offset), whence));
 }
 #endif
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 weak_alias(__libc_lseek64,lseek64)
 libc_hidden_weak(lseek64)
 /*strong_alias(__libc_lseek64,_llseek) */
diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c
index 8c0525d07..ee49c9f25 100644
--- a/libc/sysdeps/linux/common/lseek.c
+++ b/libc/sysdeps/linux/common/lseek.c
@@ -19,6 +19,7 @@ _syscall3(__off_t, __libc_lseek, int, fildes, __off_t, offset, int, whence)
 #else
 extern __typeof(lseek64) __libc_lseek64;
 libc_hidden_proto(__libc_lseek64)
+
 __off_t __libc_lseek(int fildes, __off_t offset, int whence)
 {
 	return __libc_lseek64(fildes, offset, whence);
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index fb07dfe10..1adbdcf87 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -39,7 +39,7 @@ libc_hidden_def(lstat)
 
 #if ! defined __NR_lstat64 && defined __UCLIBC_HAS_LFS__
 extern __typeof(lstat) lstat64;
-libc_hidden_proto(lstat64)
+/* libc_hidden_proto(lstat64) */
 strong_alias(lstat,lstat64)
 libc_hidden_def(lstat64)
 #endif
diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c
index 97e9528c1..8d7ce1921 100644
--- a/libc/sysdeps/linux/common/lstat64.c
+++ b/libc/sysdeps/linux/common/lstat64.c
@@ -14,7 +14,7 @@
 # include <sys/stat.h>
 # include "xstatconv.h"
 
-libc_hidden_proto(lstat64)
+/* libc_hidden_proto(lstat64) */
 
 # define __NR___syscall_lstat64 __NR_lstat64
 static __inline__ _syscall2(int, __syscall_lstat64, const char *, file_name,
diff --git a/libc/sysdeps/linux/common/mkdir.c b/libc/sysdeps/linux/common/mkdir.c
index 8591c497d..73234f287 100644
--- a/libc/sysdeps/linux/common/mkdir.c
+++ b/libc/sysdeps/linux/common/mkdir.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(mkdir)
+/* libc_hidden_proto(mkdir) */
 
 #define __NR___syscall_mkdir __NR_mkdir
 static __inline__ _syscall2(int, __syscall_mkdir, const char *, pathname,
diff --git a/libc/sysdeps/linux/common/mkfifo.c b/libc/sysdeps/linux/common/mkfifo.c
index cbde71e04..f6f03a746 100644
--- a/libc/sysdeps/linux/common/mkfifo.c
+++ b/libc/sysdeps/linux/common/mkfifo.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-libc_hidden_proto(mknod)
+/* libc_hidden_proto(mknod) */
 
 /* Create a named pipe (FIFO) named PATH with protections MODE.  */
 int
diff --git a/libc/sysdeps/linux/common/mknod.c b/libc/sysdeps/linux/common/mknod.c
index e16c49025..5c7f9a5fd 100644
--- a/libc/sysdeps/linux/common/mknod.c
+++ b/libc/sysdeps/linux/common/mknod.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-libc_hidden_proto(mknod)
+/* libc_hidden_proto(mknod) */
 
 #define __NR___syscall_mknod __NR_mknod
 static __inline__ _syscall3(int, __syscall_mknod, const char *, path,
diff --git a/libc/sysdeps/linux/common/mremap.c b/libc/sysdeps/linux/common/mremap.c
index e7c1caa95..70627af9e 100644
--- a/libc/sysdeps/linux/common/mremap.c
+++ b/libc/sysdeps/linux/common/mremap.c
@@ -12,13 +12,15 @@
 
 #ifdef __NR_mremap
 
+//vda:TODO: add comment and explain why??
+
 #define mremap _hidemremap
 #include <sys/mman.h>
 #undef mremap
 
 void *mremap(void *, size_t, size_t, int, void *);
-
 libc_hidden_proto(mremap)
+
 _syscall5(void *, mremap, void *, old_address, size_t, old_size, size_t,
 		  new_size, int, may_move, void *, new_address)
 libc_hidden_def(mremap)
diff --git a/libc/sysdeps/linux/common/munmap.c b/libc/sysdeps/linux/common/munmap.c
index 81a65fb15..37b939993 100644
--- a/libc/sysdeps/linux/common/munmap.c
+++ b/libc/sysdeps/linux/common/munmap.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 
 _syscall2(int, munmap, void *, start, size_t, length)
 libc_hidden_def(munmap)
diff --git a/libc/sysdeps/linux/common/nanosleep.c b/libc/sysdeps/linux/common/nanosleep.c
index 30a27dc32..24b2eb080 100644
--- a/libc/sysdeps/linux/common/nanosleep.c
+++ b/libc/sysdeps/linux/common/nanosleep.c
@@ -16,7 +16,7 @@ extern __typeof(nanosleep) __libc_nanosleep;
 #define __NR___libc_nanosleep __NR_nanosleep
 _syscall2(int, __libc_nanosleep, const struct timespec *, req,
 		  struct timespec *, rem)
-libc_hidden_proto(nanosleep)
+/* libc_hidden_proto(nanosleep) */
 weak_alias(__libc_nanosleep,nanosleep)
 libc_hidden_weak(nanosleep)
 #endif
diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c
index 86765a958..51997ca13 100644
--- a/libc/sysdeps/linux/common/nice.c
+++ b/libc/sysdeps/linux/common/nice.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(getpriority)
+/* libc_hidden_proto(getpriority) */
 
 #ifdef __NR_nice
 
@@ -23,7 +23,7 @@ static __inline__ _syscall1(int, __syscall_nice, int, incr)
 
 # include <limits.h>
 
-libc_hidden_proto(setpriority)
+/* libc_hidden_proto(setpriority) */
 
 static __inline__ int int_add_no_wrap(int a, int b)
 {
diff --git a/libc/sysdeps/linux/common/ntp_gettime.c b/libc/sysdeps/linux/common/ntp_gettime.c
index f32e05444..ff933fed4 100644
--- a/libc/sysdeps/linux/common/ntp_gettime.c
+++ b/libc/sysdeps/linux/common/ntp_gettime.c
@@ -18,7 +18,7 @@
 
 #include <sys/timex.h>
 
-libc_hidden_proto(adjtimex)
+/* libc_hidden_proto(adjtimex) */
 
 int ntp_gettime(struct ntptimeval *ntv)
 {
diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c
index 1c40b3e9b..4d965aeba 100644
--- a/libc/sysdeps/linux/common/open64.c
+++ b/libc/sysdeps/linux/common/open64.c
@@ -37,7 +37,7 @@ int __libc_open64 (const char *file, int oflag, ...)
 }
 libc_hidden_def(__libc_open64)
 
-libc_hidden_proto(open64)
+/* libc_hidden_proto(open64) */
 weak_alias(__libc_open64,open64)
 libc_hidden_weak(open64)
 #endif /* __UCLIBC_HAS_LFS__ */
diff --git a/libc/sysdeps/linux/common/pause.c b/libc/sysdeps/linux/common/pause.c
index 877717a0a..5c75211a7 100644
--- a/libc/sysdeps/linux/common/pause.c
+++ b/libc/sysdeps/linux/common/pause.c
@@ -17,8 +17,8 @@ extern __typeof(pause) __libc_pause;
 _syscall0(int, __libc_pause)
 #else
 #include <signal.h>
-libc_hidden_proto(__sigpause)
-libc_hidden_proto(sigblock)
+/* libc_hidden_proto(__sigpause) */
+/* libc_hidden_proto(sigblock) */
 
 int __libc_pause(void)
 {
diff --git a/libc/sysdeps/linux/common/pipe.c b/libc/sysdeps/linux/common/pipe.c
index fa0c211ab..02b173853 100644
--- a/libc/sysdeps/linux/common/pipe.c
+++ b/libc/sysdeps/linux/common/pipe.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(pipe)
+/* libc_hidden_proto(pipe) */
 
 _syscall1(int, pipe, int *, filedes)
 libc_hidden_def(pipe)
diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c
index 764a9aa7b..e5f5f771f 100644
--- a/libc/sysdeps/linux/common/poll.c
+++ b/libc/sysdeps/linux/common/poll.c
@@ -30,7 +30,7 @@ _syscall3(int, __libc_poll, struct pollfd *, fds,
 
 #elif defined(__NR_ppoll) && defined __UCLIBC_LINUX_SPECIFIC__
 
-libc_hidden_proto(ppoll)
+/* libc_hidden_proto(ppoll) */
 int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
 	struct timespec *ts = NULL, tval;
@@ -59,8 +59,8 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memset) */
-libc_hidden_proto(getdtablesize)
-libc_hidden_proto(select)
+/* libc_hidden_proto(getdtablesize) */
+/* libc_hidden_proto(select) */
 
 /* uClinux 2.0 doesn't have poll, emulate it using select */
 
diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
index a203c0c55..edcb1dc66 100644
--- a/libc/sysdeps/linux/common/ppoll.c
+++ b/libc/sysdeps/linux/common/ppoll.c
@@ -22,7 +22,7 @@
 
 #if defined __NR_ppoll && defined __UCLIBC_LINUX_SPECIFIC__
 
-libc_hidden_proto(ppoll)
+/* libc_hidden_proto(ppoll) */
 
 # define __NR___libc_ppoll __NR_ppoll
 static __always_inline
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index 353cf1ac2..cb1d83820 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -117,7 +117,7 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 
 static ssize_t __fake_pread_write64(int fd, void *buf,
 		size_t count, off64_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/common/pselect.c b/libc/sysdeps/linux/common/pselect.c
index 567728f51..dce5e879c 100644
--- a/libc/sysdeps/linux/common/pselect.c
+++ b/libc/sysdeps/linux/common/pselect.c
@@ -26,7 +26,7 @@
 extern __typeof(pselect) __libc_pselect;
 
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(select)
+/* libc_hidden_proto(select) */
 
 
 /* Check the first NFDS descriptors each in READFDS (if not NULL) for read
diff --git a/libc/sysdeps/linux/common/readlink.c b/libc/sysdeps/linux/common/readlink.c
index 716bfcc4d..36e0f8942 100644
--- a/libc/sysdeps/linux/common/readlink.c
+++ b/libc/sysdeps/linux/common/readlink.c
@@ -10,6 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(readlink)
+/* libc_hidden_proto(readlink) */
 _syscall3(ssize_t, readlink, const char *, path, char *, buf, size_t, bufsiz)
 libc_hidden_def(readlink)
diff --git a/libc/sysdeps/linux/common/rmdir.c b/libc/sysdeps/linux/common/rmdir.c
index 63c5f2e7e..221c29f46 100644
--- a/libc/sysdeps/linux/common/rmdir.c
+++ b/libc/sysdeps/linux/common/rmdir.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(rmdir)
+/* libc_hidden_proto(rmdir) */
 
 _syscall1(int, rmdir, const char *, pathname)
 libc_hidden_def(rmdir)
diff --git a/libc/sysdeps/linux/common/select.c b/libc/sysdeps/linux/common/select.c
index 6d42285b3..4fc7a21a6 100644
--- a/libc/sysdeps/linux/common/select.c
+++ b/libc/sysdeps/linux/common/select.c
@@ -42,6 +42,6 @@ _syscall5(int, __libc_select, int, n, fd_set *, readfds, fd_set *, writefds,
 
 #endif
 
-libc_hidden_proto(select)
+/* libc_hidden_proto(select) */
 weak_alias(__libc_select,select)
 libc_hidden_weak(select)
diff --git a/libc/sysdeps/linux/common/setegid.c b/libc/sysdeps/linux/common/setegid.c
index 33c627c51..30921a8b3 100644
--- a/libc/sysdeps/linux/common/setegid.c
+++ b/libc/sysdeps/linux/common/setegid.c
@@ -12,9 +12,9 @@
 #include <sys/syscall.h>
 
 #if (defined __NR_setresgid || defined __NR_setresgid32) && defined __USE_GNU
-libc_hidden_proto(setresgid)
+/* libc_hidden_proto(setresgid) */
 #endif
-libc_hidden_proto(setregid)
+/* libc_hidden_proto(setregid) */
 
 int setegid(gid_t gid)
 {
diff --git a/libc/sysdeps/linux/common/seteuid.c b/libc/sysdeps/linux/common/seteuid.c
index 5a6e9a25a..6f2c5e92a 100644
--- a/libc/sysdeps/linux/common/seteuid.c
+++ b/libc/sysdeps/linux/common/seteuid.c
@@ -16,12 +16,12 @@
 #undef __NR_setresuid32
 #endif
 
-libc_hidden_proto(seteuid)
+/* libc_hidden_proto(seteuid) */
 
 #if (defined __NR_setresuid || defined __NR_setresuid32) && defined __USE_GNU
-libc_hidden_proto(setresuid)
+/* libc_hidden_proto(setresuid) */
 #endif
-libc_hidden_proto(setreuid)
+/* libc_hidden_proto(setreuid) */
 
 int seteuid(uid_t uid)
 {
diff --git a/libc/sysdeps/linux/common/setgroups.c b/libc/sysdeps/linux/common/setgroups.c
index 298252dfa..d7a94944c 100644
--- a/libc/sysdeps/linux/common/setgroups.c
+++ b/libc/sysdeps/linux/common/setgroups.c
@@ -14,7 +14,7 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(setgroups)
+/* libc_hidden_proto(setgroups) */
 
 #if defined(__NR_setgroups32)
 # undef __NR_setgroups
@@ -26,7 +26,7 @@ _syscall2(int, setgroups, size_t, size, const gid_t *, list)
 
 #else
 
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 
 #define __NR___syscall_setgroups __NR_setgroups
 static __inline__ _syscall2(int, __syscall_setgroups,
diff --git a/libc/sysdeps/linux/common/setitimer.c b/libc/sysdeps/linux/common/setitimer.c
index f57e6acef..df65808d2 100644
--- a/libc/sysdeps/linux/common/setitimer.c
+++ b/libc/sysdeps/linux/common/setitimer.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-libc_hidden_proto(setitimer)
+/* libc_hidden_proto(setitimer) */
 
 _syscall3(int, setitimer, __itimer_which_t, which,
 		  const struct itimerval *, new, struct itimerval *, old)
diff --git a/libc/sysdeps/linux/common/setpgid.c b/libc/sysdeps/linux/common/setpgid.c
index 1ec5e6240..664da1ad2 100644
--- a/libc/sysdeps/linux/common/setpgid.c
+++ b/libc/sysdeps/linux/common/setpgid.c
@@ -12,7 +12,7 @@
 #if defined __USE_UNIX98 || defined __USE_SVID
 #include <unistd.h>
 
-libc_hidden_proto(setpgid)
+/* libc_hidden_proto(setpgid) */
 
 #define __NR___syscall_setpgid __NR_setpgid
 static __inline__ _syscall2(int, __syscall_setpgid,
diff --git a/libc/sysdeps/linux/common/setpgrp.c b/libc/sysdeps/linux/common/setpgrp.c
index 38300dc2e..9f71aa26f 100644
--- a/libc/sysdeps/linux/common/setpgrp.c
+++ b/libc/sysdeps/linux/common/setpgrp.c
@@ -7,7 +7,7 @@
 #include <syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(setpgid)
+/* libc_hidden_proto(setpgid) */
 
 int setpgrp(void)
 {
diff --git a/libc/sysdeps/linux/common/setpriority.c b/libc/sysdeps/linux/common/setpriority.c
index 9774348ce..3b98c3f58 100644
--- a/libc/sysdeps/linux/common/setpriority.c
+++ b/libc/sysdeps/linux/common/setpriority.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(setpriority)
+/* libc_hidden_proto(setpriority) */
 
 _syscall3(int, setpriority, __priority_which_t, which, id_t, who, int, prio)
 libc_hidden_def(setpriority)
diff --git a/libc/sysdeps/linux/common/setregid.c b/libc/sysdeps/linux/common/setregid.c
index b92b84468..332599431 100644
--- a/libc/sysdeps/linux/common/setregid.c
+++ b/libc/sysdeps/linux/common/setregid.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-libc_hidden_proto(setregid)
+/* libc_hidden_proto(setregid) */
 
 #if (__WORDSIZE == 32 && defined(__NR_setregid32)) || __WORDSIZE == 64
 # ifdef __NR_setregid32
diff --git a/libc/sysdeps/linux/common/setresgid.c b/libc/sysdeps/linux/common/setresgid.c
index 6018f1984..e99708e0d 100644
--- a/libc/sysdeps/linux/common/setresgid.c
+++ b/libc/sysdeps/linux/common/setresgid.c
@@ -15,7 +15,7 @@
 # undef __NR_setresgid
 # define __NR_setresgid __NR_setresgid32
 
-libc_hidden_proto(setresgid)
+/* libc_hidden_proto(setresgid) */
 _syscall3(int, setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
 libc_hidden_def(setresgid)
 
@@ -25,7 +25,7 @@ libc_hidden_def(setresgid)
 static __inline__ _syscall3(int, __syscall_setresgid,
 		__kernel_gid_t, rgid, __kernel_gid_t, egid, __kernel_gid_t, sgid)
 
-libc_hidden_proto(setresgid)
+/* libc_hidden_proto(setresgid) */
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid)
 {
 	if (((rgid + 1) > (gid_t) ((__kernel_gid_t) - 1U))
diff --git a/libc/sysdeps/linux/common/setresuid.c b/libc/sysdeps/linux/common/setresuid.c
index ab15be197..c1e395a40 100644
--- a/libc/sysdeps/linux/common/setresuid.c
+++ b/libc/sysdeps/linux/common/setresuid.c
@@ -15,7 +15,7 @@
 # undef __NR_setresuid
 # define __NR_setresuid __NR_setresuid32
 
-libc_hidden_proto(setresuid)
+/* libc_hidden_proto(setresuid) */
 _syscall3(int, setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
 libc_hidden_def(setresuid)
 
@@ -25,7 +25,7 @@ libc_hidden_def(setresuid)
 static __inline__ _syscall3(int, __syscall_setresuid,
 		__kernel_uid_t, rgid, __kernel_uid_t, egid, __kernel_uid_t, sgid)
 
-libc_hidden_proto(setresuid)
+/* libc_hidden_proto(setresuid) */
 int setresuid(uid_t ruid, uid_t euid, uid_t suid)
 {
 	if (((ruid + 1) > (uid_t) ((__kernel_uid_t) - 1U))
diff --git a/libc/sysdeps/linux/common/setreuid.c b/libc/sysdeps/linux/common/setreuid.c
index bf55843d8..bb7b6a9c5 100644
--- a/libc/sysdeps/linux/common/setreuid.c
+++ b/libc/sysdeps/linux/common/setreuid.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-libc_hidden_proto(setreuid)
+/* libc_hidden_proto(setreuid) */
 
 #if (__WORDSIZE == 32 && defined(__NR_setreuid32)) || __WORDSIZE == 64
 # ifdef __NR_setreuid32
diff --git a/libc/sysdeps/linux/common/setrlimit.c b/libc/sysdeps/linux/common/setrlimit.c
index 3811cd7d4..87f96cb21 100644
--- a/libc/sysdeps/linux/common/setrlimit.c
+++ b/libc/sysdeps/linux/common/setrlimit.c
@@ -13,7 +13,7 @@
 #include <sys/resource.h>
 #undef setrlimit64
 
-libc_hidden_proto(setrlimit)
+/* libc_hidden_proto(setrlimit) */
 
 /* Only wrap setrlimit if the new usetrlimit is not present and setrlimit sucks */
 
diff --git a/libc/sysdeps/linux/common/setrlimit64.c b/libc/sysdeps/linux/common/setrlimit64.c
index 90b8eebd7..3233ed696 100644
--- a/libc/sysdeps/linux/common/setrlimit64.c
+++ b/libc/sysdeps/linux/common/setrlimit64.c
@@ -26,7 +26,7 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-libc_hidden_proto(setrlimit)
+/* libc_hidden_proto(setrlimit) */
 
 /* Set the soft and hard limits for RESOURCE to *RLIMITS.
    Only the super-user can increase hard limits.
diff --git a/libc/sysdeps/linux/common/setsid.c b/libc/sysdeps/linux/common/setsid.c
index 849c02ffc..d0fc9b010 100644
--- a/libc/sysdeps/linux/common/setsid.c
+++ b/libc/sysdeps/linux/common/setsid.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(setsid)
+/* libc_hidden_proto(setsid) */
 
 _syscall0(pid_t, setsid)
 libc_hidden_def(setsid)
diff --git a/libc/sysdeps/linux/common/settimeofday.c b/libc/sysdeps/linux/common/settimeofday.c
index c6f2d798a..361eb3532 100644
--- a/libc/sysdeps/linux/common/settimeofday.c
+++ b/libc/sysdeps/linux/common/settimeofday.c
@@ -12,7 +12,7 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(settimeofday)
+/* libc_hidden_proto(settimeofday) */
 
 _syscall2(int, settimeofday, const struct timeval *, tv,
 		  const struct timezone *, tz)
diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c
index 5e79bc667..d610e8f6a 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -25,7 +25,7 @@
 #if defined __USE_POSIX199309
 
 /* libc_hidden_proto(getpid) */
-libc_hidden_proto(getuid)
+/* libc_hidden_proto(getuid) */
 /* Experimentally off - libc_hidden_proto(memset) */
 
 #ifdef __NR_rt_sigqueueinfo
diff --git a/libc/sysdeps/linux/common/sigsuspend.c b/libc/sysdeps/linux/common/sigsuspend.c
index 6161acb29..a5ce43007 100644
--- a/libc/sysdeps/linux/common/sigsuspend.c
+++ b/libc/sysdeps/linux/common/sigsuspend.c
@@ -32,7 +32,7 @@ int __libc_sigsuspend(const sigset_t * set)
 	return __syscall_sigsuspend(0, 0, set->__val[0]);
 }
 #endif
-libc_hidden_proto(sigsuspend)
+/* libc_hidden_proto(sigsuspend) */
 weak_alias(__libc_sigsuspend,sigsuspend)
 libc_hidden_weak(sigsuspend)
 #endif
diff --git a/libc/sysdeps/linux/common/splice.c b/libc/sysdeps/linux/common/splice.c
index f1e0d821e..b21d10336 100644
--- a/libc/sysdeps/linux/common/splice.c
+++ b/libc/sysdeps/linux/common/splice.c
@@ -10,8 +10,6 @@
 #include <sys/syscall.h>
 #include <fcntl.h>
 
-libc_hidden_proto(splice)
-
 #ifdef __NR_splice
 _syscall6(ssize_t, splice, int, __fdin, __off64_t *, __offin, int, __fdout,
 	__off64_t *, __offout, size_t, __len, unsigned int, __flags)
@@ -23,6 +21,3 @@ ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
 	return -1;
 }
 #endif
-
-libc_hidden_def(splice)
-
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index b939b4ea0..73d7113b8 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -32,17 +32,17 @@
 #if defined __UCLIBC_HAS_SYSLOG__
 #include <sys/syslog.h>
 
-libc_hidden_proto(openlog)
-libc_hidden_proto(syslog)
-libc_hidden_proto(closelog)
+/* libc_hidden_proto(openlog) */
+/* libc_hidden_proto(syslog) */
+/* libc_hidden_proto(closelog) */
 #endif
 
 /* libc_hidden_proto(sigaction) */
-libc_hidden_proto(sigfillset)
-libc_hidden_proto(sigdelset)
+/* libc_hidden_proto(sigfillset) */
+/* libc_hidden_proto(sigdelset) */
 /* libc_hidden_proto(sigprocmask) */
 /* libc_hidden_proto(write) */
-libc_hidden_proto(kill)
+/* libc_hidden_proto(kill) */
 /* libc_hidden_proto(getpid) */
 /* libc_hidden_proto(_exit) */
 
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index c2e02ae34..d563bcd88 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -40,7 +40,7 @@ libc_hidden_def(stat)
 
 #if ! defined __NR_stat64 && defined __UCLIBC_HAS_LFS__
 extern __typeof(stat) stat64;
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(stat64) */
 strong_alias(stat,stat64)
 libc_hidden_def(stat64)
 #endif
diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c
index c9ba2bc63..11f836bac 100644
--- a/libc/sysdeps/linux/common/stat64.c
+++ b/libc/sysdeps/linux/common/stat64.c
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_stat64
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(stat64) */
 
 # define __NR___syscall_stat64 __NR_stat64
 # include <unistd.h>
diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c
index 5f4133ad3..e892fb376 100644
--- a/libc/sysdeps/linux/common/statfs.c
+++ b/libc/sysdeps/linux/common/statfs.c
@@ -14,6 +14,7 @@
 
 extern __typeof(statfs) __libc_statfs;
 libc_hidden_proto(__libc_statfs)
+
 #define __NR___libc_statfs __NR_statfs
 _syscall2(int, __libc_statfs, const char *, path, struct statfs *, buf)
 
diff --git a/libc/sysdeps/linux/common/stime.c b/libc/sysdeps/linux/common/stime.c
index 2b7ea6f2f..de060c8a2 100644
--- a/libc/sysdeps/linux/common/stime.c
+++ b/libc/sysdeps/linux/common/stime.c
@@ -15,7 +15,7 @@
 #ifdef __NR_stime
 _syscall1(int, stime, const time_t *, t)
 #else
-libc_hidden_proto(settimeofday)
+/* libc_hidden_proto(settimeofday) */
 
 int stime(const time_t * when)
 {
diff --git a/libc/sysdeps/linux/common/times.c b/libc/sysdeps/linux/common/times.c
index a6ea1fa51..a0644ef1f 100644
--- a/libc/sysdeps/linux/common/times.c
+++ b/libc/sysdeps/linux/common/times.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/times.h>
 
-libc_hidden_proto(times)
+/* libc_hidden_proto(times) */
 
 _syscall1(clock_t, times, struct tms *, buf)
 libc_hidden_def(times)
diff --git a/libc/sysdeps/linux/common/truncate.c b/libc/sysdeps/linux/common/truncate.c
index a40ec3030..22da552da 100644
--- a/libc/sysdeps/linux/common/truncate.c
+++ b/libc/sysdeps/linux/common/truncate.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(truncate)
+/* libc_hidden_proto(truncate) */
 
 _syscall2(int, truncate, const char *, path, __off_t, length)
 libc_hidden_def(truncate)
diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c
index 3ab61657d..40989334f 100644
--- a/libc/sysdeps/linux/common/truncate64.c
+++ b/libc/sysdeps/linux/common/truncate64.c
@@ -62,7 +62,7 @@ int truncate64 (const char * path, __off64_t length)
 
 #else  /* __NR_truncate64 */
 
-libc_hidden_proto(truncate)
+/* libc_hidden_proto(truncate) */
 
 int truncate64 (const char * path, __off64_t length)
 {
diff --git a/libc/sysdeps/linux/common/ulimit.c b/libc/sysdeps/linux/common/ulimit.c
index c02c19122..3c1a0cc1c 100644
--- a/libc/sysdeps/linux/common/ulimit.c
+++ b/libc/sysdeps/linux/common/ulimit.c
@@ -19,9 +19,9 @@ _syscall2(long, ulimit, int, cmd, long, arg)
 #include <ulimit.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(sysconf)
-libc_hidden_proto(getrlimit)
-libc_hidden_proto(setrlimit)
+/* libc_hidden_proto(sysconf) */
+/* libc_hidden_proto(getrlimit) */
+/* libc_hidden_proto(setrlimit) */
 
 long int ulimit(int cmd, ...)
 {
diff --git a/libc/sysdeps/linux/common/uname.c b/libc/sysdeps/linux/common/uname.c
index 1b5168750..1e29b9f23 100644
--- a/libc/sysdeps/linux/common/uname.c
+++ b/libc/sysdeps/linux/common/uname.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 
-libc_hidden_proto(uname)
+/* libc_hidden_proto(uname) */
 
 _syscall1(int, uname, struct utsname *, buf)
 libc_hidden_def(uname)
diff --git a/libc/sysdeps/linux/common/unlink.c b/libc/sysdeps/linux/common/unlink.c
index 9b1f38b3c..1ad1f2c6d 100644
--- a/libc/sysdeps/linux/common/unlink.c
+++ b/libc/sysdeps/linux/common/unlink.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-libc_hidden_proto(unlink)
+/* libc_hidden_proto(unlink) */
 
 _syscall1(int, unlink, const char *, pathname)
 libc_hidden_def(unlink)
diff --git a/libc/sysdeps/linux/common/utime.c b/libc/sysdeps/linux/common/utime.c
index 5c4207aaa..f87afcfc4 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <utime.h>
 
-libc_hidden_proto(utime)
+/* libc_hidden_proto(utime) */
 
 #ifdef __NR_utime
 _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
@@ -18,7 +18,7 @@ _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
 #include <stdlib.h>
 #include <sys/time.h>
 
-libc_hidden_proto(utimes)
+/* libc_hidden_proto(utimes) */
 /* libc_hidden_proto(gettimeofday) */
 
 int utime(const char *file, const struct utimbuf *times)
diff --git a/libc/sysdeps/linux/common/utimes.c b/libc/sysdeps/linux/common/utimes.c
index e62faff7f..191b1afd8 100644
--- a/libc/sysdeps/linux/common/utimes.c
+++ b/libc/sysdeps/linux/common/utimes.c
@@ -11,14 +11,14 @@
 #include <utime.h>
 #include <sys/time.h>
 
-libc_hidden_proto(utimes)
+/* libc_hidden_proto(utimes) */
 
 #ifdef __NR_utimes
 _syscall2(int, utimes, const char *, file, const struct timeval *, tvp)
 #else
 #include <stdlib.h>
 
-libc_hidden_proto(utime)
+/* libc_hidden_proto(utime) */
 
 int utimes(const char *file, const struct timeval tvp[2])
 {
diff --git a/libc/sysdeps/linux/common/vfork.c b/libc/sysdeps/linux/common/vfork.c
index f9634cd5c..eda76aeac 100644
--- a/libc/sysdeps/linux/common/vfork.c
+++ b/libc/sysdeps/linux/common/vfork.c
@@ -12,14 +12,14 @@
 #ifdef __ARCH_USE_MMU__
 
 #ifdef __NR_fork
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 
 extern __typeof(vfork) __vfork attribute_hidden;
 pid_t __vfork(void)
 {
     return fork();
 }
-libc_hidden_proto(vfork)
+/* libc_hidden_proto(vfork) */
 weak_alias(__vfork,vfork)
 libc_hidden_weak(vfork)
 #endif
diff --git a/libc/sysdeps/linux/common/vmsplice.c b/libc/sysdeps/linux/common/vmsplice.c
index 2d32f20f8..c5fd6c7ed 100644
--- a/libc/sysdeps/linux/common/vmsplice.c
+++ b/libc/sysdeps/linux/common/vmsplice.c
@@ -10,8 +10,6 @@
 #include <sys/syscall.h>
 #include <fcntl.h>
 
-libc_hidden_proto(vmsplice)
-
 #ifdef __NR_vmsplice
 _syscall4(ssize_t, vmsplice, int, __fdout, const struct iovec *, __iov,
 	size_t, __count, unsigned int, __flags)
@@ -23,6 +21,3 @@ ssize_t vmsplice(int __fdout, const struct iovec *__iov, size_t __count,
 	return -1;
 }
 #endif
-
-libc_hidden_def(vmsplice)
-
diff --git a/libc/sysdeps/linux/common/wait.c b/libc/sysdeps/linux/common/wait.c
index 39d0e47b9..e1b41112d 100644
--- a/libc/sysdeps/linux/common/wait.c
+++ b/libc/sysdeps/linux/common/wait.c
@@ -10,7 +10,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(wait4)
+/* libc_hidden_proto(wait4) */
 
 extern __typeof(wait) __libc_wait;
 
diff --git a/libc/sysdeps/linux/common/wait3.c b/libc/sysdeps/linux/common/wait3.c
index 8a2d43f7a..11985e3db 100644
--- a/libc/sysdeps/linux/common/wait3.c
+++ b/libc/sysdeps/linux/common/wait3.c
@@ -11,7 +11,7 @@
 
 #if defined __USE_BSD
 
-libc_hidden_proto(wait4)
+/* libc_hidden_proto(wait4) */
 
 /* Wait for a child to exit.  When one does, put its status in *STAT_LOC and
  * return its process ID.  For errors return (pid_t) -1.  If USAGE is not nil,
diff --git a/libc/sysdeps/linux/common/wait4.c b/libc/sysdeps/linux/common/wait4.c
index c62a855fb..4fd866996 100644
--- a/libc/sysdeps/linux/common/wait4.c
+++ b/libc/sysdeps/linux/common/wait4.c
@@ -12,7 +12,7 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(wait4)
+/* libc_hidden_proto(wait4) */
 
 #define __NR___syscall_wait4 __NR_wait4
 static __inline__ _syscall4(int, __syscall_wait4, __kernel_pid_t, pid,
diff --git a/libc/sysdeps/linux/common/waitid.c b/libc/sysdeps/linux/common/waitid.c
index ce3d5dc05..6218cdd53 100644
--- a/libc/sysdeps/linux/common/waitid.c
+++ b/libc/sysdeps/linux/common/waitid.c
@@ -15,7 +15,7 @@
 _syscall4(int, waitid, idtype_t, idtype, id_t, id, siginfo_t*, infop, int, options)
 # else
 #  include <string.h>
-libc_hidden_proto(waitpid)
+/* libc_hidden_proto(waitpid) */
 int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
 {
 	switch (idtype) {
diff --git a/libc/sysdeps/linux/common/waitpid.c b/libc/sysdeps/linux/common/waitpid.c
index c1766be6b..d5afd8262 100644
--- a/libc/sysdeps/linux/common/waitpid.c
+++ b/libc/sysdeps/linux/common/waitpid.c
@@ -10,13 +10,13 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-libc_hidden_proto(wait4)
+/* libc_hidden_proto(wait4) */
 
 extern __typeof(waitpid) __libc_waitpid;
 __pid_t __libc_waitpid(__pid_t pid, int *wait_stat, int options)
 {
 	return wait4(pid, wait_stat, options, NULL);
 }
-libc_hidden_proto(waitpid)
+/* libc_hidden_proto(waitpid) */
 weak_alias(__libc_waitpid,waitpid)
 libc_hidden_weak(waitpid)