diff --git a/src/mainboard/amd/db800/irq_tables.c b/src/mainboard/amd/db800/irq_tables.c
index c8b201d2cf..891b454751 100644
--- a/src/mainboard/amd/db800/irq_tables.c
+++ b/src/mainboard/amd/db800/irq_tables.c
@@ -21,7 +21,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 10
diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index e90b0e9402..907240b3d1 100644
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/amd/dbm690t/fadt.c b/src/mainboard/amd/dbm690t/fadt.c
index 11070ead95..3508a384db 100644
--- a/src/mainboard/amd/dbm690t/fadt.c
+++ b/src/mainboard/amd/dbm690t/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb600/sb600.h"
+#include "southbridge/amd/sb600/sb600.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c
index aee31c9a80..79c9799deb 100644
--- a/src/mainboard/amd/mahogany/acpi_tables.c
+++ b/src/mainboard/amd/mahogany/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/amd/mahogany/fadt.c b/src/mainboard/amd/mahogany/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/amd/mahogany/fadt.c
+++ b/src/mainboard/amd/mahogany/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/amd/mahogany_fam10/fadt.c b/src/mainboard/amd/mahogany_fam10/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/amd/mahogany_fam10/fadt.c
+++ b/src/mainboard/amd/mahogany_fam10/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/amd/norwich/irq_tables.c b/src/mainboard/amd/norwich/irq_tables.c
index 4aaf6743b9..91afe6560f 100644
--- a/src/mainboard/amd/norwich/irq_tables.c
+++ b/src/mainboard/amd/norwich/irq_tables.c
@@ -21,7 +21,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 11
diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c
index d111f52c3f..05c267011d 100644
--- a/src/mainboard/amd/pistachio/acpi_tables.c
+++ b/src/mainboard/amd/pistachio/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/amd/pistachio/fadt.c b/src/mainboard/amd/pistachio/fadt.c
index 11070ead95..3508a384db 100644
--- a/src/mainboard/amd/pistachio/fadt.c
+++ b/src/mainboard/amd/pistachio/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb600/sb600.h"
+#include "southbridge/amd/sb600/sb600.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index d51433c234..1b5197e6d7 100644
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -16,7 +16,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 
 #include "mb_sysconf.h"
 
diff --git a/src/mainboard/amd/tilapia_fam10/fadt.c b/src/mainboard/amd/tilapia_fam10/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/amd/tilapia_fam10/fadt.c
+++ b/src/mainboard/amd/tilapia_fam10/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/artecgroup/dbe61/irq_tables.c b/src/mainboard/artecgroup/dbe61/irq_tables.c
index 33e98ba20b..5d9f6a1f97 100644
--- a/src/mainboard/artecgroup/dbe61/irq_tables.c
+++ b/src/mainboard/artecgroup/dbe61/irq_tables.c
@@ -21,7 +21,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 10
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index 59312dc146..f49c21560d 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -25,7 +25,7 @@
 #include <arch/io.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/lxdef.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 #include "chip.h"
 
 static void init_gpio(void)
diff --git a/src/mainboard/asrock/939a785gmh/acpi_tables.c b/src/mainboard/asrock/939a785gmh/acpi_tables.c
index aee31c9a80..79c9799deb 100644
--- a/src/mainboard/asrock/939a785gmh/acpi_tables.c
+++ b/src/mainboard/asrock/939a785gmh/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/asrock/939a785gmh/fadt.c b/src/mainboard/asrock/939a785gmh/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/asrock/939a785gmh/fadt.c
+++ b/src/mainboard/asrock/939a785gmh/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/asus/a8v-e_se/acpi_tables.c b/src/mainboard/asus/a8v-e_se/acpi_tables.c
index 866dec1c60..1119fd8fce 100644
--- a/src/mainboard/asus/a8v-e_se/acpi_tables.c
+++ b/src/mainboard/asus/a8v-e_se/acpi_tables.c
@@ -28,8 +28,8 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
-#include "../../../southbridge/via/k8t890/k8t890.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/k8t890/k8t890.h"
 
 extern const unsigned char AmlCode[];
 
diff --git a/src/mainboard/asus/a8v-e_se/mptable.c b/src/mainboard/asus/a8v-e_se/mptable.c
index 568f3a3ced..d2529db6db 100644
--- a/src/mainboard/asus/a8v-e_se/mptable.c
+++ b/src/mainboard/asus/a8v-e_se/mptable.c
@@ -20,8 +20,8 @@
 #include <string.h>
 #include <stdint.h>
 #include <arch/smp/mpspec.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
-#include "../../../southbridge/via/k8t890/k8t890.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/k8t890/k8t890.h"
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
index 6892d7fc75..5858e3ff75 100644
--- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c
+++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
@@ -28,9 +28,9 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
-#include "../../../southbridge/via/k8t890/k8t890.h"
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/k8t890/k8t890.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <cpu/amd/model_fxx_powernow.h>
 
 extern const unsigned char AmlCode[];
diff --git a/src/mainboard/asus/m4a785-m/fadt.c b/src/mainboard/asus/m4a785-m/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/asus/m4a785-m/fadt.c
+++ b/src/mainboard/asus/m4a785-m/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/digitallogic/msm800sev/irq_tables.c b/src/mainboard/digitallogic/msm800sev/irq_tables.c
index c1398fe4ce..4ad0ee4477 100644
--- a/src/mainboard/digitallogic/msm800sev/irq_tables.c
+++ b/src/mainboard/digitallogic/msm800sev/irq_tables.c
@@ -21,7 +21,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 11
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index d726678df5..8dbdbfd2ad 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -32,7 +32,7 @@
 
 extern unsigned char AmlCode[];
 
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 
 static void acpi_create_gnvs(global_nvs_t *gnvs)
 {
diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c
index 846617e64e..66619589e4 100644
--- a/src/mainboard/gigabyte/m57sli/acpi_tables.c
+++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c
@@ -29,7 +29,7 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <cpu/amd/model_fxx_powernow.h>
 #include <device/pci.h>
 #include <cpu/amd/amdk8_sysconf.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/fadt.c b/src/mainboard/gigabyte/ma785gmt/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/gigabyte/ma785gmt/fadt.c
+++ b/src/mainboard/gigabyte/ma785gmt/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/gigabyte/ma78gm/fadt.c b/src/mainboard/gigabyte/ma78gm/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/gigabyte/ma78gm/fadt.c
+++ b/src/mainboard/gigabyte/ma78gm/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c
index 6adff9f56b..063127ba10 100644
--- a/src/mainboard/ibase/mb899/acpi_tables.c
+++ b/src/mainboard/ibase/mb899/acpi_tables.c
@@ -34,7 +34,7 @@ extern const unsigned char AmlCode[];
 unsigned long acpi_create_slic(unsigned long current);
 #endif
 
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 static void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	memset((void *)gnvs, 0, sizeof(*gnvs));
diff --git a/src/mainboard/ibase/mb899/mainboard_smi.c b/src/mainboard/ibase/mb899/mainboard_smi.c
index 1aac802f2e..8516bdeba6 100644
--- a/src/mainboard/ibase/mb899/mainboard_smi.c
+++ b/src/mainboard/ibase/mb899/mainboard_smi.c
@@ -21,7 +21,7 @@
 #include <arch/romcc_io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 
 /* The southbridge SMI handler checks whether gnvs has a
  * valid pointer before calling the trap handler
diff --git a/src/mainboard/iei/kino-780am2-fam10/fadt.c b/src/mainboard/iei/kino-780am2-fam10/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/iei/kino-780am2-fam10/fadt.c
+++ b/src/mainboard/iei/kino-780am2-fam10/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c
index afa695502f..f10a8d5255 100644
--- a/src/mainboard/intel/d945gclf/acpi_tables.c
+++ b/src/mainboard/intel/d945gclf/acpi_tables.c
@@ -65,7 +65,7 @@ typedef struct acpi_oemb {
 } __attribute__((packed)) acpi_oemb_t;
 #endif
 
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 
 #if OLD_ACPI
 static void acpi_create_oemb(acpi_oemb_t *oemb)
diff --git a/src/mainboard/intel/d945gclf/mainboard_smi.c b/src/mainboard/intel/d945gclf/mainboard_smi.c
index c07a24c399..8dff64e8fa 100644
--- a/src/mainboard/intel/d945gclf/mainboard_smi.c
+++ b/src/mainboard/intel/d945gclf/mainboard_smi.c
@@ -21,7 +21,7 @@
 #include <arch/romcc_io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 
 /* The southbridge SMI handler checks whether gnvs has a
  * valid pointer before calling the trap handler
diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c
index d41b6193ba..2221ae4211 100644
--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -16,7 +16,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 
 #include "mb_sysconf.h"
 
diff --git a/src/mainboard/jetway/pa78vm5/fadt.c b/src/mainboard/jetway/pa78vm5/fadt.c
index 0f95aac6fd..851ad8b225 100644
--- a/src/mainboard/jetway/pa78vm5/fadt.c
+++ b/src/mainboard/jetway/pa78vm5/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/sb700.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
index 6adff9f56b..063127ba10 100644
--- a/src/mainboard/kontron/986lcd-m/acpi_tables.c
+++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c
@@ -34,7 +34,7 @@ extern const unsigned char AmlCode[];
 unsigned long acpi_create_slic(unsigned long current);
 #endif
 
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 static void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	memset((void *)gnvs, 0, sizeof(*gnvs));
diff --git a/src/mainboard/kontron/986lcd-m/mainboard_smi.c b/src/mainboard/kontron/986lcd-m/mainboard_smi.c
index 1aac802f2e..8516bdeba6 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard_smi.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard_smi.c
@@ -21,7 +21,7 @@
 #include <arch/romcc_io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 
 /* The southbridge SMI handler checks whether gnvs has a
  * valid pointer before calling the trap handler
diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c
index 4297aabbd7..0df43859d2 100644
--- a/src/mainboard/kontron/kt690/acpi_tables.c
+++ b/src/mainboard/kontron/kt690/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/kontron/kt690/fadt.c b/src/mainboard/kontron/kt690/fadt.c
index 11070ead95..3508a384db 100644
--- a/src/mainboard/kontron/kt690/fadt.c
+++ b/src/mainboard/kontron/kt690/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb600/sb600.h"
+#include "southbridge/amd/sb600/sb600.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/lippert/hurricane-lx/irq_tables.c b/src/mainboard/lippert/hurricane-lx/irq_tables.c
index 70cb4ecb81..86166b18c4 100644
--- a/src/mainboard/lippert/hurricane-lx/irq_tables.c
+++ b/src/mainboard/lippert/hurricane-lx/irq_tables.c
@@ -24,7 +24,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 10
diff --git a/src/mainboard/lippert/literunner-lx/irq_tables.c b/src/mainboard/lippert/literunner-lx/irq_tables.c
index b0761fe5ad..9b16074295 100644
--- a/src/mainboard/lippert/literunner-lx/irq_tables.c
+++ b/src/mainboard/lippert/literunner-lx/irq_tables.c
@@ -24,7 +24,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 10
diff --git a/src/mainboard/lippert/roadrunner-lx/irq_tables.c b/src/mainboard/lippert/roadrunner-lx/irq_tables.c
index f1c6eeb4e6..77d181a09a 100644
--- a/src/mainboard/lippert/roadrunner-lx/irq_tables.c
+++ b/src/mainboard/lippert/roadrunner-lx/irq_tables.c
@@ -24,7 +24,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 10
diff --git a/src/mainboard/lippert/spacerunner-lx/irq_tables.c b/src/mainboard/lippert/spacerunner-lx/irq_tables.c
index 48a266a707..bd56af9062 100644
--- a/src/mainboard/lippert/spacerunner-lx/irq_tables.c
+++ b/src/mainboard/lippert/spacerunner-lx/irq_tables.c
@@ -24,7 +24,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 10
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index b2e0ed6bc7..2cdb5c5018 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -29,7 +29,7 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
-//#include "../../../northbridge/amd/amdfam10/amdfam10_acpi.h"
+//#include "northbridge/amd/amdfam10/amdfam10_acpi.h"
 #include <cpu/amd/model_fxx_powernow.h>
 #include <device/pci.h>
 #include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index 1e5add3dc0..c6b86ef18d 100644
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -6,7 +6,7 @@
 #include <arch/io.h>
 #include <pc80/mc146818rtc.h>
 #include "chip.h"
-#include "../southbridge/amd/cs5536/cs5536_smbus2.h"
+#include "southbridge/amd/cs5536/cs5536_smbus2.h"
 #include <cpu/amd/vr.h>
 
 /* Borrowed from mc146818rtc.c */
diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c
index adfb957ab7..2c2464be32 100644
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -6,7 +6,7 @@
 #include <arch/io.h>
 #include <pc80/mc146818rtc.h>
 #include "chip.h"
-#include "../southbridge/amd/cs5536/cs5536_smbus2.h"
+#include "southbridge/amd/cs5536/cs5536_smbus2.h"
 
 /* Borrowed from mc146818rtc.c */
 
diff --git a/src/mainboard/pcengines/alix1c/irq_tables.c b/src/mainboard/pcengines/alix1c/irq_tables.c
index 17f0bf68f7..414a93073d 100644
--- a/src/mainboard/pcengines/alix1c/irq_tables.c
+++ b/src/mainboard/pcengines/alix1c/irq_tables.c
@@ -20,7 +20,7 @@
 #include <arch/pirq_routing.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 11
diff --git a/src/mainboard/pcengines/alix2d/irq_tables.c b/src/mainboard/pcengines/alix2d/irq_tables.c
index 229a168a1a..1e4f2d922f 100644
--- a/src/mainboard/pcengines/alix2d/irq_tables.c
+++ b/src/mainboard/pcengines/alix2d/irq_tables.c
@@ -20,7 +20,7 @@
 #include <arch/pirq_routing.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 11
diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index 00088f7b65..3bd4868932 100644
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -90,7 +90,7 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
 }
 #endif
 
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 static void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	memset((void *)gnvs, 0, sizeof(*gnvs));
diff --git a/src/mainboard/roda/rk886ex/mainboard_smi.c b/src/mainboard/roda/rk886ex/mainboard_smi.c
index a87d99da47..17783fe6e6 100644
--- a/src/mainboard/roda/rk886ex/mainboard_smi.c
+++ b/src/mainboard/roda/rk886ex/mainboard_smi.c
@@ -23,7 +23,7 @@
 #include <arch/romcc_io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include "../../../southbridge/intel/i82801gx/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/i82801gx_nvs.h"
 
 /* The southbridge SMI handler checks whether gnvs has a
  * valid pointer before calling the trap handler
diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c
index 4297aabbd7..0df43859d2 100644
--- a/src/mainboard/technexion/tim5690/acpi_tables.c
+++ b/src/mainboard/technexion/tim5690/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/technexion/tim5690/fadt.c b/src/mainboard/technexion/tim5690/fadt.c
index 11070ead95..3508a384db 100644
--- a/src/mainboard/technexion/tim5690/fadt.c
+++ b/src/mainboard/technexion/tim5690/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb600/sb600.h"
+#include "southbridge/amd/sb600/sb600.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/technexion/tim5690/speaker.c b/src/mainboard/technexion/tim5690/speaker.c
index 5eeb7938e8..ed893eded7 100644
--- a/src/mainboard/technexion/tim5690/speaker.c
+++ b/src/mainboard/technexion/tim5690/speaker.c
@@ -29,7 +29,7 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "../../../southbridge/amd/sb600/sb600.h"
+#include "southbridge/amd/sb600/sb600.h"
 #include <delay.h>
 
 #endif /* __PRE_RAM__ */
diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c
index 4297aabbd7..0df43859d2 100644
--- a/src/mainboard/technexion/tim8690/acpi_tables.c
+++ b/src/mainboard/technexion/tim8690/acpi_tables.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
diff --git a/src/mainboard/technexion/tim8690/fadt.c b/src/mainboard/technexion/tim8690/fadt.c
index 11070ead95..3508a384db 100644
--- a/src/mainboard/technexion/tim8690/fadt.c
+++ b/src/mainboard/technexion/tim8690/fadt.c
@@ -26,7 +26,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include "../../../southbridge/amd/sb600/sb600.h"
+#include "southbridge/amd/sb600/sb600.h"
 
 /*extern*/ u16 pm_base = 0x800;
 /* pm_base should be set in sb acpi */
diff --git a/src/mainboard/traverse/geos/irq_tables.c b/src/mainboard/traverse/geos/irq_tables.c
index b404f26e69..104b4a42c8 100644
--- a/src/mainboard/traverse/geos/irq_tables.c
+++ b/src/mainboard/traverse/geos/irq_tables.c
@@ -21,7 +21,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 11
diff --git a/src/mainboard/tyan/s2891/acpi_tables.c b/src/mainboard/tyan/s2891/acpi_tables.c
index 9659412590..62fece77ba 100644
--- a/src/mainboard/tyan/s2891/acpi_tables.c
+++ b/src/mainboard/tyan/s2891/acpi_tables.c
@@ -17,7 +17,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <cpu/amd/model_fxx_powernow.h>
 
 extern const unsigned char AmlCode[];
diff --git a/src/mainboard/tyan/s2892/acpi_tables.c b/src/mainboard/tyan/s2892/acpi_tables.c
index 9659412590..62fece77ba 100644
--- a/src/mainboard/tyan/s2892/acpi_tables.c
+++ b/src/mainboard/tyan/s2892/acpi_tables.c
@@ -17,7 +17,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <cpu/amd/model_fxx_powernow.h>
 
 extern const unsigned char AmlCode[];
diff --git a/src/mainboard/tyan/s2895/acpi_tables.c b/src/mainboard/tyan/s2895/acpi_tables.c
index 14dcd36e96..c9b764d280 100644
--- a/src/mainboard/tyan/s2895/acpi_tables.c
+++ b/src/mainboard/tyan/s2895/acpi_tables.c
@@ -17,7 +17,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <cpu/amd/model_fxx_powernow.h>
 
 extern const unsigned char AmlCode[];
diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c
index 01aeb7b877..414466f4f6 100644
--- a/src/mainboard/via/epia-m700/acpi_tables.c
+++ b/src/mainboard/via/epia-m700/acpi_tables.c
@@ -33,7 +33,7 @@
 #include <arch/acpi.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
-#include "../../../northbridge/via/vx800/vx800.h"
+#include "northbridge/via/vx800/vx800.h"
 
 extern const unsigned char AmlCode_dsdt[];
 extern const unsigned char AmlCode_ssdt[];
diff --git a/src/mainboard/via/epia-m700/fadt.c b/src/mainboard/via/epia-m700/fadt.c
index 887ff205ab..062edff6f7 100644
--- a/src/mainboard/via/epia-m700/fadt.c
+++ b/src/mainboard/via/epia-m700/fadt.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <arch/acpi.h>
-#include "../../../northbridge/via/vx800/vx800.h"
+#include "northbridge/via/vx800/vx800.h"
 
 void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
 {
diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c
index 7cfa15114c..d8b28b25e7 100644
--- a/src/mainboard/via/epia-n/acpi_tables.c
+++ b/src/mainboard/via/epia-n/acpi_tables.c
@@ -33,7 +33,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
 
 extern const unsigned char AmlCode[];
 
diff --git a/src/mainboard/via/epia-n/fadt.c b/src/mainboard/via/epia-n/fadt.c
index d7896f5cb8..29864a9eca 100644
--- a/src/mainboard/via/epia-n/fadt.c
+++ b/src/mainboard/via/epia-n/fadt.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <arch/acpi.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
 
 void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){
 	acpi_header_t *header=&(fadt->header);
diff --git a/src/mainboard/via/pc2500e/mptable.c b/src/mainboard/via/pc2500e/mptable.c
index caaf7843c2..3e36e878fa 100644
--- a/src/mainboard/via/pc2500e/mptable.c
+++ b/src/mainboard/via/pc2500e/mptable.c
@@ -27,7 +27,7 @@
 #include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
 
 static void *smp_write_config_table(void *v)
 {
diff --git a/src/mainboard/winent/pl6064/irq_tables.c b/src/mainboard/winent/pl6064/irq_tables.c
index c912b37e3e..48c26b0f59 100644
--- a/src/mainboard/winent/pl6064/irq_tables.c
+++ b/src/mainboard/winent/pl6064/irq_tables.c
@@ -22,7 +22,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/pirq_routing.h>
-#include "../../../southbridge/amd/cs5536/cs5536.h"
+#include "southbridge/amd/cs5536/cs5536.h"
 
 /* Platform IRQs */
 #define PIRQA 11