Index: uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
 
 typedef struct {
Index: uspace/lib/c/arch/abs32le/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/abs32le/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_abs32le_FIBRIL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define SP_DELTA  0
Index: uspace/lib/c/arch/abs32le/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/syscall.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/abs32le/include/libarch/syscall.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,6 +37,6 @@
 #define LIBC_abs32le_SYSCALL_H_
 
-#include <sys/types.h>
 #include <abi/syscall.h>
+#include <libarch/types.h>
 
 #define __syscall0  __syscall
Index: uspace/lib/c/arch/abs32le/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
Index: uspace/lib/c/arch/abs32le/src/syscall.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/syscall.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/abs32le/src/syscall.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,4 @@
  */
 
-#include <sys/types.h>
 #include <libarch/syscall.h>
 
Index: uspace/lib/c/arch/abs32le/src/tls.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/abs32le/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,6 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 tcb_t * tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/amd64/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/amd64/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/amd64/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Linux kernel struct pt_regs structure.
Index: uspace/lib/c/arch/amd64/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/amd64/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/amd64/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,6 +31,9 @@
         includes : [
                 {
-                        include : <sys/types.h>
-                }
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
+                },
         ],
 
Index: uspace/lib/c/arch/amd64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/amd64/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/amd64/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/arch/amd64/src/tls.c
===================================================================
--- uspace/lib/c/arch/amd64/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/amd64/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/arm32/include/libarch/atomic.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/atomic.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/include/libarch/atomic.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,5 @@
 #include <atomicdflt.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 extern uintptr_t *ras_page;
Index: uspace/lib/c/arch/arm32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Linux kernel struct pt_regs structure.
Index: uspace/lib/c/arch/arm32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define LIBC_arm32_FIBRIL_H_
 
-#include <sys/types.h>
+#include <libarch/types.h>
 #include <align.h>
 #include <thread.h>
Index: uspace/lib/c/arch/arm32/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,6 +31,9 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
                 },
+                {
+                        include : <stdint.h>
+                }
         ],
 
Index: uspace/lib/c/arch/arm32/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/tls.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/include/libarch/tls.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define LIBC_arm32_TLS_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define CONFIG_TLS_VARIANT_1
Index: uspace/lib/c/arch/arm32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/arm32/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/arch/arm32/src/tls.c
===================================================================
--- uspace/lib/c/arch/arm32/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/arm32/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/ia32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Linux kernel struct pt_regs structure.
Index: uspace/lib/c/arch/ia32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_ia32_FIBRIL_H_
 
-#include <sys/types.h>
+#include <libarch/types.h>
 #include <libarch/fibril_context.h>
 
Index: uspace/lib/c/arch/ia32/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,8 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
                 }
         ],
Index: uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/include/libarch/rtld/dynamic.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,6 +36,4 @@
 #define LIBC_ia32_RTLD_DYNAMIC_H_
 
-#include <sys/types.h>
-
 typedef struct {
 	/* Empty. */
Index: uspace/lib/c/arch/ia32/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/syscall.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/include/libarch/syscall.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,6 +37,6 @@
 #define LIBC_ia32_SYSCALL_H_
 
-#include <sys/types.h>
 #include <abi/syscall.h>
+#include <libarch/types.h>
 
 #define __syscall0  __syscall_fast_func
Index: uspace/lib/c/arch/ia32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/ia32/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <libarch/config.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <stacktrace.h>
Index: uspace/lib/c/arch/ia32/src/tls.c
===================================================================
--- uspace/lib/c/arch/ia32/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia32/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <align.h>
 
Index: uspace/lib/c/arch/ia64/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia64/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 typedef struct {
Index: uspace/lib/c/arch/ia64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_ia64_FIBRIL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <align.h>
 #include <libarch/stack.h>
Index: uspace/lib/c/arch/ia64/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,8 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
                 }
         ],
Index: uspace/lib/c/arch/ia64/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/tls.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia64/include/libarch/tls.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define CONFIG_TLS_VARIANT_1
 
-#include <sys/types.h>
 
 /* This structure must be exactly 16 bytes long */
Index: uspace/lib/c/arch/ia64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/ia64/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ia64/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
Index: uspace/lib/c/arch/mips32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/mips32/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Linux kernel struct pt_regs structure.
Index: uspace/lib/c/arch/mips32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/mips32/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define LIBC_mips32_FIBRIL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <libarch/fibril_context.h>
 #include <libarch/stack.h>
Index: uspace/lib/c/arch/mips32/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/mips32/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,8 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
                 }
         ],
Index: uspace/lib/c/arch/mips32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/mips32/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/mips32/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
Index: uspace/lib/c/arch/mips32/src/tls.c
===================================================================
--- uspace/lib/c/arch/mips32/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/mips32/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 tcb_t * tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/ppc32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ppc32/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Linux kernel struct pt_regs structure.
Index: uspace/lib/c/arch/ppc32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ppc32/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_ppc32_FIBRIL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <libarch/fibril_context.h>
 
Index: uspace/lib/c/arch/ppc32/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ppc32/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,8 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
                 }
         ],
Index: uspace/lib/c/arch/ppc32/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ppc32/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/arch/ppc32/src/tls.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/ppc32/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/riscv64/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
 
 typedef struct {
Index: uspace/lib/c/arch/riscv64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_riscv64_FIBRIL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define SP_DELTA  0
Index: uspace/lib/c/arch/riscv64/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -32,5 +32,8 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
                 }
         ],
Index: uspace/lib/c/arch/riscv64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/syscall.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/include/libarch/syscall.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define LIBC_riscv64_SYSCALL_H_
 
-#include <sys/types.h>
 #include <abi/syscall.h>
 
Index: uspace/lib/c/arch/riscv64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <stacktrace.h>
Index: uspace/lib/c/arch/riscv64/src/syscall.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/syscall.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/src/syscall.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,4 @@
  */
 
-#include <sys/types.h>
 #include <libarch/syscall.h>
 
Index: uspace/lib/c/arch/riscv64/src/tls.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/riscv64/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,5 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)
Index: uspace/lib/c/arch/sparc64/include/libarch/atomic.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/atomic.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/include/libarch/atomic.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 
 #include <atomicdflt.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Atomic add operation.
Index: uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/include/libarch/elf_linux.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/istate.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 typedef struct {
Index: uspace/lib/c/arch/sparc64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/fibril.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/include/libarch/fibril.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <libarch/stack.h>
 #include <libarch/fibril_context.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <align.h>
 
Index: uspace/lib/c/arch/sparc64/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/fibril_context.ag	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/include/libarch/fibril_context.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,8 @@
         includes : [
                 {
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        include : <stdint.h>
                 }
         ],
Index: uspace/lib/c/arch/sparc64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/syscall.h	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/include/libarch/syscall.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,6 +36,7 @@
 #define LIBC_sparc64_SYSCALL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <abi/syscall.h>
+#include <libarch/types.h>
 
 #define __syscall0	__syscall
Index: uspace/lib/c/arch/sparc64/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/sparc64/src/stacktrace.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/src/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <libarch/stack.h>
Index: uspace/lib/c/arch/sparc64/src/tls.c
===================================================================
--- uspace/lib/c/arch/sparc64/src/tls.c	(revision 02082f32cd603472c3d7940abab98d4121cab8a9)
+++ uspace/lib/c/arch/sparc64/src/tls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <tls.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 tcb_t *tls_alloc_arch(void **data, size_t size)