Index: uspace/lib/c/generic/stacktrace.c
===================================================================
--- uspace/lib/c/generic/stacktrace.c	(revision 64a617f6ba5e1f774278f10d16694f0f68506479)
+++ uspace/lib/c/generic/stacktrace.c	(revision a7a7f8c35340d0b14e5d74cb7398920fde63e13e)
@@ -38,4 +38,5 @@
 #include <sys/types.h>
 #include <errno.h>
+#include <unistd.h>
 
 static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);
Index: uspace/lib/c/generic/stats.c
===================================================================
--- uspace/lib/c/generic/stats.c	(revision 64a617f6ba5e1f774278f10d16694f0f68506479)
+++ uspace/lib/c/generic/stats.c	(revision a7a7f8c35340d0b14e5d74cb7398920fde63e13e)
@@ -40,4 +40,5 @@
 #include <inttypes.h>
 #include <malloc.h>
+#include <unistd.h>
 
 #define SYSINFO_STATS_MAX_PATH  64
Index: uspace/lib/c/generic/sysinfo.c
===================================================================
--- uspace/lib/c/generic/sysinfo.c	(revision 64a617f6ba5e1f774278f10d16694f0f68506479)
+++ uspace/lib/c/generic/sysinfo.c	(revision a7a7f8c35340d0b14e5d74cb7398920fde63e13e)
@@ -39,4 +39,5 @@
 #include <malloc.h>
 #include <bool.h>
+#include <unistd.h>
 
 /** Get sysinfo keys size
Index: uspace/lib/c/generic/time.c
===================================================================
--- uspace/lib/c/generic/time.c	(revision 64a617f6ba5e1f774278f10d16694f0f68506479)
+++ uspace/lib/c/generic/time.c	(revision a7a7f8c35340d0b14e5d74cb7398920fde63e13e)
@@ -43,4 +43,5 @@
 #include <ddi.h>
 #include <libc.h>
+#include <unistd.h>
 
 /** Pointer to kernel shared variables with time */
Index: uspace/lib/c/include/errno.h
===================================================================
--- uspace/lib/c/include/errno.h	(revision 64a617f6ba5e1f774278f10d16694f0f68506479)
+++ uspace/lib/c/include/errno.h	(revision a7a7f8c35340d0b14e5d74cb7398920fde63e13e)
@@ -37,5 +37,4 @@
 
 #include <abi/errno.h>
-#include <fibril.h>
 
 #define errno  (*(__errno()))
Index: uspace/lib/c/include/stdio.h
===================================================================
--- uspace/lib/c/include/stdio.h	(revision 64a617f6ba5e1f774278f10d16694f0f68506479)
+++ uspace/lib/c/include/stdio.h	(revision a7a7f8c35340d0b14e5d74cb7398920fde63e13e)
@@ -39,5 +39,4 @@
 #include <stdarg.h>
 #include <str.h>
-#include <adt/list.h>
 
 #ifndef NVERIFY_PRINTF