Index: uspace/srv/bd/ata_bd/ata_bd.c
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/bd/ata_bd/ata_bd.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -56,5 +56,5 @@
 #include <as.h>
 #include <fibril_synch.h>
-#include <string.h>
+#include <str.h>
 #include <devmap.h>
 #include <sys/types.h>
Index: uspace/srv/bd/ata_bd/ata_bd.h
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.h	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/bd/ata_bd/ata_bd.h	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <sys/types.h>
 #include <fibril_synch.h>
-#include <string.h>
+#include <str.h>
 
 enum {
Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/devmap/devmap.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -44,5 +44,5 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ipc/devmap.h>
 
Index: uspace/srv/fs/devfs/devfs_ops.c
===================================================================
--- uspace/srv/fs/devfs/devfs_ops.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/fs/devfs/devfs_ops.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <errno.h>
 #include <malloc.h>
-#include <string.h>
+#include <str.h>
 #include <libfs.h>
 #include <fibril_synch.h>
Index: uspace/srv/fs/fat/fat_dentry.c
===================================================================
--- uspace/srv/fs/fat/fat_dentry.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/fs/fat/fat_dentry.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include "fat_dentry.h"
 #include <ctype.h>
-#include <string.h>
+#include <str.h>
 
 static bool is_d_char(const char ch)
Index: uspace/srv/fs/fat/fat_idx.c
===================================================================
--- uspace/srv/fs/fat/fat_idx.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/fs/fat/fat_idx.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -39,5 +39,5 @@
 #include "../../vfs/vfs.h"
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/fs/fat/fat_ops.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -48,5 +48,5 @@
 #include <async.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 #include <byteorder.h>
 #include <adt/hash_table.h>
Index: uspace/srv/fs/tmpfs/tmpfs_dump.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <sys/types.h>
 #include <as.h>
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -46,5 +46,5 @@
 #include <atomic.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <stdio.h>
 #include <assert.h>
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/hid/console/console.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -47,5 +47,5 @@
 #include <sys/mman.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <sysinfo.h>
 #include <event.h>
Index: uspace/srv/hid/console/gcons.c
===================================================================
--- uspace/srv/hid/console/gcons.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/hid/console/gcons.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <stdio.h>
 #include <sys/mman.h>
-#include <string.h>
+#include <str.h>
 #include <align.h>
 #include <bool.h>
Index: uspace/srv/hid/fb/fb.c
===================================================================
--- uspace/srv/hid/fb/fb.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/hid/fb/fb.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <ddi.h>
 #include <sysinfo.h>
Index: uspace/srv/hid/fb/serial_console.c
===================================================================
--- uspace/srv/hid/fb/serial_console.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/hid/fb/serial_console.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -46,5 +46,5 @@
 #include <io/color.h>
 #include <io/style.h>
-#include <string.h>
+#include <str.h>
 
 #include "../console/screenbuffer.h"
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/loader/main.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -58,5 +58,5 @@
 #include <errno.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 #include <as.h>
 
Index: uspace/srv/net/app/echo/echo.c
===================================================================
--- uspace/srv/net/app/echo/echo.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/app/echo/echo.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <malloc.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <task.h>
 
Index: uspace/srv/net/app/nettest1/nettest1.c
===================================================================
--- uspace/srv/net/app/nettest1/nettest1.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/app/nettest1/nettest1.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -37,5 +37,5 @@
 #include <malloc.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <task.h>
 #include <time.h>
Index: uspace/srv/net/app/nettest2/nettest2.c
===================================================================
--- uspace/srv/net/app/nettest2/nettest2.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/app/nettest2/nettest2.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -37,5 +37,5 @@
 #include <malloc.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <task.h>
 #include <time.h>
Index: uspace/srv/net/app/parse.c
===================================================================
--- uspace/srv/net/app/parse.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/app/parse.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -36,5 +36,5 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include "../include/socket.h"
Index: uspace/srv/net/app/ping/ping.c
===================================================================
--- uspace/srv/net/app/ping/ping.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/app/ping/ping.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -36,5 +36,5 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <task.h>
 #include <time.h>
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/il/arp/arp.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <fibril_synch.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <task.h>
 
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/il/ip/ip.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -40,5 +40,5 @@
 #include <fibril_synch.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/inet.c
===================================================================
--- uspace/srv/net/inet.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/inet.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <mem.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include "include/in.h"
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/net/net.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <malloc.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/net/net_bundle.c
===================================================================
--- uspace/srv/net/net/net_bundle.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/net/net_bundle.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -36,5 +36,5 @@
  */
 
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/net/net_standalone.c
===================================================================
--- uspace/srv/net/net/net_standalone.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/net/net_standalone.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -35,5 +35,5 @@
  */
 
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/netif/lo/lo.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/nil/eth/eth.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -40,5 +40,5 @@
 #include <mem.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -40,5 +40,5 @@
 #include <mem.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <fibril_synch.h>
 #include <stdint.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/vfs/vfs.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -42,5 +42,5 @@
 #include <stdio.h>
 #include <bool.h>
-#include <string.h>
+#include <str.h>
 #include <as.h>
 #include <atomic.h>
Index: uspace/srv/vfs/vfs_file.c
===================================================================
--- uspace/srv/vfs/vfs_file.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/vfs/vfs_file.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <assert.h>
 #include <bool.h>
Index: uspace/srv/vfs/vfs_lookup.c
===================================================================
--- uspace/srv/vfs/vfs_lookup.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/vfs/vfs_lookup.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -41,5 +41,5 @@
 #include <async.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 #include <stdarg.h>
 #include <bool.h>
Index: uspace/srv/vfs/vfs_node.c
===================================================================
--- uspace/srv/vfs/vfs_node.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/vfs/vfs_node.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include "vfs.h"
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <fibril_synch.h>
 #include <adt/hash_table.h>
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/vfs/vfs_ops.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -44,5 +44,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <bool.h>
 #include <fibril_synch.h>
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/srv/vfs/vfs_register.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -43,5 +43,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <bool.h>