Index: uspace/dist/src/c/demos/top/screen.c
===================================================================
--- uspace/dist/src/c/demos/top/screen.c	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ uspace/dist/src/c/demos/top/screen.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -45,4 +45,5 @@
 #include <inttypes.h>
 #include <macros.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"
@@ -389,4 +390,7 @@
 		int width = table->columns[column_index].width;
 		field_t *field = &table->fields[i];
+		uint64_t val;
+		const char *psuffix;
+		char suffix;
 
 		if (column_index != 0) {
@@ -406,20 +410,16 @@
 			printf("%*" PRIu64, width, field->uint);
 			break;
-		case FIELD_UINT_SUFFIX_BIN: {
-			uint64_t val = field->uint;
-			const char *suffix;
+		case FIELD_UINT_SUFFIX_BIN:
+			val = field->uint;
 			width -= 3;
-			bin_order_suffix(val, &val, &suffix, true);
-			printf("%*" PRIu64 "%s", width, val, suffix);
-			break;
-		}
-		case FIELD_UINT_SUFFIX_DEC: {
-			uint64_t val = field->uint;
-			char suffix;
+			bin_order_suffix(val, &val, &psuffix, true);
+			printf("%*" PRIu64 "%s", width, val, psuffix);
+			break;
+		case FIELD_UINT_SUFFIX_DEC:
+			val = field->uint;
 			width -= 1;
 			order_suffix(val, &val, &suffix);
 			printf("%*" PRIu64 "%c", width, val, suffix);
 			break;
-		}
 		case FIELD_PERCENT:
 			width -= 5; /* nnn.% */
@@ -537,5 +537,5 @@
  *
  */
-errno_t tgetchar(unsigned int sec)
+int tgetchar(unsigned int sec)
 {
 	/*
Index: uspace/dist/src/c/demos/top/screen.h
===================================================================
--- uspace/dist/src/c/demos/top/screen.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ uspace/dist/src/c/demos/top/screen.h	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -47,5 +47,5 @@
     _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 
-extern errno_t tgetchar(unsigned int);
+extern int tgetchar(unsigned int);
 
 #endif
Index: uspace/dist/src/c/demos/top/top.c
===================================================================
--- uspace/dist/src/c/demos/top/top.c	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ uspace/dist/src/c/demos/top/top.c	(revision 338d54a7c4a77bbe3bf0bdff3c750bad8bb1ea9a)
@@ -43,4 +43,5 @@
 #include <errno.h>
 #include <gsort.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"