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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -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 2b11c3c0cf74426080bd899202376055d7cb591d)
@@ -38,5 +38,5 @@
 #include <stdint.h>
 #include <abi/syscall.h>
-#include <sys/types.h>
+#include <types/common.h>
 
 #define __syscall0	__syscall