diff --git a/src/mainboard/hp/280_g2/Makefile.inc b/src/mainboard/hp/280_g2/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/280_g2/Makefile.inc
rename to src/mainboard/hp/280_g2/Makefile.mk
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc b/src/mainboard/hp/compaq_8200_elite_sff/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/compaq_8200_elite_sff/Makefile.inc
rename to src/mainboard/hp/compaq_8200_elite_sff/Makefile.mk
diff --git a/src/mainboard/hp/compaq_elite_8300_usdt/Makefile.inc b/src/mainboard/hp/compaq_elite_8300_usdt/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/compaq_elite_8300_usdt/Makefile.inc
rename to src/mainboard/hp/compaq_elite_8300_usdt/Makefile.mk
diff --git a/src/mainboard/hp/elitebook_820_g2/Makefile.inc b/src/mainboard/hp/elitebook_820_g2/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/elitebook_820_g2/Makefile.inc
rename to src/mainboard/hp/elitebook_820_g2/Makefile.mk
diff --git a/src/mainboard/hp/folio_9480m/Makefile.inc b/src/mainboard/hp/folio_9480m/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/folio_9480m/Makefile.inc
rename to src/mainboard/hp/folio_9480m/Makefile.mk
diff --git a/src/mainboard/hp/snb_ivb_desktops/Makefile.inc b/src/mainboard/hp/snb_ivb_desktops/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/snb_ivb_desktops/Makefile.inc
rename to src/mainboard/hp/snb_ivb_desktops/Makefile.mk
diff --git a/src/mainboard/hp/snb_ivb_laptops/Makefile.inc b/src/mainboard/hp/snb_ivb_laptops/Makefile.mk
similarity index 100%
rename from src/mainboard/hp/snb_ivb_laptops/Makefile.inc
rename to src/mainboard/hp/snb_ivb_laptops/Makefile.mk
diff --git a/src/mainboard/ibase/mb899/Makefile.inc b/src/mainboard/ibase/mb899/Makefile.mk
similarity index 100%
rename from src/mainboard/ibase/mb899/Makefile.inc
rename to src/mainboard/ibase/mb899/Makefile.mk
diff --git a/src/mainboard/ibm/sbp1/Makefile.inc b/src/mainboard/ibm/sbp1/Makefile.mk
similarity index 100%
rename from src/mainboard/ibm/sbp1/Makefile.inc
rename to src/mainboard/ibm/sbp1/Makefile.mk
diff --git a/src/mainboard/intel/adlrvp/Makefile.inc b/src/mainboard/intel/adlrvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/adlrvp/Makefile.inc
rename to src/mainboard/intel/adlrvp/Makefile.mk
diff --git a/src/mainboard/intel/adlrvp/spd/Makefile.inc b/src/mainboard/intel/adlrvp/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/adlrvp/spd/Makefile.inc
rename to src/mainboard/intel/adlrvp/spd/Makefile.mk
diff --git a/src/mainboard/intel/apollolake_rvp/Makefile.inc b/src/mainboard/intel/apollolake_rvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/apollolake_rvp/Makefile.inc
rename to src/mainboard/intel/apollolake_rvp/Makefile.mk
diff --git a/src/mainboard/intel/archercity_crb/Makefile.inc b/src/mainboard/intel/archercity_crb/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/archercity_crb/Makefile.inc
rename to src/mainboard/intel/archercity_crb/Makefile.mk
diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/baskingridge/Makefile.inc
rename to src/mainboard/intel/baskingridge/Makefile.mk
diff --git a/src/mainboard/intel/cedarisland_crb/Makefile.inc b/src/mainboard/intel/cedarisland_crb/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/cedarisland_crb/Makefile.inc
rename to src/mainboard/intel/cedarisland_crb/Makefile.mk
diff --git a/src/mainboard/intel/coffeelake_rvp/Makefile.inc b/src/mainboard/intel/coffeelake_rvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/coffeelake_rvp/Makefile.inc
rename to src/mainboard/intel/coffeelake_rvp/Makefile.mk
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/Makefile.inc b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/coffeelake_rvp/variants/baseboard/Makefile.inc
rename to src/mainboard/intel/coffeelake_rvp/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/intel/d510mo/Makefile.inc b/src/mainboard/intel/d510mo/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/d510mo/Makefile.inc
rename to src/mainboard/intel/d510mo/Makefile.mk
diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/d945gclf/Makefile.inc
rename to src/mainboard/intel/d945gclf/Makefile.mk
diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/dcp847ske/Makefile.inc
rename to src/mainboard/intel/dcp847ske/Makefile.mk
diff --git a/src/mainboard/intel/dg41wv/Makefile.inc b/src/mainboard/intel/dg41wv/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/dg41wv/Makefile.inc
rename to src/mainboard/intel/dg41wv/Makefile.mk
diff --git a/src/mainboard/intel/dg43gt/Makefile.inc b/src/mainboard/intel/dg43gt/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/dg43gt/Makefile.inc
rename to src/mainboard/intel/dg43gt/Makefile.mk
diff --git a/src/mainboard/intel/dq67sw/Makefile.inc b/src/mainboard/intel/dq67sw/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/dq67sw/Makefile.inc
rename to src/mainboard/intel/dq67sw/Makefile.mk
diff --git a/src/mainboard/intel/elkhartlake_crb/Makefile.inc b/src/mainboard/intel/elkhartlake_crb/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/elkhartlake_crb/Makefile.inc
rename to src/mainboard/intel/elkhartlake_crb/Makefile.mk
diff --git a/src/mainboard/intel/elkhartlake_crb/spd/Makefile.inc b/src/mainboard/intel/elkhartlake_crb/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/elkhartlake_crb/spd/Makefile.inc
rename to src/mainboard/intel/elkhartlake_crb/spd/Makefile.mk
diff --git a/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/Makefile.inc b/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/Makefile.inc
rename to src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/Makefile.mk
diff --git a/src/mainboard/intel/emeraldlake2/Makefile.inc b/src/mainboard/intel/emeraldlake2/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/emeraldlake2/Makefile.inc
rename to src/mainboard/intel/emeraldlake2/Makefile.mk
diff --git a/src/mainboard/intel/glkrvp/Makefile.inc b/src/mainboard/intel/glkrvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/glkrvp/Makefile.inc
rename to src/mainboard/intel/glkrvp/Makefile.mk
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc b/src/mainboard/intel/glkrvp/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/glkrvp/variants/baseboard/Makefile.inc
rename to src/mainboard/intel/glkrvp/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/intel/harcuvar/Makefile.inc b/src/mainboard/intel/harcuvar/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/harcuvar/Makefile.inc
rename to src/mainboard/intel/harcuvar/Makefile.mk
diff --git a/src/mainboard/intel/harcuvar/spd/Makefile.inc b/src/mainboard/intel/harcuvar/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/harcuvar/spd/Makefile.inc
rename to src/mainboard/intel/harcuvar/spd/Makefile.mk
diff --git a/src/mainboard/intel/jasperlake_rvp/Makefile.inc b/src/mainboard/intel/jasperlake_rvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/jasperlake_rvp/Makefile.inc
rename to src/mainboard/intel/jasperlake_rvp/Makefile.mk
diff --git a/src/mainboard/intel/jasperlake_rvp/spd/Makefile.inc b/src/mainboard/intel/jasperlake_rvp/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/jasperlake_rvp/spd/Makefile.inc
rename to src/mainboard/intel/jasperlake_rvp/spd/Makefile.mk
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/Makefile.inc b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/jasperlake_rvp/variants/jslrvp/Makefile.inc
rename to src/mainboard/intel/jasperlake_rvp/variants/jslrvp/Makefile.mk
diff --git a/src/mainboard/intel/kblrvp/Makefile.inc b/src/mainboard/intel/kblrvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/kblrvp/Makefile.inc
rename to src/mainboard/intel/kblrvp/Makefile.mk
diff --git a/src/mainboard/intel/kblrvp/spd/Makefile.inc b/src/mainboard/intel/kblrvp/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/kblrvp/spd/Makefile.inc
rename to src/mainboard/intel/kblrvp/spd/Makefile.mk
diff --git a/src/mainboard/intel/kunimitsu/Makefile.inc b/src/mainboard/intel/kunimitsu/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/kunimitsu/Makefile.inc
rename to src/mainboard/intel/kunimitsu/Makefile.mk
diff --git a/src/mainboard/intel/kunimitsu/spd/Makefile.inc b/src/mainboard/intel/kunimitsu/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/kunimitsu/spd/Makefile.inc
rename to src/mainboard/intel/kunimitsu/spd/Makefile.mk
diff --git a/src/mainboard/intel/leafhill/Makefile.inc b/src/mainboard/intel/leafhill/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/leafhill/Makefile.inc
rename to src/mainboard/intel/leafhill/Makefile.mk
diff --git a/src/mainboard/intel/minnow3/Makefile.inc b/src/mainboard/intel/minnow3/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/minnow3/Makefile.inc
rename to src/mainboard/intel/minnow3/Makefile.mk
diff --git a/src/mainboard/intel/mtlrvp/Makefile.inc b/src/mainboard/intel/mtlrvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/mtlrvp/Makefile.inc
rename to src/mainboard/intel/mtlrvp/Makefile.mk
diff --git a/src/mainboard/intel/mtlrvp/spd/Makefile.inc b/src/mainboard/intel/mtlrvp/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/mtlrvp/spd/Makefile.inc
rename to src/mainboard/intel/mtlrvp/spd/Makefile.mk
diff --git a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/Makefile.inc b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/Makefile.inc
rename to src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/Makefile.mk
diff --git a/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/memory/Makefile.inc b/src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/memory/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/memory/Makefile.inc
rename to src/mainboard/intel/mtlrvp/variants/baseboard/mtlrvp_p/memory/Makefile.mk
diff --git a/src/mainboard/intel/saddlebrook/Makefile.inc b/src/mainboard/intel/saddlebrook/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/saddlebrook/Makefile.inc
rename to src/mainboard/intel/saddlebrook/Makefile.mk
diff --git a/src/mainboard/intel/saddlebrook/spd/Makefile.inc b/src/mainboard/intel/saddlebrook/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/saddlebrook/spd/Makefile.inc
rename to src/mainboard/intel/saddlebrook/spd/Makefile.mk
diff --git a/src/mainboard/intel/shadowmountain/Makefile.inc b/src/mainboard/intel/shadowmountain/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/shadowmountain/Makefile.inc
rename to src/mainboard/intel/shadowmountain/Makefile.mk
diff --git a/src/mainboard/intel/shadowmountain/spd/Makefile.inc b/src/mainboard/intel/shadowmountain/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/shadowmountain/spd/Makefile.inc
rename to src/mainboard/intel/shadowmountain/spd/Makefile.mk
diff --git a/src/mainboard/intel/shadowmountain/variants/baseboard/Makefile.inc b/src/mainboard/intel/shadowmountain/variants/baseboard/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/shadowmountain/variants/baseboard/Makefile.inc
rename to src/mainboard/intel/shadowmountain/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/strago/Makefile.inc
rename to src/mainboard/intel/strago/Makefile.mk
diff --git a/src/mainboard/intel/tglrvp/Makefile.inc b/src/mainboard/intel/tglrvp/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/tglrvp/Makefile.inc
rename to src/mainboard/intel/tglrvp/Makefile.mk
diff --git a/src/mainboard/intel/tglrvp/spd/Makefile.inc b/src/mainboard/intel/tglrvp/spd/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/tglrvp/spd/Makefile.inc
rename to src/mainboard/intel/tglrvp/spd/Makefile.mk
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/Makefile.inc b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/tglrvp/variants/tglrvp_up3/Makefile.inc
rename to src/mainboard/intel/tglrvp/variants/tglrvp_up3/Makefile.mk
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up4/Makefile.inc b/src/mainboard/intel/tglrvp/variants/tglrvp_up4/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/tglrvp/variants/tglrvp_up4/Makefile.inc
rename to src/mainboard/intel/tglrvp/variants/tglrvp_up4/Makefile.mk
diff --git a/src/mainboard/intel/wtm2/Makefile.inc b/src/mainboard/intel/wtm2/Makefile.mk
similarity index 100%
rename from src/mainboard/intel/wtm2/Makefile.inc
rename to src/mainboard/intel/wtm2/Makefile.mk
diff --git a/src/mainboard/inventec/transformers/Makefile.inc b/src/mainboard/inventec/transformers/Makefile.mk
similarity index 100%
rename from src/mainboard/inventec/transformers/Makefile.inc
rename to src/mainboard/inventec/transformers/Makefile.mk
diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.mk
similarity index 100%
rename from src/mainboard/kontron/986lcd-m/Makefile.inc
rename to src/mainboard/kontron/986lcd-m/Makefile.mk
diff --git a/src/mainboard/kontron/bsl6/Makefile.inc b/src/mainboard/kontron/bsl6/Makefile.mk
similarity index 100%
rename from src/mainboard/kontron/bsl6/Makefile.inc
rename to src/mainboard/kontron/bsl6/Makefile.mk
diff --git a/src/mainboard/kontron/ktqm77/Makefile.inc b/src/mainboard/kontron/ktqm77/Makefile.mk
similarity index 100%
rename from src/mainboard/kontron/ktqm77/Makefile.inc
rename to src/mainboard/kontron/ktqm77/Makefile.mk
diff --git a/src/mainboard/kontron/mal10/Makefile.inc b/src/mainboard/kontron/mal10/Makefile.mk
similarity index 100%
rename from src/mainboard/kontron/mal10/Makefile.inc
rename to src/mainboard/kontron/mal10/Makefile.mk
diff --git a/src/mainboard/kontron/mal10/carriers/t10-tni/Makefile.inc b/src/mainboard/kontron/mal10/carriers/t10-tni/Makefile.mk
similarity index 100%
rename from src/mainboard/kontron/mal10/carriers/t10-tni/Makefile.inc
rename to src/mainboard/kontron/mal10/carriers/t10-tni/Makefile.mk
diff --git a/src/mainboard/kontron/mal10/variants/mal10/Makefile.inc b/src/mainboard/kontron/mal10/variants/mal10/Makefile.mk
similarity index 100%
rename from src/mainboard/kontron/mal10/variants/mal10/Makefile.inc
rename to src/mainboard/kontron/mal10/variants/mal10/Makefile.mk