diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.mk
similarity index 100%
rename from payloads/external/Makefile.inc
rename to payloads/external/Makefile.mk
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 212e67e..71d60bc 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -56,7 +56,7 @@
 export KBUILD_KCONFIG := Kconfig
 export CONFIG_ := CONFIG_LP_
 
-# directory containing the toplevel Makefile.inc
+# directory containing the toplevel Makefile.mk
 TOPLEVEL := .
 
 CONFIG_LP_SHELL := sh
@@ -159,8 +159,8 @@
 	\mv -f $@.tmp $@ 2> /dev/null
 
 ifeq ($(NOCOMPILE),1)
-include $(TOPLEVEL)/Makefile.inc
-include $(TOPLEVEL)/tests/Makefile.inc
+include $(TOPLEVEL)/Makefile.mk
+include $(TOPLEVEL)/tests/Makefile.mk
 real-all: config
 
 else
@@ -285,7 +285,7 @@
 	$(eval $(1):=) \
 	$(eval special-classes+=$(1))
 
-# Clean -y variables, include Makefile.inc
+# Clean -y variables, include Makefile.mk
 # Add paths to files in X-y to X-srcs
 # Add subdirs-y to subdirs
 includemakefiles= \
@@ -308,7 +308,7 @@
 	$(eval cursubdirs:=$(subdirs)) \
 	$(eval subdirs:=) \
 	$(foreach dir,$(cursubdirs), \
-		$(eval $(call includemakefiles,$(dir)/Makefile.inc))) \
+		$(eval $(call includemakefiles,$(dir)/Makefile.mk))) \
 	$(if $(subdirs),$(eval $(call evaluate_subdirs)))
 
 # collect all object files eligible for building or run unit-tests
@@ -316,7 +316,7 @@
 subdirs:=$(TOPLEVEL)
 $(eval $(call evaluate_subdirs))
 else
-include $(TOPLEVEL)/tests/Makefile.inc
+include $(TOPLEVEL)/tests/Makefile.mk
 endif
 
 # Converts one or more source file paths to the corresponding build/ paths.
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.mk
similarity index 100%
rename from payloads/libpayload/Makefile.inc
rename to payloads/libpayload/Makefile.mk
diff --git a/payloads/libpayload/arch/arm/Makefile.inc b/payloads/libpayload/arch/arm/Makefile.mk
similarity index 100%
rename from payloads/libpayload/arch/arm/Makefile.inc
rename to payloads/libpayload/arch/arm/Makefile.mk
diff --git a/payloads/libpayload/arch/arm64/Makefile.inc b/payloads/libpayload/arch/arm64/Makefile.mk
similarity index 100%
rename from payloads/libpayload/arch/arm64/Makefile.inc
rename to payloads/libpayload/arch/arm64/Makefile.mk
diff --git a/payloads/libpayload/arch/mock/Makefile.inc b/payloads/libpayload/arch/mock/Makefile.mk
similarity index 100%
rename from payloads/libpayload/arch/mock/Makefile.inc
rename to payloads/libpayload/arch/mock/Makefile.mk
diff --git a/payloads/libpayload/arch/x86/Makefile.inc b/payloads/libpayload/arch/x86/Makefile.mk
similarity index 100%
rename from payloads/libpayload/arch/x86/Makefile.inc
rename to payloads/libpayload/arch/x86/Makefile.mk
diff --git a/payloads/libpayload/crypto/Makefile.inc b/payloads/libpayload/crypto/Makefile.mk
similarity index 100%
rename from payloads/libpayload/crypto/Makefile.inc
rename to payloads/libpayload/crypto/Makefile.mk
diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.mk
similarity index 100%
rename from payloads/libpayload/curses/Makefile.inc
rename to payloads/libpayload/curses/Makefile.mk
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.mk
similarity index 100%
rename from payloads/libpayload/drivers/Makefile.inc
rename to payloads/libpayload/drivers/Makefile.mk
diff --git a/payloads/libpayload/gdb/Makefile.inc b/payloads/libpayload/gdb/Makefile.mk
similarity index 100%
rename from payloads/libpayload/gdb/Makefile.inc
rename to payloads/libpayload/gdb/Makefile.mk
diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.mk
similarity index 100%
rename from payloads/libpayload/libc/Makefile.inc
rename to payloads/libpayload/libc/Makefile.mk
diff --git a/payloads/libpayload/libcbfs/Makefile.inc b/payloads/libpayload/libcbfs/Makefile.mk
similarity index 100%
rename from payloads/libpayload/libcbfs/Makefile.inc
rename to payloads/libpayload/libcbfs/Makefile.mk
diff --git a/payloads/libpayload/liblz4/Makefile.inc b/payloads/libpayload/liblz4/Makefile.mk
similarity index 100%
rename from payloads/libpayload/liblz4/Makefile.inc
rename to payloads/libpayload/liblz4/Makefile.mk
diff --git a/payloads/libpayload/liblzma/Makefile.inc b/payloads/libpayload/liblzma/Makefile.mk
similarity index 100%
rename from payloads/libpayload/liblzma/Makefile.inc
rename to payloads/libpayload/liblzma/Makefile.mk
diff --git a/payloads/libpayload/libpci/Makefile.inc b/payloads/libpayload/libpci/Makefile.mk
similarity index 100%
rename from payloads/libpayload/libpci/Makefile.inc
rename to payloads/libpayload/libpci/Makefile.mk
diff --git a/payloads/libpayload/tests/Makefile.inc b/payloads/libpayload/tests/Makefile.mk
similarity index 98%
rename from payloads/libpayload/tests/Makefile.inc
rename to payloads/libpayload/tests/Makefile.mk
index dede340..e271a7c 100644
--- a/payloads/libpayload/tests/Makefile.inc
+++ b/payloads/libpayload/tests/Makefile.mk
@@ -105,7 +105,7 @@
 $(1)-config-file := $(testobj)/$(1)/libpayload-config.h
 $$($(1)-config-file): $(TEST_KCONFIG_AUTOHEADER)
 	mkdir -p $$(dir $$@);
-	printf '// File generated by tests/Makefile.inc\n// Do not change\n' > $$@;
+	printf '// File generated by tests/Makefile.mk\n// Do not change\n' > $$@;
 	printf '#ifndef TEST_LIBPAYLOAD_CONFIG_H_\n' >> $$@;
 	printf '#define TEST_LIBPAYLOAD_CONFIG_H_\n' >> $$@;
 	printf '#include <%s>\n\n' "$(notdir $(TEST_KCONFIG_AUTOHEADER))" >> $$@;
diff --git a/payloads/libpayload/tests/drivers/Makefile.inc b/payloads/libpayload/tests/drivers/Makefile.mk
similarity index 100%
rename from payloads/libpayload/tests/drivers/Makefile.inc
rename to payloads/libpayload/tests/drivers/Makefile.mk
diff --git a/payloads/libpayload/tests/libc/Makefile.inc b/payloads/libpayload/tests/libc/Makefile.mk
similarity index 100%
rename from payloads/libpayload/tests/libc/Makefile.inc
rename to payloads/libpayload/tests/libc/Makefile.mk
diff --git a/payloads/libpayload/tests/libcbfs/Makefile.inc b/payloads/libpayload/tests/libcbfs/Makefile.mk
similarity index 100%
rename from payloads/libpayload/tests/libcbfs/Makefile.inc
rename to payloads/libpayload/tests/libcbfs/Makefile.mk
diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.mk
similarity index 100%
rename from payloads/libpayload/vboot/Makefile.inc
rename to payloads/libpayload/vboot/Makefile.mk
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint
index e64cf11..43b1630 100755
--- a/util/lint/kconfig_lint
+++ b/util/lint/kconfig_lint
@@ -36,7 +36,7 @@
   '^build/\|^coreboot-builds/\|^configs/\|^util/\|^\.git/\|^payloads\|^Documentation\|^3rdparty'
   . '\|' .                            # directories to exclude when searching for used symbols
   '\.config\|\.txt$\|\.tex$\|\.tags\|/kconfig.h\|\.fmd'; #files to exclude when looking for symbols
-my $payload_files_to_check='payloads/Makefile.mk payloads/external/Makefile.inc';
+my $payload_files_to_check='payloads/Makefile.mk payloads/external/Makefile.mk';
 my $config_file = "";                 # name of config file to load symbol values from.
 my @wholeconfig;                      # document the entire kconfig structure
 my %loaded_files;                     # list of each Kconfig file loaded