Index: uspace/app/tetris/screen.c
===================================================================
--- uspace/app/tetris/screen.c	(revision 9805cde92c0c387474369f3713d7c270ae3e760d)
+++ uspace/app/tetris/screen.c	(revision 7122bc7ffe00d5531336885cabe3467b25ade0d9)
@@ -51,5 +51,4 @@
 #include <string.h>
 #include <unistd.h>
-#include <io/stream.h>
 #include <console.h>
 
@@ -74,7 +73,4 @@
 }
 
-static int con_phone;
-
-
 static void start_standout(void)
 {
@@ -89,5 +85,5 @@
 void clear_screen(void)
 {
-	async_msg_0(con_phone, CONSOLE_CLEAR);
+	console_clear();
 	moveto(0, 0);
 }
@@ -101,5 +97,5 @@
 
 	resume_normal();
-	async_msg_0(con_phone, CONSOLE_CLEAR);
+	console_clear();
 	curscore = -1;
 	memset((char *)curscreen, 0, sizeof(curscreen));
@@ -112,6 +108,5 @@
 scr_init(void)
 {
-	con_phone = get_cons_phone();
-	async_msg_1(con_phone, CONSOLE_CURSOR_VISIBILITY, 0);
+	console_cursor_visibility(0);
 	resume_normal();
 	scr_clear();
@@ -120,10 +115,10 @@
 void moveto(int r, int c)
 {
-	async_msg_2(con_phone, CONSOLE_GOTO, r, c);
+	console_goto(r, c);
 }
 
 static void fflush(void)
 {
-	async_msg_0(con_phone, CONSOLE_FLUSH);
+	console_flush();
 }
 
@@ -132,6 +127,5 @@
 static int get_display_size(winsize_t *ws)
 {
-	return async_req_0_2(con_phone, CONSOLE_GETSIZE, &ws->ws_row,
-	    &ws->ws_col);
+	return console_get_size(&ws->ws_row, &ws->ws_col);
 }
 
Index: uspace/app/tetris/screen.h
===================================================================
--- uspace/app/tetris/screen.h	(revision 9805cde92c0c387474369f3713d7c270ae3e760d)
+++ uspace/app/tetris/screen.h	(revision 7122bc7ffe00d5531336885cabe3467b25ade0d9)
@@ -50,6 +50,6 @@
 
 typedef struct {
-	ipcarg_t ws_row;
-	ipcarg_t ws_col;
+	int ws_row;
+	int ws_col;
 } winsize_t;
 
Index: uspace/lib/libc/generic/console.c
===================================================================
--- uspace/lib/libc/generic/console.c	(revision 9805cde92c0c387474369f3713d7c270ae3e760d)
+++ uspace/lib/libc/generic/console.c	(revision 7122bc7ffe00d5531336885cabe3467b25ade0d9)
@@ -38,8 +38,39 @@
 #include <console.h>
 
+void console_clear(void)
+{
+	int cons_phone = get_cons_phone();
+	async_msg_0(cons_phone, CONSOLE_CLEAR);
+}
+
+void console_goto(int row, int col)
+{
+	int cons_phone = get_cons_phone();
+	async_msg_2(cons_phone, CONSOLE_GOTO, row, col);
+}
+
+void console_flush(void)
+{
+	int cons_phone = get_cons_phone();
+	async_msg_0(cons_phone, CONSOLE_FLUSH);
+}
+
+int console_get_size(int *rows, int *cols)
+{
+	int cons_phone = get_cons_phone();
+	ipcarg_t r, c;
+	int rc;
+
+	rc = async_req_0_2(cons_phone, CONSOLE_GETSIZE, &r, &c);
+
+	*rows = (int) r;
+	*cols = (int) c;
+
+	return rc;
+}
+
 void console_set_style(int style)
 {
 	int cons_phone = get_cons_phone();
-
 	async_msg_1(cons_phone, CONSOLE_SET_STYLE, style);
 }
@@ -48,5 +79,4 @@
 {
 	int cons_phone = get_cons_phone();
-
 	async_msg_3(cons_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
 }
@@ -55,6 +85,11 @@
 {
 	int cons_phone = get_cons_phone();
+	async_msg_2(cons_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+}
 
-	async_msg_2(cons_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+void console_cursor_visibility(int show)
+{
+	int cons_phone = get_cons_phone();
+	async_msg_1(cons_phone, CONSOLE_CURSOR_VISIBILITY, show != 0);
 }
 
Index: uspace/lib/libc/include/console.h
===================================================================
--- uspace/lib/libc/include/console.h	(revision 9805cde92c0c387474369f3713d7c270ae3e760d)
+++ uspace/lib/libc/include/console.h	(revision 7122bc7ffe00d5531336885cabe3467b25ade0d9)
@@ -39,7 +39,12 @@
 #include <console/color.h>
 
+extern void console_clear(void);
+extern void console_goto(int, int);
+extern void console_flush(void);
+extern int console_get_size(int *, int *);
 extern void console_set_style(int);
 extern void console_set_color(int, int, int);
 extern void console_set_rgb_color(int, int);
+extern void console_cursor_visibility(int);
 
 #endif