make DODEBUG=y happy, update sysdeps/common/* copyright

36 files changed, 48 insertions, 54 deletions

diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c
index 74f253626..2e8710076 100644
--- a/libc/stdio/__fsetlocking.c
+++ b/libc/stdio/__fsetlocking.c
@@ -8,6 +8,8 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
+libc_hidden_proto(__fsetlocking)
+
 /* Not threadsafe. */
 
 /* Notes:
@@ -43,6 +45,4 @@ int __fsetlocking(FILE *stream, int locking_mode)
 	return FSETLOCKING_INTERNAL;
 #endif
 }
-
-libc_hidden_proto(__fsetlocking)
 libc_hidden_def(__fsetlocking)
diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c
index 98865545e..f5ccfcc7c 100644
--- a/libc/stdio/asprintf.c
+++ b/libc/stdio/asprintf.c
@@ -8,6 +8,8 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
+libc_hidden_proto(asprintf)
+
 libc_hidden_proto(vasprintf)
 
 #ifndef __STDIO_HAS_VSNPRINTF
@@ -25,8 +27,6 @@ int asprintf(char **__restrict buf, const char * __restrict format, ...)
 
 	return rv;
 }
-
-libc_hidden_proto(asprintf)
 libc_hidden_def(asprintf)
 
 #endif
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index ec735d100..843599c0f 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -6,6 +6,7 @@
  */
 
 #include "_stdio.h"
+libc_hidden_proto(fclose)
 
 libc_hidden_proto(close)
 libc_hidden_proto(fflush_unlocked)
@@ -87,5 +88,4 @@ int fclose(register FILE *stream)
 
 	return rv;
 }
-libc_hidden_proto(fclose)
 libc_hidden_def(fclose)
diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index e33a0065a..a03c311e0 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -137,6 +137,7 @@ libc_hidden_def(fflush)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
+libc_hidden_proto(fflush)
 int fflush(register FILE *stream)
 {
 	int retval;
@@ -159,7 +160,6 @@ int fflush(register FILE *stream)
 
 	return retval;
 }
-libc_hidden_proto(fflush)
 libc_hidden_def(fflush)
 
 #endif
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index 599d12b30..eb8c58254 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -13,6 +13,8 @@
 #undef getc
 #undef getc_unlocked
 
+libc_hidden_proto(__fgetc_unlocked)
+
 #ifdef __DO_UNLOCKED
 
 libc_hidden_proto(fflush_unlocked)
@@ -71,7 +73,6 @@ int __fgetc_unlocked(FILE *stream)
 
 	return EOF;
 }
-libc_hidden_proto(__fgetc_unlocked)
 libc_hidden_def(__fgetc_unlocked)
 
 strong_alias(__fgetc_unlocked,fgetc_unlocked)
@@ -94,8 +95,7 @@ strong_alias(__fgetc_unlocked,getc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(__fgetc_unlocked)
-
+libc_hidden_proto(fgetc)
 int fgetc(register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
@@ -108,7 +108,6 @@ int fgetc(register FILE *stream)
 		return retval;
 	}
 }
-libc_hidden_proto(fgetc)
 libc_hidden_def(fgetc)
 
 strong_alias(fgetc,getc)
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index 031eadaaf..ae2ecdc8d 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -71,6 +71,7 @@ libc_hidden_def(fgets)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
+libc_hidden_proto(fgets)
 char *fgets(char *__restrict s, int n,
 			register FILE * __restrict stream)
 {
@@ -85,7 +86,6 @@ char *fgets(char *__restrict s, int n,
 
 	return retval;
 }
-libc_hidden_proto(fgets)
 libc_hidden_def(fgets)
 
 #endif
diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index dbcf6bec6..716a8e9c0 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -121,6 +121,7 @@ strong_alias(fgetwc_unlocked,getwc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
+libc_hidden_proto(fgetwc)
 wint_t fgetwc(register FILE *stream)
 {
 	wint_t retval;
@@ -134,7 +135,6 @@ wint_t fgetwc(register FILE *stream)
 
 	return retval;
 }
-libc_hidden_proto(fgetwc)
 libc_hidden_def(fgetwc)
 strong_alias(fgetwc,getwc)
 
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index fb895b8a0..deeff71b1 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -32,6 +32,7 @@ libc_hidden_def(fileno)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
+libc_hidden_proto(fileno)
 int fileno(register FILE *stream)
 {
 	int retval;
@@ -45,7 +46,6 @@ int fileno(register FILE *stream)
 
 	return retval;
 }
-libc_hidden_proto(fileno)
 libc_hidden_def(fileno)
 
 #endif
diff --git a/libc/stdio/fopen.c b/libc/stdio/fopen.c
index d73ce711a..ec14b5956 100644
--- a/libc/stdio/fopen.c
+++ b/libc/stdio/fopen.c
@@ -14,9 +14,9 @@
 #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);
 }
-libc_hidden_proto(fopen)
 libc_hidden_def(fopen)
diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c
index af51f44c9..d754deba5 100644
--- a/libc/stdio/fopencookie.c
+++ b/libc/stdio/fopencookie.c
@@ -28,6 +28,7 @@
 /* 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
@@ -58,6 +59,5 @@ FILE *_fopencookie(void * __restrict cookie, const char * __restrict mode,
 	return stream;
 }
 #ifndef __BCC__
-libc_hidden_proto(fopencookie)
 libc_hidden_def(fopencookie)
 #endif
diff --git a/libc/stdio/fprintf.c b/libc/stdio/fprintf.c
index 092a64981..4f73441e1 100644
--- a/libc/stdio/fprintf.c
+++ b/libc/stdio/fprintf.c
@@ -10,6 +10,7 @@
 
 libc_hidden_proto(vfprintf)
 
+libc_hidden_proto(fprintf)
 int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -21,5 +22,4 @@ int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
 
 	return rv;
 }
-libc_hidden_proto(fprintf)
 libc_hidden_def(fprintf)
diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c
index c30c0a12a..bbc72ab86 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -12,6 +12,8 @@
 #undef putc
 #undef putc_unlocked
 
+libc_hidden_proto(__fputc_unlocked)
+
 #ifdef __DO_UNLOCKED
 
 int __fputc_unlocked(int c, register FILE *stream)
@@ -68,7 +70,6 @@ int __fputc_unlocked(int c, register FILE *stream)
  BAD:
 	return EOF;
 }
-libc_hidden_proto(__fputc_unlocked)
 libc_hidden_def(__fputc_unlocked)
 
 strong_alias(__fputc_unlocked,fputc_unlocked)
@@ -86,8 +87,7 @@ libc_hidden_def(putc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(__fputc_unlocked)
-
+libc_hidden_proto(fputc)
 int fputc(int c, register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
@@ -100,7 +100,6 @@ int fputc(int c, register FILE *stream)
 		return retval;
 	}
 }
-libc_hidden_proto(fputc)
 libc_hidden_def(fputc)
 
 strong_alias(fputc,putc)
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index b9dabee30..a2d9c22c3 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -36,6 +36,7 @@ libc_hidden_def(fputs)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
+libc_hidden_proto(fputs)
 int fputs(const char * __restrict s, register FILE * __restrict stream)
 {
 	int retval;
@@ -49,7 +50,6 @@ int fputs(const char * __restrict s, register FILE * __restrict stream)
 
 	return retval;
 }
-libc_hidden_proto(fputs)
 libc_hidden_def(fputs)
 
 #endif
diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c
index d00c95797..2557155d6 100644
--- a/libc/stdio/fputws.c
+++ b/libc/stdio/fputws.c
@@ -30,6 +30,7 @@ libc_hidden_def(fputws)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
+libc_hidden_proto(fputws)
 int fputws(const wchar_t *__restrict ws, register FILE *__restrict stream)
 {
 	int retval;
@@ -43,7 +44,6 @@ int fputws(const wchar_t *__restrict ws, register FILE *__restrict stream)
 
 	return retval;
 }
-libc_hidden_proto(fputws)
 libc_hidden_def(fputws)
 
 #endif
diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c
index 417ab2c8d..3145553c2 100644
--- a/libc/stdio/fread.c
+++ b/libc/stdio/fread.c
@@ -97,6 +97,7 @@ libc_hidden_def(fread)
 
 #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)
 {
@@ -111,7 +112,6 @@ size_t fread(void * __restrict ptr, size_t size, size_t nmemb,
 
 	return retval;
 }
-libc_hidden_proto(fread)
 libc_hidden_def(fread)
 
 #endif
diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c
index 0ce4acfb7..74a9e3c3a 100644
--- a/libc/stdio/fseeko.c
+++ b/libc/stdio/fseeko.c
@@ -16,9 +16,8 @@
 # define OFFSET_TYPE   long int
 #endif
 
-#if defined(__UCLIBC_HAS_LFS__) && !defined(__DO_LARGEFILE)
 libc_hidden_proto(fseeko64)
-#endif
+libc_hidden_proto(fseek)
 
 int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence)
 {
@@ -78,10 +77,8 @@ int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence)
 }
 
 #ifdef __DO_LARGEFILE
-libc_hidden_proto(fseeko64)
 libc_hidden_def(fseeko64)
 #else
-libc_hidden_proto(fseek)
 libc_hidden_def(fseek)
 strong_alias(fseek,fseeko)
 #endif
diff --git a/libc/stdio/ftello.c b/libc/stdio/ftello.c
index 0a3a53856..2b9da8a6b 100644
--- a/libc/stdio/ftello.c
+++ b/libc/stdio/ftello.c
@@ -7,9 +7,8 @@
 
 #include "_stdio.h"
 
-#if defined(__UCLIBC_HAS_LFS__) && !defined(__DO_LARGEFILE)
 libc_hidden_proto(ftello64)
-#endif
+libc_hidden_proto(ftell)
 
 #ifndef __DO_LARGEFILE
 # define FTELL         ftell
@@ -51,10 +50,8 @@ OFFSET_TYPE FTELL(register FILE *stream)
 }
 
 #ifdef __DO_LARGEFILE
-libc_hidden_proto(ftello64)
 libc_hidden_def(ftello64)
 #else
-libc_hidden_proto(ftell)
 libc_hidden_def(ftell)
 strong_alias(ftell,ftello)
 #endif
diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c
index 106ee5db6..85ca6050e 100644
--- a/libc/stdio/fwrite.c
+++ b/libc/stdio/fwrite.c
@@ -45,6 +45,7 @@ libc_hidden_def(fwrite)
 
 #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)
 {
@@ -59,7 +60,6 @@ size_t fwrite(const void * __restrict ptr, size_t size,
 
 	return retval;
 }
-libc_hidden_proto(fwrite)
 libc_hidden_def(fwrite)
 
 #endif
diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
index 7c769dd63..a00cc1e6f 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -7,6 +7,8 @@
 
 #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). */
@@ -75,5 +77,4 @@ ssize_t getdelim(char **__restrict lineptr, size_t *__restrict n,
 
 	return pos;
 }
-libc_hidden_proto(getdelim)
 libc_hidden_def(getdelim)
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
index 0426d37f5..aef3de944 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -7,6 +7,8 @@
 
 #include "_stdio.h"
 
+libc_hidden_proto(getline)
+
 libc_hidden_proto(getdelim)
 
 ssize_t getline(char **__restrict lineptr, size_t *__restrict n,
@@ -14,5 +16,4 @@ ssize_t getline(char **__restrict lineptr, size_t *__restrict n,
 {
 	return getdelim(lineptr, n, '\n', stream);
 }
-libc_hidden_proto(getline)
 libc_hidden_def(getline)
diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c
index fd0c74c48..5ba09ea7c 100644
--- a/libc/stdio/open_memstream.c
+++ b/libc/stdio/open_memstream.c
@@ -128,6 +128,7 @@ 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;
@@ -164,5 +165,4 @@ FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc)
 
 	return NULL;
 }
-libc_hidden_proto(open_memstream)
 libc_hidden_def(open_memstream)
diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c
index f10667cbf..993fcf428 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -14,6 +14,7 @@ libc_hidden_proto(__glibc_strerror_r)
 #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
@@ -37,5 +38,4 @@ void perror(register const char *s)
 	}
 #endif
 }
-libc_hidden_proto(perror)
 libc_hidden_def(perror)
diff --git a/libc/stdio/printf.c b/libc/stdio/printf.c
index 8c547878e..617561fec 100644
--- a/libc/stdio/printf.c
+++ b/libc/stdio/printf.c
@@ -10,6 +10,7 @@
 
 libc_hidden_proto(vfprintf)
 
+libc_hidden_proto(printf)
 int printf(const char * __restrict format, ...)
 {
 	va_list arg;
@@ -21,5 +22,4 @@ int printf(const char * __restrict format, ...)
 
 	return rv;
 }
-libc_hidden_proto(printf)
 libc_hidden_def(printf)
diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c
index ad9974dff..04ab12edb 100644
--- a/libc/stdio/remove.c
+++ b/libc/stdio/remove.c
@@ -19,6 +19,7 @@ libc_hidden_proto(unlink)
  *   equivalent to rmdir(path). 
  */
 
+libc_hidden_proto(remove)
 int remove(register const char *filename)
 {
 	int saved_errno = errno;
@@ -30,5 +31,4 @@ int remove(register const char *filename)
 	}
 	return rv;
 }
-libc_hidden_proto(remove)
 libc_hidden_def(remove)
diff --git a/libc/stdio/rewind.c b/libc/stdio/rewind.c
index 713b76ec8..e04d7a086 100644
--- a/libc/stdio/rewind.c
+++ b/libc/stdio/rewind.c
@@ -9,6 +9,7 @@
 
 libc_hidden_proto(fseek)
 
+libc_hidden_proto(rewind)
 void rewind(register FILE *stream)
 {
 	__STDIO_AUTO_THREADLOCK_VAR;
@@ -20,5 +21,4 @@ void rewind(register FILE *stream)
 
 	__STDIO_AUTO_THREADUNLOCK(stream);
 }
-libc_hidden_proto(rewind)
 libc_hidden_def(rewind)
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c
index 8def91c6b..0062d3c16 100644
--- a/libc/stdio/scanf.c
+++ b/libc/stdio/scanf.c
@@ -160,6 +160,7 @@ _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;
@@ -171,7 +172,6 @@ int fscanf(FILE * __restrict stream, const char * __restrict format, ...)
 
 	return rv;
 }
-libc_hidden_proto(fscanf)
 libc_hidden_def(fscanf)
 
 #endif
@@ -196,6 +196,7 @@ 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;
@@ -207,7 +208,6 @@ int sscanf(const char * __restrict str, const char * __restrict format, ...)
 
 	return rv;
 }
-libc_hidden_proto(sscanf)
 libc_hidden_def(sscanf)
 
 #else  /* __STDIO_HAS_VSSCANF */
@@ -218,11 +218,11 @@ 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);
 }
-libc_hidden_proto(vscanf)
 libc_hidden_def(vscanf)
 
 #endif
diff --git a/libc/stdio/setvbuf.c b/libc/stdio/setvbuf.c
index 2ac258492..c1566504a 100644
--- a/libc/stdio/setvbuf.c
+++ b/libc/stdio/setvbuf.c
@@ -14,6 +14,7 @@
 #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)
 {
@@ -104,5 +105,4 @@ int setvbuf(register FILE * __restrict stream, register char * __restrict buf,
 
 #endif
 }
-libc_hidden_proto(setvbuf)
 libc_hidden_def(setvbuf)
diff --git a/libc/stdio/snprintf.c b/libc/stdio/snprintf.c
index 9cfe812ca..ef9c69215 100644
--- a/libc/stdio/snprintf.c
+++ b/libc/stdio/snprintf.c
@@ -14,6 +14,7 @@
 
 libc_hidden_proto(vsnprintf)
 
+libc_hidden_proto(snprintf)
 int snprintf(char *__restrict buf, size_t size,
 			 const char * __restrict format, ...)
 {
@@ -25,7 +26,6 @@ int snprintf(char *__restrict buf, size_t size,
 	va_end(arg);
 	return rv;
 }
-libc_hidden_proto(snprintf)
 libc_hidden_def(snprintf)
 
 #endif
diff --git a/libc/stdio/sprintf.c b/libc/stdio/sprintf.c
index bbda86bee..360245366 100644
--- a/libc/stdio/sprintf.c
+++ b/libc/stdio/sprintf.c
@@ -14,6 +14,7 @@
 
 libc_hidden_proto(vsnprintf)
 
+libc_hidden_proto(sprintf)
 int sprintf(char *__restrict buf, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -25,7 +26,6 @@ int sprintf(char *__restrict buf, const char * __restrict format, ...)
 
 	return rv;
 }
-libc_hidden_proto(sprintf)
 libc_hidden_def(sprintf)
 
 #endif
diff --git a/libc/stdio/ungetc.c b/libc/stdio/ungetc.c
index 5e7db7daa..d900928b2 100644
--- a/libc/stdio/ungetc.c
+++ b/libc/stdio/ungetc.c
@@ -24,6 +24,7 @@
  *     (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;
@@ -75,5 +76,4 @@ int ungetc(int c, register FILE *stream)
 
 	return c;
 }
-libc_hidden_proto(ungetc)
 libc_hidden_def(ungetc)
diff --git a/libc/stdio/ungetwc.c b/libc/stdio/ungetwc.c
index 082f81bd9..579022240 100644
--- a/libc/stdio/ungetwc.c
+++ b/libc/stdio/ungetwc.c
@@ -12,6 +12,7 @@
  * 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;
@@ -46,5 +47,4 @@ wint_t ungetwc(wint_t c, register FILE *stream)
 
 	return c;
 }
-libc_hidden_proto(ungetwc)
 libc_hidden_def(ungetwc)
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index 1c184583b..f355b227f 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -27,6 +27,7 @@ libc_hidden_proto(vfprintf)
 libc_hidden_proto(vsnprintf)
 #endif
 
+libc_hidden_proto(vasprintf)
 int vasprintf(char **__restrict buf, const char * __restrict format,
 			 va_list arg)
 {
@@ -81,7 +82,6 @@ int vasprintf(char **__restrict buf, const char * __restrict format,
 
 #endif /* __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ */
 }
-libc_hidden_proto(vasprintf)
 libc_hidden_def(vasprintf)
 
 #endif
diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c
index f36987477..34aa47697 100644
--- a/libc/stdio/vdprintf.c
+++ b/libc/stdio/vdprintf.c
@@ -11,6 +11,7 @@
 libc_hidden_proto(vfprintf)
 libc_hidden_proto(fflush_unlocked)
 
+libc_hidden_proto(vdprintf)
 int vdprintf(int filedes, const char * __restrict format, va_list arg)
 {
 	FILE f;
@@ -63,5 +64,4 @@ int vdprintf(int filedes, const char * __restrict format, va_list arg)
 
 	return rv;
 }
-libc_hidden_proto(vdprintf)
 libc_hidden_def(vdprintf)
diff --git a/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c
index f0b402b85..f02eae02b 100644
--- a/libc/stdio/vfprintf.c
+++ b/libc/stdio/vfprintf.c
@@ -1855,6 +1855,7 @@ static int _do_one_spec(FILE * __restrict stream,
 
 libc_hidden_proto(fprintf)
 
+libc_hidden_proto(VFPRINTF)
 int VFPRINTF (FILE * __restrict stream,
 			  register const FMT_TYPE * __restrict format,
 			  va_list arg)
@@ -1932,7 +1933,6 @@ int VFPRINTF (FILE * __restrict stream,
 
 	return count;
 }
-libc_hidden_proto(VFPRINTF)
 libc_hidden_def(VFPRINTF)
 #endif
 /**********************************************************************/
diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c
index dc8cfe036..84215eb86 100644
--- a/libc/stdio/vsnprintf.c
+++ b/libc/stdio/vsnprintf.c
@@ -8,6 +8,8 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
+libc_hidden_proto(vsnprintf)
+
 libc_hidden_proto(vfprintf)
 
 #ifdef __UCLIBC_MJN3_ONLY__
@@ -68,7 +70,6 @@ int vsnprintf(char *__restrict buf, size_t size,
 	}
 	return rv;
 }
-libc_hidden_proto(vsnprintf)
 libc_hidden_def(vsnprintf)
 
 #elif defined(__USE_OLD_VFPRINTF__)
@@ -126,7 +127,6 @@ int vsnprintf(char *__restrict buf, size_t size,
 	}
 	return rv;
 }
-libc_hidden_proto(vsnprintf)
 libc_hidden_def(vsnprintf)
 
 #elif defined(__UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__)
@@ -207,7 +207,6 @@ int vsnprintf(char *__restrict buf, size_t size,
 
 	return rv;
 }
-libc_hidden_proto(vsnprintf)
 libc_hidden_def(vsnprintf)
 
 #else
diff --git a/libc/stdio/vswprintf.c b/libc/stdio/vswprintf.c
index d806c5432..d09e08ac9 100644
--- a/libc/stdio/vswprintf.c
+++ b/libc/stdio/vswprintf.c
@@ -9,6 +9,8 @@
 #include <stdarg.h>
 #include <wchar.h>
 
+libc_hidden_proto(vswprintf)
+
 libc_hidden_proto(vfwprintf)
 
 #ifndef __STDIO_BUFFERS
@@ -68,7 +70,6 @@ int vswprintf(wchar_t *__restrict buf, size_t size,
 	}
 	return rv;
 }
-libc_hidden_proto(vswprintf)
 libc_hidden_def(vswprintf)
 
 #endif /* __STDIO_BUFFERS */