Index: kernel/arch/amd64/include/context.h
===================================================================
--- kernel/arch/amd64/include/context.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/amd64/include/context.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,8 +36,5 @@
 #define KERN_amd64_CONTEXT_H_
 
-#ifndef KERN_amd64_TYPES_H_
-#  include <arch/types.h>
-#endif
-
+#include <arch/types.h>
 
 /* According to ABI the stack MUST be aligned on 
Index: kernel/arch/mips32/include/context.h
===================================================================
--- kernel/arch/mips32/include/context.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/mips32/include/context.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -47,7 +47,5 @@
 #ifndef __ASM__
 
-#ifndef __mips32_TYPES_H__
-# include <arch/types.h>
-#endif
+#include <arch/types.h>
 
 /*
Index: kernel/arch/mips32/include/context_offset.h
===================================================================
--- kernel/arch/mips32/include/context_offset.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/mips32/include/context_offset.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -14,6 +14,5 @@
 #define OFFSET_GP      0x2c
 
-
-/* struct register_dump */
+/* struct istate */
 #define EOFFSET_AT     0x0
 #define EOFFSET_V0     0x4
Index: kernel/arch/mips32/include/exception.h
===================================================================
--- kernel/arch/mips32/include/exception.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/mips32/include/exception.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,8 +36,5 @@
 #define KERN_mips32_EXCEPTION_H_
 
-#ifndef KERN_mips32_TYPES_H_
-#  include <arch/types.h>
-#endif
-
+#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/cp0.h>
Index: kernel/arch/ppc32/include/context.h
===================================================================
--- kernel/arch/ppc32/include/context.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/ppc32/include/context.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,7 +36,5 @@
 #define KERN_ppc32_CONTEXT_H_
 
-#ifndef KERN_ppc32_TYPES_H_
-# include <arch/types.h>
-#endif
+#include <arch/types.h>
 
 #define SP_DELTA	16
Index: kernel/arch/ppc32/include/exception.h
===================================================================
--- kernel/arch/ppc32/include/exception.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/ppc32/include/exception.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,8 +36,5 @@
 #define KERN_ppc32_EXCEPTION_H_
 
-#ifndef KERN_ppc32_TYPES_H_
-#  include <arch/types.h>
-#endif
-
+#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ppc64/include/context.h
===================================================================
--- kernel/arch/ppc64/include/context.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/ppc64/include/context.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,7 +36,5 @@
 #define KERN_ppc64_CONTEXT_H_
 
-#ifndef KERN_ppc64_TYPES_H_
-# include <arch/types.h>
-#endif
+#include <arch/types.h>
 
 #define SP_DELTA	16
Index: kernel/arch/ppc64/include/exception.h
===================================================================
--- kernel/arch/ppc64/include/exception.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/ppc64/include/exception.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,8 +36,5 @@
 #define KERN_ppc64_EXCEPTION_H_
 
-#ifndef KERN_ppc64_TYPES_H_
-#  include <arch/types.h>
-#endif
-
+#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/sparc64/include/context.h
===================================================================
--- kernel/arch/sparc64/include/context.h	(revision 8cee7054021b8feabfbbb8d0e8ed691c0dc8e680)
+++ kernel/arch/sparc64/include/context.h	(revision 715a847f39286d8a5751f93af972d0fdb8bfb951)
@@ -36,15 +36,7 @@
 #define KERN_sparc64_CONTEXT_H_
 
-#ifndef KERN_sparc64_STACK_H_
-# include <arch/stack.h>
-#endif
-
-#ifndef KERN_sparc64_TYPES_H_
-# include <arch/types.h>
-#endif
-
-#ifndef KERN_ALIGN_H_
-# include <align.h>
-#endif
+#include <arch/stack.h>
+#include <arch/types.h>
+#include <align.h>
 
 #define SP_DELTA	STACK_WINDOW_SAVE_AREA_SIZE