diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in
index c078518e599..8eb74f13b98 100644
--- a/mozilla/config/Makefile.in
+++ b/mozilla/config/Makefile.in
@@ -113,7 +113,12 @@ endif
 ifdef WRAP_SYSTEM_INCLUDES
 export::
 	if test ! -d system_wrappers; then mkdir system_wrappers; fi
-	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+		-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
+		-DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
+		-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
+		-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
+		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)/include
 endif
 
diff --git a/mozilla/config/system-headers b/mozilla/config/system-headers
index 073786a7097..ae1b923d462 100644
--- a/mozilla/config/system-headers
+++ b/mozilla/config/system-headers
@@ -973,3 +973,9 @@ plstr.h
 plarenas.h
 plarena.h
 plhash.h
+#if MOZ_NATIVE_PNG==1
+png.h
+#endif
+#if MOZ_NATIVE_ZLIB==1
+zlib.h
+#endif