Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision 62c63fc1e28ff7b487c370d09617342a5d5ecb43)
+++ kernel/generic/include/time/timeout.h	(revision 8e8c1a5a8422819c5ec8b1e633c4d302de9e5dd9)
@@ -37,24 +37,7 @@
 
 #include <arch/types.h>
-#include <cpu.h>
-#include <synch/spinlock.h>
-#include <adt/list.h>
+#include <proc/task.h>
 
-#define us2ticks(us)	((uint64_t)(((uint32_t) (us)/(1000000/HZ))))
-
-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))))
 
 extern void timeout_init(void);