diff --git a/src/mainboard/google/daisy/Makefile.inc b/src/mainboard/google/daisy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/daisy/Makefile.inc
rename to src/mainboard/google/daisy/Makefile.mk
diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/Makefile.inc
rename to src/mainboard/google/dedede/Makefile.mk
diff --git a/src/mainboard/google/dedede/spd/Makefile.inc b/src/mainboard/google/dedede/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/spd/Makefile.inc
rename to src/mainboard/google/dedede/spd/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/baseboard/Makefile.inc b/src/mainboard/google/dedede/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/baseboard/Makefile.inc
rename to src/mainboard/google/dedede/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/beadrix/Makefile.inc b/src/mainboard/google/dedede/variants/beadrix/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/beadrix/Makefile.inc
rename to src/mainboard/google/dedede/variants/beadrix/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.inc b/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/beadrix/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/beadrix/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/blipper/Makefile.inc b/src/mainboard/google/dedede/variants/blipper/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/blipper/Makefile.inc
rename to src/mainboard/google/dedede/variants/blipper/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/blipper/memory/Makefile.inc b/src/mainboard/google/dedede/variants/blipper/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/blipper/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/blipper/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/boten/Makefile.inc b/src/mainboard/google/dedede/variants/boten/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/boten/Makefile.inc
rename to src/mainboard/google/dedede/variants/boten/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/boten/memory/Makefile.inc b/src/mainboard/google/dedede/variants/boten/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/boten/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/boten/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/boxy/Makefile.inc b/src/mainboard/google/dedede/variants/boxy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/boxy/Makefile.inc
rename to src/mainboard/google/dedede/variants/boxy/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/boxy/memory/Makefile.inc b/src/mainboard/google/dedede/variants/boxy/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/boxy/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/boxy/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/bugzzy/Makefile.inc b/src/mainboard/google/dedede/variants/bugzzy/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/bugzzy/Makefile.inc
rename to src/mainboard/google/dedede/variants/bugzzy/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.inc b/src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/bugzzy/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/cappy2/Makefile.inc b/src/mainboard/google/dedede/variants/cappy2/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/cappy2/Makefile.inc
rename to src/mainboard/google/dedede/variants/cappy2/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cappy2/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/cappy2/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/cappy2/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/corori/Makefile.inc b/src/mainboard/google/dedede/variants/corori/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/corori/Makefile.inc
rename to src/mainboard/google/dedede/variants/corori/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/corori/memory/Makefile.inc b/src/mainboard/google/dedede/variants/corori/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/corori/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/corori/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/cret/Makefile.inc b/src/mainboard/google/dedede/variants/cret/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/cret/Makefile.inc
rename to src/mainboard/google/dedede/variants/cret/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/cret/memory/Makefile.inc b/src/mainboard/google/dedede/variants/cret/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/cret/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/cret/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/dexi/Makefile.inc b/src/mainboard/google/dedede/variants/dexi/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/dexi/Makefile.inc
rename to src/mainboard/google/dedede/variants/dexi/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/dexi/memory/Makefile.inc b/src/mainboard/google/dedede/variants/dexi/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/dexi/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/dexi/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/dibbi/Makefile.inc b/src/mainboard/google/dedede/variants/dibbi/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/dibbi/Makefile.inc
rename to src/mainboard/google/dedede/variants/dibbi/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/dibbi/memory/Makefile.inc b/src/mainboard/google/dedede/variants/dibbi/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/dibbi/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/dibbi/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/dita/Makefile.inc b/src/mainboard/google/dedede/variants/dita/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/dita/Makefile.inc
rename to src/mainboard/google/dedede/variants/dita/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/dita/memory/Makefile.inc b/src/mainboard/google/dedede/variants/dita/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/dita/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/dita/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/drawcia/Makefile.inc b/src/mainboard/google/dedede/variants/drawcia/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/drawcia/Makefile.inc
rename to src/mainboard/google/dedede/variants/drawcia/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/drawcia/memory/Makefile.inc b/src/mainboard/google/dedede/variants/drawcia/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/drawcia/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/drawcia/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/driblee/Makefile.inc b/src/mainboard/google/dedede/variants/driblee/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/driblee/Makefile.inc
rename to src/mainboard/google/dedede/variants/driblee/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/driblee/memory/Makefile.inc b/src/mainboard/google/dedede/variants/driblee/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/driblee/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/driblee/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/galtic/Makefile.inc b/src/mainboard/google/dedede/variants/galtic/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/galtic/Makefile.inc
rename to src/mainboard/google/dedede/variants/galtic/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/galtic/memory/Makefile.inc b/src/mainboard/google/dedede/variants/galtic/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/galtic/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/galtic/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/gooey/Makefile.inc b/src/mainboard/google/dedede/variants/gooey/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/gooey/Makefile.inc
rename to src/mainboard/google/dedede/variants/gooey/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/gooey/memory/Makefile.inc b/src/mainboard/google/dedede/variants/gooey/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/gooey/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/gooey/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/haboki/Makefile.inc b/src/mainboard/google/dedede/variants/haboki/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/haboki/Makefile.inc
rename to src/mainboard/google/dedede/variants/haboki/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/haboki/memory/Makefile.inc b/src/mainboard/google/dedede/variants/haboki/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/haboki/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/haboki/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/kracko/Makefile.inc b/src/mainboard/google/dedede/variants/kracko/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/kracko/Makefile.inc
rename to src/mainboard/google/dedede/variants/kracko/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/kracko/memory/Makefile.inc b/src/mainboard/google/dedede/variants/kracko/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/kracko/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/kracko/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/lalala/Makefile.inc b/src/mainboard/google/dedede/variants/lalala/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/lalala/Makefile.inc
rename to src/mainboard/google/dedede/variants/lalala/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc b/src/mainboard/google/dedede/variants/lalala/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/lalala/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/lalala/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/lantis/Makefile.inc b/src/mainboard/google/dedede/variants/lantis/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/lantis/Makefile.inc
rename to src/mainboard/google/dedede/variants/lantis/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/lantis/memory/Makefile.inc b/src/mainboard/google/dedede/variants/lantis/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/lantis/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/lantis/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/madoo/Makefile.inc b/src/mainboard/google/dedede/variants/madoo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/madoo/Makefile.inc
rename to src/mainboard/google/dedede/variants/madoo/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/madoo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/madoo/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/madoo/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/madoo/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/magolor/Makefile.inc b/src/mainboard/google/dedede/variants/magolor/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/magolor/Makefile.inc
rename to src/mainboard/google/dedede/variants/magolor/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc b/src/mainboard/google/dedede/variants/magolor/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/magolor/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/magolor/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/metaknight/Makefile.inc b/src/mainboard/google/dedede/variants/metaknight/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/metaknight/Makefile.inc
rename to src/mainboard/google/dedede/variants/metaknight/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/metaknight/memory/Makefile.inc b/src/mainboard/google/dedede/variants/metaknight/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/metaknight/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/metaknight/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/pirika/Makefile.inc b/src/mainboard/google/dedede/variants/pirika/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/pirika/Makefile.inc
rename to src/mainboard/google/dedede/variants/pirika/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/pirika/memory/Makefile.inc b/src/mainboard/google/dedede/variants/pirika/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/pirika/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/pirika/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/sasuke/Makefile.inc b/src/mainboard/google/dedede/variants/sasuke/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/sasuke/Makefile.inc
rename to src/mainboard/google/dedede/variants/sasuke/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/sasuke/memory/Makefile.inc b/src/mainboard/google/dedede/variants/sasuke/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/sasuke/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/sasuke/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/sasukette/Makefile.inc b/src/mainboard/google/dedede/variants/sasukette/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/sasukette/Makefile.inc
rename to src/mainboard/google/dedede/variants/sasukette/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/sasukette/memory/Makefile.inc b/src/mainboard/google/dedede/variants/sasukette/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/sasukette/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/sasukette/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/shotzo/Makefile.inc b/src/mainboard/google/dedede/variants/shotzo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/shotzo/Makefile.inc
rename to src/mainboard/google/dedede/variants/shotzo/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/shotzo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/shotzo/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/shotzo/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/shotzo/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/storo/Makefile.inc b/src/mainboard/google/dedede/variants/storo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/storo/Makefile.inc
rename to src/mainboard/google/dedede/variants/storo/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/storo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/storo/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/storo/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/storo/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/taranza/Makefile.inc b/src/mainboard/google/dedede/variants/taranza/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/taranza/Makefile.inc
rename to src/mainboard/google/dedede/variants/taranza/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/taranza/memory/Makefile.inc b/src/mainboard/google/dedede/variants/taranza/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/taranza/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/taranza/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/waddledee/Makefile.inc b/src/mainboard/google/dedede/variants/waddledee/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/waddledee/Makefile.inc
rename to src/mainboard/google/dedede/variants/waddledee/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/waddledee/memory/Makefile.inc b/src/mainboard/google/dedede/variants/waddledee/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/waddledee/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/waddledee/memory/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/waddledoo/Makefile.inc b/src/mainboard/google/dedede/variants/waddledoo/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/waddledoo/Makefile.inc
rename to src/mainboard/google/dedede/variants/waddledoo/Makefile.mk
diff --git a/src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.inc
rename to src/mainboard/google/dedede/variants/waddledoo/memory/Makefile.mk
diff --git a/src/mainboard/google/drallion/Makefile.inc b/src/mainboard/google/drallion/Makefile.mk
similarity index 100%
rename from src/mainboard/google/drallion/Makefile.inc
rename to src/mainboard/google/drallion/Makefile.mk
diff --git a/src/mainboard/google/drallion/spd/Makefile.inc b/src/mainboard/google/drallion/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/drallion/spd/Makefile.inc
rename to src/mainboard/google/drallion/spd/Makefile.mk
diff --git a/src/mainboard/google/drallion/variants/drallion/Makefile.inc b/src/mainboard/google/drallion/variants/drallion/Makefile.mk
similarity index 100%
rename from src/mainboard/google/drallion/variants/drallion/Makefile.inc
rename to src/mainboard/google/drallion/variants/drallion/Makefile.mk
diff --git a/src/mainboard/google/eve/Makefile.inc b/src/mainboard/google/eve/Makefile.mk
similarity index 100%
rename from src/mainboard/google/eve/Makefile.inc
rename to src/mainboard/google/eve/Makefile.mk
diff --git a/src/mainboard/google/eve/spd/Makefile.inc b/src/mainboard/google/eve/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/google/eve/spd/Makefile.inc
rename to src/mainboard/google/eve/spd/Makefile.mk
diff --git a/src/mainboard/google/fizz/Makefile.inc b/src/mainboard/google/fizz/Makefile.mk
similarity index 100%
rename from src/mainboard/google/fizz/Makefile.inc
rename to src/mainboard/google/fizz/Makefile.mk
diff --git a/src/mainboard/google/fizz/variants/baseboard/Makefile.inc b/src/mainboard/google/fizz/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/google/fizz/variants/baseboard/Makefile.inc
rename to src/mainboard/google/fizz/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/fizz/variants/endeavour/Makefile.inc b/src/mainboard/google/fizz/variants/endeavour/Makefile.mk
similarity index 100%
rename from src/mainboard/google/fizz/variants/endeavour/Makefile.inc
rename to src/mainboard/google/fizz/variants/endeavour/Makefile.mk
diff --git a/src/mainboard/google/fizz/variants/karma/Makefile.inc b/src/mainboard/google/fizz/variants/karma/Makefile.mk
similarity index 100%
rename from src/mainboard/google/fizz/variants/karma/Makefile.inc
rename to src/mainboard/google/fizz/variants/karma/Makefile.mk
diff --git a/src/mainboard/google/foster/Makefile.inc b/src/mainboard/google/foster/Makefile.mk
similarity index 100%
rename from src/mainboard/google/foster/Makefile.inc
rename to src/mainboard/google/foster/Makefile.mk
diff --git a/src/mainboard/google/foster/bct/Makefile.inc b/src/mainboard/google/foster/bct/Makefile.mk
similarity index 100%
rename from src/mainboard/google/foster/bct/Makefile.inc
rename to src/mainboard/google/foster/bct/Makefile.mk