Index: kernel/arch/amd64/src/asm.S
===================================================================
--- kernel/arch/amd64/src/asm.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/amd64/src/asm.S	(revision 95aed62f997beed657c99c003a81e20a7a71d608)
@@ -30,6 +30,6 @@
 #include <arch/pm.h>
 #include <arch/mm/page.h>
-#include <arch/istate_struct.h>
-#include <arch/kseg_struct.h>
+#include <arch/istate_struct.ag.h>
+#include <arch/kseg_struct.ag.h>
 #include <arch/cpu.h>
 #include <arch/smp/apic.h>
@@ -541,2 +541,3 @@
 	ret
 FUNCTION_END(early_putchar)
+
Index: kernel/arch/amd64/src/boot/multiboot.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/amd64/src/boot/multiboot.S	(revision 95aed62f997beed657c99c003a81e20a7a71d608)
@@ -720,2 +720,3 @@
 status_main:
 	.asciz "[main] "
+
Index: kernel/arch/amd64/src/context.S
===================================================================
--- kernel/arch/amd64/src/context.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/amd64/src/context.S	(revision 95aed62f997beed657c99c003a81e20a7a71d608)
@@ -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/amd64/src/smp/ap.S
===================================================================
--- kernel/arch/amd64/src/smp/ap.S	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/amd64/src/smp/ap.S	(revision 95aed62f997beed657c99c003a81e20a7a71d608)
@@ -39,5 +39,5 @@
 #include <arch/cpu.h>
 #include <arch/cpuid.h>
-#include <arch/context_struct.h>
+#include <arch/context_struct.ag.h>
 
 .section K_TEXT_START, "ax"