Index: uspace/lib/c/include/io/chardev_srv.h
===================================================================
--- uspace/lib/c/include/io/chardev_srv.h	(revision 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/chardev_srv.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/charfield.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/chargrid.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/con_srv.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/input.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/kio.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/klog.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/log.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/mode.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/pixel.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/pixelmap.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/pos_event.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/printf_core.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/visualizer.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/lib/c/include/io/window.h	(revision b06414f03a4dbc34fce671630eb087b869763bfc)
@@ -37,5 +37,4 @@
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <async.h>
 #include <loc.h>