diff --git a/Makefile b/Makefile
index e68f4f5b..a455a37c 100644
--- a/Makefile
+++ b/Makefile
@@ -94,5 +94,5 @@ clean: cleanheaders
 	@printf "  CLEAN   doxygen\n"
 	$(Q)$(MAKE) -C doc clean
 
-.PHONY: build lib examples install doc clean generatedheaders
+.PHONY: build lib examples install doc clean generatedheaders cleanheaders
 
diff --git a/scripts/irq2nvic_h b/scripts/irq2nvic_h
index cddbfc34..23e365d1 100755
--- a/scripts/irq2nvic_h
+++ b/scripts/irq2nvic_h
@@ -142,8 +142,10 @@ def main():
     vector_nvic_c = infile.replace('./include/libopencm3/', './lib/').replace('irq.yaml', 'vector_nvic.c')
 
     if remove:
-        os.unlink(nvic_h)
-        os.unlink(vector_nvic_c)
+        if os.path.exists(nvic_h):
+            os.unlink(nvic_h)
+        if os.path.exists(vector_nvic_c):
+            os.unlink(vector_nvic_c)
         sys.exit(0)
 
     if not needs_update([__file__, infile], [nvic_h, vector_nvic_c]):