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