Index: uspace/lib/bithenge/src/failure.c
===================================================================
--- uspace/lib/bithenge/src/failure.c	(revision ce04ea446ae259288dc1f51ca1fdcc70dd74d6bb)
+++ uspace/lib/bithenge/src/failure.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -43,5 +43,4 @@
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #define BITHENGE_FAILURE_DECLS_ONLY 1
 #include "failure.h"
Index: uspace/lib/bithenge/src/failure.h
===================================================================
--- uspace/lib/bithenge/src/failure.h	(revision ce04ea446ae259288dc1f51ca1fdcc70dd74d6bb)
+++ uspace/lib/bithenge/src/failure.h	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -43,5 +43,4 @@
 #include <stdlib.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 int bithenge_should_fail(void);
Index: uspace/lib/bithenge/src/file.c
===================================================================
--- uspace/lib/bithenge/src/file.c	(revision ce04ea446ae259288dc1f51ca1fdcc70dd74d6bb)
+++ uspace/lib/bithenge/src/file.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -42,5 +42,4 @@
 #include <vfs/vfs.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include "common.h"
 #include <bithenge/blob.h>
Index: uspace/lib/bithenge/src/helenos/common.h
===================================================================
--- uspace/lib/bithenge/src/helenos/common.h	(revision ce04ea446ae259288dc1f51ca1fdcc70dd74d6bb)
+++ uspace/lib/bithenge/src/helenos/common.h	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -32,4 +32,6 @@
 #include <bithenge/os.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
 #include <byteorder.h>
 #include <errno.h>
@@ -37,5 +39,4 @@
 #include <macros.h>
 #include <mem.h>
-#include <stdlib.h>
 #include <str.h>
 #include <str_error.h>