Index: uspace/app/bdsh/cmds/builtin_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/builtin_cmds.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/builtin_cmds.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -34,5 +34,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"
Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -32,5 +32,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 
Index: uspace/app/bdsh/cmds/mod_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/mod_cmds.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/mod_cmds.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -47,5 +47,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"
Index: uspace/app/bdsh/cmds/modules/bdd/bdd.c
===================================================================
--- uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -29,5 +29,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -33,5 +33,5 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -33,5 +33,5 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -31,5 +31,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -40,5 +40,5 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <str.h>
 
 #include "errors.h"
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -38,5 +38,5 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -38,5 +38,5 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -36,5 +36,5 @@
 #include <getopt.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -38,5 +38,5 @@
 #include <dirent.h>
 #include <sys/types.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/errors.c
===================================================================
--- uspace/app/bdsh/errors.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/errors.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -30,5 +30,5 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <unistd.h>
Index: uspace/app/bdsh/exec.c
===================================================================
--- uspace/app/bdsh/exec.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/exec.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -38,5 +38,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
Index: uspace/app/bdsh/input.c
===================================================================
--- uspace/app/bdsh/input.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/input.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -32,5 +32,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>
Index: uspace/app/bdsh/scli.c
===================================================================
--- uspace/app/bdsh/scli.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/scli.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -31,5 +31,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include "config.h"
Index: uspace/app/bdsh/util.c
===================================================================
--- uspace/app/bdsh/util.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/bdsh/util.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -29,5 +29,5 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <stdarg.h>
 #include <stdlib.h>
Index: uspace/app/edit/sheet.c
===================================================================
--- uspace/app/edit/sheet.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/edit/sheet.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -50,5 +50,5 @@
 
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <adt/list.h>
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/init/init.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -46,5 +46,5 @@
 #include <malloc.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <devmap.h>
 #include "init.h"
Index: uspace/app/redir/redir.c
===================================================================
--- uspace/app/redir/redir.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/redir/redir.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -39,5 +39,5 @@
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <stdio.h>
 #include <task.h>
Index: uspace/app/tester/tester.c
===================================================================
--- uspace/app/tester/tester.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tester/tester.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -38,5 +38,5 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include "tester.h"
 
Index: uspace/app/tester/vfs/vfs1.c
===================================================================
--- uspace/app/tester/vfs/vfs1.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tester/vfs/vfs1.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -30,5 +30,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <vfs/vfs.h>
 #include <unistd.h>
Index: uspace/app/tetris/input.c
===================================================================
--- uspace/app/tetris/input.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tetris/input.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -52,5 +52,5 @@
 #include <errno.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 
 #include "input.h"
Index: uspace/app/tetris/scores.c
===================================================================
--- uspace/app/tetris/scores.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tetris/scores.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -52,5 +52,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <io/console.h>
 #include <io/keycode.h>
Index: uspace/app/tetris/scores.h
===================================================================
--- uspace/app/tetris/scores.h	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tetris/scores.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -48,5 +48,5 @@
 
 #include <sys/time.h>
-#include <string.h>
+#include <str.h>
 
 #define MAXLOGNAME   16
Index: uspace/app/tetris/screen.c
===================================================================
--- uspace/app/tetris/screen.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tetris/screen.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -49,5 +49,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <vfs/vfs.h>
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/tetris/tetris.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -53,5 +53,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <unistd.h>
 #include <getopt.h>
Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ uspace/app/trace/trace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
@@ -43,5 +43,5 @@
 #include <task.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 #include <bool.h>
 #include <loader/loader.h>