Index: uspace/lib/posix/include/posix/string.h
===================================================================
--- uspace/lib/posix/include/posix/string.h	(revision 8a5a902af34592bce127314cf2fc188c642817f3)
+++ uspace/lib/posix/include/posix/string.h	(revision 45f7449e0a82becbb9eb64d8afe4237b1bb85912)
@@ -60,19 +60,14 @@
  * forward declarations ought to be enough.
  */
-
 /* From str.h. */
-
-extern char *strtok_r(char *, const char *, char **);
-extern char *strtok(char *, const char *);
+extern char * strtok_r(char *, const char *, char **);
+extern char * strtok(char *, const char *);
 
 /* From mem.h */
+#define bzero(ptr, len)  memset((ptr), 0, (len))
+extern void *memset(void *, int, size_t);
+extern void *memcpy(void *, const void *, size_t);
+extern void *memmove(void *, const void *, size_t);
 
-#define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-
-#define bzero(ptr, len)  memset((ptr), 0, (len))
-
-extern void *memmove(void *, const void *, size_t);
-extern int bcmp(const void *, const void *, size_t);
 
 /* Copying and Concatenation */