Index: uspace/lib/c/arch/ia32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/elf_linux.h	(revision d2bb25e777311fb1c2e3cb09e66bab0c8b523a13)
+++ 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 d2bb25e777311fb1c2e3cb09e66bab0c8b523a13)
+++ 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 d2bb25e777311fb1c2e3cb09e66bab0c8b523a13)
+++ 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 d2bb25e777311fb1c2e3cb09e66bab0c8b523a13)
+++ 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 d2bb25e777311fb1c2e3cb09e66bab0c8b523a13)
+++ 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