Index: uspace/lib/posix/source/fcntl.c
===================================================================
--- uspace/lib/posix/source/fcntl.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/lib/posix/source/fcntl.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -39,5 +39,4 @@
 #include "posix/fcntl.h"
 
-#include "libc/unistd.h"
 #include "libc/vfs/vfs.h"
 #include "posix/errno.h"
Index: uspace/lib/posix/source/time.c
===================================================================
--- uspace/lib/posix/source/time.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/lib/posix/source/time.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -49,4 +49,6 @@
 #include "libc/stats.h"
 #include "libc/stdbool.h"
+#include "libc/stddef.h"
+#include "libc/thread.h"
 #include "libc/sys/time.h"
 
@@ -313,8 +315,8 @@
 			// TODO: interruptible sleep
 			if (rqtp->tv_sec != 0) {
-				sleep(rqtp->tv_sec);
+				thread_sleep(rqtp->tv_sec);
 			}
 			if (rqtp->tv_nsec != 0) {
-				usleep(rqtp->tv_nsec / 1000);
+				thread_usleep(rqtp->tv_nsec / 1000);
 			}
 			return 0;
Index: uspace/lib/posix/source/unistd.c
===================================================================
--- uspace/lib/posix/source/unistd.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/lib/posix/source/unistd.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -49,4 +49,6 @@
 #include "libc/vfs/vfs.h"
 
+#include <libarch/config.h>
+
 aoff64_t posix_pos[MAX_OPEN_FILES];
 
@@ -134,5 +136,5 @@
 int posix_getpagesize(void)
 {
-	return getpagesize();
+	return PAGE_SIZE;
 }
 
@@ -384,6 +386,6 @@
 	stats_physmem_t *mem_stats = stats_get_physmem();
 	if (mem_stats) {
-		phys_pages = (long) (mem_stats->total / getpagesize());
-		avphys_pages = (long) (mem_stats->free / getpagesize());
+		phys_pages = (long) (mem_stats->total / posix_getpagesize());
+		avphys_pages = (long) (mem_stats->free / posix_getpagesize());
 		free(mem_stats);
 		mem_stats = 0;
@@ -396,5 +398,5 @@
 		return avphys_pages;
 	case _SC_PAGESIZE:
-		return getpagesize();
+		return posix_getpagesize();
 	case _SC_CLK_TCK:
 		return clk_tck;