6 files changed, 13 insertions, 6 deletions
diff --git a/src/cpu/amd/agesa/family12/fixme.c b/src/cpu/amd/agesa/family12/fixme.c
index deeb8b9096..d946e1bb13 100644
--- a/src/cpu/amd/agesa/family12/fixme.c
+++ b/src/cpu/amd/agesa/family12/fixme.c
@@ -14,7 +14,8 @@
  */
 
 #include <cpu/x86/mtrr.h>
-#include <northbridge/amd/agesa/agesawrapper.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <AGESA.h>
 #include "amdlib.h"
 
 void amd_initcpuio(void)
diff --git a/src/cpu/amd/agesa/family14/fixme.c b/src/cpu/amd/agesa/family14/fixme.c
index 9a171ede40..7d595853e6 100644
--- a/src/cpu/amd/agesa/family14/fixme.c
+++ b/src/cpu/amd/agesa/family14/fixme.c
@@ -14,7 +14,9 @@
  */
 
 #include <cpu/x86/mtrr.h>
-#include <northbridge/amd/agesa/agesawrapper.h>
+
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <AGESA.h>
 #include "amdlib.h"
 
 /* Define AMD Ontario APPU SSID/SVID */
diff --git a/src/cpu/amd/agesa/family15/fixme.c b/src/cpu/amd/agesa/family15/fixme.c
index 7b8598d816..03f4dff773 100644
--- a/src/cpu/amd/agesa/family15/fixme.c
+++ b/src/cpu/amd/agesa/family15/fixme.c
@@ -14,7 +14,8 @@
  */
 
 #include <cpu/x86/mtrr.h>
-#include <northbridge/amd/agesa/agesawrapper.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <AGESA.h>
 #include "amdlib.h"
 
 UINT64
diff --git a/src/cpu/amd/agesa/family15rl/fixme.c b/src/cpu/amd/agesa/family15rl/fixme.c
index b35d115692..2eb96891a0 100644
--- a/src/cpu/amd/agesa/family15rl/fixme.c
+++ b/src/cpu/amd/agesa/family15rl/fixme.c
@@ -14,7 +14,8 @@
  */
 
 #include <cpu/x86/mtrr.h>
-#include <northbridge/amd/agesa/agesawrapper.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <AGESA.h>
 #include "amdlib.h"
 
 void amd_initcpuio(void)
diff --git a/src/cpu/amd/agesa/family15tn/fixme.c b/src/cpu/amd/agesa/family15tn/fixme.c
index b35d115692..2eb96891a0 100644
--- a/src/cpu/amd/agesa/family15tn/fixme.c
+++ b/src/cpu/amd/agesa/family15tn/fixme.c
@@ -14,7 +14,8 @@
  */
 
 #include <cpu/x86/mtrr.h>
-#include <northbridge/amd/agesa/agesawrapper.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <AGESA.h>
 #include "amdlib.h"
 
 void amd_initcpuio(void)
diff --git a/src/cpu/amd/agesa/family16kb/fixme.c b/src/cpu/amd/agesa/family16kb/fixme.c
index d1bc4bc55f..4ea52cc6e0 100644
--- a/src/cpu/amd/agesa/family16kb/fixme.c
+++ b/src/cpu/amd/agesa/family16kb/fixme.c
@@ -14,7 +14,8 @@
  */
 
 #include <cpu/x86/mtrr.h>
-#include <northbridge/amd/agesa/agesawrapper.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <AGESA.h>
 #include "amdlib.h"
 
 void amd_initcpuio(void)