diff --git a/lib/asn1/NTMakefile b/lib/asn1/NTMakefile
index 76ad6b10d..79b6b5d41 100644
--- a/lib/asn1/NTMakefile
+++ b/lib/asn1/NTMakefile
@@ -514,7 +514,7 @@ $(BINDIR)\asn1_compile.exe:				    \
 	$(OBJ)\symbol.obj				    \
 	$(OBJ)\asn1_compile-version.res
 	$(EXECONLINK) $(LIBROKEN) $(LIBVERS)
-	$(EXEPREP)
+	$(EXEPREP_NOHEIM)
 
 $(OBJ)\lex.c: lex.l $(OBJ)\asn1parse.h
 	$(LEX) -o$@ lex.l
diff --git a/lib/com_err/NTMakefile b/lib/com_err/NTMakefile
index 21e2ac959..e95758998 100644
--- a/lib/com_err/NTMakefile
+++ b/lib/com_err/NTMakefile
@@ -60,7 +60,7 @@ $(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res
 
 $(BINDIR)\compile_et.exe:  $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj $(OBJ)\compile_et-version.res
 	$(EXECONLINK) $(LIBROKEN) $(LIBVERS)
-	$(EXEPREP)
+	$(EXEPREP_NOHEIM)
 
 $(OBJ)\parse.obj: $(OBJ)\parse.c
 	$(C2OBJ) -I$(SRC)\$(RELDIR)
diff --git a/lib/sl/NTMakefile b/lib/sl/NTMakefile
index ecd9ccbf7..c56da23a7 100644
--- a/lib/sl/NTMakefile
+++ b/lib/sl/NTMakefile
@@ -40,7 +40,7 @@ $(LIBSL): $(OBJ)\sl.obj
 
 $(BINDIR)\slc.exe: $(OBJ)\slc-gram.obj $(OBJ)\slc-lex.obj
 	$(EXECONLINK) $(LIBROKEN) $(LIBVERS)
-	$(EXEPREP)
+	$(EXEPREP_NOHEIM)
 
 $(OBJ)\slc-gram.c: slc-gram.y
 	$(YACC) -o $@ --defines=$(@R).h slc-gram.y
diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 75e2e56d7..50609abfa 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -425,6 +425,9 @@ clean::
 MT=mt.exe -nologo
 
 _VC_MANIFEST_EMBED_EXE= \
+( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest $(APPMANIFEST) )
+
+_VC_MANIFEST_EMBED_EXE_NOHEIM= \
 ( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest )
 
 _VC_MANIFEST_EMBED_DLL= \
@@ -475,16 +478,19 @@ _CODESIGN=( echo Skipping code sign )
 # prepare binaries.
 
 EXEPREP=\
-( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || $(RM) $@
+( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
+
+EXEPREP_NOHEIM=\
+( $(_VC_MANIFEST_EMBED_EXE_NOHEIM) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
 
 EXEPREP_NODIST=\
-( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) ) || $(RM) $@
+( $(_VC_MANIFEST_EMBED_EXE_NOHEIM) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
 
 DLLPREP=\
-( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || $(RM) $@
+( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
 
 DLLPREP_NODIST=\
-( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || $(RM) $@
+( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
 
 #----------------------------------------------------------------------
 # Convenience macros for import libraries and assemblies