Index: uspace/lib/c/generic/io/chardev.c
===================================================================
--- uspace/lib/c/generic/io/chardev.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/chardev.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -114,5 +114,5 @@
 	}
 
-	sysarg_t retval;
+	int retval;
 	async_wait_for(req, &retval);
 
@@ -166,5 +166,5 @@
 	}
 
-	sysarg_t retval;
+	int retval;
 	async_wait_for(req, &retval);
 	if (retval != EOK) {
Index: uspace/lib/c/generic/io/console.c
===================================================================
--- uspace/lib/c/generic/io/console.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/console.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -188,5 +188,5 @@
 		async_exchange_end(exch);
 		
-		sysarg_t rc;
+		int rc;
 		async_wait_for(aid, &rc);
 		
@@ -202,5 +202,5 @@
 		}
 	} else {
-		sysarg_t retval;
+		int retval;
 		async_wait_for(ctrl->input_aid, &retval);
 		
@@ -208,5 +208,5 @@
 		
 		if (retval != EOK) {
-			errno = (int) retval;
+			errno = retval;
 			return false;
 		}
@@ -235,5 +235,5 @@
 	}
 	
-	sysarg_t retval;
+	int retval;
 	int rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
 	if (rc != EOK) {
@@ -246,5 +246,5 @@
 	
 	if (retval != EOK) {
-		errno = (int) retval;
+		errno = retval;
 		return false;
 	}
Index: uspace/lib/c/generic/io/log.c
===================================================================
--- uspace/lib/c/generic/io/log.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/log.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -89,5 +89,5 @@
 	    log, level, NULL);
 	int rc = async_data_write_start(exchange, message, str_size(message));
-	sysarg_t reg_msg_rc;
+	int reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
 
@@ -199,5 +199,5 @@
 	    parent, &answer);
 	int rc = async_data_write_start(exchange, name, str_size(name));
-	sysarg_t reg_msg_rc;
+	int reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
 
Index: uspace/lib/c/generic/io/logctl.c
===================================================================
--- uspace/lib/c/generic/io/logctl.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/logctl.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -111,5 +111,5 @@
 	    new_level, NULL);
 	rc = async_data_write_start(exchange, logname, str_size(logname));
-	sysarg_t reg_msg_rc;
+	int reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
 
@@ -137,5 +137,5 @@
 	rc = vfs_pass_handle(vfs_exch, vfs_root(), exchange);
 	vfs_exchange_end(vfs_exch);
-	sysarg_t reg_msg_rc;
+	int reg_msg_rc;
 	async_wait_for(reg_msg, &reg_msg_rc);
 
Index: uspace/lib/c/generic/io/output.c
===================================================================
--- uspace/lib/c/generic/io/output.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/output.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -94,5 +94,5 @@
 	async_exchange_end(exch);
 	
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 	
Index: uspace/lib/c/generic/io/visualizer.c
===================================================================
--- uspace/lib/c/generic/io/visualizer.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/visualizer.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -68,5 +68,5 @@
 	async_exchange_end(exch);
 
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 
@@ -91,5 +91,5 @@
 	async_exchange_end(exch);
 
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 
@@ -114,5 +114,5 @@
 	async_exchange_end(exch);
 
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 
@@ -137,5 +137,5 @@
 	async_exchange_end(exch);
 
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 
@@ -160,5 +160,5 @@
 	async_exchange_end(exch);
 
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 
Index: uspace/lib/c/generic/io/window.c
===================================================================
--- uspace/lib/c/generic/io/window.c	(revision 9246016f2cd9a449613c5c8a7e45dcdc5c78a8f5)
+++ uspace/lib/c/generic/io/window.c	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -61,5 +61,5 @@
 	async_exchange_end(exch);
 
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);
 
@@ -105,5 +105,5 @@
 	async_exchange_end(exch);
 	
-	sysarg_t ret;
+	int ret;
 	async_wait_for(req, &ret);