diff --git a/sdk/xtdk/amd64/ketypes.h b/sdk/xtdk/amd64/ketypes.h
index f8ecb6f..16eda05 100644
--- a/sdk/xtdk/amd64/ketypes.h
+++ b/sdk/xtdk/amd64/ketypes.h
@@ -17,17 +17,6 @@
 #include ARCH_HEADER(artypes.h)
 
 
-/* Processor context flags */
-#define CONTEXT_ARCH                      0x100000
-#define CONTEXT_CONTROL                   (CONTEXT_ARCH | 0x1L)
-#define CONTEXT_INTEGER                   (CONTEXT_ARCH | 0x2L)
-#define CONTEXT_SEGMENTS                  (CONTEXT_ARCH | 0x4L)
-#define CONTEXT_FLOATING_POINT            (CONTEXT_ARCH | 0x8L)
-#define CONTEXT_DEBUG_REGISTERS           (CONTEXT_ARCH | 0x10L)
-#define CONTEXT_FULL                      (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT)
-#define CONTEXT_ALL                       (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \
-                                           CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)
-
 /* Selector masks */
 #define MODE_MASK                         0x0001
 #define RPL_MASK                          0x0003
@@ -143,6 +132,9 @@
 #define CONTEXT_SEGMENTS                  (CONTEXT_ARCHITECTURE | 0x04)
 #define CONTEXT_FLOATING_POINT            (CONTEXT_ARCHITECTURE | 0x08)
 #define CONTEXT_DEBUG_REGISTERS           (CONTEXT_ARCHITECTURE | 0x10)
+#define CONTEXT_FULL                      (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT)
+#define CONTEXT_ALL                       (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \
+                                           CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)
 
 /* Clock control flags */
 #define CLOCK_QUANTUM_DECREMENT           3
diff --git a/sdk/xtdk/i686/ketypes.h b/sdk/xtdk/i686/ketypes.h
index 81a1f51..22e26bd 100644
--- a/sdk/xtdk/i686/ketypes.h
+++ b/sdk/xtdk/i686/ketypes.h
@@ -17,19 +17,6 @@
 #include ARCH_HEADER(artypes.h)
 
 
-/* Processor context flags */
-#define CONTEXT_ARCH                      0x10000
-#define CONTEXT_CONTROL                   (CONTEXT_ARCH | 0x1L)
-#define CONTEXT_INTEGER                   (CONTEXT_ARCH | 0x2L)
-#define CONTEXT_SEGMENTS                  (CONTEXT_ARCH | 0x4L)
-#define CONTEXT_FLOATING_POINT            (CONTEXT_ARCH | 0x8L)
-#define CONTEXT_DEBUG_REGISTERS           (CONTEXT_ARCH | 0x10L)
-#define CONTEXT_EXTENDED_REGISTERS        (CONTEXT_ARCH | 0x20L)
-#define CONTEXT_FULL                      (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS)
-#define CONTEXT_ALL                       (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \
-                                           CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | \
-                                           CONTEXT_EXTENDED_REGISTERS)
-
 /* Selector masks */
 #define MODE_MASK                         0x0001
 #define RPL_MASK                          0x0003
@@ -167,6 +154,10 @@
 #define CONTEXT_FLOATING_POINT            (CONTEXT_ARCHITECTURE | 0x08)
 #define CONTEXT_DEBUG_REGISTERS           (CONTEXT_ARCHITECTURE | 0x10)
 #define CONTEXT_EXTENDED_REGISTERS        (CONTEXT_ARCHITECTURE | 0x20)
+#define CONTEXT_FULL                      (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS)
+#define CONTEXT_ALL                       (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \
+                                           CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | \
+                                           CONTEXT_EXTENDED_REGISTERS)
 
 /* Clock control flags */
 #define CLOCK_QUANTUM_DECREMENT           3