Index: kernel/arch/mips32/include/context.h
===================================================================
--- kernel/arch/mips32/include/context.h	(revision 3dea17f5a2dc97de65bf1ff23eb43f3621665af4)
+++ 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 3dea17f5a2dc97de65bf1ff23eb43f3621665af4)
+++ 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 3dea17f5a2dc97de65bf1ff23eb43f3621665af4)
+++ 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>