Index: /trunk/src/libs/libpng-1.2.8/Makefile.kmk
===================================================================
--- /trunk/src/libs/libpng-1.2.8/Makefile.kmk	(revision 33893)
+++ /trunk/src/libs/libpng-1.2.8/Makefile.kmk	(revision 33894)
@@ -5,5 +5,5 @@
 
 #
-# Copyright (C) 2006-2008 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21,5 +21,5 @@
 LIBRARIES += VBox-libpng
 VBox-libpng_TEMPLATE = VBOXR3NP
-VBox-libpng_INCS = ../zlib-1.2.1
+VBox-libpng_SDKS = VBOX_ZLIB
 VBox-libpng_SOURCES = \
 	png.c \
Index: /trunk/src/libs/zlib-1.2.1/zconf.h
===================================================================
--- /trunk/src/libs/zlib-1.2.1/zconf.h	(revision 33893)
+++ /trunk/src/libs/zlib-1.2.1/zconf.h	(revision 33894)
@@ -13,4 +13,43 @@
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
  */
+#ifdef VBOX /* Map public symbols to make sure the build is sane. */
+#  define deflateInit_          vboxzlib_deflateInit_
+#  define deflate               vboxzlib_deflate
+#  define deflateEnd            vboxzlib_deflateEnd
+#  define inflateInit_          vboxzlib_inflateInit_
+#  define inflate               vboxzlib_inflate
+#  define inflateEnd            vboxzlib_inflateEnd
+#  define deflateInit2_         vboxzlib_deflateInit2_
+#  define deflateSetDictionary  vboxzlib_deflateSetDictionary
+#  define deflateCopy           vboxzlib_deflateCopy
+#  define deflateReset          vboxzlib_deflateReset
+#  define deflatePrime          vboxzlib_deflatePrime
+#  define deflateParams         vboxzlib_deflateParams
+#  define deflateBound          vboxzlib_deflateBound
+#  define inflateInit2_         vboxzlib_inflateInit2_
+#  define inflateSetDictionary  vboxzlib_inflateSetDictionary
+#  define inflateSync           vboxzlib_inflateSync
+#  define inflateSyncPoint      vboxzlib_inflateSyncPoint
+#  define inflateCopy           vboxzlib_inflateCopy
+#  define inflateReset          vboxzlib_inflateReset
+#  define compress              vboxzlib_compress
+#  define compress2             vboxzlib_compress2
+#  define compressBound         vboxzlib_compressBound
+#  define uncompress            vboxzlib_uncompress
+#  define adler32               vboxzlib_adler32
+#  define crc32                 vboxzlib_crc32
+#  define get_crc_table         vboxzlib_get_crc_table
+
+#  define Byte                  vboxzlib_Byte
+#  define uInt                  vboxzlib_uInt
+#  define uLong                 vboxzlib_uLong
+#  define Bytef                 vboxzlib_Bytef
+#  define charf                 vboxzlib_charf
+#  define intf                  vboxzlib_intf
+#  define uIntf                 vboxzlib_uIntf
+#  define uLongf                vboxzlib_uLongf
+#  define voidpf                vboxzlib_voidpf
+#  define voidp                 vboxzlib_voidp
+#else /* !VBOX */
 #ifdef Z_PREFIX
 #  define deflateInit_  z_deflateInit_
@@ -52,4 +91,5 @@
 #  define voidp         z_voidp
 #endif
+#endif /*!VBOX*/
 
 #if defined(__MSDOS__) && !defined(MSDOS)