diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index 45cd42bac37..d1a15e75fcc 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_ARMV7A),y)          # ARMv7-A
diff --git a/arch/arm64/src/Makefile b/arch/arm64/src/Makefile
index 3be44f834c3..c90cb221e0d 100644
--- a/arch/arm64/src/Makefile
+++ b/arch/arm64/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 22d5465791f..da50e27beea 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
diff --git a/arch/ceva/src/Makefile b/arch/ceva/src/Makefile
index a4518d1768e..cd0c91c132e 100644
--- a/arch/ceva/src/Makefile
+++ b/arch/ceva/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 -include chip$(DELIM)Make.defs
 
 ifeq ($(CONFIG_ARCH_XC5),y)
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 3d08b1704d5..607b1f72195 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_HC12),y)
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 67437f36a7c..722e4c272f0 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_MIPS),y)
diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile
index 172fa557220..6773d6e8cd2 100644
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_CHIP_LM32),y)
diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile
index d0210d1a159..48fcd3ff5ee 100644
--- a/arch/or1k/src/Makefile
+++ b/arch/or1k/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_MOR1KX),y)          # OpenRISC mor1kx
diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile
index 4f7501986e7..13cbc84940a 100644
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index 76ffe125aad..bb1272d7755 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 ifeq ($(CONFIG_OPENSBI),y)
 include opensbi/Make.defs
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 073bfd2983a..81dc2b310bd 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
 
diff --git a/arch/sparc/src/Makefile b/arch/sparc/src/Makefile
index 6bb3050ce72..a6af15bc327 100644
--- a/arch/sparc/src/Makefile
+++ b/arch/sparc/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 -include chip/Make.defs
 
 ARCH_SUBDIR = sparc_v8
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index 176bf7ceb79..76e5b1abfbf 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_I486),y)
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index b37f96f679d..0c97c4bc6bf 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_INTEL64),y)
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index f4d7c3a8027..ec83edd9b89 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_FAMILY_LX6),y)
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index e1fcce7738d..3456da90662 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 COMPILER = ${shell basename "$(CC)"}
diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile
index b99edba0e25..3fe81ea10e1 100644
--- a/arch/z80/src/Makefile
+++ b/arch/z80/src/Makefile
@@ -20,7 +20,7 @@
 
 # Makefile fragments
 
-include $(TOPDIR)/Make.defs
+include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
 include chip/Make.defs
 
 # Compiler-Dependent Make:  SDCC, Clang, or ZiLOG ZDS-II