Index: kernel/arch/amd64/include/cpu.h
===================================================================
--- kernel/arch/amd64/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/amd64/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -58,5 +58,5 @@
 #include <arch/pm.h>
 
-struct cpu_arch {
+typedef struct {
 	int vendor;
 	int family;
@@ -66,5 +66,5 @@
 	
 	count_t iomapver_copy;	/** Copy of TASK's I/O Permission bitmap generation count. */
-};
+} cpu_arch_t;
 
 struct star_msr {
Index: kernel/arch/amd64/include/cpuid.h
===================================================================
--- kernel/arch/amd64/include/cpuid.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/amd64/include/cpuid.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -47,10 +47,10 @@
 #include <arch/types.h>
 
-struct cpu_info {
+typedef struct {
 	uint32_t cpuid_eax;
 	uint32_t cpuid_ebx;
 	uint32_t cpuid_ecx;
 	uint32_t cpuid_edx;
-} __attribute__ ((packed));
+} __attribute__ ((packed)) cpu_info_t;
 
 extern int has_cpuid(void);
Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/amd64/src/amd64.c	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -104,5 +104,5 @@
 void arch_pre_mm_init(void)
 {
-	struct cpu_info cpuid_s;
+	cpu_info_t cpuid_s;
 
 	cpuid(AMD_CPUID_EXTENDED,&cpuid_s);
Index: kernel/arch/ia32/include/cpu.h
===================================================================
--- kernel/arch/ia32/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ia32/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -43,5 +43,5 @@
 #define EFLAGS_RF       (1 << 16)
 
-struct cpu_arch {
+typedef struct {
 	int vendor;
 	int family;
@@ -51,5 +51,5 @@
 	
 	count_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */
-};
+} cpu_arch_t;
 
 
Index: kernel/arch/ia32/include/cpuid.h
===================================================================
--- kernel/arch/ia32/include/cpuid.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ia32/include/cpuid.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -38,10 +38,10 @@
 #include <arch/types.h>
 
-struct cpu_info {
+typedef struct {
 	uint32_t cpuid_eax;
 	uint32_t cpuid_ebx;
 	uint32_t cpuid_ecx;
 	uint32_t cpuid_edx;
-} __attribute__ ((packed));
+} __attribute__ ((packed)) cpu_info_t;
 
 struct __cpuid_extended_feature_info {
@@ -98,5 +98,5 @@
 }
 
-static inline void cpuid(uint32_t cmd, struct cpu_info *info)
+static inline void cpuid(uint32_t cmd, cpu_info_t *info)
 {
 	__asm__ volatile (
Index: kernel/arch/ia64/include/cpu.h
===================================================================
--- kernel/arch/ia64/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ia64/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -43,9 +43,9 @@
 #define FAMILY_ITANIUM2	0x1f
 
-struct cpu_arch {
+typedef struct {
 	uint64_t cpuid0;
 	uint64_t cpuid1;
 	cpuid3_t cpuid3;
-};
+} cpu_arch_t;
 
 /** Read CPUID register.
Index: kernel/arch/mips32/include/cpu.h
===================================================================
--- kernel/arch/mips32/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/mips32/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -38,8 +38,8 @@
 #include <arch/types.h>
 
-struct cpu_arch {
+typedef struct {
 	uint32_t imp_num;
 	uint32_t rev_num;
-};
+} cpu_arch_t;
 	
 #endif
Index: kernel/arch/ppc32/include/cpu.h
===================================================================
--- kernel/arch/ppc32/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ppc32/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -38,8 +38,8 @@
 #include <typedefs.h>
 
-struct cpu_arch {
+typedef struct {
 	int version;
 	int revision;
-};
+} cpu_arch_t;
 	
 #endif
Index: kernel/arch/ppc32/include/cpuid.h
===================================================================
--- kernel/arch/ppc32/include/cpuid.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ppc32/include/cpuid.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -38,10 +38,10 @@
 #include <arch/types.h>
 
-struct cpu_info {
+typedef struct {
 	uint16_t version;
 	uint16_t revision;
-} __attribute__ ((packed));
+} __attribute__ ((packed)) cpu_info_t;
 
-static inline void cpu_version(struct cpu_info *info)
+static inline void cpu_version(cpu_info_t *info)
 {
 	asm volatile (
Index: kernel/arch/ppc64/include/cpu.h
===================================================================
--- kernel/arch/ppc64/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ppc64/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -38,8 +38,8 @@
 #include <typedefs.h>
 
-struct cpu_arch {
+typedef struct {
 	int version;
 	int revision;
-};
+} cpu_arch_t;
 	
 #endif
Index: kernel/arch/ppc64/include/cpuid.h
===================================================================
--- kernel/arch/ppc64/include/cpuid.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/ppc64/include/cpuid.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -38,10 +38,10 @@
 #include <arch/types.h>
 
-struct cpu_info {
+typedef struct {
 	uint16_t version;
 	uint16_t revision;
-} __attribute__ ((packed));
+} __attribute__ ((packed)) cpu_info_t;
 
-static inline void cpu_version(struct cpu_info *info)
+static inline void cpu_version(cpu_info_t *info)
 {
 	asm volatile (
Index: kernel/arch/sparc64/include/cpu.h
===================================================================
--- kernel/arch/sparc64/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/sparc64/include/cpu.h	(revision f429331b6108df4294a421a92f3e9aaa64d95732)
@@ -52,13 +52,12 @@
 #define IMPL_SPARC64V		0x5
 
-struct cpu_arch {
+typedef struct {
 	uint32_t mid;			/**< Processor ID as read from UPA_CONFIG. */
 	ver_reg_t ver;
 	uint32_t clock_frequency;	/**< Processor frequency in Hz. */
 	uint64_t next_tick_cmpr;	/**< Next clock interrupt should be
-					 *   generated when the TICK register
-					 *   matches this value.
-					 */
-};
+									 generated when the TICK register
+									 matches this value. */
+} cpu_arch_t;
 	
 #endif
Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ 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 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ 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 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ 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;