Clean up ACPI:

- unify all iasl related rules into the toplevel Makefile
- build a filesystem standard for ACPI files and use it
- pass ACPI sources through cpp, so constants can be shared
  between C and ACPI more easily
- use cpp's #include instead of ACPI's Include() so cpp gets
  the whole picture

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5094 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

156 files changed, 152 insertions, 543 deletions

diff --git a/Makefile b/Makefile
index e526ba9..461ee13 100644
--- a/Makefile
+++ b/Makefile
@@ -138,12 +138,13 @@ subdirs:=$(PLATFORM-y) $(BUILD-y)
 $(eval $(call evaluate_subdirs))
 
 
-define c_dsl_template
-$(obj)/$(1)%.c: src/$(1)%.dsl $(obj)/build.h
+define objs_dsl_template
+$(obj)/$(1)%.o: src/$(1)%.asl
 	@printf "    IASL       $$(subst $$(shell pwd)/,,$$(@))\n"
-	iasl -p $$(basename $$@) -tc $$<
-	perl -pi -e 's/AmlCode/AmlCode_$$(notdir $$(basename $$@))/g' $$(basename $$@).hex
-	mv $$(basename $$@).hex $$@
+	$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
+	iasl -p $$(basename $$@) -tc $$(basename $$@).asl
+	mv $$(basename $$@).hex $$(basename $$@).c
+	$(CC) -m32 $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$@).c
 endef
 
 define objs_c_template
@@ -196,7 +197,7 @@ endef
 
 usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d)))))
 usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d)))))
-$(eval $(call usetemplate,c,dsl))
+$(eval $(call usetemplate,objs,dsl))
 $(eval $(call usetemplate,objs,c))
 $(eval $(call usetemplate,objs,S))
 $(eval $(call usetemplate,initobjs,c))
diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc
index 3152504..6ecf5c4 100644
--- a/src/mainboard/Makefile.k8_CAR.inc
+++ b/src/mainboard/Makefile.k8_CAR.inc
@@ -48,13 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/Makefile.k8_ck804.inc b/src/mainboard/Makefile.k8_ck804.inc
index 9472cf2..8e99fe9 100644
--- a/src/mainboard/Makefile.k8_ck804.inc
+++ b/src/mainboard/Makefile.k8_ck804.inc
@@ -53,13 +53,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/amd/dbm690t/Makefile.inc b/src/mainboard/amd/dbm690t/Makefile.inc
index 7a4a169..3413f84 100644
--- a/src/mainboard/amd/dbm690t/Makefile.inc
+++ b/src/mainboard/amd/dbm690t/Makefile.inc
@@ -48,13 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/amd/dbm690t/acpi/debug.asl b/src/mainboard/amd/dbm690t/acpi/debug.asl
index 5a5b1d6..bd5c965 100644
--- a/src/mainboard/amd/dbm690t/acpi/debug.asl
+++ b/src/mainboard/amd/dbm690t/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/amd/dbm690t/acpi/globutil.asl b/src/mainboard/amd/dbm690t/acpi/globutil.asl
index 7265608..7e7f4e1 100644
--- a/src/mainboard/amd/dbm690t/acpi/globutil.asl
+++ b/src/mainboard/amd/dbm690t/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/amd/dbm690t/acpi/ide.asl b/src/mainboard/amd/dbm690t/acpi/ide.asl
index 75aa72c..7d12fd2 100644
--- a/src/mainboard/amd/dbm690t/acpi/ide.asl
+++ b/src/mainboard/amd/dbm690t/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/amd/dbm690t/acpi/routing.asl b/src/mainboard/amd/dbm690t/acpi/routing.asl
index 25e99f2..f9469da 100644
--- a/src/mainboard/amd/dbm690t/acpi/routing.asl
+++ b/src/mainboard/amd/dbm690t/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/amd/dbm690t/acpi/sata.asl b/src/mainboard/amd/dbm690t/acpi/sata.asl
index a67703d..80e235d 100644
--- a/src/mainboard/amd/dbm690t/acpi/sata.asl
+++ b/src/mainboard/amd/dbm690t/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/amd/dbm690t/acpi/usb.asl b/src/mainboard/amd/dbm690t/acpi/usb.asl
index 3fc9fc5..5b802bc 100644
--- a/src/mainboard/amd/dbm690t/acpi/usb.asl
+++ b/src/mainboard/amd/dbm690t/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/amd/dbm690t/acpi/dsdt.asl b/src/mainboard/amd/dbm690t/dsdt.asl
index 5c10d82..70b553a 100644
--- a/src/mainboard/amd/dbm690t/acpi/dsdt.asl
+++ b/src/mainboard/amd/dbm690t/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1119,11 +1119,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1262,7 +1262,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {
diff --git a/src/mainboard/amd/pistachio/Makefile.inc b/src/mainboard/amd/pistachio/Makefile.inc
index 482dfff..5b68cd3 100644
--- a/src/mainboard/amd/pistachio/Makefile.inc
+++ b/src/mainboard/amd/pistachio/Makefile.inc
@@ -48,13 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/amd/pistachio/acpi/debug.asl b/src/mainboard/amd/pistachio/acpi/debug.asl
index 5a5b1d6..bd5c965 100644
--- a/src/mainboard/amd/pistachio/acpi/debug.asl
+++ b/src/mainboard/amd/pistachio/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/amd/pistachio/acpi/globutil.asl b/src/mainboard/amd/pistachio/acpi/globutil.asl
index 7265608..7e7f4e1 100644
--- a/src/mainboard/amd/pistachio/acpi/globutil.asl
+++ b/src/mainboard/amd/pistachio/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/amd/pistachio/acpi/ide.asl b/src/mainboard/amd/pistachio/acpi/ide.asl
index 75aa72c..7d12fd2 100644
--- a/src/mainboard/amd/pistachio/acpi/ide.asl
+++ b/src/mainboard/amd/pistachio/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/amd/pistachio/acpi/routing.asl b/src/mainboard/amd/pistachio/acpi/routing.asl
index 25e99f2..f9469da 100644
--- a/src/mainboard/amd/pistachio/acpi/routing.asl
+++ b/src/mainboard/amd/pistachio/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/amd/pistachio/acpi/sata.asl b/src/mainboard/amd/pistachio/acpi/sata.asl
index a67703d..80e235d 100644
--- a/src/mainboard/amd/pistachio/acpi/sata.asl
+++ b/src/mainboard/amd/pistachio/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/amd/pistachio/acpi/usb.asl b/src/mainboard/amd/pistachio/acpi/usb.asl
index 27396f6..08704f4 100644
--- a/src/mainboard/amd/pistachio/acpi/usb.asl
+++ b/src/mainboard/amd/pistachio/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/amd/pistachio/acpi/dsdt.asl b/src/mainboard/amd/pistachio/dsdt.asl
index 3c85a84..40ce24b 100644
--- a/src/mainboard/amd/pistachio/acpi/dsdt.asl
+++ b/src/mainboard/amd/pistachio/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1118,11 +1118,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1221,7 +1221,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1261,7 +1261,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {
diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
index 2a21650..13b33db 100644
--- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
@@ -26,13 +26,12 @@ obj-y += get_bus_conf.o
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
-# ./ssdt.o is in northbridge/amd/amdk8/Config.lb
-obj-y += ssdt2.o
-obj-y += ssdt3.o
-obj-y += ssdt4.o
 driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 
 # This is part of the conversion to init-obj and away from included code.
@@ -54,28 +53,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(obj)/pci2 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
-	mv $(obj)/pci2.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
-	iasl -p $(obj)/pci3 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
-	mv $(obj)/pci3.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
-	iasl -p $(obj)/pci4 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
-	mv $(obj)/pci4.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8111.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl
index e64bc4a..b2474e2 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8111.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl
@@ -89,9 +89,9 @@
                 }
             }
 
-	    Include ("amd8111_pic.asl")
+	    #include "amd8111_pic.asl"
 
-	    Include ("amd8111_isa.asl")
+	    #include "amd8111_isa.asl"
 
             Device (TP2P)
             {
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8111_isa.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
index b682306..9d93e34 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8111_isa.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
@@ -170,7 +170,7 @@
                         IRQNoFlags () {1}
                     })
                 }
-		Include ("superio.asl")
+		#include "superio.asl"
 
             }
 
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8111_pic.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_pic.asl
index 228f3f8..228f3f8 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8111_pic.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_pic.asl
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8131.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131.asl
index e209665..e209665 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8131.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131.asl
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8131_2.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131_2.asl
index 163c0f6..163c0f6 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8131_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8131_2.asl
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8132_2.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8132_2.asl
index 75ef723..75ef723 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8132_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8132_2.asl
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8151.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8151.asl
index 001d45b..001d45b 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8151.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8151.asl
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl b/src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl
new file mode 100644
index 0000000..2fd3b09
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl
@@ -0,0 +1,2 @@
+	#include "amd8111.asl" //real SB at first
+	#include "amd8131.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl b/src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl
new file mode 100644
index 0000000..fd3ad2c
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl
@@ -0,0 +1 @@
+	#include "amd8132_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl b/src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl
new file mode 100644
index 0000000..070ebe5
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl
@@ -0,0 +1 @@
+	#include "amd8151.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl b/src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl
new file mode 100644
index 0000000..bd3f70e
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl
@@ -0,0 +1 @@
+	#include "amd8131_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/superio.asl b/src/mainboard/amd/serengeti_cheetah/acpi/superio.asl
new file mode 100644
index 0000000..83ee582
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/superio.asl
@@ -0,0 +1 @@
+//	#include "w83627hf.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/dsdt_lb.dsl b/src/mainboard/amd/serengeti_cheetah/dsdt.asl
index 940be88..ee87023 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/dsdt_lb.dsl
+++ b/src/mainboard/amd/serengeti_cheetah/dsdt.asl
@@ -103,7 +103,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3) 
 	    }
 
-	    Include ("pci0_hc.asl")
+	    #include "acpi/pci0_hc.asl"
 		
         }
         Device (PCI1)
@@ -206,7 +206,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440)
         Z00A,   8
     }
 
-    Include ("../../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+    #include "northbridge/amd/amdk8/amdk8_util.asl"
 
 }
 
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci0_hc.asl b/src/mainboard/amd/serengeti_cheetah/dx/pci0_hc.asl
deleted file mode 100644
index b1e9562..0000000
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci0_hc.asl
+++ /dev/null
@@ -1,2 +0,0 @@
-	Include ("amd8111.asl") //real SB at first
-	Include ("amd8131.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci2_hc.asl b/src/mainboard/amd/serengeti_cheetah/dx/pci2_hc.asl
deleted file mode 100644
index 03443ad..0000000
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci2_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("amd8132_2.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci3_hc.asl b/src/mainboard/amd/serengeti_cheetah/dx/pci3_hc.asl
deleted file mode 100644
index 045d090..0000000
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci3_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("amd8151.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci4_hc.asl b/src/mainboard/amd/serengeti_cheetah/dx/pci4_hc.asl
deleted file mode 100644
index 5b9a420..0000000
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci4_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("amd8131_2.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/superio.asl b/src/mainboard/amd/serengeti_cheetah/dx/superio.asl
deleted file mode 100644
index 86a10a9..0000000
--- a/src/mainboard/amd/serengeti_cheetah/dx/superio.asl
+++ /dev/null
@@ -1 +0,0 @@
-//	Include ("w83627hf.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt b/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
index 99a89f9..41988c8 100644
--- a/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
+++ b/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
@@ -1,12 +1,12 @@
 At this time, For acpi support We got
 1. support AMK K8 SRAT --- dynamically (coreboot run-time)  (src/northbridge/amd/amdk8/amdk8_acpi.c)
 2. support MADT ---- dynamically (coreboot run-time)  (src/northbridge/amd/amdk8/amdk8_acpi.c , src/mainboard/amd/serengeti_cheetah/acpi_tables.c)
-3. support DSDT ---- dynamically (Compile time, coreboot run-time, ACPI run-time) (src/mainboard/amd/serengeti_cheetah/{dx/*, get_bus_conf.c}, src/northbridge/amd/amdk8/get_sblk_pci1234.c)
+3. support DSDT ---- dynamically (Compile time, coreboot run-time, ACPI run-time) (src/mainboard/amd/serengeti_cheetah/{acpi/*, get_bus_conf.c}, src/northbridge/amd/amdk8/get_sblk_pci1234.c)
 4. Chipset support: amd8111, amd8132
 
 The developers need to change for different MB
 
-Change dx/dsdt_lb.dsl, according to MB layout 
+Change dsdt.asl, according to MB layout 
 	pci1, pci2, pci3, pci4, ...., pci8
 	if there is HT-IO board, may use pci2.asl.... to create ssdt2.c, and ssdt3,c and ssdt4.c, ....ssdt8.c
 
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci2.asl b/src/mainboard/amd/serengeti_cheetah/ssdt2.asl
index 217491a..582ef97 100644
--- a/src/mainboard/iwill/dk8_htx/dx/pci2.asl
+++ b/src/mainboard/amd/serengeti_cheetah/ssdt2.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci2_hc.asl")
+	    #include "acpi/pci2_hc.asl"
         }
     }
 
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci3.asl b/src/mainboard/amd/serengeti_cheetah/ssdt3.asl
index 1507cfc..583e945 100644
--- a/src/mainboard/iwill/dk8_htx/dx/pci3.asl
+++ b/src/mainboard/amd/serengeti_cheetah/ssdt3.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci3_hc.asl")
+	    #include "acpi/pci3_hc.asl"
         }
     }
 
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci4.asl b/src/mainboard/amd/serengeti_cheetah/ssdt4.asl
index 3ced9be..fd7224d 100644
--- a/src/mainboard/iwill/dk8_htx/dx/pci4.asl
+++ b/src/mainboard/amd/serengeti_cheetah/ssdt4.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci4_hc.asl")
+	    #include "acpi/pci4_hc.asl"
         }
     }
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
index 619e53a..e9b4fcb 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
@@ -51,33 +51,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $<
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci2 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci2.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci2.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci3 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci3.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci3.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci4 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci4.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci4.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci5 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci5.hex
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/pci5.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
index 054b971..db78618 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
@@ -97,9 +97,9 @@
 		}
 	}
 
-	Include ("amd8111_pic.asl")
+	#include "amd8111_pic.asl"
 
-	Include ("amd8111_isa.asl")
+	#include "amd8111_isa.asl"
 
 	Device (TP2P)
 	{
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_isa.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
index f679bae..1a91c90 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_isa.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
@@ -186,7 +186,7 @@
 				IRQNoFlags () {1}
 			})
 		}
-		Include ("superio.asl")
+		#include "superio.asl"
 
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_pic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
index 585f195..585f195 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_pic.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8131_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
index d810726..d810726 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8131_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
index 2ac06f8..2ac06f8 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
index e944e14..e944e14 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8151.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
index fd070fe..fd070fe 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8151.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/htx_no_ioapic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
index 9115caa..9115caa 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/htx_no_ioapic.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
index 78433b1..9c79193 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
@@ -16,5 +16,5 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
-
-	Include ("htx_no_ioapic.asl")
+	#include "amd8111.asl" //real SB at first
+	#include "amd8132.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
index 5ada493..043e3b2 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-	Include ("amd8132_2.asl")
+	#include "amd8132_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
index ccd545c..afb1530 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-	Include ("amd8151.asl")
+	#include "amd8151.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
index 3f259e5..60e9988 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-	Include ("amd8131_2.asl")
+	#include "amd8131_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
new file mode 100644
index 0000000..b881868
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
@@ -0,0 +1,20 @@
+//
+// This file is part of the coreboot project.
+//
+// Copyright (C) 2007 Advanced Micro Devices, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+//
+
+	#include "htx_no_ioapic.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/superio.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
index dab8864..da39b88 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/superio.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
@@ -17,4 +17,4 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
-//	Include ("w83627hf.asl")
+//	#include "w83627hf.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
index 78a7fb1..7676ddd 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
@@ -119,7 +119,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci0_hc.asl")
+			#include "acpi/pci0_hc.asl"
 
 		}
 		Device (PCI1)
@@ -238,5 +238,5 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 		Z00A, 8
 	}
 
-	Include ("../../../../../src/northbridge/amd/amdfam10/amdfam10_util.asl")
+	#include "northbridge/amd/amdfam10/amdfam10_util.asl"
 }
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl
deleted file mode 100644
index 2df9035..0000000
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// This file is part of the coreboot project.
-//
-// Copyright (C) 2007 Advanced Micro Devices, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-//
-	Include ("amd8111.asl") //real SB at first
-	Include ("amd8132.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
index 9e8345e..bf9708e 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
@@ -75,7 +75,7 @@ DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 			Return (Local3)
 		}
 
-			Include ("pci2_hc.asl")
+			#include "acpi/pci2_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
index 2a86426..d4a853c 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
@@ -75,7 +75,7 @@ DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci3_hc.asl")
+			#include "acpi/pci3_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
index b1fae61..0513303 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
@@ -75,7 +75,7 @@ DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci4_hc.asl")
+			#include "acpi/pci4_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
index ba41734..553ccd4 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
@@ -76,7 +76,7 @@ DefinitionBlock ("SSDT5.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 				Return (Local3)
 			}
 
-			Include ("pci5_hc.asl")
+			#include "acpi/pci5_hc.asl"
 		}
 	}
 
diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc
index 8bcaea7..69553d5 100644
--- a/src/mainboard/asus/a8n_e/Makefile.inc
+++ b/src/mainboard/asus/a8n_e/Makefile.inc
@@ -45,28 +45,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex
-	mv pci2.hex ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
-	iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex
-	mv pci3.hex ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
-	iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex
-	mv pci4.hex ssdt4.c
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc
index 8900722..904e7de 100644
--- a/src/mainboard/asus/a8v-e_se/Makefile.inc
+++ b/src/mainboard/asus/a8v-e_se/Makefile.inc
@@ -27,13 +27,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc
index d703a32..fbecd24 100644
--- a/src/mainboard/asus/m2v-mx_se/Makefile.inc
+++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc
@@ -39,13 +39,6 @@ ldscripts += $(src)/cpu/x86/32bit/entry32.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/asus/m2v-mx_se/dsdt.asl b/src/mainboard/asus/m2v-mx_se/dsdt.asl
index 68eabc6..3ca190d 100644
--- a/src/mainboard/asus/m2v-mx_se/dsdt.asl
+++ b/src/mainboard/asus/m2v-mx_se/dsdt.asl
@@ -22,7 +22,7 @@
 
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1)
 {
-	 Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+	 #include "northbridge/amd/amdk8/amdk8_util.asl"
 
 	/* For now only define 2 power states:
 	 *  - S0 which is fully on
diff --git a/src/mainboard/bcom/winnetp680/Makefile.inc b/src/mainboard/bcom/winnetp680/Makefile.inc
index 5ae10f3..3084b10 100644
--- a/src/mainboard/bcom/winnetp680/Makefile.inc
+++ b/src/mainboard/bcom/winnetp680/Makefile.inc
@@ -44,13 +44,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv dsdt.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc
index 45b19b5..970e40d 100644
--- a/src/mainboard/gigabyte/m57sli/Makefile.inc
+++ b/src/mainboard/gigabyte/m57sli/Makefile.inc
@@ -53,13 +53,6 @@ endif
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
 
diff --git a/src/mainboard/gigabyte/m57sli/dsdt.asl b/src/mainboard/gigabyte/m57sli/dsdt.asl
index 678d339..033f822 100644
--- a/src/mainboard/gigabyte/m57sli/dsdt.asl
+++ b/src/mainboard/gigabyte/m57sli/dsdt.asl
@@ -23,7 +23,7 @@
 
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1)
 {
-	Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+	#include "northbridge/amd/amdk8/amdk8_util.asl"
 
 	/* For now only define 2 power states:
 	 *  - S0 which is fully on
diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc
index 944aa3d..e84032a 100644
--- a/src/mainboard/intel/d945gclf/Makefile.inc
+++ b/src/mainboard/intel/d945gclf/Makefile.inc
@@ -51,14 +51,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc
index af1b217..0ff5630 100644
--- a/src/mainboard/intel/eagleheights/Makefile.inc
+++ b/src/mainboard/intel/eagleheights/Makefile.inc
@@ -26,13 +26,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/intel/eagleheights/dsdt.dsl b/src/mainboard/intel/eagleheights/dsdt.asl
index 507d250..507d250 100644
--- a/src/mainboard/intel/eagleheights/dsdt.dsl
+++ b/src/mainboard/intel/eagleheights/dsdt.asl
diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc
index 95af100..69cee0c 100644
--- a/src/mainboard/iwill/dk8_htx/Makefile.inc
+++ b/src/mainboard/iwill/dk8_htx/Makefile.inc
@@ -26,15 +26,13 @@ obj-y += get_bus_conf.o
 obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
-# ./ssdt.o is in northbridge/amd/amdk8/Config.lb
-obj-y += ssdt2.o
-obj-y += ssdt3.o
-obj-y += ssdt4.o
-obj-y += ssdt5.o
-
 # This is part of the conversion to init-obj and away from included code.
 
 initobj-y += crt0.o
@@ -54,33 +52,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(obj)/pci2 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
-	mv $(obj)/pci2.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
-	iasl -p $(obj)/pci3 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
-	mv $(obj)/pci3.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
-	iasl -p $(obj)/pci4 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
-	mv $(obj)/pci4.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
-	iasl -p $(obj)/pci5 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' $(obj)/pci5.hex
-	mv $(obj)/pci5.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8111.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl
index 931d2b0..19011dc 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8111.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl
@@ -89,9 +89,9 @@
                 }
             }
 
-	    Include ("amd8111_pic.asl")
+	    #include "amd8111_pic.asl"
 
-	    Include ("amd8111_isa.asl")
+	    #include "amd8111_isa.asl"
 
             Device (TP2P)
             {
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/amd8111_isa.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
index b682306..9d93e34 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/amd8111_isa.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
@@ -170,7 +170,7 @@
                         IRQNoFlags () {1}
                     })
                 }
-		Include ("superio.asl")
+		#include "superio.asl"
 
             }
 
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8111_pic.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111_pic.asl
index 228f3f8..228f3f8 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8111_pic.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111_pic.asl
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8131.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl
index fbc0b30..fbc0b30 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8131.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8131_2.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl
index 163c0f6..163c0f6 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8131_2.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8132_2.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl
index 75ef723..75ef723 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8132_2.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl
diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8151.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8151.asl
index 001d45b..001d45b 100644
--- a/src/mainboard/iwill/dk8_htx/dx/amd8151.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8151.asl
diff --git a/src/mainboard/iwill/dk8_htx/dx/htx_no_ioapic.asl b/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl
index 95a4860..95a4860 100644
--- a/src/mainboard/iwill/dk8_htx/dx/htx_no_ioapic.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl
diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl
new file mode 100644
index 0000000..2fd3b09
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl
@@ -0,0 +1,2 @@
+	#include "amd8111.asl" //real SB at first
+	#include "amd8131.asl"
diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl
new file mode 100644
index 0000000..fd3ad2c
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl
@@ -0,0 +1 @@
+	#include "amd8132_2.asl"
diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl
new file mode 100644
index 0000000..070ebe5
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl
@@ -0,0 +1 @@
+	#include "amd8151.asl"
diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl
new file mode 100644
index 0000000..bd3f70e
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl
@@ -0,0 +1 @@
+	#include "amd8131_2.asl"
diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl
new file mode 100644
index 0000000..f7f0a7d
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl
@@ -0,0 +1 @@
+	#include "htx_no_ioapic.asl"
diff --git a/src/mainboard/iwill/dk8_htx/acpi/superio.asl b/src/mainboard/iwill/dk8_htx/acpi/superio.asl
new file mode 100644
index 0000000..83ee582
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/acpi/superio.asl
@@ -0,0 +1 @@
+//	#include "w83627hf.asl"
diff --git a/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl b/src/mainboard/iwill/dk8_htx/dsdt.asl
index 940be88..ee87023 100644
--- a/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl
+++ b/src/mainboard/iwill/dk8_htx/dsdt.asl
@@ -103,7 +103,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3) 
 	    }
 
-	    Include ("pci0_hc.asl")
+	    #include "acpi/pci0_hc.asl"
 		
         }
         Device (PCI1)
@@ -206,7 +206,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440)
         Z00A,   8
     }
 
-    Include ("../../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+    #include "northbridge/amd/amdk8/amdk8_util.asl"
 
 }
 
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl
deleted file mode 100644
index b1e9562..0000000
--- a/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl
+++ /dev/null
@@ -1,2 +0,0 @@
-	Include ("amd8111.asl") //real SB at first
-	Include ("amd8131.asl")
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl
deleted file mode 100644
index 03443ad..0000000
--- a/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("amd8132_2.asl")
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl
deleted file mode 100644
index 045d090..0000000
--- a/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("amd8151.asl")
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl
deleted file mode 100644
index 5b9a420..0000000
--- a/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("amd8131_2.asl")
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl
deleted file mode 100644
index 6b9276c..0000000
--- a/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl
+++ /dev/null
@@ -1 +0,0 @@
-	Include ("htx_no_ioapic.asl")
diff --git a/src/mainboard/iwill/dk8_htx/dx/superio.asl b/src/mainboard/iwill/dk8_htx/dx/superio.asl
deleted file mode 100644
index 86a10a9..0000000
--- a/src/mainboard/iwill/dk8_htx/dx/superio.asl
+++ /dev/null
@@ -1 +0,0 @@
-//	Include ("w83627hf.asl")
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci2.asl b/src/mainboard/iwill/dk8_htx/ssdt2.asl
index 217491a..582ef97 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci2.asl
+++ b/src/mainboard/iwill/dk8_htx/ssdt2.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci2_hc.asl")
+	    #include "acpi/pci2_hc.asl"
         }
     }
 
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci3.asl b/src/mainboard/iwill/dk8_htx/ssdt3.asl
index 1507cfc..583e945 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci3.asl
+++ b/src/mainboard/iwill/dk8_htx/ssdt3.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci3_hc.asl")
+	    #include "acpi/pci3_hc.asl"
         }
     }
 
diff --git a/src/mainboard/amd/serengeti_cheetah/dx/pci4.asl b/src/mainboard/iwill/dk8_htx/ssdt4.asl
index 3ced9be..fd7224d 100644
--- a/src/mainboard/amd/serengeti_cheetah/dx/pci4.asl
+++ b/src/mainboard/iwill/dk8_htx/ssdt4.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci4_hc.asl")
+	    #include "acpi/pci4_hc.asl"
         }
     }
 
diff --git a/src/mainboard/iwill/dk8_htx/dx/pci5.asl b/src/mainboard/iwill/dk8_htx/ssdt5.asl
index 5f25161..7592301 100644
--- a/src/mainboard/iwill/dk8_htx/dx/pci5.asl
+++ b/src/mainboard/iwill/dk8_htx/ssdt5.asl
@@ -60,7 +60,7 @@ DefinitionBlock ("SSDT5.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440)
                 Return (Local3)
             }
 
-	    Include ("pci5_hc.asl")
+	    #include "acpi/pci5_hc.asl"
         }
     }
 
diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc
index 29f4379..49b3080 100644
--- a/src/mainboard/kontron/986lcd-m/Makefile.inc
+++ b/src/mainboard/kontron/986lcd-m/Makefile.inc
@@ -47,14 +47,6 @@ ldscripts += $(src)/cpu/x86/32bit/entry32.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc
index 482dfff..5b68cd3 100644
--- a/src/mainboard/kontron/kt690/Makefile.inc
+++ b/src/mainboard/kontron/kt690/Makefile.inc
@@ -48,13 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/kontron/kt690/acpi/debug.asl b/src/mainboard/kontron/kt690/acpi/debug.asl
index 5a5b1d6..bd5c965 100644
--- a/src/mainboard/kontron/kt690/acpi/debug.asl
+++ b/src/mainboard/kontron/kt690/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/kontron/kt690/acpi/globutil.asl b/src/mainboard/kontron/kt690/acpi/globutil.asl
index 7265608..7e7f4e1 100644
--- a/src/mainboard/kontron/kt690/acpi/globutil.asl
+++ b/src/mainboard/kontron/kt690/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/kontron/kt690/acpi/ide.asl b/src/mainboard/kontron/kt690/acpi/ide.asl
index 75aa72c..7d12fd2 100644
--- a/src/mainboard/kontron/kt690/acpi/ide.asl
+++ b/src/mainboard/kontron/kt690/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/kontron/kt690/acpi/routing.asl b/src/mainboard/kontron/kt690/acpi/routing.asl
index 9b465a9..4b6b111 100644
--- a/src/mainboard/kontron/kt690/acpi/routing.asl
+++ b/src/mainboard/kontron/kt690/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/kontron/kt690/acpi/sata.asl b/src/mainboard/kontron/kt690/acpi/sata.asl
index a67703d..80e235d 100644
--- a/src/mainboard/kontron/kt690/acpi/sata.asl
+++ b/src/mainboard/kontron/kt690/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/kontron/kt690/acpi/usb.asl b/src/mainboard/kontron/kt690/acpi/usb.asl
index 3fc9fc5..5b802bc 100644
--- a/src/mainboard/kontron/kt690/acpi/usb.asl
+++ b/src/mainboard/kontron/kt690/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/kontron/kt690/acpi/dsdt.asl b/src/mainboard/kontron/kt690/dsdt.asl
index 8e52823..d69b060 100644
--- a/src/mainboard/kontron/kt690/acpi/dsdt.asl
+++ b/src/mainboard/kontron/kt690/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1119,11 +1119,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1262,7 +1262,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {
diff --git a/src/mainboard/msi/ms7260/Makefile.inc b/src/mainboard/msi/ms7260/Makefile.inc
index 3787045..f595d4c 100644
--- a/src/mainboard/msi/ms7260/Makefile.inc
+++ b/src/mainboard/msi/ms7260/Makefile.inc
@@ -48,13 +48,6 @@ endif
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
 
diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc
index aba65c0..83c6a5c 100644
--- a/src/mainboard/msi/ms9282/Makefile.inc
+++ b/src/mainboard/msi/ms9282/Makefile.inc
@@ -50,13 +50,6 @@ endif
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
 
diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc
index c943ae4..e8536d8 100644
--- a/src/mainboard/roda/rk886ex/Makefile.inc
+++ b/src/mainboard/roda/rk886ex/Makefile.inc
@@ -55,14 +55,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc
index 2d87c43..64fbd09 100644
--- a/src/mainboard/supermicro/h8dme/Makefile.inc
+++ b/src/mainboard/supermicro/h8dme/Makefile.inc
@@ -48,28 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex
-	mv pci2.hex ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
-	iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex
-	mv pci3.hex ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
-	iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex
-	mv pci4.hex ssdt4.c
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/supermicro/h8dmr/Makefile.inc b/src/mainboard/supermicro/h8dmr/Makefile.inc
index d280d6b..bbafb6f 100644
--- a/src/mainboard/supermicro/h8dmr/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr/Makefile.inc
@@ -47,28 +47,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex
-	mv pci2.hex ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
-	iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex
-	mv pci3.hex ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
-	iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex
-	mv pci4.hex ssdt4.c
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
index 9d1b771..36ac3da 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
@@ -40,28 +40,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(obj)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
-	mv $(obj)/pci2.hex $(obj)/ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
-	iasl -p $(obj)/pci3 -tc $(CONFIG_MAINBOARD)/
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
-	mv $(obj)/pci3.hex $(obj)/ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
-	iasl -p $(obj)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
-	mv $(obj)/pci4.hex $(obj)/ssdt4.c
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
index 9d1b771..36ac3da 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
+++ b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
@@ -40,28 +40,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
-	iasl -p $(obj)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
-	mv $(obj)/pci2.hex $(obj)/ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
-	iasl -p $(obj)/pci3 -tc $(CONFIG_MAINBOARD)/
-	perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
-	mv $(obj)/pci3.hex $(obj)/ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
-	iasl -p $(obj)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
-	perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
-	mv $(obj)/pci4.hex $(obj)/ssdt4.c
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc
index 25176c7..277ab74 100644
--- a/src/mainboard/technexion/tim5690/Makefile.inc
+++ b/src/mainboard/technexion/tim5690/Makefile.inc
@@ -54,13 +54,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/technexion/tim5690/acpi/debug.asl b/src/mainboard/technexion/tim5690/acpi/debug.asl
index 5a5b1d6..bd5c965 100644
--- a/src/mainboard/technexion/tim5690/acpi/debug.asl
+++ b/src/mainboard/technexion/tim5690/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim5690/acpi/globutil.asl b/src/mainboard/technexion/tim5690/acpi/globutil.asl
index 7265608..7e7f4e1 100644
--- a/src/mainboard/technexion/tim5690/acpi/globutil.asl
+++ b/src/mainboard/technexion/tim5690/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/technexion/tim5690/acpi/ide.asl b/src/mainboard/technexion/tim5690/acpi/ide.asl
index 75aa72c..7d12fd2 100644
--- a/src/mainboard/technexion/tim5690/acpi/ide.asl
+++ b/src/mainboard/technexion/tim5690/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim5690/acpi/routing.asl b/src/mainboard/technexion/tim5690/acpi/routing.asl
index 25e99f2..f9469da 100644
--- a/src/mainboard/technexion/tim5690/acpi/routing.asl
+++ b/src/mainboard/technexion/tim5690/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim5690/acpi/sata.asl b/src/mainboard/technexion/tim5690/acpi/sata.asl
index a67703d..80e235d 100644
--- a/src/mainboard/technexion/tim5690/acpi/sata.asl
+++ b/src/mainboard/technexion/tim5690/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim5690/acpi/usb.asl b/src/mainboard/technexion/tim5690/acpi/usb.asl
index 73cda9e..6ea497e 100644
--- a/src/mainboard/technexion/tim5690/acpi/usb.asl
+++ b/src/mainboard/technexion/tim5690/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/technexion/tim5690/acpi/dsdt.asl b/src/mainboard/technexion/tim5690/dsdt.asl
index 8bc793a..39ac7bd 100644
--- a/src/mainboard/technexion/tim5690/acpi/dsdt.asl
+++ b/src/mainboard/technexion/tim5690/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1119,11 +1119,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1262,7 +1262,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {
diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc
index 482dfff..5b68cd3 100644
--- a/src/mainboard/technexion/tim8690/Makefile.inc
+++ b/src/mainboard/technexion/tim8690/Makefile.inc
@@ -48,13 +48,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/technexion/tim8690/acpi/debug.asl b/src/mainboard/technexion/tim8690/acpi/debug.asl
index 5a5b1d6..bd5c965 100644
--- a/src/mainboard/technexion/tim8690/acpi/debug.asl
+++ b/src/mainboard/technexion/tim8690/acpi/debug.asl
@@ -27,7 +27,7 @@
 		0x00010001
 		)
 	{
-		Include ("debug.asl")
+		#include "debug.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim8690/acpi/globutil.asl b/src/mainboard/technexion/tim8690/acpi/globutil.asl
index 7265608..7e7f4e1 100644
--- a/src/mainboard/technexion/tim8690/acpi/globutil.asl
+++ b/src/mainboard/technexion/tim8690/acpi/globutil.asl
@@ -19,7 +19,7 @@
 
 /*
 Scope(\_SB) {
-	Include ("globutil.asl")
+	#include "globutil.asl"
 }
 */
 
diff --git a/src/mainboard/technexion/tim8690/acpi/ide.asl b/src/mainboard/technexion/tim8690/acpi/ide.asl
index 75aa72c..7d12fd2 100644
--- a/src/mainboard/technexion/tim8690/acpi/ide.asl
+++ b/src/mainboard/technexion/tim8690/acpi/ide.asl
@@ -22,7 +22,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(IDEC) {
 			Name(_ADR, 0x00140001)
-			Include ("ide.asl")
+			#include "ide.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim8690/acpi/routing.asl b/src/mainboard/technexion/tim8690/acpi/routing.asl
index 25e99f2..f9469da 100644
--- a/src/mainboard/technexion/tim8690/acpi/routing.asl
+++ b/src/mainboard/technexion/tim8690/acpi/routing.asl
@@ -21,7 +21,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("routing.asl")
+		#include "routing.asl"
 	}
 */
 
diff --git a/src/mainboard/technexion/tim8690/acpi/sata.asl b/src/mainboard/technexion/tim8690/acpi/sata.asl
index a67703d..80e235d 100644
--- a/src/mainboard/technexion/tim8690/acpi/sata.asl
+++ b/src/mainboard/technexion/tim8690/acpi/sata.asl
@@ -24,7 +24,7 @@ Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
 			Name(_ADR, 0x00120000)
-			Include ("sata.asl")
+			#include "sata.asl"
 		}
 	}
 }
diff --git a/src/mainboard/technexion/tim8690/acpi/usb.asl b/src/mainboard/technexion/tim8690/acpi/usb.asl
index 3fc9fc5..5b802bc 100644
--- a/src/mainboard/technexion/tim8690/acpi/usb.asl
+++ b/src/mainboard/technexion/tim8690/acpi/usb.asl
@@ -22,7 +22,7 @@
 DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
 		)
 	{
-		Include ("usb.asl")
+		#include "usb.asl"
 	}
 */
 Method(UCOC, 0) {
diff --git a/src/mainboard/technexion/tim8690/acpi/dsdt.asl b/src/mainboard/technexion/tim8690/dsdt.asl
index 0013548..05c61f0 100644
--- a/src/mainboard/technexion/tim8690/acpi/dsdt.asl
+++ b/src/mainboard/technexion/tim8690/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock (
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
-	/* Include ("debug.asl") */		/* Include global debug methods if needed */
+	/* #include "acpi/debug.asl" */		/* Include global debug methods if needed */
 
 	/* Data to be patched by the BIOS during POST */
 	/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@ DefinitionBlock (
 		}
 	}
 
-	Include ("routing.asl")
+	#include "acpi/routing.asl"
 
 	Scope(\_SB) {
 
@@ -1119,11 +1119,11 @@ DefinitionBlock (
 
 	} 	/* End Scope GPE */
 
-	Include ("usb.asl")
+	#include "acpi/usb.asl"
 
 	/* South Bridge */
 	Scope(\_SB) { /* Start \_SB scope */
-		Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+		#include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
 
 		/*  _SB.PCI0 */
 		/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@ DefinitionBlock (
 			/* Describe the Southbridge devices */
 			Device(STCR) {
 				Name(_ADR, 0x00120000)
-				Include ("sata.asl")
+				#include "acpi/sata.asl"
 			} /* end STCR */
 
 			Device(UOH1) {
@@ -1262,7 +1262,7 @@ DefinitionBlock (
 			/* Primary (and only) IDE channel */
 			Device(IDEC) {
 				Name(_ADR, 0x00140001)
-				Include ("ide.asl")
+				#include "acpi/ide.asl"
 			} /* end IDEC */
 
 			Device(AZHD) {
diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc
index 27b522a..7ed6618 100644
--- a/src/mainboard/tyan/s2735/Makefile.inc
+++ b/src/mainboard/tyan/s2735/Makefile.inc
@@ -51,13 +51,6 @@ ldscripts += $(src)/cpu/x86/car/cache_as_ram.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/tyan/s2891/dsdt.dsl b/src/mainboard/tyan/s2891/dsdt.asl
index f6a8505..a2a0b30 100644
--- a/src/mainboard/tyan/s2891/dsdt.dsl
+++ b/src/mainboard/tyan/s2891/dsdt.asl
@@ -22,7 +22,7 @@
 
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE  ", "CB-DSDT ", 1)
 {
-	 Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+	 #include "northbridge/amd/amdk8/amdk8_util.asl"
 
 	/* For now only define 2 power states:
 	 *  - S0 which is fully on
diff --git a/src/mainboard/tyan/s2892/dsdt.dsl b/src/mainboard/tyan/s2892/dsdt.asl
index 95bd9b9..41bef89 100644
--- a/src/mainboard/tyan/s2892/dsdt.dsl
+++ b/src/mainboard/tyan/s2892/dsdt.asl
@@ -22,7 +22,7 @@
 
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE  ", "CB-DSDT ", 1)
 {
-	 Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+	 #include "northbridge/amd/amdk8/amdk8_util.asl"
 
 	/* For now only define 2 power states:
 	 *  - S0 which is fully on
diff --git a/src/mainboard/tyan/s2895/dsdt.dsl b/src/mainboard/tyan/s2895/dsdt.asl
index 597d41e..23ec08e 100644
--- a/src/mainboard/tyan/s2895/dsdt.dsl
+++ b/src/mainboard/tyan/s2895/dsdt.asl
@@ -22,7 +22,7 @@
 
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE  ", "CB-DSDT ", 1)
 {
-	 Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+	 #include "northbridge/amd/amdk8/amdk8_util.asl"
 
 	/* For now only define 2 power states:
 	 *  - S0 which is fully on
diff --git a/src/mainboard/tyan/s2912/Makefile.inc b/src/mainboard/tyan/s2912/Makefile.inc
index 92d7685..4f7e55c 100644
--- a/src/mainboard/tyan/s2912/Makefile.inc
+++ b/src/mainboard/tyan/s2912/Makefile.inc
@@ -50,13 +50,6 @@ endif
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
 
diff --git a/src/mainboard/tyan/s2912_fam10/Makefile.inc b/src/mainboard/tyan/s2912_fam10/Makefile.inc
index 1840d70..4758b55 100644
--- a/src/mainboard/tyan/s2912_fam10/Makefile.inc
+++ b/src/mainboard/tyan/s2912_fam10/Makefile.inc
@@ -43,13 +43,6 @@ endif
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv $(obj)/dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
 
diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index 3c82c85..c7f0675 100644
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@@ -46,13 +46,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv dsdt.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index f8d0e6f..76d5ec5 100644
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@@ -43,13 +43,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv dsdt.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/via/epia-n/irq_links.asl b/src/mainboard/via/epia-n/acpi/irq_links.asl
index fc93e76..fc93e76 100644
--- a/src/mainboard/via/epia-n/irq_links.asl
+++ b/src/mainboard/via/epia-n/acpi/irq_links.asl
diff --git a/src/mainboard/via/epia-n/pata_methods.asl b/src/mainboard/via/epia-n/acpi/pata_methods.asl
index 68d5058..68d5058 100644
--- a/src/mainboard/via/epia-n/pata_methods.asl
+++ b/src/mainboard/via/epia-n/acpi/pata_methods.asl
diff --git a/src/mainboard/via/epia-n/pci_init.asl b/src/mainboard/via/epia-n/acpi/pci_init.asl
index 3169a03..3169a03 100644
--- a/src/mainboard/via/epia-n/pci_init.asl
+++ b/src/mainboard/via/epia-n/acpi/pci_init.asl
diff --git a/src/mainboard/via/epia-n/sb_physical.asl b/src/mainboard/via/epia-n/acpi/sb_physical.asl
index c59feb6..7dd7b1d 100644
--- a/src/mainboard/via/epia-n/sb_physical.asl
+++ b/src/mainboard/via/epia-n/acpi/sb_physical.asl
@@ -154,7 +154,7 @@ Device (PATA)
         }
     }
 
-	Include("pata_methods.asl")
+	#include "pata_methods.asl"
 
 
     OperationRegion (PAPR, PCI_Config, 0x00, 0xC2)
diff --git a/src/mainboard/via/epia-n/dsdt.asl b/src/mainboard/via/epia-n/dsdt.asl
index 50d1813..9073150 100644
--- a/src/mainboard/via/epia-n/dsdt.asl
+++ b/src/mainboard/via/epia-n/dsdt.asl
@@ -88,7 +88,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CBT-V2", "CBT-DSDT", 1)
 	       })
 
 		   /* PCI Devices Included Here */
-		   Include("sb_physical.asl")
+		   #include "acpi/sb_physical.asl"
 
 		   /* Legacy PNP Devices Defined Here */
 
@@ -343,8 +343,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CBT-V2", "CBT-DSDT", 1)
                })
            }
 
-		   Include("irq_links.asl")
-		   Include("pci_init.asl")
+		   #include "acpi/irq_links.asl"
+		   #include "acpi/pci_init.asl"
 
 	   } //End of PCI0
 
diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
index 4be5631..336cad6 100644
--- a/src/mainboard/via/epia/Makefile.inc
+++ b/src/mainboard/via/epia/Makefile.inc
@@ -39,13 +39,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-	mv dsdt.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc
index 8f321c2..19b68fa 100644
--- a/src/mainboard/via/vt8454c/Makefile.inc
+++ b/src/mainboard/via/vt8454c/Makefile.inc
@@ -42,13 +42,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p dsdt -tc $<
-	mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
-	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl b/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
index 4a294bc..4a294bc 100644
--- a/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl
+++ b/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
diff --git a/src/mainboard/via/vt8454c/irq.dsl b/src/mainboard/via/vt8454c/acpi/irq.asl
index 63e64e6..63e64e6 100644
--- a/src/mainboard/via/vt8454c/irq.dsl
+++ b/src/mainboard/via/vt8454c/acpi/irq.asl
diff --git a/src/mainboard/via/vt8454c/dsdt.dsl b/src/mainboard/via/vt8454c/dsdt.asl
index 150fbcf..ada6c95 100644
--- a/src/mainboard/via/vt8454c/dsdt.dsl
+++ b/src/mainboard/via/vt8454c/dsdt.asl
@@ -298,7 +298,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CX700 ", "COREBOOT", 0x00000001)
 			Name (_BBN, 0x00)
 
 			// Mainboard specific IRQ routing
-			Include ("irq.dsl")
+			#include "acpi/irq.asl"
 
 			/* PCI Routing Table */
             		Method (_PRT, 0, NotSerialized)
@@ -317,7 +317,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CX700 ", "COREBOOT", 0x00000001)
 			{
 				Name (_ADR, 0x00130001)
 
-				Include ("irq-p2p-bridge.dsl")
+				#include "acpi/irq-p2p-bridge.asl"
 				Method (_PRT, 0, NotSerialized)
 				{
 					If (LNot (PICF))
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index 3adf38c..54dc2e9 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -11,35 +11,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.o
 
 obj-y += get_pci1234.o
 
-ifdef POST_EVALUATION
-$(obj)/northbridge/amd/amdfam10/ssdt.c: $(src)/northbridge/amd/amdfam10/ssdt.dsl
-	iasl -p $(obj)/northbridge/amd/amdfam10/ssdt -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_ssdt/g' $(obj)/northbridge/amd/amdfam10/ssdt.hex
-	mv $(obj)/northbridge/amd/amdfam10/ssdt.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr1.c: $(src)/northbridge/amd/amdfam10/sspr1.dsl
-	iasl -p $(obj)/northbridge/amd/amdfam10/sspr1 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_sspr1/g' $(obj)/northbridge/amd/amdfam10/sspr1.hex
-	mv $(obj)/northbridge/amd/amdfam10/sspr1.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr2.c: $(src)/northbridge/amd/amdfam10/sspr2.dsl
-	iasl -p $(obj)/northbridge/amd/amdfam10/sspr2 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_sspr2/g' $(obj)/northbridge/amd/amdfam10/sspr2.hex
-	mv $(obj)/northbridge/amd/amdfam10/sspr2.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr3.c: $(src)/northbridge/amd/amdfam10/sspr3.dsl
-	iasl -p $(obj)/northbridge/amd/amdfam10/sspr3 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_sspr3/g' $(obj)/northbridge/amd/amdfam10/sspr3.hex
-	mv $(obj)/northbridge/amd/amdfam10/sspr3.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr4.c: $(src)/northbridge/amd/amdfam10/sspr4.dsl
-	iasl -p $(obj)/northbridge/amd/amdfam10/sspr4 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_sspr4/g' $(obj)/northbridge/amd/amdfam10/sspr4.hex
-	mv $(obj)/northbridge/amd/amdfam10/sspr4.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr5.c: $(src)/northbridge/amd/amdfam10/sspr5.dsl
-	iasl -p $(obj)/northbridge/amd/amdfam10/sspr5 -tc $<
-	perl -pi -e 's/AmlCode/AmlCode_sspr5/g' $(obj)/northbridge/amd/amdfam10/sspr5.hex
-	mv $(obj)/northbridge/amd/amdfam10/sspr5.hex $@
-endif
-
diff --git a/src/northbridge/amd/amdfam10/ssdt.dsl b/src/northbridge/amd/amdfam10/ssdt.asl
index 8326a41..8326a41 100644
--- a/src/northbridge/amd/amdfam10/ssdt.dsl
+++ b/src/northbridge/amd/amdfam10/ssdt.asl
diff --git a/src/northbridge/amd/amdfam10/sspr1.dsl b/src/northbridge/amd/amdfam10/sspr1.asl
index 1bfdde0..1bfdde0 100644
--- a/src/northbridge/amd/amdfam10/sspr1.dsl
+++ b/src/northbridge/amd/amdfam10/sspr1.asl
diff --git a/src/northbridge/amd/amdfam10/sspr2.dsl b/src/northbridge/amd/amdfam10/sspr2.asl
index 4bdde33..4bdde33 100644
--- a/src/northbridge/amd/amdfam10/sspr2.dsl
+++ b/src/northbridge/amd/amdfam10/sspr2.asl
diff --git a/src/northbridge/amd/amdfam10/sspr3.dsl b/src/northbridge/amd/amdfam10/sspr3.asl
index 5bf87f6..5bf87f6 100644
--- a/src/northbridge/amd/amdfam10/sspr3.dsl
+++ b/src/northbridge/amd/amdfam10/sspr3.asl
diff --git a/src/northbridge/amd/amdfam10/sspr4.dsl b/src/northbridge/amd/amdfam10/sspr4.asl
index d243a3a..d243a3a 100644
--- a/src/northbridge/amd/amdfam10/sspr4.dsl
+++ b/src/northbridge/amd/amdfam10/sspr4.asl
diff --git a/src/northbridge/amd/amdfam10/sspr5.dsl b/src/northbridge/amd/amdfam10/sspr5.asl
index 6e43252..6e43252 100644
--- a/src/northbridge/amd/amdfam10/sspr5.dsl
+++ b/src/northbridge/amd/amdfam10/sspr5.asl