Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 1004b37bdb66a590cdd0d1374967646565e61622)
+++ kernel/generic/include/proc/task.h	(revision 831a04d0773940f7587dff16f2f8addd800d3810)
@@ -134,37 +134,4 @@
 } task_t;
 
-typedef void (* timeout_handler_t)(void *arg);
-
-typedef struct {
-	SPINLOCK_DECLARE(lock);
-
-	link_t link;			/**< Link to the list of active timeouts on THE->cpu */
-	
-	uint64_t ticks;			/**< Timeout will be activated in this amount of clock() ticks. */
-
-	timeout_handler_t handler;	/**< Function that will be called on timeout activation. */
-	void *arg;			/**< Argument to be passed to handler() function. */
-	
-	cpu_t *cpu;			/**< On which processor is this timeout registered. */
-} timeout_t;
-
-/** Thread states. */
-typedef enum {
-	Invalid,	/**< It is an error, if thread is found in this state. */
-	Running,	/**< State of a thread that is currently executing on some CPU. */
-	Sleeping,	/**< Thread in this state is waiting for an event. */
-	Ready,		/**< State of threads in a run queue. */
-	Entering,	/**< Threads are in this state before they are first readied. */
-	Exiting,	/**< After a thread calls thread_exit(), it is put into Exiting state. */
-	Undead		/**< Threads that were not detached but exited are in the Undead state. */
-} state_t;
-
-/** Join types. */
-typedef enum {
-	None,
-	TaskClnp,	/**< The thread will be joined by ktaskclnp thread. */
-	TaskGC		/**< The thread will be joined by ktaskgc thread. */
-} thread_join_type_t;
-
 SPINLOCK_EXTERN(tasks_lock);
 extern btree_t tasks_btree;
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 1004b37bdb66a590cdd0d1374967646565e61622)
+++ kernel/generic/include/proc/thread.h	(revision 831a04d0773940f7587dff16f2f8addd800d3810)
@@ -38,4 +38,5 @@
 #include <synch/waitq.h>
 #include <proc/task.h>
+#include <time/timeout.h>
 #include <cpu.h>
 #include <synch/rwlock.h>
@@ -56,4 +57,22 @@
 #define THREAD_FLAG_USPACE	(1 << 2)	/**< Thread executes in userspace. */
 
+/** Thread states. */
+typedef enum {
+	Invalid,	/**< It is an error, if thread is found in this state. */
+	Running,	/**< State of a thread that is currently executing on some CPU. */
+	Sleeping,	/**< Thread in this state is waiting for an event. */
+	Ready,		/**< State of threads in a run queue. */
+	Entering,	/**< Threads are in this state before they are first readied. */
+	Exiting,	/**< After a thread calls thread_exit(), it is put into Exiting state. */
+	Undead		/**< Threads that were not detached but exited are in the Undead state. */
+} state_t;
+
+/** Join types. */
+typedef enum {
+	None,
+	TaskClnp,	/**< The thread will be joined by ktaskclnp thread. */
+	TaskGC		/**< The thread will be joined by ktaskgc thread. */
+} thread_join_type_t;
+
 /** Thread structure. There is one per thread. */
 typedef struct thread {
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision 1004b37bdb66a590cdd0d1374967646565e61622)
+++ kernel/generic/include/time/timeout.h	(revision 831a04d0773940f7587dff16f2f8addd800d3810)
@@ -37,5 +37,21 @@
 
 #include <arch/types.h>
-#include <proc/task.h>
+#include <adt/list.h>
+#include <cpu.h>
+
+typedef void (* timeout_handler_t)(void *arg);
+
+typedef struct {
+	SPINLOCK_DECLARE(lock);
+
+	link_t link;			/**< Link to the list of active timeouts on THE->cpu */
+	
+	uint64_t ticks;			/**< Timeout will be activated in this amount of clock() ticks. */
+
+	timeout_handler_t handler;	/**< Function that will be called on timeout activation. */
+	void *arg;			/**< Argument to be passed to handler() function. */
+	
+	cpu_t *cpu;			/**< On which processor is this timeout registered. */
+} timeout_t;
 
 #define us2ticks(us)	((uint64_t) (((uint32_t) (us) / (1000000 / HZ))))