diff --git a/src/mainboard/google/kahlee/bootblock/bootblock.c b/src/mainboard/google/kahlee/bootblock/bootblock.c
index 3041a8fbec..90c8acbabf 100644
--- a/src/mainboard/google/kahlee/bootblock/bootblock.c
+++ b/src/mainboard/google/kahlee/bootblock/bootblock.c
@@ -14,8 +14,8 @@
  */
 
 #include <bootblock_common.h>
-#include <ec.h>
 #include <soc/southbridge.h>
+#include <variant/ec.h>
 
 void bootblock_mainboard_init(void)
 {
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index 708219a1e9..885dd8dce0 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include "ec.h"
+#include <variant/ec.h>
 
 /* DefinitionBlock Statement */
 DefinitionBlock (
diff --git a/src/mainboard/google/kahlee/ec.c b/src/mainboard/google/kahlee/ec.c
index 0d1dae2bde..3f309eb20d 100644
--- a/src/mainboard/google/kahlee/ec.c
+++ b/src/mainboard/google/kahlee/ec.c
@@ -16,9 +16,9 @@
 #include <arch/acpi.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
-#include "ec.h"
 #include <rules.h>
 #include <soc/southbridge.h>
+#include <variant/ec.h>
 
 static void ramstage_ec_init(void)
 {
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index e21aa02080..643bda10aa 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -19,10 +19,10 @@
 #include <agesawrapper.h>
 #include <amd_pci_util.h>
 #include <cbmem.h>
-#include <ec.h>
 #include <baseboard/variants.h>
 #include <soc/nvs.h>
 #include <soc/smi.h>
+#include <variant/ec.h>
 #include <variant/thermal.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/kahlee/smihandler.c b/src/mainboard/google/kahlee/smihandler.c
index f1c66a6fcb..6d43fbf098 100644
--- a/src/mainboard/google/kahlee/smihandler.c
+++ b/src/mainboard/google/kahlee/smihandler.c
@@ -18,7 +18,7 @@
 #include <cpu/x86/smm.h>
 #include <ec/google/chromeec/smm.h>
 #include <soc/smi.h>
-#include "ec.h"
+#include <variant/ec.h>
 
 void mainboard_smi_sleep(u8 slp_typ)
 {
diff --git a/src/mainboard/google/kahlee/ec.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/ec.h
similarity index 100%
rename from src/mainboard/google/kahlee/ec.h
rename to src/mainboard/google/kahlee/variants/baseboard/include/baseboard/ec.h
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/ec.h b/src/mainboard/google/kahlee/variants/grunt/include/variant/ec.h
new file mode 100644
index 0000000000..294a48d908
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/ec.h
@@ -0,0 +1 @@
+#include <baseboard/ec.h>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/ec.h b/src/mainboard/google/kahlee/variants/kahlee/include/variant/ec.h
new file mode 100644
index 0000000000..294a48d908
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/ec.h
@@ -0,0 +1 @@
+#include <baseboard/ec.h>