diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
index 44ccc5d2d..99f2da661 100644
--- a/scripts/nmk/scripts/build.mk
+++ b/scripts/nmk/scripts/build.mk
@@ -55,6 +55,7 @@ ifneq ($(lib-y),)
         else
                 lib-target := $(obj)/lib.a
         endif
+        cleanup-y += $(call cleanify,$(lib-y))
         cleanup-y += $(lib-target)
         all-y += $(lib-target)
 endif
@@ -66,6 +67,7 @@ ifneq ($(obj-y),)
         else
                 builtin-target := $(obj)/built-in.o
         endif
+        cleanup-y += $(call cleanify,$(obj-y))
         cleanup-y += $(builtin-target)
         all-y += $(builtin-target)
 endif
@@ -111,6 +113,7 @@ define gen-custom-target-rule
                                 $(call objectify,$($(1)-obj-y))         \
                                 $(call objectify,$($(1)-obj-e))))
                 all-y += $(obj)/$(1).built-in.o
+                cleanup-y += $(call cleanify,$(call objectify,$($(1)-obj-y)))
                 cleanup-y += $(obj)/$(1).built-in.o
         endif
         ifneq ($($(1)-lib-y),)
@@ -121,6 +124,7 @@ define gen-custom-target-rule
                                 $(call objectify,$($(1)-lib-e)),        \
                                 $(call objectify,$($(1)-lib-y))))
                 all-y += $(obj)/$(1).lib.a
+                cleanup-y += $(call cleanify,$(call objectify,$($(1)-lib-y)))
                 cleanup-y += $(obj)/$(1).lib.a
         endif
 endef
@@ -168,7 +172,7 @@ all: $(all-y)
 # Clean most files, but leave enough to navigate with tags (generated files)
 clean:
 	$(call msg-clean, $(obj))
-	$(Q) $(RM) $(obj)/*.o $(obj)/*.d $(obj)/*.i $(obj)/*.s $(cleanup-y)
+	$(Q) $(RM) $(cleanup-y)
 .PHONY: clean
 
 #