diff --git a/src/cpu/amd/pi/00630F01/fixme.c b/src/cpu/amd/pi/00630F01/fixme.c
index c27a555eec..91450338aa 100644
--- a/src/cpu/amd/pi/00630F01/fixme.c
+++ b/src/cpu/amd/pi/00630F01/fixme.c
@@ -15,7 +15,10 @@
 
 #include <cpu/x86/mtrr.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
-#include "amdlib.h"
+
+#include <Porting.h>
+#include <AGESA.h>
+#include <amdlib.h>
 
 void amd_initcpuio(void)
 {
diff --git a/src/cpu/amd/pi/00660F01/fixme.c b/src/cpu/amd/pi/00660F01/fixme.c
index 433cee9c19..a4c574ced7 100644
--- a/src/cpu/amd/pi/00660F01/fixme.c
+++ b/src/cpu/amd/pi/00660F01/fixme.c
@@ -15,7 +15,10 @@
 
 #include <cpu/x86/mtrr.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
-#include "amdlib.h"
+
+#include <Porting.h>
+#include <AGESA.h>
+#include <amdlib.h>
 
 void amd_initcpuio(void)
 {
diff --git a/src/cpu/amd/pi/00730F01/fixme.c b/src/cpu/amd/pi/00730F01/fixme.c
index 6489511630..f6334a8a78 100644
--- a/src/cpu/amd/pi/00730F01/fixme.c
+++ b/src/cpu/amd/pi/00730F01/fixme.c
@@ -15,7 +15,10 @@
 
 #include <cpu/x86/mtrr.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
-#include "amdlib.h"
+
+#include <Porting.h>
+#include <AGESA.h>
+#include <amdlib.h>
 
 void amd_initcpuio(void)
 {