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>

76 files changed, 0 insertions, 209 deletions

diff --git a/libc/stdio/_READ.c b/libc/stdio/_READ.c
index 0531b2ef2..02601c090 100644
--- a/libc/stdio/_READ.c
+++ b/libc/stdio/_READ.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(abort) */
 
 /* Given a reading stream without its end-of-file indicator set and
  * with no buffered input or ungots, read at most 'bufsize' bytes
diff --git a/libc/stdio/_WRITE.c b/libc/stdio/_WRITE.c
index 3d6174325..10b3b9584 100644
--- a/libc/stdio/_WRITE.c
+++ b/libc/stdio/_WRITE.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(write) */
 
 /* Given a writing stream with no buffered output, write the
  * data in 'buf' (which may be the stream's bufstart) of size
diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c
index 2011cc78c..6d4fc18b8 100644
--- a/libc/stdio/__fsetlocking.c
+++ b/libc/stdio/__fsetlocking.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-/* libc_hidden_proto(__fsetlocking) */
 
 /* Not threadsafe. */
 
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 69a04bcc8..49b636b19 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -7,13 +7,8 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(read) */
-/* libc_hidden_proto(write) */
-/* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(lseek64) */
 #else
-/* libc_hidden_proto(lseek) */
 #endif
 
 /**********************************************************************/
diff --git a/libc/stdio/_flushlbf.c b/libc/stdio/_flushlbf.c
index 7146e9bc9..c322c3e33 100644
--- a/libc/stdio/_flushlbf.c
+++ b/libc/stdio/_flushlbf.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-/* libc_hidden_proto(fflush_unlocked) */
 
 /* Solaris function --
  * Flush all line buffered (writing) streams.
diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index 51d1cf9bf..96377ee44 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -7,9 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(isatty) */
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(fcntl) */
 
 /*
  * Cases:
diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c
index 0aab23364..1332a20e7 100644
--- a/libc/stdio/_fpmaxtostr.c
+++ b/libc/stdio/_fpmaxtostr.c
@@ -11,7 +11,6 @@
 #include <locale.h>
 #include <bits/uClibc_fpmax.h>
 
-/* Experimentally off - libc_hidden_proto(memset) */
 
 typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len,
 								intptr_t buf);
diff --git a/libc/stdio/_fwrite.c b/libc/stdio/_fwrite.c
index ba4b02fb1..47860afbf 100644
--- a/libc/stdio/_fwrite.c
+++ b/libc/stdio/_fwrite.c
@@ -7,9 +7,6 @@
 
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memchr) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memrchr) */
 
 #ifdef __STDIO_BUFFERS
 
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 9189a52e1..11d5c7854 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -77,31 +77,10 @@
 #include <bits/uClibc_fpmax.h>
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
-/* Experimentally off - libc_hidden_proto(memcmp) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strcpy) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(ungetc) */
-/* libc_hidden_proto(vfscanf) */
-/* libc_hidden_proto(vsscanf) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(getc_unlocked) */
-/* libc_hidden_proto(__fgetc_unlocked) */
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(wcslen) */
-/* libc_hidden_proto(vfwscanf) */
-/* libc_hidden_proto(vswscanf) */
-/* libc_hidden_proto(mbsrtowcs) */
-/* libc_hidden_proto(mbrtowc) */
-/* libc_hidden_proto(wcrtomb) */
-/* libc_hidden_proto(ungetwc) */
-/* libc_hidden_proto(iswspace) */
-/* libc_hidden_proto(fgetwc_unlocked) */
 #endif
 #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_SCANF_GLIBC_A_FLAG__
@@ -165,7 +144,6 @@ _stdlib_strto_l(register const char * __restrict str,
 /**********************************************************************/
 #ifdef L_fscanf
 
-/* libc_hidden_proto(fscanf) */
 int fscanf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -201,7 +179,6 @@ int scanf(const char * __restrict format, ...)
 
 #ifdef __STDIO_HAS_VSSCANF
 
-/* libc_hidden_proto(sscanf) */
 int sscanf(const char * __restrict str, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -223,7 +200,6 @@ libc_hidden_def(sscanf)
 /**********************************************************************/
 #ifdef L_vscanf
 
-/* libc_hidden_proto(vscanf) */
 int vscanf(const char * __restrict format, va_list arg)
 {
 	return vfscanf(stdin, format, arg);
diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c
index 3c3ce59c7..3c8d667d2 100644
--- a/libc/stdio/_stdio.c
+++ b/libc/stdio/_stdio.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(isatty) */
 
 /* This is pretty much straight from uClibc, but with one important
  * difference.
diff --git a/libc/stdio/_trans2w.c b/libc/stdio/_trans2w.c
index 57a06d336..c72237939 100644
--- a/libc/stdio/_trans2w.c
+++ b/libc/stdio/_trans2w.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fseek) */
 
 /* Function to handle transition to writing.
  *   Initialize or verify the stream's orientation (even if readonly).
diff --git a/libc/stdio/_uintmaxtostr.c b/libc/stdio/_uintmaxtostr.c
index 086f6abd1..4be2c462f 100644
--- a/libc/stdio/_uintmaxtostr.c
+++ b/libc/stdio/_uintmaxtostr.c
@@ -11,7 +11,6 @@
 #include <locale.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* Avoid using long long / and % operations to cut down dependencies on
  * libgcc.a.  Definitely helps on i386 at least. */
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index c9d0f6bb9..d651cc965 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -115,21 +115,7 @@
 #include <bits/uClibc_uintmaxtostr.h>
 #include <bits/uClibc_va_copy.h>
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* libc_hidden_proto(__glibc_strerror_r) */
-/* libc_hidden_proto(fputs_unlocked) */
-/* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_WCHAR__
-/* libc_hidden_proto(wcslen) */
-/* libc_hidden_proto(wcsnlen) */
-/* libc_hidden_proto(mbsrtowcs) */
-/* libc_hidden_proto(wcsrtombs) */
-/* libc_hidden_proto(btowc) */
-/* libc_hidden_proto(wcrtomb) */
-/* libc_hidden_proto(fputws) */
 #endif
 
 /* Some older or broken gcc toolchains define LONG_LONG_MAX but not
@@ -729,9 +715,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs)
 #ifdef L__ppfs_parsespec
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /* Notes: argtype differs from glibc for the following:
@@ -1860,7 +1844,6 @@ static int _do_one_spec(FILE * __restrict stream,
 	return 0;
 }
 
-/* libc_hidden_proto(fprintf) */
 
 int VFPRINTF_internal (FILE * __restrict stream,
 			  const FMT_TYPE * __restrict format,
diff --git a/libc/stdio/_wfwrite.c b/libc/stdio/_wfwrite.c
index 81f5bd4e8..517e3a7a3 100644
--- a/libc/stdio/_wfwrite.c
+++ b/libc/stdio/_wfwrite.c
@@ -16,8 +16,6 @@
 #warning TODO: Fix prototype.
 #endif
 
-/* libc_hidden_proto(wmemcpy) */
-/* libc_hidden_proto(wcsnrtombs) */
 
 size_t attribute_hidden _wstdio_fwrite(const wchar_t *__restrict ws, size_t n,
 					  register FILE *__restrict stream)
diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c
index 8c6420936..6334cc72a 100644
--- a/libc/stdio/asprintf.c
+++ b/libc/stdio/asprintf.c
@@ -11,9 +11,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(asprintf) */
 
-/* libc_hidden_proto(vasprintf) */
 
 #ifndef __STDIO_HAS_VSNPRINTF
 #warning Skipping asprintf and __asprintf since no vsnprintf!
diff --git a/libc/stdio/ctermid.c b/libc/stdio/ctermid.c
index 26369d6f5..854c526ea 100644
--- a/libc/stdio/ctermid.c
+++ b/libc/stdio/ctermid.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(strcpy) */
 
 char *ctermid(register char *s)
 {
diff --git a/libc/stdio/dprintf.c b/libc/stdio/dprintf.c
index 0123c501a..3fab12739 100644
--- a/libc/stdio/dprintf.c
+++ b/libc/stdio/dprintf.c
@@ -11,7 +11,6 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vdprintf) */
 
 int dprintf(int filedes, const char * __restrict format, ...)
 {
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index 7d2138130..3417b2678 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -6,10 +6,7 @@
  */
 
 #include "_stdio.h"
-/* libc_hidden_proto(fclose) */
 
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(fflush_unlocked) */
 
 int fclose(register FILE *stream)
 {
diff --git a/libc/stdio/fcloseall.c b/libc/stdio/fcloseall.c
index b13da31a1..4d78b37d6 100644
--- a/libc/stdio/fcloseall.c
+++ b/libc/stdio/fcloseall.c
@@ -10,7 +10,6 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* libc_hidden_proto(fclose) */
 
 /* NOTE: GLIBC difference!!! -- fcloseall
  * According to the info pages, glibc actually fclose()s all open files.
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index 85ece2a5f..76c239f4d 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fdopen) */
-/* libc_hidden_proto(fcntl) */
 
 FILE *fdopen(int filedes, const char *mode)
 {
diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index 01564a936..8b918d6bb 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fflush_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -179,14 +178,12 @@ int fflush_unlocked(register FILE *stream)
 libc_hidden_def(fflush_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fflush) */
 strong_alias(fflush_unlocked,fflush)
 libc_hidden_def(fflush)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fflush) */
 int fflush(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index dfe57a6cd..fc25002ee 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -13,11 +13,9 @@
 #undef getc
 #undef getc_unlocked
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(fflush_unlocked) */
 
 int __fgetc_unlocked(FILE *stream)
 {
@@ -75,7 +73,6 @@ int __fgetc_unlocked(FILE *stream)
 }
 libc_hidden_def(__fgetc_unlocked)
 
-/* libc_hidden_proto(fgetc_unlocked) */
 strong_alias(__fgetc_unlocked,fgetc_unlocked)
 libc_hidden_def(fgetc_unlocked)
 
@@ -83,12 +80,10 @@ libc_hidden_def(fgetc_unlocked)
 //strong_alias(__fgetc_unlocked,__getc_unlocked)
 //libc_hidden_def(__getc_unlocked)
 
-/* libc_hidden_proto(getc_unlocked) */
 strong_alias(__fgetc_unlocked,getc_unlocked)
 libc_hidden_def(getc_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fgetc) */
 strong_alias(__fgetc_unlocked,fgetc)
 libc_hidden_def(fgetc)
 
@@ -97,7 +92,6 @@ strong_alias(__fgetc_unlocked,getc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgetc) */
 int fgetc(register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index 0c7b97ecd..bc710c764 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -7,11 +7,9 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fgets_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 char *fgets_unlocked(char *__restrict s, int n,
 					   register FILE * __restrict stream)
@@ -64,14 +62,12 @@ char *fgets_unlocked(char *__restrict s, int n,
 libc_hidden_def(fgets_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fgets) */
 strong_alias(fgets_unlocked,fgets)
 libc_hidden_def(fgets)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgets) */
 char *fgets(char *__restrict s, int n,
 			register FILE * __restrict stream)
 {
diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index 18a6b5bb5..32d9e0ea3 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fgetwc_unlocked) */
 
-/* libc_hidden_proto(mbrtowc) */
 
 #ifdef __DO_UNLOCKED
 
@@ -113,7 +111,6 @@ libc_hidden_def(fgetwc_unlocked)
 
 strong_alias(fgetwc_unlocked,getwc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fgetwc) */
 strong_alias(fgetwc_unlocked,fgetwc)
 libc_hidden_def(fgetwc)
 
@@ -122,7 +119,6 @@ strong_alias(fgetwc_unlocked,getwc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgetwc) */
 wint_t fgetwc(register FILE *stream)
 {
 	wint_t retval;
diff --git a/libc/stdio/fgetws.c b/libc/stdio/fgetws.c
index 80af1a217..b59d74b15 100644
--- a/libc/stdio/fgetws.c
+++ b/libc/stdio/fgetws.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fgetws_unlocked) */
 
-/* libc_hidden_proto(fgetwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index faed620d8..452572bae 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fileno_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -25,14 +24,12 @@ int fileno_unlocked(register FILE *stream)
 libc_hidden_def(fileno_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fileno) */
 strong_alias(fileno_unlocked,fileno)
 libc_hidden_def(fileno)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fileno) */
 int fileno(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c
index 269c7ec6d..4a67376f5 100644
--- a/libc/stdio/fmemopen.c
+++ b/libc/stdio/fmemopen.c
@@ -10,8 +10,6 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
diff --git a/libc/stdio/fopen.c b/libc/stdio/fopen.c
index d33e28aa1..a2d6617e8 100644
--- a/libc/stdio/fopen.c
+++ b/libc/stdio/fopen.c
@@ -14,7 +14,6 @@
 # undef fopen64
 #endif
 
-/* libc_hidden_proto(fopen) */
 FILE *fopen(const char * __restrict filename, const char * __restrict mode)
 {
 	return _stdio_fopen(((intptr_t) filename), mode, NULL, FILEDES_ARG);
diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c
index ac2c33483..c4927e0bd 100644
--- a/libc/stdio/fopencookie.c
+++ b/libc/stdio/fopencookie.c
@@ -31,7 +31,6 @@
 /* Currently no real reentrancy issues other than a possible double close(). */
 
 #ifndef __BCC__
-/* libc_hidden_proto(fopencookie) */
 FILE *fopencookie(void * __restrict cookie, const char * __restrict mode,
 				  cookie_io_functions_t io_functions)
 #else
diff --git a/libc/stdio/fprintf.c b/libc/stdio/fprintf.c
index 4e3246ec8..fb7549566 100644
--- a/libc/stdio/fprintf.c
+++ b/libc/stdio/fprintf.c
@@ -8,9 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vfprintf) */
 
-/* libc_hidden_proto(fprintf) */
 int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c
index f426161d2..b49f868f1 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -12,7 +12,6 @@
 #undef putc
 #undef putc_unlocked
 
-/* libc_hidden_proto(__fputc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -72,26 +71,21 @@ int __fputc_unlocked(int c, register FILE *stream)
 }
 libc_hidden_def(__fputc_unlocked)
 
-/* libc_hidden_proto(fputc_unlocked) */
 strong_alias(__fputc_unlocked,fputc_unlocked)
 libc_hidden_def(fputc_unlocked)
 
-/* libc_hidden_proto(putc_unlocked) */
 strong_alias(__fputc_unlocked,putc_unlocked)
 libc_hidden_def(putc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fputc) */
 strong_alias(__fputc_unlocked,fputc)
 libc_hidden_def(fputc)
 
-/* libc_hidden_proto(putc) */
 strong_alias(__fputc_unlocked,putc)
 libc_hidden_def(putc)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fputc) */
 int fputc(int c, register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
@@ -106,7 +100,6 @@ int fputc(int c, register FILE *stream)
 }
 libc_hidden_def(fputc)
 
-/* libc_hidden_proto(putc) */
 strong_alias(fputc,putc)
 libc_hidden_def(putc)
 
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index 08da59c40..b3ede6871 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -7,10 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fputs_unlocked) */
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* libc_hidden_proto(fwrite_unlocked) */
 
 /* Note: The standard says fputs returns a nonnegative number on
  * success.  In this implementation, we return the length of the
@@ -29,14 +26,12 @@ int fputs_unlocked(register const char * __restrict s,
 libc_hidden_def(fputs_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fputs) */
 strong_alias(fputs_unlocked,fputs)
 libc_hidden_def(fputs)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fputs) */
 int fputs(const char * __restrict s, register FILE * __restrict stream)
 {
 	int retval;
diff --git a/libc/stdio/fputwc.c b/libc/stdio/fputwc.c
index 6c7d6b263..7f46f48b8 100644
--- a/libc/stdio/fputwc.c
+++ b/libc/stdio/fputwc.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fputwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c
index a4fadb428..7a1892188 100644
--- a/libc/stdio/fputws.c
+++ b/libc/stdio/fputws.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fputws_unlocked) */
 
-/* libc_hidden_proto(wcslen) */
 
 #ifdef __DO_UNLOCKED
 
@@ -23,14 +21,12 @@ int fputws_unlocked(const wchar_t *__restrict ws,
 libc_hidden_def(fputws_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fputws) */
 strong_alias(fputws_unlocked,fputws)
 libc_hidden_def(fputws)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fputws) */
 int fputws(const wchar_t *__restrict ws, register FILE *__restrict stream)
 {
 	int retval;
diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c
index 55d3cb2d3..d2fcc70d5 100644
--- a/libc/stdio/fread.c
+++ b/libc/stdio/fread.c
@@ -7,12 +7,9 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fread_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(fflush_unlocked) */
 
 size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,
 						FILE * __restrict stream)
@@ -90,14 +87,12 @@ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,
 libc_hidden_def(fread_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fread) */
 strong_alias(fread_unlocked,fread)
 libc_hidden_def(fread)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fread) */
 size_t fread(void * __restrict ptr, size_t size, size_t nmemb,
 			 register FILE * __restrict stream)
 {
diff --git a/libc/stdio/freopen.c b/libc/stdio/freopen.c
index d51a549b9..f48a43b73 100644
--- a/libc/stdio/freopen.c
+++ b/libc/stdio/freopen.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fclose) */
 
 #ifndef __DO_LARGEFILE
 # define FILEDES_ARG    (-1)
diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c
index a7f8b8dc1..5f3bbbb98 100644
--- a/libc/stdio/fseeko.c
+++ b/libc/stdio/fseeko.c
@@ -17,9 +17,7 @@
 #endif
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(fseeko64) */
 #endif
-/* libc_hidden_proto(fseek) */
 
 int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence)
 {
diff --git a/libc/stdio/ftello.c b/libc/stdio/ftello.c
index f6adf3874..ad8f4df60 100644
--- a/libc/stdio/ftello.c
+++ b/libc/stdio/ftello.c
@@ -8,9 +8,7 @@
 #include "_stdio.h"
 
 #ifdef __UCLIBC_HAS_LFS__
-/* libc_hidden_proto(ftello64) */
 #endif
-/* libc_hidden_proto(ftell) */
 
 #ifndef __DO_LARGEFILE
 # define FTELL         ftell
diff --git a/libc/stdio/fwprintf.c b/libc/stdio/fwprintf.c
index 6bae0c7a4..2f2dddc10 100644
--- a/libc/stdio/fwprintf.c
+++ b/libc/stdio/fwprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vfwprintf) */
 
 int fwprintf(FILE * __restrict stream, const wchar_t * __restrict format, ...)
 {
diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c
index 180fa9249..71793ff26 100644
--- a/libc/stdio/fwrite.c
+++ b/libc/stdio/fwrite.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fwrite_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -38,14 +37,12 @@ size_t fwrite_unlocked(const void * __restrict ptr, size_t size,
 libc_hidden_def(fwrite_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-/* libc_hidden_proto(fwrite) */
 strong_alias(fwrite_unlocked,fwrite)
 libc_hidden_def(fwrite)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fwrite) */
 size_t fwrite(const void * __restrict ptr, size_t size,
 			  size_t nmemb, register FILE * __restrict stream)
 {
diff --git a/libc/stdio/getchar.c b/libc/stdio/getchar.c
index 2ef7220e4..b6c650c9b 100644
--- a/libc/stdio/getchar.c
+++ b/libc/stdio/getchar.c
@@ -7,14 +7,12 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 #undef getchar
 #ifdef __DO_UNLOCKED
 
 /* the only use of the hidden getchar_unlocked is in gets.c */
 #undef getchar_unlocked
-/* libc_hidden_proto(getchar_unlocked) */
 int getchar_unlocked(void)
 {
 	register FILE *stream = stdin;
diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
index 30fca81d7..987e32a19 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -10,9 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* libc_hidden_proto(getdelim) */
 
-/* libc_hidden_proto(__fgetc_unlocked) */
 
 /* Note: There is a defect in this function.  (size_t vs ssize_t). */
 
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
index 8123b0c95..98ce8d108 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -10,9 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* libc_hidden_proto(getline) */
 
-/* libc_hidden_proto(getdelim) */
 
 ssize_t getline(char **__restrict lineptr, size_t *__restrict n,
 				FILE *__restrict stream)
diff --git a/libc/stdio/gets.c b/libc/stdio/gets.c
index c8271977e..515e966d1 100644
--- a/libc/stdio/gets.c
+++ b/libc/stdio/gets.c
@@ -13,7 +13,6 @@ link_warning(gets, "the 'gets' function is dangerous and should not be used.")
 
 /* disable macro, force actual function call */
 #undef getchar_unlocked
-/* libc_hidden_proto(getchar_unlocked) */
 
 char *gets(char *s)
 {
diff --git a/libc/stdio/getw.c b/libc/stdio/getw.c
index 75255aae9..625f17f3e 100644
--- a/libc/stdio/getw.c
+++ b/libc/stdio/getw.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fread_unlocked) */
 
 /* SUSv2 Legacy function -- need not be reentrant. */
 
diff --git a/libc/stdio/getwchar.c b/libc/stdio/getwchar.c
index c17f0c71c..75266de3a 100644
--- a/libc/stdio/getwchar.c
+++ b/libc/stdio/getwchar.c
@@ -9,7 +9,6 @@
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(fgetwc_unlocked) */
 
 wint_t getwchar_unlocked(void)
 {
@@ -22,7 +21,6 @@ strong_alias(getwchar_unlocked,getwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(fgetwc) */
 
 wint_t getwchar(void)
 {
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index e3a817368..7d4bfea6a 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -143,12 +143,6 @@
 #include <pthread.h>
 #endif /* __UCLIBC_HAS_THREADS__ */
 
-/* Experimentally off - libc_hidden_proto(strlen) */
-/* Experimentally off - libc_hidden_proto(strnlen) */
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* libc_hidden_proto(putc_unlocked) */
-/* libc_hidden_proto(__fputc_unlocked) */
-/* libc_hidden_proto(__glibc_strerror_r) */
 
 /*  #undef __UCLIBC_HAS_FLOATS__ */
 /*  #undef WANT_FLOAT_ERROR */
@@ -343,7 +337,6 @@ static const char u_spec[] = "%nbopxXudics";
 /* u_radix[i] <-> u_spec[i+2] for unsigned entries only */
 static const char u_radix[] = "\x02\x08\x10\x10\x10\x0a";
 
-/* libc_hidden_proto(vfprintf) */
 int vfprintf(FILE * __restrict op, register const char * __restrict fmt,
 			 va_list ap)
 {
diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c
index 46142a089..8b552c796 100644
--- a/libc/stdio/open_memstream.c
+++ b/libc/stdio/open_memstream.c
@@ -10,9 +10,6 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
-/* Experimentally off - libc_hidden_proto(memset) */
-/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
@@ -131,7 +128,6 @@ static const cookie_io_functions_t _oms_io_funcs = {
  * (ie replace the FILE buffer with the cookie buffer and update FILE bufstart,
  * etc. whenever we seek). */
 
-/* libc_hidden_proto(open_memstream) */
 FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc)
 {
 	register __oms_cookie *cookie;
diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c
index a01c4fe18..8b943e467 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -7,14 +7,11 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fprintf) */
-/* libc_hidden_proto(__glibc_strerror_r) */
 
 #ifdef __UCLIBC_MJN3_ONLY__
 #warning CONSIDER: Increase buffer size for error message (non-%m case)?
 #endif
 
-/* libc_hidden_proto(perror) */
 void perror(register const char *s)
 {
 	/* If the program is calling perror, it's a safe bet that printf and
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index e920b8d7e..d5c60cf2a 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -26,15 +26,6 @@
 #warning "hmm... susv3 says Pipe streams are byte-oriented."
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(waitpid) */
-/* libc_hidden_proto(execl) */
-/* libc_hidden_proto(dup2) */
-/* libc_hidden_proto(fdopen) */
-/* libc_hidden_proto(pipe) */
-/* libc_hidden_proto(vfork) */
-/* libc_hidden_proto(fclose) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
@@ -42,7 +33,6 @@
 # define vfork fork
 # define VFORK_LOCK		((void) 0)
 # define VFORK_UNLOCK		((void) 0)
-/* libc_hidden_proto(fork) */
 #endif
 
 #ifndef VFORK_LOCK
diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c
index 2f4a36e95..8cd3db9f1 100644
--- a/libc/stdio/printf.c
+++ b/libc/stdio/printf.c
@@ -8,9 +8,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vfprintf) */
 
-/* libc_hidden_proto(printf) */
 int printf(const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/putchar.c b/libc/stdio/putchar.c
index 65d8f64c1..583e90f44 100644
--- a/libc/stdio/putchar.c
+++ b/libc/stdio/putchar.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(__fputc_unlocked) */
 
 #undef putchar
 #ifdef __DO_UNLOCKED
diff --git a/libc/stdio/puts.c b/libc/stdio/puts.c
index 3ece1ba68..67775ff7c 100644
--- a/libc/stdio/puts.c
+++ b/libc/stdio/puts.c
@@ -7,8 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(__fputc_unlocked) */
-/* libc_hidden_proto(fputs_unlocked) */
 
 int puts(register const char * __restrict s)
 {
diff --git a/libc/stdio/putw.c b/libc/stdio/putw.c
index 5074117b6..ffdb11478 100644
--- a/libc/stdio/putw.c
+++ b/libc/stdio/putw.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fwrite_unlocked) */
 
 /* SUSv2 Legacy function -- need not be reentrant. */
 
diff --git a/libc/stdio/putwchar.c b/libc/stdio/putwchar.c
index aa6531988..3fadb61db 100644
--- a/libc/stdio/putwchar.c
+++ b/libc/stdio/putwchar.c
@@ -9,7 +9,6 @@
 
 #ifdef __DO_UNLOCKED
 
-/* libc_hidden_proto(fputwc_unlocked) */
 
 wint_t putwchar_unlocked(wchar_t wc)
 {
@@ -22,9 +21,7 @@ strong_alias(putwchar_unlocked,putwchar)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-/* libc_hidden_proto(__fputc_unlocked) */
 /* psm: should this be fputwc? */
-/* libc_hidden_proto(fputc) */
 
 wint_t putwchar(wchar_t wc)
 {
diff --git a/libc/stdio/rewind.c b/libc/stdio/rewind.c
index 600f8cd0e..1b170443a 100644
--- a/libc/stdio/rewind.c
+++ b/libc/stdio/rewind.c
@@ -7,9 +7,7 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(fseek) */
 
-/* libc_hidden_proto(rewind) */
 void rewind(register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
diff --git a/libc/stdio/setbuf.c b/libc/stdio/setbuf.c
index b9bdc8b5b..e6080a522 100644
--- a/libc/stdio/setbuf.c
+++ b/libc/stdio/setbuf.c
@@ -7,7 +7,6 @@
 
 #include "_stdio.h"
 
-/* libc_hidden_proto(setvbuf) */
 
 void setbuf(FILE * __restrict stream, register char * __restrict buf)
 {
diff --git a/libc/stdio/setbuffer.c b/libc/stdio/setbuffer.c
index 428b38936..b566bfc39 100644
--- a/libc/stdio/setbuffer.c
+++ b/libc/stdio/setbuffer.c
@@ -9,7 +9,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(setvbuf) */
 
 /* A BSD function.  The implementation matches the linux man page,
  * except that we do not bother calling setvbuf if not configured
diff --git a/libc/stdio/setlinebuf.c b/libc/stdio/setlinebuf.c
index 564776989..932338886 100644
--- a/libc/stdio/setlinebuf.c
+++ b/libc/stdio/setlinebuf.c
@@ -9,7 +9,6 @@
 
 #ifdef __USE_BSD
 
-/* libc_hidden_proto(setvbuf) */
 
 /* A BSD function.  The implementation matches the linux man page,
  * except that we do not bother calling setvbuf if not configured
diff --git a/libc/stdio/setvbuf.c b/libc/stdio/setvbuf.c
index 7f0c6f6f3..0b0ea0dde 100644
--- a/libc/stdio/setvbuf.c
+++ b/libc/stdio/setvbuf.c
@@ -14,7 +14,6 @@
 #error Assumption violated for buffering mode flags
 #endif
 
-/* libc_hidden_proto(setvbuf) */
 int setvbuf(register FILE * __restrict stream, register char * __restrict buf,
 			int mode, size_t size)
 {
diff --git a/libc/stdio/snprintf.c b/libc/stdio/snprintf.c
index 1b1f089cd..e0902ac70 100644
--- a/libc/stdio/snprintf.c
+++ b/libc/stdio/snprintf.c
@@ -12,9 +12,7 @@
 #warning Skipping snprintf since no vsnprintf!
 #else
 
-/* libc_hidden_proto(vsnprintf) */
 
-/* libc_hidden_proto(snprintf) */
 int snprintf(char *__restrict buf, size_t size,
 			 const char * __restrict format, ...)
 {
diff --git a/libc/stdio/sprintf.c b/libc/stdio/sprintf.c
index 594c51b86..44304b5da 100644
--- a/libc/stdio/sprintf.c
+++ b/libc/stdio/sprintf.c
@@ -12,9 +12,7 @@
 #warning Skipping sprintf since no vsnprintf!
 #else
 
-/* libc_hidden_proto(vsnprintf) */
 
-/* libc_hidden_proto(sprintf) */
 int sprintf(char *__restrict buf, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/swprintf.c b/libc/stdio/swprintf.c
index 4af8a6b11..8e037d20d 100644
--- a/libc/stdio/swprintf.c
+++ b/libc/stdio/swprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vswprintf) */
 
 #ifndef __STDIO_BUFFERS
 #warning Skipping swprintf since no buffering!
diff --git a/libc/stdio/tempnam.c b/libc/stdio/tempnam.c
index 3673f4bda..faf7c5ecb 100644
--- a/libc/stdio/tempnam.c
+++ b/libc/stdio/tempnam.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include "../misc/internals/tempname.h"
 
-/* Experimentally off - libc_hidden_proto(strdup) */
 
 /* Generate a unique temporary filename using up to five characters of PFX
    if it is not NULL.  The directory to put this file in is searched for
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
index bb843affd..2f973c329 100644
--- a/libc/stdio/tmpfile.c
+++ b/libc/stdio/tmpfile.c
@@ -21,9 +21,6 @@
 #include <unistd.h>
 #include "../misc/internals/tempname.h"
 
-/* libc_hidden_proto(fdopen) */
-/* libc_hidden_proto(remove) */
-/* libc_hidden_proto(close) */
 
 /* This returns a new stream opened on a temporary file (generated
    by tmpnam).  The file is opened with mode "w+b" (binary read/write).
diff --git a/libc/stdio/tmpnam.c b/libc/stdio/tmpnam.c
index 8df6ff57f..1f180e08a 100644
--- a/libc/stdio/tmpnam.c
+++ b/libc/stdio/tmpnam.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include "../misc/internals/tempname.h"
 
-/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static char tmpnam_buffer[L_tmpnam];
 
diff --git a/libc/stdio/ungetc.c b/libc/stdio/ungetc.c
index dcec91904..ea4edd22c 100644
--- a/libc/stdio/ungetc.c
+++ b/libc/stdio/ungetc.c
@@ -24,7 +24,6 @@
  *     (See section 7.19.6.2 of the C9X rationale -- WG14/N897.)
  */
 
-/* libc_hidden_proto(ungetc) */
 int ungetc(int c, register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
diff --git a/libc/stdio/ungetwc.c b/libc/stdio/ungetwc.c
index 438cb7572..25b12b887 100644
--- a/libc/stdio/ungetwc.c
+++ b/libc/stdio/ungetwc.c
@@ -12,7 +12,6 @@
  * as reset stream->__ungot_width[1] for use by _stdio_adjpos().
  */
 
-/* libc_hidden_proto(ungetwc) */
 wint_t ungetwc(wint_t c, register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index 02f495efb..175c497a5 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -23,14 +23,9 @@
 #else
 
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
-/* libc_hidden_proto(open_memstream) */
-/* libc_hidden_proto(fclose) */
-/* libc_hidden_proto(vfprintf) */
 #else
-/* libc_hidden_proto(vsnprintf) */
 #endif
 
-/* libc_hidden_proto(vasprintf) */
 int vasprintf(char **__restrict buf, const char * __restrict format,
 			 va_list arg)
 {
diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c
index b51aba4be..8e9926ff0 100644
--- a/libc/stdio/vdprintf.c
+++ b/libc/stdio/vdprintf.c
@@ -12,11 +12,8 @@
 #include <stdarg.h>
 
 #ifdef __USE_OLD_VFPRINTF__
-/* libc_hidden_proto(vfprintf) */
 #endif
-/* libc_hidden_proto(fflush_unlocked) */
 
-/* libc_hidden_proto(vdprintf) */
 int vdprintf(int filedes, const char * __restrict format, va_list arg)
 {
 	FILE f;
diff --git a/libc/stdio/vprintf.c b/libc/stdio/vprintf.c
index b01b2310f..853f340cc 100644
--- a/libc/stdio/vprintf.c
+++ b/libc/stdio/vprintf.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vfprintf) */
 
 int vprintf(const char * __restrict format, va_list arg)
 {
diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c
index 01ffb4ba0..7eb91eeff 100644
--- a/libc/stdio/vsnprintf.c
+++ b/libc/stdio/vsnprintf.c
@@ -8,10 +8,8 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-/* libc_hidden_proto(vsnprintf) */
 
 #ifdef __USE_OLD_VFPRINTF__
-/* libc_hidden_proto(vfprintf) */
 #endif
 
 #ifdef __UCLIBC_MJN3_ONLY__
diff --git a/libc/stdio/vsprintf.c b/libc/stdio/vsprintf.c
index b44789e69..d87090147 100644
--- a/libc/stdio/vsprintf.c
+++ b/libc/stdio/vsprintf.c
@@ -12,7 +12,6 @@
 #warning Skipping vsprintf since no vsnprintf!
 #else
 
-/* libc_hidden_proto(vsnprintf) */
 
 int vsprintf(char *__restrict buf, const char * __restrict format,
 			 va_list arg)
diff --git a/libc/stdio/vswprintf.c b/libc/stdio/vswprintf.c
index 10f7cc467..e509216e9 100644
--- a/libc/stdio/vswprintf.c
+++ b/libc/stdio/vswprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vswprintf) */
 
 /* NB: this file is not used if __USE_OLD_VFPRINTF__ */
 
diff --git a/libc/stdio/vwprintf.c b/libc/stdio/vwprintf.c
index 4e666cb54..25dd5b3fa 100644
--- a/libc/stdio/vwprintf.c
+++ b/libc/stdio/vwprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vfwprintf) */
 
 int vwprintf(const wchar_t * __restrict format, va_list arg)
 {
diff --git a/libc/stdio/wprintf.c b/libc/stdio/wprintf.c
index 80d76d5bb..b3a6318a5 100644
--- a/libc/stdio/wprintf.c
+++ b/libc/stdio/wprintf.c
@@ -9,7 +9,6 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-/* libc_hidden_proto(vfwprintf) */
 
 int wprintf(const wchar_t * __restrict format, ...)
 {