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