diff --git a/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h b/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h
index 971d6ac0092..f5252287eda 100644
--- a/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h
+++ b/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h
@@ -25,3 +25,5 @@
 #include "MacSharedPrefix_debug.h"
 
 #undef TARGET_CARBON
+#define TARGET_CARBON 0
+#define PLUGIN_LOGGING 0
diff --git a/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h b/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h
index b55e8449474..ce0dec01dc2 100644
--- a/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h
+++ b/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h
@@ -23,3 +23,7 @@
 #define _IMPL_NS_PLUGINS 1
 
 #include "MacSharedPrefix.h"
+
+#undef TARGET_CARBON
+#define TARGET_CARBON 0
+#define PLUGIN_LOGGING 0
diff --git a/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h b/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h
index 2707a56ffed..42d2eb0bd5b 100644
--- a/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h
+++ b/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h
@@ -53,6 +53,7 @@
 #define NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID "@mozilla.org/plugin/classicpluginfactory;1"
 
 struct PRLibrary;
+class nsIServiceManagerObsolete;
 
 class nsIClassicPluginFactory : public nsISupports {
 public:
@@ -63,7 +64,7 @@ public:
     * and initializes an ns4xPlugin object, and returns it in
     * <b>result</b>.
     */
-    NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
+    NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
                             PRLibrary* aLibrary, nsIPlugin** aResult) = 0;
 };
 
diff --git a/mozilla/modules/plugin/base/public/nsPluginLogging.h b/mozilla/modules/plugin/base/public/nsPluginLogging.h
index 4acb31f3416..cf160baa7b1 100644
--- a/mozilla/modules/plugin/base/public/nsPluginLogging.h
+++ b/mozilla/modules/plugin/base/public/nsPluginLogging.h
@@ -43,7 +43,9 @@
 #ifdef PR_LOGGING
 #include "prlog.h"
 
+#ifndef PLUGIN_LOGGING    // allow external override
 #define PLUGIN_LOGGING 1  // master compile-time switch for pluging logging
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Basic Plugin Logging Usage Instructions
@@ -75,7 +77,7 @@
 //    http://www.mozilla.org/projects/nspr/reference/html/prlog.html
 
 
-#ifdef PLUGIN_LOGGING
+#if PLUGIN_LOGGING
 
 class nsPluginLogging
 {
@@ -90,7 +92,7 @@ public:
 #endif  // PR_LOGGING
 
 // Quick-use macros
-#ifdef PLUGIN_LOGGING
+#if PLUGIN_LOGGING
  #define NPN_PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                        \
    PR_LOG(nsPluginLogging::gNPNLog, a, b); \
@@ -100,7 +102,7 @@ public:
  #define NPN_PLUGIN_LOG(a, b)
 #endif
 
-#ifdef PLUGIN_LOGGING
+#if PLUGIN_LOGGING
  #define NPP_PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                         \
    PR_LOG(nsPluginLogging::gNPPLog, a, b); \
@@ -110,7 +112,7 @@ public:
  #define NPP_PLUGIN_LOG(a, b)
 #endif
 
-#ifdef PLUGIN_LOGGING
+#if PLUGIN_LOGGING
  #define PLUGIN_LOG(a, b)                              \
    PR_BEGIN_MACRO                                         \
    PR_LOG(nsPluginLogging::gPluginLog, a, b); \
diff --git a/mozilla/modules/plugin/base/public/nsplugindefs.h b/mozilla/modules/plugin/base/public/nsplugindefs.h
index 4658845a025..c3b1f1bcc70 100644
--- a/mozilla/modules/plugin/base/public/nsplugindefs.h
+++ b/mozilla/modules/plugin/base/public/nsplugindefs.h
@@ -338,6 +338,7 @@ struct nsPluginEvent {
 
 /*
  *  Non-standard event types that can be passed to HandleEvent
+ *  (These need to be kept in sync with the events defined in npapi.h.)
  */
 enum nsPluginEventType {
 #if defined(XP_MAC) || defined(XP_MACOSX)
@@ -346,6 +347,8 @@ enum nsPluginEventType {
     nsPluginEventType_AdjustCursorEvent,
     nsPluginEventType_MenuCommandEvent,
     nsPluginEventType_ClippingChangedEvent,
+    nsPluginEventType_ScrollingBeginsEvent,
+    nsPluginEventType_ScrollingEndsEvent,
 #endif /* XP_MAC || XP_MACOSX */
     nsPluginEventType_Idle                 = 0
 };
diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
index 18cb74fe0d0..2f9f9057d4f 100644
--- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp
@@ -1316,7 +1316,7 @@ _requestread(NPStream *pstream, NPByteRange *rangeList)
 {
   NPN_PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("NPN_RequestRead: stream=%p\n", (void*)pstream));
 
-#ifdef PLUGIN_LOGGING
+#if PLUGIN_LOGGING
   for(NPByteRange * range = rangeList; range != nsnull; range = range->next)
     PR_LOG(nsPluginLogging::gNPNLog,PLUGIN_LOG_NOISY, 
     ("%i-%i", range->offset, range->offset + range->length - 1));
diff --git a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
index 40ac8e66c66..88b7976b4dc 100644
--- a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
@@ -48,7 +48,7 @@ public:
     
     static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
-    NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
+    NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
                             PRLibrary* aLibrary, nsIPlugin** aResult);
 };
 
@@ -72,7 +72,7 @@ nsresult nsClassicPluginFactory::Create(nsISupports* aOuter, REFNSIID aIID, void
     return factory->QueryInterface(aIID, aResult);
 }
 
-NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
+NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
                                                PRLibrary* aLibrary, nsIPlugin** aResult)
 {
     return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aLibrary, aResult);
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 835096338ed..0e104cff093 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -4260,7 +4260,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
           nsCOMPtr<nsIClassicPluginFactory> factory = 
                    do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv);
           if (NS_SUCCEEDED(rv)) 
-            rv = factory->CreatePlugin((nsIServiceManager*)serviceManager, 
+            rv = factory->CreatePlugin(serviceManager, 
                                        pluginTag->mFileName, 
                                        pluginTag->mLibrary, 
                                        &pluginTag->mEntryPoint);