Index: uspace/srv/devman/client_conn.c
===================================================================
--- uspace/srv/devman/client_conn.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/client_conn.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -66,5 +66,5 @@
 	devman_handle_t handle;
 	
-	int rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		async_answer_0(iid, rc);
@@ -363,5 +363,5 @@
 	size_t size;
 	size_t act_size;
-	int rc;
+	errno_t rc;
 	
 	if (!async_data_read_receive(&callid, &size)) {
@@ -400,5 +400,5 @@
 	fibril_rwlock_read_unlock(&device_tree.rwlock);
 	
-	int retval = async_data_read_finalize(callid, hdl_buf, size);
+	errno_t retval = async_data_read_finalize(callid, hdl_buf, size);
 	free(hdl_buf);
 	
@@ -440,5 +440,5 @@
 {
 	fun_node_t *fun;
-	int rc;
+	errno_t rc;
 
 	fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -465,5 +465,5 @@
 {
 	fun_node_t *fun;
-	int rc;
+	errno_t rc;
 
 	fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -511,5 +511,5 @@
 	size_t size;
 	size_t act_size;
-	int rc;
+	errno_t rc;
 	
 	if (!async_data_read_receive(&callid, &size)) {
@@ -532,5 +532,5 @@
 	}
 	
-	int retval = async_data_read_finalize(callid, hdl_buf, size);
+	errno_t retval = async_data_read_finalize(callid, hdl_buf, size);
 	free(hdl_buf);
 	
@@ -543,5 +543,5 @@
 	size_t size;
 	size_t act_size;
-	int rc;
+	errno_t rc;
 	
 	if (!async_data_read_receive(&callid, &size)) {
@@ -572,5 +572,5 @@
 	}
 	
-	int retval = async_data_read_finalize(callid, hdl_buf, size);
+	errno_t retval = async_data_read_finalize(callid, hdl_buf, size);
 	free(hdl_buf);
 	
@@ -584,5 +584,5 @@
 	char *drvname;
 	
-	int rc = async_data_write_accept((void **) &drvname, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **) &drvname, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		async_answer_0(iid, rc);
@@ -711,5 +711,5 @@
 {
 	driver_t *drv;
-	int rc;
+	errno_t rc;
 	
 	drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
@@ -730,5 +730,5 @@
 {
 	driver_t *drv;
-	int rc;
+	errno_t rc;
 	
 	drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
Index: uspace/srv/devman/dev.c
===================================================================
--- uspace/srv/devman/dev.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/dev.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -127,5 +127,5 @@
 
 /** Get list of device functions. */
-int dev_get_functions(dev_tree_t *tree, dev_node_t *dev,
+errno_t dev_get_functions(dev_tree_t *tree, dev_node_t *dev,
     devman_handle_t *hdl_buf, size_t buf_size, size_t *act_size)
 {
Index: uspace/srv/devman/dev.h
===================================================================
--- uspace/srv/devman/dev.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/dev.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -45,5 +45,5 @@
     devman_handle_t handle);
 extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
-extern int dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
+extern errno_t dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
     size_t, size_t *);
 
Index: uspace/srv/devman/driver.c
===================================================================
--- uspace/srv/devman/driver.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/driver.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -283,5 +283,5 @@
 bool start_driver(driver_t *drv)
 {
-	int rc;
+	errno_t rc;
 
 	assert(fibril_mutex_is_locked(&drv->driver_mutex));
@@ -306,8 +306,8 @@
  *			otherwise.
  */
-int stop_driver(driver_t *drv)
+errno_t stop_driver(driver_t *drv)
 {
 	async_exch_t *exch;
-	int retval;
+	errno_t retval;
 	
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "stop_driver(drv=\"%s\")", drv->name);
@@ -591,5 +591,5 @@
 	
 	/* Send the device name to the driver. */
-	int rc = async_data_write_start(exch, dev->pfun->name,
+	errno_t rc = async_data_write_start(exch, dev->pfun->name,
 	    str_size(dev->pfun->name) + 1);
 	
@@ -603,9 +603,9 @@
 	}
 
-	switch (rc) {
-	case EOK:
+	switch ((case_errno_t) rc) {
+	case (case_errno_t) EOK:
 		dev->state = DEVICE_USABLE;
 		break;
-	case ENOENT:
+	case (case_errno_t) ENOENT:
 		dev->state = DEVICE_NOT_PRESENT;
 		break;
@@ -618,8 +618,8 @@
 }
 
-int driver_dev_remove(dev_tree_t *tree, dev_node_t *dev)
+errno_t driver_dev_remove(dev_tree_t *tree, dev_node_t *dev)
 {
 	async_exch_t *exch;
-	int retval;
+	errno_t retval;
 	driver_t *drv;
 	devman_handle_t handle;
@@ -641,8 +641,8 @@
 }
 
-int driver_dev_gone(dev_tree_t *tree, dev_node_t *dev)
+errno_t driver_dev_gone(dev_tree_t *tree, dev_node_t *dev)
 {
 	async_exch_t *exch;
-	int retval;
+	errno_t retval;
 	driver_t *drv;
 	devman_handle_t handle;
@@ -664,8 +664,8 @@
 }
 
-int driver_fun_online(dev_tree_t *tree, fun_node_t *fun)
+errno_t driver_fun_online(dev_tree_t *tree, fun_node_t *fun)
 {
 	async_exch_t *exch;
-	int retval;
+	errno_t retval;
 	driver_t *drv;
 	devman_handle_t handle;
@@ -692,8 +692,8 @@
 }
 
-int driver_fun_offline(dev_tree_t *tree, fun_node_t *fun)
+errno_t driver_fun_offline(dev_tree_t *tree, fun_node_t *fun)
 {
 	async_exch_t *exch;
-	int retval;
+	errno_t retval;
 	driver_t *drv;
 	devman_handle_t handle;
@@ -721,5 +721,5 @@
 
 /** Get list of registered drivers. */
-int driver_get_list(driver_list_t *driver_list, devman_handle_t *hdl_buf,
+errno_t driver_get_list(driver_list_t *driver_list, devman_handle_t *hdl_buf,
     size_t buf_size, size_t *act_size)
 {
@@ -753,5 +753,5 @@
 
 /** Get list of device functions. */
-int driver_get_devices(driver_t *driver, devman_handle_t *hdl_buf,
+errno_t driver_get_devices(driver_t *driver, devman_handle_t *hdl_buf,
     size_t buf_size, size_t *act_size)
 {
Index: uspace/srv/devman/driver.h
===================================================================
--- uspace/srv/devman/driver.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/driver.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -50,10 +50,10 @@
 extern void detach_driver(dev_tree_t *, dev_node_t *);
 extern bool start_driver(driver_t *);
-extern int stop_driver(driver_t *);
+extern errno_t stop_driver(driver_t *);
 extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
-extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
-extern int driver_dev_gone(dev_tree_t *, dev_node_t *);
-extern int driver_fun_online(dev_tree_t *, fun_node_t *);
-extern int driver_fun_offline(dev_tree_t *, fun_node_t *);
+extern errno_t driver_dev_remove(dev_tree_t *, dev_node_t *);
+extern errno_t driver_dev_gone(dev_tree_t *, dev_node_t *);
+extern errno_t driver_fun_online(dev_tree_t *, fun_node_t *);
+extern errno_t driver_fun_offline(dev_tree_t *, fun_node_t *);
 
 extern driver_t *driver_find(driver_list_t *, devman_handle_t);
@@ -64,6 +64,6 @@
 extern void clean_driver(driver_t *);
 extern void delete_driver(driver_t *);
-extern int driver_get_list(driver_list_t *, devman_handle_t *, size_t, size_t *);
-extern int driver_get_devices(driver_t *, devman_handle_t *, size_t, size_t *);
+extern errno_t driver_get_list(driver_list_t *, devman_handle_t *, size_t, size_t *);
+extern errno_t driver_get_devices(driver_t *, devman_handle_t *, size_t, size_t *);
 
 #endif
Index: uspace/srv/devman/drv_conn.c
===================================================================
--- uspace/srv/devman/drv_conn.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/drv_conn.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -61,5 +61,5 @@
 #include "main.h"
 
-static int init_running_drv(void *drv);
+static errno_t init_running_drv(void *drv);
 
 /** Register running driver. */
@@ -72,5 +72,5 @@
 	
 	/* Get driver name. */
-	int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		async_answer_0(callid, rc);
@@ -163,10 +163,10 @@
  * @return		Zero on success, error code otherwise.
  */
-static int devman_receive_match_id(match_id_list_t *match_ids)
+static errno_t devman_receive_match_id(match_id_list_t *match_ids)
 {
 	match_id_t *match_id = create_match_id();
 	ipc_callid_t callid;
 	ipc_call_t call;
-	int rc = 0;
+	errno_t rc = 0;
 	
 	callid = async_get_call(&call);
@@ -213,8 +213,8 @@
  * @return		Zero on success, error code otherwise.
  */
-static int devman_receive_match_ids(sysarg_t match_count,
+static errno_t devman_receive_match_ids(sysarg_t match_count,
     match_id_list_t *match_ids)
 {
-	int ret = EOK;
+	errno_t ret = EOK;
 	size_t i;
 	
@@ -255,5 +255,5 @@
 	
 	char *fun_name = NULL;
-	int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
+	errno_t rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
 	if (rc != EOK) {
 		dev_del_ref(pdev);
@@ -332,5 +332,5 @@
 	devman_handle_t handle = IPC_GET_ARG1(*call);
 	category_id_t cat_id;
-	int rc;
+	errno_t rc;
 	
 	/* Get category name. */
@@ -381,5 +381,5 @@
 {
 	fun_node_t *fun;
-	int rc;
+	errno_t rc;
 	
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()");
@@ -425,5 +425,5 @@
 {
 	fun_node_t *fun;
-	int rc;
+	errno_t rc;
 
 	fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -462,5 +462,5 @@
 	devman_handle_t fun_handle = IPC_GET_ARG1(*call);
 	dev_tree_t *tree = &device_tree;
-	int rc;
+	errno_t rc;
 	
 	fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
@@ -490,5 +490,5 @@
 			dev_node_t *dev = fun->child;
 			device_state_t dev_state;
-			int gone_rc;
+			errno_t gone_rc;
 			
 			dev_add_ref(dev);
@@ -575,5 +575,5 @@
  * driver needed to be served by devman during the driver's initialization).
  */
-static int init_running_drv(void *drv)
+static errno_t init_running_drv(void *drv)
 {
 	driver_t *driver = (driver_t *) drv;
Index: uspace/srv/devman/fun.c
===================================================================
--- uspace/srv/devman/fun.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/fun.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -286,5 +286,5 @@
 }
 
-static int assign_driver_fibril(void *arg)
+static errno_t assign_driver_fibril(void *arg)
 {
 	dev_node_t *dev_node = (dev_node_t *) arg;
@@ -296,5 +296,5 @@
 }
 
-int fun_online(fun_node_t *fun)
+errno_t fun_online(fun_node_t *fun)
 {
 	dev_node_t *dev;
@@ -354,7 +354,7 @@
 }
 
-int fun_offline(fun_node_t *fun)
-{
-	int rc;
+errno_t fun_offline(fun_node_t *fun)
+{
+	errno_t rc;
 	
 	fibril_rwlock_write_lock(&device_tree.rwlock);
Index: uspace/srv/devman/fun.h
===================================================================
--- uspace/srv/devman/fun.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/fun.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -49,6 +49,6 @@
     const char *);
 extern bool set_fun_path(dev_tree_t *, fun_node_t *, fun_node_t *);
-extern int fun_online(fun_node_t *);
-extern int fun_offline(fun_node_t *);
+extern errno_t fun_online(fun_node_t *);
+extern errno_t fun_offline(fun_node_t *);
 
 #endif
Index: uspace/srv/devman/loc.c
===================================================================
--- uspace/srv/devman/loc.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/loc.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -67,7 +67,7 @@
 }
 
-int loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree)
+errno_t loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree)
 {
-	int rc = loc_service_unregister(fun->service_id);
+	errno_t rc = loc_service_unregister(fun->service_id);
 	tree_rem_loc_function(tree, fun);
 	return rc;
Index: uspace/srv/devman/loc.h
===================================================================
--- uspace/srv/devman/loc.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/loc.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -39,5 +39,5 @@
 
 extern void loc_register_tree_function(fun_node_t *, dev_tree_t *);
-extern int loc_unregister_tree_function(fun_node_t *, dev_tree_t *);
+extern errno_t loc_unregister_tree_function(fun_node_t *, dev_tree_t *);
 extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t);
 extern void tree_add_loc_function(dev_tree_t *, fun_node_t *);
Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/main.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -317,5 +317,5 @@
 	printf("%s: HelenOS Device Manager\n", NAME);
 	
-	int rc = log_init(NAME);
+	errno_t rc = log_init(NAME);
 	if (rc != EOK) {
 		printf("%s: Error initializing logging subsystem: %s\n", NAME, str_error(rc));
Index: uspace/srv/devman/match.c
===================================================================
--- uspace/srv/devman/match.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/devman/match.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -202,5 +202,5 @@
 	struct stat st;
 	
-	int rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
+	errno_t rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
 	if (rc != EOK) {
 		log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",