diff --git a/mozilla/jpeg/macbuild/JPEG.Prefix b/mozilla/jpeg/macbuild/JPEG.Prefix
index 567b947e929..f4c829e9bda 100644
--- a/mozilla/jpeg/macbuild/JPEG.Prefix
+++ b/mozilla/jpeg/macbuild/JPEG.Prefix
@@ -22,4 +22,5 @@
 //
 //
 
-#include "JPEGConfig.h"
\ No newline at end of file
+#include "MacPrefix.h"
+#include "JPEGConfig.h"
diff --git a/mozilla/jpeg/macbuild/JPEG.mcp b/mozilla/jpeg/macbuild/JPEG.mcp
index ff6c33c72b6..f354ae8bb21 100644
Binary files a/mozilla/jpeg/macbuild/JPEG.mcp and b/mozilla/jpeg/macbuild/JPEG.mcp differ
diff --git a/mozilla/jpeg/macbuild/JPEGConfig.h b/mozilla/jpeg/macbuild/JPEGConfig.h
index 366e95ad02f..fbb43656eee 100644
--- a/mozilla/jpeg/macbuild/JPEGConfig.h
+++ b/mozilla/jpeg/macbuild/JPEGConfig.h
@@ -16,6 +16,4 @@
  * Reserved.
  */
 
-#define EDITOR 1
-#undef HAVE_BOOLEAN 
-#include "IDE_Options.h"
+#undef HAVE_BOOLEAN
diff --git a/mozilla/jpeg/macbuild/JPEGDebug.Prefix b/mozilla/jpeg/macbuild/JPEGDebug.Prefix
index 8a7d2f0e921..10bbfe32c3e 100644
--- a/mozilla/jpeg/macbuild/JPEGDebug.Prefix
+++ b/mozilla/jpeg/macbuild/JPEGDebug.Prefix
@@ -22,6 +22,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
+#include "MacPrefix_debug.h"
 #include "JPEGConfig.h"
diff --git a/mozilla/js/jsj/macbuild/JSJ.Prefix b/mozilla/js/jsj/macbuild/JSJ.Prefix
index e622da47c84..04262c8d542 100644
--- a/mozilla/js/jsj/macbuild/JSJ.Prefix
+++ b/mozilla/js/jsj/macbuild/JSJ.Prefix
@@ -23,4 +23,5 @@
 //
 //
 
+#include "MacPrefix.h"
 #include "JSJConfig.h"
diff --git a/mozilla/js/jsj/macbuild/JSJConfig.h b/mozilla/js/jsj/macbuild/JSJConfig.h
index 48abc22f646..bb47a0d0c2f 100644
--- a/mozilla/js/jsj/macbuild/JSJConfig.h
+++ b/mozilla/js/jsj/macbuild/JSJConfig.h
@@ -16,10 +16,5 @@
  * Reserved.
  */
 /* ** */
-#define EDITOR 1
 
-#include "NSCrossProductDefines.h"
-#include "IDE_Options.h"
-
-
-#define MOZILLA_CLIENT 1
+/* Nuthin' to do. */
diff --git a/mozilla/js/jsj/macbuild/JSJDebug.Prefix b/mozilla/js/jsj/macbuild/JSJDebug.Prefix
index 8821204d6ed..ecb0c3f39a0 100644
--- a/mozilla/js/jsj/macbuild/JSJDebug.Prefix
+++ b/mozilla/js/jsj/macbuild/JSJDebug.Prefix
@@ -23,6 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
+#include "MacPrefix_debug.h"
 #include "JSJConfig.h"
diff --git a/mozilla/js/jsj/macbuild/JSJ_PPC.mcp b/mozilla/js/jsj/macbuild/JSJ_PPC.mcp
index 122c0faa988..f31be5cbd25 100644
Binary files a/mozilla/js/jsj/macbuild/JSJ_PPC.mcp and b/mozilla/js/jsj/macbuild/JSJ_PPC.mcp differ
diff --git a/mozilla/js/macbuild/JavaScript.Prefix b/mozilla/js/macbuild/JavaScript.Prefix
index d5055d4922d..05507fbfdd4 100644
--- a/mozilla/js/macbuild/JavaScript.Prefix
+++ b/mozilla/js/macbuild/JavaScript.Prefix
@@ -23,4 +23,5 @@
 //
 //
 
-#include "JavaScriptConfig.h"
\ No newline at end of file
+#include "MacPrefix.h"
+#include "JavaScriptConfig.h"
diff --git a/mozilla/js/macbuild/JavaScriptConfig.h b/mozilla/js/macbuild/JavaScriptConfig.h
index 248088871c4..658acd96ed2 100644
--- a/mozilla/js/macbuild/JavaScriptConfig.h
+++ b/mozilla/js/macbuild/JavaScriptConfig.h
@@ -16,11 +16,4 @@
  * Reserved.
  */
 
-#define EDITOR 1
-
-#include "NSCrossProductDefines.h"
-#include "IDE_Options.h"
-
-//#define JAVA
-
-#define MOZILLA_CLIENT 1
+/* Nuthin' to do */
diff --git a/mozilla/js/macbuild/JavaScriptDebug.Prefix b/mozilla/js/macbuild/JavaScriptDebug.Prefix
index 051e66daee1..12347b09124 100644
--- a/mozilla/js/macbuild/JavaScriptDebug.Prefix
+++ b/mozilla/js/macbuild/JavaScriptDebug.Prefix
@@ -23,6 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
-#include "JavaScriptConfig.h"
\ No newline at end of file
+#include "MacPrefix_debug.h"
+#include "JavaScriptConfig.h"
diff --git a/mozilla/js/macbuild/JavaScriptPPC.mcp b/mozilla/js/macbuild/JavaScriptPPC.mcp
index 83560548553..8ac40a4198d 100644
Binary files a/mozilla/js/macbuild/JavaScriptPPC.mcp and b/mozilla/js/macbuild/JavaScriptPPC.mcp differ
diff --git a/mozilla/modules/rdf/macbuild/RDF.Prefix b/mozilla/modules/rdf/macbuild/RDF.Prefix
index 51bfa72b7b6..3a9d3a492a2 100644
--- a/mozilla/modules/rdf/macbuild/RDF.Prefix
+++ b/mozilla/modules/rdf/macbuild/RDF.Prefix
@@ -23,5 +23,5 @@
 //
 //
 
+#include "MacPrefix_debug.h"
 #include "RDFConfig.h"
-#include <OpenTransport.h>
\ No newline at end of file
diff --git a/mozilla/modules/rdf/macbuild/RDF.mcp b/mozilla/modules/rdf/macbuild/RDF.mcp
index d6dafa1819e..912d3674285 100644
Binary files a/mozilla/modules/rdf/macbuild/RDF.mcp and b/mozilla/modules/rdf/macbuild/RDF.mcp differ
diff --git a/mozilla/modules/rdf/macbuild/RDFConfig.h b/mozilla/modules/rdf/macbuild/RDFConfig.h
index 661c1ead6c7..48e4cccaf05 100644
--- a/mozilla/modules/rdf/macbuild/RDFConfig.h
+++ b/mozilla/modules/rdf/macbuild/RDFConfig.h
@@ -16,7 +16,3 @@
  * Reserved.
  */
 #define CGLUESUPPORTED 0 // turn off C glue support to avoid conflict on create() in RDF
-
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
-#define MOZILLA_CLIENT 1
diff --git a/mozilla/modules/rdf/macbuild/RDFDebug.Prefix b/mozilla/modules/rdf/macbuild/RDFDebug.Prefix
index 294c0333055..40553dd7675 100644
--- a/mozilla/modules/rdf/macbuild/RDFDebug.Prefix
+++ b/mozilla/modules/rdf/macbuild/RDFDebug.Prefix
@@ -1,3 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
 //
 //	RDFDebug.Prefix
 //
@@ -5,7 +23,5 @@
 //
 //
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
+#include "MacPrefix_debug.h"
 #include "RDFConfig.h"
-#include <OpenTransport.h>
\ No newline at end of file
diff --git a/mozilla/nav-java/stubs/macbuild/NavJavaStubs.mcp b/mozilla/nav-java/stubs/macbuild/NavJavaStubs.mcp
index 934274c6ff6..2cfd18d8d4c 100644
Binary files a/mozilla/nav-java/stubs/macbuild/NavJavaStubs.mcp and b/mozilla/nav-java/stubs/macbuild/NavJavaStubs.mcp differ
diff --git a/mozilla/nav-java/stubs/macbuild/NavJavaStubs.prefix b/mozilla/nav-java/stubs/macbuild/NavJavaStubs.prefix
index ecc43deeaa2..26cfa26ee8c 100644
--- a/mozilla/nav-java/stubs/macbuild/NavJavaStubs.prefix
+++ b/mozilla/nav-java/stubs/macbuild/NavJavaStubs.prefix
@@ -1,14 +1,4 @@
 /* This is a Mac only file */
 
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
-
-#define MOZILLA_CLIENT 1
-#define MOCHAFILE 1
-#define COMPILER 0
-#define LAYERS 1
-#define VERSION_NUMBER "40"
-#define JAR_NAME "java"##VERSION_NUMBER##".jar"
-//#define JAVA 1
-#define EDITOR 1
-#define MOCHA 1
\ No newline at end of file
+#include "MacPrefix.h"
+#include "JavaDefines.h"
diff --git a/mozilla/sun-java/stubs/macbuild/JavaStubs.mcp b/mozilla/sun-java/stubs/macbuild/JavaStubs.mcp
index 8c8f463646f..5387142ac44 100644
Binary files a/mozilla/sun-java/stubs/macbuild/JavaStubs.mcp and b/mozilla/sun-java/stubs/macbuild/JavaStubs.mcp differ
diff --git a/mozilla/sun-java/stubs/macbuild/JavaStubs.prefix b/mozilla/sun-java/stubs/macbuild/JavaStubs.prefix
index ecc43deeaa2..26cfa26ee8c 100644
--- a/mozilla/sun-java/stubs/macbuild/JavaStubs.prefix
+++ b/mozilla/sun-java/stubs/macbuild/JavaStubs.prefix
@@ -1,14 +1,4 @@
 /* This is a Mac only file */
 
-#include "IDE_Options.h"
-#include "NSCrossProductDefines.h"
-
-#define MOZILLA_CLIENT 1
-#define MOCHAFILE 1
-#define COMPILER 0
-#define LAYERS 1
-#define VERSION_NUMBER "40"
-#define JAR_NAME "java"##VERSION_NUMBER##".jar"
-//#define JAVA 1
-#define EDITOR 1
-#define MOCHA 1
\ No newline at end of file
+#include "MacPrefix.h"
+#include "JavaDefines.h"