diff --git a/src/arch/arm/include/arch/memlayout.h b/src/arch/arm/include/arch/memlayout.h
index 1395e82bc7..408443f1ba 100644
--- a/src/arch/arm/include/arch/memlayout.h
+++ b/src/arch/arm/include/arch/memlayout.h
@@ -20,7 +20,7 @@
 /* ARM stacks need 8-byte alignment and stay in one place through ramstage. */
 #define STACK(addr, size) \
 	REGION(stack, addr, size, 8) \
-	_ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.inc");
+	_ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.mk");
 
 #define DMA_COHERENT(addr, size) \
 	REGION(dma_coherent, addr, size, SUPERPAGE_SIZE) \
diff --git a/src/arch/arm64/include/arch/memlayout.h b/src/arch/arm64/include/arch/memlayout.h
index a04033dfd1..69e4731a12 100644
--- a/src/arch/arm64/include/arch/memlayout.h
+++ b/src/arch/arm64/include/arch/memlayout.h
@@ -22,7 +22,7 @@
 /* ARM64 stacks need 16-byte alignment. */
 #define STACK(addr, size) \
 	REGION(stack, addr, size, 16) \
-	_ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.inc");
+	_ = ASSERT(size >= 2K, "stack should be >= 2K, see toolchain.mk");
 
 #define BL31(addr, size) \
 	REGION(bl31, addr, size, 4K) \
diff --git a/src/include/rules.h b/src/include/rules.h
index 17ef198932..04b0a8229e 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -156,7 +156,7 @@
 #define ENV_STRING "UNKNOWN"
 #endif
 
-/* Define helpers about the current architecture, based on toolchain.inc. */
+/* Define helpers about the current architecture, based on toolchain.mk. */
 
 #if defined(__ARCH_arm__)
 #define ENV_ARM 1
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index 4dd02600ab..b4e50f079b 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -12,7 +12,7 @@ LINTDIR="$(
 . "${LINTDIR}/helper_functions.sh"
 
 EXCLUDELIST='^src/vendorcode/|^util/kconfig/|^util/nvidia/cbootimage|^util/goswid|__pycache__|COPYING|LICENSE|README|_shipped$|\.patch$|\.bin$|\.hex$|\.jpg$|\.gif$|\.ttf$|\.woff$|\.png$|\.eot$|\.vbt$|\.ico$|\.md$|\.apcb$'
-INCLUDELIST="src util payloads Makefile* toolchain.inc tests"
+INCLUDELIST="src util payloads Makefile* toolchain.mk tests"
 
 # shellcheck disable=SC2086,SC2046
 if uname | grep -qi "linux"; then