Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ kernel/generic/src/udebug/udebug.c	(revision 3b47db687606b55f2694aaa5c4c6db563b5b61eb)
@@ -397,5 +397,5 @@
  *
  */
-int udebug_task_cleanup(struct task *task)
+errno_t udebug_task_cleanup(struct task *task)
 {
 	assert(mutex_locked(&task->udebug.lock));
Index: kernel/generic/src/udebug/udebug_ipc.c
===================================================================
--- kernel/generic/src/udebug/udebug_ipc.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ kernel/generic/src/udebug/udebug_ipc.c	(revision 3b47db687606b55f2694aaa5c4c6db563b5b61eb)
@@ -51,5 +51,5 @@
 #include <udebug/udebug_ipc.h>
 
-int udebug_request_preprocess(call_t *call, phone_t *phone)
+errno_t udebug_request_preprocess(call_t *call, phone_t *phone)
 {
 	switch (IPC_GET_ARG1(call->data)) {
@@ -71,5 +71,5 @@
 static void udebug_receive_begin(call_t *call)
 {
-	int rc;
+	errno_t rc;
 	bool active;
 
@@ -98,5 +98,5 @@
 static void udebug_receive_end(call_t *call)
 {
-	int rc;
+	errno_t rc;
 
 	rc = udebug_end();
@@ -113,5 +113,5 @@
 static void udebug_receive_set_evmask(call_t *call)
 {
-	int rc;
+	errno_t rc;
 	udebug_evmask_t mask;
 
@@ -132,5 +132,5 @@
 {
 	thread_t *t;
-	int rc;
+	errno_t rc;
 
 	t = (thread_t *)IPC_GET_ARG2(call->data);
@@ -152,5 +152,5 @@
 {
 	thread_t *t;
-	int rc;
+	errno_t rc;
 
 	t = (thread_t *)IPC_GET_ARG2(call->data);
@@ -172,5 +172,5 @@
 	void *buffer;
 	size_t copied, needed;
-	int rc;
+	errno_t rc;
 
 	uspace_addr = IPC_GET_ARG2(call->data);	/* Destination address */
@@ -307,5 +307,5 @@
 	thread_t *t;
 	sysarg_t uspace_addr;
-	int rc;
+	errno_t rc;
 	void *buffer;
 
@@ -346,5 +346,5 @@
 	sysarg_t to_copy;
 	void *buffer = NULL;
-	int rc;
+	errno_t rc;
 
 	t = (thread_t *) IPC_GET_ARG2(call->data);
@@ -390,5 +390,5 @@
 	unsigned size;
 	void *buffer = NULL;
-	int rc;
+	errno_t rc;
 
 	uspace_dst = IPC_GET_ARG2(call->data);
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision 3b47db687606b55f2694aaa5c4c6db563b5b61eb)
@@ -79,5 +79,5 @@
  *
  */
-static int _thread_op_begin(thread_t *thread, bool being_go)
+static errno_t _thread_op_begin(thread_t *thread, bool being_go)
 {
 	mutex_lock(&TASK->udebug.lock);
@@ -174,5 +174,5 @@
  *         debugging session.
  */
-int udebug_begin(call_t *call, bool *active)
+errno_t udebug_begin(call_t *call, bool *active)
 {
 	LOG("Debugging task %" PRIu64, TASK->taskid);
@@ -219,10 +219,10 @@
  *
  */
-int udebug_end(void)
+errno_t udebug_end(void)
 {
 	LOG("Task %" PRIu64, TASK->taskid);
 	
 	mutex_lock(&TASK->udebug.lock);
-	int rc = udebug_task_cleanup(TASK);
+	errno_t rc = udebug_task_cleanup(TASK);
 	mutex_unlock(&TASK->udebug.lock);
 	
@@ -239,5 +239,5 @@
  *
  */
-int udebug_set_evmask(udebug_evmask_t mask)
+errno_t udebug_set_evmask(udebug_evmask_t mask)
 {
 	LOG("mask = 0x%x", mask);
@@ -266,8 +266,8 @@
  *
  */
-int udebug_go(thread_t *thread, call_t *call)
+errno_t udebug_go(thread_t *thread, call_t *call)
 {
 	/* On success, this will lock thread->udebug.lock. */
-	int rc = _thread_op_begin(thread, false);
+	errno_t rc = _thread_op_begin(thread, false);
 	if (rc != EOK)
 		return rc;
@@ -297,5 +297,5 @@
  *
  */
-int udebug_stop(thread_t *thread, call_t *call)
+errno_t udebug_stop(thread_t *thread, call_t *call)
 {
 	LOG("udebug_stop()");
@@ -306,5 +306,5 @@
 	 *
 	 */
-	int rc = _thread_op_begin(thread, true);
+	errno_t rc = _thread_op_begin(thread, true);
 	if (rc != EOK)
 		return rc;
@@ -364,5 +364,5 @@
  *
  */
-int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
+errno_t udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
     size_t *needed)
 {
@@ -428,5 +428,5 @@
  *
  */
-int udebug_name_read(char **data, size_t *data_size)
+errno_t udebug_name_read(char **data, size_t *data_size)
 {
 	size_t name_size = str_size(TASK->name) + 1;
@@ -457,8 +457,8 @@
  *
  */
-int udebug_args_read(thread_t *thread, void **buffer)
+errno_t udebug_args_read(thread_t *thread, void **buffer)
 {
 	/* On success, this will lock t->udebug.lock. */
-	int rc = _thread_op_begin(thread, false);
+	errno_t rc = _thread_op_begin(thread, false);
 	if (rc != EOK)
 		return rc;
@@ -500,8 +500,8 @@
  *
  */
-int udebug_regs_read(thread_t *thread, void **buffer)
+errno_t udebug_regs_read(thread_t *thread, void **buffer)
 {
 	/* On success, this will lock t->udebug.lock */
-	int rc = _thread_op_begin(thread, false);
+	errno_t rc = _thread_op_begin(thread, false);
 	if (rc != EOK)
 		return rc;
@@ -536,5 +536,5 @@
  *
  */
-int udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
+errno_t udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer)
 {
 	/* Verify task state */
@@ -553,5 +553,5 @@
 	 *
 	 */
-	int rc = copy_from_uspace(data_buffer, (void *) uspace_addr, n);
+	errno_t rc = copy_from_uspace(data_buffer, (void *) uspace_addr, n);
 	mutex_unlock(&TASK->udebug.lock);