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