diff --git a/src/modules/Gz/zlibmod.c b/src/modules/Gz/zlibmod.c
index 983334800fbb4c4c5cc7cba078eea16f4867c9c6..12e66c9194b9474c847b4348b5e20fe44349fa6f 100644
--- a/src/modules/Gz/zlibmod.c
+++ b/src/modules/Gz/zlibmod.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: zlibmod.c,v 1.74 2006/08/02 20:53:55 mast Exp $
+|| $Id: zlibmod.c,v 1.75 2006/08/02 21:40:48 mast Exp $
 */
 
 #include "global.h"
@@ -219,8 +219,8 @@ static void free_pack(struct zipper *z)
   toss_buffer((dynamic_buffer *)z->gz.opaque);
 }
 
-void pack(struct pike_string *data, dynamic_buffer *buf,
-	  int level, int strategy, int wbits)
+void zlibmod_pack(struct pike_string *data, dynamic_buffer *buf,
+		  int level, int strategy, int wbits)
 {
   struct zipper z;
   ONERROR err;
@@ -299,7 +299,7 @@ static void gz_pack(INT32 args)
   if( raw )
     wbits = -wbits;
 
-  pack(data, &buf, level, strategy, wbits);
+  zlibmod_pack(data, &buf, level, strategy, wbits);
 
   pop_n_elems(args);
   push_string(low_free_buf(&buf));
@@ -794,7 +794,7 @@ PIKE_MODULE_INIT
   ADD_FUNCTION("pack",gz_pack,tFunc(tStr tOr(tVoid,tInt01) tOr(tVoid,tInt) tOr(tVoid,tInt),tStr),0);
 
   PIKE_MODULE_EXPORT(Gz, crc32);
-  PIKE_MODULE_EXPORT(Gz, pack);
+  PIKE_MODULE_EXPORT(Gz, zlibmod_pack);
 #else
   if(!TEST_COMPAT(7,6))
     HIDE_MODULE();
diff --git a/src/modules/Image/encodings/png.c b/src/modules/Image/encodings/png.c
index 10695ddbe6c1fbd44a07a2c1eb2df1ec759c22ef..b9125374a742301394e3940ef68eaa1335dc8804 100644
--- a/src/modules/Image/encodings/png.c
+++ b/src/modules/Image/encodings/png.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: png.c,v 1.85 2006/08/02 16:23:28 nilsson Exp $
+|| $Id: png.c,v 1.86 2006/08/02 21:40:48 mast Exp $
 */
 
 #include "global.h"
@@ -39,10 +39,10 @@ typedef unsigned INT32 (_crc32)(unsigned INT32, unsigned char*,
 				unsigned INT32);
 typedef void (_pack)(struct pike_string*, dynamic_buffer*, int, int, int);
 static _crc32 *crc32;
-static _pack *pack;
+static _pack *zlibmod_pack;
 #else
 extern unsigned INT32 crc32(unsigned INT32, unsigned char*, unsigned INT32);
-extern void pack(struct pike_string*, dynamic_buffer*, int, int, int);
+extern void zlibmod_pack(struct pike_string*, dynamic_buffer*, int, int, int);
 #endif
 
 static struct pike_string *param_palette;
@@ -139,7 +139,7 @@ static void png_compress(int style, int zlevel, int zstrategy)
   if (style)
     Pike_error("Internal error: Illegal decompression style %d.\n",style);
 
-  pack(Pike_sp[-1].u.string, &buf, zlevel, zstrategy, 15);
+  zlibmod_pack(Pike_sp[-1].u.string, &buf, zlevel, zstrategy, 15);
 
   pop_stack();
   push_string(low_free_buf(&buf));
@@ -1828,8 +1828,8 @@ void init_image_png(void)
 {
 #ifdef DYNAMIC_MODULE
    crc32 = PIKE_MODULE_IMPORT(Gz, crc32);
-   pack = PIKE_MODULE_IMPORT(Gz, pack);
-   if(!crc32 || !pack) {
+   zlibmod_pack = PIKE_MODULE_IMPORT(Gz, zlibmod_pack);
+   if(!crc32 || !zlibmod_pack) {
      yyerror("Could not load Image module.");
      return;
    }