Index: uspace/lib/libc/include/sys/mman.h
===================================================================
--- uspace/lib/libc/include/sys/mman.h	(revision daa90e8e7088c799912351760ca507292df5f906)
+++ uspace/lib/libc/include/sys/mman.h	(revision af0ff9b21ecdf63555517440fea522aec0690fff)
@@ -37,4 +37,5 @@
 
 #include <as.h>
+#include <sys/types.h>
 
 #define MAP_FAILED  ((void *) -1)
@@ -49,6 +50,6 @@
 #define PROTO_EXEC   AS_AREA_EXEC
 
-extern void  *mmap(void  *start, size_t length, int prot, int flags, int fd,
-		   off_t offset);
+extern void *mmap(void  *start, size_t length, int prot, int flags, int fd,
+    off_t offset);
 extern int munmap(void *start, size_t length);
 
Index: uspace/lib/libc/include/sys/time.h
===================================================================
--- uspace/lib/libc/include/sys/time.h	(revision daa90e8e7088c799912351760ca507292df5f906)
+++ uspace/lib/libc/include/sys/time.h	(revision af0ff9b21ecdf63555517440fea522aec0690fff)
@@ -36,5 +36,5 @@
 #define LIBC_TIME_H_
 
-#include <types.h>
+#include <sys/types.h>
 
 #define DST_NONE 0
Index: uspace/lib/libc/include/sys/types.h
===================================================================
--- uspace/lib/libc/include/sys/types.h	(revision daa90e8e7088c799912351760ca507292df5f906)
+++ uspace/lib/libc/include/sys/types.h	(revision af0ff9b21ecdf63555517440fea522aec0690fff)
@@ -36,5 +36,9 @@
 #define LIBC_SYS_TYPES_H_
 
-#include <types.h>
+#include <libarch/types.h>
+
+typedef unsigned long size_t;
+typedef signed long ssize_t;
+typedef long off_t;
 
 #endif