diff --git a/arch/8051/src/Makefile b/arch/8051/src/Makefile
index 4772834d9cc..6c87b8bc96f 100644
--- a/arch/8051/src/Makefile
+++ b/arch/8051/src/Makefile
@@ -221,13 +221,15 @@ clean:
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	$(Q) rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
+	$(call DELFILE up_mem.h)
 	$(call CLEAN)
 
 distclean: clean
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \
 	fi
-	rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index a48d18799ba..a6d5fa4f466 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -178,13 +178,14 @@ clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 462968ed53c..69d3a0fc040 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -171,14 +171,15 @@ clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 0ada6c4c2c2..7353b44ea5c 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -166,13 +166,14 @@ clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 057b95d220e..b27fe8730a9 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -164,13 +164,14 @@ clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/rgmp/src/Makefile b/arch/rgmp/src/Makefile
index 7650a0a942a..019dca4658b 100644
--- a/arch/rgmp/src/Makefile
+++ b/arch/rgmp/src/Makefile
@@ -96,12 +96,14 @@ export_head:
 depend: .depend
 
 clean:
-	@rm -f $(TOPDIR)/arch/rgmp/src/x86/*.o
-	@rm -f $(TOPDIR)/kernel.img nuttx.img 
-	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE "$(TOPDIR)/arch/rgmp/src/x86/*.o")
+	$(call DELFILE "$(TOPDIR)/kernel.img")
+	$(call DELFILE nuttx.img)
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/sh/src/Makefile b/arch/sh/src/Makefile
index 132ca4610ed..af7c481a909 100644
--- a/arch/sh/src/Makefile
+++ b/arch/sh/src/Makefile
@@ -161,13 +161,14 @@ clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index a5d6100a3f3..5abd6ce4f0f 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -214,14 +214,16 @@ clean: cleanrel
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	$(Q) rm -f nuttx.rel libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE nuttx.rel)
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 	$(Q) rm -rf GNU
 
 -include Make.dep
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index 19193709cc9..e93dc2657c6 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -172,13 +172,14 @@ clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 44f96d03d4c..d3f58199896 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -137,16 +137,20 @@ clean:
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 ifeq ($(COMPILER),zneocc.exe)
-	$(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map
+	$(call DELFILE nuttx.linkcmd)
+	$(call DELFILE *.asm)
+	$(call DELFILE *.tmp)
+	$(call DELFILE *.map)
 endif
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/z80/src/Makefile.sdcc b/arch/z80/src/Makefile.sdcc
index 7c9f45a6c7c..e29fa9fda8e 100644
--- a/arch/z80/src/Makefile.sdcc
+++ b/arch/z80/src/Makefile.sdcc
@@ -240,13 +240,19 @@ clean:
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	$(Q) rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp
+	$(call DELFILE up_mem.h)
+	$(call DELFILE asm_mem.h)
+	$(call DELFILE pass1.*)
+	$(call DELFILE nuttx.*)
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
+
 distclean: clean
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii
index 666af89452c..1d7b1f96d17 100644
--- a/arch/z80/src/Makefile.zdsii
+++ b/arch/z80/src/Makefile.zdsii
@@ -150,14 +150,18 @@ clean:
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
-	$(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map
+	$(call DELFILE nuttx.linkcmd)
+	$(call DELFILE *.asm)
+	$(call DELFILE *.tmp)
+	$(call DELFILE *.map)
+	$(call DELFILE libarch$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep