Index: uspace/lib/libc/include/as.h
===================================================================
--- uspace/lib/libc/include/as.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/as.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_AS_H_
 
-#include <types.h>
+#include <sys/types.h>
 #include <task.h>
 #include <kernel/mm/as.h>
Index: uspace/lib/libc/include/async.h
===================================================================
--- uspace/lib/libc/include/async.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/async.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -56,7 +56,7 @@
 
 aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
-		   ipc_call_t *dataptr);
+    ipc_call_t *dataptr);
 aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
-		   ipcarg_t arg3, ipc_call_t *dataptr);
+    ipcarg_t arg3, ipc_call_t *dataptr);
 void async_wait_for(aid_t amsgid, ipcarg_t *result);
 int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout);
@@ -68,5 +68,6 @@
  * @return Return code of message
  */
-static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2)
+static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1, 
+    ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2)
 {
 	ipc_call_t result;
@@ -81,9 +82,9 @@
 	return rc;
 }
-#define async_req(phoneid, method, arg1, r1) async_req_2(phoneid, method, arg1, 0, r1, 0)
+#define async_req(phoneid, method, arg1, r1) \
+    async_req_2(phoneid, method, arg1, 0, r1, 0)
 
 static inline ipcarg_t async_req_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
-				   ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1, 
-				   ipcarg_t *r2, ipcarg_t *r3)
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1, ipcarg_t *r2, ipcarg_t *r3)
 {
 	ipc_call_t result;
@@ -114,5 +115,5 @@
 /* Primitve functions for IPC communication */
 void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, 
-		 ipcarg_t arg3);
+    ipcarg_t arg3);
 void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2);
 #define async_msg(ph, m, a1) async_msg_2(ph, m, a1, 0)
Index: uspace/lib/libc/include/bitops.h
===================================================================
--- uspace/lib/libc/include/bitops.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/bitops.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_BITOPS_H_
 
-#include <types.h>
+#include <sys/types.h>
 
 
Index: uspace/lib/libc/include/futex.h
===================================================================
--- uspace/lib/libc/include/futex.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/futex.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -37,5 +37,5 @@
 
 #include <atomic.h>
-#include <types.h>
+#include <sys/types.h>
 
 #define FUTEX_INITIALIZER     {1}
Index: uspace/lib/libc/include/io/io.h
===================================================================
--- uspace/lib/libc/include/io/io.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/io/io.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_IO_H_
 
-#include <libarch/types.h>
+#include <sys/types.h>
 
 int putnchars(const char * buf, size_t count);
Index: uspace/lib/libc/include/io/printf_core.h
===================================================================
--- uspace/lib/libc/include/io/printf_core.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/io/printf_core.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_PRINTF_CORE_H_
 
-#include <libarch/types.h>
+#include <sys/types.h>
 #include <stdarg.h>
 
Index: uspace/lib/libc/include/ipc/ipc.h
===================================================================
--- uspace/lib/libc/include/ipc/ipc.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/ipc/ipc.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -39,5 +39,5 @@
 #include <kernel/ddi/irq.h>
 #include <libc.h>
-#include <types.h>
+#include <sys/types.h>
 #include <kernel/synch/synch.h>
 
Index: uspace/lib/libc/include/libc.h
===================================================================
--- uspace/lib/libc/include/libc.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/libc.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_LIBC_H_
 
-#include <types.h>
+#include <sys/types.h>
 #include <kernel/syscall/syscall.h>
 #include <libarch/syscall.h>
Index: uspace/lib/libc/include/stdarg.h
===================================================================
--- uspace/lib/libc/include/stdarg.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/stdarg.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_STDARG_H_
 
-#include <types.h>
+#include <sys/types.h>
 #include <libarch/stackarg.h>
 
Index: uspace/lib/libc/include/stddef.h
===================================================================
--- uspace/lib/libc/include/stddef.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/stddef.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_STDDEF_H_
 
-#include <types.h>
+#include <sys/types.h>
 
 #endif
Index: uspace/lib/libc/include/stdint.h
===================================================================
--- uspace/lib/libc/include/stdint.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/stdint.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,6 +36,6 @@
 #define LIBC_STDINT_H_
 
-/* Definitions of types with fixed size*/
-#include <types.h>
+/* Definitions of types with fixed size */
+#include <libarch/types.h>
 
 #define MAX_INT8 (0x7F)
Index: uspace/lib/libc/include/stdio.h
===================================================================
--- uspace/lib/libc/include/stdio.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/stdio.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_STDIO_H_
 
-#include <types.h>
+#include <sys/types.h>
 #include <stdarg.h>
 
Index: uspace/lib/libc/include/string.h
===================================================================
--- uspace/lib/libc/include/string.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/string.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_STRING_H_
 
-#include <types.h>
+#include <sys/types.h>
 
 #define bzero(ptr, len)	memset((ptr), 0, (len))
Index: uspace/lib/libc/include/sys/mman.h
===================================================================
--- uspace/lib/libc/include/sys/mman.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/sys/mman.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -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 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/sys/time.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -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 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/sys/types.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -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
Index: uspace/lib/libc/include/syscall.h
===================================================================
--- uspace/lib/libc/include/syscall.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/syscall.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -38,5 +38,5 @@
 #define LIBC_SYSCALL_H_
 
-#include <types.h>
+#include <sys/types.h>
 #include <kernel/syscall/syscall.h>
 
Index: uspace/lib/libc/include/task.h
===================================================================
--- uspace/lib/libc/include/task.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/task.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_TASK_H_
 
-#include <types.h>
+#include <sys/types.h>
 
 typedef uint64_t task_id_t;
Index: uspace/lib/libc/include/thread.h
===================================================================
--- uspace/lib/libc/include/thread.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/thread.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -38,5 +38,5 @@
 #include <kernel/proc/uarg.h>
 #include <libarch/thread.h>
-#include <types.h>
+#include <sys/types.h>
 
 typedef uint64_t thread_id_t;
Index: uspace/lib/libc/include/types.h
===================================================================
--- uspace/lib/libc/include/types.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include <libarch/types.h>
Index: uspace/lib/libc/include/unistd.h
===================================================================
--- uspace/lib/libc/include/unistd.h	(revision 26f2af09087bccd53eb0c8a6bb24dfe65cc45156)
+++ uspace/lib/libc/include/unistd.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -36,5 +36,5 @@
 #define LIBC_UNISTD_H_
 
-#include <types.h>
+#include <sys/types.h>
 #include <libarch/config.h>