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>

48 files changed, 0 insertions, 153 deletions

diff --git a/libc/stdlib/__uc_malloc.c b/libc/stdlib/__uc_malloc.c
index 38457596f..2a2e223ef 100644
--- a/libc/stdlib/__uc_malloc.c
+++ b/libc/stdlib/__uc_malloc.c
@@ -22,9 +22,6 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(__uc_malloc) */
-/* libc_hidden_proto(__uc_malloc_failed) */
 
 void (*__uc_malloc_failed)(size_t size) = NULL;
 /* Seemingly superfluous assigment of NULL above prevents gas error
diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
index 884032bba..0d420d3c9 100644
--- a/libc/stdlib/_atexit.c
+++ b/libc/stdlib/_atexit.c
@@ -46,8 +46,6 @@
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_EXTERN(__atexit_lock);
 
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(_exit) */
 
 
 typedef void (*aefuncp) (void);         /* atexit function pointer */
diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c
index 6a3d246ea..71fba8248 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -110,12 +110,10 @@
 # include <wchar.h>
 # include <wctype.h>
 # include <bits/uClibc_uwchar.h>
-/* libc_hidden_proto(iswspace) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 # include <xlocale.h>
-/* libc_hidden_proto(iswspace_l) */
 #endif
 
 /* Handle _STRTOD_HEXADECIMAL_FLOATS via uClibc config now. */
@@ -175,10 +173,7 @@ extern void __fp_range_check(__fpmax_t y, __fpmax_t x) attribute_hidden;
 #if defined(L___strtofpmax) || defined(L___strtofpmax_l) || defined(L___wcstofpmax) || defined(L___wcstofpmax_l)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
 
 #if defined(L___wcstofpmax) || defined(L___wcstofpmax_l)
@@ -214,7 +209,6 @@ __fpmax_t attribute_hidden __strtofpmax(const Wchar *str, Wchar **endptr, int ex
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
 
 __fpmax_t attribute_hidden __XL_NPP(__strtofpmax)(const Wchar *str, Wchar **endptr, int exponent_power
 								 __LOCALE_PARAM )
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index fcf90187c..3cc796370 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -26,13 +26,7 @@ Cambridge, MA 02139, USA.  */
 #include <signal.h>
 #include <errno.h>
 
-/* libc_hidden_proto(abort) */
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(sigaction) */
-/* libc_hidden_proto(sigprocmask) */
-/* libc_hidden_proto(raise) */
-/* 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 e7d69f168..416db6d0c 100644
--- a/libc/stdlib/arc4random.c
+++ b/libc/stdlib/arc4random.c
@@ -38,10 +38,6 @@
 //libc_hidden_proto(sysctl)
 #endif
 
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(gettimeofday) */
 
 struct arc4_stream {
 	uint8_t i;
@@ -168,7 +164,6 @@ arc4_getword(as)
 	return val;
 }
 
-/* libc_hidden_proto(arc4random_stir) */
 void
 arc4random_stir(void)
 {
diff --git a/libc/stdlib/bsd_getpt.c b/libc/stdlib/bsd_getpt.c
index c7582e855..e704e235f 100644
--- a/libc/stdlib/bsd_getpt.c
+++ b/libc/stdlib/bsd_getpt.c
@@ -23,8 +23,6 @@
 #include <unistd.h>
 
 #if defined __USE_BSD
-/* libc_hidden_proto(open) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
 
 /* Prefix for master pseudo terminal nodes.  */
 #define _PATH_PTY "/dev/pty"
diff --git a/libc/stdlib/drand48.c b/libc/stdlib/drand48.c
index f0d20de61..8c9017b11 100644
--- a/libc/stdlib/drand48.c
+++ b/libc/stdlib/drand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(erand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/drand48_r.c b/libc/stdlib/drand48_r.c
index 96fb186f4..df07b0752 100644
--- a/libc/stdlib/drand48_r.c
+++ b/libc/stdlib/drand48_r.c
@@ -21,7 +21,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(erand48_r) */
 
 int drand48_r (struct drand48_data *buffer, double *result)
 {
diff --git a/libc/stdlib/erand48.c b/libc/stdlib/erand48.c
index 913d6ed84..ee28d9635 100644
--- a/libc/stdlib/erand48.c
+++ b/libc/stdlib/erand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(erand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/erand48_r.c b/libc/stdlib/erand48_r.c
index f367f8dc6..e36e73eb2 100644
--- a/libc/stdlib/erand48_r.c
+++ b/libc/stdlib/erand48_r.c
@@ -24,7 +24,6 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-/* libc_hidden_proto(erand48_r) */
 int erand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, double *result)
 {
     union ieee754_double temp;
diff --git a/libc/stdlib/gcvt.c b/libc/stdlib/gcvt.c
index 6c61ee1e4..3c27b62c4 100644
--- a/libc/stdlib/gcvt.c
+++ b/libc/stdlib/gcvt.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/* 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 e0193e223..d5db1785c 100644
--- a/libc/stdlib/getenv.c
+++ b/libc/stdlib/getenv.c
@@ -8,9 +8,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(getenv) */
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 
 /* IEEE Std 1003.1-2001 says getenv need not be thread safe, so
  * don't bother locking access to __environ */
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index f39e79664..2d8b207d3 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -27,8 +27,6 @@
 
 extern __typeof(statfs) __libc_statfs;
 
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
 
 #if !defined __ASSUME_DEVPTS__
 
diff --git a/libc/stdlib/jrand48.c b/libc/stdlib/jrand48.c
index 7bfc9d608..163c5408e 100644
--- a/libc/stdlib/jrand48.c
+++ b/libc/stdlib/jrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(jrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/jrand48_r.c b/libc/stdlib/jrand48_r.c
index da2a1506d..24f7075f5 100644
--- a/libc/stdlib/jrand48_r.c
+++ b/libc/stdlib/jrand48_r.c
@@ -22,7 +22,6 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-/* libc_hidden_proto(jrand48_r) */
 int jrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, long int *result)
 {
     /* Compute next state.  */
diff --git a/libc/stdlib/lrand48.c b/libc/stdlib/lrand48.c
index 33d0e91ef..a0b15caff 100644
--- a/libc/stdlib/lrand48.c
+++ b/libc/stdlib/lrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(nrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/lrand48_r.c b/libc/stdlib/lrand48_r.c
index c3aa89a24..5a425d1e9 100644
--- a/libc/stdlib/lrand48_r.c
+++ b/libc/stdlib/lrand48_r.c
@@ -19,9 +19,7 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(nrand48_r) */
 
-/* libc_hidden_proto(lrand48_r) */
 int lrand48_r (struct drand48_data *buffer, long int *result)
 {
     /* Be generous for the arguments, detect some errors.  */
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
index e729494e0..36355c1e9 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -17,10 +17,6 @@
 #include <sys/mman.h>
 #include <malloc.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/*libc_hidden_proto(memset)*/
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(munmap) */
 
 #ifdef L_malloc
 void *malloc(size_t size)
diff --git a/libc/stdlib/malloc-standard/calloc.c b/libc/stdlib/malloc-standard/calloc.c
index 80ba3d04a..a70516f0e 100644
--- a/libc/stdlib/malloc-standard/calloc.c
+++ b/libc/stdlib/malloc-standard/calloc.c
@@ -16,7 +16,6 @@
 
 #include "malloc.h"
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 /* ------------------------------ calloc ------------------------------ */
 void* calloc(size_t n_elements, size_t elem_size)
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c
index 9fbf563ab..39e54d635 100644
--- a/libc/stdlib/malloc-standard/free.c
+++ b/libc/stdlib/malloc-standard/free.c
@@ -16,7 +16,6 @@
 
 #include "malloc.h"
 
-/* libc_hidden_proto(munmap) */
 
 /* ------------------------- __malloc_trim -------------------------
    __malloc_trim is an inverse of sorts to __malloc_alloc.  It gives memory
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index 4ebbe8b49..d60d6d9b5 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -16,10 +16,8 @@
 
 #include "malloc.h"
 
-/* libc_hidden_proto(fprintf) */
 
 /* ------------------------------ mallinfo ------------------------------ */
-/* libc_hidden_proto(mallinfo) */
 struct mallinfo mallinfo(void)
 {
     mstate av;
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index 524468cbe..90c9fd14d 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -24,10 +24,6 @@
 #include <sys/mman.h>
 #include <bits/uClibc_mutex.h>
 
-/* libc_hidden_proto(mmap) */
-/* libc_hidden_proto(sysconf) */
-/* libc_hidden_proto(sbrk) */
-/* libc_hidden_proto(abort) */
 
 
 __UCLIBC_MUTEX_EXTERN(__malloc_lock);
diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c
index 95eb0d38a..e060b70ea 100644
--- a/libc/stdlib/malloc-standard/realloc.c
+++ b/libc/stdlib/malloc-standard/realloc.c
@@ -16,8 +16,6 @@
 
 #include "malloc.h"
 
-/* libc_hidden_proto(mremap) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* ------------------------------ realloc ------------------------------ */
 void* realloc(void* oldmem, size_t bytes)
diff --git a/libc/stdlib/malloc/calloc.c b/libc/stdlib/malloc/calloc.c
index 79e6ec6c7..7ac94b83d 100644
--- a/libc/stdlib/malloc/calloc.c
+++ b/libc/stdlib/malloc/calloc.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 void * calloc(size_t nmemb, size_t lsize)
 {
diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c
index 5dd3a7625..c17e7ec2a 100644
--- a/libc/stdlib/malloc/free.c
+++ b/libc/stdlib/malloc/free.c
@@ -15,8 +15,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-/* libc_hidden_proto(munmap) */
-/* 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 f1ccc6f2d..5f17aae04 100644
--- a/libc/stdlib/malloc/heap_debug.c
+++ b/libc/stdlib/malloc/heap_debug.c
@@ -17,9 +17,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(fprintf) */
-/* 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 19877db89..f4bbc71a2 100644
--- a/libc/stdlib/malloc/malloc.c
+++ b/libc/stdlib/malloc/malloc.c
@@ -16,8 +16,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-/* 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 01f9bfd6f..1a5374faa 100644
--- a/libc/stdlib/malloc/malloc_debug.c
+++ b/libc/stdlib/malloc/malloc_debug.c
@@ -16,10 +16,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-/* libc_hidden_proto(atoi) */
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(putc) */
-/* libc_hidden_proto(getenv) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/malloc/realloc.c b/libc/stdlib/malloc/realloc.c
index a8271995b..fa779205a 100644
--- a/libc/stdlib/malloc/realloc.c
+++ b/libc/stdlib/malloc/realloc.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <errno.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 #include "malloc.h"
 #include "heap.h"
diff --git a/libc/stdlib/mrand48.c b/libc/stdlib/mrand48.c
index 131c4b991..b209acd57 100644
--- a/libc/stdlib/mrand48.c
+++ b/libc/stdlib/mrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(jrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/mrand48_r.c b/libc/stdlib/mrand48_r.c
index 0127fddb5..86fd6a2b9 100644
--- a/libc/stdlib/mrand48_r.c
+++ b/libc/stdlib/mrand48_r.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(jrand48_r) */
 
 int mrand48_r (struct drand48_data *buffer, long int *result)
 {
diff --git a/libc/stdlib/nrand48.c b/libc/stdlib/nrand48.c
index e69afd78b..97c197caa 100644
--- a/libc/stdlib/nrand48.c
+++ b/libc/stdlib/nrand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(nrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/nrand48_r.c b/libc/stdlib/nrand48_r.c
index acf813e9b..0710e90ef 100644
--- a/libc/stdlib/nrand48_r.c
+++ b/libc/stdlib/nrand48_r.c
@@ -22,7 +22,6 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-/* libc_hidden_proto(nrand48_r) */
 int nrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, long int *result)
 {
     /* Compute next state.  */
diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c
index 3e4a1cfe1..ff3823301 100644
--- a/libc/stdlib/ptsname.c
+++ b/libc/stdlib/ptsname.c
@@ -29,13 +29,6 @@
 #include <unistd.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* 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) */
 
 #if !defined __UNIX98PTY_ONLY__
 
@@ -68,7 +61,6 @@ extern const char __libc_ptyname2[] attribute_hidden;
 /* Store at most BUFLEN characters of the pathname of the slave pseudo
    terminal associated with the master FD is open on in BUF.
    Return 0 on success, otherwise an error number.  */
-/* libc_hidden_proto(ptsname_r) */
 int ptsname_r (int fd, char *buf, size_t buflen)
 {
   int save_errno = errno;
diff --git a/libc/stdlib/rand.c b/libc/stdlib/rand.c
index 93fc01483..4b899c0fc 100644
--- a/libc/stdlib/rand.c
+++ b/libc/stdlib/rand.c
@@ -7,7 +7,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(random) */
 
 int rand(void)
 {
diff --git a/libc/stdlib/random.c b/libc/stdlib/random.c
index 967a1e52a..b009c4310 100644
--- a/libc/stdlib/random.c
+++ b/libc/stdlib/random.c
@@ -27,10 +27,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(random_r) */
-/* libc_hidden_proto(srandom_r) */
-/* libc_hidden_proto(setstate_r) */
-/* libc_hidden_proto(initstate_r) */
 
 /* POSIX.1c requires that there is mutual exclusion for the `rand' and
    `srand' functions to prevent concurrent calls from modifying common
@@ -235,7 +231,6 @@ char * setstate (char *arg_state)
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-/* libc_hidden_proto(random) */
 long int random (void)
 {
   int32_t retval;
diff --git a/libc/stdlib/random_r.c b/libc/stdlib/random_r.c
index cb70b7dc4..4b2b3f85d 100644
--- a/libc/stdlib/random_r.c
+++ b/libc/stdlib/random_r.c
@@ -131,7 +131,6 @@ static const struct random_poly_info random_poly_info =
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-/* libc_hidden_proto(random_r) */
 int random_r(struct random_data *buf, int32_t *result)
 {
     int32_t *state;
@@ -189,7 +188,6 @@ libc_hidden_def(random_r)
    information a given number of times to get rid of any initial dependencies
    introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
    for default usage relies on values produced by this routine.  */
-/* libc_hidden_proto(srandom_r) */
 int srandom_r (unsigned int seed, struct random_data *buf)
 {
     int type;
@@ -257,7 +255,6 @@ libc_hidden_def(srandom_r)
    Note: The first thing we do is save the current state, if any, just like
    setstate so that it doesn't matter when initstate is called.
    Returns a pointer to the old state.  */
-/* libc_hidden_proto(initstate_r) */
 int initstate_r (unsigned int seed, char *arg_state, size_t n, struct random_data *buf)
 {
     int type;
@@ -316,7 +313,6 @@ libc_hidden_def(initstate_r)
    to the order in which things are done, it is OK to call setstate with the
    same state as the current state
    Returns a pointer to the old state information.  */
-/* libc_hidden_proto(setstate_r) */
 int setstate_r (char *arg_state, struct random_data *buf)
 {
     int32_t *new_state = 1 + (int32_t *) arg_state;
diff --git a/libc/stdlib/realpath.c b/libc/stdlib/realpath.c
index 3a4789152..1a00c3112 100644
--- a/libc/stdlib/realpath.c
+++ b/libc/stdlib/realpath.c
@@ -21,11 +21,6 @@
 
 #include <sys/stat.h>			/* for S_IFLNK */
 
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(readlink) */
-/* libc_hidden_proto(getcwd) */
 
 #ifndef PATH_MAX
 #ifdef _POSIX_VERSION
diff --git a/libc/stdlib/seed48.c b/libc/stdlib/seed48.c
index c688c1aa6..9ff8a480a 100644
--- a/libc/stdlib/seed48.c
+++ b/libc/stdlib/seed48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(seed48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/seed48_r.c b/libc/stdlib/seed48_r.c
index 4347383f8..0d5872238 100644
--- a/libc/stdlib/seed48_r.c
+++ b/libc/stdlib/seed48_r.c
@@ -21,9 +21,7 @@
 #include <string.h>
 #include <limits.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* libc_hidden_proto(seed48_r) */
 int seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
 {
     /* Save old value at a private place to be used as return value.  */
diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c
index 6598a6c52..8da2fae5c 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -25,12 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strncmp) */
-/* Experimentally off - libc_hidden_proto(strndup) */
-/* libc_hidden_proto(unsetenv) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -121,7 +115,6 @@ static int __add_to_environ(const char *name, const char *value,
 	return rv;
 }
 
-/* libc_hidden_proto(setenv) */
 int setenv(const char *name, const char *value, int replace)
 {
 	/* NB: setenv("VAR", NULL, 1) inserts "VAR=" string */
@@ -129,7 +122,6 @@ int setenv(const char *name, const char *value, int replace)
 }
 libc_hidden_def(setenv)
 
-/* libc_hidden_proto(unsetenv) */
 int unsetenv(const char *name)
 {
 	const char *eq;
diff --git a/libc/stdlib/srand48.c b/libc/stdlib/srand48.c
index 5f593223a..817d068c3 100644
--- a/libc/stdlib/srand48.c
+++ b/libc/stdlib/srand48.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-/* libc_hidden_proto(srand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/srand48_r.c b/libc/stdlib/srand48_r.c
index 33c241560..4347fef69 100644
--- a/libc/stdlib/srand48_r.c
+++ b/libc/stdlib/srand48_r.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <limits.h>
 
-/* libc_hidden_proto(srand48_r) */
 int srand48_r (long int seedval, struct drand48_data *buffer)
 {
     /* The standards say we only have 32 bits.  */
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index 05cc68bdb..c7bff6473 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -197,7 +197,6 @@ _stdlib_wcsto_ll(register const wchar_t * __restrict str,
 /**********************************************************************/
 #ifdef L_atof
 
-/* libc_hidden_proto(strtod) */
 
 double atof(const char *nptr)
 {
@@ -269,9 +268,7 @@ strong_alias(llabs,imaxabs)
 
 #if INT_MAX < LONG_MAX
 
-/* libc_hidden_proto(strtol) */
 
-/* libc_hidden_proto(atoi) */
 int atoi(const char *nptr)
 {
 	return (int) strtol(nptr, (char **) NULL, 10);
@@ -284,9 +281,7 @@ libc_hidden_def(atoi)
 /**********************************************************************/
 #ifdef L_atol
 
-/* libc_hidden_proto(strtol) */
 
-/* libc_hidden_proto(atol) */
 long atol(const char *nptr)
 {
 	return strtol(nptr, (char **) NULL, 10);
@@ -313,7 +308,6 @@ strong_alias(atol,atoll)
 
 #if defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX)
 
-/* libc_hidden_proto(strtoll) */
 
 long long atoll(const char *nptr)
 {
@@ -468,10 +462,8 @@ strong_alias(strtoull,strtouq)
 #define Wuchar __uwchar_t
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) iswspace_l((C), locale_arg)
-/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -480,10 +472,8 @@ strong_alias(strtoull,strtouq)
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -504,9 +494,7 @@ unsigned long attribute_hidden _stdlib_strto_l(register const Wchar * __restrict
  * strtoul (sflag = 0). */
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar * __restrict str,
@@ -623,10 +611,8 @@ unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar *
 #define Wuchar __uwchar_t
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) iswspace_l((C), locale_arg)
-/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -635,10 +621,8 @@ unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar *
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -656,7 +640,6 @@ unsigned long long attribute_hidden _stdlib_strto_ll(register const Wchar * __re
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 /* This is the main work fuction which handles both strtoll (sflag = 1) and
  * strtoull (sflag = 0). */
@@ -771,7 +754,6 @@ unsigned long long attribute_hidden __XL_NPP(_stdlib_strto_ll)(register const Wc
 /**********************************************************************/
 /* Made _Exit() an alias for _exit(), as per C99. */
 /*  #ifdef L__Exit */
-/*  libc_hidden_proto(_exit) */
 /*  void _Exit(int status) */
 /*  { */
 /*  	_exit(status); */
@@ -819,7 +801,6 @@ void *bsearch(const void *key, const void *base, size_t /* nmemb */ high,
  * calculation, as well as to reduce the generated code size with
  * bcc and gcc. */
 
-/* libc_hidden_proto(qsort) */
 void qsort(void  *base,
            size_t nel,
            size_t width,
@@ -915,7 +896,6 @@ void ssort(void  *base,
 /**********************************************************************/
 #ifdef L__stdlib_mb_cur_max
 
-/* libc_hidden_proto(_stdlib_mb_cur_max) */
 size_t _stdlib_mb_cur_max(void)
 {
 #ifdef __CTYPE_HAS_UTF_8_LOCALES
@@ -959,7 +939,6 @@ static __always_inline int is_stateful(unsigned char encoding)
 /**********************************************************************/
 #ifdef L_mblen
 
-/* libc_hidden_proto(mbrlen) */
 
 int mblen(register const char *s, size_t n)
 {
@@ -991,7 +970,6 @@ int mblen(register const char *s, size_t n)
 /**********************************************************************/
 #ifdef L_mbtowc
 
-/* libc_hidden_proto(mbrtowc) */
 
 int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 {
@@ -1026,7 +1004,6 @@ int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 
 /* Note: We completely ignore state in all currently supported conversions. */
 
-/* libc_hidden_proto(wcrtomb) */
 
 int wctomb(register char *__restrict s, wchar_t swc)
 {
@@ -1045,7 +1022,6 @@ int wctomb(register char *__restrict s, wchar_t swc)
 /**********************************************************************/
 #ifdef L_mbstowcs
 
-/* libc_hidden_proto(mbsrtowcs) */
 
 size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {
@@ -1062,7 +1038,6 @@ size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 
 /* Note: We completely ignore state in all currently supported conversions. */
 
-/* libc_hidden_proto(wcsrtombs) */
 
 size_t wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
 {
diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c
index 9244892ab..99f7970c8 100644
--- a/libc/stdlib/system.c
+++ b/libc/stdlib/system.c
@@ -11,17 +11,11 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(wait4) */
-/* libc_hidden_proto(execl) */
-/* libc_hidden_proto(signal) */
-/* libc_hidden_proto(vfork) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
 #ifndef __NR_vfork
 # define vfork fork
-/* libc_hidden_proto(fork) */
 #endif
 
 extern __typeof(system) __libc_system;
diff --git a/libc/stdlib/unix_grantpt.c b/libc/stdlib/unix_grantpt.c
index 25c335239..1be0a7ddb 100644
--- a/libc/stdlib/unix_grantpt.c
+++ b/libc/stdlib/unix_grantpt.c
@@ -30,20 +30,6 @@
 #include <unistd.h>
 #include "pty-private.h"
 
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(setrlimit) */
-/* libc_hidden_proto(waitpid) */
-/* libc_hidden_proto(dup2) */
-/* libc_hidden_proto(chmod) */
-/* libc_hidden_proto(chown) */
-/* libc_hidden_proto(vfork) */
-/* libc_hidden_proto(fork) */
-/* libc_hidden_proto(stat) */
-/* libc_hidden_proto(ptsname_r) */
-/* libc_hidden_proto(execle) */
-/* 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 731a11a85..5dfea15d7 100644
--- a/libc/stdlib/unlockpt.c
+++ b/libc/stdlib/unlockpt.c
@@ -22,7 +22,6 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 
-/* libc_hidden_proto(ioctl) */
 
 /* Unlock the slave pseudo terminal associated with the master pseudo
    terminal specified by FD.  */
diff --git a/libc/stdlib/valloc.c b/libc/stdlib/valloc.c
index d2aca4072..c5197b2ba 100644
--- a/libc/stdlib/valloc.c
+++ b/libc/stdlib/valloc.c
@@ -24,7 +24,6 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-/* libc_hidden_proto(getpagesize) */
 
 static size_t pagesize;