diff --git a/js/macbuild/LiveConnect.mcp b/js/macbuild/LiveConnect.mcp
index a7707574f83..875b94a13bb 100644
Binary files a/js/macbuild/LiveConnect.mcp and b/js/macbuild/LiveConnect.mcp differ
diff --git a/layout/macbuild/layout.mcp b/layout/macbuild/layout.mcp
index bf43b1ca6f8..2ef2bb0f1ce 100644
Binary files a/layout/macbuild/layout.mcp and b/layout/macbuild/layout.mcp differ
diff --git a/modules/oji/macbuild/oji.mcp b/modules/oji/macbuild/oji.mcp
index 0069f126235..ece874095e3 100644
Binary files a/modules/oji/macbuild/oji.mcp and b/modules/oji/macbuild/oji.mcp differ
diff --git a/modules/oji/src/nsJVMManager.cpp b/modules/oji/src/nsJVMManager.cpp
index e1b6e230c34..8eb3bfaded1 100644
--- a/modules/oji/src/nsJVMManager.cpp
+++ b/modules/oji/src/nsJVMManager.cpp
@@ -24,7 +24,9 @@
 //#include "npglue.h"
 #include "prefapi.h"
 #include "np.h"
+#ifndef XP_MAC
 #include "primpl.h"
+#endif
 #include "prio.h"
 #include "prmem.h"
 #include "prthread.h"
diff --git a/modules/plugin/base/macbuild/plugin.mcp b/modules/plugin/base/macbuild/plugin.mcp
index cad7ab31500..c5ce6332d75 100644
Binary files a/modules/plugin/base/macbuild/plugin.mcp and b/modules/plugin/base/macbuild/plugin.mcp differ
diff --git a/modules/plugin/macbuild/plugin.mcp b/modules/plugin/macbuild/plugin.mcp
index cad7ab31500..c5ce6332d75 100644
Binary files a/modules/plugin/macbuild/plugin.mcp and b/modules/plugin/macbuild/plugin.mcp differ