Index: uspace/lib/posix/stdio.c
===================================================================
--- uspace/lib/posix/stdio.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/stdio.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -36,14 +36,18 @@
 #define LIBPOSIX_INTERNAL
 
-#include <assert.h>
-#include <errno.h>
-#include <bool.h>
+/* Has to be first. */
+#include "stdbool.h"
 
 #include "internal/common.h"
 #include "stdio.h"
+
+#include "assert.h"
+#include "errno.h"
+#include "string.h"
+#include "sys/types.h"
+
 #include "libc/io/printf_core.h"
-#include "string.h"
 #include "libc/str.h"
-#include "sys/types.h"
+
 
 /* not the best of solutions, but freopen and ungetc will eventually
Index: uspace/lib/posix/stdlib.c
===================================================================
--- uspace/lib/posix/stdlib.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/stdlib.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -36,9 +36,10 @@
 #define LIBPOSIX_INTERNAL
 
+#include "internal/common.h"
 #include "stdlib.h"
+
 #include "libc/sort.h"
 #include "libc/str.h"
 #include "libc/vfs/vfs.h"
-#include "internal/common.h"
 #include <errno.h>  // FIXME: use POSIX errno
 
Index: uspace/lib/posix/stdlib/strtol.c
===================================================================
--- uspace/lib/posix/stdlib/strtol.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/stdlib/strtol.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -37,7 +37,8 @@
 #include "../internal/common.h"
 #include "../stdlib.h"
-#include <errno.h>  // FIXME: use POSIX errno
+
 #include "../limits.h"
 #include "../ctype.h"
+#include <errno.h> // FIXME: use POSIX errno
 
 // TODO: documentation
Index: uspace/lib/posix/stdlib/strtold.c
===================================================================
--- uspace/lib/posix/stdlib/strtold.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/stdlib/strtold.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -35,13 +35,15 @@
 #define LIBPOSIX_INTERNAL
 
+/* Has to be first. */
+#include "../stdbool.h"
+
 #include "../internal/common.h"
-
-#include "../libc/assert.h"
+#include "../stdlib.h"
+
+#include "../assert.h"
 #include "../ctype.h"
-#include <errno.h> // TODO: use POSIX errno
-#include "../libc/bool.h"
 #include "../stdint.h"
-#include "../stdlib.h"
 #include "../strings.h"
+#include <errno.h> // FIXME: use POSIX errno
 
 #ifndef HUGE_VALL
Index: uspace/lib/posix/string.c
===================================================================
--- uspace/lib/posix/string.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/string.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -36,11 +36,13 @@
 #define LIBPOSIX_INTERNAL
 
+#include "internal/common.h"
 #include "string.h"
 
-#include "libc/assert.h"
-#include "libc/str_error.h"
+#include "assert.h"
 #include "errno.h"
 #include "limits.h"
 #include "stdlib.h"
+
+#include "libc/str_error.h"
 
 /**
Index: uspace/lib/posix/strings.c
===================================================================
--- uspace/lib/posix/strings.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/strings.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -38,4 +38,5 @@
 #include "internal/common.h"
 #include "strings.h"
+
 #include "string.h"
 #include "ctype.h"
Index: uspace/lib/posix/sys/stat.c
===================================================================
--- uspace/lib/posix/sys/stat.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/sys/stat.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -36,7 +36,8 @@
 #define LIBPOSIX_INTERNAL
 
+#include "../internal/common.h"
 #include "stat.h"
-#include "../internal/common.h"
-#include <mem.h>
+
+#include "../libc/mem.h"
 
 /**
Index: uspace/lib/posix/time.c
===================================================================
--- uspace/lib/posix/time.c	(revision 557a747156e2df4a85d4e386ea9e0de0efef1fc8)
+++ uspace/lib/posix/time.c	(revision a6d908c16a3f2517f780643cb3b1e2f2606ae1f2)
@@ -38,7 +38,8 @@
 #include "internal/common.h"
 #include "time.h"
+
 #include "libc/malloc.h"
-#include <task.h>
-#include <stats.h>
+#include "libc/task.h"
+#include "libc/stats.h"
 
 /**