diff --git a/mailnews/base/macbuild/msgCore.mcp b/mailnews/base/macbuild/msgCore.mcp
new file mode 100644
index 000000000000..8f558c3c5eb3
Binary files /dev/null and b/mailnews/base/macbuild/msgCore.mcp differ
diff --git a/mailnews/base/macbuild/msgCorePrefix.h b/mailnews/base/macbuild/msgCorePrefix.h
new file mode 100644
index 000000000000..9df74ad1048a
--- /dev/null
+++ b/mailnews/base/macbuild/msgCorePrefix.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix.h"
diff --git a/mailnews/base/macbuild/msgCorePrefixDebug.h b/mailnews/base/macbuild/msgCorePrefixDebug.h
new file mode 100644
index 000000000000..d3c50b8db2f6
--- /dev/null
+++ b/mailnews/base/macbuild/msgCorePrefixDebug.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix_debug.h"
diff --git a/mailnews/base/util/macbuild/msgUtil.mcp b/mailnews/base/util/macbuild/msgUtil.mcp
new file mode 100644
index 000000000000..809900608098
Binary files /dev/null and b/mailnews/base/util/macbuild/msgUtil.mcp differ
diff --git a/mailnews/base/util/macbuild/msgUtilPrefix.h b/mailnews/base/util/macbuild/msgUtilPrefix.h
new file mode 100644
index 000000000000..9df74ad1048a
--- /dev/null
+++ b/mailnews/base/util/macbuild/msgUtilPrefix.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix.h"
diff --git a/mailnews/base/util/macbuild/msgUtilPrefixDebug.h b/mailnews/base/util/macbuild/msgUtilPrefixDebug.h
new file mode 100644
index 000000000000..d3c50b8db2f6
--- /dev/null
+++ b/mailnews/base/util/macbuild/msgUtilPrefixDebug.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix_debug.h"
diff --git a/mailnews/compose/macbuild/msgCompose.mcp b/mailnews/compose/macbuild/msgCompose.mcp
new file mode 100644
index 000000000000..e002a701c5bc
Binary files /dev/null and b/mailnews/compose/macbuild/msgCompose.mcp differ
diff --git a/mailnews/compose/macbuild/msgComposePrefix.h b/mailnews/compose/macbuild/msgComposePrefix.h
new file mode 100644
index 000000000000..9df74ad1048a
--- /dev/null
+++ b/mailnews/compose/macbuild/msgComposePrefix.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix.h"
diff --git a/mailnews/compose/macbuild/msgComposePrefixDebug.h b/mailnews/compose/macbuild/msgComposePrefixDebug.h
new file mode 100644
index 000000000000..d3c50b8db2f6
--- /dev/null
+++ b/mailnews/compose/macbuild/msgComposePrefixDebug.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix_debug.h"
diff --git a/mailnews/db/macbuild/msgDB.mcp b/mailnews/db/macbuild/msgDB.mcp
new file mode 100644
index 000000000000..2bc4f13be5c0
Binary files /dev/null and b/mailnews/db/macbuild/msgDB.mcp differ
diff --git a/mailnews/db/macbuild/msgDBPrefix.h b/mailnews/db/macbuild/msgDBPrefix.h
new file mode 100644
index 000000000000..9df74ad1048a
--- /dev/null
+++ b/mailnews/db/macbuild/msgDBPrefix.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix.h"
diff --git a/mailnews/db/macbuild/msgDBPrefixDebug.h b/mailnews/db/macbuild/msgDBPrefixDebug.h
new file mode 100644
index 000000000000..d3c50b8db2f6
--- /dev/null
+++ b/mailnews/db/macbuild/msgDBPrefixDebug.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix_debug.h"
diff --git a/mailnews/local/macbuild/msglocal.mcp b/mailnews/local/macbuild/msglocal.mcp
new file mode 100644
index 000000000000..eb1b21e2cae1
Binary files /dev/null and b/mailnews/local/macbuild/msglocal.mcp differ
diff --git a/mailnews/local/macbuild/msglocalPrefix.h b/mailnews/local/macbuild/msglocalPrefix.h
new file mode 100644
index 000000000000..9df74ad1048a
--- /dev/null
+++ b/mailnews/local/macbuild/msglocalPrefix.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix.h"
diff --git a/mailnews/local/macbuild/msglocalPrefixDebug.h b/mailnews/local/macbuild/msglocalPrefixDebug.h
new file mode 100644
index 000000000000..d3c50b8db2f6
--- /dev/null
+++ b/mailnews/local/macbuild/msglocalPrefixDebug.h
@@ -0,0 +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.
+ */
+
+
+
+#include "MacPrefix_debug.h"