Index: kernel/arch/ia32/src/asm.S
===================================================================
--- kernel/arch/ia32/src/asm.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/src/asm.S	(revision 0c793e2e9c4358a2bb2521d35eb36b273cf0283b)
@@ -35,5 +35,5 @@
 #include <arch/cpu.h>
 #include <arch/mm/page.h>
-#include <arch/istate_struct.h>
+#include <arch/istate_struct.ag.h>
 #include <arch/smp/apic.h>
 
@@ -585,2 +585,3 @@
 FUNCTION_END(early_putchar)
 
+
Index: kernel/arch/ia32/src/context.S
===================================================================
--- kernel/arch/ia32/src/context.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/src/context.S	(revision 0c793e2e9c4358a2bb2521d35eb36b273cf0283b)
@@ -28,5 +28,5 @@
 
 #include <abi/asmtool.h>
-#include <arch/context_struct.h>
+#include <arch/context_struct.ag.h>
 #include <arch/vreg.h>
 
Index: kernel/arch/ia32/src/smp/ap.S
===================================================================
--- kernel/arch/ia32/src/smp/ap.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/ia32/src/smp/ap.S	(revision 0c793e2e9c4358a2bb2521d35eb36b273cf0283b)
@@ -38,5 +38,5 @@
 #include <arch/pm.h>
 #include <arch/cpu.h>
-#include <arch/context_struct.h>
+#include <arch/context_struct.ag.h>
 
 .section K_TEXT_START, "ax"