diff --git a/build.mk b/build.mk
index a19db494..91886f0e 100644
--- a/build.mk
+++ b/build.mk
@@ -148,7 +148,7 @@ run-benchmarks$(E): test/run-benchmarks.o test/runner.o $(RUNNER_SRC) $(BENCHMAR
 test/echo.o: test/echo.c test/echo.h
 
 
-.PHONY: clean clean-platform distclean distclean-platform test bench
+.PHONY: clean clean-platform distclean test bench
 
 
 test: run-tests$(E)
@@ -157,8 +157,8 @@ test: run-tests$(E)
 bench: run-benchmarks$(E)
 	$(CURDIR)/$<
 
-clean: clean-platform
-	$(RM) -f *.a *.so test/run-tests$(E) test/run-benchmarks$(E)
-
-distclean: distclean-platform
-	$(RM) -f *.a *.so test/run-tests$(E) test/run-benchmarks$(E)
+clean distclean: clean-platform
+	$(RM) libuv.a libuv.$(SOEXT) \
+		test/run-tests.o test/run-benchmarks.o \
+		test/run-tests$(E) test/run-benchmarks$(E) \
+		$(BENCHMARKS) $(TESTS) $(RUNNER_LIBS)
diff --git a/config-mingw.mk b/config-mingw.mk
index 9906a1c6..400a6c46 100644
--- a/config-mingw.mk
+++ b/config-mingw.mk
@@ -46,6 +46,3 @@ src/win/%.o: src/win/%.c include/uv.h include/uv-private/uv-win.h src/win/intern
 
 clean-platform:
 	-rm -f src/win/*.o
-
-distclean-platform:
-	-rm -f src/win/*.o
diff --git a/config-unix.mk b/config-unix.mk
index 8d018982..efe0d17e 100644
--- a/config-unix.mk
+++ b/config-unix.mk
@@ -158,10 +158,7 @@ test/%.o: test/%.c include/uv.h test/.buildstamp
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 clean-platform:
-	-rm -f libuv.a libuv.$(SOEXT) test/run-{tests,benchmarks}.dSYM
-
-distclean-platform:
-	-rm -f libuv.a libuv.$(SOEXT) test/run-{tests,benchmarks}.dSYM
+	$(RM) test/run-{tests,benchmarks}.dSYM $(OBJS) $(OBJS:%.o=%.pic.o)
 
 %.pic.o %.o:  %.m
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ -o $@