Index: kernel/arch/abs32le/include/memstr.h
===================================================================
--- kernel/arch/abs32le/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/abs32le/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -36,10 +36,7 @@
 #define KERN_abs32le_MEMSTR_H_
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
-
-extern int memcmp(const void *, const void *, size_t);
+#define memcpy(dst, src, cnt)   _memcpy((dst), (src), (cnt))
+#define memsetb(dst, cnt, val)  _memsetb((dst), (cnt), (val))
+#define memsetw(dst, cnt, val)  _memsetw((dst), (cnt), (val))
 
 #endif
Index: kernel/arch/amd64/include/memstr.h
===================================================================
--- kernel/arch/amd64/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/amd64/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup amd64	
+/** @addtogroup amd64
  * @{
  */
@@ -38,8 +38,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif
Index: kernel/arch/arm32/include/memstr.h
===================================================================
--- kernel/arch/arm32/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/arm32/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup arm32	
+/** @addtogroup arm32
  * @{
  */
@@ -39,8 +39,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif
Index: kernel/arch/ia32/include/memstr.h
===================================================================
--- kernel/arch/ia32/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/ia32/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32	
+/** @addtogroup ia32
  * @{
  */
@@ -38,8 +38,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif
Index: kernel/arch/ia64/include/memstr.h
===================================================================
--- kernel/arch/ia64/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/ia64/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64	
+/** @addtogroup ia64
  * @{
  */
@@ -38,8 +38,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif
Index: kernel/arch/mips32/include/memstr.h
===================================================================
--- kernel/arch/mips32/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/mips32/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup mips32	
+/** @addtogroup mips32
  * @{
  */
@@ -38,8 +38,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif
Index: kernel/arch/ppc32/include/memstr.h
===================================================================
--- kernel/arch/ppc32/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/ppc32/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ppc32	
+/** @addtogroup ppc32
  * @{
  */
@@ -38,8 +38,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif
Index: kernel/arch/sparc64/include/memstr.h
===================================================================
--- kernel/arch/sparc64/include/memstr.h	(revision b473611ceac30d2844afddbecf5c2cd999470cdf)
+++ kernel/arch/sparc64/include/memstr.h	(revision dabdd1aaada964f4510bd352506e4f47c078c88d)
@@ -38,8 +38,6 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif