diff --git a/src/mainboard/google/oak/Makefile.inc b/src/mainboard/google/oak/Makefile.mk
similarity index 100%
rename from src/mainboard/google/oak/Makefile.inc
rename to src/mainboard/google/oak/Makefile.mk
diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/Makefile.inc
rename to src/mainboard/google/octopus/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/ampton/Makefile.inc b/src/mainboard/google/octopus/variants/ampton/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/ampton/Makefile.inc
rename to src/mainboard/google/octopus/variants/ampton/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc b/src/mainboard/google/octopus/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/baseboard/Makefile.inc
rename to src/mainboard/google/octopus/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/bloog/Makefile.inc b/src/mainboard/google/octopus/variants/bloog/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/bloog/Makefile.inc
rename to src/mainboard/google/octopus/variants/bloog/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/bobba/Makefile.inc
rename to src/mainboard/google/octopus/variants/bobba/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/casta/Makefile.inc b/src/mainboard/google/octopus/variants/casta/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/casta/Makefile.inc
rename to src/mainboard/google/octopus/variants/casta/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/dood/Makefile.inc b/src/mainboard/google/octopus/variants/dood/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/dood/Makefile.inc
rename to src/mainboard/google/octopus/variants/dood/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/fleex/Makefile.inc b/src/mainboard/google/octopus/variants/fleex/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/fleex/Makefile.inc
rename to src/mainboard/google/octopus/variants/fleex/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/foob/Makefile.inc b/src/mainboard/google/octopus/variants/foob/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/foob/Makefile.inc
rename to src/mainboard/google/octopus/variants/foob/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/garg/Makefile.inc b/src/mainboard/google/octopus/variants/garg/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/garg/Makefile.inc
rename to src/mainboard/google/octopus/variants/garg/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/lick/Makefile.inc b/src/mainboard/google/octopus/variants/lick/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/lick/Makefile.inc
rename to src/mainboard/google/octopus/variants/lick/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/meep/Makefile.inc
rename to src/mainboard/google/octopus/variants/meep/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/phaser/Makefile.inc b/src/mainboard/google/octopus/variants/phaser/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/phaser/Makefile.inc
rename to src/mainboard/google/octopus/variants/phaser/Makefile.mk
diff --git a/src/mainboard/google/octopus/variants/yorp/Makefile.inc b/src/mainboard/google/octopus/variants/yorp/Makefile.mk
similarity index 100%
rename from src/mainboard/google/octopus/variants/yorp/Makefile.inc
rename to src/mainboard/google/octopus/variants/yorp/Makefile.mk
diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.mk
similarity index 100%
rename from src/mainboard/google/parrot/Makefile.inc
rename to src/mainboard/google/parrot/Makefile.mk
diff --git a/src/mainboard/google/peach_pit/Makefile.inc b/src/mainboard/google/peach_pit/Makefile.mk
similarity index 100%
rename from src/mainboard/google/peach_pit/Makefile.inc
rename to src/mainboard/google/peach_pit/Makefile.mk
diff --git a/src/mainboard/google/poppy/Makefile.inc b/src/mainboard/google/poppy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/Makefile.inc
rename to src/mainboard/google/poppy/Makefile.mk
diff --git a/src/mainboard/google/poppy/spd/Makefile.inc b/src/mainboard/google/poppy/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/spd/Makefile.inc
rename to src/mainboard/google/poppy/spd/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/atlas/Makefile.inc b/src/mainboard/google/poppy/variants/atlas/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/atlas/Makefile.inc
rename to src/mainboard/google/poppy/variants/atlas/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc b/src/mainboard/google/poppy/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/baseboard/Makefile.inc
rename to src/mainboard/google/poppy/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/nami/Makefile.inc
rename to src/mainboard/google/poppy/variants/nami/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc b/src/mainboard/google/poppy/variants/nautilus/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/nautilus/Makefile.inc
rename to src/mainboard/google/poppy/variants/nautilus/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/nocturne/Makefile.inc
rename to src/mainboard/google/poppy/variants/nocturne/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/poppy/Makefile.inc b/src/mainboard/google/poppy/variants/poppy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/poppy/Makefile.inc
rename to src/mainboard/google/poppy/variants/poppy/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/rammus/Makefile.inc b/src/mainboard/google/poppy/variants/rammus/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/rammus/Makefile.inc
rename to src/mainboard/google/poppy/variants/rammus/Makefile.mk
diff --git a/src/mainboard/google/poppy/variants/soraka/Makefile.inc b/src/mainboard/google/poppy/variants/soraka/Makefile.mk
similarity index 100%
rename from src/mainboard/google/poppy/variants/soraka/Makefile.inc
rename to src/mainboard/google/poppy/variants/soraka/Makefile.mk
diff --git a/src/mainboard/google/puff/Makefile.inc b/src/mainboard/google/puff/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/Makefile.inc
rename to src/mainboard/google/puff/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/ambassador/Makefile.inc b/src/mainboard/google/puff/variants/ambassador/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/ambassador/Makefile.inc
rename to src/mainboard/google/puff/variants/ambassador/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/baseboard/Makefile.inc b/src/mainboard/google/puff/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/baseboard/Makefile.inc
rename to src/mainboard/google/puff/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/dooly/Makefile.inc b/src/mainboard/google/puff/variants/dooly/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/dooly/Makefile.inc
rename to src/mainboard/google/puff/variants/dooly/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/duffy/Makefile.inc b/src/mainboard/google/puff/variants/duffy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/duffy/Makefile.inc
rename to src/mainboard/google/puff/variants/duffy/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/faffy/Makefile.inc b/src/mainboard/google/puff/variants/faffy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/faffy/Makefile.inc
rename to src/mainboard/google/puff/variants/faffy/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/genesis/Makefile.inc b/src/mainboard/google/puff/variants/genesis/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/genesis/Makefile.inc
rename to src/mainboard/google/puff/variants/genesis/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/kaisa/Makefile.inc b/src/mainboard/google/puff/variants/kaisa/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/kaisa/Makefile.inc
rename to src/mainboard/google/puff/variants/kaisa/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/moonbuggy/Makefile.inc b/src/mainboard/google/puff/variants/moonbuggy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/moonbuggy/Makefile.inc
rename to src/mainboard/google/puff/variants/moonbuggy/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/noibat/Makefile.inc b/src/mainboard/google/puff/variants/noibat/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/noibat/Makefile.inc
rename to src/mainboard/google/puff/variants/noibat/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/puff/Makefile.inc b/src/mainboard/google/puff/variants/puff/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/puff/Makefile.inc
rename to src/mainboard/google/puff/variants/puff/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/scout/Makefile.inc b/src/mainboard/google/puff/variants/scout/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/scout/Makefile.inc
rename to src/mainboard/google/puff/variants/scout/Makefile.mk
diff --git a/src/mainboard/google/puff/variants/wyvern/Makefile.inc b/src/mainboard/google/puff/variants/wyvern/Makefile.mk
similarity index 100%
rename from src/mainboard/google/puff/variants/wyvern/Makefile.inc
rename to src/mainboard/google/puff/variants/wyvern/Makefile.mk
diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/Makefile.inc
rename to src/mainboard/google/rambi/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/banjo/Makefile.inc b/src/mainboard/google/rambi/variants/banjo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/banjo/Makefile.inc
rename to src/mainboard/google/rambi/variants/banjo/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/candy/Makefile.inc b/src/mainboard/google/rambi/variants/candy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/candy/Makefile.inc
rename to src/mainboard/google/rambi/variants/candy/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/clapper/Makefile.inc b/src/mainboard/google/rambi/variants/clapper/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/clapper/Makefile.inc
rename to src/mainboard/google/rambi/variants/clapper/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/enguarde/Makefile.inc b/src/mainboard/google/rambi/variants/enguarde/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/enguarde/Makefile.inc
rename to src/mainboard/google/rambi/variants/enguarde/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/expresso/Makefile.inc b/src/mainboard/google/rambi/variants/expresso/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/expresso/Makefile.inc
rename to src/mainboard/google/rambi/variants/expresso/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/glimmer/Makefile.inc b/src/mainboard/google/rambi/variants/glimmer/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/glimmer/Makefile.inc
rename to src/mainboard/google/rambi/variants/glimmer/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/gnawty/Makefile.inc b/src/mainboard/google/rambi/variants/gnawty/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/gnawty/Makefile.inc
rename to src/mainboard/google/rambi/variants/gnawty/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/heli/Makefile.inc b/src/mainboard/google/rambi/variants/heli/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/heli/Makefile.inc
rename to src/mainboard/google/rambi/variants/heli/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/kip/Makefile.inc b/src/mainboard/google/rambi/variants/kip/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/kip/Makefile.inc
rename to src/mainboard/google/rambi/variants/kip/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/ninja/Makefile.inc b/src/mainboard/google/rambi/variants/ninja/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/ninja/Makefile.inc
rename to src/mainboard/google/rambi/variants/ninja/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/orco/Makefile.inc b/src/mainboard/google/rambi/variants/orco/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/orco/Makefile.inc
rename to src/mainboard/google/rambi/variants/orco/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/quawks/Makefile.inc b/src/mainboard/google/rambi/variants/quawks/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/quawks/Makefile.inc
rename to src/mainboard/google/rambi/variants/quawks/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/rambi/Makefile.inc b/src/mainboard/google/rambi/variants/rambi/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/rambi/Makefile.inc
rename to src/mainboard/google/rambi/variants/rambi/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/squawks/Makefile.inc b/src/mainboard/google/rambi/variants/squawks/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/squawks/Makefile.inc
rename to src/mainboard/google/rambi/variants/squawks/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/sumo/Makefile.inc b/src/mainboard/google/rambi/variants/sumo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/sumo/Makefile.inc
rename to src/mainboard/google/rambi/variants/sumo/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/swanky/Makefile.inc b/src/mainboard/google/rambi/variants/swanky/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/swanky/Makefile.inc
rename to src/mainboard/google/rambi/variants/swanky/Makefile.mk
diff --git a/src/mainboard/google/rambi/variants/winky/Makefile.inc b/src/mainboard/google/rambi/variants/winky/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rambi/variants/winky/Makefile.inc
rename to src/mainboard/google/rambi/variants/winky/Makefile.mk
diff --git a/src/mainboard/google/reef/Makefile.inc b/src/mainboard/google/reef/Makefile.mk
similarity index 100%
rename from src/mainboard/google/reef/Makefile.inc
rename to src/mainboard/google/reef/Makefile.mk
diff --git a/src/mainboard/google/reef/variants/baseboard/Makefile.inc b/src/mainboard/google/reef/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/reef/variants/baseboard/Makefile.inc
rename to src/mainboard/google/reef/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/reef/variants/coral/Makefile.inc b/src/mainboard/google/reef/variants/coral/Makefile.mk
similarity index 100%
rename from src/mainboard/google/reef/variants/coral/Makefile.inc
rename to src/mainboard/google/reef/variants/coral/Makefile.mk
diff --git a/src/mainboard/google/reef/variants/pyro/Makefile.inc b/src/mainboard/google/reef/variants/pyro/Makefile.mk
similarity index 100%
rename from src/mainboard/google/reef/variants/pyro/Makefile.inc
rename to src/mainboard/google/reef/variants/pyro/Makefile.mk
diff --git a/src/mainboard/google/reef/variants/snappy/Makefile.inc b/src/mainboard/google/reef/variants/snappy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/reef/variants/snappy/Makefile.inc
rename to src/mainboard/google/reef/variants/snappy/Makefile.mk
diff --git a/src/mainboard/google/rex/Makefile.inc b/src/mainboard/google/rex/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/Makefile.inc
rename to src/mainboard/google/rex/Makefile.mk
diff --git a/src/mainboard/google/rex/spd/Makefile.inc b/src/mainboard/google/rex/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/spd/Makefile.inc
rename to src/mainboard/google/rex/spd/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.inc b/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/baseboard/ovis/Makefile.inc
rename to src/mainboard/google/rex/variants/baseboard/ovis/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc b/src/mainboard/google/rex/variants/baseboard/rex/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc
rename to src/mainboard/google/rex/variants/baseboard/rex/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/deku/Makefile.inc b/src/mainboard/google/rex/variants/deku/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/deku/Makefile.inc
rename to src/mainboard/google/rex/variants/deku/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/deku/memory/Makefile.inc b/src/mainboard/google/rex/variants/deku/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/deku/memory/Makefile.inc
rename to src/mainboard/google/rex/variants/deku/memory/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/karis/Makefile.inc b/src/mainboard/google/rex/variants/karis/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/karis/Makefile.inc
rename to src/mainboard/google/rex/variants/karis/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/karis/memory/Makefile.inc b/src/mainboard/google/rex/variants/karis/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/karis/memory/Makefile.inc
rename to src/mainboard/google/rex/variants/karis/memory/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/ovis/Makefile.inc b/src/mainboard/google/rex/variants/ovis/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/ovis/Makefile.inc
rename to src/mainboard/google/rex/variants/ovis/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/ovis/memory/Makefile.inc b/src/mainboard/google/rex/variants/ovis/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/ovis/memory/Makefile.inc
rename to src/mainboard/google/rex/variants/ovis/memory/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/rex0/Makefile.inc b/src/mainboard/google/rex/variants/rex0/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/rex0/Makefile.inc
rename to src/mainboard/google/rex/variants/rex0/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/rex0/memory/Makefile.inc b/src/mainboard/google/rex/variants/rex0/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/rex0/memory/Makefile.inc
rename to src/mainboard/google/rex/variants/rex0/memory/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/screebo/Makefile.inc b/src/mainboard/google/rex/variants/screebo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/screebo/Makefile.inc
rename to src/mainboard/google/rex/variants/screebo/Makefile.mk
diff --git a/src/mainboard/google/rex/variants/screebo/memory/Makefile.inc b/src/mainboard/google/rex/variants/screebo/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/rex/variants/screebo/memory/Makefile.inc
rename to src/mainboard/google/rex/variants/screebo/memory/Makefile.mk