5 files changed, 8 insertions, 1 deletions
diff --git a/libc/stdio/_fwrite.c b/libc/stdio/_fwrite.c
index d9d0bc2a8..6657b0849 100644
--- a/libc/stdio/_fwrite.c
+++ b/libc/stdio/_fwrite.c
@@ -5,6 +5,9 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define memrchr __memrchr
+#define memchr __memchr
+
 #include "_stdio.h"
 
 #ifdef __STDIO_BUFFERS
diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h
index acc6068c7..e5d3c0787 100644
--- a/libc/stdio/_stdio.h
+++ b/libc/stdio/_stdio.h
@@ -7,6 +7,7 @@
 
 #define _GNU_SOURCE
 
+#include <features.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -17,7 +18,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <features.h>
 
 #ifdef __UCLIBC_HAS_WCHAR__
 #include <wchar.h>
diff --git a/libc/stdio/_wfwrite.c b/libc/stdio/_wfwrite.c
index 0febbf45a..792cff604 100644
--- a/libc/stdio/_wfwrite.c
+++ b/libc/stdio/_wfwrite.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define wmemcpy __wmemcpy
+
 #include "_stdio.h"
 #include <wchar.h>
 
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index 36e4d89b9..97049d379 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -128,6 +128,7 @@
 /**************************************************************************/
 
 #define _uintmaxtostr __libc__uintmaxtostr
+#define strnlen __strnlen
 
 #define _ISOC99_SOURCE			/* for ULLONG primarily... */
 #define _GNU_SOURCE				/* for strnlen */
diff --git a/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c
index 5f13a8eed..2adcefde5 100644
--- a/libc/stdio/vfprintf.c
+++ b/libc/stdio/vfprintf.c
@@ -89,6 +89,7 @@
  */
 
 #define _uintmaxtostr __libc__uintmaxtostr
+#define strnlen __strnlen
 
 #define _ISOC99_SOURCE			/* for ULLONG primarily... */
 #define _GNU_SOURCE