Index: uspace/srv/hid/rfb/main.c
===================================================================
--- uspace/srv/hid/rfb/main.c	(revision 1569a9b70f7219a7103788305e4baf473da24376)
+++ uspace/srv/hid/rfb/main.c	(revision b7fd2a02e4161f4edd38548e7f8456b8021549be)
@@ -52,25 +52,25 @@
 static rfb_t rfb;
 
-static int rfb_claim(visualizer_t *vs)
-{
-	return EOK;
-}
-
-static int rfb_yield(visualizer_t *vs)
-{
-	return EOK;
-}
-
-static int rfb_suspend(visualizer_t *vs)
-{
-	return EOK;
-}
-
-static int rfb_wakeup(visualizer_t *vs)
-{
-	return EOK;
-}
-
-static int rfb_handle_damage_pixels(visualizer_t *vs,
+static errno_t rfb_claim(visualizer_t *vs)
+{
+	return EOK;
+}
+
+static errno_t rfb_yield(visualizer_t *vs)
+{
+	return EOK;
+}
+
+static errno_t rfb_suspend(visualizer_t *vs)
+{
+	return EOK;
+}
+
+static errno_t rfb_wakeup(visualizer_t *vs)
+{
+	return EOK;
+}
+
+static errno_t rfb_handle_damage_pixels(visualizer_t *vs,
     sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
     sysarg_t x_offset, sysarg_t y_offset)
@@ -126,5 +126,5 @@
 }
 
-static int rfb_change_mode(visualizer_t *vs, vslmode_t new_mode)
+static errno_t rfb_change_mode(visualizer_t *vs, vslmode_t new_mode)
 {
 	return EOK;
@@ -217,5 +217,5 @@
 	async_set_fallback_port_handler(client_connection, NULL);
 
-	int rc = loc_server_register(NAME);
+	errno_t rc = loc_server_register(NAME);
 	if (rc != EOK) {
 		printf("%s: Unable to register server.\n", NAME);
Index: uspace/srv/hid/rfb/rfb.c
===================================================================
--- uspace/srv/hid/rfb/rfb.c	(revision 1569a9b70f7219a7103788305e4baf473da24376)
+++ uspace/srv/hid/rfb/rfb.c	(revision b7fd2a02e4161f4edd38548e7f8456b8021549be)
@@ -62,8 +62,8 @@
 
 /** Receive one character (with buffering) */
-static int recv_char(tcp_conn_t *conn, char *c)
+static errno_t recv_char(tcp_conn_t *conn, char *c)
 {
 	size_t nrecv;
-	int rc;
+	errno_t rc;
 
 	if (rbuf_out == rbuf_in) {
@@ -83,8 +83,8 @@
 
 /** Receive count characters (with buffering) */
-static int recv_chars(tcp_conn_t *conn, char *c, size_t count)
+static errno_t recv_chars(tcp_conn_t *conn, char *c, size_t count)
 {
 	for (size_t i = 0; i < count; i++) {
-		int rc = recv_char(conn, c);
+		errno_t rc = recv_char(conn, c);
 		if (rc != EOK)
 			return rc;
@@ -94,9 +94,9 @@
 }
 
-static int recv_skip_chars(tcp_conn_t *conn, size_t count)
+static errno_t recv_skip_chars(tcp_conn_t *conn, size_t count)
 {
 	for (size_t i = 0; i < count; i++) {
 		char c;
-		int rc = recv_char(conn, &c);
+		errno_t rc = recv_char(conn, &c);
 		if (rc != EOK)
 			return rc;
@@ -173,5 +173,5 @@
 }
 
-int rfb_init(rfb_t *rfb, uint16_t width, uint16_t height, const char *name)
+errno_t rfb_init(rfb_t *rfb, uint16_t width, uint16_t height, const char *name)
 {
 	memset(rfb, 0, sizeof(rfb_t));
@@ -196,5 +196,5 @@
 }
 
-int rfb_set_size(rfb_t *rfb, uint16_t width, uint16_t height)
+errno_t rfb_set_size(rfb_t *rfb, uint16_t width, uint16_t height)
 {
 	size_t new_size = width * height * sizeof(pixel_t);
@@ -216,5 +216,5 @@
 }
 
-static int recv_message(tcp_conn_t *conn, char type, void *buf, size_t size)
+static errno_t recv_message(tcp_conn_t *conn, char type, void *buf, size_t size)
 {
 	memcpy(buf, &type, 1);
@@ -435,5 +435,5 @@
 }
 
-static int rfb_tile_encode_solid(rfb_t *rfb, cpixel_ctx_t *cpixel,
+static errno_t rfb_tile_encode_solid(rfb_t *rfb, cpixel_ctx_t *cpixel,
     rfb_rectangle_t *tile, void *buf, size_t *size)
 {
@@ -476,5 +476,5 @@
 			uint8_t tile_enctype = RFB_TILE_ENCODING_SOLID;
 			size_t tile_size;
-			int rc = rfb_tile_encode_solid(rfb, &cpixel, &tile, buf,
+			errno_t rc = rfb_tile_encode_solid(rfb, &cpixel, &tile, buf,
 			    &tile_size);
 			if (rc != EOK) {
@@ -492,5 +492,5 @@
 }
 
-static int rfb_send_framebuffer_update(rfb_t *rfb, tcp_conn_t *conn,
+static errno_t rfb_send_framebuffer_update(rfb_t *rfb, tcp_conn_t *conn,
     bool incremental)
 {
@@ -556,5 +556,5 @@
 	
 	if (!rfb->pixel_format.true_color) {
-		int rc = tcp_conn_send(conn, send_palette, send_palette_size);
+		errno_t rc = tcp_conn_send(conn, send_palette, send_palette_size);
 		if (rc != EOK) {
 			free(buf);
@@ -563,5 +563,5 @@
 	}
 	
-	int rc = tcp_conn_send(conn, buf, buf_size);
+	errno_t rc = tcp_conn_send(conn, buf, buf_size);
 	free(buf);
 	
@@ -569,5 +569,5 @@
 }
 
-static int rfb_set_pixel_format(rfb_t *rfb, rfb_pixel_format_t *pixel_format)
+static errno_t rfb_set_pixel_format(rfb_t *rfb, rfb_pixel_format_t *pixel_format)
 {
 	rfb->pixel_format = *pixel_format;
@@ -599,5 +599,5 @@
 {
 	/* Version handshake */
-	int rc = tcp_conn_send(conn, "RFB 003.008\n", 12);
+	errno_t rc = tcp_conn_send(conn, "RFB 003.008\n", 12);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_WARN, "Failed sending server version: %s",
@@ -759,10 +759,10 @@
 }
 
-int rfb_listen(rfb_t *rfb, uint16_t port)
+errno_t rfb_listen(rfb_t *rfb, uint16_t port)
 {
 	tcp_t *tcp = NULL;
 	tcp_listener_t *lst = NULL;
 	inet_ep_t ep;
-	int rc;
+	errno_t rc;
 	
 	rc = tcp_create(&tcp);
Index: uspace/srv/hid/rfb/rfb.h
===================================================================
--- uspace/srv/hid/rfb/rfb.h	(revision 1569a9b70f7219a7103788305e4baf473da24376)
+++ uspace/srv/hid/rfb/rfb.h	(revision b7fd2a02e4161f4edd38548e7f8456b8021549be)
@@ -164,7 +164,7 @@
 
 
-extern int rfb_init(rfb_t *, uint16_t, uint16_t, const char *);
-extern int rfb_set_size(rfb_t *, uint16_t, uint16_t);
-extern int rfb_listen(rfb_t *, uint16_t);
+extern errno_t rfb_init(rfb_t *, uint16_t, uint16_t, const char *);
+extern errno_t rfb_set_size(rfb_t *, uint16_t, uint16_t);
+extern errno_t rfb_listen(rfb_t *, uint16_t);
 
 #endif