diff -Naur zsh-5.0.7-orig/Src/Modules/system.mdd zsh-5.0.7/Src/Modules/system.mdd
--- zsh-5.0.7-orig/Src/Modules/system.mdd	2015-04-27 19:50:02.697158025 -0700
+++ zsh-5.0.7/Src/Modules/system.mdd	2015-04-27 19:50:59.650493056 -0700
@@ -15,7 +15,7 @@
 		touch errtmp.out; \
 	   else \
 		$(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \
-		$(CPP) errtmp.c >errtmp.out; \
+		$(CPP) -P errtmp.c >errtmp.out; \
 	   fi
 	   $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@
 	   rm -f errtmp.c errtmp.out
diff -Naur zsh-5.0.7-orig/Src/zsh.mdd zsh-5.0.7/Src/zsh.mdd
--- zsh-5.0.7-orig/Src/zsh.mdd	2015-04-27 19:50:02.680491357 -0700
+++ zsh-5.0.7/Src/zsh.mdd	2015-04-27 19:50:17.677158471 -0700
@@ -23,7 +23,7 @@
 
 signames.c: signames1.awk signames2.awk ../config.h @SIGNAL_H@
 	$(AWK) -f $(sdir)/signames1.awk @SIGNAL_H@ >sigtmp.c
-	$(CPP) sigtmp.c >sigtmp.out
+	$(CPP) -P sigtmp.c >sigtmp.out
 	$(AWK) -f $(sdir)/signames2.awk sigtmp.out > $@
 	rm -f sigtmp.c sigtmp.out