Index: uspace/lib/posix/src/ctype.c
===================================================================
--- uspace/lib/posix/src/ctype.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/ctype.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -34,5 +34,5 @@
  */
 
-#include "posix/ctype.h"
+#include <ctype.h>
 
 /**
Index: uspace/lib/posix/src/dlfcn.c
===================================================================
--- uspace/lib/posix/src/dlfcn.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/dlfcn.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -32,5 +32,5 @@
 
 #include "internal/common.h"
-#include "posix/dlfcn.h"
+#include <dlfcn.h>
 
 int dlclose(void *handle)
Index: uspace/lib/posix/src/fcntl.c
===================================================================
--- uspace/lib/posix/src/fcntl.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/fcntl.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -34,8 +34,6 @@
 
 #include "internal/common.h"
-#include "posix/fcntl.h"
-
-#include "libc/vfs/vfs.h"
-
+#include <fcntl.h>
+#include <vfs/vfs.h>
 #include <errno.h>
 
Index: uspace/lib/posix/src/fnmatch.c
===================================================================
--- uspace/lib/posix/src/fnmatch.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/fnmatch.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -43,12 +43,12 @@
  */
 
-#include "libc/stdbool.h"
-#include "posix/ctype.h"
-#include "posix/string.h"
-#include "posix/stdlib.h"
+#include <stdbool.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include "internal/common.h"
-#include "posix/fnmatch.h"
+#include <fnmatch.h>
 
 /* Returned by _match... functions. */
Index: uspace/lib/posix/src/locale.c
===================================================================
--- uspace/lib/posix/src/locale.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/locale.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -34,10 +34,10 @@
 
 #include "internal/common.h"
-#include "posix/locale.h"
+#include <locale.h>
 
 #include <errno.h>
 
-#include "posix/limits.h"
-#include "posix/string.h"
+#include <limits.h>
+#include <string.h>
 
 /*
Index: uspace/lib/posix/src/pthread/condvar.c
===================================================================
--- uspace/lib/posix/src/pthread/condvar.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/condvar.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -33,6 +33,6 @@
  */
 
-#include "posix/pthread.h"
-#include "errno.h"
+#include <pthread.h>
+#include <errno.h>
 #include "../internal/common.h"
 
Index: uspace/lib/posix/src/pthread/keys.c
===================================================================
--- uspace/lib/posix/src/pthread/keys.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/keys.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -33,6 +33,6 @@
  */
 
-#include "posix/stdlib.h"
-#include "posix/pthread.h"
+#include <stdlib.h>
+#include <pthread.h>
 #include <errno.h>
 #include "../internal/common.h"
Index: uspace/lib/posix/src/pthread/mutex.c
===================================================================
--- uspace/lib/posix/src/pthread/mutex.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/mutex.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -33,5 +33,5 @@
  */
 
-#include "posix/pthread.h"
+#include <pthread.h>
 #include <errno.h>
 #include "../internal/common.h"
Index: uspace/lib/posix/src/pthread/threads.c
===================================================================
--- uspace/lib/posix/src/pthread/threads.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pthread/threads.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -33,7 +33,7 @@
  */
 
-#include "posix/pthread.h"
-#include "errno.h"
-#include "posix/stdlib.h"
+#include <pthread.h>
+#include <errno.h>
+#include <stdlib.h>
 #include <fibril.h>
 #include "../internal/common.h"
Index: uspace/lib/posix/src/pwd.c
===================================================================
--- uspace/lib/posix/src/pwd.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/pwd.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -33,7 +33,7 @@
  */
 
-#include "libc/stdbool.h"
-#include "posix/pwd.h"
-#include "posix/string.h"
+#include <stdbool.h>
+#include <pwd.h>
+#include <string.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/posix/src/signal.c
===================================================================
--- uspace/lib/posix/src/signal.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/signal.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -33,14 +33,14 @@
  */
 
-#include "posix/signal.h"
+#include <signal.h>
 #include "internal/common.h"
-#include "posix/limits.h"
-#include "posix/stdlib.h"
-#include "posix/string.h"
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <errno.h>
 
-#include "libc/fibril_synch.h"
-#include "libc/task.h"
+#include <fibril_synch.h>
+#include <task.h>
 
 /*
Index: uspace/lib/posix/src/stdio.c
===================================================================
--- uspace/lib/posix/src/stdio.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/stdio.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -36,5 +36,5 @@
 
 #include "internal/common.h"
-#include "posix/stdio.h"
+#include <stdio.h>
 
 #include <assert.h>
@@ -43,16 +43,15 @@
 #include <tmpfile.h>
 
-#include "posix/fcntl.h"
-#include "posix/stdlib.h"
-#include "posix/string.h"
-#include "posix/sys/stat.h"
-#include "posix/sys/types.h"
-#include "posix/unistd.h"
-
-#include "libc/stdio.h"
-#include "libc/io/printf_core.h"
-#include "libc/str.h"
-#include "libc/malloc.h"
-#include "libc/adt/list.h"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <io/printf_core.h>
+#include <str.h>
+#include <malloc.h>
+#include <adt/list.h>
 
 /**
Index: uspace/lib/posix/src/stdlib.c
===================================================================
--- uspace/lib/posix/src/stdlib.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/stdlib.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -35,19 +35,19 @@
 
 #include "internal/common.h"
-#include "posix/stdlib.h"
+#include <stdlib.h>
 
 #include <errno.h>
 #include <tmpfile.h>
 
-#include "posix/fcntl.h"
-#include "posix/limits.h"
-#include "posix/string.h"
-#include "posix/sys/stat.h"
-#include "posix/unistd.h"
-
-#include "libc/qsort.h"
-#include "libc/str.h"
-#include "libc/vfs/vfs.h"
-#include "libc/stats.h"
+#include <fcntl.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <qsort.h>
+#include <str.h>
+#include <vfs/vfs.h>
+#include <stats.h>
 
 /**
Index: uspace/lib/posix/src/string.c
===================================================================
--- uspace/lib/posix/src/string.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/string.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -36,5 +36,5 @@
 
 #include "internal/common.h"
-#include "posix/string.h"
+#include <string.h>
 
 #include <assert.h>
@@ -42,10 +42,9 @@
 #include <errno.h>
 
-#include "posix/limits.h"
-#include "posix/stdlib.h"
-#include "posix/signal.h"
-
-#include "libc/str.h"
-#include "libc/str_error.h"
+#include <limits.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <str.h>
+#include <str_error.h>
 
 /**
Index: uspace/lib/posix/src/strings.c
===================================================================
--- uspace/lib/posix/src/strings.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/strings.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -35,11 +35,11 @@
 
 #include "internal/common.h"
-#include "posix/strings.h"
+#include <strings.h>
 
-#include "posix/string.h"
-#include "posix/ctype.h"
+#include <string.h>
+#include <ctype.h>
 
-#include "libc/mem.h"
-#include "libc/str.h"
+#include <mem.h>
+#include <str.h>
 
 /**
Index: uspace/lib/posix/src/sys/mman.c
===================================================================
--- uspace/lib/posix/src/sys/mman.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/sys/mman.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -34,8 +34,8 @@
 
 #include "../internal/common.h"
-#include <posix/sys/mman.h>
-#include <posix/sys/types.h>
-#include <libc/as.h>
-#include <posix/unistd.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <as.h>
+#include <unistd.h>
 
 void *mmap(void *start, size_t length, int prot, int flags, int fd,
Index: uspace/lib/posix/src/sys/stat.c
===================================================================
--- uspace/lib/posix/src/sys/stat.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/sys/stat.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -35,9 +35,9 @@
 
 #include "../internal/common.h"
-#include "posix/sys/stat.h"
-#include "libc/vfs/vfs.h"
+#include <sys/stat.h>
+#include <vfs/vfs.h>
 
 #include <errno.h>
-#include "libc/mem.h"
+#include <mem.h>
 
 /**
Index: uspace/lib/posix/src/sys/wait.c
===================================================================
--- uspace/lib/posix/src/sys/wait.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/sys/wait.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -35,13 +35,13 @@
 
 #include "../internal/common.h"
-#include "posix/sys/wait.h"
+#include <sys/wait.h>
 
-#include "libc/task.h"
+#include <task.h>
 #include <assert.h>
 
 #include <errno.h>
 
-#include "posix/limits.h"
-#include "posix/signal.h"
+#include <limits.h>
+#include <signal.h>
 
 int __posix_wifexited(int status)
Index: uspace/lib/posix/src/time.c
===================================================================
--- uspace/lib/posix/src/time.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/time.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -35,20 +35,19 @@
 
 #include "internal/common.h"
-#include "posix/sys/types.h"
-#include "posix/sys/time.h"
-#include "posix/time.h"
-
-#include "posix/ctype.h"
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <ctype.h>
 
 #include <errno.h>
 
-#include "posix/signal.h"
+#include <signal.h>
 #include <assert.h>
 
-#include "libc/async.h"
-#include "libc/malloc.h"
-#include "libc/task.h"
-#include "libc/stddef.h"
-#include "libc/time.h"
+#include <async.h>
+#include <malloc.h>
+#include <task.h>
+#include <stddef.h>
 
 // TODO: test everything in this file
Index: uspace/lib/posix/src/unistd.c
===================================================================
--- uspace/lib/posix/src/unistd.c	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
+++ uspace/lib/posix/src/unistd.c	(revision 460ea7ed2af9977b884414b68b2f7b94fa472cfd)
@@ -35,17 +35,17 @@
 
 #include "internal/common.h"
-#include "posix/unistd.h"
+#include <unistd.h>
 
 #include <errno.h>
 
-#include "posix/dirent.h"
-#include "posix/string.h"
-#include "posix/sys/types.h"
-#include "posix/fcntl.h"
-
-#include "libc/task.h"
-#include "libc/stats.h"
-#include "libc/malloc.h"
-#include "libc/vfs/vfs.h"
+#include <dirent.h>
+#include <string.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#include <task.h>
+#include <stats.h>
+#include <malloc.h>
+#include <vfs/vfs.h>
 
 #include <libarch/config.h>