7 files changed, 8 insertions, 9 deletions
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index b5739f9e39..07646c862c 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -19,7 +19,7 @@
 #include <device/smbus.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
-#include <stdlib.h>
+
 #include "hudson.h"
 #include "smbus.c"
 
diff --git a/src/southbridge/amd/cimx/sb800/smbus_spd.c b/src/southbridge/amd/cimx/sb800/smbus_spd.c
index a6881bbe1e..a574072388 100644
--- a/src/southbridge/amd/cimx/sb800/smbus_spd.c
+++ b/src/southbridge/amd/cimx/sb800/smbus_spd.c
@@ -15,7 +15,7 @@
 
 #include <device/pci_def.h>
 #include <device/device.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <OEM.h>		/* SMBUS0_BASE_ADDRESS */
 
 /* warning: Porting.h includes an open #pragma pack(1) */
diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c
index ffda0a8ea4..fcb4fa1111 100644
--- a/src/southbridge/amd/cimx/sb800/spi.c
+++ b/src/southbridge/amd/cimx/sb800/spi.c
@@ -12,8 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <stdint.h>
-#include <stdlib.h>
+
 #include <device/mmio.h>
 #include <console/console.h>
 #include <spi_flash.h>
@@ -21,6 +20,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
+#include <types.h>
 
 #include "SBPLATFORM.h"
 #include <vendorcode/amd/cimx/sb800/ECfan.h>
diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index 58f5113fa5..7ecb8df2ab 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -19,7 +19,7 @@
 #include <device/smbus.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
-#include <stdlib.h>
+
 #include "hudson.h"
 #include "smbus.c"
 
diff --git a/src/southbridge/amd/sb700/sm.c b/src/southbridge/amd/sb700/sm.c
index 66316828ba..535e5e4135 100644
--- a/src/southbridge/amd/sb700/sm.c
+++ b/src/southbridge/amd/sb700/sm.c
@@ -24,7 +24,7 @@
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
-#include <stdlib.h>
+
 #include "sb700.h"
 #include "smbus.h"
 
diff --git a/src/southbridge/amd/sb700/spi.c b/src/southbridge/amd/sb700/spi.c
index ee031e927f..f772f755ba 100644
--- a/src/southbridge/amd/sb700/spi.c
+++ b/src/southbridge/amd/sb700/spi.c
@@ -14,8 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <device/mmio.h>
 #include <console/console.h>
 #include <spi-generic.h>
@@ -23,6 +21,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
+#include <types.h>
 
 #define AMD_SB_SPI_TX_LEN 8
 
diff --git a/src/southbridge/amd/sb800/sm.c b/src/southbridge/amd/sb800/sm.c
index 1d2daed81c..e1cf05ce09 100644
--- a/src/southbridge/amd/sb800/sm.c
+++ b/src/southbridge/amd/sb800/sm.c
@@ -23,7 +23,7 @@
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
-#include <stdlib.h>
+
 #include "sb800.h"
 #include "smbus.c"