diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.mk
similarity index 100%
rename from src/cpu/Makefile.inc
rename to src/cpu/Makefile.mk
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.mk
similarity index 100%
rename from src/cpu/amd/Makefile.inc
rename to src/cpu/amd/Makefile.mk
diff --git a/src/cpu/amd/mtrr/Makefile.inc b/src/cpu/amd/mtrr/Makefile.mk
similarity index 100%
rename from src/cpu/amd/mtrr/Makefile.inc
rename to src/cpu/amd/mtrr/Makefile.mk
diff --git a/src/cpu/amd/pi/00730F01/Makefile.inc b/src/cpu/amd/pi/00730F01/Makefile.mk
similarity index 100%
rename from src/cpu/amd/pi/00730F01/Makefile.inc
rename to src/cpu/amd/pi/00730F01/Makefile.mk
diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.mk
similarity index 100%
rename from src/cpu/amd/pi/Makefile.inc
rename to src/cpu/amd/pi/Makefile.mk
diff --git a/src/cpu/armltd/Makefile.inc b/src/cpu/armltd/Makefile.mk
similarity index 100%
rename from src/cpu/armltd/Makefile.inc
rename to src/cpu/armltd/Makefile.mk
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.mk
similarity index 92%
rename from src/cpu/intel/Makefile.inc
rename to src/cpu/intel/Makefile.mk
index dc0bc53773..bc8f5375c1 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.mk
@@ -3,7 +3,7 @@
 # Note: From here on down, we are socket-centric. Socket choice determines
 # what other CPU files are included.
 #
-# Therefore: ONLY include Makefile.inc from socket directories!
+# Therefore: ONLY include Makefiles from socket directories!
 
 subdirs-$(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE) += fit
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441
diff --git a/src/cpu/intel/common/Makefile.inc b/src/cpu/intel/common/Makefile.mk
similarity index 100%
rename from src/cpu/intel/common/Makefile.inc
rename to src/cpu/intel/common/Makefile.mk
diff --git a/src/cpu/intel/fit/Makefile.inc b/src/cpu/intel/fit/Makefile.mk
similarity index 100%
rename from src/cpu/intel/fit/Makefile.inc
rename to src/cpu/intel/fit/Makefile.mk
diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.mk
similarity index 100%
rename from src/cpu/intel/haswell/Makefile.inc
rename to src/cpu/intel/haswell/Makefile.mk
diff --git a/src/cpu/intel/microcode/Makefile.inc b/src/cpu/intel/microcode/Makefile.mk
similarity index 100%
rename from src/cpu/intel/microcode/Makefile.inc
rename to src/cpu/intel/microcode/Makefile.mk
diff --git a/src/cpu/intel/model_1067x/Makefile.inc b/src/cpu/intel/model_1067x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_1067x/Makefile.inc
rename to src/cpu/intel/model_1067x/Makefile.mk
diff --git a/src/cpu/intel/model_106cx/Makefile.inc b/src/cpu/intel/model_106cx/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_106cx/Makefile.inc
rename to src/cpu/intel/model_106cx/Makefile.mk
diff --git a/src/cpu/intel/model_2065x/Makefile.inc b/src/cpu/intel/model_2065x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_2065x/Makefile.inc
rename to src/cpu/intel/model_2065x/Makefile.mk
diff --git a/src/cpu/intel/model_206ax/Makefile.inc b/src/cpu/intel/model_206ax/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_206ax/Makefile.inc
rename to src/cpu/intel/model_206ax/Makefile.mk
diff --git a/src/cpu/intel/model_65x/Makefile.inc b/src/cpu/intel/model_65x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_65x/Makefile.inc
rename to src/cpu/intel/model_65x/Makefile.mk
diff --git a/src/cpu/intel/model_67x/Makefile.inc b/src/cpu/intel/model_67x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_67x/Makefile.inc
rename to src/cpu/intel/model_67x/Makefile.mk
diff --git a/src/cpu/intel/model_68x/Makefile.inc b/src/cpu/intel/model_68x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_68x/Makefile.inc
rename to src/cpu/intel/model_68x/Makefile.mk
diff --git a/src/cpu/intel/model_6bx/Makefile.inc b/src/cpu/intel/model_6bx/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_6bx/Makefile.inc
rename to src/cpu/intel/model_6bx/Makefile.mk
diff --git a/src/cpu/intel/model_6ex/Makefile.inc b/src/cpu/intel/model_6ex/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_6ex/Makefile.inc
rename to src/cpu/intel/model_6ex/Makefile.mk
diff --git a/src/cpu/intel/model_6fx/Makefile.inc b/src/cpu/intel/model_6fx/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_6fx/Makefile.inc
rename to src/cpu/intel/model_6fx/Makefile.mk
diff --git a/src/cpu/intel/model_6xx/Makefile.inc b/src/cpu/intel/model_6xx/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_6xx/Makefile.inc
rename to src/cpu/intel/model_6xx/Makefile.mk
diff --git a/src/cpu/intel/model_f2x/Makefile.inc b/src/cpu/intel/model_f2x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_f2x/Makefile.inc
rename to src/cpu/intel/model_f2x/Makefile.mk
diff --git a/src/cpu/intel/model_f3x/Makefile.inc b/src/cpu/intel/model_f3x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_f3x/Makefile.inc
rename to src/cpu/intel/model_f3x/Makefile.mk
diff --git a/src/cpu/intel/model_f4x/Makefile.inc b/src/cpu/intel/model_f4x/Makefile.mk
similarity index 100%
rename from src/cpu/intel/model_f4x/Makefile.inc
rename to src/cpu/intel/model_f4x/Makefile.mk
diff --git a/src/cpu/intel/slot_1/Makefile.inc b/src/cpu/intel/slot_1/Makefile.mk
similarity index 100%
rename from src/cpu/intel/slot_1/Makefile.inc
rename to src/cpu/intel/slot_1/Makefile.mk
diff --git a/src/cpu/intel/smm/Makefile.inc b/src/cpu/intel/smm/Makefile.mk
similarity index 100%
rename from src/cpu/intel/smm/Makefile.inc
rename to src/cpu/intel/smm/Makefile.mk
diff --git a/src/cpu/intel/smm/gen1/Makefile.inc b/src/cpu/intel/smm/gen1/Makefile.mk
similarity index 100%
rename from src/cpu/intel/smm/gen1/Makefile.inc
rename to src/cpu/intel/smm/gen1/Makefile.mk
diff --git a/src/cpu/intel/socket_441/Makefile.inc b/src/cpu/intel/socket_441/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_441/Makefile.inc
rename to src/cpu/intel/socket_441/Makefile.mk
diff --git a/src/cpu/intel/socket_BGA956/Makefile.inc b/src/cpu/intel/socket_BGA956/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_BGA956/Makefile.inc
rename to src/cpu/intel/socket_BGA956/Makefile.mk
diff --git a/src/cpu/intel/socket_FCBGA559/Makefile.inc b/src/cpu/intel/socket_FCBGA559/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_FCBGA559/Makefile.inc
rename to src/cpu/intel/socket_FCBGA559/Makefile.mk
diff --git a/src/cpu/intel/socket_LGA775/Makefile.inc b/src/cpu/intel/socket_LGA775/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_LGA775/Makefile.inc
rename to src/cpu/intel/socket_LGA775/Makefile.mk
diff --git a/src/cpu/intel/socket_m/Makefile.inc b/src/cpu/intel/socket_m/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_m/Makefile.inc
rename to src/cpu/intel/socket_m/Makefile.mk
diff --git a/src/cpu/intel/socket_mPGA604/Makefile.inc b/src/cpu/intel/socket_mPGA604/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_mPGA604/Makefile.inc
rename to src/cpu/intel/socket_mPGA604/Makefile.mk
diff --git a/src/cpu/intel/socket_p/Makefile.inc b/src/cpu/intel/socket_p/Makefile.mk
similarity index 100%
rename from src/cpu/intel/socket_p/Makefile.inc
rename to src/cpu/intel/socket_p/Makefile.mk
diff --git a/src/cpu/intel/speedstep/Makefile.inc b/src/cpu/intel/speedstep/Makefile.mk
similarity index 100%
rename from src/cpu/intel/speedstep/Makefile.inc
rename to src/cpu/intel/speedstep/Makefile.mk
diff --git a/src/cpu/intel/turbo/Makefile.inc b/src/cpu/intel/turbo/Makefile.mk
similarity index 100%
rename from src/cpu/intel/turbo/Makefile.inc
rename to src/cpu/intel/turbo/Makefile.mk
diff --git a/src/cpu/power9/Makefile.inc b/src/cpu/power9/Makefile.mk
similarity index 100%
rename from src/cpu/power9/Makefile.inc
rename to src/cpu/power9/Makefile.mk
diff --git a/src/cpu/qemu-power8/Makefile.inc b/src/cpu/qemu-power8/Makefile.mk
similarity index 100%
rename from src/cpu/qemu-power8/Makefile.inc
rename to src/cpu/qemu-power8/Makefile.mk
diff --git a/src/cpu/qemu-x86/Makefile.inc b/src/cpu/qemu-x86/Makefile.mk
similarity index 100%
rename from src/cpu/qemu-x86/Makefile.inc
rename to src/cpu/qemu-x86/Makefile.mk
diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.mk
similarity index 100%
rename from src/cpu/x86/64bit/Makefile.inc
rename to src/cpu/x86/64bit/Makefile.mk
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.mk
similarity index 100%
rename from src/cpu/x86/Makefile.inc
rename to src/cpu/x86/Makefile.mk
diff --git a/src/cpu/x86/cache/Makefile.inc b/src/cpu/x86/cache/Makefile.mk
similarity index 100%
rename from src/cpu/x86/cache/Makefile.inc
rename to src/cpu/x86/cache/Makefile.mk
diff --git a/src/cpu/x86/lapic/Makefile.inc b/src/cpu/x86/lapic/Makefile.mk
similarity index 100%
rename from src/cpu/x86/lapic/Makefile.inc
rename to src/cpu/x86/lapic/Makefile.mk
diff --git a/src/cpu/x86/mtrr/Makefile.inc b/src/cpu/x86/mtrr/Makefile.mk
similarity index 100%
rename from src/cpu/x86/mtrr/Makefile.inc
rename to src/cpu/x86/mtrr/Makefile.mk
diff --git a/src/cpu/x86/name/Makefile.inc b/src/cpu/x86/name/Makefile.mk
similarity index 100%
rename from src/cpu/x86/name/Makefile.inc
rename to src/cpu/x86/name/Makefile.mk
diff --git a/src/cpu/x86/pae/Makefile.inc b/src/cpu/x86/pae/Makefile.mk
similarity index 100%
rename from src/cpu/x86/pae/Makefile.inc
rename to src/cpu/x86/pae/Makefile.mk
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.mk
similarity index 100%
rename from src/cpu/x86/smm/Makefile.inc
rename to src/cpu/x86/smm/Makefile.mk
diff --git a/src/cpu/x86/tsc/Makefile.inc b/src/cpu/x86/tsc/Makefile.mk
similarity index 100%
rename from src/cpu/x86/tsc/Makefile.inc
rename to src/cpu/x86/tsc/Makefile.mk