Index: uspace/lib/posix/stdlib/strtol.c
===================================================================
--- uspace/lib/posix/stdlib/strtol.c	(revision 2b83add11c5bcd828a9b4eca961890f4cbac0c38)
+++ uspace/lib/posix/stdlib/strtol.c	(revision a35fc17b8b322aa472e7cd73bfb3382b92f62013)
@@ -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 2b83add11c5bcd828a9b4eca961890f4cbac0c38)
+++ uspace/lib/posix/stdlib/strtold.c	(revision a35fc17b8b322aa472e7cd73bfb3382b92f62013)
@@ -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