diff --git a/makefile b/makefile
index 9ae92379ae5..464572331c7 100644
--- a/makefile
+++ b/makefile
@@ -1691,24 +1691,39 @@ tests: $(REGTESTS)
 
 .PHONY: cleansrc
 
+# FIXME: make this work with SEPARATE_BIN
 cleansrc:
 	@echo Cleaning up tabs/spaces/end of lines....
 ifeq ($(OS),windows)
 	$(shell for /r src %%i in (*.c) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.cpp) do srcclean %%i >&2 )
 	$(shell for /r src %%i in (*.h) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.mak) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.lst) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.lay) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.hpp) do srcclean %%i >&2 )
 	$(shell for /r src %%i in (*.hxx) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.ipp) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.lay) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.lst) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.mak) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.mm) do srcclean %%i >&2 )
+	$(shell for /r hash %%i in (*.hsi) do srcclean %%i >&2 )
 	$(shell for /r hash %%i in (*.xml) do srcclean %%i >&2 )
+	$(shell for /r plugins %%i in (*.lua) do srcclean %%i >&2 )
+	$(shell for /r scripts %%i in (*.lua) do srcclean %%i >&2 )
 else
-	@find src/ -name \*.c -exec ./srcclean {} \; >&2
-	@find src/ -name \*.h -exec ./srcclean {} \; >&2
-	@find src/ -name \*.mak -exec ./srcclean {} \; >&2
-	@find src/ -name \*.lst -exec ./srcclean {} \; >&2
-	@find src/ -name \*.lay -exec ./srcclean {} \; >&2
-	@find src/ -name \*.hxx -exec ./srcclean {} \; >&2
-	@find hash/ -name \*.xml -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.c -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.cpp -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.h -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.hpp -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.hxx -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.ipp -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.lay -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.lst -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.mak -exec ./srcclean {} \; >&2
+	$(SILENT) find src -name \*.mm -exec ./srcclean {} \; >&2
+	$(SILENT) find hash -name \*.hsi -exec ./srcclean {} \; >&2
+	$(SILENT) find hash -name \*.xml -exec ./srcclean {} \; >&2
+	$(SILENT) find plugins -name \*.lua -exec ./srcclean {} \; >&2
+	$(SILENT) find scripts -name \*.lua -exec ./srcclean {} \; >&2
 endif
 
 #-------------------------------------------------