diff --git a/mozilla/dbm/macbuild/DBM.Prefix b/mozilla/dbm/macbuild/DBM.Prefix
index 92959fce622..2f6b68e03d3 100644
--- a/mozilla/dbm/macbuild/DBM.Prefix
+++ b/mozilla/dbm/macbuild/DBM.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.
+ */
+
 //
 //	DBM.Prefix
 //
@@ -6,4 +24,5 @@
 //
 
 
-#include "DBMConfig.h"
\ No newline at end of file
+#include "MacPrefix.h"
+#include "DBMConfig.h"
diff --git a/mozilla/dbm/macbuild/DBMConfig.h b/mozilla/dbm/macbuild/DBMConfig.h
index ec6e8988bcc..69d681812b1 100644
--- a/mozilla/dbm/macbuild/DBMConfig.h
+++ b/mozilla/dbm/macbuild/DBMConfig.h
@@ -1,34 +1,19 @@
-/* 
- *           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
- *              NETSCAPE COMMUNICATIONS CORPORATION
- * Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
- * Reserved.  Use of this Source Code is subject to the terms of the
- * applicable license agreement from Netscape Communications Corporation.
- * The copyright notice(s) in this Source Code does not indicate actual or
- * intended publication of this Source Code.
+/* -*- 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.
  */
 
-// we have to do this here because ConditionalMacros.h will be included from
-// within OpenTptInternet.h and will stupidly define these to 1 if they
-// have not been previously defined. The new PowerPlant (CWPro1) requires that
-// this be set to 0. (pinkerton)
-#define OLDROUTINENAMES 0
-#ifndef OLDROUTINELOCATIONS
-	#define OLDROUTINELOCATIONS	0
-#endif
-
-#define XP_MAC 1
-#define _PR_NO_PREEMPT 1
-#define _NO_FAST_STRING_INLINES_ 1
-#define NSPR20 1
-
-// OpenTransport.h has changed to not include the error messages we need from
-// it unless this is defined. Why? dunnno...(pinkerton)
-#define OTUNIXERRORS 1
-
-#include "IDE_Options.h"
-
-/* Make sure that "macintosh" is defined. */
-#ifndef macintosh
-#define macintosh 1
-#endif
+/* Nothing to do here. If you need DBM-specific defines, put them here */
diff --git a/mozilla/dbm/macbuild/DBMDebug.Prefix b/mozilla/dbm/macbuild/DBMDebug.Prefix
index b6db0d66f0f..a3bd75f0a85 100644
--- a/mozilla/dbm/macbuild/DBMDebug.Prefix
+++ b/mozilla/dbm/macbuild/DBMDebug.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.
+ */
+
 //
 //	DBMDebug.Prefix
 //
@@ -5,7 +23,6 @@
 //
 //
 
+#include "MacPrefix_debug.h"
+#include "DBMConfig.h"
 
-#define DEBUG 1
-#define DEVELOPER_DEBUG 1
-#include "DBMConfig.h"
\ No newline at end of file
diff --git a/mozilla/dbm/macbuild/DBMPPC.mcp b/mozilla/dbm/macbuild/DBMPPC.mcp
index bcba1d8fadc..610683f3312 100644
Binary files a/mozilla/dbm/macbuild/DBMPPC.mcp and b/mozilla/dbm/macbuild/DBMPPC.mcp differ
diff --git a/mozilla/modules/security/freenav/macbuild/NoSecurity.mcp b/mozilla/modules/security/freenav/macbuild/NoSecurity.mcp
index 185b6b421e3..0259426716f 100644
Binary files a/mozilla/modules/security/freenav/macbuild/NoSecurity.mcp and b/mozilla/modules/security/freenav/macbuild/NoSecurity.mcp differ
diff --git a/mozilla/modules/security/freenav/macbuild/SecurityConfig.h b/mozilla/modules/security/freenav/macbuild/SecurityConfig.h
index fc53c59bee1..70fa7785d72 100644
--- a/mozilla/modules/security/freenav/macbuild/SecurityConfig.h
+++ b/mozilla/modules/security/freenav/macbuild/SecurityConfig.h
@@ -19,6 +19,9 @@
 // within OpenTptInternet.h and will stupidly define these to 1 if they
 // have not been previously defined. The new PowerPlant (CWPro1) requires that
 // this be set to 0. (pinkerton)
+
+#error "Don't use me"
+
 #define OLDROUTINENAMES 0
 #ifndef OLDROUTINELOCATIONS
 	#define OLDROUTINELOCATIONS	0
diff --git a/mozilla/xpcom/macbuild/xpcomConfig.h b/mozilla/xpcom/macbuild/xpcomConfig.h
index 9ad5a4fe745..18071a403e3 100644
--- a/mozilla/xpcom/macbuild/xpcomConfig.h
+++ b/mozilla/xpcom/macbuild/xpcomConfig.h
@@ -1,3 +1,5 @@
+#error "Don't use me"
+
 #define EDITOR 1
 
 #include "NSCrossProductDefines.h"