diff --git a/pbl/string.c b/pbl/string.c
index 6787e82..b773f5c 100644
--- a/pbl/string.c
+++ b/pbl/string.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/string.h>
 
 void *memcpy(void *__dest, __const void *__src, size_t __n)
 {
@@ -103,7 +104,7 @@
 	return NULL;
 }
 
-char *strchr(const char *s, int c)
+char *_strchr(const char *s, int c)
 {
 	while (*s != (char)c)
 		if (*s++ == '\0')
@@ -111,8 +112,6 @@
 	return (char *)s;
 }
 
-#undef memset
-
 void *memset(void *s, int c, size_t count)
 {
 	char *xs = s;
@@ -120,8 +119,3 @@
 		*xs++ = c;
 	return s;
 }
-
-void __memzero(void *s, size_t count)
-{
-	memset(s, 0, count);
-}