diff --git a/mozilla/modules/libimg/src/MIMGCB.c b/mozilla/modules/libimg/src/MIMGCB.c
index 4ccc125d5b2..6bc72fadf8f 100644
--- a/mozilla/modules/libimg/src/MIMGCB.c
+++ b/mozilla/modules/libimg/src/MIMGCB.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; -*- */
 /*******************************************************************************
- * Source date: 3 Jun 1998 00:22:02 GMT
+ * Source date: 14 Jul 1998 19:28:58 GMT
  * netscape/libimg/IMGCB module C stub file
  * Generated by jmc version 1.8 -- DO NOT EDIT
  ******************************************************************************/
diff --git a/mozilla/modules/libimg/src/MPSIMGCB.c b/mozilla/modules/libimg/src/MPSIMGCB.c
index cdd18d854f7..f72311b1468 100644
--- a/mozilla/modules/libimg/src/MPSIMGCB.c
+++ b/mozilla/modules/libimg/src/MPSIMGCB.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; -*- */
 /*******************************************************************************
- * Source date: 3 Jun 1998 00:22:02 GMT
+ * Source date: 14 Jul 1998 19:28:58 GMT
  * netscape/libimg/PSIMGCB module C stub file
  * Generated by jmc version 1.8 -- DO NOT EDIT
  ******************************************************************************/
diff --git a/mozilla/modules/libimg/src/dither.c b/mozilla/modules/libimg/src/dither.c
index c9670fe55e9..b952592f899 100644
--- a/mozilla/modules/libimg/src/dither.c
+++ b/mozilla/modules/libimg/src/dither.c
@@ -24,8 +24,8 @@
 
 #include "jinclude.h"
 #include "jpeglib.h"
-#include "jpegint.h"
 #include "jerror.h"
+#include "jpegint.h"
 
 
 /* BEGIN code adapted from jpeg library */
@@ -67,7 +67,7 @@ il_setup_quantize(void)
 	the_sample_range_limit = table;
 
 	/* First segment of "simple" table: limit[x] = 0 for x < 0 */
-	MEMZERO(table - (MAXJSAMPLE+1), (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));
+	XP_BZERO(table - (MAXJSAMPLE+1), (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));
 
 	/* Main part of "simple" table: limit[x] = x */
 	for (i = 0; i <= MAXJSAMPLE; i++)
@@ -80,9 +80,9 @@ il_setup_quantize(void)
 		table[i] = MAXJSAMPLE;
 
 	/* Second half of post-IDCT table */
-	MEMZERO(table + (2 * (MAXJSAMPLE+1)),
+	XP_BZERO(table + (2 * (MAXJSAMPLE+1)),
 			(2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * SIZEOF(JSAMPLE));
-	MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
+	XP_MEMCPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
 			the_sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
 
 	return TRUE;