Index: boot/generic/include/memstr.h
===================================================================
--- boot/generic/include/memstr.h	(revision 1715b7feb70e6c6d6bf5f4c8cb293a7bf73f8247)
+++ boot/generic/include/memstr.h	(revision 0ca441cd372e38bab04fe49abcfe22ead9b21afc)
@@ -35,6 +35,4 @@
 #include <typedefs.h>
 
-extern void *memcpy(void *, const void *, size_t);
-extern void *memset(void *, int, size_t);
 extern void *memmove(void *, const void *, size_t);