Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ kernel/generic/include/proc/task.h	(revision b9e7944055fbefcc560af681ef9fafaffaeaba03)
@@ -54,4 +54,5 @@
 #include <proc/scheduler.h>
 #include <udebug/udebug.h>
+#include <ipc/kbox.h>
 
 #define TASK_NAME_BUFLEN	20
@@ -99,17 +100,11 @@
 
 #ifdef CONFIG_UDEBUG
-	/** Debugging stuff */
+	/** Debugging stuff. */
 	udebug_task_t udebug;
 
-	/** Kernel answerbox */
-	answerbox_t kernel_box;
-	/** Thread used to service kernel answerbox */
-	struct thread *kb_thread;
-	/** Kbox thread creation vs. begin of cleanup mutual exclusion */
-	mutex_t kb_cleanup_lock;
-	/** True if cleanup of kbox has already started */
-	bool kb_finished;
+	/** Kernel answerbox. */
+	kbox_t kb;
 #endif
-	
+
 	/** Architecture specific task data. */
 	task_arch_t arch;