19 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.mk b/Makefile.mk
index 87c6bcb247..f7b98c7c8d 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -768,7 +768,7 @@ gitconfig:
 install-git-commit-clangfmt:
 	cp util/scripts/prepare-commit-msg.clang-format .git/hooks/prepare-commit-msg
 
-include util/crossgcc/Makefile.inc
+include util/crossgcc/Makefile.mk
 
 .PHONY: tools
 tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD)
diff --git a/util/amdfwtool/Makefile.inc b/util/amdfwtool/Makefile.mk
index 6a83cb9265..6a83cb9265 100644
--- a/util/amdfwtool/Makefile.inc
+++ b/util/amdfwtool/Makefile.mk
diff --git a/util/bincfg/Makefile.inc b/util/bincfg/Makefile.mk
index 0f5f442fd1..0f5f442fd1 100644
--- a/util/bincfg/Makefile.inc
+++ b/util/bincfg/Makefile.mk
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 034aca26a6..8dde77ba52 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -91,7 +91,7 @@ ifneq ($(V),1)
 .SILENT:
 endif
 
-include Makefile.inc
+include Makefile.mk
 
 $(objutil)/cbfstool/cbfstool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h
 $(objutil)/cbfstool/elogtool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.mk
index 80aab6720d..8577874044 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.mk
@@ -98,14 +98,14 @@ elogobj += elog.o
 elogobj += common.o
 elogobj += flashrom.o
 
-include $(top)/util/cbfstool/fpt_formats/Makefile.inc
+include $(top)/util/cbfstool/fpt_formats/Makefile.mk
 cse_fpt_obj :=
 cse_fpt_obj += cse_fpt.o
 cse_fpt_obj += common.o
 cse_fpt_obj += cse_helpers.o
 cse_fpt_obj += $(foreach var, $(fpt_formats_obj), $(var))
 
-include $(top)/util/cbfstool/bpdt_formats/Makefile.inc
+include $(top)/util/cbfstool/bpdt_formats/Makefile.mk
 cse_serger_obj :=
 cse_serger_obj += cse_serger.o
 cse_serger_obj += common.o
diff --git a/util/cbfstool/bpdt_formats/Makefile.inc b/util/cbfstool/bpdt_formats/Makefile.mk
index a3be46be5d..a3be46be5d 100644
--- a/util/cbfstool/bpdt_formats/Makefile.inc
+++ b/util/cbfstool/bpdt_formats/Makefile.mk
diff --git a/util/cbfstool/fpt_formats/Makefile.inc b/util/cbfstool/fpt_formats/Makefile.mk
index 11cb30d274..11cb30d274 100644
--- a/util/cbfstool/fpt_formats/Makefile.inc
+++ b/util/cbfstool/fpt_formats/Makefile.mk
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.mk
index 8a4f3c53a2..8a4f3c53a2 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.mk
diff --git a/util/futility/Makefile b/util/futility/Makefile
index 6901948fa0..14d5f8204c 100644
--- a/util/futility/Makefile
+++ b/util/futility/Makefile
@@ -23,4 +23,4 @@ ifneq ($(Q),)
 endif
 endif
 
-include Makefile.inc
+include Makefile.mk
diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.mk
index a7bcee50d3..a7bcee50d3 100644
--- a/util/futility/Makefile.inc
+++ b/util/futility/Makefile.mk
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index c0210693d8..72a4dabe5c 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -10,7 +10,7 @@ HOSTCC ?= $(CC)
 HOSTCFLAGS ?= $(CFLAGS)
 top := ../..
 objutil := ..
-include Makefile.inc
+include Makefile.mk
 
 PROGRAM=$(objutil)/ifdtool/ifdtool
 
diff --git a/util/ifdtool/Makefile.inc b/util/ifdtool/Makefile.mk
index 2b97bf51c8..2b97bf51c8 100644
--- a/util/ifdtool/Makefile.inc
+++ b/util/ifdtool/Makefile.mk
diff --git a/util/marvell/Makefile.inc b/util/marvell/Makefile.mk
index d58c9d83ba..d58c9d83ba 100644
--- a/util/marvell/Makefile.inc
+++ b/util/marvell/Makefile.mk
diff --git a/util/marvell/doimage_mv/Makefile.inc b/util/marvell/doimage_mv/Makefile.mk
index 3f4f528abd..3f4f528abd 100644
--- a/util/marvell/doimage_mv/Makefile.inc
+++ b/util/marvell/doimage_mv/Makefile.mk
diff --git a/util/nvidia/Makefile.inc b/util/nvidia/Makefile.mk
index 04199d062e..04199d062e 100644
--- a/util/nvidia/Makefile.inc
+++ b/util/nvidia/Makefile.mk
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.mk
index 00e5efa995..00e5efa995 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.mk
diff --git a/util/qemu/Makefile.inc b/util/qemu/Makefile.mk
index e1181ade73..077fde772d 100644
--- a/util/qemu/Makefile.inc
+++ b/util/qemu/Makefile.mk
@@ -2,10 +2,10 @@
 
 # This automatically adds a `qemu` make target if a compatible
 # configuration is selected. There are some notable variables
-# that can be set or adapted in `Makefile.inc` files, the make
+# that can be set or adapted in `Makefile.mk` files, the make
 # command line or the environment:
 #
-# Primarily for `Makefile.inc` use:
+# Primarily for `Makefile.mk` use:
 # QEMU-y		the QEMU executable
 # QEMU_CFG-y		a QEMU config that sets the available default devices,
 #			used to run more comprehensive tests by default,
diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.mk
index c3da29d199..c3da29d199 100644
--- a/util/sconfig/Makefile.inc
+++ b/util/sconfig/Makefile.mk
diff --git a/util/supermicro/Makefile.inc b/util/supermicro/Makefile.mk
index 7d295a0205..7d295a0205 100644
--- a/util/supermicro/Makefile.inc
+++ b/util/supermicro/Makefile.mk