Index: uspace/app/edit/edit.c
===================================================================
--- uspace/app/edit/edit.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/app/edit/edit.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -48,5 +48,5 @@
 #include <macros.h>
 #include <clipboard.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #include "sheet.h"
Index: uspace/app/sbi/src/os/posix.c
===================================================================
--- uspace/app/sbi/src/os/posix.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/app/sbi/src/os/posix.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -34,5 +34,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <sys/wait.h>
 #include <unistd.h>
Index: uspace/app/tetris/screen.h
===================================================================
--- uspace/app/tetris/screen.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/app/tetris/screen.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -55,5 +55,5 @@
 #define putpad(s)  tputs(s, 1, put)
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <io/console.h>
 #include <async.h>
Index: uspace/app/trace/trace.h
===================================================================
--- uspace/app/trace/trace.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/app/trace/trace.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define TRACE_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 /**
Index: uspace/dist/src/c/demos/tetris/screen.h
===================================================================
--- uspace/dist/src/c/demos/tetris/screen.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/dist/src/c/demos/tetris/screen.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -55,5 +55,5 @@
 #define putpad(s)  tputs(s, 1, put)
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <io/console.h>
 #include <async.h>
Index: uspace/lib/c/arch/abs32le/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/abs32le/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_abs32le_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))
Index: uspace/lib/c/arch/abs32le/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/syscall.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/abs32le/include/libarch/syscall.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 
 #include <abi/syscall.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #define __syscall0  __syscall
Index: uspace/lib/c/arch/amd64/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/amd64/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/amd64/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_amd64_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: uspace/lib/c/arch/arm32/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/arm32/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 #define LIBC_arm32_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 /** Calculate absolute address of function referenced by fptr pointer.
Index: uspace/lib/c/arch/arm32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 #define LIBC_arm32_FIBRIL_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <align.h>
 #include <thread.h>
Index: uspace/lib/c/arch/ia32/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/ia32/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_ia32_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))
Index: uspace/lib/c/arch/ia32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/fibril.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/ia32/include/libarch/fibril.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_ia32_FIBRIL_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <libarch/fibril_context.h>
 
Index: uspace/lib/c/arch/ia32/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/syscall.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/ia32/include/libarch/syscall.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 
 #include <abi/syscall.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #define __syscall0  __syscall_fast_func
Index: uspace/lib/c/arch/ia64/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/ia64/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_ia64_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 /**
Index: uspace/lib/c/arch/ia64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -39,5 +39,5 @@
 #include <align.h>
 #include <libarch/stack.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <libarch/fibril_context.h>
 
Index: uspace/lib/c/arch/mips32/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/mips32/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_mips32_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))
Index: uspace/lib/c/arch/ppc32/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/ppc32/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_ppc32_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: uspace/lib/c/arch/riscv64/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/riscv64/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_riscv64_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))
Index: uspace/lib/c/arch/riscv64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/syscall.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/riscv64/include/libarch/syscall.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -39,5 +39,5 @@
 #include <stdint.h>
 #include <abi/syscall.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #define __syscall0  __syscall
Index: uspace/lib/c/arch/riscv64/src/thread_entry.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/thread_entry.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/riscv64/src/thread_entry.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -30,5 +30,5 @@
  */
 
-#include <sys/types.h>
+#include <types/common.h>
 #include "../../../generic/private/thread.h"
 
Index: uspace/lib/c/arch/sparc64/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/faddr.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/sparc64/include/libarch/faddr.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_sparc64_FADDR_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: uspace/lib/c/arch/sparc64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/syscall.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/arch/sparc64/include/libarch/syscall.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 #include <stdint.h>
 #include <abi/syscall.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #define __syscall0	__syscall
Index: uspace/lib/c/generic/perm.c
===================================================================
--- uspace/lib/c/generic/perm.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/generic/perm.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 #include <task.h>
 #include <libc.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 /** Grant permissions to a task.
Index: uspace/lib/c/include/adt/hash.h
===================================================================
--- uspace/lib/c/include/adt/hash.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/adt/hash.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 
 #include <stdint.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 /** Produces a uniform hash affecting all output bits from the skewed input. */
Index: uspace/lib/c/include/as.h
===================================================================
--- uspace/lib/c/include/as.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/as.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_AS_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <stddef.h>
 #include <stdint.h>
Index: uspace/lib/c/include/atomicdflt.h
===================================================================
--- uspace/lib/c/include/atomicdflt.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/atomicdflt.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -40,5 +40,5 @@
 #endif
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/include/elf/elf.h
===================================================================
--- uspace/lib/c/include/elf/elf.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/elf/elf.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 
 #include <stdint.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <abi/elf.h>
 #include <libarch/elf.h>
Index: uspace/lib/c/include/fibril.h
===================================================================
--- uspace/lib/c/include/fibril.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/fibril.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 
 #include <libarch/fibril.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <adt/list.h>
 #include <libarch/tls.h>
Index: uspace/lib/c/include/inet/dhcp.h
===================================================================
--- uspace/lib/c/include/inet/dhcp.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/inet/dhcp.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_INET_DHCP_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 extern int dhcp_init(void);
Index: uspace/lib/c/include/io/chardev.h
===================================================================
--- uspace/lib/c/include/io/chardev.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/io/chardev.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -33,5 +33,5 @@
 #define LIBC_IO_CHARDEV_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <async.h>
 
Index: uspace/lib/c/include/io/chargrid.h
===================================================================
--- uspace/lib/c/include/io/chargrid.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/io/chargrid.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 
 #include <io/charfield.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <stddef.h>
 
Index: uspace/lib/c/include/io/log.h
===================================================================
--- uspace/lib/c/include/io/log.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/io/log.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 #include <inttypes.h>
 #include <io/verify.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #include <abi/log.h>
Index: uspace/lib/c/include/io/pixelmap.h
===================================================================
--- uspace/lib/c/include/io/pixelmap.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/io/pixelmap.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 #define LIBC_IO_PIXELMAP_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <stdbool.h>
 #include <stddef.h>
Index: uspace/lib/c/include/io/pos_event.h
===================================================================
--- uspace/lib/c/include/io/pos_event.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/io/pos_event.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 #define LIBC_IO_POS_EVENT_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 typedef enum {
Index: uspace/lib/c/include/ipc/dev_iface.h
===================================================================
--- uspace/lib/c/include/ipc/dev_iface.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/ipc/dev_iface.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -31,5 +31,5 @@
 
 #include <malloc.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 typedef enum {
Index: uspace/lib/c/include/ipc/event.h
===================================================================
--- uspace/lib/c/include/ipc/event.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/ipc/event.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 
 #include <abi/ipc/event.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 extern int ipc_event_subscribe(event_type_t, sysarg_t);
Index: uspace/lib/c/include/ipc/irq.h
===================================================================
--- uspace/lib/c/include/ipc/irq.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/ipc/irq.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_IPC_IRQ_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <abi/ddi/irq.h>
 
Index: uspace/lib/c/include/stack.h
===================================================================
--- uspace/lib/c/include/stack.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/stack.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_STACK_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 
 extern size_t stack_size_get(void);
Index: uspace/lib/c/include/sys/types.h
===================================================================
--- uspace/lib/c/include/sys/types.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ 	(revision )
@@ -1,43 +1,0 @@
-/*
- * Copyright (c) 2017 Jiri Zarevucky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup libc
- * @{
- */
-/** @file
- */
-
-#ifndef LIBC_SYS_TYPES_H_
-#define LIBC_SYS_TYPES_H_
-
-#include <libarch/types.h>
-
-#endif
-
-/** @}
- */
Index: uspace/lib/c/include/syscall.h
===================================================================
--- uspace/lib/c/include/syscall.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/syscall.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -45,5 +45,5 @@
 
 #include <abi/syscall.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #define __syscall0  __syscall
Index: uspace/lib/c/include/sysinfo.h
===================================================================
--- uspace/lib/c/include/sysinfo.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/c/include/sysinfo.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #define LIBC_SYSINFO_H_
 
-#include <sys/types.h>
+#include <types/common.h>
 #include <stddef.h>
 #include <stdbool.h>
Index: uspace/lib/c/include/types/common.h
===================================================================
--- uspace/lib/c/include/types/common.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
+++ uspace/lib/c/include/types/common.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Jiri Zarevucky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_TYPES_COMMON_H_
+#define LIBC_TYPES_COMMON_H_
+
+#include <libarch/types.h>
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/drv/include/ddf/interrupt.h
===================================================================
--- uspace/lib/drv/include/ddf/interrupt.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/drv/include/ddf/interrupt.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -37,5 +37,5 @@
 
 #include <libarch/common.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <abi/ddi/irq.h>
 #include <adt/list.h>
Index: uspace/lib/hound/src/client.c
===================================================================
--- uspace/lib/hound/src/client.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/hound/src/client.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -41,5 +41,5 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include <task.h>
 
Index: uspace/lib/hound/src/protocol.c
===================================================================
--- uspace/lib/hound/src/protocol.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/hound/src/protocol.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -41,5 +41,5 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #include "protocol.h"
Index: uspace/lib/posix/include/posix/strings.h
===================================================================
--- uspace/lib/posix/include/posix/strings.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/posix/include/posix/strings.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -42,5 +42,5 @@
 
 
-#include <sys/types.h>
+#include <types/common.h>
 
 /* Search Functions */
Index: uspace/lib/posix/include/posix/sys/types.h
===================================================================
--- uspace/lib/posix/include/posix/sys/types.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/posix/include/posix/sys/types.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -43,5 +43,5 @@
 #include "libc/offset.h"
 #include "libc/sys/time.h"
-#include "libc/sys/types.h"
+#include "libc/types/common.h"
 
 typedef unsigned int __POSIX_DEF__(ino_t);
Index: uspace/lib/softrend/rectangle.h
===================================================================
--- uspace/lib/softrend/rectangle.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/softrend/rectangle.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 extern bool rectangle_intersect(
Index: uspace/lib/usb/include/usb/usb.h
===================================================================
--- uspace/lib/usb/include/usb/usb.h	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/lib/usb/include/usb/usb.h	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -38,5 +38,5 @@
 #include <stdbool.h>
 #include <stdint.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 /** Convert 16bit value from native (host) endianness to USB endianness. */
Index: uspace/srv/hid/output/proto/vt100.c
===================================================================
--- uspace/srv/hid/output/proto/vt100.c	(revision 2a7749d7cdfe920a4293c37d0e5d6658e7c6f75d)
+++ uspace/srv/hid/output/proto/vt100.c	(revision b08e98baa9f9a43decb28ff503b56eed801651fd)
@@ -36,5 +36,5 @@
 #include <malloc.h>
 #include <io/color.h>
-#include <sys/types.h>
+#include <types/common.h>
 #include "vt100.h"