Index: uspace/srv/ns/clonable.c
===================================================================
--- uspace/srv/ns/clonable.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/clonable.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -55,5 +55,5 @@
 static list_t cs_req;
 
-int clonable_init(void)
+errno_t clonable_init(void)
 {
 	list_initialize(&cs_req);
@@ -128,5 +128,5 @@
 	
 	/* Spawn a loader. */
-	int rc = loader_spawn("loader");
+	errno_t rc = loader_spawn("loader");
 	
 	if (rc != EOK) {
Index: uspace/srv/ns/clonable.h
===================================================================
--- uspace/srv/ns/clonable.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/clonable.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -39,5 +39,5 @@
 #include <stdbool.h>
 
-extern int clonable_init(void);
+extern errno_t clonable_init(void);
 
 extern bool service_clonable(service_t);
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/ns.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -81,5 +81,5 @@
 		
 		task_id_t id;
-		int retval;
+		errno_t retval;
 		
 		service_t service;
@@ -132,5 +132,5 @@
 	printf("%s: HelenOS IPC Naming Service\n", NAME);
 	
-	int rc = service_init();
+	errno_t rc = service_init();
 	if (rc != EOK)
 		return EXIT_RC(rc);
Index: uspace/srv/ns/service.c
===================================================================
--- uspace/srv/ns/service.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/service.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -95,5 +95,5 @@
 static list_t pending_conn;
 
-int service_init(void)
+errno_t service_init(void)
 {
 	if (!hash_table_create(&service_hash_table, 0, 0,
@@ -139,5 +139,5 @@
  *
  */
-int register_service(service_t service, sysarg_t phone, ipc_call_t *call)
+errno_t register_service(service_t service, sysarg_t phone, ipc_call_t *call)
 {
 	if (hash_table_find(&service_hash_table, &service))
@@ -173,5 +173,5 @@
 	sysarg_t arg3 = IPC_GET_ARG3(*call);
 	sysarg_t flags = IPC_GET_ARG4(*call);
-	int retval;
+	errno_t retval;
 	
 	ht_link_t *link = hash_table_find(&service_hash_table, &service);
Index: uspace/srv/ns/service.h
===================================================================
--- uspace/srv/ns/service.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/service.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -38,8 +38,8 @@
 #include <abi/ipc/interfaces.h>
 
-extern int service_init(void);
+extern errno_t service_init(void);
 extern void process_pending_conn(void);
 
-extern int register_service(service_t, sysarg_t, ipc_call_t *);
+extern errno_t register_service(service_t, sysarg_t, ipc_call_t *);
 extern void connect_to_service(service_t, iface_t, ipc_call_t *, ipc_callid_t);
 
Index: uspace/srv/ns/task.c
===================================================================
--- uspace/srv/ns/task.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/task.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -151,5 +151,5 @@
 static list_t pending_wait;
 
-int task_init(void)
+errno_t task_init(void)
 {
 	if (!hash_table_create(&task_hash_table, 0, 0, &task_hash_table_ops)) {
@@ -225,5 +225,5 @@
 }
 
-int ns_task_id_intro(ipc_call_t *call)
+errno_t ns_task_id_intro(ipc_call_t *call)
 {
 	task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
@@ -264,5 +264,5 @@
 }
 
-static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
+static errno_t get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
 {
 	ht_link_t *link = hash_table_find(&phone_to_id, &phone_hash);
@@ -276,5 +276,5 @@
 }
 
-int ns_task_retval(ipc_call_t *call)
+errno_t ns_task_retval(ipc_call_t *call)
 {
 	task_id_t id = call->in_task_id;
@@ -296,8 +296,8 @@
 }
 
-int ns_task_disconnect(ipc_call_t *call)
+errno_t ns_task_disconnect(ipc_call_t *call)
 {
 	task_id_t id;
-	int rc = get_id_by_phone(call->in_phone_hash, &id);
+	errno_t rc = get_id_by_phone(call->in_phone_hash, &id);
 	if (rc != EOK)
 		return rc;
Index: uspace/srv/ns/task.h
===================================================================
--- uspace/srv/ns/task.h	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/ns/task.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -37,12 +37,12 @@
 #include <abi/proc/task.h>
 
-extern int task_init(void);
+extern errno_t task_init(void);
 extern void process_pending_wait(void);
 
 extern void wait_for_task(task_id_t, ipc_call_t *, ipc_callid_t);
 
-extern int ns_task_id_intro(ipc_call_t *);
-extern int ns_task_disconnect(ipc_call_t *);
-extern int ns_task_retval(ipc_call_t *);
+extern errno_t ns_task_id_intro(ipc_call_t *);
+extern errno_t ns_task_disconnect(ipc_call_t *);
+extern errno_t ns_task_retval(ipc_call_t *);