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>

63 files changed, 0 insertions, 128 deletions

diff --git a/libc/string/__glibc_strerror_r.c b/libc/string/__glibc_strerror_r.c
index 2b856e9f5..e97e55234 100644
--- a/libc/string/__glibc_strerror_r.c
+++ b/libc/string/__glibc_strerror_r.c
@@ -8,8 +8,6 @@
 #include <features.h>
 #include <string.h>
 
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(__xpg_strerror_r) */
 
 char *__glibc_strerror_r(int errnum, char *strerrbuf, size_t buflen)
 {
diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c
index 274b6cec8..fb4d44004 100644
--- a/libc/string/__xpg_strerror_r.c
+++ b/libc/string/__xpg_strerror_r.c
@@ -15,9 +15,6 @@
 
 #undef strerror_r
 
-/* libc_hidden_proto(__xpg_strerror_r) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 
 #ifdef __UCLIBC_HAS_ERRNO_MESSAGES__
 
diff --git a/libc/string/_collate.c b/libc/string/_collate.c
index 9cc9ed055..eadbd6c6e 100644
--- a/libc/string/_collate.c
+++ b/libc/string/_collate.c
@@ -19,13 +19,7 @@
 #include <errno.h>
 #include <assert.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(strlcpy) */
-/* Experimentally off - libc_hidden_proto(strcmp) */
 #ifdef WANT_WIDE
-/* libc_hidden_proto(wcsxfrm) */
-/* libc_hidden_proto(wcscmp) */
 #endif
 
 #ifdef __UCLIBC_HAS_LOCALE__
@@ -59,18 +53,14 @@
 
 #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
 
-/* libc_hidden_proto(wcscoll_l) */
 
-/* libc_hidden_proto(wcscoll) */
 int wcscoll (const Wchar *s0, const Wchar *s1)
 {
 	return wcscoll_l(s0, s1, __UCLIBC_CURLOCALE );
 }
 libc_hidden_def(wcscoll)
 
-/* libc_hidden_proto(wcsxfrm_l) */
 
-/* libc_hidden_proto(wcsxfrm) */
 size_t wcsxfrm(Wchar *__restrict ws1, const Wchar *__restrict ws2, size_t n)
 {
 	return wcsxfrm_l(ws1, ws2, n, __UCLIBC_CURLOCALE );
diff --git a/libc/string/basename.c b/libc/string/basename.c
index a076c20e9..29e7a2a82 100644
--- a/libc/string/basename.c
+++ b/libc/string/basename.c
@@ -8,7 +8,6 @@
 #include "_string.h"
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(basename) */
 
 char *basename(const char *path)
 {
diff --git a/libc/string/bcopy.c b/libc/string/bcopy.c
index 3aa7eab1e..4b718f98d 100644
--- a/libc/string/bcopy.c
+++ b/libc/string/bcopy.c
@@ -9,7 +9,6 @@
 
 #ifdef __UCLIBC_SUSV3_LEGACY__
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 
 void bcopy(const void *s2, void *s1, size_t n)
 {
diff --git a/libc/string/bzero.c b/libc/string/bzero.c
index 7498f795f..364456fff 100644
--- a/libc/string/bzero.c
+++ b/libc/string/bzero.c
@@ -9,7 +9,6 @@
 
 #ifdef __UCLIBC_SUSV3_LEGACY__
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 void bzero(void *s, size_t n)
 {
diff --git a/libc/string/cris/memcpy.c b/libc/string/cris/memcpy.c
index 94ece0512..94e576f4f 100644
--- a/libc/string/cris/memcpy.c
+++ b/libc/string/cris/memcpy.c
@@ -44,7 +44,6 @@
 /* No name ambiguities in this file.  */
 __asm__ (".syntax no_register_prefix");
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 void *
 memcpy(void *pdst, const void *psrc, size_t pn)
 {
diff --git a/libc/string/cris/memmove.c b/libc/string/cris/memmove.c
index fa495eba4..4184fc96d 100644
--- a/libc/string/cris/memmove.c
+++ b/libc/string/cris/memmove.c
@@ -27,7 +27,6 @@
 #include "memcopy.h"
 #include "../generic/pagecopy.h"
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 void *memmove (void *dest, const void *src, size_t len)
 {
   unsigned long int dstp = (long int) dest;
diff --git a/libc/string/cris/memset.c b/libc/string/cris/memset.c
index f4c5bb685..fab4e8b66 100644
--- a/libc/string/cris/memset.c
+++ b/libc/string/cris/memset.c
@@ -46,7 +46,6 @@
 /* No name ambiguities in this file.  */
 __asm__ (".syntax no_register_prefix");
 
-/* Experimentally off - libc_hidden_proto(memset) */
 void *memset(void *pdst, int c, unsigned int plen)
 {
   /* Now we want the parameters in special registers.  Make sure the
diff --git a/libc/string/cris/strcpy.c b/libc/string/cris/strcpy.c
index 955a990b7..40e6389b9 100644
--- a/libc/string/cris/strcpy.c
+++ b/libc/string/cris/strcpy.c
@@ -6,7 +6,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
 char *strcpy(char *dest, const char *src)
 {
   char *ret = dest;
diff --git a/libc/string/cris/strncpy.c b/libc/string/cris/strncpy.c
index 3f2775bdd..8d074071a 100644
--- a/libc/string/cris/strncpy.c
+++ b/libc/string/cris/strncpy.c
@@ -6,9 +6,7 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
-/* Experimentally off - libc_hidden_proto(strncpy) */
 char *strncpy(char *dest, const char *src, size_t count)
 {
   char *ret = dest;
diff --git a/libc/string/ffs.c b/libc/string/ffs.c
index 241b7456f..22efe4a1e 100644
--- a/libc/string/ffs.c
+++ b/libc/string/ffs.c
@@ -9,7 +9,6 @@
 
 #include "_string.h"
 
-/* Experimentally off - libc_hidden_proto(ffs) */
 
 int ffs(int i)
 {
diff --git a/libc/string/frv/memset.S b/libc/string/frv/memset.S
index 477597dcd..a3e76c491 100644
--- a/libc/string/frv/memset.S
+++ b/libc/string/frv/memset.S
@@ -155,4 +155,3 @@ memset:
 	bralr
 	.size		memset, .-memset
 
-/* Experimentally off - libc_hidden_proto(memset) */
diff --git a/libc/string/generic/memcmp.c b/libc/string/generic/memcmp.c
index 27db6b3d3..62600cd08 100644
--- a/libc/string/generic/memcmp.c
+++ b/libc/string/generic/memcmp.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
 
 #include <endian.h>
 
diff --git a/libc/string/generic/memcpy.c b/libc/string/generic/memcpy.c
index a19e0c335..7dd7118fd 100644
--- a/libc/string/generic/memcpy.c
+++ b/libc/string/generic/memcpy.c
@@ -24,7 +24,6 @@
 #include "pagecopy.h"
 #include "_memcpy_fwd.c"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 void *memcpy (void *dstpp, const void *srcpp, size_t len)
 {
diff --git a/libc/string/generic/memmem.c b/libc/string/generic/memmem.c
index c75bb2426..0fccac77f 100644
--- a/libc/string/generic/memmem.c
+++ b/libc/string/generic/memmem.c
@@ -20,8 +20,6 @@
 #include <stddef.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(memmem) */
-/* Experimentally off - libc_hidden_proto(memcmp) */
 
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */
 void *memmem (const void *haystack, size_t haystack_len,
diff --git a/libc/string/generic/memmove.c b/libc/string/generic/memmove.c
index 7f945b150..b564a7d10 100644
--- a/libc/string/generic/memmove.c
+++ b/libc/string/generic/memmove.c
@@ -29,8 +29,6 @@
 #include "_memcpy_fwd.c"
 #endif
 
-/* Experimentally off - libc_hidden_proto(memmove) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static void _wordcopy_bwd_aligned (long int dstp, long int srcp, size_t len)
 {
diff --git a/libc/string/generic/memrchr.c b/libc/string/generic/memrchr.c
index 95fe1d4d8..c03a77037 100644
--- a/libc/string/generic/memrchr.c
+++ b/libc/string/generic/memrchr.c
@@ -27,8 +27,6 @@
 #include <limits.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(memrchr) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/memset.c b/libc/string/generic/memset.c
index 62cc36fe3..7be572765 100644
--- a/libc/string/generic/memset.c
+++ b/libc/string/generic/memset.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(memset) */
 void *memset (void *dstpp, int c, size_t len)
 {
   long int dstp = (long int) dstpp;
diff --git a/libc/string/generic/rawmemchr.c b/libc/string/generic/rawmemchr.c
index 5242734f1..ddefb0997 100644
--- a/libc/string/generic/rawmemchr.c
+++ b/libc/string/generic/rawmemchr.c
@@ -26,8 +26,6 @@
 #include <limits.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(rawmemchr) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strcat.c b/libc/string/generic/strcat.c
index e00494038..b19a0dbd5 100644
--- a/libc/string/generic/strcat.c
+++ b/libc/string/generic/strcat.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strcat) */
 /* Append SRC on the end of DEST.  */
 char *strcat (char *dest, const char *src)
 {
diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c
index 91de3f4aa..836ccddbf 100644
--- a/libc/string/generic/strchr.c
+++ b/libc/string/generic/strchr.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strchrnul.c b/libc/string/generic/strchrnul.c
index 6a25b1c0c..9984d6161 100644
--- a/libc/string/generic/strchrnul.c
+++ b/libc/string/generic/strchrnul.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(strchrnul) */
-/* libc_hidden_proto(abort) */
 
 #include "memcopy.h"
 
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c
index 50acd3548..502b80fb3 100644
--- a/libc/string/generic/strcmp.c
+++ b/libc/string/generic/strcmp.c
@@ -20,7 +20,6 @@
 
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
 /* Compare S1 and S2, returning less than, equal to or
    greater than zero if S1 is lexicographically less than,
    equal to or greater than S2.  */
@@ -44,7 +43,6 @@ int strcmp (const char *p1, const char *p2)
 libc_hidden_weak(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-/* Experimentally off - libc_hidden_proto(strcoll) */
 strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/generic/strcpy.c b/libc/string/generic/strcpy.c
index b9a0a286a..4d070531f 100644
--- a/libc/string/generic/strcpy.c
+++ b/libc/string/generic/strcpy.c
@@ -21,7 +21,6 @@
 
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
 /* Copy SRC to DEST.  */
 char *strcpy(char *dest, const char *src)
 {
diff --git a/libc/string/generic/strcspn.c b/libc/string/generic/strcspn.c
index b65b3b995..f1f39df8c 100644
--- a/libc/string/generic/strcspn.c
+++ b/libc/string/generic/strcspn.c
@@ -18,8 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcspn) */
-/* Experimentally off - libc_hidden_proto(strchr) */
 
 /* Return the length of the maximum initial segment of S
    which contains no characters from REJECT.  */
diff --git a/libc/string/generic/strlen.c b/libc/string/generic/strlen.c
index be899d330..9b6d81dfe 100644
--- a/libc/string/generic/strlen.c
+++ b/libc/string/generic/strlen.c
@@ -22,8 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(abort) */
 
 /* Return the length of the null-terminated string STR.  Scan for
    the null terminator quickly by testing four bytes at a time.  */
diff --git a/libc/string/generic/strncat.c b/libc/string/generic/strncat.c
index 8e3423e49..0863d3669 100644
--- a/libc/string/generic/strncat.c
+++ b/libc/string/generic/strncat.c
@@ -20,7 +20,6 @@
 
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strncat) */
 char *strncat (char *s1, const char *s2, size_t n)
 {
   reg_char c;
diff --git a/libc/string/generic/strncmp.c b/libc/string/generic/strncmp.c
index c49f36d8b..04d6cf2ac 100644
--- a/libc/string/generic/strncmp.c
+++ b/libc/string/generic/strncmp.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strncmp) */
 /* Compare no more than N characters of S1 and S2,
    returning less than, equal to or greater than zero
    if S1 is lexicographically less than, equal to or
diff --git a/libc/string/generic/strncpy.c b/libc/string/generic/strncpy.c
index d2d693f2b..26b45bb8c 100644
--- a/libc/string/generic/strncpy.c
+++ b/libc/string/generic/strncpy.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include "memcopy.h"
 
-/* Experimentally off - libc_hidden_proto(strncpy) */
 char *strncpy (char *s1, const char *s2, size_t n)
 {
   reg_char c;
diff --git a/libc/string/generic/strnlen.c b/libc/string/generic/strnlen.c
index 0bc517a84..85819aaa6 100644
--- a/libc/string/generic/strnlen.c
+++ b/libc/string/generic/strnlen.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* libc_hidden_proto(abort) */
 
 /* Find the length of S, but scan at most MAXLEN characters.  If no
    '\0' terminator is found in that many characters, return MAXLEN.  */
diff --git a/libc/string/generic/strrchr.c b/libc/string/generic/strrchr.c
index c85707241..7d169260a 100644
--- a/libc/string/generic/strrchr.c
+++ b/libc/string/generic/strrchr.c
@@ -18,8 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strrchr) */
-/* Experimentally off - libc_hidden_proto(strchr) */
 
 /* Find the last occurrence of C in S.  */
 char *strrchr (const char *s, int c)
diff --git a/libc/string/generic/strsep.c b/libc/string/generic/strsep.c
index e02e57068..91dfade85 100644
--- a/libc/string/generic/strsep.c
+++ b/libc/string/generic/strsep.c
@@ -20,10 +20,7 @@
 
 #ifdef __USE_BSD
 
-/* Experimentally off - libc_hidden_proto(strchr) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
 
-/* Experimentally off - libc_hidden_proto(strsep) */
 char *strsep (char **stringp, const char *delim)
 {
   char *begin, *end;
diff --git a/libc/string/generic/strspn.c b/libc/string/generic/strspn.c
index 010567744..1d9ec4022 100644
--- a/libc/string/generic/strspn.c
+++ b/libc/string/generic/strspn.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strspn) */
 /* Return the length of the maximum initial segment
    of S which contains only characters in ACCEPT.  */
 size_t strspn (const char *s, const char *accept)
diff --git a/libc/string/generic/strstr.c b/libc/string/generic/strstr.c
index c12dceb33..c3b886a0d 100644
--- a/libc/string/generic/strstr.c
+++ b/libc/string/generic/strstr.c
@@ -28,7 +28,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strstr) */
 
 typedef unsigned chartype;
 
diff --git a/libc/string/generic/strtok_r.c b/libc/string/generic/strtok_r.c
index 7648212f7..75ce5be2a 100644
--- a/libc/string/generic/strtok_r.c
+++ b/libc/string/generic/strtok_r.c
@@ -19,15 +19,10 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* Experimentally off - libc_hidden_proto(strspn) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
 #ifdef __USE_GNU
 # define __rawmemchr rawmemchr
-/* Experimentally off - libc_hidden_proto(rawmemchr) */
 #else
 # define __rawmemchr strchr
-/* Experimentally off - libc_hidden_proto(strchr) */
 #endif
 #if 0
    Parse S into tokens separated by characters in DELIM.
diff --git a/libc/string/i386/strcat.c b/libc/string/i386/strcat.c
index 2cf0237a6..e71aad4f7 100644
--- a/libc/string/i386/strcat.c
+++ b/libc/string/i386/strcat.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcat) */
 char *strcat(char * dest, const char * src)
 {
     int d0, d1, d2, d3;
diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c
index eff230c5c..9621f66f8 100644
--- a/libc/string/i386/strcmp.c
+++ b/libc/string/i386/strcmp.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strcmp) */
 int strcmp(const char *cs, const char *ct)
 {
     int d0, d1;
@@ -55,7 +54,6 @@ int strcmp(const char *cs, const char *ct)
 libc_hidden_def(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-/* Experimentally off - libc_hidden_proto(strcoll) */
 strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/i386/strrchr.c b/libc/string/i386/strrchr.c
index 9f2c74923..5c349f683 100644
--- a/libc/string/i386/strrchr.c
+++ b/libc/string/i386/strrchr.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(strrchr) */
 char *strrchr(const char *s, int c)
 {
 	char *eax;
diff --git a/libc/string/memcmp.c b/libc/string/memcmp.c
index 762fc23c1..6cb37f417 100644
--- a/libc/string/memcmp.c
+++ b/libc/string/memcmp.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wmemcmp wmemcmp
 #else
-/* Experimentally off - libc_hidden_proto(memcmp) */
 # define Wmemcmp memcmp
 #endif
 
diff --git a/libc/string/memmem.c b/libc/string/memmem.c
index 9dcd4c4c0..f568a4261 100644
--- a/libc/string/memmem.c
+++ b/libc/string/memmem.c
@@ -8,7 +8,6 @@
 #include "_string.h"
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(memmem) */
 void *memmem(const void *haystack, size_t haystacklen,
 		     const void *needle, size_t needlelen)
 {
diff --git a/libc/string/memmove.c b/libc/string/memmove.c
index 0bea9b497..8dcc6e49b 100644
--- a/libc/string/memmove.c
+++ b/libc/string/memmove.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wmemmove wmemmove
 #else
-/* Experimentally off - libc_hidden_proto(memmove) */
 # define Wmemmove memmove
 #endif
 
diff --git a/libc/string/memrchr.c b/libc/string/memrchr.c
index 48ec50a4e..3a7e22f9b 100644
--- a/libc/string/memrchr.c
+++ b/libc/string/memrchr.c
@@ -9,7 +9,6 @@
 
 #ifdef __USE_GNU
 
-/* Experimentally off - libc_hidden_proto(memrchr) */
 
 void *memrchr(const void *s, int c, size_t n)
 {
diff --git a/libc/string/powerpc/memmove.c b/libc/string/powerpc/memmove.c
index 8badae37d..6bd79915d 100644
--- a/libc/string/powerpc/memmove.c
+++ b/libc/string/powerpc/memmove.c
@@ -21,9 +21,7 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
-/* Experimentally off - libc_hidden_proto(memmove) */
 void *memmove(void *to, const void *from, size_t n)
 {
 	unsigned long rem, chunks, tmp1, tmp2;
diff --git a/libc/string/powerpc/memset.c b/libc/string/powerpc/memset.c
index 1cbfd04fc..a900b92cb 100644
--- a/libc/string/powerpc/memset.c
+++ b/libc/string/powerpc/memset.c
@@ -21,7 +21,6 @@
 
 #include <string.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 static __inline__ int expand_byte_word(int c){
 	/* this does:
diff --git a/libc/string/psignal.c b/libc/string/psignal.c
index e4498528a..3e1f68b94 100644
--- a/libc/string/psignal.c
+++ b/libc/string/psignal.c
@@ -10,8 +10,6 @@
 #include <string.h>
 #include <signal.h>
 
-/* libc_hidden_proto(fprintf) */
-/* Experimentally off - libc_hidden_proto(strsignal) */
 
 /* TODO: make this threadsafe with a reentrant version of strsignal? */
 
diff --git a/libc/string/rawmemchr.c b/libc/string/rawmemchr.c
index 3cddefa10..f0cb7ee47 100644
--- a/libc/string/rawmemchr.c
+++ b/libc/string/rawmemchr.c
@@ -8,7 +8,6 @@
 #include "_string.h"
 
 #ifdef __USE_GNU
-/* Experimentally off - libc_hidden_proto(rawmemchr) */
 void *rawmemchr(const void *s, int c)
 {
 	register const unsigned char *r = s;
diff --git a/libc/string/stpncpy.c b/libc/string/stpncpy.c
index dac8471fd..0524ee93e 100644
--- a/libc/string/stpncpy.c
+++ b/libc/string/stpncpy.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstpncpy wcpncpy
 #else
-/* Experimentally off - libc_hidden_proto(stpncpy) */
 # define Wstpncpy stpncpy
 #endif
 
diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index 94c8ff492..20b3cd8d7 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -12,28 +12,19 @@
 #ifdef WANT_WIDE
 # define strcasecmp wcscasecmp
 # define strcasecmp_l wcscasecmp_l
-/* libc_hidden_proto(wcscasecmp) */
 # if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-/* libc_hidden_proto(wcscasecmp_l) */
 # endif
 # ifdef __UCLIBC_DO_XLOCALE
-/* libc_hidden_proto(towlower_l) */
 #  define TOLOWER(C) towlower_l((C), locale_arg)
 # else
-/* libc_hidden_proto(towlower) */
 #  define TOLOWER(C) towlower((C))
 # endif
 #else
-/* Experimentally off - libc_hidden_proto(strcasecmp) */
-/* Experimentally off - libc_hidden_proto(strcasecmp_l) */
 # ifdef __UCLIBC_DO_XLOCALE
-/* libc_hidden_proto(tolower_l) */
 #  define TOLOWER(C) tolower_l((C), locale_arg)
 # else
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
 #  define TOLOWER(C) tolower((C))
 # endif
 #endif
@@ -48,7 +39,6 @@ libc_hidden_def(strcasecmp)
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-/* Experimentally off - libc_hidden_proto(__XL_NPP(strcasecmp)) */
 int __XL_NPP(strcasecmp)(register const Wchar *s1, register const Wchar *s2
 					  __LOCALE_PARAM )
 {
diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c
index 4804494cc..3ca4df088 100644
--- a/libc/string/strcasestr.c
+++ b/libc/string/strcasestr.c
@@ -9,11 +9,8 @@
 #include <ctype.h>
 
 #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) */
 
 char *strcasestr(const char *s1, const char *s2)
 {
diff --git a/libc/string/strcspn.c b/libc/string/strcspn.c
index 1ec460a15..0466af99b 100644
--- a/libc/string/strcspn.c
+++ b/libc/string/strcspn.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrcspn wcscspn
 #else
-/* Experimentally off - libc_hidden_proto(strcspn) */
 # define Wstrcspn strcspn
 #endif
 
diff --git a/libc/string/strdup.c b/libc/string/strdup.c
index 9eb28630e..049a23f63 100644
--- a/libc/string/strdup.c
+++ b/libc/string/strdup.c
@@ -9,16 +9,12 @@
 #include <stdlib.h>
 
 #ifdef WANT_WIDE
-/* libc_hidden_proto(wcslen) */
 # define Wstrdup wcsdup
 # define Wstrlen wcslen
 #else
-/* Experimentally off - libc_hidden_proto(strdup) */
-/* Experimentally off - libc_hidden_proto(strlen) */
 # define Wstrdup strdup
 # define Wstrlen strlen
 #endif
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 Wchar *Wstrdup(register const Wchar *s1)
 {
diff --git a/libc/string/strerror.c b/libc/string/strerror.c
index a52c407f8..7250da07d 100644
--- a/libc/string/strerror.c
+++ b/libc/string/strerror.c
@@ -9,8 +9,6 @@
 #include <string.h>
 #include "_syserrmsg.h"
 
-/* Experimentally off - libc_hidden_proto(strerror) */
-/* libc_hidden_proto(__xpg_strerror_r) */
 
 char *strerror(int errnum)
 {
diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index a9e7245a8..8f768d6f1 100644
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -12,28 +12,19 @@
 #ifdef WANT_WIDE
 # define strncasecmp wcsncasecmp
 # define strncasecmp_l wcsncasecmp_l
-/* libc_hidden_proto(wcsncasecmp) */
 # if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-/* libc_hidden_proto(wcsncasecmp_l) */
 # endif
 # ifdef __UCLIBC_DO_XLOCALE
-/* libc_hidden_proto(towlower_l) */
 #  define TOLOWER(C) towlower_l((C), locale_arg)
 # else
-/* libc_hidden_proto(towlower) */
 #  define TOLOWER(C) towlower((C))
 # endif
 #else
-/* Experimentally off - libc_hidden_proto(strncasecmp) */
-/* Experimentally off - libc_hidden_proto(strncasecmp_l) */
 # ifdef __UCLIBC_DO_XLOCALE
-/* libc_hidden_proto(tolower_l) */
 #  define TOLOWER(C) tolower_l((C), locale_arg)
 # else
 #if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_tolower) */
 #endif
-/* libc_hidden_proto(tolower) */
 #  define TOLOWER(C) tolower((C))
 # endif
 #endif
@@ -48,7 +39,6 @@ libc_hidden_def(strncasecmp)
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-/* Experimentally off - libc_hidden_proto(__XL_NPP(strncasecmp)) */
 int __XL_NPP(strncasecmp)(register const Wchar *s1, register const Wchar *s2,
 					  size_t n   __LOCALE_PARAM )
 {
diff --git a/libc/string/strncat.c b/libc/string/strncat.c
index 0180d1328..cbbb0c540 100644
--- a/libc/string/strncat.c
+++ b/libc/string/strncat.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrncat wcsncat
 #else
-/* Experimentally off - libc_hidden_proto(strncat) */
 # define Wstrncat strncat
 #endif
 
diff --git a/libc/string/strncmp.c b/libc/string/strncmp.c
index 59e4a2c22..2da61771c 100644
--- a/libc/string/strncmp.c
+++ b/libc/string/strncmp.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrncmp wcsncmp
 #else
-/* Experimentally off - libc_hidden_proto(strncmp) */
 # define Wstrncmp strncmp
 #endif
 
diff --git a/libc/string/strncpy.c b/libc/string/strncpy.c
index d93561294..ccf031b1b 100644
--- a/libc/string/strncpy.c
+++ b/libc/string/strncpy.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrncpy wcsncpy
 #else
-/* Experimentally off - libc_hidden_proto(strncpy) */
 # define Wstrncpy strncpy
 #endif
 
diff --git a/libc/string/strndup.c b/libc/string/strndup.c
index 96a36d404..8e608669c 100644
--- a/libc/string/strndup.c
+++ b/libc/string/strndup.c
@@ -8,9 +8,6 @@
 #include "_string.h"
 #include <stdlib.h>
 
-/* Experimentally off - libc_hidden_proto(strndup) */
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 char *strndup(register const char *s1, size_t n)
 {
diff --git a/libc/string/strrchr.c b/libc/string/strrchr.c
index 253c4166d..db12bbc7c 100644
--- a/libc/string/strrchr.c
+++ b/libc/string/strrchr.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrrchr wcsrchr
 #else
-/* Experimentally off - libc_hidden_proto(strrchr) */
 # define Wstrrchr strrchr
 #endif
 
diff --git a/libc/string/strsep.c b/libc/string/strsep.c
index 373b00a71..ce17dcf89 100644
--- a/libc/string/strsep.c
+++ b/libc/string/strsep.c
@@ -9,10 +9,7 @@
 
 #ifdef __USE_BSD
 
-/* Experimentally off - libc_hidden_proto(strpbrk) */
-/* Experimentally off - libc_hidden_proto(strcspn) */
 
-/* Experimentally off - libc_hidden_proto(strsep) */
 char *strsep(char ** __restrict s1, const char * __restrict s2)
 {
 	register char *s = *s1;
diff --git a/libc/string/strstr.c b/libc/string/strstr.c
index 11417fb78..7e2a64e7d 100644
--- a/libc/string/strstr.c
+++ b/libc/string/strstr.c
@@ -10,7 +10,6 @@
 #ifdef WANT_WIDE
 # define Wstrstr wcsstr
 #else
-/* Experimentally off - libc_hidden_proto(strstr) */
 # define Wstrstr strstr
 #endif
 
diff --git a/libc/string/strtok.c b/libc/string/strtok.c
index 159dd6b6a..c337d81a7 100644
--- a/libc/string/strtok.c
+++ b/libc/string/strtok.c
@@ -15,7 +15,6 @@
 # define Wstrtok_r strtok_r
 #endif
 
-/* Experimentally off - libc_hidden_proto(Wstrtok_r) */
 
 Wchar *Wstrtok(Wchar * __restrict s1, const Wchar * __restrict s2)
 {
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index c81231997..2026888f8 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -8,15 +8,10 @@
 #include "_string.h"
 
 #ifdef WANT_WIDE
-/* libc_hidden_proto(wcsspn) */
-/* libc_hidden_proto(wcspbrk) */
 # define Wstrtok_r wcstok
 # define Wstrspn wcsspn
 # define Wstrpbrk wcspbrk
 #else
-/* Experimentally off - libc_hidden_proto(strtok_r) */
-/* Experimentally off - libc_hidden_proto(strspn) */
-/* Experimentally off - libc_hidden_proto(strpbrk) */
 # define Wstrtok_r strtok_r
 # define Wstrspn strspn
 # define Wstrpbrk strpbrk