diff --git a/mozilla/webshell/tests/viewer/nsMacMain.cpp b/mozilla/webshell/tests/viewer/nsMacMain.cpp
index c65f45625e2..40eb2b7464f 100644
--- a/mozilla/webshell/tests/viewer/nsMacMain.cpp
+++ b/mozilla/webshell/tests/viewer/nsMacMain.cpp
@@ -36,12 +36,36 @@
 #include <Resources.h>
 #include <Dialogs.h>
 
-#include <PP_Messages.h>		// for PP standard menu commands
 #include "nsMacMessagePump.h"	// for the windowless menu event handler
 #include "nsILeakDetector.h"
 
 #include "macstdlibextras.h"
 
+typedef		SInt32			MessageT;
+typedef   PRUint32    Uint32;
+const MessageT	cmd_Undo			= 11;	// nil
+const MessageT	cmd_Cut				= 12;	// nil
+const MessageT	cmd_Copy			= 13;	// nil
+const MessageT	cmd_Paste			= 14;	// nil
+const MessageT	cmd_Clear			= 15;	// nil
+const MessageT	cmd_SelectAll		= 16;	// nil
+
+const MessageT	cmd_About			= 1;	// nil
+
+					// File Menu
+const MessageT	cmd_New				= 2;	// nil
+const MessageT	cmd_Open			= 3;	// nil
+const MessageT	cmd_Close			= 4;	// nil
+const MessageT	cmd_Save			= 5;	// nil
+const MessageT	cmd_SaveAs			= 6;	// nil
+const MessageT	cmd_Revert			= 7;	// nil
+const MessageT	cmd_PageSetup		= 8;	// nil
+const MessageT	cmd_Print			= 9;	// nil
+const MessageT	cmd_PrintOne		= 17;	// nil
+const MessageT	cmd_Quit			= 10;	// nil
+const MessageT	cmd_Preferences		= 27;	// nil
+
+
 enum
 {
 	menu_First = 128,
diff --git a/mozilla/widget/src/mac/nsMacEventHandler.cpp b/mozilla/widget/src/mac/nsMacEventHandler.cpp
index d00207da07d..29d83771bf0 100644
--- a/mozilla/widget/src/mac/nsMacEventHandler.cpp
+++ b/mozilla/widget/src/mac/nsMacEventHandler.cpp
@@ -34,6 +34,7 @@
 #include <Script.h>
 #include "nsCarbonHelpers.h"
 #include "nsIRollupListener.h"
+#include <locale>
 
 
 //#define DEBUG_TSM
diff --git a/mozilla/widget/src/mac/nsTextAreaWidget.cpp b/mozilla/widget/src/mac/nsTextAreaWidget.cpp
index d1a689c980f..cfdb7e20eb9 100644
--- a/mozilla/widget/src/mac/nsTextAreaWidget.cpp
+++ b/mozilla/widget/src/mac/nsTextAreaWidget.cpp
@@ -46,7 +46,14 @@ NS_IMPL_RELEASE(nsTextAreaWidget);
 //-------------------------------------------------------------------------
 
 #include <Scrap.h>
-#include <PP_Messages.h>		// for PP standard menu commands
+
+typedef		SInt32			MessageT;
+typedef   PRUint32    Uint32;
+const MessageT	cmd_Cut				= 12;	// nil
+const MessageT	cmd_Copy			= 13;	// nil
+const MessageT	cmd_Paste			= 14;	// nil
+const MessageT	cmd_Clear			= 15;	// nil
+const MessageT	cmd_SelectAll		= 16;	// nil
 enum
 {
 	menu_Apple = 128,
diff --git a/mozilla/widget/src/mac/nsTextWidget.cpp b/mozilla/widget/src/mac/nsTextWidget.cpp
index 53f4c260380..cc0c5e39e5b 100644
--- a/mozilla/widget/src/mac/nsTextWidget.cpp
+++ b/mozilla/widget/src/mac/nsTextWidget.cpp
@@ -45,7 +45,15 @@ NS_IMPL_RELEASE(nsTextWidget);
 //-------------------------------------------------------------------------
 
 #include <Scrap.h>
-#include <PP_Messages.h>		// for PP standard menu commands
+
+typedef		SInt32			MessageT;
+typedef   PRUint32    Uint32;
+const MessageT	cmd_Cut				= 12;	// nil
+const MessageT	cmd_Copy			= 13;	// nil
+const MessageT	cmd_Paste			= 14;	// nil
+const MessageT	cmd_Clear			= 15;	// nil
+const MessageT	cmd_SelectAll		= 16;	// nil
+
 enum
 {
 	menu_Apple = 128,