diff --git a/reactos/proxy.mak b/reactos/proxy.mak
index 783b42129ae..e89083920d2 100644
--- a/reactos/proxy.mak
+++ b/reactos/proxy.mak
@@ -8,3 +8,5 @@ all:
 
 clean:
 	@$(MAKE) -C $(TOP) $(DEFAULT)_clean
+
+$(DEFAULT)_clean: clean
diff --git a/reactos/tools/buildno/makefile b/reactos/tools/buildno/buildno.mak
similarity index 90%
rename from reactos/tools/buildno/makefile
rename to reactos/tools/buildno/buildno.mak
index 308f0f89252..7a5da94865c 100644
--- a/reactos/tools/buildno/makefile
+++ b/reactos/tools/buildno/buildno.mak
@@ -27,6 +27,7 @@ $(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h
 .PHONY: buildno_clean
 buildno_clean:
 	-@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL)
+clean: buildno_clean
 
 # BUILDNO_H is defined from the top-level makefile now...
 #BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h
@@ -36,3 +37,8 @@ buildno_h: $(BUILDNO_H)
 
 $(BUILDNO_H): $(BUILDNO_TARGET)
 	$(BUILDNO_TARGET) $(BUILDNO_H)
+
+.PHONY: buildno_h_clean
+buildno_h_clean:
+	-@$(rm) $(BUILDNO_H)
+clean: buildno_h_clean
diff --git a/reactos/tools/cdmake/makefile b/reactos/tools/cdmake/cdmake.mak
similarity index 100%
rename from reactos/tools/cdmake/makefile
rename to reactos/tools/cdmake/cdmake.mak
diff --git a/reactos/tools/nci/makefile b/reactos/tools/nci/nci.mak
similarity index 100%
rename from reactos/tools/nci/makefile
rename to reactos/tools/nci/nci.mak
diff --git a/reactos/tools/rbuild/makefile b/reactos/tools/rbuild/rbuild.mak
similarity index 100%
rename from reactos/tools/rbuild/makefile
rename to reactos/tools/rbuild/rbuild.mak
diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index 851ff66db5d..77bed6ec347 100644
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -55,11 +55,11 @@ rsym_clean:
 	-@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL)
 clean: rsym_clean
 
-include tools/buildno/makefile
-include tools/cdmake/makefile
-include tools/nci/makefile
-include tools/rbuild/makefile
-include tools/unicode/makefile
-include tools/wmc/makefile
+include tools/buildno/buildno.mak
+include tools/cdmake/cdmake.mak
+include tools/nci/nci.mak
+include tools/rbuild/rbuild.mak
+include tools/unicode/unicode.mak
+include tools/wmc/wmc.mak
 include tools/wpp/wpp.mak
-include tools/wrc/makefile
+include tools/wrc/wrc.mak
diff --git a/reactos/tools/unicode/makefile b/reactos/tools/unicode/unicode.mak
similarity index 100%
rename from reactos/tools/unicode/makefile
rename to reactos/tools/unicode/unicode.mak
diff --git a/reactos/tools/wmc/makefile b/reactos/tools/wmc/wmc.mak
similarity index 100%
rename from reactos/tools/wmc/makefile
rename to reactos/tools/wmc/wmc.mak
diff --git a/reactos/tools/wrc/makefile b/reactos/tools/wrc/wrc.mak
similarity index 100%
rename from reactos/tools/wrc/makefile
rename to reactos/tools/wrc/wrc.mak