diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk
index 19c14023a..ada5d6987 100644
--- a/libc/arch-x86/x86.mk
+++ b/libc/arch-x86/x86.mk
@@ -72,7 +72,7 @@ _LIBC_ARCH_COMMON_SRC_FILES += \
 	arch-x86/string/bzero.S \
 	bionic/memrchr.c \
 	bionic/memchr.c \
-	string/strchr.cpp \
+	bionic/strchr.cpp \
 	string/strrchr.c \
 	string/index.c \
 	bionic/strnlen.c \
diff --git a/libc/include/string.h b/libc/include/string.h
index f6b4acf86..10ff72230 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -46,6 +46,8 @@ extern void   memswap(void *, void *, size_t);
 
 extern char*  index(const char *, int) __purefunc;
 extern char*  strchr(const char *, int) __purefunc;
+extern char* __strchr_chk(const char *, int, size_t);
+
 extern char*  strrchr(const char *, int) __purefunc;
 
 extern size_t strlen(const char *) __purefunc;
@@ -238,8 +240,6 @@ size_t strlen(const char *s) {
     return __strlen_chk(s, bos);
 }
 
-extern char* __strchr_chk(const char *, int, size_t);
-
 __BIONIC_FORTIFY_INLINE
 char* strchr(const char *s, int c) {
     size_t bos = __bos(s);