Index: uspace/app/bdsh/cmds/builtins/batch/batch.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -32,4 +32,5 @@
 #include <stddef.h>
 #include <errno.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/mount/mount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <getopt.h>
 #include <inttypes.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -31,4 +31,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/compl.c
===================================================================
--- uspace/app/bdsh/compl.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/bdsh/compl.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -34,4 +34,5 @@
 #include <stdlib.h>
 #include <vfs/vfs.h>
+#include <str.h>
 
 #include "cmds/cmds.h"
Index: uspace/app/blkdump/blkdump.c
===================================================================
--- uspace/app/blkdump/blkdump.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/blkdump/blkdump.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -49,4 +49,5 @@
 #include <inttypes.h>
 #include <errno.h>
+#include <str.h>
 
 #define NAME	"blkdump"
Index: uspace/app/bnchmark/bnchmark.c
===================================================================
--- uspace/app/bnchmark/bnchmark.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/bnchmark/bnchmark.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -49,4 +49,5 @@
 #include <time.h>
 #include <dirent.h>
+#include <str.h>
 
 #define NAME	"bnchmark"
Index: uspace/app/corecfg/corecfg.c
===================================================================
--- uspace/app/corecfg/corecfg.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/corecfg/corecfg.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -36,4 +36,5 @@
 #include <errno.h>
 #include <stdio.h>
+#include <str.h>
 
 #define NAME "corecfg"
Index: uspace/app/date/date.c
===================================================================
--- uspace/app/date/date.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/date/date.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -36,4 +36,5 @@
 #include <getopt.h>
 #include <ctype.h>
+#include <str.h>
 
 #define NAME   "date"
Index: uspace/app/devctl/devctl.c
===================================================================
--- uspace/app/devctl/devctl.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/devctl/devctl.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -39,4 +39,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/app/dltest/dltest.c
===================================================================
--- uspace/app/dltest/dltest.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/dltest/dltest.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -41,4 +41,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 /** libdltest library handle */
Index: uspace/app/dnscfg/dnscfg.c
===================================================================
--- uspace/app/dnscfg/dnscfg.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/dnscfg/dnscfg.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -43,4 +43,5 @@
 #include <stdlib.h>
 #include <stdint.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/app/dnsres/dnsres.c
===================================================================
--- uspace/app/dnsres/dnsres.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/dnsres/dnsres.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -38,4 +38,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 #define NAME  "dnsres"
Index: uspace/app/fdisk/fdisk.c
===================================================================
--- uspace/app/fdisk/fdisk.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/fdisk/fdisk.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <stdlib.h>
 #include <fdisk.h>
+#include <str.h>
 
 #define NO_LABEL_CAPTION "(No name)"
Index: uspace/app/getterm/getterm.c
===================================================================
--- uspace/app/getterm/getterm.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/getterm/getterm.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <loc.h>
 #include <vfs/vfs.h>
+#include <str.h>
 #include "version.h"
 #include "welcome.h"
Index: uspace/app/inet/inet.c
===================================================================
--- uspace/app/inet/inet.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/inet/inet.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -43,4 +43,5 @@
 #include <stdlib.h>
 #include <stdint.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/app/kill/kill.c
===================================================================
--- uspace/app/kill/kill.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/kill/kill.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <stdio.h>
 #include <task.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/app/killall/killall.c
===================================================================
--- uspace/app/killall/killall.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/killall/killall.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -40,4 +40,5 @@
 #include <str_error.h>
 #include <stdlib.h>
+#include <str.h>
 
 #define NAME  "killall"
Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/mkfat/mkfat.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -48,4 +48,5 @@
 #include <inttypes.h>
 #include <errno.h>
+#include <str.h>
 #include "fat.h"
 #include "fat_dentry.h"
Index: uspace/app/netecho/comm.c
===================================================================
--- uspace/app/netecho/comm.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/netecho/comm.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -44,4 +44,5 @@
 #include <stdlib.h>
 #include <stdint.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/app/nic/nic.c
===================================================================
--- uspace/app/nic/nic.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/nic/nic.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -40,4 +40,5 @@
 #include <stdlib.h>
 #include <stddef.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/app/nterm/nterm.c
===================================================================
--- uspace/app/nterm/nterm.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/nterm/nterm.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <io/console.h>
 #include <stdio.h>
+#include <str.h>
 
 #include "conn.h"
Index: uspace/app/pkg/pkg.c
===================================================================
--- uspace/app/pkg/pkg.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/pkg/pkg.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -39,4 +39,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <str_error.h>
 #include <task.h>
Index: uspace/app/rcubench/rcubench.c
===================================================================
--- uspace/app/rcubench/rcubench.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/rcubench/rcubench.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -47,4 +47,5 @@
 #include <compiler/barrier.h>
 #include <futex.h>
+#include <str.h>
 
 #include <rcu.h>
Index: uspace/app/rcutest/rcutest.c
===================================================================
--- uspace/app/rcutest/rcutest.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/rcutest/rcutest.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -48,4 +48,5 @@
 #include <compiler/barrier.h>
 #include <futex.h>
+#include <str.h>
 
 #include <rcu.h>
Index: uspace/app/sportdmp/sportdmp.c
===================================================================
--- uspace/app/sportdmp/sportdmp.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/sportdmp/sportdmp.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -33,4 +33,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 #define BUF_SIZE 1
Index: uspace/app/sysinfo/sysinfo.c
===================================================================
--- uspace/app/sysinfo/sysinfo.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/sysinfo/sysinfo.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -40,4 +40,5 @@
 #include <sysinfo.h>
 #include <stdlib.h>
+#include <str.h>
 
 static void dump_bytes_hex(char *data, size_t size)
Index: uspace/app/sysinst/sysinst.c
===================================================================
--- uspace/app/sysinst/sysinst.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/sysinst/sysinst.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -47,4 +47,5 @@
 #include <task.h>
 #include <vfs/vfs.h>
+#include <str.h>
 
 #include "futil.h"
Index: uspace/app/taskdump/elf_core.c
===================================================================
--- uspace/app/taskdump/elf_core.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/taskdump/elf_core.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -62,4 +62,5 @@
 #include <libarch/istate.h>
 #include <vfs/vfs.h>
+#include <str.h>
 
 #include "elf_core.h"
Index: uspace/app/taskdump/symtab.c
===================================================================
--- uspace/app/taskdump/symtab.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/taskdump/symtab.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -41,4 +41,5 @@
 #include <stddef.h>
 #include <errno.h>
+#include <str.h>
 #include <str_error.h>
 #include <vfs/vfs.h>
Index: uspace/app/taskdump/taskdump.c
===================================================================
--- uspace/app/taskdump/taskdump.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/taskdump/taskdump.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -48,4 +48,5 @@
 #include <macros.h>
 #include <assert.h>
+#include <str.h>
 
 #include <symtab.h>
Index: uspace/app/testread/testread.c
===================================================================
--- uspace/app/testread/testread.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/testread/testread.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -58,4 +58,5 @@
 #include <time.h>
 #include <offset.h>
+#include <str.h>
 
 #define NAME	"testread"
Index: uspace/app/testwrit/testwrit.c
===================================================================
--- uspace/app/testwrit/testwrit.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/testwrit/testwrit.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -33,4 +33,5 @@
 #include <stdio.h>
 #include <stddef.h>
+#include <str.h>
 
 #define BUF_SIZE  1024
Index: uspace/app/top/screen.c
===================================================================
--- uspace/app/top/screen.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/top/screen.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -45,4 +45,5 @@
 #include <inttypes.h>
 #include <macros.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"
Index: uspace/app/top/top.c
===================================================================
--- uspace/app/top/top.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/top/top.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -43,4 +43,5 @@
 #include <errno.h>
 #include <gsort.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"
Index: uspace/app/usbinfo/list.c
===================================================================
--- uspace/app/usbinfo/list.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/usbinfo/list.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -45,4 +45,5 @@
 #include <loc.h>
 #include <usb_iface.h>
+#include <str.h>
 
 #include "usbinfo.h"
Index: uspace/app/viewer/viewer.c
===================================================================
--- uspace/app/viewer/viewer.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/viewer/viewer.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -44,4 +44,5 @@
 #include <codec/tga.h>
 #include <task.h>
+#include <str.h>
 
 #define NAME  "viewer"
Index: uspace/app/wavplay/drec.c
===================================================================
--- uspace/app/wavplay/drec.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/wavplay/drec.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <as.h>
 #include <inttypes.h>
+#include <str.h>
 
 #include "wave.h"
Index: uspace/app/wifi_supplicant/wifi_supplicant.c
===================================================================
--- uspace/app/wifi_supplicant/wifi_supplicant.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/app/wifi_supplicant/wifi_supplicant.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -41,4 +41,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <str_error.h>
 #include <loc.h>
Index: uspace/drv/bus/usb/vhc/hub/virthub.c
===================================================================
--- uspace/drv/bus/usb/vhc/hub/virthub.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/drv/bus/usb/vhc/hub/virthub.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <ddf/driver.h>
 
Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/drv/test/test1/test1.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <str.h>
 
 #include "test1.h"
Index: uspace/drv/test/test2/test2.c
===================================================================
--- uspace/drv/test/test2/test2.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/drv/test/test2/test2.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -34,4 +34,5 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str.h>
 #include <str_error.h>
 #include <ddf/driver.h>
Index: uspace/lib/bithenge/include/bithenge/tree.h
===================================================================
--- uspace/lib/bithenge/include/bithenge/tree.h	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/bithenge/include/bithenge/tree.h	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -39,4 +39,5 @@
 
 #include <assert.h>
+#include <stdbool.h>
 #include "os.h"
 
Index: uspace/lib/c/arch/ia32/src/rtld/reloc.c
===================================================================
--- uspace/lib/c/arch/ia32/src/rtld/reloc.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/arch/ia32/src/rtld/reloc.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -38,4 +38,5 @@
 #include <stdlib.h>
 #include <inttypes.h>
+#include <str.h>
 
 #include <libarch/rtld/elf_dyn.h>
Index: uspace/lib/c/generic/inet/addr.c
===================================================================
--- uspace/lib/c/generic/inet/addr.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/inet/addr.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <bitops.h>
 #include <inttypes.h>
+#include <str.h>
 
 #define INET_PREFIXSTRSIZE  5
Index: uspace/lib/c/generic/io/log.c
===================================================================
--- uspace/lib/c/generic/io/log.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/io/log.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -41,4 +41,5 @@
 #include <io/log.h>
 #include <ipc/logger.h>
+#include <str.h>
 #include <ns.h>
 
Index: uspace/lib/c/generic/io/table.c
===================================================================
--- uspace/lib/c/generic/io/table.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/io/table.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -40,4 +40,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 static table_column_t *table_column_first(table_t *);
Index: uspace/lib/c/generic/rtld/dynamic.c
===================================================================
--- uspace/lib/c/generic/rtld/dynamic.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/rtld/dynamic.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <stdio.h>
 #include <inttypes.h>
+#include <str.h>
 
 #include <rtld/elf_dyn.h>
Index: uspace/lib/c/generic/rtld/module.c
===================================================================
--- uspace/lib/c/generic/rtld/module.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/rtld/module.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -41,4 +41,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include <rtld/rtld.h>
Index: uspace/lib/c/generic/rtld/rtld.c
===================================================================
--- uspace/lib/c/generic/rtld/rtld.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/rtld/rtld.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -40,4 +40,5 @@
 #include <rtld/rtld_debug.h>
 #include <stdlib.h>
+#include <str.h>
 
 rtld_t *runtime_env;
Index: uspace/lib/c/generic/rtld/symbol.c
===================================================================
--- uspace/lib/c/generic/rtld/symbol.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/rtld/symbol.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include <elf/elf.h>
Index: uspace/lib/c/generic/vfs/mtab.c
===================================================================
--- uspace/lib/c/generic/vfs/mtab.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/generic/vfs/mtab.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -40,4 +40,5 @@
 #include <errno.h>
 #include <assert.h>
+#include <str.h>
 
 static void process_mp(const char *path, struct stat *stat, list_t *mtab_list)
Index: uspace/lib/c/include/io/kio.h
===================================================================
--- uspace/lib/c/include/io/kio.h	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/include/io/kio.h	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -39,4 +39,6 @@
 #include <stdarg.h>
 #include <io/verify.h>
+#include <_bits/errno.h>
+#include <_bits/size_t.h>
 
 extern errno_t kio_write(const void *, size_t, size_t *);
Index: uspace/lib/c/include/stdio.h
===================================================================
--- uspace/lib/c/include/stdio.h	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/include/stdio.h	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,7 +37,7 @@
 
 #include <stdarg.h>
-#include <str.h>
 #include <io/verify.h>
-#include <abi/kio.h>
+#include <_bits/size_t.h>
+#include <_bits/wchar_t.h>
 
 #define EOF  (-1)
Index: uspace/lib/c/test/sprintf.c
===================================================================
--- uspace/lib/c/test/sprintf.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/c/test/sprintf.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -28,4 +28,5 @@
 
 #include <stdio.h>
+#include <str.h>
 #include <pcut/pcut.h>
 
Index: uspace/lib/draw/font/pcf.c
===================================================================
--- uspace/lib/draw/font/pcf.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/draw/font/pcf.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <offset.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "pcf.h"
Index: uspace/lib/drv/generic/logbuf.c
===================================================================
--- uspace/lib/drv/generic/logbuf.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/drv/generic/logbuf.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -35,4 +35,5 @@
 #include <ddf/log.h>
 #include <assert.h>
+#include <str.h>
 
 /** Formatting string for printing number of not-printed items. */
Index: uspace/lib/drv/generic/remote_ahci.c
===================================================================
--- uspace/lib/drv/generic/remote_ahci.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/drv/generic/remote_ahci.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -39,4 +39,5 @@
 #include <stdio.h>
 #include <macros.h>
+#include <str.h>
 #include "ahci_iface.h"
 #include "ddf/driver.h"
Index: uspace/lib/fmtutil/fmtutil.c
===================================================================
--- uspace/lib/fmtutil/fmtutil.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/fmtutil/fmtutil.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -31,4 +31,5 @@
 #include <fmtutil.h>
 #include <stdlib.h>
+#include <str.h>
 
 typedef struct {
Index: uspace/lib/gui/terminal.c
===================================================================
--- uspace/lib/gui/terminal.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/gui/terminal.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -47,4 +47,5 @@
 #include <atomic.h>
 #include <stdarg.h>
+#include <str.h>
 #include "window.h"
 #include "terminal.h"
Index: uspace/lib/gui/terminal.h
===================================================================
--- uspace/lib/gui/terminal.h	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/gui/terminal.h	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -45,4 +45,5 @@
 #include <adt/prodcons.h>
 #include <atomic.h>
+#include <str.h>
 #include "widget.h"
 
Index: uspace/lib/pcut/src/report/report.c
===================================================================
--- uspace/lib/pcut/src/report/report.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/pcut/src/report/report.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -33,5 +33,7 @@
 
 #include "../internal.h"
-#ifndef __helenos__
+#ifdef __helenos__
+#include <str.h>
+#else
 #include <string.h>
 #endif
Index: uspace/lib/posix/source/stdlib/strtold.c
===================================================================
--- uspace/lib/posix/source/stdlib/strtold.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/posix/source/stdlib/strtold.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -50,4 +50,6 @@
 
 #include "posix/float.h"
+
+#include "libc/str.h"
 
 #ifndef HUGE_VALL
Index: uspace/lib/posix/source/string.c
===================================================================
--- uspace/lib/posix/source/string.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/posix/source/string.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -48,4 +48,5 @@
 #include "posix/signal.h"
 
+#include "libc/str.h"
 #include "libc/str_error.h"
 
Index: uspace/lib/posix/source/strings.c
===================================================================
--- uspace/lib/posix/source/strings.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/posix/source/strings.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -44,4 +44,5 @@
 
 #include "libc/mem.h"
+#include "libc/str.h"
 
 /**
Index: uspace/lib/usb/src/debug.c
===================================================================
--- uspace/lib/usb/src/debug.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/lib/usb/src/debug.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -36,4 +36,5 @@
 #include <ddf/log.h>
 #include <usb/debug.h>
+#include <str.h>
 
 #define REMAINDER_STR_FMT " (%zu)..."
Index: uspace/srv/audio/hound/hound.c
===================================================================
--- uspace/srv/audio/hound/hound.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/audio/hound/hound.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -37,4 +37,5 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "hound.h"
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -52,4 +52,5 @@
 #include <task.h>
 #include <macros.h>
+#include <str.h>
 
 #define NAME "file_bd"
Index: uspace/srv/fs/cdfs/cdfs.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/cdfs/cdfs.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -44,4 +44,5 @@
 #include <stdio.h>
 #include <libfs.h>
+#include <str.h>
 #include "cdfs.h"
 #include "cdfs_ops.h"
Index: uspace/srv/fs/exfat/exfat.c
===================================================================
--- uspace/srv/fs/exfat/exfat.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/exfat/exfat.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -47,4 +47,5 @@
 #include <stdio.h>
 #include <libfs.h>
+#include <str.h>
 #include "../../vfs/vfs.h"
 
Index: uspace/srv/fs/ext4fs/ext4fs.c
===================================================================
--- uspace/srv/fs/ext4fs/ext4fs.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/ext4fs/ext4fs.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -42,4 +42,5 @@
 #include <task.h>
 #include <ipc/services.h>
+#include <str.h>
 #include "ext4/ops.h"
 #include "../../vfs/vfs.h"
Index: uspace/srv/fs/fat/fat.c
===================================================================
--- uspace/srv/fs/fat/fat.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/fat/fat.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -47,4 +47,5 @@
 #include <stdio.h>
 #include <libfs.h>
+#include <str.h>
 #include "../../vfs/vfs.h"
 
Index: uspace/srv/fs/locfs/locfs.c
===================================================================
--- uspace/srv/fs/locfs/locfs.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/locfs/locfs.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -47,4 +47,5 @@
 #include <task.h>
 #include <libfs.h>
+#include <str.h>
 #include "locfs.h"
 #include "locfs_ops.h"
Index: uspace/srv/fs/mfs/mfs_dentry.c
===================================================================
--- uspace/srv/fs/mfs/mfs_dentry.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/mfs/mfs_dentry.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -31,4 +31,5 @@
  */
 
+#include <str.h>
 #include "mfs.h"
 
Index: uspace/srv/fs/mfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/mfs/mfs_ops.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/mfs/mfs_ops.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -36,4 +36,5 @@
 #include <adt/hash_table.h>
 #include <adt/hash.h>
+#include <str.h>
 #include "mfs.h"
 
Index: uspace/srv/fs/tmpfs/tmpfs.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/fs/tmpfs/tmpfs.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -50,4 +50,5 @@
 #include <task.h>
 #include <libfs.h>
+#include <str.h>
 #include "../../vfs/vfs.h"
 
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/hid/console/console.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -51,4 +51,5 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
+#include <str.h>
 #include "console.h"
 
Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/hid/input/input.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -54,4 +54,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <str_error.h>
 
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -35,4 +35,5 @@
 #include <stddef.h>
 #include <stdio.h>
+#include <str.h>
 #include <task.h>
 
Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/hid/remcons/remcons.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -49,4 +49,5 @@
 #include <io/console.h>
 #include <inttypes.h>
+#include <str.h>
 #include "telnet.h"
 #include "user.h"
Index: uspace/srv/hid/rfb/main.c
===================================================================
--- uspace/srv/hid/rfb/main.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/hid/rfb/main.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -35,4 +35,5 @@
 #include <inttypes.h>
 #include <io/log.h>
+#include <str.h>
 #include <task.h>
 
Index: uspace/srv/net/dhcp/dhcp.c
===================================================================
--- uspace/srv/net/dhcp/dhcp.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/net/dhcp/dhcp.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -48,4 +48,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "dhcp.h"
Index: uspace/srv/net/dnsrsrv/dnsrsrv.c
===================================================================
--- uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -43,4 +43,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <task.h>
 
Index: uspace/srv/net/loopip/loopip.c
===================================================================
--- uspace/srv/net/loopip/loopip.c	(revision bd768718dfae4f0bf4db7bf22af81211b1851ee1)
+++ uspace/srv/net/loopip/loopip.c	(revision 1d6dd2a62370f8442aef510558ad86b6439e6653)
@@ -45,4 +45,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <task.h>