diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index bc6656da2b..8158ac4d1e 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -126,7 +126,7 @@ ifeq ($(CONFIG_CPU_AMD_GEODELX),y)
 else
 ifeq ($(CONFIG_CPU_AMD_K8),y)
 	STAGE0_CAR_OBJ = amd/stage0.o
-	STAGE0_ARCH_X86_OBJ += amdk8/stage1.o
+	STAGE0_ARCH_X86_OBJ += amd/k8/stage1.o
 endif
 endif
 endif
diff --git a/arch/x86/amd/k8/stage1.c b/arch/x86/amd/k8/stage1.c
index 24133d35e7..9989b725d1 100644
--- a/arch/x86/amd/k8/stage1.c
+++ b/arch/x86/amd/k8/stage1.c
@@ -22,7 +22,7 @@
 #include <lib.h>
 #include <console.h>
 #include <msr.h>
-#include <amd_k8.h>
+#include <amd/k8/k8.h>
 
 /**
  * Disable Cache As RAM (CAR) after memory is setup.