7 files changed, 1 insertions, 9 deletions
diff --git a/src/southbridge/amd/agesa/hudson/early_setup.c b/src/southbridge/amd/agesa/hudson/early_setup.c
index 75da9dd91e..66cd66ebe3 100644
--- a/src/southbridge/amd/agesa/hudson/early_setup.c
+++ b/src/southbridge/amd/agesa/hudson/early_setup.c
@@ -21,7 +21,6 @@
 #include <arch/acpi.h>
 #include <console/console.h>
 #include <reset.h>
-#include <arch/cpu.h>
 #include <cbmem.h>
 #include "hudson.h"
 
diff --git a/src/southbridge/amd/agesa/hudson/smi.c b/src/southbridge/amd/agesa/hudson/smi.c
index e8b7868209..4180795a73 100644
--- a/src/southbridge/amd/agesa/hudson/smi.c
+++ b/src/southbridge/amd/agesa/hudson/smi.c
@@ -21,7 +21,6 @@
 #include "smi.h"
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
 {
diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index 2f22f04738..c38e6f8d69 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -22,7 +22,6 @@
 #include <arch/acpi.h>
 #include <console/console.h>
 #include <reset.h>
-#include <arch/cpu.h>
 #include <cbmem.h>
 #include "hudson.h"
 #include "pci_devs.h"
diff --git a/src/southbridge/amd/pi/hudson/smi.c b/src/southbridge/amd/pi/hudson/smi.c
index e8b7868209..4180795a73 100644
--- a/src/southbridge/amd/pi/hudson/smi.c
+++ b/src/southbridge/amd/pi/hudson/smi.c
@@ -21,7 +21,6 @@
 #include "smi.h"
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
 {
diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c
index b849e1efa7..23cd877370 100644
--- a/src/southbridge/amd/rs780/cmn.c
+++ b/src/southbridge/amd/rs780/cmn.c
@@ -14,9 +14,8 @@
  */
 
 #include <console/console.h>
-
 #include <arch/io.h>
-
+#include <arch/cpu.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
@@ -24,7 +23,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <delay.h>
-#include <cpu/cpu.h>
 #include "rs780.h"
 
 static u32 nb_read_index(struct device *dev, u32 index_reg, u32 index)
diff --git a/src/southbridge/amd/sb700/early_setup.c b/src/southbridge/amd/sb700/early_setup.c
index a6569210f4..70cf340c8e 100644
--- a/src/southbridge/amd/sb700/early_setup.c
+++ b/src/southbridge/amd/sb700/early_setup.c
@@ -19,7 +19,6 @@
 
 #include <stdint.h>
 #include <option.h>
-#include <arch/cpu.h>
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
diff --git a/src/southbridge/amd/sb800/early_setup.c b/src/southbridge/amd/sb800/early_setup.c
index 6835d993c4..c9b879a931 100644
--- a/src/southbridge/amd/sb800/early_setup.c
+++ b/src/southbridge/amd/sb800/early_setup.c
@@ -17,7 +17,6 @@
 #define _SB800_EARLY_SETUP_C_
 
 #include <reset.h>
-#include <arch/cpu.h>
 #include <southbridge/amd/common/amd_defs.h>
 #include <southbridge/amd/common/reset.h>
 #include "sb800.h"