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>

45 files changed, 3 insertions, 353 deletions

diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index c6132924d..ff9e47dcf 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -32,15 +32,12 @@
 #include <unistd.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(abort) */
 
 /* Get the prototype from assert.h as a double-check. */
 #undef NDEBUG
 #include <assert.h>
 #undef assert
 
-/* libc_hidden_proto(__assert) */
 
 #define ASSERT_SHOW_PROGNAME 1
 
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index f90b40537..6abb49ac4 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -36,9 +36,7 @@
 #include <assert.h>
 #include <locale.h>
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
@@ -165,8 +163,6 @@ int CTYPE_NAME(NAME) (int c) \
 #ifdef L___ctype_assert
 #ifdef __UCLIBC_HAS_CTYPE_ENFORCED__
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(abort) */
 
 attribute_hidden void __isctype_assert(int c, int mask)
 {
@@ -281,11 +277,8 @@ IS_FUNC_BODY(xdigit);
 
 #undef tolower
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
 int tolower(int c)
@@ -311,7 +304,6 @@ libc_hidden_def(tolower)
 #ifdef L_tolower_l
 
 #undef tolower_l
-/* libc_hidden_proto(tolower_l) */
 int tolower_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -329,11 +321,8 @@ libc_hidden_def(tolower_l)
 
 #undef toupper
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_toupper) */
 #endif
-/* libc_hidden_proto(toupper) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 
 int toupper(int c)
@@ -359,7 +348,6 @@ libc_hidden_def(toupper)
 #ifdef L_toupper_l
 
 #undef toupper_l
-/* libc_hidden_proto(toupper_l) */
 int toupper_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -446,7 +434,6 @@ libc_hidden_def(__ctype_b_loc)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_tolower_loc) */
 const __ctype_touplow_t **__ctype_tolower_loc(void)
 {
 	return &(__UCLIBC_CURLOCALE->__ctype_tolower);
@@ -461,7 +448,6 @@ libc_hidden_def(__ctype_tolower_loc)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_toupper_loc) */
 const __ctype_touplow_t **__ctype_toupper_loc(void)
 {
 	return &(__UCLIBC_CURLOCALE->__ctype_toupper);
@@ -863,7 +849,6 @@ static const __ctype_mask_t __C_ctype_b_data[] = {
 	/*  255  M-^? */ 0
 };
 
-/* libc_hidden_proto(__C_ctype_b) */
 const __ctype_mask_t *__C_ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_b)
 
@@ -979,14 +964,12 @@ static const __ctype_touplow_t __C_ctype_tolower_data[] = {
 	 252,          253,          254,          255
 };
 
-/* libc_hidden_proto(__C_ctype_tolower) */
 const __ctype_touplow_t *__C_ctype_tolower =
 		__C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_tolower)
 
 #ifndef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_tolower) */
 const __ctype_touplow_t *__ctype_tolower =
 		__C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_tolower)
@@ -1098,14 +1081,12 @@ static const __ctype_touplow_t __C_ctype_toupper_data[] = {
 	 252,          253,          254,          255
 };
 
-/* libc_hidden_proto(__C_ctype_toupper) */
 const __ctype_touplow_t *__C_ctype_toupper =
 		__C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_toupper)
 
 #ifndef __UCLIBC_HAS_XLOCALE__
 
-/* libc_hidden_proto(__ctype_toupper) */
 const __ctype_touplow_t *__ctype_toupper =
 		__C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_toupper)
diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c
index 466e600ac..cca03b8f7 100644
--- a/libc/misc/dirent/closedir.c
+++ b/libc/misc/dirent/closedir.c
@@ -10,8 +10,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(close) */
 
 int closedir(DIR * dir)
 {
diff --git a/libc/misc/dirent/dirfd.c b/libc/misc/dirent/dirfd.c
index e5b41bc6b..649dd4ad8 100644
--- a/libc/misc/dirent/dirfd.c
+++ b/libc/misc/dirent/dirfd.c
@@ -8,7 +8,6 @@
 #include <errno.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(dirfd) */
 
 int dirfd(DIR * dir)
 {
diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c
index e92c4ad58..4fcd1cc72 100644
--- a/libc/misc/dirent/readdir.c
+++ b/libc/misc/dirent/readdir.c
@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(readdir) */
 
 struct dirent *readdir(DIR * dir)
 {
diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c
index 3aaef5139..1264c38b1 100644
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -13,7 +13,6 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(readdir64) */
 struct dirent64 *readdir64(DIR * dir)
 {
 	ssize_t bytes;
diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c
index d394fdb8f..ba726003d 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -13,9 +13,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* libc_hidden_proto(readdir64_r) */
 int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c
index 51f483ba5..d08997ffa 100644
--- a/libc/misc/dirent/readdir_r.c
+++ b/libc/misc/dirent/readdir_r.c
@@ -11,9 +11,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* libc_hidden_proto(readdir_r) */
 int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/rewinddir.c b/libc/misc/dirent/rewinddir.c
index 99aa6b263..0a8f14740 100644
--- a/libc/misc/dirent/rewinddir.c
+++ b/libc/misc/dirent/rewinddir.c
@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(lseek) */
 
 /* rewinddir() just does an lseek(fd,0,0) - see close for comments */
 void rewinddir(DIR * dir)
diff --git a/libc/misc/dirent/seekdir.c b/libc/misc/dirent/seekdir.c
index 19661509d..eaf447ea2 100644
--- a/libc/misc/dirent/seekdir.c
+++ b/libc/misc/dirent/seekdir.c
@@ -9,7 +9,6 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-/* libc_hidden_proto(lseek) */
 
 void seekdir(DIR * dir, long int offset)
 {
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index d30efbe37..9ddb59624 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -21,16 +21,7 @@
 
 #if defined __USE_BSD
 
-/* libc_hidden_proto(vwarn) */
-/* libc_hidden_proto(vwarnx) */
-/* libc_hidden_proto(verr) */
-/* libc_hidden_proto(verrx) */
-
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(__xpg_strerror_r) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(vfprintf) */
+
 
 static void vwarn_work(const char *format, va_list args, int showerr)
 {
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 7518ff5e5..a30a4decf 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -26,15 +26,6 @@
 #include <string.h>
 #include <error.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strerror) */
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(exit) */
-/* libc_hidden_proto(putc) */
-/* libc_hidden_proto(vfprintf) */
-/* libc_hidden_proto(fflush) */
-/* libc_hidden_proto(fputc) */
-/* libc_hidden_proto(__fputc_unlocked) */
 
 /* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count = 0;
diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c
index 58fcdad0a..b37ace408 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -24,11 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-/* libc_hidden_proto(lockf) */
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fcntl) */
-/* libc_hidden_proto(getpid) */
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index e4f6f5cce..177942445 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -32,17 +32,12 @@
 #define F_GETLK F_GETLK64
 #undef F_SETLK
 #define F_SETLK F_SETLK64
-/* libc_hidden_proto(fcntl64) */
 #else
-/* libc_hidden_proto(fcntl) */
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(getpid) */
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
-/* libc_hidden_proto(lockf64) */
 int lockf64 (int fd, int cmd, off64_t len64)
 {
     struct flock fl;
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index cf3086715..28f744a26 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -62,25 +62,9 @@
 
 #ifdef __UCLIBC__
 #define __memset memset
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/*libc_hidden_proto(strchr)*/
-/*libc_hidden_proto(strchrnul)*/
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcoll) */
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
-/* libc_hidden_proto(__ctype_tolower_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
-/* libc_hidden_proto(fnmatch) */
-/* libc_hidden_proto(getenv) */
 #endif
 
 /* For platform which support the ISO C amendement 1 functionality we
@@ -90,19 +74,7 @@
 # include <wchar.h>
 # include <wctype.h>
 # ifdef __UCLIBC__
-/* libc_hidden_proto(wctype) */
-/* libc_hidden_proto(iswctype) */
-/* libc_hidden_proto(btowc) */
 #  ifdef __UCLIBC_HAS_LOCALE__
-/* libc_hidden_proto(wmemchr) */
-/* libc_hidden_proto(wmempcpy) */
-/* libc_hidden_proto(wcscat) */
-/* libc_hidden_proto(wcschr) */
-/* libc_hidden_proto(wcschrnul) */
-/* libc_hidden_proto(wcslen) */
-/* libc_hidden_proto(wcscoll) */
-/* libc_hidden_proto(towlower) */
-/* libc_hidden_proto(mbsrtowcs) */
 #  endif
 # endif
 #endif
@@ -376,7 +348,6 @@ is_char_class (const wchar_t *wcs)
 # endif
 
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #else
 #undef MB_CUR_MAX
 #define MB_CUR_MAX 1
diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c
index 69a8ede50..2dece85dc 100644
--- a/libc/misc/fnmatch/fnmatch_old.c
+++ b/libc/misc/fnmatch/fnmatch_old.c
@@ -23,9 +23,7 @@ Cambridge, MA 02139, USA.  */
 #include <fnmatch.h>
 #include <ctype.h>
 
-/* libc_hidden_proto(fnmatch) */
 
-/* libc_hidden_proto(tolower) */
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
    Library, but also included in many other GNU distributions.  Compiling
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 9325ab745..74f6e1354 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -83,27 +83,8 @@ char *alloca ();
 # include <sys/stat.h>
 #endif
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(dirfd) */
-/* libc_hidden_proto(tsearch) */
-/* libc_hidden_proto(tfind) */
-/* libc_hidden_proto(tdestroy) */
-/* libc_hidden_proto(getcwd) */
-/* libc_hidden_proto(chdir) */
-/* libc_hidden_proto(fchdir) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(opendir) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(readdir64) */
-/* libc_hidden_proto(lstat64) */
-/* libc_hidden_proto(stat64) */
 #endif
-/* libc_hidden_proto(closedir) */
-/* Experimentally off - libc_hidden_proto(stpcpy) */
-/* libc_hidden_proto(lstat) */
-/* libc_hidden_proto(stat) */
 
 #if !defined _LIBC && !HAVE_DECL_STPCPY && !defined stpcpy
 char *stpcpy ();
diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c
index 8ee0f1a37..b242a45fa 100644
--- a/libc/misc/glob/glob-susv3.c
+++ b/libc/misc/glob/glob-susv3.c
@@ -23,16 +23,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strcat) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(opendir) */
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(qsort) */
-/* libc_hidden_proto(fnmatch) */
 
 struct match
 {
@@ -53,12 +43,8 @@ extern int __glob_match_in_dir(const char *d, const char *p, int flags, int (*er
 # define stat stat64
 # define readdir_r readdir64_r
 # define dirent dirent64
-/* libc_hidden_proto(readdir64_r) */
-/* libc_hidden_proto(stat64) */
 # define struct_stat struct stat64
 #else
-/* libc_hidden_proto(readdir_r) */
-/* libc_hidden_proto(stat) */
 # define struct_stat struct stat
 #endif
 
@@ -224,9 +210,7 @@ int __glob_sort(const void *a, const void *b)
 #endif /* !__GLOB64 */
 
 #ifdef __GLOB64
-/* libc_hidden_proto(glob64) */
 #else
-/* libc_hidden_proto(glob) */
 #endif
 int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g)
 {
@@ -302,9 +286,7 @@ libc_hidden_def(glob)
 #endif
 
 #ifdef __GLOB64
-/* libc_hidden_proto(globfree64) */
 #else
-/* libc_hidden_proto(globfree) */
 #endif
 void globfree(glob_t *g)
 {
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index 5736f4981..8f27443ff 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -31,24 +31,10 @@
 #include <fnmatch.h>
 #include <glob.h>
 
-/* libc_hidden_proto(closedir) */
-/* libc_hidden_proto(fnmatch) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(mempcpy) */
-/* libc_hidden_proto(opendir) */
-/* libc_hidden_proto(qsort) */
-/* libc_hidden_proto(readdir) */
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strcoll) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strrchr) */
 
 
 #ifdef ENABLE_GLOB_TILDE_EXPANSION
 #include <pwd.h>
-/* libc_hidden_proto(getpwnam_r) */
 #endif
 
 #ifdef COMPILE_GLOB64
@@ -62,19 +48,15 @@
 #define glob_t glob64_t
 #define glob(pattern, flags, errfunc, pglob) glob64 (pattern, flags, errfunc, pglob)
 #define globfree(pglob) globfree64 (pglob)
-/* libc_hidden_proto(stat64) */
-/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir readdir
 #ifdef __UCLIBC_HAS_LFS__
 #define __readdir64 readdir64
-/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir64 readdir
 #endif
 #define struct_stat64          struct stat
 #define __stat64(fname, buf)   stat (fname, buf)
-/* libc_hidden_proto(stat) */
 #endif
 
 
@@ -132,7 +114,6 @@ extern int __prefix_array (const char *dirname, char **array, size_t n) attribut
 extern const char *__next_brace_sub (const char *cp, int flags) attribute_hidden;
 #endif
 
-/* libc_hidden_proto(glob_pattern_p) */
 #ifndef COMPILE_GLOB64
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
@@ -489,11 +470,7 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags,
 }
 
 #ifdef COMPILE_GLOB64
-/* libc_hidden_proto(glob64) */
-/* libc_hidden_proto(globfree64) */
 #else
-/* libc_hidden_proto(glob) */
-/* libc_hidden_proto(globfree) */
 #endif
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
index 4401ba249..487a9c2c5 100644
--- a/libc/misc/internals/__errno_location.c
+++ b/libc/misc/internals/__errno_location.c
@@ -7,7 +7,6 @@
 #include "internal_errno.h"
 
 /* psm: moved to bits/errno.h: */
-/* libc_hidden_proto(__errno_location) */
 int * weak_const_function __errno_location (void)
 {
     return &errno;
diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
index f4a587e96..213d39894 100644
--- a/libc/misc/internals/__h_errno_location.c
+++ b/libc/misc/internals/__h_errno_location.c
@@ -6,7 +6,6 @@
 
 #include "internal_errno.h"
 
-/* libc_hidden_proto(__h_errno_location) */
 int * weak_const_function __h_errno_location (void)
 {
     return &h_errno;
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 7de372387..3588768a3 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -27,19 +27,10 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 
-/* libc_hidden_proto(exit) */
 
 #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
-/* Experimentally off - libc_hidden_proto(strrchr) */
 #endif
 #ifndef __ARCH_HAS_NO_LDSO__
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(getgid) */
-/* libc_hidden_proto(getuid) */
-/* libc_hidden_proto(getegid) */
-/* libc_hidden_proto(geteuid) */
-/* libc_hidden_proto(fstat) */
-/* libc_hidden_proto(abort) */
 
 #endif
 
diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c
index 20b26b2b6..65728f863 100644
--- a/libc/misc/internals/errno.c
+++ b/libc/misc/internals/errno.c
@@ -1,8 +1,6 @@
 #include "internal_errno.h"
 
 #ifdef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(errno) */
-/* libc_hidden_proto(h_errno) */
 #endif
 int errno = 0;
 int h_errno = 0;
diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c
index 10d00041c..e0bf922c4 100644
--- a/libc/misc/internals/tempname.c
+++ b/libc/misc/internals/tempname.c
@@ -45,19 +45,8 @@
 #include <sys/time.h>
 #include "tempname.h"
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* libc_hidden_proto(sprintf) */
-/* libc_hidden_proto(mkdir) */
-/* libc_hidden_proto(open) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(open64) */
 #endif
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(getpid) */
-/* libc_hidden_proto(stat) */
-/* libc_hidden_proto(gettimeofday) */
 
 /* Return nonzero if DIR is an existent directory.  */
 static int direxists (const char *dir)
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index ec6189279..a9fd952f9 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -58,19 +58,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidde