Index: uspace/dist/src/c/demos/edit/search.c
===================================================================
--- uspace/dist/src/c/demos/edit/search.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/edit/search.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -36,4 +36,5 @@
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 
Index: uspace/dist/src/c/demos/tetris/scores.c
===================================================================
--- uspace/dist/src/c/demos/tetris/scores.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/tetris/scores.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -232,4 +232,9 @@
 
 	f = fopen("/data/tetris.sco", "wb");
+	if (f == NULL) {
+		printf("Error creating table\n");
+		return;
+	}
+	
 	cnt = fwrite(scores, sizeof(struct highscore), NUMSPOTS, f);
 	rc = fclose(f);
Index: uspace/dist/src/c/demos/tetris/screen.c
===================================================================
--- uspace/dist/src/c/demos/tetris/screen.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/tetris/screen.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -58,5 +58,4 @@
 #include <stdlib.h>
 #include <str.h>
-#include <unistd.h>
 #include <vfs/vfs.h>
 #include <async.h>
Index: uspace/dist/src/c/demos/tetris/shapes.c
===================================================================
--- uspace/dist/src/c/demos/tetris/shapes.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/tetris/shapes.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -56,5 +56,4 @@
  */
 
-#include <unistd.h>
 #include "tetris.h"
 
Index: uspace/dist/src/c/demos/tetris/tetris.c
===================================================================
--- uspace/dist/src/c/demos/tetris/tetris.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/tetris/tetris.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -51,5 +51,5 @@
  */
 
-static const char copyright[] =
+static volatile const char copyright[] =
 	"@(#) Copyright (c) 1992, 1993\n"
 	"\tThe Regents of the University of California.  All rights reserved.\n";
@@ -61,6 +61,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <str.h>
-#include <unistd.h>
 #include <getopt.h>
 #include "scores.h"
Index: uspace/dist/src/c/demos/tetris/tetris.h
===================================================================
--- uspace/dist/src/c/demos/tetris/tetris.h	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/tetris/tetris.h	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -49,4 +49,6 @@
 /** @file
  */
+
+#include <stdint.h>
 
 /*
Index: uspace/dist/src/c/demos/top/top.c
===================================================================
--- uspace/dist/src/c/demos/top/top.c	(revision dc122622bc947e1d697ecaa0da3e88b197e31f5e)
+++ uspace/dist/src/c/demos/top/top.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -38,5 +38,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <task.h>
 #include <thread.h>