diff --git a/Makefile.unix b/Makefile.unix
index 3b641e8b26..c88a6cc92c 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -447,7 +447,7 @@ check_context:
 # Archive targets.  The target build sequency will first create a series of
 # libraries, one per configured source file directory.  The final NuttX
 # execution will then be built from those libraries.  The following targets
-# built those libraries.
+# build those libraries.
 #
 # Possible kernel-mode builds
 
diff --git a/Makefile.win b/Makefile.win
index 7f96206924..4fe0b2aa1f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -463,7 +463,7 @@ check_context:
 # Archive targets.  The target build sequency will first create a series of
 # libraries, one per configured source file directory.  The final NuttX
 # execution will then be built from those libraries.  The following targets
-# built those libraries.
+# build those libraries.
 #
 # Possible kernel-mode builds
 
diff --git a/configs/amber/src/Makefile b/configs/amber/src/Makefile
index f841ede06d..49e8d5df8c 100644
--- a/configs/amber/src/Makefile
+++ b/configs/amber/src/Makefile
@@ -86,7 +86,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/avr32dev1/src/Makefile b/configs/avr32dev1/src/Makefile
index f92a05c4ed..64b2ba0998 100644
--- a/configs/avr32dev1/src/Makefile
+++ b/configs/avr32dev1/src/Makefile
@@ -79,7 +79,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/c5471evm/src/Makefile b/configs/c5471evm/src/Makefile
index 80a3da5225..2161ac11aa 100644
--- a/configs/c5471evm/src/Makefile
+++ b/configs/c5471evm/src/Makefile
@@ -66,7 +66,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/compal_e88/src/Makefile b/configs/compal_e88/src/Makefile
index 5e857da644..c2b9182c5f 100644
--- a/configs/compal_e88/src/Makefile
+++ b/configs/compal_e88/src/Makefile
@@ -69,7 +69,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/compal_e99/src/Makefile b/configs/compal_e99/src/Makefile
index 2f0ea61fd4..deeacb0bd3 100644
--- a/configs/compal_e99/src/Makefile
+++ b/configs/compal_e99/src/Makefile
@@ -69,7 +69,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/demo9s12ne64/src/Makefile b/configs/demo9s12ne64/src/Makefile
index ecc2ff2469..18dd2ac095 100644
--- a/configs/demo9s12ne64/src/Makefile
+++ b/configs/demo9s12ne64/src/Makefile
@@ -75,7 +75,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index 06089df464..2a09631a24 100644
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -94,7 +94,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ea3152/src/Makefile b/configs/ea3152/src/Makefile
index 6ade0ffd38..1620a3586d 100644
--- a/configs/ea3152/src/Makefile
+++ b/configs/ea3152/src/Makefile
@@ -94,7 +94,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile
index 9096f164fc..c7e9e31370 100644
--- a/configs/eagle100/src/Makefile
+++ b/configs/eagle100/src/Makefile
@@ -75,7 +75,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ekk-lm3s9b96/src/Makefile b/configs/ekk-lm3s9b96/src/Makefile
index adabe130a4..a44b698980 100644
--- a/configs/ekk-lm3s9b96/src/Makefile
+++ b/configs/ekk-lm3s9b96/src/Makefile
@@ -77,7 +77,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ez80f910200kitg/src/Makefile b/configs/ez80f910200kitg/src/Makefile
index e430be9ab7..61103a9312 100644
--- a/configs/ez80f910200kitg/src/Makefile
+++ b/configs/ez80f910200kitg/src/Makefile
@@ -73,7 +73,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ez80f910200zco/src/Makefile b/configs/ez80f910200zco/src/Makefile
index 2b56c1cea1..8cf20c750a 100644
--- a/configs/ez80f910200zco/src/Makefile
+++ b/configs/ez80f910200zco/src/Makefile
@@ -80,7 +80,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/fire-stm32v2/src/Makefile b/configs/fire-stm32v2/src/Makefile
index 6492b216a6..48bb5e6c74 100644
--- a/configs/fire-stm32v2/src/Makefile
+++ b/configs/fire-stm32v2/src/Makefile
@@ -116,7 +116,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/hymini-stm32v/src/Makefile b/configs/hymini-stm32v/src/Makefile
index c57eee3384..2f8cf9992c 100644
--- a/configs/hymini-stm32v/src/Makefile
+++ b/configs/hymini-stm32v/src/Makefile
@@ -95,7 +95,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/kwikstik-k40/src/Makefile b/configs/kwikstik-k40/src/Makefile
index 7560007392..eeaec8d0f9 100644
--- a/configs/kwikstik-k40/src/Makefile
+++ b/configs/kwikstik-k40/src/Makefile
@@ -93,7 +93,7 @@ libboard$(LIBEXT): $(OBJS)
 
 depend: .depend
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/lincoln60/src/Makefile b/configs/lincoln60/src/Makefile
index 1be1108a59..8e9fd8f04d 100644
--- a/configs/lincoln60/src/Makefile
+++ b/configs/lincoln60/src/Makefile
@@ -85,7 +85,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/lm3s6432-s2e/src/Makefile b/configs/lm3s6432-s2e/src/Makefile
index 1fe533a4ec..751fe8c91f 100644
--- a/configs/lm3s6432-s2e/src/Makefile
+++ b/configs/lm3s6432-s2e/src/Makefile
@@ -76,7 +76,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/lm3s6965-ek/src/Makefile b/configs/lm3s6965-ek/src/Makefile
index ddba1f4107..48315415ce 100644
--- a/configs/lm3s6965-ek/src/Makefile
+++ b/configs/lm3s6965-ek/src/Makefile
@@ -79,7 +79,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/lm3s8962-ek/src/Makefile b/configs/lm3s8962-ek/src/Makefile
index 07551c406b..270906b6d0 100644
--- a/configs/lm3s8962-ek/src/Makefile
+++ b/configs/lm3s8962-ek/src/Makefile
@@ -79,7 +79,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/lpc4330-xplorer/src/Makefile b/configs/lpc4330-xplorer/src/Makefile
index 75b5b76119..c0d330df4c 100644
--- a/configs/lpc4330-xplorer/src/Makefile
+++ b/configs/lpc4330-xplorer/src/Makefile
@@ -113,7 +113,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/lpcxpresso-lpc1768/src/Makefile b/configs/lpcxpresso-lpc1768/src/Makefile
index 522027ab6d..1e946c3dd3 100644
--- a/configs/lpcxpresso-lpc1768/src/Makefile
+++ b/configs/lpcxpresso-lpc1768/src/Makefile
@@ -85,7 +85,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/m68332evb/src/Makefile b/configs/m68332evb/src/Makefile
index dfc787419d..f152f8fd9d 100644
--- a/configs/m68332evb/src/Makefile
+++ b/configs/m68332evb/src/Makefile
@@ -63,7 +63,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile
index d5e4412a06..a55bd36159 100644
--- a/configs/mbed/src/Makefile
+++ b/configs/mbed/src/Makefile
@@ -79,7 +79,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile
index 47feeb0c5d..ee6f8a7f33 100644
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@@ -86,7 +86,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/micropendous3/src/Makefile b/configs/micropendous3/src/Makefile
index 66231a3b28..df5dd45f24 100644
--- a/configs/micropendous3/src/Makefile
+++ b/configs/micropendous3/src/Makefile
@@ -86,7 +86,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/mirtoo/src/Makefile b/configs/mirtoo/src/Makefile
index d560d803d9..2a92f9a33e 100644
--- a/configs/mirtoo/src/Makefile
+++ b/configs/mirtoo/src/Makefile
@@ -85,7 +85,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/mx1ads/src/Makefile b/configs/mx1ads/src/Makefile
index a264617403..1de5cbf7e2 100644
--- a/configs/mx1ads/src/Makefile
+++ b/configs/mx1ads/src/Makefile
@@ -66,7 +66,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile
index deeca6abb8..ea80cd087c 100644
--- a/configs/ne64badge/src/Makefile
+++ b/configs/ne64badge/src/Makefile
@@ -75,7 +75,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ntosd-dm320/src/Makefile b/configs/ntosd-dm320/src/Makefile
index 47cedfaf78..f42558a712 100644
--- a/configs/ntosd-dm320/src/Makefile
+++ b/configs/ntosd-dm320/src/Makefile
@@ -66,7 +66,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/nucleus2g/src/Makefile b/configs/nucleus2g/src/Makefile
index e6c33821ae..ad6ee69b16 100644
--- a/configs/nucleus2g/src/Makefile
+++ b/configs/nucleus2g/src/Makefile
@@ -79,7 +79,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/olimex-lpc1766stk/src/Makefile b/configs/olimex-lpc1766stk/src/Makefile
index 8ac131ffdb..a8e3920b59 100644
--- a/configs/olimex-lpc1766stk/src/Makefile
+++ b/configs/olimex-lpc1766stk/src/Makefile
@@ -93,7 +93,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/olimex-lpc2378/src/Makefile b/configs/olimex-lpc2378/src/Makefile
index 05a84cdeaf..4ab2cffa6a 100644
--- a/configs/olimex-lpc2378/src/Makefile
+++ b/configs/olimex-lpc2378/src/Makefile
@@ -82,7 +82,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/olimex-stm32-p107/src/Makefile b/configs/olimex-stm32-p107/src/Makefile
index 3fc0abe5df..f0e0fc8d63 100644
--- a/configs/olimex-stm32-p107/src/Makefile
+++ b/configs/olimex-stm32-p107/src/Makefile
@@ -78,7 +78,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile
index 12c48d2133..efe2df4f93 100644
--- a/configs/olimex-strp711/src/Makefile
+++ b/configs/olimex-strp711/src/Makefile
@@ -79,7 +79,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/pcblogic-pic32mx/src/Makefile b/configs/pcblogic-pic32mx/src/Makefile
index 2e576b795b..175f0f1315 100644
--- a/configs/pcblogic-pic32mx/src/Makefile
+++ b/configs/pcblogic-pic32mx/src/Makefile
@@ -77,7 +77,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/pic32-starterkit/src/Makefile b/configs/pic32-starterkit/src/Makefile
index acaaa91c58..f041f9b081 100644
--- a/configs/pic32-starterkit/src/Makefile
+++ b/configs/pic32-starterkit/src/Makefile
@@ -88,7 +88,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/pic32mx7mmb/src/Makefile b/configs/pic32mx7mmb/src/Makefile
index 304989a847..ffb83cc495 100644
--- a/configs/pic32mx7mmb/src/Makefile
+++ b/configs/pic32mx7mmb/src/Makefile
@@ -92,7 +92,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/pjrc-8051/src/Makefile b/configs/pjrc-8051/src/Makefile
index fccb3ada2a..fff994b9ba 100644
--- a/configs/pjrc-8051/src/Makefile
+++ b/configs/pjrc-8051/src/Makefile
@@ -65,7 +65,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/qemu-i486/src/Makefile b/configs/qemu-i486/src/Makefile
index 06debd3e0d..d945f9ccd6 100644
--- a/configs/qemu-i486/src/Makefile
+++ b/configs/qemu-i486/src/Makefile
@@ -72,7 +72,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/sam3u-ek/src/Makefile b/configs/sam3u-ek/src/Makefile
index 18fba3eb02..08ccb2f463 100644
--- a/configs/sam3u-ek/src/Makefile
+++ b/configs/sam3u-ek/src/Makefile
@@ -85,7 +85,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/shenzhou/src/Makefile b/configs/shenzhou/src/Makefile
index d7ca85efcd..e3aa181e42 100644
--- a/configs/shenzhou/src/Makefile
+++ b/configs/shenzhou/src/Makefile
@@ -136,7 +136,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile
index adfbb1f9a3..7c5887e720 100644
--- a/configs/sim/src/Makefile
+++ b/configs/sim/src/Makefile
@@ -72,7 +72,7 @@ endif
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/skp16c26/src/Makefile b/configs/skp16c26/src/Makefile
index 306e268063..b54b130510 100644
--- a/configs/skp16c26/src/Makefile
+++ b/configs/skp16c26/src/Makefile
@@ -66,7 +66,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile
index e518366887..22ff4d40bb 100644
--- a/configs/stm3210e-eval/src/Makefile
+++ b/configs/stm3210e-eval/src/Makefile
@@ -120,7 +120,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/stm3220g-eval/src/Makefile b/configs/stm3220g-eval/src/Makefile
index a5072bdb4e..b30f111f28 100644
--- a/configs/stm3220g-eval/src/Makefile
+++ b/configs/stm3220g-eval/src/Makefile
@@ -120,7 +120,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/stm3240g-eval/src/Makefile b/configs/stm3240g-eval/src/Makefile
index 81924abcbd..a22f75e703 100644
--- a/configs/stm3240g-eval/src/Makefile
+++ b/configs/stm3240g-eval/src/Makefile
@@ -128,7 +128,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/stm32f100rc_generic/src/Makefile b/configs/stm32f100rc_generic/src/Makefile
index 57c96a57fd..f32c947d0c 100644
--- a/configs/stm32f100rc_generic/src/Makefile
+++ b/configs/stm32f100rc_generic/src/Makefile
@@ -72,7 +72,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/sure-pic32mx/src/Makefile b/configs/sure-pic32mx/src/Makefile
index dd2078ed18..dc0ee13f92 100644
--- a/configs/sure-pic32mx/src/Makefile
+++ b/configs/sure-pic32mx/src/Makefile
@@ -97,7 +97,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/teensy/src/Makefile b/configs/teensy/src/Makefile
index e1c7c029a7..705315dde6 100644
--- a/configs/teensy/src/Makefile
+++ b/configs/teensy/src/Makefile
@@ -92,7 +92,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/twr-k60n512/src/Makefile b/configs/twr-k60n512/src/Makefile
index 257e8e73f7..bb0dcd3e02 100644
--- a/configs/twr-k60n512/src/Makefile
+++ b/configs/twr-k60n512/src/Makefile
@@ -94,7 +94,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/ubw32/src/Makefile b/configs/ubw32/src/Makefile
index 608563b7e9..6cbec5db30 100644
--- a/configs/ubw32/src/Makefile
+++ b/configs/ubw32/src/Makefile
@@ -88,7 +88,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/configs/us7032evb1/src/Makefile b/configs/us7032evb1/src/Makefile
index bf457d1c5d..93a9792770 100644
--- a/configs/us7032evb1/src/Makefile
+++ b/configs/us7032evb1/src/Makefile
@@ -66,7 +66,7 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	$(call DELFILE libboard$(LIBEXT)))
+	$(call DELFILE libboard$(LIBEXT))
 	$(call CLEAN)
 
 distclean: clean
diff --git a/include/nuttx/power/pm.h b/include/nuttx/power/pm.h
index 86e23f090e..9c0568b2dd 100644
--- a/include/nuttx/power/pm.h
+++ b/include/nuttx/power/pm.h
@@ -163,7 +163,7 @@
 #endif
 
 #if CONFIG_PM_IDLEENTER_THRESH >= CONFIG_PM_IDLEEXIT_THRESH
-#  error "Must have CONFIG_PM_IDLEENTER_THRESH < CONFIG_PM_IDLEEXIT_THRESH
+#  error "Must have CONFIG_PM_IDLEENTER_THRESH < CONFIG_PM_IDLEEXIT_THRESH"
 #endif
 
 #ifndef CONFIG_PM_IDLEENTER_COUNT
@@ -181,7 +181,7 @@
 #endif
 
 #if CONFIG_PM_STANDBYENTER_THRESH >= CONFIG_PM_STANDBYEXIT_THRESH
-#  error "Must have CONFIG_PM_STANDBYENTER_THRESH < CONFIG_PM_STANDBYEXIT_THRESH
+#  error "Must have CONFIG_PM_STANDBYENTER_THRESH < CONFIG_PM_STANDBYEXIT_THRESH"
 #endif
 
 #ifndef CONFIG_PM_STANDBYENTER_COUNT
@@ -199,7 +199,7 @@
 #endif
 
 #if CONFIG_PM_SLEEPENTER_THRESH >= CONFIG_PM_SLEEPEXIT_THRESH
-#  error "Must have CONFIG_PM_SLEEPENTER_THRESH < CONFIG_PM_SLEEPEXIT_THRESH
+#  error "Must have CONFIG_PM_SLEEPENTER_THRESH < CONFIG_PM_SLEEPEXIT_THRESH"
 #endif
 
 #ifndef CONFIG_PM_SLEEPENTER_COUNT
diff --git a/libc/stdio/lib_fgets.c b/libc/stdio/lib_fgets.c
index c2c98a38b6..35d024ebb0 100644
--- a/libc/stdio/lib_fgets.c
+++ b/libc/stdio/lib_fgets.c
@@ -150,7 +150,7 @@ char *fgets(FAR char *buf, int buflen, FILE *stream)
       if (ch == '\n')
 #elif defined(CONFIG_EOL_IS_CR)
       if (ch == '\r')
-#elif CONFIG_EOL_IS_EITHER_CRLF
+#else /* elif CONFIG_EOL_IS_EITHER_CRLF */
       if (ch == '\n' || ch == '\r')
 #endif
         {