trim Experimentally off and uncommented hidden

  sed -i -e '/Experimentally off - /d' $(grep -rl "Experimentally off - " *)
  sed -i -e '/^\/\*[[:space:]]*libc_hidden_proto(/d' $(grep -rl "libc_hidden_proto" *)
  should be a nop

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

90 files changed, 1 insertions, 151 deletions

diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
index 6dc8725f6..f9ec0eabf 100644
--- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c
+++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c
@@ -12,8 +12,6 @@
 #define __need_NULL
 #include <stddef.h>
 
-/* 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/_exit.c b/libc/sysdeps/linux/common/_exit.c
index a8b3ffcb9..fbeed0d8a 100644
--- a/libc/sysdeps/linux/common/_exit.c
+++ b/libc/sysdeps/linux/common/_exit.c
@@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-/* libc_hidden_proto(_exit) */
 
 void attribute_noreturn _exit(int status)
 {
diff --git a/libc/sysdeps/linux/common/adjtimex.c b/libc/sysdeps/linux/common/adjtimex.c
index 725c82994..45cb38495 100644
--- a/libc/sysdeps/linux/common/adjtimex.c
+++ b/libc/sysdeps/linux/common/adjtimex.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/timex.h>
 
-/* 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 10d4123a7..cfd68fe1b 100644
--- a/libc/sysdeps/linux/common/alarm.c
+++ b/libc/sysdeps/linux/common/alarm.c
@@ -10,14 +10,12 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(alarm) */
 
 #ifdef __NR_alarm
 _syscall1(unsigned int, alarm, unsigned int, seconds)
 #else
 #include <sys/time.h>
 
-/* libc_hidden_proto(setitimer) */
 
 unsigned int alarm(unsigned int seconds)
 {
diff --git a/libc/sysdeps/linux/common/chdir.c b/libc/sysdeps/linux/common/chdir.c
index 05441eb82..e13810196 100644
--- a/libc/sysdeps/linux/common/chdir.c
+++ b/libc/sysdeps/linux/common/chdir.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <sys/param.h>
 
-/* 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 a4524ba1f..871e0233d 100644
--- a/libc/sysdeps/linux/common/chmod.c
+++ b/libc/sysdeps/linux/common/chmod.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-/* 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 2e7784a0c..f2c60e0b7 100644
--- a/libc/sysdeps/linux/common/chown.c
+++ b/libc/sysdeps/linux/common/chown.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-/* 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 4964ec57c..61413b6c4 100644
--- a/libc/sysdeps/linux/common/clock_getres.c
+++ b/libc/sysdeps/linux/common/clock_getres.c
@@ -14,7 +14,6 @@
 #ifdef __NR_clock_getres
 _syscall2(int, clock_getres, clockid_t, clock_id, struct timespec*, res)
 #else
-/* libc_hidden_proto(sysconf) */
 
 int clock_getres(clockid_t clock_id, struct timespec* res)
 {
diff --git a/libc/sysdeps/linux/common/clock_gettime.c b/libc/sysdeps/linux/common/clock_gettime.c
index f1db8ad7c..888cd64b0 100644
--- a/libc/sysdeps/linux/common/clock_gettime.c
+++ b/libc/sysdeps/linux/common/clock_gettime.c
@@ -15,7 +15,6 @@
 #ifdef __NR_clock_gettime
 _syscall2(int, clock_gettime, clockid_t, clock_id, struct timespec*, tp)
 #else
-/* libc_hidden_proto(gettimeofday) */
 
 int clock_gettime(clockid_t clock_id, struct timespec* tp)
 {
diff --git a/libc/sysdeps/linux/common/clock_settime.c b/libc/sysdeps/linux/common/clock_settime.c
index f11088a37..0c9c840ac 100644
--- a/libc/sysdeps/linux/common/clock_settime.c
+++ b/libc/sysdeps/linux/common/clock_settime.c
@@ -14,7 +14,6 @@
 #ifdef __NR_clock_settime
 _syscall2(int, clock_settime, clockid_t, clock_id, const struct timespec*, tp)
 #else
-/* 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 5230fc6be..0360b479b 100644
--- a/libc/sysdeps/linux/common/cmsg_nxthdr.c
+++ b/libc/sysdeps/linux/common/cmsg_nxthdr.c
@@ -23,7 +23,6 @@
 #undef __USE_EXTERN_INLINES
 #include <sys/socket.h>
 
-/* libc_hidden_proto(__cmsg_nxthdr) */
 
 struct cmsghdr *
 __cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
diff --git a/libc/sysdeps/linux/common/dl-osinfo.h b/libc/sysdeps/linux/common/dl-osinfo.h
index 195c64803..649d203f8 100644
--- a/libc/sysdeps/linux/common/dl-osinfo.h
+++ b/libc/sysdeps/linux/common/dl-osinfo.h
@@ -21,10 +21,6 @@
 
 #  ifdef IS_IN_libc
 #include <fcntl.h>
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(gettimeofday) */
 #   define OPEN open
 #   define READ read
 #   define CLOSE close
diff --git a/libc/sysdeps/linux/common/dup2.c b/libc/sysdeps/linux/common/dup2.c
index 2a315fed4..006f06b69 100644
--- a/libc/sysdeps/linux/common/dup2.c
+++ b/libc/sysdeps/linux/common/dup2.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 53efd78fb..e8568df2b 100644
--- a/libc/sysdeps/linux/common/execve.c
+++ b/libc/sysdeps/linux/common/execve.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <sys/param.h>
 
-/* 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 45236f177..4d54ef821 100644
--- a/libc/sysdeps/linux/common/fchdir.c
+++ b/libc/sysdeps/linux/common/fchdir.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 5993387f0..26a20d987 100644
--- a/libc/sysdeps/linux/common/fork.c
+++ b/libc/sysdeps/linux/common/fork.c
@@ -16,7 +16,6 @@
 extern __typeof(fork) __libc_fork;
 #define __NR___libc_fork __NR_fork
 _syscall0(pid_t, __libc_fork)
-/* libc_hidden_proto(fork) */
 weak_alias(__libc_fork,fork)
 libc_hidden_weak(fork)
 #endif
@@ -28,7 +27,6 @@ pid_t __libc_fork(void)
 	__set_errno(ENOSYS);
 	return -1;
 }
-/* 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/fstat64.c b/libc/sysdeps/linux/common/fstat64.c
index a57b4f6f5..60613433b 100644
--- a/libc/sysdeps/linux/common/fstat64.c
+++ b/libc/sysdeps/linux/common/fstat64.c
@@ -14,7 +14,6 @@
 #include <sys/stat.h>
 #include "xstatconv.h"
 
-/* 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 a7a6ea69d..3bdef3f46 100644
--- a/libc/sysdeps/linux/common/ftruncate.c
+++ b/libc/sysdeps/linux/common/ftruncate.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 4d00b0294..c5a616007 100644
--- a/libc/sysdeps/linux/common/ftruncate64.c
+++ b/libc/sysdeps/linux/common/ftruncate64.c
@@ -21,7 +21,6 @@
 # include <sys/types.h>
 # include <sys/syscall.h>
 
-/* libc_hidden_proto(ftruncate64) */
 
 # ifdef __NR_ftruncate64
 
@@ -52,7 +51,6 @@ int ftruncate64 (int fd, __off64_t length)
 
 # else  /* __NR_ftruncate64 */
 
-/* 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 13619159d..75d7a1c8b 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -15,17 +15,7 @@
 #include <sys/param.h>
 #include <sys/syscall.h>
 
-/* 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(stat) */
+
 
 #ifdef __NR_getcwd
 
diff --git a/libc/sysdeps/linux/common/getdirname.c b/libc/sysdeps/linux/common/getdirname.c
index 4b793faf0..63b9b750e 100644
--- a/libc/sysdeps/linux/common/getdirname.c
+++ b/libc/sysdeps/linux/common/getdirname.c
@@ -25,13 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* libc_hidden_proto(getcwd) */
-/* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(stat64) */
 #else
-/* libc_hidden_proto(stat) */
 #endif
 
 /* Return a malloc'd string containing the current directory name.
diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c
index cdea2172a..8590283f5 100644
--- a/libc/sysdeps/linux/common/getdomainname.c
+++ b/libc/sysdeps/linux/common/getdomainname.c
@@ -12,9 +12,6 @@
 #include <sys/utsname.h>
 
 #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) */
 
 int
 #ifndef __UCLIBC_BSD_SPECIFIC__
diff --git a/libc/sysdeps/linux/common/getdtablesize.c b/libc/sysdeps/linux/common/getdtablesize.c
index 183c09e1f..7dd3a54d9 100644
--- a/libc/sysdeps/linux/common/getdtablesize.c
+++ b/libc/sysdeps/linux/common/getdtablesize.c
@@ -11,9 +11,7 @@
 
 /* XXX: _BSD || _XOPEN_SOURCE >= 500 */
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-/* libc_hidden_proto(getdtablesize) */
 
-/* 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 20a679156..f2b6401cf 100644
--- a/libc/sysdeps/linux/common/getegid.c
+++ b/libc/sysdeps/linux/common/getegid.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(getegid) */
 
 #if defined(__NR_getegid32)
 # undef __NR_getegid
@@ -25,7 +24,6 @@ gid_t getegid(void)
 	return (__syscall_getegid());
 }
 #else
-/* 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 b9332a9f2..6111e5d1b 100644
--- a/libc/sysdeps/linux/common/geteuid.c
+++ b/libc/sysdeps/linux/common/geteuid.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(geteuid) */
 
 #if defined(__NR_geteuid32)
 # undef __NR_geteuid
@@ -26,7 +25,6 @@ uid_t geteuid(void)
 }
 
 #else
-/* 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 f42a1731c..80c60034e 100644
--- a/libc/sysdeps/linux/common/getgid.c
+++ b/libc/sysdeps/linux/common/getgid.c
@@ -19,6 +19,5 @@
 # define __NR_getgid __NR_getgid32
 #endif
 
-/* 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 67d2f4faa..ddc2caee4 100644
--- a/libc/sysdeps/linux/common/getgroups.c
+++ b/libc/sysdeps/linux/common/getgroups.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <grp.h>
 
-/* libc_hidden_proto(getgroups) */
 
 #if defined(__NR_getgroups32)
 # undef __NR_getgroups
@@ -24,7 +23,6 @@ _syscall2(int, getgroups, int, size, gid_t *, list)
 
 #else
 
-/* 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 e06fee98d..3b59e5671 100644
--- a/libc/sysdeps/linux/common/gethostname.c
+++ b/libc/sysdeps/linux/common/gethostname.c
@@ -9,11 +9,7 @@
 #include <sys/utsname.h>
 #include <errno.h>
 
-/* libc_hidden_proto(gethostname) */
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* 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 96ed17b04..1faa54886 100644
--- a/libc/sysdeps/linux/common/getpagesize.c
+++ b/libc/sysdeps/linux/common/getpagesize.c
@@ -43,6 +43,5 @@ int __getpagesize(void)
 #endif	/* NBPG.  */
 #endif	/* EXEC_PAGESIZE.  */
 }
-/* libc_hidden_proto(getpagesize) */
 strong_alias(__getpagesize,getpagesize)
 libc_hidden_def(getpagesize)
diff --git a/libc/sysdeps/linux/common/getpid.c b/libc/sysdeps/linux/common/getpid.c
index d78c6e906..8041022e7 100644
--- a/libc/sysdeps/linux/common/getpid.c
+++ b/libc/sysdeps/linux/common/getpid.c
@@ -16,6 +16,5 @@ extern __typeof(getpid) __libc_getpid;
 #endif
 #define __NR___libc_getpid __NR_getpid
 _syscall0(pid_t, __libc_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 7adeb2f8b..4f2b0e933 100644
--- a/libc/sysdeps/linux/common/getppid.c
+++ b/libc/sysdeps/linux/common/getppid.c
@@ -12,7 +12,6 @@
 #ifdef	__NR_getppid
 _syscall0(pid_t, getppid)
 #else
-/* libc_hidden_proto(getpid) */
 pid_t getppid(void)
 {
 	return getpid();
diff --git a/libc/sysdeps/linux/common/getpriority.c b/libc/sysdeps/linux/common/getpriority.c
index 58fb2b31f..eba54a5fd 100644
--- a/libc/sysdeps/linux/common/getpriority.c
+++ b/libc/sysdeps/linux/common/getpriority.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-/* 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 6297516f0..4d3163f7e 100644
--- a/libc/sysdeps/linux/common/getrlimit.c
+++ b/libc/sysdeps/linux/common/getrlimit.c
@@ -13,7 +13,6 @@
 #include <sys/resource.h>
 #undef getrlimit64
 
-/* 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 14335778c..d537241eb 100644
--- a/libc/sysdeps/linux/common/getrlimit64.c
+++ b/libc/sysdeps/linux/common/getrlimit64.c
@@ -26,7 +26,6 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-/* 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 1b22451f8..5a178bba1 100644
--- a/libc/sysdeps/linux/common/getsid.c
+++ b/libc/sysdeps/linux/common/getsid.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 
 #ifdef __USE_XOPEN_EXTENDED
-/* 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/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c
index 663cc3b50..52490fec4 100644
--- a/libc/sysdeps/linux/common/gettimeofday.c
+++ b/libc/sysdeps/linux/common/gettimeofday.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-/* libc_hidden_proto(gettimeofday) */
 #ifdef __USE_BSD
 _syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz)
 #else
diff --git a/libc/sysdeps/linux/common/getuid.c b/libc/sysdeps/linux/common/getuid.c
index ab0ea150b..b6f813a06 100644
--- a/libc/sysdeps/linux/common/getuid.c
+++ b/libc/sysdeps/linux/common/getuid.c
@@ -19,6 +19,5 @@
 # define __NR_getuid __NR_getuid32
 #endif
 
-/* libc_hidden_proto(getuid) */
 _syscall0(uid_t, getuid)
 libc_hidden_def(getuid)
diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c
index 990558ef1..7ac8f16c2 100644
--- a/libc/sysdeps/linux/common/ioctl.c
+++ b/libc/sysdeps/linux/common/ioctl.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <sys/ioctl.h>
 
-/* libc_hidden_proto(ioctl) */
 
 #define __NR___syscall_ioctl __NR_ioctl
 static __always_inline
diff --git a/libc/sysdeps/linux/common/kill.c b/libc/sysdeps/linux/common/kill.c
index 3578673b8..c11a0ed08 100644
--- a/libc/sysdeps/linux/common/kill.c
+++ b/libc/sysdeps/linux/common/kill.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <signal.h>
 
-/* 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/longjmp.c b/libc/sysdeps/linux/common/longjmp.c
index e600c7f13..4d1442414 100644
--- a/libc/sysdeps/linux/common/longjmp.c
+++ b/libc/sysdeps/linux/common/longjmp.c
@@ -20,7 +20,6 @@
 #include <setjmp.h>
 #include <signal.h>
 
-/* 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/lstat64.c b/libc/sysdeps/linux/common/lstat64.c
index 8d7ce1921..235b76d4a 100644
--- a/libc/sysdeps/linux/common/lstat64.c
+++ b/libc/sysdeps/linux/common/lstat64.c
@@ -14,7 +14,6 @@
 # include <sys/stat.h>
 # include "xstatconv.h"
 
-/* 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 73234f287..fbc587d3d 100644
--- a/libc/sysdeps/linux/common/mkdir.c
+++ b/libc/sysdeps/linux/common/mkdir.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/stat.h>
 
-/* 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 f6f03a746..061681415 100644
--- a/libc/sysdeps/linux/common/mkfifo.c
+++ b/libc/sysdeps/linux/common/mkfifo.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-/* libc_hidden_proto(mknod) */
 
 /* Create a named pipe (FIFO) named PATH with protections MODE.  */
 int
diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c
index d5b0b85df..89958985e 100644
--- a/libc/sysdeps/linux/common/mmap.c
+++ b/libc/sysdeps/linux/common/mmap.c
@@ -14,7 +14,6 @@
 
 #ifdef __NR_mmap
 
-/* libc_hidden_proto(mmap) */
 
 #ifdef __UCLIBC_MMAP_HAS_6_ARGS__
 
@@ -45,7 +44,6 @@ libc_hidden_def(mmap)
 
 #elif defined(__NR_mmap2)
 
-/* 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 d0e87afb5..4ef039710 100644
--- a/libc/sysdeps/linux/common/mmap64.c
+++ b/libc/sysdeps/linux/common/mmap64.c
@@ -15,7 +15,6 @@
 #include <sys/syscall.h>
 #include <bits/uClibc_page.h>
 
-/* libc_hidden_proto(mmap) */
 
 # if !defined __NR_mmap2
 
diff --git a/libc/sysdeps/linux/common/munmap.c b/libc/sysdeps/linux/common/munmap.c
index 37b939993..736bffee2 100644
--- a/libc/sysdeps/linux/common/munmap.c
+++ b/libc/sysdeps/linux/common/munmap.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(munmap) */
 
 _syscall2(int, munmap, void *, start, size_t, length)
 libc_hidden_def(munmap)
diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c
index 51997ca13..3694db882 100644
--- a/libc/sysdeps/linux/common/nice.c
+++ b/libc/sysdeps/linux/common/nice.c
@@ -12,7 +12,6 @@
 #include <unistd.h>
 #include <sys/resource.h>
 
-/* libc_hidden_proto(getpriority) */
 
 #ifdef __NR_nice
 
@@ -23,7 +22,6 @@ static __inline__ _syscall1(int, __syscall_nice, int, incr)
 
 # include <limits.h>
 
-/* 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 ff933fed4..83959e860 100644
--- a/libc/sysdeps/linux/common/ntp_gettime.c
+++ b/libc/sysdeps/linux/common/ntp_gettime.c
@@ -18,7 +18,6 @@
 
 #include <sys/timex.h>
 
-/* libc_hidden_proto(adjtimex) */
 
 int ntp_gettime(struct ntptimeval *ntv)
 {
diff --git a/libc/sysdeps/linux/common/pipe.c b/libc/sysdeps/linux/common/pipe.c
index 02b173853..8eae27ca4 100644
--- a/libc/sysdeps/linux/common/pipe.c
+++ b/libc/sysdeps/linux/common/pipe.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(pipe) */
 
 _syscall1(int, pipe, int *, filedes)
 libc_hidden_def(pipe)
diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
index 1d7a04ecb..c9efe8d08 100644
--- a/libc/sysdeps/linux/common/ppoll.c
+++ b/libc/sysdeps/linux/common/ppoll.c
@@ -23,7 +23,6 @@
 
 #if defined __NR_ppoll && defined __UCLIBC_LINUX_SPECIFIC__
 
-/* libc_hidden_proto(ppoll) */
 
 int
 ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index 83d5fdfb0..88e6957ab 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -75,9 +75,6 @@ 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) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
@@ -117,7 +114,6 @@ static ssize_t __fake_pread_write(int fd, void *buf,
 }
 
 # ifdef __UCLIBC_HAS_LFS__
-/* 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 dce5e879c..63ab0dbb1 100644
--- a/libc/sysdeps/linux/common/pselect.c
+++ b/libc/sysdeps/linux/common/pselect.c
@@ -25,8 +25,6 @@
 
 extern __typeof(pselect) __libc_pselect;
 
-/* libc_hidden_proto(sigprocmask) */
-/* 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 36e0f8942..ef9e83539 100644
--- a/libc/sysdeps/linux/common/readlink.c
+++ b/libc/sysdeps/linux/common/readlink.c
@@ -10,6 +10,5 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 221c29f46..bad66544b 100644
--- a/libc/sysdeps/linux/common/rmdir.c
+++ b/libc/sysdeps/linux/common/rmdir.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(rmdir) */
 
 _syscall1(int, rmdir, const char *, pathname)
 libc_hidden_def(rmdir)
diff --git a/libc/sysdeps/linux/common/sbrk.c b/libc/sysdeps/linux/common/sbrk.c
index 9ec1db3db..4f0a8c40d 100644
--- a/libc/sysdeps/linux/common/sbrk.c
+++ b/libc/sysdeps/linux/common/sbrk.c
@@ -7,7 +7,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-/* libc_hidden_proto(brk) */
 
 /* Defined in brk.c.  */
 extern void *__curbrk attribute_hidden;
@@ -15,7 +14,6 @@ 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) */
 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 6705d0c68..1a0f55f75 100644
--- a/libc/sysdeps/linux/common/sched_setaffinity.c
+++ b/libc/sysdeps/linux/common/sched_setaffinity.c
@@ -28,7 +28,6 @@
 #include <alloca.h>
 
 #if defined __NR_sched_setaffinity
-/* 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/select.c b/libc/sysdeps/linux/common/select.c
index 5d56c7480..caff28d7c 100644
--- a/libc/sysdeps/linux/common/select.c
+++ b/libc/sysdeps/linux/common/select.c
@@ -61,6 +61,5 @@ _syscall5(int, __libc_select, int, n, fd_set *, readfds, fd_set *, writefds,
 
 #endif
 
-/* 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 30921a8b3..d1daf319b 100644
--- a/libc/sysdeps/linux/common/setegid.c
+++ b/libc/sysdeps/linux/common/setegid.c
@@ -12,9 +12,7 @@
 #include <sys/syscall.h>
 
 #if (defined __NR_setresgid || defined __NR_setresgid32) && defined __USE_GNU
-/* libc_hidden_proto(setresgid) */
 #endif
-/* 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 6f2c5e92a..44f085406 100644
--- a/libc/sysdeps/linux/common/seteuid.c
+++ b/libc/sysdeps/linux/common/seteuid.c
@@ -16,12 +16,9 @@
 #undef __NR_setresuid32
 #endif
 
-/* libc_hidden_proto(seteuid) */
 
 #if (defined __NR_setresuid || defined __NR_setresuid32) && defined __USE_GNU
-/* libc_hidden_proto(setresuid) */
 #endif
-/* 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 d7a94944c..72c987837 100644
--- a/libc/sysdeps/linux/common/setgroups.c
+++ b/libc/sysdeps/linux/common/setgroups.c
@@ -14,7 +14,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(setgroups) */
 
 #if defined(__NR_setgroups32)
 # undef __NR_setgroups
@@ -26,7 +25,6 @@ _syscall2(int, setgroups, size_t, size, const gid_t *, list)
 
 #else
 
-/* 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 df65808d2..427ff1eff 100644
--- a/libc/sysdeps/linux/common/setitimer.c
+++ b/libc/sysdeps/linux/common/setitimer.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-/* 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 664da1ad2..0410c64f3 100644
--- a/libc/sysdeps/linux/common/setpgid.c
+++ b/libc/sysdeps/linux/common/setpgid.c
@@ -12,7 +12,6 @@
 #if defined __USE_UNIX98 || defined __USE_SVID
 #include <unistd.h>
 
-/* 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 9f71aa26f..1a82ac884 100644
--- a/libc/sysdeps/linux/common/setpgrp.c
+++ b/libc/sysdeps/linux/common/setpgrp.c
@@ -7,7 +7,6 @@
 #include <syscall.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(setpgid) */
 
 int setpgrp(void)
 {
diff --git a/libc/sysdeps/linux/common/setpriority.c b/libc/sysdeps/linux/common/setpriority.c
index 3b98c3f58..05d5dd995 100644
--- a/libc/sysdeps/linux/common/setpriority.c
+++ b/libc/sysdeps/linux/common/setpriority.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 
-/* 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 332599431..15d590a68 100644
--- a/libc/sysdeps/linux/common/setregid.c
+++ b/libc/sysdeps/linux/common/setregid.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-/* 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 e99708e0d..95decc29e 100644
--- a/libc/sysdeps/linux/common/setresgid.c
+++ b/libc/sysdeps/linux/common/setresgid.c
@@ -15,7 +15,6 @@
 # undef __NR_setresgid
 # define __NR_setresgid __NR_setresgid32
 
-/* libc_hidden_proto(setresgid) */
 _syscall3(int, setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
 libc_hidden_def(setresgid)
 
@@ -25,7 +24,6 @@ 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) */
 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 c1e395a40..022ccfe64 100644
--- a/libc/sysdeps/linux/common/setresuid.c
+++ b/libc/sysdeps/linux/common/setresuid.c
@@ -15,7 +15,6 @@
 # undef __NR_setresuid
 # define __NR_setresuid __NR_setresuid32
 
-/* libc_hidden_proto(setresuid) */
 _syscall3(int, setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
 libc_hidden_def(setresuid)
 
@@ -25,7 +24,6 @@ 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) */
 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 bb7b6a9c5..a9eea6dc4 100644
--- a/libc/sysdeps/linux/common/setreuid.c
+++ b/libc/sysdeps/linux/common/setreuid.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <bits/wordsize.h>
 
-/* 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 87f96cb21..ed773f7ae 100644
--- a/libc/sysdeps/linux/common/setrlimit.c
+++ b/libc/sysdeps/linux/common/setrlimit.c
@@ -13,7 +13,6 @@
 #include <sys/resource.h>
 #undef setrlimit64
 
-/* 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 3233ed696..8705c6f59 100644
--- a/libc/sysdeps/linux/common/setrlimit64.c
+++ b/libc/sysdeps/linux/common/setrlimit64.c
@@ -26,7 +26,6 @@
 
 #if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32
 
-/* 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 d0fc9b010..4ca95fcc6 100644
--- a/libc/sysdeps/linux/common/setsid.c
+++ b/libc/sysdeps/linux/common/setsid.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 361eb3532..7e508aea0 100644
--- a/libc/sysdeps/linux/common/settimeofday.c
+++ b/libc/sysdeps/linux/common/settimeofday.c
@@ -12,7 +12,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(settimeofday) */
 
 _syscall2(int, settimeofday, const struct timeval *, tv,
 		  const struct timezone *, tz)
diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c
index febdca014..13bb2beb7 100644
--- a/libc/sysdeps/linux/common/sigprocmask.c
+++ b/libc/sysdeps/linux/common/sigprocmask.c
@@ -14,7 +14,6 @@
 
 #undef 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 1b997dcd7..e55d3b343 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -24,9 +24,6 @@
 #include <sys/syscall.h>
 #if defined __USE_POSIX199309
 
-/* libc_hidden_proto(getpid) */
-/* 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 a5ce43007..3648e76b5 100644
--- a/libc/sysdeps/linux/common/sigsuspend.c
+++ b/libc/sysdeps/linux/common/sigsuspend.c
@@ -32,7 +32,6 @@ int __libc_sigsuspend(const sigset_t * set)
 	return __syscall_sigsuspend(0, 0, set->__val[0]);
 }
 #endif
-/* libc_hidden_proto(sigsuspend) */
 weak_alias(__libc_sigsuspend,sigsuspend)
 libc_hidden_weak(sigsuspend)
 #endif
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index 8682ddcf2..69611cab5 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -32,19 +32,8 @@
 #if defined __UCLIBC_HAS_SYSLOG__
 #include <sys/syslog.h>
 
-/* 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(sigprocmask) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(kill) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(_exit) */
 
 static void block_signals(void)
 {
diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c
index 11f836bac..a76f182d4 100644
--- a/libc/sysdeps/linux/common/stat64.c
+++ b/libc/sysdeps/linux/common/stat64.c
@@ -11,7 +11,6 @@
 #include <sys/stat.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_stat64
-/* libc_hidden_proto(stat64) */
 
 # define __NR___syscall_stat64 __NR_stat64
 # include <unistd.h>
diff --git a/libc/sysdeps/linux/common/stime.c b/libc/sysdeps/linux/common/stime.c
index de060c8a2..cb7e8040c 100644
--- a/libc/sysdeps/linux/common/stime.c
+++ b/libc/sysdeps/linux/common/stime.c
@@ -15,7 +15,6 @@
 #ifdef __NR_stime
 _syscall1(int, stime, const time_t *, t)
 #else
-/* libc_hidden_proto(settimeofday) */
 
 int stime(const time_t * when)
 {
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c
index a40d8fc53..0d9e412bf 100644
--- a/libc/sysdeps/linux/common/time.c
+++ b/libc/sysdeps/linux/common/time.c
@@ -11,12 +11,10 @@
 #include <time.h>
 #include <sys/time.h>
 
-/* Experimentally off - libc_hidden_proto(time) */
 
 #ifdef __NR_time
 _syscall1(time_t, time, time_t *, t)
 #else
-/* libc_hidden_proto(gettimeofday) */
 
 time_t time(time_t * t)
 {
diff --git a/libc/sysdeps/linux/common/times.c b/libc/sysdeps/linux/common/times.c
index a0644ef1f..e71d1bd71 100644
--- a/libc/sysdeps/linux/common/times.c
+++ b/libc/sysdeps/linux/common/times.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/times.h>
 
-/* 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 22da552da..2331bddb1 100644
--- a/libc/sysdeps/linux/common/truncate.c
+++ b/libc/sysdeps/linux/common/truncate.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 73f652942..1f6c4596a 100644
--- a/libc/sysdeps/linux/common/truncate64.c
+++ b/libc/sysdeps/linux/common/truncate64.c
@@ -49,7 +49,6 @@ int truncate64(const char * path, __off64_t length)
 
 #else  /* __NR_truncate64 */
 
-/* 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 3c1a0cc1c..74b453375 100644
--- a/libc/sysdeps/linux/common/ulimit.c
+++ b/libc/sysdeps/linux/common/ulimit.c
@@ -19,9 +19,6 @@ _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) */
 
 long int ulimit(int cmd, ...)
 {
diff --git a/libc/sysdeps/linux/common/uname.c b/libc/sysdeps/linux/common/uname.c
index 1e29b9f23..0feec9343 100644
--- a/libc/sysdeps/linux/common/uname.c
+++ b/libc/sysdeps/linux/common/uname.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 
-/* 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 1ad1f2c6d..513cdd5e1 100644
--- a/libc/sysdeps/linux/common/unlink.c
+++ b/libc/sysdeps/linux/common/unlink.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-/* 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 f87afcfc4..a9f988a43 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -10,7 +10,6 @@
 #include <sys/syscall.h>
 #include <utime.h>
 
-/* libc_hidden_proto(utime) */
 
 #ifdef __NR_utime
 _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
@@ -18,8 +17,6 @@ _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
 #include <stdlib.h>
 #include <sys/time.h>
 
-/* 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 191b1afd8..f4781e0a4 100644
--- a/libc/sysdeps/linux/common/utimes.c
+++ b/libc/sysdeps/linux/common/utimes.c
@@ -11,14 +11,12 @@
 #include <utime.h>
 #include <sys/time.h>
 
-/* 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) */
 
 int utimes(const char *file, const struct timeval tvp[2])
 {
diff --git a/libc/sysdeps/linux/common/wait3.c b/libc/sysdeps/linux/common/wait3.c
index 11985e3db..0d480ec54 100644
--- a/libc/sysdeps/linux/common/wait3.c
+++ b/libc/sysdeps/linux/common/wait3.c
@@ -11,7 +11,6 @@
 
 #if defined __USE_BSD
 
-/* 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 4fd866996..dceab41b6 100644
--- a/libc/sysdeps/linux/common/wait4.c
+++ b/libc/sysdeps/linux/common/wait4.c
@@ -12,7 +12,6 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-/* 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 b7930a02d..af55c914a 100644
--- a/libc/sysdeps/linux/common/waitid.c
+++ b/libc/sysdeps/linux/common/waitid.c
@@ -23,7 +23,6 @@ static _syscall5(int, waitid5, idtype_t, idtype, id_t, id, siginfo_t*, infop,
                  int, options, struct rusage*, ru)
 # endif
 
-/* libc_hidden_proto(waitpid) */
 int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
 {
 # ifdef __NR_waitid