166 files changed, 13 insertions, 0 deletions
diff --git a/src/vendorcode/amd/agesa/Makefile.inc b/src/vendorcode/amd/agesa/Makefile.inc
index 5f4569dd31a3..ca7a2019343e 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 e5c2c8e2ee5e..e5c2c8e2ee5e 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 72720063c73c..72720063c73c 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 15949d0e34c7..15949d0e34c7 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 c598283b6b02..c598283b6b02 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 b161cd3be775..b161cd3be775 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 ba4b42b8fb5c..ba4b42b8fb5c 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 ead4fcec6ae4..ead4fcec6ae4 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 63cb0ff3cb89..63cb0ff3cb89 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 f1799f6507d7..f1799f6507d7 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 c031f326c165..c031f326c165 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 bcd9700293b3..bcd9700293b3 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 eb4e44b5af4c..eb4e44b5af4c 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 e30f0488ff57..e30f0488ff57 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 4778de358d07..4778de358d07 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 3402809b3ff5..3402809b3ff5 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 7f3ac0769fa0..7f3ac0769fa0 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 3f9a3def529b..3f9a3def529b 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 0fd8232ead48..0fd8232ead48 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 6d2a445b5303..6d2a445b5303 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 7476e16358df..7476e16358df 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 3c87677fe98a..3c87677fe98a 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 10ea6a74b1a1..10ea6a74b1a1 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 7d6433db31ac..7d6433db31ac 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 5b62bdf6dc15..5b62bdf6dc15 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 915e5302c4bf..915e5302c4bf 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 273874753f3e..273874753f3e 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 34886eee14f2..34886eee14f2 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 5facece353a2..5facece353a2 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 1fe116a6c76e..1fe116a6c76e 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 5ed6a39c29c4..4da54b7d19a0 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 ea678637433a..ea678637433a 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 79261def2d71..79261def2d71 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 8d6e454c99c8..8d6e454c99c8 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 43b82c56d7bb..43b82c56d7bb 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 5bc78967e856..5bc78967e856 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 d4dc2b3e932a..d4dc2b3e932a 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 eb4bc91f9931..eb4bc91f9931 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 fda98c105499..fda98c105499 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 c031f326c165..c031f326c165 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 0b9412f533d8..0b9412f533d8 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 175482b9e911..175482b9e911 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 5c44465c338c..5c44465c338c 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 14058d51bf49..14058d51bf49 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 79975cc170e9..79975cc170e9 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 bc80a74e8737..bc80a74e8737 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 9438abc70cbb..9438abc70cbb 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 283a972463d0..283a972463d0 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 65028853dec1..65028853dec1 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 49c746ad3b3c..49c746ad3b3c 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 244bbba996f8..244bbba996f8 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 368df9d780e4..368df9d780e4 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 116320a46d29..116320a46d29 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 5b62bdf6dc15..5b62bdf6dc15 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 915e5302c4bf..915e5302c4bf 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 273874753f3e..273874753f3e 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 34886eee14f2..34886eee14f2 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 5facece353a2..5facece353a2 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 cfcca8278d86..cfcca8278d86 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 ea7198ff59e1..f71b957b3f37 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 4b3b9a8a2555..4b3b9a8a2555 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 2e944bf65ab7..2e944bf65ab7 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 d47619baa79f..d47619baa79f 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 35362ffdb7d0..35362ffdb7d0 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 d0743ecc3c30..d0743ecc3c30 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 5cc48190463d..5cc48190463d 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 44df5ba63127..44df5ba63127 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 b09a58ff0b13..b09a58ff0b13 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 7eeea69c9f1b..7eeea69c9f1b 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 73eeb6fca42f..73eeb6fca42f 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 715e1628d542..715e1628d542 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 c046c24e87e0..c046c24e87e0 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 7733859aedb2..7733859aedb2 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 056777d07938..056777d07938 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 f01fb04e9ee9..f01fb04e9ee9 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 6873370a5502..6873370a5502 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 f83ad70f5dbc..f83ad70f5dbc 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 4a73c40dbcb4..4a73c40dbcb4 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 61cf174cc2da..61cf174cc2da 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 254e22e923e4..254e22e923e4 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 f5dea81d336a..f5dea81d336a 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 a64321ef389a..a64321ef389a 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 26a56a34686c..26a56a34686c 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 2b40f77b17a5..2b40f77b17a5 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 061b6f598b09..061b6f598b09 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 8ca835c3852e..8ca835c3852e 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 e5d93eb1b857..e5d93eb1b857 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 a96b217ce3ef..a96b217ce3ef 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 3003cabaa7e7..3003cabaa7e7 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 b5ebae704070..b5ebae704070 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 1295782a34dc..1295782a34dc 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 54f180a94ad9..54f180a94ad9 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 d329add945f2..4f6acba469b8 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 368104c20f23..368104c20f23 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 b6186c6fa5e4..b6186c6fa5e4 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 308dc73b572a..308dc73b572a 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 8b5db5aee4d9..8b5db5aee4d9 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 855930a388f8..855930a388f8 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 a3bc05db9aee..a3bc05db9aee 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 50829bdbdea3..50829bdbdea3 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 541cee9dc105..541cee9dc105 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 f0d91940186c..f0d91940186c 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 4a8237a210fc..4a8237a210fc 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 c031f326c165..c031f326c165 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 f6fc162919c1..f6fc162919c1 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 50694125417b..50694125417b 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 671b0fb0a611..671b0fb0a611 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 374ceb49b7c7..374ceb49b7c7 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 5fe172c6e3e3..5fe172c6e3e3 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 b83ee6b04dda..b83ee6b04dda 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 203b9e27a043..203b9e27a043 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 900d93f5844c..900d93f5844c 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 457c51e475fa..457c51e475fa 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 47400352232f..47400352232f 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 5ba255d36c0f..5ba255d36c0f 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 6d0aeef50ee5..6d0aeef50ee5 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 46c303330bd9..46c303330bd9 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 310dc5419a3f..310dc5419a3f 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 0053a49a8d1d..0053a49a8d1d 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 5106ed263abf..5106ed263abf 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 e80a69ddb34c..e80a69ddb34c 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 f47004201d8a..f47004201d8a 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 915e5302c4bf..915e5302c4bf 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 273874753f3e..273874753f3e 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 4fa53ce0a7a7..4fa53ce0a7a7 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 5facece353a2..5facece353a2 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 334c84ee3c6f..334c84ee3c6f 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 d060dddc97ee..352a03ce8915 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 1624859e9c5b..1624859e9c5b 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 53256edce4c1..53256edce4c1 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 96ee782b8243..96ee782b8243 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 42a9ff5d4531..42a9ff5d4531 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 9e094ec10b1c..9e094ec10b1c 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 4b29b73c5c6d..4b29b73c5c6d 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 8e61eff7aeea..8e61eff7aeea 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 61c750aafb4e..61c750aafb4e 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 987677e91aee..987677e91aee 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 2b47e15de912..2b47e15de912 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 e0b09b3b6acc..e0b09b3b6acc 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 ae9e3ad3523f..ae9e3ad3523f 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 47255041596a..47255041596a 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 75ae37e18419..75ae37e18419 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 a648cc4ec3f3..a648cc4ec3f3 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 06c5463e28f5..06c5463e28f5 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 8f5079cb56ef..8f5079cb56ef 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 fe875004a2ca..fe875004a2ca 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 e466c9ebe9e2..e466c9ebe9e2 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 3323fea953a0..3323fea953a0 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 3834bd4d7cfe..3834bd4d7cfe 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 e2d4e03bf9dc..e2d4e03bf9dc 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 0ed16d5d73fe..0ed16d5d73fe 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 0150c1bcb637..0150c1bcb637 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 d99bb7c0f789..d99bb7c0f789 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 cc79ceb883d7..cc79ceb883d7 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 711b1a3acee5..711b1a3acee5 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 1f32feecba67..1f32feecba67 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 8e8910770d49..8e8910770d49 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 58699e6372bc..58699e6372bc 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 a3c5fa3328d8..a3c5fa3328d8 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 d36004ff3e21..d36004ff3e21 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 2e42384e5a57..2e42384e5a57 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 0e3fb296dab6..0e3fb296dab6 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 843bd85ec001..843bd85ec001 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 afbd3259bb00..afbd3259bb00 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 7ff268d67e4e..7ff268d67e4e 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 db7a00d49fff..3b5eb4af2456 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