diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c
index e1e5437da7..398fadbf09 100644
--- a/src/mainboard/amd/gardenia/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c
@@ -13,9 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
+#include <agesawrapper.h>
 #include <BiosCallOuts.h>
-#include <FchPlatform.h>
 #include <soc/imc.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/gardenia/OemCustomize.c b/src/mainboard/amd/gardenia/OemCustomize.c
index 8bd8e7c041..1cee585b1d 100644
--- a/src/mainboard/amd/gardenia/OemCustomize.c
+++ b/src/mainboard/amd/gardenia/OemCustomize.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
 #include <agesawrapper.h>
-#include <PlatformMemoryConfiguration.h>
 
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE
 
diff --git a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c
index 8ab4240c16..6b52162ee6 100644
--- a/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/bootblock/BiosCallOuts.c
@@ -13,9 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
+#include <agesawrapper.h>
 #include <BiosCallOuts.h>
-#include <FchPlatform.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>
 
diff --git a/src/mainboard/amd/gardenia/bootblock/OemCustomize.c b/src/mainboard/amd/gardenia/bootblock/OemCustomize.c
index 53b4a6ca04..82b77f288b 100644
--- a/src/mainboard/amd/gardenia/bootblock/OemCustomize.c
+++ b/src/mainboard/amd/gardenia/bootblock/OemCustomize.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
 #include <agesawrapper.h>
-#include <PlatformMemoryConfiguration.h>
 
 #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE