diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c
index 2f6a6036c8..fd8465a240 100644
--- a/src/mainboard/google/kahlee/BiosCallOuts.c
+++ b/src/mainboard/google/kahlee/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>
 #include <baseboard/variants.h>
diff --git a/src/mainboard/google/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/OemCustomize.c
index bd58e0ecc8..c50752698a 100644
--- a/src/mainboard/google/kahlee/OemCustomize.c
+++ b/src/mainboard/google/kahlee/OemCustomize.c
@@ -14,9 +14,7 @@
  */
 
 #include <chip.h>
-#include <AGESA.h>
 #include <agesawrapper.h>
-#include <PlatformMemoryConfiguration.h>
 
 #define DIMMS_PER_CHANNEL 1
 #if DIMMS_PER_CHANNEL > MAX_DIMMS_PER_CH
diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
index aca96c4e50..4dc6d45368 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
-#include <FchPlatform.h>
+#include <agesawrapper.h>
 #include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
index aad560708a..b4e0891063 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <soc/smi.h>
-#include <AGESA.h>
+#include <agesawrapper.h>
 
 const GPIO_CONTROL *get_gpio_table(void);
 const struct sci_source *get_gpe_table(size_t *num);
diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c
index 0fd5f400cb..d90a99cbd7 100644
--- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c
+++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <AGESA.h>
-#include <FchPlatform.h>
+#include <agesawrapper.h>
 #include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>