diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index ac54ac0681..87a3ffd2b0 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -140,7 +140,7 @@ else
 endif
 
 clean::
-	$(RM) $(BIN2CEXE)
+	$(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%)
 
 %.c %.h %.pc %.ver %.version: TAG = GEN
 
diff --git a/libavcodec/neon/Makefile b/libavcodec/neon/Makefile
index 607f116a77..83c2f0051c 100644
--- a/libavcodec/neon/Makefile
+++ b/libavcodec/neon/Makefile
@@ -1 +1,4 @@
+clean::
+	$(RM) $(CLEANSUFFIXES:%=libavcodec/neon/%)
+
 OBJS-$(CONFIG_MPEGVIDEO)          += neon/mpegvideo.o
diff --git a/libavcodec/x86/vvc/Makefile b/libavcodec/x86/vvc/Makefile
index 82f281d1c7..d1623bd46a 100644
--- a/libavcodec/x86/vvc/Makefile
+++ b/libavcodec/x86/vvc/Makefile
@@ -1,5 +1,5 @@
 clean::
-	$(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%)
+	$(RM) $(CLEANSUFFIXES:%=libavcodec/x86/vvc/%) $(CLEANSUFFIXES:%=libavcodec/x86/h26x/%)
 
 OBJS-$(CONFIG_VVC_DECODER)             += x86/vvc/vvcdsp_init.o \
                                           x86/h26x/h2656dsp.o
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index f6c1d641d6..994d9773ba 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -666,6 +666,7 @@ TOOLS-$(CONFIG_LIBZMQ) += zmqsend
 
 clean::
 	$(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) $(CLEANSUFFIXES:%=libavfilter/opencl/%) \
+              $(CLEANSUFFIXES:%=libavfilter/metal/%) \
               $(CLEANSUFFIXES:%=libavfilter/vulkan/%)
 
 OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl))