191 files changed, 38 insertions, 25 deletions
diff --git a/src/mainboard/amd/dinar/buildOpts.c b/src/mainboard/amd/dinar/buildOpts.c
index 071b146e82..853a240203 100644
--- a/src/mainboard/amd/dinar/buildOpts.c
+++ b/src/mainboard/amd/dinar/buildOpts.c
@@ -378,4 +378,4 @@ CONST DEVICE_CAP_OVERRIDE ROMDATA MaranelloOverrideDevCap[2] =
 #include "cpuEarlyInit.h"
 #include "cpuLateInit.h"
 #include "GnbInterfaceStub.h"
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/inagua/buildOpts.c b/src/mainboard/amd/inagua/buildOpts.c
index cc7d1efe05..ff947a056b 100644
--- a/src/mainboard/amd/inagua/buildOpts.c
+++ b/src/mainboard/amd/inagua/buildOpts.c
@@ -291,4 +291,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE		(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/olivehill/buildOpts.c b/src/mainboard/amd/olivehill/buildOpts.c
index b4afa30470..171aa48d01 100644
--- a/src/mainboard/amd/olivehill/buildOpts.c
+++ b/src/mainboard/amd/olivehill/buildOpts.c
@@ -339,4 +339,4 @@ GPIO_CONTROL   olivehill_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/parmer/buildOpts.c b/src/mainboard/amd/parmer/buildOpts.c
index 795112ca97..af2046d81c 100644
--- a/src/mainboard/amd/parmer/buildOpts.c
+++ b/src/mainboard/amd/parmer/buildOpts.c
@@ -340,4 +340,4 @@ GPIO_CONTROL   parmer_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/persimmon/buildOpts.c b/src/mainboard/amd/persimmon/buildOpts.c
index 3fed0edeb7..bdd8f5d4fd 100644
--- a/src/mainboard/amd/persimmon/buildOpts.c
+++ b/src/mainboard/amd/persimmon/buildOpts.c
@@ -291,4 +291,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE				(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/south_station/buildOpts.c b/src/mainboard/amd/south_station/buildOpts.c
index 542d5b6f5b..68236b6095 100644
--- a/src/mainboard/amd/south_station/buildOpts.c
+++ b/src/mainboard/amd/south_station/buildOpts.c
@@ -291,4 +291,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/thatcher/buildOpts.c b/src/mainboard/amd/thatcher/buildOpts.c
index 2f0b7ca37f..4b7bb698a2 100644
--- a/src/mainboard/amd/thatcher/buildOpts.c
+++ b/src/mainboard/amd/thatcher/buildOpts.c
@@ -340,4 +340,4 @@ GPIO_CONTROL   thatcher_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/torpedo/buildOpts.c b/src/mainboard/amd/torpedo/buildOpts.c
index 07850d60df..4b6bfb0481 100644
--- a/src/mainboard/amd/torpedo/buildOpts.c
+++ b/src/mainboard/amd/torpedo/buildOpts.c
@@ -218,4 +218,4 @@ CONST AP_MTRR_SETTINGS ROMDATA LlanoApMtrrSettingsList[] =
 #include "cpuEarlyInit.h"
 #include "cpuLateInit.h"
 #include "GnbInterface.h"
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/amd/union_station/buildOpts.c b/src/mainboard/amd/union_station/buildOpts.c
index 542d5b6f5b..68236b6095 100644
--- a/src/mainboard/amd/union_station/buildOpts.c
+++ b/src/mainboard/amd/union_station/buildOpts.c
@@ -291,4 +291,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/asrock/e350m1/buildOpts.c b/src/mainboard/asrock/e350m1/buildOpts.c
index e1058bea98..1231839ba8 100644
--- a/src/mainboard/asrock/e350m1/buildOpts.c
+++ b/src/mainboard/asrock/e350m1/buildOpts.c
@@ -290,4 +290,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/asrock/imb-a180/buildOpts.c b/src/mainboard/asrock/imb-a180/buildOpts.c
index a2b04cade5..138cd260d1 100644
--- a/src/mainboard/asrock/imb-a180/buildOpts.c
+++ b/src/mainboard/asrock/imb-a180/buildOpts.c
@@ -339,4 +339,4 @@ GPIO_CONTROL   imba180_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/asus/f2a85-m/buildOpts.c b/src/mainboard/asus/f2a85-m/buildOpts.c
index 42e91dd5b4..f840382bdc 100644
--- a/src/mainboard/asus/f2a85-m/buildOpts.c
+++ b/src/mainboard/asus/f2a85-m/buildOpts.c
@@ -343,4 +343,4 @@ GPIO_CONTROL   f2a85_m_gpio[] = {
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 /* Moving this include up will break AGESA. */
-#include <vendorcode/amd/agesa/f15tn/Include/PlatformInstall.h>
+#include <PlatformInstall.h>
diff --git a/src/mainboard/bap/ode_e20XX/buildOpts.c b/src/mainboard/bap/ode_e20XX/buildOpts.c
index 44e4a750ec..2631bbaef0 100644
--- a/src/mainboard/bap/ode_e20XX/buildOpts.c
+++ b/src/mainboard/bap/ode_e20XX/buildOpts.c
@@ -340,4 +340,4 @@ GPIO_CONTROL   gizmo2_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/biostar/am1ml/buildOpts.c b/src/mainboard/biostar/am1ml/buildOpts.c
index 334975727a..5e9b0d6f6e 100644
--- a/src/mainboard/biostar/am1ml/buildOpts.c
+++ b/src/mainboard/biostar/am1ml/buildOpts.c
@@ -339,4 +339,4 @@ GPIO_CONTROL   imba180_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/elmex/pcm205400/buildOpts.c b/src/mainboard/elmex/pcm205400/buildOpts.c
index a90ee79905..23c59c1c20 100644
--- a/src/mainboard/elmex/pcm205400/buildOpts.c
+++ b/src/mainboard/elmex/pcm205400/buildOpts.c
@@ -291,4 +291,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE				(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/gizmosphere/gizmo/buildOpts.c b/src/mainboard/gizmosphere/gizmo/buildOpts.c
index 618679d63b..bf00a587b5 100644
--- a/src/mainboard/gizmosphere/gizmo/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo/buildOpts.c
@@ -293,4 +293,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE				(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/buildOpts.c b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
index 44e4a750ec..2631bbaef0 100644
--- a/src/mainboard/gizmosphere/gizmo2/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
@@ -340,4 +340,4 @@ GPIO_CONTROL   gizmo2_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/hp/abm/buildOpts.c b/src/mainboard/hp/abm/buildOpts.c
index f217cfc00b..dcbb5d924f 100644
--- a/src/mainboard/hp/abm/buildOpts.c
+++ b/src/mainboard/hp/abm/buildOpts.c
@@ -353,4 +353,4 @@ GPIO_CONTROL   hp_abm_gpio[] = {
 #define DFLT_MEMORY_QUADRANK_TYPE       QUADRANK_UNBUFFERED
 #define DFLT_VRM_SLEW_RATE              (5000)
 
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
index 1ab96bf65b..455b05959f 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
@@ -387,4 +387,4 @@ SCI_MAP_CONTROL m6_1035dx_sci_map[] = {
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 /* AGESA nonsense: this header depends on the definitions above */
-#include <vendorcode/amd/agesa/f15tn/Include/PlatformInstall.h>
+#include <PlatformInstall.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
index 8512afb43f..65986e26fc 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
@@ -297,4 +297,4 @@ const AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 
 /* AGESA nonsense: this header depends on the definitions above */
 /* Instantiate all solution relevant data. */
-#include <vendorcode/amd/agesa/f14/Include/PlatformInstall.h>
+#include <PlatformInstall.h>
diff --git a/src/mainboard/lenovo/g505s/buildOpts.c b/src/mainboard/lenovo/g505s/buildOpts.c
index e4365d9441..3e28a301df 100644
--- a/src/mainboard/lenovo/g505s/buildOpts.c
+++ b/src/mainboard/lenovo/g505s/buildOpts.c
@@ -387,4 +387,4 @@ SCI_MAP_CONTROL lenovo_g505s_sci_map[] = {
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 /* AGESA nonsense: this header depends on the definitions above */
-#include <vendorcode/amd/agesa/f15tn/Include/PlatformInstall.h>
+#include <PlatformInstall.h>
diff --git a/src/mainboard/lippert/frontrunner-af/buildOpts.c b/src/mainboard/lippert/frontrunner-af/buildOpts.c
index 3a3ab7482b..06e786873f 100644
--- a/src/mainboard/lippert/frontrunner-af/buildOpts.c
+++ b/src/mainboard/lippert/frontrunner-af/buildOpts.c
@@ -292,4 +292,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE				(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/lippert/toucan-af/buildOpts.c b/src/mainboard/lippert/toucan-af/buildOpts.c
index 3a3ab7482b..06e786873f 100644
--- a/src/mainboard/lippert/toucan-af/buildOpts.c
+++ b/src/mainboard/lippert/toucan-af/buildOpts.c
@@ -292,4 +292,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE				(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/mainboard/msi/ms7721/buildOpts.c b/src/mainboard/msi/ms7721/buildOpts.c
index 87fc20f9ee..9bce45a4b8 100644
--- a/src/mainboard/msi/ms7721/buildOpts.c
+++ b/src/mainboard/msi/ms7721/buildOpts.c
@@ -343,4 +343,4 @@ GPIO_CONTROL   ms7721_m_gpio[] = {
 #define DFLT_VRM_SLEW_RATE              (5000)
 
 /* Moving this include up will break AGESA. */
-#include <vendorcode/amd/agesa/f15tn/Include/PlatformInstall.h>
+#include <PlatformInstall.h>
diff --git a/src/mainboard/pcengines/apu1/buildOpts.c b/src/mainboard/pcengines/apu1/buildOpts.c
index 36b4145945..a66c9d1779 100644
--- a/src/mainboard/pcengines/apu1/buildOpts.c
+++ b/src/mainboard/pcengines/apu1/buildOpts.c
@@ -291,4 +291,4 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
 #define DFLT_VRM_SLEW_RATE				(5000)
 
 // Instantiate all solution relevant data.
-#include "PlatformInstall.h"
+#include <PlatformInstall.h>
diff --git a/src/vendorcode/amd/agesa/Makefile.inc b/src/vendorcode/amd/agesa/Makefile.inc
index 5f4569dd31..ca7a201934 100644
--- a/src/vendorcode/amd/agesa/Makefile.inc
+++ b/src/vendorcode/amd/agesa/Makefile.inc
@@ -18,4 +18,7 @@ else
 $(eval $(call create_class_compiler,libagesa,x86_64))
 endif
 
+$(obj)/romstage/mainboard/$(MAINBOARDDIR)/buildOpts.o: CPPFLAGS_x86_32 += $(BUILDOPTS_INCLUDES)
+$(obj)/ramstage/mainboard/$(MAINBOARDDIR)/buildOpts.o: CPPFLAGS_x86_32 += $(BUILDOPTS_INCLUDES)
+
 endif
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f12/Config/OptionC6Install.h
index e5c2c8e2ee..e5c2c8e2ee 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionC6Install.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionCpbInstall.h
index 72720063c7..72720063c7 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionCpbInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionCpuCacheFlushOnHaltInstall.h
index 15949d0e34..15949d0e34 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionCpuCacheFlushOnHaltInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionCpuCoreLevelingInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionCpuCoreLevelingInstall.h
index c598283b6b..c598283b6b 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionCpuCoreLevelingInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionCpuCoreLevelingInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionCpuFamiliesInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionCpuFamiliesInstall.h
index b161cd3be7..b161cd3be7 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionCpuFamiliesInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionCpuFamiliesInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionCpuFeaturesInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionCpuFeaturesInstall.h
index ba4b42b8fb..ba4b42b8fb 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionCpuFeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionCpuFeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionDmiInstall.h
index ead4fcec6a..ead4fcec6a 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionDmiInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionFamily12hInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionFamily12hInstall.h
index 63cb0ff3cb..63cb0ff3cb 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionFamily12hInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionFamily12hInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionFchInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionFchInstall.h
index f1799f6507..f1799f6507 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionFchInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionFchInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionGfxRecoveryInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionGfxRecoveryInstall.h
index c031f326c1..c031f326c1 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionGfxRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionGfxRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionGnbInstall.h
index bcd9700293..bcd9700293 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionGnbInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionHtInstall.h
index eb4e44b5af..eb4e44b5af 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionHtInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionHwC1eInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionHwC1eInstall.h
index e30f0488ff..e30f0488ff 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionHwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionHwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionIdsInstall.h
index 4778de358d..4778de358d 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionIdsInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionIoCstateInstall.h
index 3402809b3f..3402809b3f 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionIoCstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionL3FeaturesInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionL3FeaturesInstall.h
index 7f3ac0769f..7f3ac0769f 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionL3FeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionL3FeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionLowPwrPstateInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionLowPwrPstateInstall.h
index 3f9a3def52..3f9a3def52 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionLowPwrPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionLowPwrPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionMemoryInstall.h
index 0fd8232ead..0fd8232ead 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionMemoryInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionMemoryInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMemoryRecoveryInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionMemoryRecoveryInstall.h
index 6d2a445b53..6d2a445b53 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionMemoryRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionMemoryRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionMsgBasedC1eInstall.h
index 7476e16358..7476e16358 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionMsgBasedC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionMultiSocketInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionMultiSocketInstall.h
index 3c87677fe9..3c87677fe9 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionMultiSocketInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionMultiSocketInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionPreserveMailboxInstall.h
index 10ea6a74b1..10ea6a74b1 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionPreserveMailboxInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionPstateInstall.h
index 7d6433db31..7d6433db31 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionS3ScriptInstall.h
index 5b62bdf6dc..5b62bdf6dc 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionS3ScriptInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionSlitInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionSlitInstall.h
index 915e5302c4..915e5302c4 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionSlitInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionSlitInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionSratInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionSratInstall.h
index 273874753f..273874753f 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionSratInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionSratInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionSwC1eInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionSwC1eInstall.h
index 34886eee14..34886eee14 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionSwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionSwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/OptionWheaInstall.h b/src/vendorcode/amd/agesa/f12/Config/OptionWheaInstall.h
index 5facece353..5facece353 100644
--- a/src/vendorcode/amd/agesa/f12/Include/OptionWheaInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/OptionWheaInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Include/PlatformInstall.h b/src/vendorcode/amd/agesa/f12/Config/PlatformInstall.h
index 1fe116a6c7..1fe116a6c7 100644
--- a/src/vendorcode/amd/agesa/f12/Include/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f12/Config/PlatformInstall.h
diff --git a/src/vendorcode/amd/agesa/f12/Makefile.inc b/src/vendorcode/amd/agesa/f12/Makefile.inc
index 5ed6a39c29..4da54b7d19 100644
--- a/src/vendorcode/amd/agesa/f12/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f12/Makefile.inc
@@ -38,6 +38,8 @@ AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
 AGESA_INC += $(AGESA_AUTOINCLUDES)
 
+BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC)
+
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f14/Config/OptionC6Install.h
index ea67863743..ea67863743 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionC6Install.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionCpbInstall.h
index 79261def2d..79261def2d 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionCpbInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionCpuCacheFlushOnHaltInstall.h
index 8d6e454c99..8d6e454c99 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionCpuCacheFlushOnHaltInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpuCoreLevelingInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionCpuCoreLevelingInstall.h
index 43b82c56d7..43b82c56d7 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpuCoreLevelingInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionCpuCoreLevelingInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpuFamiliesInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionCpuFamiliesInstall.h
index 5bc78967e8..5bc78967e8 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpuFamiliesInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionCpuFamiliesInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionCpuFeaturesInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionCpuFeaturesInstall.h
index d4dc2b3e93..d4dc2b3e93 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionCpuFeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionCpuFeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionDmiInstall.h
index eb4bc91f99..eb4bc91f99 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionDmiInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionFamily14hInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionFamily14hInstall.h
index fda98c1054..fda98c1054 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionFamily14hInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionFamily14hInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionGfxRecoveryInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionGfxRecoveryInstall.h
index c031f326c1..c031f326c1 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionGfxRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionGfxRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionGnbInstall.h
index 0b9412f533..0b9412f533 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionGnbInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionHtAssistInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionHtAssistInstall.h
index 175482b9e9..175482b9e9 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionHtAssistInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionHtAssistInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h
index 5c44465c33..5c44465c33 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionHtInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionHwC1eInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionHwC1eInstall.h
index 14058d51bf..14058d51bf 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionHwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionHwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionIdsInstall.h
index 79975cc170..79975cc170 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionIdsInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionIoCstateInstall.h
index bc80a74e87..bc80a74e87 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionIoCstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionLowPwrPstateInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionLowPwrPstateInstall.h
index 9438abc70c..9438abc70c 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionLowPwrPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionLowPwrPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionMemoryInstall.h
index 283a972463..283a972463 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionMemoryInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryRecoveryInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionMemoryRecoveryInstall.h
index 65028853de..65028853de 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMemoryRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionMemoryRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionMsgBasedC1eInstall.h
index 49c746ad3b..49c746ad3b 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionMsgBasedC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionMultiSocketInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionMultiSocketInstall.h
index 244bbba996..244bbba996 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionMultiSocketInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionMultiSocketInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionPreserveMailboxInstall.h
index 368df9d780..368df9d780 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionPreserveMailboxInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionPstateInstall.h
index 116320a46d..116320a46d 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionS3ScriptInstall.h
index 5b62bdf6dc..5b62bdf6dc 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionS3ScriptInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionSlitInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionSlitInstall.h
index 915e5302c4..915e5302c4 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionSlitInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionSlitInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionSratInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionSratInstall.h
index 273874753f..273874753f 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionSratInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionSratInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionSwC1eInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionSwC1eInstall.h
index 34886eee14..34886eee14 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionSwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionSwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/OptionWheaInstall.h b/src/vendorcode/amd/agesa/f14/Config/OptionWheaInstall.h
index 5facece353..5facece353 100644
--- a/src/vendorcode/amd/agesa/f14/Include/OptionWheaInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/OptionWheaInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Include/PlatformInstall.h b/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
index cfcca8278d..cfcca8278d 100644
--- a/src/vendorcode/amd/agesa/f14/Include/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f14/Config/PlatformInstall.h
diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc
index ea7198ff59..f71b957b3f 100644
--- a/src/vendorcode/amd/agesa/f14/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f14/Makefile.inc
@@ -38,6 +38,8 @@ AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
 AGESA_INC += $(AGESA_AUTOINCLUDES)
 
+BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC)
+
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionApmInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionApmInstall.h
index 4b3b9a8a25..4b3b9a8a25 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionApmInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionApmInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f15/Config/OptionC6Install.h
index 2e944bf65a..2e944bf65a 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionC6Install.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionCpbInstall.h
index d47619baa7..d47619baa7 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionCpbInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionCpuCacheFlushOnHaltInstall.h
index 35362ffdb7..35362ffdb7 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionCpuCacheFlushOnHaltInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionCpuCoreLevelingInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionCpuCoreLevelingInstall.h
index d0743ecc3c..d0743ecc3c 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionCpuCoreLevelingInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionCpuCoreLevelingInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionCpuFamiliesInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionCpuFamiliesInstall.h
index 5cc4819046..5cc4819046 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionCpuFamiliesInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionCpuFamiliesInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionCpuFeaturesInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionCpuFeaturesInstall.h
index 44df5ba631..44df5ba631 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionCpuFeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionCpuFeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionDmiInstall.h
index b09a58ff0b..b09a58ff0b 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionDmiInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionFamily10hInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionFamily10hInstall.h
index 7eeea69c9f..7eeea69c9f 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionFamily10hInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionFamily10hInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionFamily15hInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionFamily15hInstall.h
index 73eeb6fca4..73eeb6fca4 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionFamily15hInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionFamily15hInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionFchInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionFchInstall.h
index 715e1628d5..715e1628d5 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionFchInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionFchInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionGfxRecoveryInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionGfxRecoveryInstall.h
index c046c24e87..c046c24e87 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionGfxRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionGfxRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionGnbInstall.h
index 7733859aed..7733859aed 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionGnbInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionHtInstall.h
index 056777d079..056777d079 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionHtInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionHwC1eInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionHwC1eInstall.h
index f01fb04e9e..f01fb04e9e 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionHwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionHwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionIdsInstall.h
index 6873370a55..6873370a55 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionIdsInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionIoCstateInstall.h
index f83ad70f5d..f83ad70f5d 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionIoCstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionL3FeaturesInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionL3FeaturesInstall.h
index 4a73c40dbc..4a73c40dbc 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionL3FeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionL3FeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionLowPwrPstateInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionLowPwrPstateInstall.h
index 61cf174cc2..61cf174cc2 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionLowPwrPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionLowPwrPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionMemoryInstall.h
index 254e22e923..254e22e923 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionMemoryInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionMemoryInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMemoryRecoveryInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionMemoryRecoveryInstall.h
index f5dea81d33..f5dea81d33 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionMemoryRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionMemoryRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionMsgBasedC1eInstall.h
index a64321ef38..a64321ef38 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionMsgBasedC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionMultiSocketInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionMultiSocketInstall.h
index 26a56a3468..26a56a3468 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionMultiSocketInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionMultiSocketInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionPreserveMailboxInstall.h
index 2b40f77b17..2b40f77b17 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionPreserveMailboxInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionPstateHpcModeInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionPstateHpcModeInstall.h
index 061b6f598b..061b6f598b 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionPstateHpcModeInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionPstateHpcModeInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionPstateInstall.h
index 8ca835c385..8ca835c385 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionS3ScriptInstall.h
index e5d93eb1b8..e5d93eb1b8 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionS3ScriptInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionSlitInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionSlitInstall.h
index a96b217ce3..a96b217ce3 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionSlitInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionSlitInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionSratInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionSratInstall.h
index 3003cabaa7..3003cabaa7 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionSratInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionSratInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionSwC1eInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionSwC1eInstall.h
index b5ebae7040..b5ebae7040 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionSwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionSwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/OptionWheaInstall.h b/src/vendorcode/amd/agesa/f15/Config/OptionWheaInstall.h
index 1295782a34..1295782a34 100644
--- a/src/vendorcode/amd/agesa/f15/Include/OptionWheaInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/OptionWheaInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Include/PlatformInstall.h b/src/vendorcode/amd/agesa/f15/Config/PlatformInstall.h
index 54f180a94a..54f180a94a 100644
--- a/src/vendorcode/amd/agesa/f15/Include/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f15/Config/PlatformInstall.h
diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc
index d329add945..4f6acba469 100644
--- a/src/vendorcode/amd/agesa/f15/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15/Makefile.inc
@@ -27,6 +27,8 @@ AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
 AGESA_INC += $(AGESA_AUTOINCLUDES)
 
+BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC)
+
 ## AGESA need sse feature ##
 CFLAGS_x86_32 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionApmInstall.h
index 368104c20f..368104c20f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionApmInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionC6Install.h
index b6186c6fa5..b6186c6fa5 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionC6Install.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpbInstall.h
index 308dc73b57..308dc73b57 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpbInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuCacheFlushOnHaltInstall.h
index 8b5db5aee4..8b5db5aee4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuCacheFlushOnHaltInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCoreLevelingInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuCoreLevelingInstall.h
index 855930a388..855930a388 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCoreLevelingInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuCoreLevelingInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuFamiliesInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFamiliesInstall.h
index a3bc05db9a..a3bc05db9a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuFamiliesInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFamiliesInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuFeaturesInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFeaturesInstall.h
index 50829bdbde..50829bdbde 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuFeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionDmiInstall.h
index 541cee9dc1..541cee9dc1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionDmiInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionFamily15hInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionFamily15hInstall.h
index f0d9194018..f0d9194018 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionFamily15hInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionFamily15hInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionFchInstall.h
index 4a8237a210..4a8237a210 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionFchInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecoveryInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionGfxRecoveryInstall.h
index c031f326c1..c031f326c1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionGfxRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionGfxRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionGnbInstall.h
index f6fc162919..f6fc162919 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionGnbInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionHtInstall.h
index 5069412541..5069412541 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionHtInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionHtcInstall.h
index 671b0fb0a6..671b0fb0a6 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionHtcInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionHwC1eInstall.h
index 374ceb49b7..374ceb49b7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionHwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionIdsInstall.h
index 5fe172c6e3..5fe172c6e3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionIdsInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionIoCstateInstall.h
index b83ee6b04d..b83ee6b04d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionIoCstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionL3FeaturesInstall.h
index 203b9e27a0..203b9e27a0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionL3FeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionLowPwrPstateInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionLowPwrPstateInstall.h
index 900d93f584..900d93f584 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionLowPwrPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionLowPwrPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryInstall.h
index 457c51e475..457c51e475 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryRecoveryInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryRecoveryInstall.h
index 4740035223..4740035223 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMmioMapInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMmioMapInstall.h
index 5ba255d36c..5ba255d36c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMmioMapInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMmioMapInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMsgBasedC1eInstall.h
index 6d0aeef50e..6d0aeef50e 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMsgBasedC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocketInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMultiSocketInstall.h
index 46c303330b..46c303330b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMultiSocketInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMultiSocketInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionPreserveMailboxInstall.h
index 310dc5419a..310dc5419a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionPreserveMailboxInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionPsiInstall.h
index 0053a49a8d..0053a49a8d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionPsiInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateHpcModeInstall.h
index 5106ed263a..5106ed263a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateHpcModeInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateInstall.h
index e80a69ddb3..e80a69ddb3 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionS3ScriptInstall.h
index f47004201d..f47004201d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionS3ScriptInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionSlitInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionSlitInstall.h
index 915e5302c4..915e5302c4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionSlitInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionSlitInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionSratInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionSratInstall.h
index 273874753f..273874753f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionSratInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionSratInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionSwC1eInstall.h
index 4fa53ce0a7..4fa53ce0a7 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionSwC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionWheaInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionWheaInstall.h
index 5facece353..5facece353 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionWheaInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionWheaInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/PlatformInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
index 334c84ee3c..334c84ee3c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h
diff --git a/src/vendorcode/amd/agesa/f15tn/Makefile.inc b/src/vendorcode/amd/agesa/f15tn/Makefile.inc
index d060dddc97..352a03ce89 100644
--- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc
@@ -40,6 +40,8 @@ AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 AGESA_INC += -I$(src)/southbridge/amd/agesa/hudson
 
+BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC)
+
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionApmInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionApmInstall.h
index 1624859e9c..1624859e9c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionApmInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionApmInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionC6Install.h
index 53256edce4..53256edce4 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionC6Install.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCditInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCditInstall.h
index 96ee782b82..96ee782b82 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCditInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCditInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpbInstall.h
index 42a9ff5d45..42a9ff5d45 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpbInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuCacheFlushOnHaltInstall.h
index 9e094ec10b..9e094ec10b 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuCacheFlushOnHaltInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuCoreLevelingInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuCoreLevelingInstall.h
index 4b29b73c5c..4b29b73c5c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuCoreLevelingInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuCoreLevelingInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuFamiliesInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuFamiliesInstall.h
index 8e61eff7ae..8e61eff7ae 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuFamiliesInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuFamiliesInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuFeaturesInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuFeaturesInstall.h
index 61c750aafb..61c750aafb 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuFeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuFeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuSpecificServicesInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuSpecificServicesInstall.h
index 987677e91a..987677e91a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCpuSpecificServicesInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCpuSpecificServicesInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionCratInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionCratInstall.h
index 2b47e15de9..2b47e15de9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionCratInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionCratInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionDmiInstall.h
index e0b09b3b6a..e0b09b3b6a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionDmiInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionFamily16hInstall.h
index ae9e3ad352..ae9e3ad352 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionFamily16hInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionFamily16hInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionFchInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionFchInstall.h
index 4725504159..4725504159 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionFchInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionFchInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecoveryInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionGfxRecoveryInstall.h
index 75ae37e184..75ae37e184 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionGfxRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionGfxRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionGnbInstall.h
index a648cc4ec3..a648cc4ec3 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionGnbInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionHtInstall.h
index 06c5463e28..06c5463e28 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionHtInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionHtcInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionHtcInstall.h
index 8f5079cb56..8f5079cb56 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionHtcInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionHtcInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionIdsInstall.h
index fe875004a2..fe875004a2 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionIdsInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionIoCstateInstall.h
index e466c9ebe9..e466c9ebe9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionIoCstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionL3FeaturesInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionL3FeaturesInstall.h
index 3323fea953..3323fea953 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionL3FeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionL3FeaturesInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionLowPwrPstateInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionLowPwrPstateInstall.h
index 3834bd4d7c..3834bd4d7c 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionLowPwrPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionLowPwrPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionMemoryInstall.h
index e2d4e03bf9..e2d4e03bf9 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionMemoryInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryRecoveryInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionMemoryRecoveryInstall.h
index 0ed16d5d73..0ed16d5d73 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMemoryRecoveryInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionMemoryRecoveryInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMmioMapInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionMmioMapInstall.h
index 0150c1bcb6..0150c1bcb6 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMmioMapInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionMmioMapInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionMsgBasedC1eInstall.h
index d99bb7c0f7..d99bb7c0f7 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionMsgBasedC1eInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocketInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionMultiSocketInstall.h
index cc79ceb883..cc79ceb883 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionMultiSocketInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionMultiSocketInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionPrefetchModeInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionPrefetchModeInstall.h
index 711b1a3ace..711b1a3ace 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionPrefetchModeInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionPrefetchModeInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionPreserveMailboxInstall.h
index 1f32feecba..1f32feecba 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionPreserveMailboxInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionPsiInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionPsiInstall.h
index 8e8910770d..8e8910770d 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionPsiInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionPsiInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionPstateHpcModeInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionPstateHpcModeInstall.h
index 58699e6372..58699e6372 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionPstateHpcModeInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionPstateHpcModeInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionPstateInstall.h
index a3c5fa3328..a3c5fa3328 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionPstateInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionS3ScriptInstall.h
index d36004ff3e..d36004ff3e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionS3ScriptInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionSlitInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionSlitInstall.h
index 2e42384e5a..2e42384e5a 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionSlitInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionSlitInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionSratInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionSratInstall.h
index 0e3fb296da..0e3fb296da 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionSratInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionSratInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionTdpLimitingInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionTdpLimitingInstall.h
index 843bd85ec0..843bd85ec0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionTdpLimitingInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionTdpLimitingInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/OptionWheaInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/OptionWheaInstall.h
index afbd3259bb..afbd3259bb 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/OptionWheaInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/OptionWheaInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Include/PlatformInstall.h b/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
index 7ff268d67e..7ff268d67e 100644
--- a/src/vendorcode/amd/agesa/f16kb/Include/PlatformInstall.h
+++ b/src/vendorcode/amd/agesa/f16kb/Config/PlatformInstall.h
diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
index db7a00d49f..3b5eb4af24 100644
--- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
@@ -40,6 +40,8 @@ AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 AGESA_INC += -I$(src)/southbridge/amd/agesa/hudson
 
+BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC)
+
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing