Index: uspace/lib/posix/include/posix/string.h
===================================================================
--- uspace/lib/posix/include/posix/string.h	(revision 3e6a98c595287c43d200d28d97f57755342be117)
+++ uspace/lib/posix/include/posix/string.h	(revision 0ca441cd372e38bab04fe49abcfe22ead9b21afc)
@@ -60,14 +60,19 @@
  * 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 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 *memset(void *, int, size_t);
-extern void *memcpy(void *, const void *, size_t);
+
 extern void *memmove(void *, const void *, size_t);
-
+extern int bcmp(const void *, const void *, size_t);
 
 /* Copying and Concatenation */