Index: uspace/dist/src/c/demos/edit/edit.c
===================================================================
--- uspace/dist/src/c/demos/edit/edit.c	(revision 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/dist/src/c/demos/edit/edit.c	(revision e540bc874e3accb1e3c70f4fa85bba2a12f7a592)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/dist/src/c/demos/edit/sheet.h	(revision e540bc874e3accb1e3c70f4fa85bba2a12f7a592)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/dist/src/c/demos/tetris/screen.h	(revision e540bc874e3accb1e3c70f4fa85bba2a12f7a592)
@@ -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 582a0b84b0a73672531e7b404a89997af41ba0b9)
+++ uspace/dist/src/c/demos/tetris/tetris.c	(revision e540bc874e3accb1e3c70f4fa85bba2a12f7a592)
@@ -56,5 +56,4 @@
 
 #include <sys/time.h>
-#include <sys/types.h>
 #include <err.h>
 #include <errno.h>