Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -53,5 +53,5 @@
  * There is one structure like this for every processor.
  */
-struct cpu {
+typedef struct {
 	SPINLOCK_DECLARE(lock);
 
@@ -92,5 +92,5 @@
 	 */
 	uint8_t *stack;
-};
+} cpu_t;
 
 extern cpu_t *cpus;
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/time/timeout.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -37,5 +37,5 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
+#include <cpu.h>
 #include <synch/spinlock.h>
 #include <adt/list.h>
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/typedefs.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -48,8 +48,4 @@
 typedef unsigned long context_id_t;
 
-typedef struct cpu_info cpu_info_t;
-
-typedef struct cpu cpu_t;
-typedef struct cpu_arch cpu_arch_t;
 typedef struct task task_t;
 typedef enum state state_t;