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>