Index: uspace/lib/posix/src/sys/mman.c
===================================================================
--- uspace/lib/posix/src/sys/mman.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/posix/src/sys/mman.c	(revision dc68f72eac461823c3a678b8d303bd6fcc714e60)
@@ -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 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/posix/src/sys/stat.c	(revision dc68f72eac461823c3a678b8d303bd6fcc714e60)
@@ -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 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
+++ uspace/lib/posix/src/sys/wait.c	(revision dc68f72eac461823c3a678b8d303bd6fcc714e60)
@@ -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)