Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision da1f9dc1583ac0512bc6f526a7d3e477ee640173)
+++ kernel/generic/include/arch.h	(revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89)
@@ -60,5 +60,5 @@
  * the base address of the stack.
  */
-struct the {
+typedef struct {
 	count_t preemption_disabled;	/**< Preemption disabled counter. */
 	thread_t *thread;		/**< Current thread. */
@@ -66,5 +66,5 @@
 	cpu_t *cpu;			/**< Executing cpu. */
 	as_t *as;			/**< Current address space. */
-};
+} the_t;
 
 #define THE		((the_t *)(get_stack_base()))
Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision da1f9dc1583ac0512bc6f526a7d3e477ee640173)
+++ kernel/generic/include/proc/scheduler.h	(revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89)
@@ -46,9 +46,9 @@
 
 /** Scheduler run queue structure. */
-struct runq {
+typedef struct {
 	SPINLOCK_DECLARE(lock);
 	link_t rq_head;		/**< List of ready threads. */
 	count_t n;		/**< Number of threads in rq_ready. */
-};
+} runq_t;
 
 extern atomic_t nrdy;
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision da1f9dc1583ac0512bc6f526a7d3e477ee640173)
+++ kernel/generic/include/time/timeout.h	(revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89)
@@ -45,5 +45,5 @@
 typedef void (* timeout_handler_t)(void *arg);
 
-struct timeout {
+typedef struct {
 	SPINLOCK_DECLARE(lock);
 
@@ -56,5 +56,5 @@
 	
 	cpu_t *cpu;			/**< On which processor is this timeout registered. */
-};
+} timeout_t;
 
 extern void timeout_init(void);
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision da1f9dc1583ac0512bc6f526a7d3e477ee640173)
+++ kernel/generic/include/typedefs.h	(revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89)
@@ -53,8 +53,4 @@
 typedef struct fpu_context fpu_context_t;
 
-typedef struct timeout timeout_t;
-
-typedef struct runq runq_t;
-
 typedef struct spinlock spinlock_t;
 typedef struct mutex mutex_t;
@@ -73,6 +69,4 @@
 
 typedef struct link link_t;
-
-typedef struct the the_t;
 
 typedef struct chardev chardev_t;