Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision c98e6ee244a8e271a395a052069c23bca4f8b538)
+++ kernel/generic/include/proc/task.h	(revision e028660a0518e4c5bb85a0b54ab8b441db26e4e2)
@@ -53,4 +53,5 @@
 #include <mm/tlb.h>
 #include <proc/scheduler.h>
+#include <udebug/udebug.h>
 
 struct thread;
@@ -94,4 +95,18 @@
 	 */
 	atomic_t active_calls;
+
+#ifdef CONFIG_UDEBUG
+	/** 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;
+#endif
 	
 	/** Architecture specific task data. */
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision c98e6ee244a8e271a395a052069c23bca4f8b538)
+++ kernel/generic/include/proc/thread.h	(revision e028660a0518e4c5bb85a0b54ab8b441db26e4e2)
@@ -47,4 +47,5 @@
 #include <mm/tlb.h>
 #include <proc/uarg.h>
+#include <udebug/udebug.h>
 
 #define THREAD_STACK_SIZE	STACK_SIZE
@@ -204,4 +205,10 @@
 	/** Thread's kernel stack. */
 	uint8_t *kstack;
+
+#ifdef CONFIG_UDEBUG
+	/** Debugging stuff */
+	udebug_thread_t udebug;
+#endif
+
 } thread_t;