diff --git a/admin/NTMakefile b/admin/NTMakefile
index e45a5e75f..06f90c9fd 100644
--- a/admin/NTMakefile
+++ b/admin/NTMakefile
@@ -71,4 +71,4 @@ INCFILES=\
 all:: $(INCFILES) $(SBINPROGRAMS)
 
 clean::
-	-$(RM) $(SBINPROGRAMS)
+	-$(RM) $(SBINPROGRAMS:.exe=.*)
diff --git a/kadmin/NTMakefile b/kadmin/NTMakefile
index f20592362..f50e118be 100644
--- a/kadmin/NTMakefile
+++ b/kadmin/NTMakefile
@@ -106,8 +106,8 @@ $(LIBEXECDIR)\kadmind.exe: $(KADMIND_OBJS) $(KADMIND_LIBS)
 all:: $(INCFILES) $(SBIN_PROGRAMS) $(LIBEXEC_PROGRAMS)
 
 clean::
-	-$(RM) $(SBIN_PROGRAMS)
-	-$(RM) $(LIBEXEC_PROGRAMS)
+	-$(RM) $(SBIN_PROGRAMS:.exe=.*)
+	-$(RM) $(LIBEXEC_PROGRAMS:.exe=.*)
 
 
 
diff --git a/kdc/NTMakefile b/kdc/NTMakefile
index f9ee92b56..cbb0fbcf8 100644
--- a/kdc/NTMakefile
+++ b/kdc/NTMakefile
@@ -55,7 +55,7 @@ all:: $(INCFILES) $(LIBKDC) $(BINPROGRAMS) $(SBINPROGRAMS) $(LIBEXECPROGRAMS)
 
 clean::
 	-$(RM) $(LIBKDC)
-	-$(RM) $(BINPROGRAMS) $(SBINPROGRAMS) $(LIBEXECPROGRAMS)
+	-$(RM) $(BINPROGRAMS:.exe=.*) $(SBINPROGRAMS:.exe=.*) $(LIBEXECPROGRAMS:.exe=.*)
 
 BIN_LIBS=\
 	$(LIBHDB)	\
@@ -129,6 +129,9 @@ $(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS) $(LIBKDCRES)
 
 $(LIBKDC): $(LIBEXECDIR)\libkdc.dll
 
+clean::
+	-$(RM) $(LIBEXECDIR)\libkdc.*
+
 libkdc_la_SOURCES = 		\
 	default_config.c 	\
 	set_dbinfo.c	 	\
diff --git a/kuser/NTMakefile b/kuser/NTMakefile
index c6e3d4629..e9fd7f6f9 100644
--- a/kuser/NTMakefile
+++ b/kuser/NTMakefile
@@ -60,7 +60,7 @@ BINLIBS=\
 all:: $(BINPROGRAMS) $(LIBEXECPROGRAMS)
 
 clean::
-	-$(RM) $(BINPROGRAMS) $(LIBEXECPROGRAMS)
+	-$(RM) $(BINPROGRAMS:.exe=.*) $(LIBEXECPROGRAMS:.exe=.*)
 
 $(BINDIR)\kinit.exe: $(OBJ)\kinit.obj $(BINLIBS) $(OBJ)\kinit-version.res
 	$(EXECONLINK)
diff --git a/lib/asn1/NTMakefile b/lib/asn1/NTMakefile
index f0c4d85d5..76ad6b10d 100644
--- a/lib/asn1/NTMakefile
+++ b/lib/asn1/NTMakefile
@@ -733,6 +733,14 @@ all:: $(INCFILES) $(GENINCFILES) $(ASN1_BINARIES) $(LIBASN1)
 
 all-tools:: $(LIBEXECDIR)\asn1_print.exe $(BINDIR)\asn1_gen.exe
 
+clean::
+	-$(RM) $(INCFILES)
+	-$(RM) $(GENINCFILES)
+	-$(RM) $(ASN1_BINARIES:.exe=.*)
+	-$(RM) $(LIBASN1)
+	-$(RM) $(LIBEXECDIR)\asn1_print.*
+	-$(RM) $(LIBEXECDIR)\asn1_gen.*
+
 TEST_BINARIES=\
 	$(OBJ)\check-der.exe	\
 	$(OBJ)\check-gen.exe	\
@@ -753,6 +761,9 @@ test-run:
 
 test:: test-binaries test-run
 
+clean::
+	-$(RM) $(TEST_BINARIES:.exe=*)
+
 $(OBJ)\check-ber.exe: $(OBJ)\check-ber.obj \
 		$(LIBHEIMDAL) $(LIBROKEN)
 	$(EXECONLINK)
diff --git a/lib/com_err/NTMakefile b/lib/com_err/NTMakefile
index 2dbb04409..21e2ac959 100644
--- a/lib/com_err/NTMakefile
+++ b/lib/com_err/NTMakefile
@@ -82,7 +82,8 @@ all:: $(INCFILES) $(LIBCOMERR) $(BINDIR)\compile_et.exe
 clean::
 	-$(RM) $(LIBCOMERR)
 	-$(RM) $(INCFILES)
-	-$(RM) $(COMERRDLL)
+	-$(RM) $(COMERRDLL:.dll=.*)
+	-$(RM) $(BINDIR)\compile_et.*
 
 test-exports:
 	$(PERL) ..\..\cf\w32-check-exported-symbols.pl --vs version-script.map --def libcom_err-exports.def
diff --git a/lib/gssapi/NTMakefile b/lib/gssapi/NTMakefile
index 2430ca37b..31035cdd2 100644
--- a/lib/gssapi/NTMakefile
+++ b/lib/gssapi/NTMakefile
@@ -478,7 +478,7 @@ $(libgssapi_OBJs: =
 $(LIBGSSAPI): $(BINDIR)\gssapi.dll
 
 clean::
-	-$(RM) $(BINDIR)\gssapi.dll
+	-$(RM) $(BINDIR)\gssapi.*
 
 !else
 
diff --git a/lib/hdb/NTMakefile b/lib/hdb/NTMakefile
index 3387fb610..6addf864c 100644
--- a/lib/hdb/NTMakefile
+++ b/lib/hdb/NTMakefile
@@ -148,6 +148,9 @@ $(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBHEIMDAL) $(LIBSQLITE) $(LI
 	$(DLLGUILINK) -def:libhdb-exports.def -implib:$(LIBHDB)
 	$(DLLPREP)
 
+clean::
+	-$(RM) $(BINDIR)\libhdb.*
+
 !else
 
 $(LIBHDB): $(libhdb_OBJs) $(ldap_lib)
diff --git a/lib/heimdal/NTMakefile b/lib/heimdal/NTMakefile
index 752c7a44f..c6352a7db 100644
--- a/lib/heimdal/NTMakefile
+++ b/lib/heimdal/NTMakefile
@@ -76,7 +76,7 @@ $(DLL): $(DLLDEPS) $(DEF) $(RES)
 	$(DLLPREP)
 
 clean::
-	-$(RM) $(BINDIR)\heimdal.dll
+	-$(RM) $(BINDIR)\heimdal.*
 
 !else
 
diff --git a/lib/hx509/NTMakefile b/lib/hx509/NTMakefile
index ac978c2db..e7b73d72a 100644
--- a/lib/hx509/NTMakefile
+++ b/lib/hx509/NTMakefile
@@ -238,7 +238,7 @@ mktooldir:
 all-tools:: $(BINDIR)\hxtool.exe
 
 clean::
-	-$(RM) $(BINDIR)\hxtool.exe
+	-$(RM) $(BINDIR)\hxtool.*
 	-$(RM) $(OBJ)\tool\*.*
 
 {}.c{$(OBJ)\tool}.obj::
diff --git a/lib/kadm5/NTMakefile b/lib/kadm5/NTMakefile
index e83b8c6b2..6f70e6e31 100644
--- a/lib/kadm5/NTMakefile
+++ b/lib/kadm5/NTMakefile
@@ -226,9 +226,9 @@ clean::
 	-$(RM) $(INCFILES)
 	-$(RM) $(LIBKADM5CLNT)
 	-$(RM) $(LIBKADM5SRV)
-	-$(RM) $(BINDIR)\libkadm5srv.dll
-	-$(RM) $(SBINPROGRAMS)
-	-$(RM) $(LIBEXECPROGRAMS)
+	-$(RM) $(BINDIR)\libkadm5srv.*
+	-$(RM) $(SBINPROGRAMS:.exe=.*)
+	-$(RM) $(LIBEXECPROGRAMS:.exe=.*)
 
 test:: test-binaries test-run
 
diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile
index 801cb9ade..635615b45 100644
--- a/lib/krb5/NTMakefile
+++ b/lib/krb5/NTMakefile
@@ -335,7 +335,7 @@ clean::
 all-tools:: $(BINDIR)\verify_krb5_conf.exe
 
 clean::
-	-$(RM) $(BINDIR)\verify_krb5_conf.exe
+	-$(RM) $(BINDIR)\verify_krb5_conf.*
 
 $(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS) $(OBJ)\verify_krb5_conf-version.res
 	$(EXECONLINK)
diff --git a/lib/ntlm/NTMakefile b/lib/ntlm/NTMakefile
index dad338c43..c7c7b123f 100644
--- a/lib/ntlm/NTMakefile
+++ b/lib/ntlm/NTMakefile
@@ -52,6 +52,9 @@ $(BINDIR)\libheimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES)
 	$(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM)
 	$(DLLPREP)
 
+clean::
+	-$(RM) $(BINDIR)\libheimntlm.*
+
 !else
 
 $(LIBHEIMNTLM): $(OBJ)\ntlm.obj
diff --git a/lib/sl/NTMakefile b/lib/sl/NTMakefile
index 46e32f3d9..ecd9ccbf7 100644
--- a/lib/sl/NTMakefile
+++ b/lib/sl/NTMakefile
@@ -62,7 +62,7 @@ all:: $(INCFILES) $(LIBSL) $(BINDIR)\slc.exe
 
 clean::
 	-$(RM) $(LIBSL)
-	-$(RM) $(BINDIR)\slc.exe
+	-$(RM) $(BINDIR)\slc.*
 
 test-binaries: $(OBJ)\test_sl.exe
 
diff --git a/packages/windows/kfw_shim/NTMakefile b/packages/windows/kfw_shim/NTMakefile
index 2b9756bcf..bdf9564ec 100644
--- a/packages/windows/kfw_shim/NTMakefile
+++ b/packages/windows/kfw_shim/NTMakefile
@@ -108,7 +108,7 @@ $(BINDIR)\krb5_64.dll: $(KRB5_SHIM_OBJS)
 all:: $(FILES)
 
 clean::
-	-$(RM) $(FILES)
+	-$(RM) $(FILES:.dll=.*)
 
 !ifdef DEV
 
diff --git a/packages/windows/sdk/NTMakefile b/packages/windows/sdk/NTMakefile
index 205d493dd..f93f7a96a 100644
--- a/packages/windows/sdk/NTMakefile
+++ b/packages/windows/sdk/NTMakefile
@@ -98,4 +98,6 @@ all:: $(INCFILES) $(LIBFILES)
 clean::
 	-$(RM) $(SDKINCDIR)\*.*
 	-$(RM) $(SDKINCDIR)\krb5\*.*
+	-$(RM) $(SDKINCDIR)\kadm5\*.*
 	-$(RM) $(SDKLIBDIR)\*.*
+	-$(RM) $(SDKREDISTDIR)\*.*