diff --git a/Makefile b/Makefile
index 6ce8387e..24e50bc0 100644
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,9 @@ generatedheaders:
 		./scripts/irq2nvic_h $$yamlfile ; \
 	done
 
-cleanheaders:
-	@printf "  CLEANING HEADERS\n"
-	$(Q)for yamlfile in $(YAMLFILES); do \
-		./scripts/irq2nvic_h --remove $$yamlfile ; \
-	done
+%.cleanhdr:
+	@printf "  CLNHDR  $*\n";
+	@./scripts/irq2nvic_h --remove ./$*
 
 LIB_DIRS:=$(wildcard $(addprefix lib/,$(TARGETS)))
 $(LIB_DIRS): generatedheaders
@@ -92,7 +90,7 @@ install: lib
 doc:
 	$(Q)$(MAKE) -C doc html
 
-clean: cleanheaders $(LIB_DIRS:=.clean) $(EXAMPLE_DIRS:=.clean) doc.clean
+clean: $(YAMLFILES:=.cleanhdr) $(LIB_DIRS:=.clean) $(EXAMPLE_DIRS:=.clean) doc.clean
 
 %.clean:
 	$(Q)if [ -d $* ]; then \
@@ -107,5 +105,5 @@ stylecheck:
 		fi ; \
 	done
 
-.PHONY: build lib $(LIB_DIRS) install doc clean generatedheaders cleanheaders stylecheck
+.PHONY: build lib $(LIB_DIRS) install doc clean generatedheaders stylecheck