Index: kernel/arch/amd64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/amd64/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/amd64/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,9 @@
                 {
                         negative-guard: KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard: KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/arm32/include/arch/cp15.h
===================================================================
--- kernel/arch/arm32/include/arch/cp15.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/arm32/include/arch/cp15.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,5 @@
 #include <typedefs.h>
 #else
-#include <sys/types.h>
+#include <stdint.h>
 #endif
 
Index: kernel/arch/arm32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/arm32/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/arm32/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/ia32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/ia32/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/ia32/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,9 @@
                 {
                         negative-guard: KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard: KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/ia64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/ia64/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/ia64/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 },
                 {
Index: kernel/arch/mips32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/mips32/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/mips32/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/ppc32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/ppc32/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/ppc32/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/riscv64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/riscv64/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/riscv64/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
                 {
                         negative-guard: KERNEL,
-                        include : <sys/types.h>
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/sparc64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/sparc64/include/arch/istate_struct.ag	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ kernel/arch/sparc64/include/arch/istate_struct.ag	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: tools/autogen.py
===================================================================
--- tools/autogen.py	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ tools/autogen.py	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -98,4 +98,5 @@
 #define emit_constant(n, v) \
     asm volatile ("EMITTED_CONSTANT " str(n) \" = %%0\" :: \"i\" (v))
+#undef offsetof
 #define offsetof(t, m) ((size_t) &(((t *) 0)->m))
 
Index: tools/mkarray.py
===================================================================
--- tools/mkarray.py	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ tools/mkarray.py	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -99,5 +99,6 @@
 	header.write("#ifndef %s_H_\n" % label)
 	header.write("#define %s_H_\n\n" % label)
-	header.write("#include <sys/types.h>\n\n")
+	header.write("#include <stddef.h>\n")
+	header.write("#include <stdint.h>\n\n")
 	header.write("\n".join(header_ctx))
 	header.write("\n\n")
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <dirent.h>
 #include <getopt.h>
-#include <sys/types.h>
 #include <vfs/vfs.h>
 #include <str.h>
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -29,6 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <dirent.h>
-#include <sys/types.h>
 #include <getopt.h>
 #include <stdarg.h>
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,6 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <dirent.h>
-#include <sys/types.h>
 #include <macros.h>
 #include <getopt.h>
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,6 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <dirent.h>
-#include <sys/types.h>
 #include <str.h>
 #include <getopt.h>
Index: uspace/app/bithenge/test.c
===================================================================
--- uspace/app/bithenge/test.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/bithenge/test.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 #include <stdlib.h>
 #include <stddef.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <bithenge/blob.h>
 #include <bithenge/source.h>
Index: uspace/app/blkdump/blkdump.c
===================================================================
--- uspace/app/blkdump/blkdump.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/blkdump/blkdump.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,4 +40,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <block.h>
 #include <mem.h>
@@ -45,5 +46,4 @@
 #include <byteorder.h>
 #include <scsi/mmc.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 #include <inttypes.h>
Index: uspace/app/bnchmark/bnchmark.c
===================================================================
--- uspace/app/bnchmark/bnchmark.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/bnchmark/bnchmark.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,8 +40,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <mem.h>
 #include <loc.h>
 #include <byteorder.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 #include <inttypes.h>
Index: uspace/app/dnscfg/dnscfg.c
===================================================================
--- uspace/app/dnscfg/dnscfg.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/dnscfg/dnscfg.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,6 +42,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #define NAME "dnscfg"
Index: uspace/app/edit/search.h
===================================================================
--- uspace/app/edit/search.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/edit/search.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,4 +38,5 @@
 
 #include <str.h>
+#include <sys/types.h>
 
 struct search;
Index: uspace/app/getterm/getterm.c
===================================================================
--- uspace/app/getterm/getterm.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/getterm/getterm.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <task.h>
Index: uspace/app/inet/inet.c
===================================================================
--- uspace/app/inet/inet.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/inet/inet.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,6 +41,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #define NAME  "inet"
Index: uspace/app/loc/loc.c
===================================================================
--- uspace/app/loc/loc.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/loc/loc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,6 +37,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 
Index: uspace/app/mkexfat/exfat.h
===================================================================
--- uspace/app/mkexfat/exfat.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/mkexfat/exfat.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -32,5 +32,4 @@
  */
 
-#include <sys/types.h>
 #include <stdint.h>
 #include <stdbool.h>
Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/mkexfat/mkexfat.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,4 +38,6 @@
 
 #include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <block.h>
 #include <assert.h>
@@ -44,7 +46,5 @@
 #include <byteorder.h>
 #include <align.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
-#include <stdbool.h>
 #include <str.h>
 #include <getopt.h>
Index: uspace/app/mkfat/fat.h
===================================================================
--- uspace/app/mkfat/fat.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/mkfat/fat.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define FAT_FAT_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define BS_BLOCK		0
Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/mkfat/mkfat.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,9 +40,9 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <block.h>
 #include <mem.h>
 #include <loc.h>
 #include <byteorder.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 #include <inttypes.h>
Index: uspace/app/netecho/comm.c
===================================================================
--- uspace/app/netecho/comm.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/netecho/comm.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -43,6 +43,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #include "comm.h"
Index: uspace/app/netecho/comm.h
===================================================================
--- uspace/app/netecho/comm.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/netecho/comm.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define COMM_H
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int comm_open_listen(const char *);
Index: uspace/app/netecho/netecho.h
===================================================================
--- uspace/app/netecho/netecho.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/netecho/netecho.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define NETECHO_H
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern void netecho_received(void *, size_t);
Index: uspace/app/nic/nic.c
===================================================================
--- uspace/app/nic/nic.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/nic/nic.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,6 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #define NAME  "nic"
Index: uspace/app/nterm/conn.c
===================================================================
--- uspace/app/nterm/conn.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/nterm/conn.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,4 @@
 
 #include <byteorder.h>
-#include <stdbool.h>
 #include <errno.h>
 #include <fibril.h>
@@ -42,6 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #include "conn.h"
Index: uspace/app/nterm/conn.h
===================================================================
--- uspace/app/nterm/conn.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/nterm/conn.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define CONN_H
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int conn_open(const char *);
Index: uspace/app/nterm/nterm.h
===================================================================
--- uspace/app/nterm/nterm.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/nterm/nterm.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define NTERM_H
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern void nterm_received(void *, size_t);
Index: uspace/app/ping/ping.c
===================================================================
--- uspace/app/ping/ping.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/ping/ping.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,4 @@
 
 #include <async.h>
-#include <stdbool.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -42,9 +41,11 @@
 #include <io/console.h>
 #include <getopt.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <str.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #define NAME "ping"
Index: uspace/app/redir/redir.c
===================================================================
--- uspace/app/redir/redir.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/redir/redir.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,4 @@
  */
 
-#include <sys/types.h>
 #include <stdlib.h>
 #include <str.h>
Index: uspace/app/sbi/src/bigint_t.h
===================================================================
--- uspace/app/sbi/src/bigint_t.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/sbi/src/bigint_t.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,6 +30,7 @@
 #define BIGINT_T_H_
 
-#include <sys/types.h>
 #include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
 
 typedef uint8_t bigint_word_t;
@@ -47,5 +48,5 @@
 
 	/** Sign. */
-	bool_t negative;
+	bool negative;
 
 	/** Digits starting from the least significant. */
Index: uspace/app/sysinfo/sysinfo.c
===================================================================
--- uspace/app/sysinfo/sysinfo.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/sysinfo/sysinfo.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <sysinfo.h>
 #include <malloc.h>
-#include <sys/types.h>
 
 static void dump_bytes_hex(char *data, size_t size)
Index: uspace/app/sysinst/futil.c
===================================================================
--- uspace/app/sysinst/futil.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/sysinst/futil.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,6 +38,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <vfs/vfs.h>
-#include <sys/types.h>
 #include <dirent.h>
 
Index: uspace/app/sysinst/futil.h
===================================================================
--- uspace/app/sysinst/futil.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/sysinst/futil.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int futil_copy_file(const char *, const char *);
Index: uspace/app/taskdump/elf_core.c
===================================================================
--- uspace/app/taskdump/elf_core.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/taskdump/elf_core.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -52,8 +52,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <stddef.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <mem.h>
-#include <stdint.h>
 #include <as.h>
 #include <udebug.h>
Index: uspace/app/taskdump/include/symtab.h
===================================================================
--- uspace/app/taskdump/include/symtab.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/taskdump/include/symtab.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <elf/elf.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 typedef struct {
Index: uspace/app/taskdump/symtab.c
===================================================================
--- uspace/app/taskdump/symtab.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/taskdump/symtab.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,6 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <vfs/vfs.h>
 
Index: uspace/app/taskdump/taskdump.c
===================================================================
--- uspace/app/taskdump/taskdump.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/taskdump/taskdump.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,14 +38,14 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <udebug.h>
 #include <task.h>
 #include <as.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 #include <libarch/istate.h>
 #include <macros.h>
 #include <assert.h>
-#include <stdbool.h>
 
 #include <symtab.h>
Index: uspace/app/tester/hw/misc/virtchar1.c
===================================================================
--- uspace/app/tester/hw/misc/virtchar1.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tester/hw/misc/virtchar1.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <errno.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <async.h>
 #include <char_dev_iface.h>
Index: uspace/app/tester/hw/serial/serial1.c
===================================================================
--- uspace/app/tester/hw/serial/serial1.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tester/hw/serial/serial1.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,4 @@
 #include <stdio.h>
 #include <stddef.h>
-#include <sys/types.h>
 #include <async.h>
 #include <thread.h>
Index: uspace/app/tester/mm/common.h
===================================================================
--- uspace/app/tester/mm/common.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tester/mm/common.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define MM_COMMON_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdbool.h>
 #include <adt/list.h>
Index: uspace/app/tester/tester.h
===================================================================
--- uspace/app/tester/tester.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tester/tester.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define TESTER_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 #include <stacktrace.h>
Index: uspace/app/tester/vfs/vfs1.c
===================================================================
--- uspace/app/tester/vfs/vfs1.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tester/vfs/vfs1.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,9 +30,9 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include <vfs/vfs.h>
 #include <dirent.h>
 #include <loc.h>
-#include <sys/types.h>
 #include "../tester.h"
 
Index: uspace/app/testread/testread.c
===================================================================
--- uspace/app/testread/testread.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/testread/testread.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -49,8 +49,9 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <mem.h>
 #include <loc.h>
 #include <byteorder.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 #include <inttypes.h>
Index: uspace/app/tetris/screen.h
===================================================================
--- uspace/app/tetris/screen.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tetris/screen.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -55,5 +55,5 @@
 #define putpad(s)  tputs(s, 1, put)
 
-#include <sys/types.h>
+#include <libarch/types.h>
 #include <io/console.h>
 #include <async.h>
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/tetris/tetris.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -56,5 +56,4 @@
 
 #include <sys/time.h>
-#include <sys/types.h>
 #include <err.h>
 #include <errno.h>
Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/trace/trace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,4 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
 #include <fibril.h>
 #include <errno.h>
@@ -42,10 +45,8 @@
 #include <mem.h>
 #include <str.h>
-#include <stdbool.h>
 #include <loader/loader.h>
 #include <io/console.h>
 #include <io/keycode.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
 #include <sys/typefmt.h>
 #include <vfs/vfs.h>
Index: uspace/app/trace/trace.h
===================================================================
--- uspace/app/trace/trace.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/trace/trace.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define TRACE_H_
 
-#include <sys/types.h>
+#include <libarch/types.h>
 
 /**
Index: uspace/app/vuhid/items.h
===================================================================
--- uspace/app/vuhid/items.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/vuhid/items.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define VUK_ITEM_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 typedef uint8_t report_descriptor_data_t[];
Index: uspace/app/websrv/websrv.c
===================================================================
--- uspace/app/websrv/websrv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/app/websrv/websrv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,9 +34,10 @@
  */
 
-#include <stdbool.h>
 #include <errno.h>
 #include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdint.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <task.h>
Index: uspace/dist/src/c/demos/edit/edit.c
===================================================================
--- uspace/dist/src/c/demos/edit/edit.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/dist/src/c/demos/edit/edit.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdbool.h>
 #include <vfs/vfs.h>
 #include <io/console.h>
@@ -47,5 +48,4 @@
 #include <macros.h>
 #include <clipboard.h>
-#include <stdbool.h>
 
 #include "sheet.h"
Index: uspace/dist/src/c/demos/edit/sheet.h
===================================================================
--- uspace/dist/src/c/demos/edit/sheet.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/dist/src/c/demos/edit/sheet.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 
 #include <adt/list.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdbool.h>
 
Index: uspace/dist/src/c/demos/tetris/screen.h
===================================================================
--- uspace/dist/src/c/demos/tetris/screen.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/dist/src/c/demos/tetris/screen.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -55,5 +55,5 @@
 #define putpad(s)  tputs(s, 1, put)
 
-#include <sys/types.h>
+#include <libarch/types.h>
 #include <io/console.h>
 #include <async.h>
Index: uspace/dist/src/c/demos/tetris/tetris.c
===================================================================
--- uspace/dist/src/c/demos/tetris/tetris.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/dist/src/c/demos/tetris/tetris.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -56,5 +56,4 @@
 
 #include <sys/time.h>
-#include <sys/types.h>
 #include <err.h>
 #include <errno.h>
Index: uspace/drv/audio/hdaudio/spec/regs.h
===================================================================
--- uspace/drv/audio/hdaudio/spec/regs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/audio/hdaudio/spec/regs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define SPEC_REGS_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Stream Descriptor registers */
Index: uspace/drv/block/ahci/ahci.h
===================================================================
--- uspace/drv/block/ahci/ahci.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/block/ahci/ahci.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,8 +35,9 @@
 
 #include <async.h>
-#include <sys/types.h>
 #include <devman.h>
 #include <ddf/interrupt.h>
 #include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "ahci_hw.h"
 
Index: uspace/drv/block/ahci/ahci_hw.h
===================================================================
--- uspace/drv/block/ahci/ahci_hw.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/block/ahci/ahci_hw.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define __AHCI_HW_H__
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/block/ahci/ahci_sata.h
===================================================================
--- uspace/drv/block/ahci/ahci_sata.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/block/ahci/ahci_sata.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define __AHCI_SATA_H__
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/block/ata_bd/ata_bd.c
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/block/ata_bd/ata_bd.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -58,11 +58,11 @@
 #include <scsi/spc.h>
 #include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stddef.h>
 #include <str.h>
 #include <loc.h>
-#include <sys/types.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <byteorder.h>
 #include <task.h>
Index: uspace/drv/block/ata_bd/ata_bd.h
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/block/ata_bd/ata_bd.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,7 +39,8 @@
 #include <bd_srv.h>
 #include <ddf/driver.h>
-#include <sys/types.h>
 #include <fibril_synch.h>
 #include <str.h>
+#include <stdint.h>
+#include <stddef.h>
 #include "ata_hw.h"
 
Index: uspace/drv/block/ata_bd/ata_hw.h
===================================================================
--- uspace/drv/block/ata_bd/ata_hw.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/block/ata_bd/ata_hw.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define __ATA_HW_H__
 
-#include <sys/types.h>
+#include <stdint.h>
 
 enum {
Index: uspace/drv/bus/usb/ehci/ehci_regs.h
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_regs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/ehci_regs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,4 +34,5 @@
 #ifndef DRV_EHCI_EHCI_REGS_H
 #define DRV_EHCI_EHCI_REGS_H
+
 #include <sys/types.h>
 #include <byteorder.h>
Index: uspace/drv/bus/usb/ehci/ehci_rh.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 #include <mem.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stdint.h>
+#include <stddef.h>
 
 #include <usb/classes/hub.h>
Index: uspace/drv/bus/usb/ehci/ehci_rh.h
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/ehci_rh.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/usb.h>
Index: uspace/drv/bus/usb/ehci/endpoint_list.h
===================================================================
--- uspace/drv/bus/usb/ehci/endpoint_list.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/endpoint_list.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
 #include <usb/host/utils/malloc32.h>
 
Index: uspace/drv/bus/usb/ehci/hc.c
===================================================================
--- uspace/drv/bus/usb/ehci/hc.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,6 +40,6 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/ehci/hc.h
===================================================================
--- uspace/drv/bus/usb/ehci/hc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,5 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/host/hcd.h>
Index: uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #define DRV_EHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "link_pointer.h"
 
Index: uspace/drv/bus/usb/ehci/hw_struct/link_pointer.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/link_pointer.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hw_struct/link_pointer.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #define DRV_EHCI_HW_STRUCT_LINK_POINTER_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** EHCI link pointer, used by many data structures */
Index: uspace/drv/bus/usb/ehci/hw_struct/queue_head.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/queue_head.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hw_struct/queue_head.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/host/endpoint.h>
 #include <usb/host/utils/malloc32.h>
Index: uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #define DRV_EHCI_HW_STRUCT_SPLIT_ISO_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "link_pointer.h"
 
Index: uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,6 @@
 #define DRV_EHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "link_pointer.h"
 #include "mem_access.h"
Index: uspace/drv/bus/usb/ohci/endpoint_list.h
===================================================================
--- uspace/drv/bus/usb/ohci/endpoint_list.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/endpoint_list.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <assert.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/host/utils/malloc32.h>
 
Index: uspace/drv/bus/usb/ohci/hc.c
===================================================================
--- uspace/drv/bus/usb/ohci/hc.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/hc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,6 @@
 #include <stdlib.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/ohci/hc.h
===================================================================
--- uspace/drv/bus/usb/ohci/hc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/hc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,5 +44,5 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/host/hcd.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/host/endpoint.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/hcca.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 
 #include <malloc.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <macros.h>
 #include <assert.h>
Index: uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #include "completion_codes.h"
Index: uspace/drv/bus/usb/ohci/ohci_rh.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_rh.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/ohci_rh.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #include <errno.h>
 #include <mem.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <usb/classes/hub.h>
Index: uspace/drv/bus/usb/ohci/ohci_rh.h
===================================================================
--- uspace/drv/bus/usb/ohci/ohci_rh.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/ohci/ohci_rh.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #include <usb/usb.h>
Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,6 +44,6 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str_error.h>
-#include <sys/types.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRV_UHCI_HW_STRUCT_LINK_POINTER_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** UHCI link pointer, used by many data structures */
Index: uspace/drv/bus/usb/uhci/hw_struct/queue_head.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/host/utils/malloc32.h>
 
Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,6 @@
 #include <usb/usb.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "link_pointer.h"
Index: uspace/drv/bus/usb/uhci/transfer_list.c
===================================================================
--- uspace/drv/bus/usb/uhci/transfer_list.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/uhci/transfer_list.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <errno.h>
 #include <libarch/barrier.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/debug.h>
 #include <usb/host/usb_transfer_batch.h>
Index: uspace/drv/bus/usb/uhci/uhci_batch.h
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/uhci/uhci_batch.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,5 @@
 #include <errno.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <usb/host/usb_transfer_batch.h>
 
Index: uspace/drv/bus/usb/usbhub/status.h
===================================================================
--- uspace/drv/bus/usb/usbhub/status.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/usbhub/status.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/dev/request.h>
 
Index: uspace/drv/bus/usb/usbmast/bo_trans.h
===================================================================
--- uspace/drv/bus/usb/usbmast/bo_trans.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/usbmast/bo_trans.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <scsi/spc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usb/usb.h>
 #include <usb/dev/pipes.h>
Index: uspace/drv/bus/usb/usbmast/cmdw.c
===================================================================
--- uspace/drv/bus/usb/usbmast/cmdw.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/usbmast/cmdw.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #include <byteorder.h>
 #include <mem.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/usb.h>
 #include "cmdw.h"
Index: uspace/drv/bus/usb/usbmast/cmdw.h
===================================================================
--- uspace/drv/bus/usb/usbmast/cmdw.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/usbmast/cmdw.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define CMDW_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <usb/usb.h>
 
Index: uspace/drv/bus/usb/usbmast/scsi_ms.h
===================================================================
--- uspace/drv/bus/usb/usbmast/scsi_ms.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/usbmast/scsi_ms.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <scsi/spc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usb/usb.h>
 #include <usb/dev/driver.h>
Index: uspace/drv/bus/usb/usbmast/usbmast.h
===================================================================
--- uspace/drv/bus/usb/usbmast/usbmast.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/bus/usb/usbmast/usbmast.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <bd_srv.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usb/usb.h>
 
Index: uspace/drv/char/pl050/pl050_hw.h
===================================================================
--- uspace/drv/char/pl050/pl050_hw.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/char/pl050/pl050_hw.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define PL050_HW_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 typedef struct {
Index: uspace/drv/fb/kfb/port.c
===================================================================
--- uspace/drv/fb/kfb/port.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/fb/kfb/port.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <abi/fb/visuals.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <errno.h>
 
Index: uspace/drv/nic/ar9271/htc.h
===================================================================
--- uspace/drv/nic/ar9271/htc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/nic/ar9271/htc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,6 @@
 #include <fibril_synch.h>
 #include <usb/dev/driver.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <nic.h>
 #include "ath.h"
Index: uspace/drv/nic/rtl8139/defs.h
===================================================================
--- uspace/drv/nic/rtl8139/defs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/nic/rtl8139/defs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define RTL8139_DEFS_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <ddi.h>
 
Index: uspace/drv/nic/rtl8139/driver.h
===================================================================
--- uspace/drv/nic/rtl8139/driver.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/nic/rtl8139/driver.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,5 @@
 #define RTL8139_DRIVER_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "defs.h"
Index: uspace/drv/nic/rtl8169/defs.h
===================================================================
--- uspace/drv/nic/rtl8169/defs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/nic/rtl8169/defs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define RTL8169_DEFS_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <ddi.h>
 
Index: uspace/drv/nic/rtl8169/driver.h
===================================================================
--- uspace/drv/nic/rtl8169/driver.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/drv/nic/rtl8169/driver.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,5 @@
 #define RTL8169_DRIVER_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "defs.h"
Index: uspace/lib/bithenge/include/bithenge/tree.h
===================================================================
--- uspace/lib/bithenge/include/bithenge/tree.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/bithenge/include/bithenge/tree.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,4 @@
 
 #include <assert.h>
-#include <sys/types.h>
 #include "os.h"
 
Index: uspace/lib/bithenge/src/failure.c
===================================================================
--- uspace/lib/bithenge/src/failure.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/bithenge/src/failure.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <sys/wait.h>
 #define BITHENGE_FAILURE_DECLS_ONLY 1
Index: uspace/lib/bithenge/src/failure.h
===================================================================
--- uspace/lib/bithenge/src/failure.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/bithenge/src/failure.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 int bithenge_should_fail(void);
Index: uspace/lib/bithenge/src/file.c
===================================================================
--- uspace/lib/bithenge/src/file.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/bithenge/src/file.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,5 @@
 #include <stdlib.h>
 #include <vfs/vfs.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include "common.h"
 #include <bithenge/blob.h>
Index: uspace/lib/block/block.h
===================================================================
--- uspace/lib/block/block.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/block/block.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 #define LIBBLOCK_LIBBLOCK_H_
 
-#include <stdint.h>
+#include <sys/types.h>
 #include <async.h>
 #include <fibril_synch.h>
Index: uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/elf_linux.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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 e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ 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)
Index: uspace/lib/c/generic/as.c
===================================================================
--- uspace/lib/c/generic/as.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/as.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 #include <errno.h>
 #include <align.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <bitops.h>
 #include <malloc.h>
Index: uspace/lib/c/generic/bd.c
===================================================================
--- uspace/lib/c/generic/bd.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/bd.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,4 +44,5 @@
 #include <macros.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 static void bd_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
Index: uspace/lib/c/generic/bd_srv.c
===================================================================
--- uspace/lib/c/generic/bd_srv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/bd_srv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <bd_srv.h>
Index: uspace/lib/c/generic/cap.c
===================================================================
--- uspace/lib/c/generic/cap.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/cap.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,4 +38,5 @@
 #include <task.h>
 #include <libc.h>
+#include <libarch/types.h>
 
 /** Grant capabilities to a task.
Index: uspace/lib/c/generic/dirent.c
===================================================================
--- uspace/lib/c/generic/dirent.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/dirent.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #include <stdlib.h>
 #include <dirent.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/c/generic/elf/elf_mod.c
===================================================================
--- uspace/lib/c/generic/elf/elf_mod.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/elf/elf_mod.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -47,5 +47,6 @@
 #include <stdio.h>
 #include <vfs/vfs.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <align.h>
 #include <assert.h>
Index: uspace/lib/c/generic/io/chardev_srv.c
===================================================================
--- uspace/lib/c/generic/io/chardev_srv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/io/chardev_srv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 static chardev_srv_t *chardev_srv_create(chardev_srvs_t *);
Index: uspace/lib/c/generic/io/con_srv.c
===================================================================
--- uspace/lib/c/generic/io/con_srv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/io/con_srv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <ipc/console.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 #include <io/con_srv.h>
Index: uspace/lib/c/generic/io/kio.c
===================================================================
--- uspace/lib/c/generic/io/kio.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/io/kio.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <libc.h>
 #include <str.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <errno.h>
 #include <abi/kio.h>
Index: uspace/lib/c/generic/io/klog.c
===================================================================
--- uspace/lib/c/generic/io/klog.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/io/klog.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,6 @@
 #include <libc.h>
 #include <str.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <errno.h>
 #include <abi/klog.h>
Index: uspace/lib/c/generic/iplink_srv.c
===================================================================
--- uspace/lib/c/generic/iplink_srv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/iplink_srv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <ipc/iplink.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <inet/addr.h>
 #include <inet/iplink_srv.h>
Index: uspace/lib/c/generic/mem.c
===================================================================
--- uspace/lib/c/generic/mem.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/mem.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** Fill memory block with a constant value. */
Index: uspace/lib/c/generic/smc.c
===================================================================
--- uspace/lib/c/generic/smc.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/smc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 
 #include <libc.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <smc.h>
 
Index: uspace/lib/c/generic/stacktrace.c
===================================================================
--- uspace/lib/c/generic/stacktrace.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/stacktrace.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <stdio.h>
 #include <stddef.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <errno.h>
 
Index: uspace/lib/c/generic/udebug.c
===================================================================
--- uspace/lib/c/generic/udebug.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/udebug.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,6 @@
 
 #include <udebug.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <abi/ipc/methods.h>
 #include <async.h>
Index: uspace/lib/c/generic/vfs/mtab.c
===================================================================
--- uspace/lib/c/generic/vfs/mtab.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/vfs/mtab.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <stdlib.h>
 #include <dirent.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/c/generic/vfs/vfs.c
===================================================================
--- uspace/lib/c/generic/vfs/vfs.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/generic/vfs/vfs.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,6 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <ipc/services.h>
 #include <ns.h>
Index: uspace/lib/c/include/adt/checksum.h
===================================================================
--- uspace/lib/c/include/adt/checksum.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/adt/checksum.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBC_CHECKSUM_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 extern uint32_t compute_crc32(uint8_t *, size_t);
Index: uspace/lib/c/include/adt/gcdlcm.h
===================================================================
--- uspace/lib/c/include/adt/gcdlcm.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/adt/gcdlcm.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBC_GCDLCM_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define DECLARE_GCD(type, name) \
Index: uspace/lib/c/include/as.h
===================================================================
--- uspace/lib/c/include/as.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/as.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,7 @@
 #define LIBC_AS_H_
 
-#include <sys/types.h>
+#include <libarch/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <abi/mm/as.h>
 #include <libarch/config.h>
Index: uspace/lib/c/include/bitops.h
===================================================================
--- uspace/lib/c/include/bitops.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/bitops.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBC_BITOPS_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** Mask with bit @a n set. */
Index: uspace/lib/c/include/elf/elf.h
===================================================================
--- uspace/lib/c/include/elf/elf.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/elf/elf.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBC_ELF_H_
 
-#include <sys/types.h>
+#include <stdint.h>
+#include <libarch/types.h>
 #include <abi/elf.h>
 #include <libarch/elf.h>
Index: uspace/lib/c/include/elf/elf_mod.h
===================================================================
--- uspace/lib/c/include/elf/elf_mod.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/elf/elf_mod.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,6 @@
 
 #include <elf/elf.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <loader/pcb.h>
 
Index: uspace/lib/c/include/futex.h
===================================================================
--- uspace/lib/c/include/futex.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/futex.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <atomic.h>
-#include <sys/types.h>
 #include <libc.h>
 
Index: uspace/lib/c/include/inet/dhcp.h
===================================================================
--- uspace/lib/c/include/inet/dhcp.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/inet/dhcp.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_INET_DHCP_H_
 
-#include <sys/types.h>
 
 extern int dhcp_init(void);
Index: uspace/lib/c/include/inet/inet.h
===================================================================
--- uspace/lib/c/include/inet/inet.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/inet/inet.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <inet/addr.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <types/inet.h>
 
Index: uspace/lib/c/include/inet/inetcfg.h
===================================================================
--- uspace/lib/c/include/inet/inetcfg.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/inet/inetcfg.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <inet/inet.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <types/inetcfg.h>
 
Index: uspace/lib/c/include/inet/inetping.h
===================================================================
--- uspace/lib/c/include/inet/inetping.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/inet/inetping.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <inet/inet.h>
-#include <sys/types.h>
 #include <types/inetping.h>
 
Index: uspace/lib/c/include/io/chardev_srv.h
===================================================================
--- uspace/lib/c/include/io/chardev_srv.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/chardev_srv.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,5 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 typedef struct chardev_ops chardev_ops_t;
Index: uspace/lib/c/include/io/charfield.h
===================================================================
--- uspace/lib/c/include/io/charfield.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/charfield.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define LIBC_IO_CHARFIELD_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 #include <io/color.h>
Index: uspace/lib/c/include/io/chargrid.h
===================================================================
--- uspace/lib/c/include/io/chargrid.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/chargrid.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define LIBC_IO_CHARGRID_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <io/charfield.h>
 
Index: uspace/lib/c/include/io/con_srv.h
===================================================================
--- uspace/lib/c/include/io/con_srv.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/con_srv.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -46,5 +46,5 @@
 #include <stdbool.h>
 #include <sys/time.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 typedef struct con_ops con_ops_t;
Index: uspace/lib/c/include/io/input.h
===================================================================
--- uspace/lib/c/include/io/input.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/input.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <async.h>
 #include <io/kbd_event.h>
-#include <sys/types.h>
 
 struct input_ev_ops;
Index: uspace/lib/c/include/io/kio.h
===================================================================
--- uspace/lib/c/include/io/kio.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/kio.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_IO_KIO_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdarg.h>
 #include <io/verify.h>
Index: uspace/lib/c/include/io/klog.h
===================================================================
--- uspace/lib/c/include/io/klog.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/klog.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_IO_KLOG_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdarg.h>
 #include <io/verify.h>
Index: uspace/lib/c/include/io/log.h
===================================================================
--- uspace/lib/c/include/io/log.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/log.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,4 +38,5 @@
 #include <inttypes.h>
 #include <io/verify.h>
+#include <libarch/types.h>
 
 #include <abi/log.h>
Index: uspace/lib/c/include/io/mode.h
===================================================================
--- uspace/lib/c/include/io/mode.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/mode.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 
 #include <abi/fb/visuals.h>
-#include <sys/types.h>
 #include <adt/list.h>
 #include <io/pixel.h>
Index: uspace/lib/c/include/io/pixel.h
===================================================================
--- uspace/lib/c/include/io/pixel.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/pixel.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define LIBC_IO_PIXEL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define NARROW(channel, bits) \
Index: uspace/lib/c/include/io/pixelmap.h
===================================================================
--- uspace/lib/c/include/io/pixelmap.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/pixelmap.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define LIBC_IO_PIXELMAP_H_
 
-#include <sys/types.h>
 #include <stddef.h>
 #include <io/pixel.h>
Index: uspace/lib/c/include/io/pos_event.h
===================================================================
--- uspace/lib/c/include/io/pos_event.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/pos_event.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define LIBC_IO_POS_EVENT_H_
 
-#include <sys/types.h>
 
 typedef enum {
Index: uspace/lib/c/include/io/printf_core.h
===================================================================
--- uspace/lib/c/include/io/printf_core.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/printf_core.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_PRINTF_CORE_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdarg.h>
 
Index: uspace/lib/c/include/io/visualizer.h
===================================================================
--- uspace/lib/c/include/io/visualizer.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/visualizer.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_IO_VISUALIZER_H_
 
-#include <sys/types.h>
 #include <async.h>
 #include <io/mode.h>
Index: uspace/lib/c/include/io/window.h
===================================================================
--- uspace/lib/c/include/io/window.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/io/window.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <async.h>
 #include <loc.h>
Index: uspace/lib/c/include/ipc/common.h
===================================================================
--- uspace/lib/c/include/ipc/common.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/ipc/common.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_IPC_COMMON_H_
 
-#include <sys/types.h>
 #include <abi/ipc/ipc.h>
 #include <atomic.h>
Index: uspace/lib/c/include/ipc/ipc.h
===================================================================
--- uspace/lib/c/include/ipc/ipc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/ipc/ipc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,4 @@
 #define LIBC_IPC_H_
 
-#include <sys/types.h>
 #include <ipc/common.h>
 #include <abi/ipc/methods.h>
Index: uspace/lib/c/include/ipc/irq.h
===================================================================
--- uspace/lib/c/include/ipc/irq.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/ipc/irq.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_IPC_IRQ_H_
 
-#include <sys/types.h>
+#include <libarch/types.h>
 #include <abi/ddi/irq.h>
 
Index: uspace/lib/c/include/ipc/services.h
===================================================================
--- uspace/lib/c/include/ipc/services.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/ipc/services.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define LIBC_SERVICES_H_
 
-#include <sys/types.h>
 #include <abi/fourcc.h>
 
Index: uspace/lib/c/include/ipc/vfs.h
===================================================================
--- uspace/lib/c/include/ipc/vfs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/ipc/vfs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <ipc/common.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/include/libc.h
===================================================================
--- uspace/lib/c/include/libc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/libc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_LIBC_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <abi/syscall.h>
 #include <libarch/syscall.h>
Index: uspace/lib/c/include/loader/pcb.h
===================================================================
--- uspace/lib/c/include/loader/pcb.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/loader/pcb.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define LIBC_PCB_H_
 
-#include <sys/types.h>
 
 typedef void (*entry_point_t)(void);
Index: uspace/lib/c/include/malloc.h
===================================================================
--- uspace/lib/c/include/malloc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/malloc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_MALLOC_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern void *malloc(const size_t size)
Index: uspace/lib/c/include/mem.h
===================================================================
--- uspace/lib/c/include/mem.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/mem.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_MEM_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <cc.h>
 
Index: uspace/lib/c/include/nic/eth_phys.h
===================================================================
--- uspace/lib/c/include/nic/eth_phys.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/nic/eth_phys.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,5 @@
 #define LIBC_NIC_ETH_PHYS_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /*****************************************************/
Index: uspace/lib/c/include/ns.h
===================================================================
--- uspace/lib/c/include/ns.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/ns.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_NS_H_
 
-#include <sys/types.h>
 #include <ipc/services.h>
 #include <task.h>
Index: uspace/lib/c/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/include/rtld/elf_dyn.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/rtld/elf_dyn.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_RTLD_ELF_DYN_H_
 
-#include <sys/types.h>
 #include <elf/elf.h>
 #include <libarch/rtld/elf_dyn.h>
Index: uspace/lib/c/include/rtld/module.h
===================================================================
--- uspace/lib/c/include/rtld/module.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/rtld/module.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_RTLD_MODULE_H_
 
-#include <sys/types.h>
 #include <rtld/dynamic.h>
 #include <adt/list.h>
Index: uspace/lib/c/include/rtld/rtld.h
===================================================================
--- uspace/lib/c/include/rtld/rtld.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/rtld/rtld.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <adt/list.h>
 #include <elf/elf_mod.h>
-#include <sys/types.h>
 
 #include <rtld/dynamic.h>
Index: uspace/lib/c/include/rwlock.h
===================================================================
--- uspace/lib/c/include/rwlock.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/rwlock.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,4 @@
 
 #include <atomic.h>
-#include <sys/types.h>
 #include <futex.h>
 
Index: uspace/lib/c/include/smc.h
===================================================================
--- uspace/lib/c/include/smc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/smc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_SMC_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int smc_coherence(void *address, size_t size);
Index: uspace/lib/c/include/sort.h
===================================================================
--- uspace/lib/c/include/sort.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/sort.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_SORT_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/include/stacktrace.h
===================================================================
--- uspace/lib/c/include/stacktrace.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/stacktrace.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define LIBC_STACKTRACE_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/include/stats.h
===================================================================
--- uspace/lib/c/include/stats.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/stats.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,5 @@
 #include <stdint.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <abi/sysinfo.h>
 
Index: uspace/lib/c/include/stdarg.h
===================================================================
--- uspace/lib/c/include/stdarg.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/stdarg.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_STDARG_H_
 
-#include <sys/types.h>
 
 typedef __builtin_va_list va_list;
Index: uspace/lib/c/include/stddef.h
===================================================================
--- uspace/lib/c/include/stddef.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/stddef.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_STDDEF_H_
 
-#include <sys/types.h>
+#include <libarch/stddef.h>
 
 #ifndef NULL
Index: uspace/lib/c/include/str.h
===================================================================
--- uspace/lib/c/include/str.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/str.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <mem.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/c/include/sys/time.h
===================================================================
--- uspace/lib/c/include/sys/time.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/sys/time.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #define LIBC_SYS_TIME_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define DST_NONE  0
Index: uspace/lib/c/include/syscall.h
===================================================================
--- uspace/lib/c/include/syscall.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/syscall.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,6 +44,6 @@
 #endif
 
-#include <sys/types.h>
 #include <abi/syscall.h>
+#include <libarch/types.h>
 
 #define __syscall0  __syscall
Index: uspace/lib/c/include/sysinfo.h
===================================================================
--- uspace/lib/c/include/sysinfo.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/sysinfo.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_SYSINFO_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdbool.h>
 #include <abi/sysinfo.h>
Index: uspace/lib/c/include/task.h
===================================================================
--- uspace/lib/c/include/task.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/task.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,7 +36,7 @@
 #define LIBC_TASK_H_
 
-#include <sys/types.h>
+#include <stdint.h>
+#include <stdarg.h>
 #include <abi/proc/task.h>
-#include <stdarg.h>
 #include <async.h>
 #include <types/task.h>
Index: uspace/lib/c/include/thread.h
===================================================================
--- uspace/lib/c/include/thread.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/thread.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <libarch/thread.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <abi/proc/thread.h>
 #include <time.h>
Index: uspace/lib/c/include/tls.h
===================================================================
--- uspace/lib/c/include/tls.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/tls.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 
 #include <libarch/tls.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** DTV Generation number - equals vector length */
Index: uspace/lib/c/include/types/inet.h
===================================================================
--- uspace/lib/c/include/types/inet.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/types/inet.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #include <inet/addr.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define INET_TTL_MAX 255
Index: uspace/lib/c/include/types/inetcfg.h
===================================================================
--- uspace/lib/c/include/types/inetcfg.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/types/inetcfg.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <inet/inet.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 /** Address object info */
Index: uspace/lib/c/include/types/inetping.h
===================================================================
--- uspace/lib/c/include/types/inetping.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/types/inetping.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,6 @@
 
 #include <inet/addr.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 typedef struct {
Index: uspace/lib/c/include/types/rtld/module.h
===================================================================
--- uspace/lib/c/include/types/rtld/module.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/types/rtld/module.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <adt/list.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 typedef enum {
Index: uspace/lib/c/include/types/rtld/rtld.h
===================================================================
--- uspace/lib/c/include/types/rtld/rtld.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/types/rtld/rtld.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #include <adt/list.h>
 #include <elf/elf_mod.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <types/rtld/module.h>
Index: uspace/lib/c/include/udebug.h
===================================================================
--- uspace/lib/c/include/udebug.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/udebug.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 
 #include <abi/udebug.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <async.h>
 
Index: uspace/lib/c/include/vfs/canonify.h
===================================================================
--- uspace/lib/c/include/vfs/canonify.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/vfs/canonify.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBC_VFS_CANONIFY_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern char *canonify(char *, size_t *);
Index: uspace/lib/c/include/vfs/vfs.h
===================================================================
--- uspace/lib/c/include/vfs/vfs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/vfs/vfs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBC_VFS_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <ipc/vfs.h>
 #include <ipc/loc.h>
Index: uspace/lib/c/include/vfs/vfs_mtab.h
===================================================================
--- uspace/lib/c/include/vfs/vfs_mtab.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/c/include/vfs/vfs_mtab.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,4 @@
 #define LIBC_VFS_MTAB_H_
 
-#include <sys/types.h>
 #include <ipc/vfs.h>
 #include <adt/list.h>
Index: uspace/lib/compress/gzip.c
===================================================================
--- uspace/lib/compress/gzip.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/compress/gzip.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -27,5 +27,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stddef.h>
 #include <errno.h>
Index: uspace/lib/compress/gzip.h
===================================================================
--- uspace/lib/compress/gzip.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/compress/gzip.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,5 @@
 #define LIBCOMPRESS_GZIP_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int gzip_expand(void *, size_t, void **, size_t *);
Index: uspace/lib/compress/inflate.c
===================================================================
--- uspace/lib/compress/inflate.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/compress/inflate.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -64,5 +64,6 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
Index: uspace/lib/compress/inflate.h
===================================================================
--- uspace/lib/compress/inflate.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/compress/inflate.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,5 @@
 #define LIBCOMPRESS_INFLATE_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int inflate(void *, size_t, void *, size_t);
Index: uspace/lib/crypto/crypto.h
===================================================================
--- uspace/lib/crypto/crypto.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/crypto/crypto.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,6 @@
 #define LIBCRYPTO_H
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define AES_CIPHER_LENGTH  16
Index: uspace/lib/draw/codec/tga.gz.h
===================================================================
--- uspace/lib/draw/codec/tga.gz.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/codec/tga.gz.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRAW_CODEC_TGA_GZ_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include "../surface.h"
 
Index: uspace/lib/draw/codec/tga.h
===================================================================
--- uspace/lib/draw/codec/tga.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/codec/tga.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define DRAW_CODEC_TGA_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include "../surface.h"
 
Index: uspace/lib/draw/codec/webp.c
===================================================================
--- uspace/lib/draw/codec/webp.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/codec/webp.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,4 +40,5 @@
 #include <pixconv.h>
 #include <sys/types.h>
+#include <stdint.h>
 #include <abi/fourcc.h>
 #include "webp.h"
Index: uspace/lib/draw/codec/webp.h
===================================================================
--- uspace/lib/draw/codec/webp.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/codec/webp.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRAW_CODEC_WEBP_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include "../surface.h"
 
Index: uspace/lib/draw/cursor.h
===================================================================
--- uspace/lib/draw/cursor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/cursor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define DRAW_CURSOR_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #include "surface.h"
Index: uspace/lib/draw/cursor/embedded.c
===================================================================
--- uspace/lib/draw/cursor/embedded.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/cursor/embedded.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,6 @@
 
 #include <assert.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <malloc.h>
 
Index: uspace/lib/draw/drawctx.h
===================================================================
--- uspace/lib/draw/drawctx.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/drawctx.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define DRAW_DRAWCTX_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 
Index: uspace/lib/draw/font.h
===================================================================
--- uspace/lib/draw/font.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/font.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define DRAW_FONT_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #include "surface.h"
Index: uspace/lib/draw/font/bitmap_backend.h
===================================================================
--- uspace/lib/draw/font/bitmap_backend.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/font/bitmap_backend.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define DRAW_FONT_BITMAP_BACKEND_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #include "../font.h"
Index: uspace/lib/draw/font/embedded.c
===================================================================
--- uspace/lib/draw/font/embedded.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/font/embedded.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <malloc.h>
 #include <errno.h>
Index: uspace/lib/draw/font/pcf.c
===================================================================
--- uspace/lib/draw/font/pcf.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/font/pcf.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,6 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <malloc.h>
 #include <errno.h>
Index: uspace/lib/draw/gfx/cursor-11x18.h
===================================================================
--- uspace/lib/draw/gfx/cursor-11x18.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/gfx/cursor-11x18.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define CURSOR_11X18_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define CURSOR_WIDTH   11
Index: uspace/lib/draw/gfx/font-8x16.c
===================================================================
--- uspace/lib/draw/gfx/font-8x16.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/gfx/font-8x16.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "font-8x16.h"
 
Index: uspace/lib/draw/gfx/font-8x16.h
===================================================================
--- uspace/lib/draw/gfx/font-8x16.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/gfx/font-8x16.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define FONT_8X16_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/lib/draw/source.h
===================================================================
--- uspace/lib/draw/source.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/source.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define DRAW_SOURCE_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 
Index: uspace/lib/draw/surface.h
===================================================================
--- uspace/lib/draw/surface.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/draw/surface.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define DRAW_SURFACE_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 #include <io/pixelmap.h>
Index: uspace/lib/drv/generic/interrupt.c
===================================================================
--- uspace/lib/drv/generic/interrupt.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/drv/generic/interrupt.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <async.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <macros.h>
 
Index: uspace/lib/drv/include/ops/hw_res.h
===================================================================
--- uspace/lib/drv/include/ops/hw_res.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/drv/include/ops/hw_res.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 
 #include <device/hw_res.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "../ddf/driver.h"
 
Index: uspace/lib/drv/include/ops/pio_window.h
===================================================================
--- uspace/lib/drv/include/ops/pio_window.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/drv/include/ops/pio_window.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <device/pio_window.h>
-#include <sys/types.h>
 #include "../ddf/driver.h"
 
Index: uspace/lib/ext4/include/ext4/balloc.h
===================================================================
--- uspace/lib/ext4/include/ext4/balloc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/include/ext4/balloc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define LIBEXT4_BALLOC_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "types.h"
 
Index: uspace/lib/ext4/include/ext4/bitmap.h
===================================================================
--- uspace/lib/ext4/include/ext4/bitmap.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/include/ext4/bitmap.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define LIBEXT4_BITMAP_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 extern void ext4_bitmap_free_bit(uint8_t *, uint32_t);
Index: uspace/lib/ext4/include/ext4/block_group.h
===================================================================
--- uspace/lib/ext4/include/ext4/block_group.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/include/ext4/block_group.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <block.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "types.h"
 
Index: uspace/lib/ext4/include/ext4/hash.h
===================================================================
--- uspace/lib/ext4/include/ext4/hash.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/include/ext4/hash.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,4 @@
 #define LIBEXT4_HASH_H_
 
-#include <sys/types.h>
 #include "ext4/types.h"
 
Index: uspace/lib/ext4/include/ext4/inode.h
===================================================================
--- uspace/lib/ext4/include/ext4/inode.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/include/ext4/inode.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <block.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "ext4/types.h"
 
Index: uspace/lib/ext4/include/ext4/superblock.h
===================================================================
--- uspace/lib/ext4/include/ext4/superblock.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/include/ext4/superblock.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <block.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "ext4/types.h"
 
Index: uspace/lib/ext4/src/balloc.c
===================================================================
--- uspace/lib/ext4/src/balloc.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/src/balloc.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <errno.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "ext4/balloc.h"
 #include "ext4/bitmap.h"
Index: uspace/lib/ext4/src/bitmap.c
===================================================================
--- uspace/lib/ext4/src/bitmap.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ext4/src/bitmap.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <errno.h>
 #include <block.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "ext4/bitmap.h"
 
Index: uspace/lib/fs/libfs.h
===================================================================
--- uspace/lib/fs/libfs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/fs/libfs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 
 #include <ipc/vfs.h>
-#include <stdint.h>
+#include <sys/types.h>
 #include <async.h>
 #include <loc.h>
Index: uspace/lib/graph/graph.h
===================================================================
--- uspace/lib/graph/graph.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/graph/graph.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define GRAPH_GRAPH_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 #include <loc.h>
Index: uspace/lib/gui/button.h
===================================================================
--- uspace/lib/gui/button.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/button.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define GUI_BUTTON_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <io/pixel.h>
 
Index: uspace/lib/gui/canvas.h
===================================================================
--- uspace/lib/gui/canvas.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/canvas.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <io/pixel.h>
 #include <surface.h>
Index: uspace/lib/gui/common.c
===================================================================
--- uspace/lib/gui/common.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/common.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,6 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <drawctx.h>
 #include "common.h"
Index: uspace/lib/gui/common.h
===================================================================
--- uspace/lib/gui/common.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/common.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define GUI_COMMON_H_
 
-#include <sys/types.h>
 #include <drawctx.h>
 
Index: uspace/lib/gui/connection.h
===================================================================
--- uspace/lib/gui/connection.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/connection.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define GUI_CONNECTION_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include "widget.h"
 
Index: uspace/lib/gui/grid.h
===================================================================
--- uspace/lib/gui/grid.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/grid.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define GUI_GRID_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <io/pixel.h>
 #include "widget.h"
Index: uspace/lib/gui/label.h
===================================================================
--- uspace/lib/gui/label.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/label.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define GUI_LABEL_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <io/pixel.h>
 
Index: uspace/lib/gui/minimal.h
===================================================================
--- uspace/lib/gui/minimal.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/minimal.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <io/pixel.h>
 
Index: uspace/lib/gui/terminal.h
===================================================================
--- uspace/lib/gui/terminal.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/terminal.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #define GUI_TERMINAL_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <fibril_synch.h>
 #include <font.h>
Index: uspace/lib/gui/widget.h
===================================================================
--- uspace/lib/gui/widget.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/widget.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define GUI_WIDGET_H_
 
-#include <sys/types.h>
 #include <adt/list.h>
 #include <io/window.h>
Index: uspace/lib/gui/window.h
===================================================================
--- uspace/lib/gui/window.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/gui/window.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define GUI_WINDOW_H_
 
-#include <sys/types.h>
 #include <async.h>
 #include <adt/prodcons.h>
Index: uspace/lib/ieee80211/include/ieee80211_private.h
===================================================================
--- uspace/lib/ieee80211/include/ieee80211_private.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/ieee80211/include/ieee80211_private.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -43,5 +43,6 @@
 #include <byteorder.h>
 #include <ddf/driver.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <ieee80211/ieee80211.h>
 #include "ieee80211.h"
Index: uspace/lib/label/include/std/gpt.h
===================================================================
--- uspace/lib/label/include/std/gpt.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/label/include/std/gpt.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBLABEL_STD_GPT_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 enum {
Index: uspace/lib/minix/minix.h
===================================================================
--- uspace/lib/minix/minix.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/minix/minix.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define _MINIX_FS_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define MFS_BLOCKSIZE		1024
Index: uspace/lib/nic/include/nic_ev.h
===================================================================
--- uspace/lib/nic/include/nic_ev.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/nic/include/nic_ev.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,5 @@
 #include <async.h>
 #include <nic/nic.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 extern int nic_ev_addr_changed(async_sess_t *, const nic_address_t *);
Index: uspace/lib/pcut/src/os/generic.c
===================================================================
--- uspace/lib/pcut/src/os/generic.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/pcut/src/os/generic.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,4 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/pcut/src/os/helenos.c
===================================================================
--- uspace/lib/pcut/src/os/helenos.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/pcut/src/os/helenos.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,4 @@
 #include <str.h>
 #include <str_error.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/pcut/src/os/unix.c
===================================================================
--- uspace/lib/pcut/src/os/unix.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/pcut/src/os/unix.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <signal.h>
 #include <errno.h>
Index: uspace/lib/softrend/rectangle.h
===================================================================
--- uspace/lib/softrend/rectangle.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/softrend/rectangle.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 #define SOFTREND_RECTANGLE_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 
Index: uspace/lib/usb/include/usb/classes/hub.h
===================================================================
--- uspace/lib/usb/include/usb/classes/hub.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usb/include/usb/classes/hub.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBUSB_CLASS_HUB_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Hub class feature selector.
Index: uspace/lib/usb/include/usb/debug.h
===================================================================
--- uspace/lib/usb/include/usb/debug.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usb/include/usb/debug.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBUSB_DEBUG_H_
 #include <stdio.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <io/log.h>
 
Index: uspace/lib/usb/include/usb/descriptor.h
===================================================================
--- uspace/lib/usb/include/usb/descriptor.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usb/include/usb/descriptor.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBUSB_DESCRIPTOR_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Descriptor type. */
Index: uspace/lib/usb/include/usb/request.h
===================================================================
--- uspace/lib/usb/include/usb/request.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usb/include/usb/request.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define LIBUSB_REQUEST_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Standard device request. */
Index: uspace/lib/usb/include/usb/usb.h
===================================================================
--- uspace/lib/usb/include/usb/usb.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usb/include/usb/usb.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <byteorder.h>
 
Index: uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,6 @@
 
 #include <usb/descriptor.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** Wrapper for data related to alternate interface setting.
Index: uspace/lib/usbdev/include/usb/dev/dp.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/dp.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/include/usb/dev/dp.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBUSBDEV_DP_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** USB descriptors nesting.
Index: uspace/lib/usbdev/include/usb/dev/pipes.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/pipes.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/include/usb/dev/pipes.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,6 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define CTRL_PIPE_MIN_PACKET_SIZE 8
Index: uspace/lib/usbdev/include/usb/dev/poll.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/poll.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/include/usb/dev/poll.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,6 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** Parameters and callbacks for automated polling. */
Index: uspace/lib/usbdev/include/usb/dev/request.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/request.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/include/usb/dev/request.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define LIBUSBDEV_REQUEST_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <l18n/langs.h>
 #include <usb/usb.h>
Index: uspace/lib/usbdev/src/devpoll.c
===================================================================
--- uspace/lib/usbdev/src/devpoll.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/src/devpoll.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -50,5 +50,6 @@
 #include <stdlib.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** Maximum number of failed consecutive requests before announcing failure. */
Index: uspace/lib/usbdev/src/dp.c
===================================================================
--- uspace/lib/usbdev/src/dp.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/src/dp.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -49,5 +49,5 @@
 #include <stdbool.h>
 #include <stddef.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 #define NESTING(parentname, childname) \
Index: uspace/lib/usbdev/src/recognise.c
===================================================================
--- uspace/lib/usbdev/src/recognise.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbdev/src/recognise.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,4 @@
 #include <errno.h>
 #include <stdio.h>
-#include <sys/types.h>
 
 /** Get integer part from BCD coded number. */
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,5 +44,6 @@
 #include <assert.h>
 #include <usbhc_iface.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 typedef struct hcd hcd_t;
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,6 @@
 #include <assert.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <usbhc_iface.h>
 
Index: uspace/lib/usbhost/include/usb/host/utils/malloc32.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/utils/malloc32.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/lib/usbhost/include/usb/host/utils/malloc32.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,6 @@
 #include <errno.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /* Generic TDs and EDs require 16byte alignment,
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -45,5 +45,6 @@
 #include <fibril_synch.h>
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/typefmt.h>
 #include <errno.h>
Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <bd_srv.h>
 #include <devman.h>
Index: uspace/srv/bd/sata_bd/sata_bd.h
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/bd/sata_bd/sata_bd.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,6 @@
 #include <bd_srv.h>
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /** SATA Block Device. */
Index: uspace/srv/bd/vbd/types/vbd.h
===================================================================
--- uspace/srv/bd/vbd/types/vbd.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/bd/vbd/types/vbd.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,5 +44,5 @@
 #include <loc.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <types/label.h>
 
Index: uspace/srv/devman/match.c
===================================================================
--- uspace/srv/devman/match.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/devman/match.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,5 @@
 #include <str.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <vfs/vfs.h>
 
Index: uspace/srv/fs/cdfs/cdfs_endian.h
===================================================================
--- uspace/srv/fs/cdfs/cdfs_endian.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/cdfs/cdfs_endian.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define CDFS_CDFS_ENDIAN_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #if !(defined(__BE__) ^ defined(__LE__))
Index: uspace/srv/fs/exfat/exfat.h
===================================================================
--- uspace/srv/fs/exfat/exfat.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/exfat/exfat.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 #include <libfs.h>
 #include <atomic.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include "../../vfs/vfs.h"
Index: uspace/srv/fs/fat/fat.h
===================================================================
--- uspace/srv/fs/fat/fat.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/fat/fat.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 #include <libfs.h>
 #include <atomic.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <macros.h>
Index: uspace/srv/fs/fat/fat_dentry.c
===================================================================
--- uspace/srv/fs/fat/fat_dentry.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/fat/fat_dentry.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -44,5 +44,5 @@
 #include <assert.h>
 #include <stddef.h>
-#include <sys/types.h>
+#include <stdint.h>
 
 /** Compare path component with the name read from the dentry.
Index: uspace/srv/fs/tmpfs/tmpfs.h
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/tmpfs/tmpfs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #include <libfs.h>
 #include <atomic.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdbool.h>
 #include <adt/hash_table.h>
Index: uspace/srv/fs/tmpfs/tmpfs_dump.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -42,5 +42,6 @@
 #include <stdlib.h>
 #include <str.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <as.h>
 #include <block.h>
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -48,5 +48,5 @@
 #include <stdio.h>
 #include <assert.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <adt/hash_table.h>
 #include <adt/hash.h>
Index: uspace/srv/fs/udf/udf.h
===================================================================
--- uspace/srv/fs/udf/udf.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/udf/udf.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #include <libfs.h>
 #include <atomic.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include "../../vfs/vfs.h"
Index: uspace/srv/fs/udf/udf_cksum.h
===================================================================
--- uspace/srv/fs/udf/udf_cksum.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/udf/udf_cksum.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,6 @@
 #define UDF_CKSUM_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 
Index: uspace/srv/fs/udf/udf_file.h
===================================================================
--- uspace/srv/fs/udf/udf_file.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/udf/udf_file.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,6 @@
 #define UDF_FILE_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <ipc/loc.h>
 #include <block.h>
Index: uspace/srv/fs/udf/udf_osta.h
===================================================================
--- uspace/srv/fs/udf/udf_osta.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/udf/udf_osta.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,6 @@
 #define UDF_OSTA_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include "udf_types.h"
Index: uspace/srv/fs/udf/udf_types.h
===================================================================
--- uspace/srv/fs/udf/udf_types.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/udf/udf_types.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define UDF_UDF_TYPES_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <byteorder.h>
Index: uspace/srv/fs/udf/udf_volume.h
===================================================================
--- uspace/srv/fs/udf/udf_volume.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/fs/udf/udf_volume.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,5 @@
 #define UDF_UDF_VOLUME_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <ipc/loc.h>
 #include "udf_types.h"
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/compositor/compositor.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -33,5 +33,6 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <errno.h>
Index: uspace/srv/hid/input/kbd_port.h
===================================================================
--- uspace/srv/hid/input/kbd_port.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/input/kbd_port.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define KBD_PORT_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 struct kbd_dev;
Index: uspace/srv/hid/input/layout.h
===================================================================
--- uspace/srv/hid/input/layout.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/input/layout.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define KBD_LAYOUT_H_
 
-#include <sys/types.h>
 #include <io/console.h>
 
Index: uspace/srv/hid/input/mouse_port.h
===================================================================
--- uspace/srv/hid/input/mouse_port.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/input/mouse_port.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define MOUSE_PORT_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 struct mouse_dev;
Index: uspace/srv/hid/input/port/ski.c
===================================================================
--- uspace/srv/hid/input/port/ski.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/input/port/ski.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <thread.h>
 #include <stdbool.h>
Index: uspace/srv/hid/output/ctl/serial.c
===================================================================
--- uspace/srv/hid/output/ctl/serial.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/ctl/serial.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,4 @@
  */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <io/chargrid.h>
Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/output.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -27,5 +27,5 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <errno.h>
 #include <malloc.h>
Index: uspace/srv/hid/output/output.h
===================================================================
--- uspace/srv/hid/output/output.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/output.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,4 @@
 #define OUTPUT_OUTPUT_H_
 
-#include <sys/types.h>
 #include <stdbool.h>
 #include <loc.h>
Index: uspace/srv/hid/output/port/chardev.c
===================================================================
--- uspace/srv/hid/output/port/chardev.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/port/chardev.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,6 @@
  */
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <char_dev_iface.h>
 #include <stdio.h>
Index: uspace/srv/hid/output/port/kchar.c
===================================================================
--- uspace/srv/hid/output/port/kchar.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/port/kchar.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <errno.h>
 #include <str.h>
Index: uspace/srv/hid/output/port/niagara.c
===================================================================
--- uspace/srv/hid/output/port/niagara.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/port/niagara.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -32,5 +32,5 @@
  */
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <errno.h>
 #include <sysinfo.h>
Index: uspace/srv/hid/output/port/ski.c
===================================================================
--- uspace/srv/hid/output/port/ski.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/port/ski.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -31,5 +31,4 @@
  */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <sysinfo.h>
Index: uspace/srv/hid/output/proto/vt100.c
===================================================================
--- uspace/srv/hid/output/proto/vt100.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/proto/vt100.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -30,5 +30,4 @@
  */
 
-#include <sys/types.h>
 #include <inttypes.h>
 #include <errno.h>
Index: uspace/srv/hid/output/proto/vt100.h
===================================================================
--- uspace/srv/hid/output/proto/vt100.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/output/proto/vt100.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -33,5 +33,4 @@
 #define OUTPUT_PROTO_VT100_H_
 
-#include <sys/types.h>
 #include <io/charfield.h>
 
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define S3C24XX_TS_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <async.h>
 
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <ddi.h>
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.h
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,6 @@
 #define CUDA_ADB_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <async.h>
 #include <fibril_synch.h>
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define S3C24XX_UART_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <async.h>
 
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/loader/main.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -47,5 +47,5 @@
 #include <stdlib.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <ipc/services.h>
 #include <ipc/loader.h>
Index: uspace/srv/locsrv/locsrv.h
===================================================================
--- uspace/srv/locsrv/locsrv.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/locsrv/locsrv.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 #include <async.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 /** Representation of server (supplier).
Index: uspace/srv/net/dhcp/transport.h
===================================================================
--- uspace/srv/net/dhcp/transport.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/dhcp/transport.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -40,5 +40,5 @@
 #include <inet/udp.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 struct dhcp_transport;
Index: uspace/srv/net/ethip/ethip.h
===================================================================
--- uspace/srv/net/ethip/ethip.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/ethip/ethip.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -43,5 +43,6 @@
 #include <inet/addr.h>
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 typedef struct {
Index: uspace/srv/net/ethip/std.h
===================================================================
--- uspace/srv/net/ethip/std.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/ethip/std.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define ETHIP_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <inet/addr.h>
 
Index: uspace/srv/net/inetsrv/addrobj.h
===================================================================
--- uspace/srv/net/inetsrv/addrobj.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/addrobj.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #define INET_ADDROBJ_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/inetsrv/icmp_std.h
===================================================================
--- uspace/srv/net/inetsrv/icmp_std.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/icmp_std.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define ICMP_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP_PROTO_ICMP 1
Index: uspace/srv/net/inetsrv/icmpv6_std.h
===================================================================
--- uspace/srv/net/inetsrv/icmpv6_std.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/icmpv6_std.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define ICMPV6_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP_PROTO_ICMPV6  58
Index: uspace/srv/net/inetsrv/inet_link.h
===================================================================
--- uspace/srv/net/inetsrv/inet_link.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/inet_link.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #define INET_LINK_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/inetsrv/inet_std.h
===================================================================
--- uspace/srv/net/inetsrv/inet_std.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/inet_std.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define INET_STD_H_
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP6_NEXT_FRAGMENT  44
Index: uspace/srv/net/inetsrv/inetcfg.c
===================================================================
--- uspace/srv/net/inetsrv/inetcfg.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/inetcfg.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -43,5 +43,5 @@
 #include <stdlib.h>
 #include <str.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <types/inetcfg.h>
 
Index: uspace/srv/net/inetsrv/inetping.c
===================================================================
--- uspace/srv/net/inetsrv/inetping.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/inetping.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -43,5 +43,6 @@
 #include <loc.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <types/inetping.h>
 #include "icmp.h"
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -45,5 +45,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <task.h>
 #include "addrobj.h"
Index: uspace/srv/net/inetsrv/inetsrv.h
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/inetsrv.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -43,5 +43,6 @@
 #include <inet/iplink.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <types/inet.h>
 #include <async.h>
Index: uspace/srv/net/inetsrv/ndp.h
===================================================================
--- uspace/srv/net/inetsrv/ndp.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/ndp.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define NDP_H_
 
-#include <sys/types.h>
 #include <inet/addr.h>
 #include "inetsrv.h"
Index: uspace/srv/net/inetsrv/pdu.h
===================================================================
--- uspace/srv/net/inetsrv/pdu.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/pdu.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,6 @@
 
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 #include "ndp.h"
Index: uspace/srv/net/inetsrv/reass.h
===================================================================
--- uspace/srv/net/inetsrv/reass.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/reass.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #define INET_REASS_H_
 
-#include <sys/types.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/inetsrv/sroute.h
===================================================================
--- uspace/srv/net/inetsrv/sroute.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/inetsrv/sroute.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #define INET_SROUTE_H_
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "inetsrv.h"
 
Index: uspace/srv/net/nconfsrv/iplink.h
===================================================================
--- uspace/srv/net/nconfsrv/iplink.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/nconfsrv/iplink.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define NCONFSRV_IPLINK_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include "nconfsrv.h"
 
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -47,5 +47,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <task.h>
 #include "iplink.h"
Index: uspace/srv/net/tcp/pdu.h
===================================================================
--- uspace/srv/net/tcp/pdu.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/pdu.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <inet/endpoint.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include "std.h"
 #include "tcp_type.h"
Index: uspace/srv/net/tcp/segment.h
===================================================================
--- uspace/srv/net/tcp/segment.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/segment.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,6 @@
 #define SEGMENT_H
 
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include "tcp_type.h"
 
Index: uspace/srv/net/tcp/seq_no.c
===================================================================
--- uspace/srv/net/tcp/seq_no.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/seq_no.c	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <stdbool.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include "seq_no.h"
 #include "tcp_type.h"
Index: uspace/srv/net/tcp/seq_no.h
===================================================================
--- uspace/srv/net/tcp/seq_no.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/seq_no.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -36,5 +36,5 @@
 #define SEQ_NO_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include "tcp_type.h"
 
Index: uspace/srv/net/tcp/std.h
===================================================================
--- uspace/srv/net/tcp/std.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/std.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define STD_H
 
-#include <sys/types.h>
+#include <stdint.h>
 #include <inet/addr.h>
 
Index: uspace/srv/net/tcp/tcp_type.h
===================================================================
--- uspace/srv/net/tcp/tcp_type.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/tcp_type.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,6 @@
 #include <fibril.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <inet/addr.h>
 #include <inet/endpoint.h>
Index: uspace/srv/net/tcp/ucall.h
===================================================================
--- uspace/srv/net/tcp/ucall.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/tcp/ucall.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,5 @@
 
 #include <inet/endpoint.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include "tcp_type.h"
 
Index: uspace/srv/net/udp/assoc.h
===================================================================
--- uspace/srv/net/udp/assoc.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/udp/assoc.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,4 @@
 #include <inet/endpoint.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
 #include "udp_type.h"
 
Index: uspace/srv/net/udp/pdu.h
===================================================================
--- uspace/srv/net/udp/pdu.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/udp/pdu.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -37,5 +37,4 @@
 
 #include <inet/endpoint.h>
-#include <sys/types.h>
 #include "std.h"
 #include "udp_type.h"
Index: uspace/srv/net/udp/std.h
===================================================================
--- uspace/srv/net/udp/std.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/udp/std.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,5 @@
 #define STD_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 #define IP_PROTO_UDP  17
Index: uspace/srv/net/udp/udp_type.h
===================================================================
--- uspace/srv/net/udp/udp_type.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/net/udp/udp_type.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -41,5 +41,5 @@
 #include <inet/endpoint.h>
 #include <ipc/loc.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <inet/addr.h>
 
Index: uspace/srv/ns/clonable.h
===================================================================
--- uspace/srv/ns/clonable.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/ns/clonable.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -35,5 +35,4 @@
 
 #include <ipc/common.h>
-#include <sys/types.h>
 #include <ipc/services.h>
 #include <abi/ipc/interfaces.h>
Index: uspace/srv/ns/service.h
===================================================================
--- uspace/srv/ns/service.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/ns/service.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -34,5 +34,4 @@
 #define NS_SERVICE_H__
 
-#include <sys/types.h>
 #include <ipc/common.h>
 #include <ipc/services.h>
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/vfs/vfs.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -38,5 +38,6 @@
 #include <adt/hash_table.h>
 #include <fibril_synch.h>
-#include <sys/types.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <loc.h>
 #include <stdbool.h>
Index: uspace/srv/volsrv/part.h
===================================================================
--- uspace/srv/volsrv/part.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
+++ uspace/srv/volsrv/part.h	(revision 8d2dd7f2d52fbc7693f94b66e451eeff3756d061)
@@ -39,5 +39,5 @@
 
 #include <loc.h>
-#include <sys/types.h>
+#include <stddef.h>
 #include <types/vol.h>
 #include "types/part.h"