diff --git a/src/mainboard/google/gale/Makefile.inc b/src/mainboard/google/gale/Makefile.mk
similarity index 100%
rename from src/mainboard/google/gale/Makefile.inc
rename to src/mainboard/google/gale/Makefile.mk
diff --git a/src/mainboard/google/geralt/Makefile.inc b/src/mainboard/google/geralt/Makefile.mk
similarity index 100%
rename from src/mainboard/google/geralt/Makefile.inc
rename to src/mainboard/google/geralt/Makefile.mk
diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/Makefile.inc
rename to src/mainboard/google/glados/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/asuka/Makefile.inc b/src/mainboard/google/glados/variants/asuka/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/asuka/Makefile.inc
rename to src/mainboard/google/glados/variants/asuka/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/caroline/Makefile.inc b/src/mainboard/google/glados/variants/caroline/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/caroline/Makefile.inc
rename to src/mainboard/google/glados/variants/caroline/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/cave/Makefile.inc b/src/mainboard/google/glados/variants/cave/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/cave/Makefile.inc
rename to src/mainboard/google/glados/variants/cave/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/chell/Makefile.inc b/src/mainboard/google/glados/variants/chell/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/chell/Makefile.inc
rename to src/mainboard/google/glados/variants/chell/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/glados/Makefile.inc b/src/mainboard/google/glados/variants/glados/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/glados/Makefile.inc
rename to src/mainboard/google/glados/variants/glados/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/lars/Makefile.inc b/src/mainboard/google/glados/variants/lars/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/lars/Makefile.inc
rename to src/mainboard/google/glados/variants/lars/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/sentry/Makefile.inc b/src/mainboard/google/glados/variants/sentry/Makefile.mk
similarity index 100%
rename from src/mainboard/google/glados/variants/sentry/Makefile.inc
rename to src/mainboard/google/glados/variants/sentry/Makefile.mk
diff --git a/src/mainboard/google/gru/Makefile.inc b/src/mainboard/google/gru/Makefile.mk
similarity index 100%
rename from src/mainboard/google/gru/Makefile.inc
rename to src/mainboard/google/gru/Makefile.mk
diff --git a/src/mainboard/google/gru/sdram_params/Makefile.inc b/src/mainboard/google/gru/sdram_params/Makefile.mk
similarity index 100%
rename from src/mainboard/google/gru/sdram_params/Makefile.inc
rename to src/mainboard/google/gru/sdram_params/Makefile.mk
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/Makefile.inc
rename to src/mainboard/google/guybrush/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/baseboard/Makefile.inc b/src/mainboard/google/guybrush/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/baseboard/Makefile.inc
rename to src/mainboard/google/guybrush/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/dewatt/Makefile.inc
rename to src/mainboard/google/guybrush/variants/dewatt/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc
rename to src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
rename to src/mainboard/google/guybrush/variants/guybrush/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc
rename to src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
rename to src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
rename to src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk
diff --git a/src/mainboard/google/hatch/Makefile.inc b/src/mainboard/google/hatch/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/Makefile.inc
rename to src/mainboard/google/hatch/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/akemi/Makefile.inc b/src/mainboard/google/hatch/variants/akemi/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/akemi/Makefile.inc
rename to src/mainboard/google/hatch/variants/akemi/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc b/src/mainboard/google/hatch/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/baseboard/Makefile.inc
rename to src/mainboard/google/hatch/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/dratini/Makefile.inc b/src/mainboard/google/hatch/variants/dratini/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/dratini/Makefile.inc
rename to src/mainboard/google/hatch/variants/dratini/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/hatch/Makefile.inc b/src/mainboard/google/hatch/variants/hatch/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/hatch/Makefile.inc
rename to src/mainboard/google/hatch/variants/hatch/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/helios/Makefile.inc b/src/mainboard/google/hatch/variants/helios/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/helios/Makefile.inc
rename to src/mainboard/google/hatch/variants/helios/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/jinlon/Makefile.inc b/src/mainboard/google/hatch/variants/jinlon/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/jinlon/Makefile.inc
rename to src/mainboard/google/hatch/variants/jinlon/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/kindred/Makefile.inc b/src/mainboard/google/hatch/variants/kindred/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/kindred/Makefile.inc
rename to src/mainboard/google/hatch/variants/kindred/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/kohaku/Makefile.inc b/src/mainboard/google/hatch/variants/kohaku/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/kohaku/Makefile.inc
rename to src/mainboard/google/hatch/variants/kohaku/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/mushu/Makefile.inc b/src/mainboard/google/hatch/variants/mushu/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/mushu/Makefile.inc
rename to src/mainboard/google/hatch/variants/mushu/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc b/src/mainboard/google/hatch/variants/nightfury/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/nightfury/Makefile.inc
rename to src/mainboard/google/hatch/variants/nightfury/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/palkia/Makefile.inc b/src/mainboard/google/hatch/variants/palkia/Makefile.mk
similarity index 100%
rename from src/mainboard/google/hatch/variants/palkia/Makefile.inc
rename to src/mainboard/google/hatch/variants/palkia/Makefile.mk
diff --git a/src/mainboard/google/herobrine/Makefile.inc b/src/mainboard/google/herobrine/Makefile.mk
similarity index 100%
rename from src/mainboard/google/herobrine/Makefile.inc
rename to src/mainboard/google/herobrine/Makefile.mk
diff --git a/src/mainboard/google/jecht/Makefile.inc b/src/mainboard/google/jecht/Makefile.mk
similarity index 100%
rename from src/mainboard/google/jecht/Makefile.inc
rename to src/mainboard/google/jecht/Makefile.mk
diff --git a/src/mainboard/google/jecht/spd/Makefile.inc b/src/mainboard/google/jecht/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/jecht/spd/Makefile.inc
rename to src/mainboard/google/jecht/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/Makefile.inc
rename to src/mainboard/google/kahlee/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc b/src/mainboard/google/kahlee/variants/aleena/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/aleena/Makefile.inc
rename to src/mainboard/google/kahlee/variants/aleena/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/baseboard/Makefile.inc
rename to src/mainboard/google/kahlee/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
rename to src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/careena/Makefile.inc
rename to src/mainboard/google/kahlee/variants/careena/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc
rename to src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/Makefile.inc
rename to src/mainboard/google/kahlee/variants/grunt/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/liara/Makefile.inc b/src/mainboard/google/kahlee/variants/liara/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/liara/Makefile.inc
rename to src/mainboard/google/kahlee/variants/liara/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/nuwani/Makefile.inc
rename to src/mainboard/google/kahlee/variants/nuwani/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc
rename to src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/treeya/Makefile.inc
rename to src/mainboard/google/kahlee/variants/treeya/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc
rename to src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk
diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kukui/Makefile.inc
rename to src/mainboard/google/kukui/Makefile.mk
diff --git a/src/mainboard/google/kukui/sdram_params/Makefile.inc b/src/mainboard/google/kukui/sdram_params/Makefile.mk
similarity index 100%
rename from src/mainboard/google/kukui/sdram_params/Makefile.inc
rename to src/mainboard/google/kukui/sdram_params/Makefile.mk
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.mk
similarity index 100%
rename from src/mainboard/google/link/Makefile.inc
rename to src/mainboard/google/link/Makefile.mk
diff --git a/src/mainboard/google/mistral/Makefile.inc b/src/mainboard/google/mistral/Makefile.mk
similarity index 100%
rename from src/mainboard/google/mistral/Makefile.inc
rename to src/mainboard/google/mistral/Makefile.mk
diff --git a/src/mainboard/google/myst/Makefile.inc b/src/mainboard/google/myst/Makefile.mk
similarity index 97%
rename from src/mainboard/google/myst/Makefile.inc
rename to src/mainboard/google/myst/Makefile.mk
index 4c5f80db8b..305179e117 100644
--- a/src/mainboard/google/myst/Makefile.inc
+++ b/src/mainboard/google/myst/Makefile.mk
@@ -28,7 +28,7 @@ APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
 # Add the below section back in after the apcbtool is updated to handle the
 # Phoenix APCB SPD configuration.
 
-ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
+ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.mk),)
 
 LIB_SPD_DEPS = $(SPD_SOURCES)
 
diff --git a/src/mainboard/google/myst/variants/baseboard/Makefile.inc b/src/mainboard/google/myst/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/myst/variants/baseboard/Makefile.inc
rename to src/mainboard/google/myst/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/myst/variants/myst/Makefile.inc b/src/mainboard/google/myst/variants/myst/Makefile.mk
similarity index 100%
rename from src/mainboard/google/myst/variants/myst/Makefile.inc
rename to src/mainboard/google/myst/variants/myst/Makefile.mk
diff --git a/src/mainboard/google/myst/variants/myst/memory/Makefile.inc b/src/mainboard/google/myst/variants/myst/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/myst/variants/myst/memory/Makefile.inc
rename to src/mainboard/google/myst/variants/myst/memory/Makefile.mk
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.mk
similarity index 100%
rename from src/mainboard/google/nyan/Makefile.inc
rename to src/mainboard/google/nyan/Makefile.mk
diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.mk
similarity index 100%
rename from src/mainboard/google/nyan/bct/Makefile.inc
rename to src/mainboard/google/nyan/bct/Makefile.mk
diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.mk
similarity index 100%
rename from src/mainboard/google/nyan_big/Makefile.inc
rename to src/mainboard/google/nyan_big/Makefile.mk
diff --git a/src/mainboard/google/nyan_big/bct/Makefile.inc b/src/mainboard/google/nyan_big/bct/Makefile.mk
similarity index 100%
rename from src/mainboard/google/nyan_big/bct/Makefile.inc
rename to src/mainboard/google/nyan_big/bct/Makefile.mk
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.mk
similarity index 100%
rename from src/mainboard/google/nyan_blaze/Makefile.inc
rename to src/mainboard/google/nyan_blaze/Makefile.mk
diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.inc b/src/mainboard/google/nyan_blaze/bct/Makefile.mk
similarity index 100%
rename from src/mainboard/google/nyan_blaze/bct/Makefile.inc
rename to src/mainboard/google/nyan_blaze/bct/Makefile.mk