Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 9a1b20c34d5404b8272209d06c0239aa1a2384da)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision 356acd03b058b7d85d7e5258b683635e430a3266)
@@ -36,5 +36,5 @@
  */
  
-#include <print.h>
+#include <debug.h>
 #include <proc/task.h>
 #include <proc/thread.h>
@@ -163,12 +163,12 @@
 	link_t *cur;
 
-	printf("udebug_begin()\n");
-
-	mutex_lock(&TASK->udebug.lock);
-	printf("debugging task %llu\n", TASK->taskid);
+	LOG("udebug_begin()\n");
+
+	mutex_lock(&TASK->udebug.lock);
+	LOG("debugging task %llu\n", TASK->taskid);
 
 	if (TASK->udebug.dt_state != UDEBUG_TS_INACTIVE) {
 		mutex_unlock(&TASK->udebug.lock);
-		printf("udebug_begin(): busy error\n");
+		LOG("udebug_begin(): busy error\n");
 
 		return EBUSY;
@@ -200,5 +200,5 @@
 	mutex_unlock(&TASK->udebug.lock);
 
-	printf("udebug_begin() done (%s)\n", 
+	LOG("udebug_begin() done (%s)\n", 
 	    reply ? "reply" : "stoppability wait");
 
@@ -210,8 +210,8 @@
 	int rc;
 
-	printf("udebug_end()\n");
-
-	mutex_lock(&TASK->udebug.lock);
-	printf("task %llu\n", TASK->taskid);
+	LOG("udebug_end()\n");
+
+	mutex_lock(&TASK->udebug.lock);
+	LOG("task %" PRIu64 "\n", TASK->taskid);
 
 	rc = udebug_task_cleanup(TASK);
@@ -224,7 +224,5 @@
 int udebug_set_evmask(udebug_evmask_t mask)
 {
-	printf("udebug_set_mask()\n");
-
-	printf("debugging task %llu\n", TASK->taskid);
+	LOG("udebug_set_mask()\n");
 
 	mutex_lock(&TASK->udebug.lock);
@@ -232,5 +230,5 @@
 	if (TASK->udebug.dt_state != UDEBUG_TS_ACTIVE) {
 		mutex_unlock(&TASK->udebug.lock);
-		printf("udebug_set_mask(): not active debuging session\n");
+		LOG("udebug_set_mask(): not active debuging session\n");
 
 		return EINVAL;
@@ -248,6 +246,4 @@
 {
 	int rc;
-
-//	printf("udebug_go()\n");
 
 	/* On success, this will lock t->udebug.lock */
@@ -275,5 +271,5 @@
 	int rc;
 
-	printf("udebug_stop()\n");
+	LOG("udebug_stop()\n");
 	mutex_lock(&TASK->udebug.lock);
 
@@ -299,5 +295,5 @@
 	 * Answer GO call
 	 */
-	printf("udebug_stop - answering go call\n");
+	LOG("udebug_stop - answering go call\n");
 
 	/* Make sure nobody takes this call away from us */
@@ -307,5 +303,5 @@
 	IPC_SET_RETVAL(call->data, 0);
 	IPC_SET_ARG1(call->data, UDEBUG_EVENT_STOP);
-	printf("udebug_stop/ipc_answer\n");
+	LOG("udebug_stop/ipc_answer\n");
 
 	THREAD->udebug.cur_event = UDEBUG_EVENT_STOP;
@@ -316,5 +312,5 @@
 	mutex_unlock(&TASK->udebug.lock);
 
-	printf("udebog_stop/done\n");
+	LOG("udebog_stop/done\n");
 	return 0;
 }
@@ -331,5 +327,5 @@
 	size_t max_ids;
 
-	printf("udebug_thread_read()\n");
+	LOG("udebug_thread_read()\n");
 
 	/* Allocate a buffer to hold thread IDs */
@@ -386,6 +382,4 @@
 	unative_t *arg_buffer;
 
-//	printf("udebug_args_read()\n");
-
 	/* Prepare a buffer to hold the arguments */
 	arg_buffer = malloc(6 * sizeof(unative_t), 0);
@@ -428,6 +422,4 @@
 	data_buffer = malloc(n, 0);
 
-//	printf("udebug_mem_read: src=%u, size=%u\n", uspace_addr, n);
-
 	/* NOTE: this is not strictly from a syscall... but that shouldn't
 	 * be a problem */