diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index 445577b4afa..9e6bda77cc6 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -111,8 +111,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@if [ -e board/Makefile ]; then \
diff --git a/arch/c5471/src/Makefile b/arch/c5471/src/Makefile
index c04d9a9a681..1e7933b8fd8 100644
--- a/arch/c5471/src/Makefile
+++ b/arch/c5471/src/Makefile
@@ -113,7 +113,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	rm -f libarch$(LIBEXT) *.o *.obj *~
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@if [ -e board/Makefile ]; then \
diff --git a/arch/dm320/src/Makefile b/arch/dm320/src/Makefile
index 41b9a90ab28..8ce53aa7411 100644
--- a/arch/dm320/src/Makefile
+++ b/arch/dm320/src/Makefile
@@ -113,12 +113,13 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	rm -f libarch$(LIBEXT) *.o *.obj *~
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \
 	fi
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend
 
 -include Make.dep
diff --git a/arch/pjrc-8051/src/Makefile b/arch/pjrc-8051/src/Makefile
index 5d95b2f78df..d77bf546dd7 100644
--- a/arch/pjrc-8051/src/Makefile
+++ b/arch/pjrc-8051/src/Makefile
@@ -211,9 +211,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	rm -f libarch$(LIBEXT) up_mem.h
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@if [ -e board/Makefile ]; then \
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index c31c4e17ec2..ea92eb50c83 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -101,8 +101,8 @@ nuttx$(EXEEXT): $(LINKOBJS)
 depend: .depend
 
 clean:
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@rm -f Make.dep .depend
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 2ce3a301303..cd069244710 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -99,8 +99,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@if [ -e board/Makefile ]; then \
diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile
index 2c1f15c99be..9f5e752d448 100644
--- a/arch/z80/src/Makefile
+++ b/arch/z80/src/Makefile
@@ -234,10 +234,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.*
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex
-	rm -f core *~ .*.swp *.swp
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	@if [ -e board/Makefile ]; then \