diff --git a/mozilla/webshell/embed/ActiveX/ActiveXPlugin.cpp b/mozilla/webshell/embed/ActiveX/ActiveXPlugin.cpp
index 84ddbc69077..3851ec7a260 100644
--- a/mozilla/webshell/embed/ActiveX/ActiveXPlugin.cpp
+++ b/mozilla/webshell/embed/ActiveX/ActiveXPlugin.cpp
@@ -23,7 +23,7 @@ static NS_DEFINE_IID(kIPluginIID, NS_IPLUGIN_IID);
 
 static CActiveXPlugin *gpFactory = NULL;
 
-extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
+extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsISupports* serviceMgr, nsIFactory **aFactory)
 {
     if (aClass.Equals(kIPluginIID))
 	{
@@ -137,12 +137,11 @@ NS_IMETHODIMP CActiveXPlugin::LockFactory(PRBool aLock)
 ///////////////////////////////////////////////////////////////////////////////
 // nsIPlugin overrides
 
-static char *gpszMime = "application/x-activex-plugin:smp:Mozilla ActiveX Control Plug-in";
-static char *gpszPluginName = "Mozilla ActiveX Control Plug-in";
-static char *gpszPluginDesc = "Hosts ActiveX controls";
+static const char *gpszMime = "application/x-oleobject:smp:Mozilla ActiveX Control Plug-in";
+static const char *gpszPluginName = "Mozilla ActiveX Control Plug-in";
+static const char *gpszPluginDesc = "ActiveX control host";
 
-
-NS_IMETHODIMP CActiveXPlugin::Initialize(nsISupports* browserInterfaces)
+NS_IMETHODIMP CActiveXPlugin::Initialize()
 {
 	return NS_OK;
 }
@@ -166,11 +165,11 @@ NS_IMETHODIMP CActiveXPlugin::GetValue(nsPluginVariable variable, void *value)
     nsresult err = NS_OK;
     if (variable == nsPluginVariable_NameString)
 	{
-        *((char **)value) = gpszPluginName;
+        *((char **)value) = const_cast<char *>(gpszPluginName);
 	}
     else if (variable == nsPluginVariable_DescriptionString)
 	{
-        *((char **)value) = gpszPluginDesc;
+        *((char **)value) = const_cast<char *>(gpszPluginDesc);
 	}
     else
 	{
diff --git a/mozilla/webshell/embed/ActiveX/ActiveXPlugin.h b/mozilla/webshell/embed/ActiveX/ActiveXPlugin.h
index 04ebc22e247..8a49e977f72 100644
--- a/mozilla/webshell/embed/ActiveX/ActiveXPlugin.h
+++ b/mozilla/webshell/embed/ActiveX/ActiveXPlugin.h
@@ -17,7 +17,7 @@ public:
 	NS_IMETHOD LockFactory(PRBool aLock);
 
 	// nsIPlugin overrides
-    NS_IMETHOD Initialize(nsISupports* browserInterfaces);
+	NS_IMETHOD Initialize();
     NS_IMETHOD Shutdown(void);
     NS_IMETHOD GetMIMEDescription(const char* *resultingDesc);
     NS_IMETHOD GetValue(nsPluginVariable variable, void *value);
diff --git a/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.cpp b/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.cpp
index 869422f2614..6e63d82c68d 100644
--- a/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.cpp
+++ b/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.cpp
@@ -120,7 +120,12 @@ NS_IMETHODIMP CActiveXPluginInstance::SetWindow(nsPluginWindow* window)
 	return NS_OK;
 }
 
-#ifndef NEW_PLUGIN_STREAM_API
+#ifdef NEW_PLUGIN_STREAM_API
+NS_IMETHODIMP CActiveXPluginInstance::NewStream(nsIPluginStreamListener** listener)
+{
+	return NS_OK;
+}
+#else
 NS_IMETHODIMP CActiveXPluginInstance::NewStream(nsIPluginStreamPeer* peer, nsIPluginStream* *result)
 {
 	return NS_OK;
diff --git a/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.h b/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.h
index a1906f89a70..77cd2564890 100644
--- a/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.h
+++ b/mozilla/webshell/embed/ActiveX/ActiveXPluginInstance.h
@@ -7,7 +7,7 @@ protected:
 	virtual ~CActiveXPluginInstance();
 
 	CControlSite	*mControlSite;
-	nsPluginWindow	mPluginWindow;
+	nsPluginWindow	 mPluginWindow;
 
 public:
 	CActiveXPluginInstance();
@@ -25,7 +25,9 @@ public:
     NS_IMETHOD Stop(void);
     NS_IMETHOD Destroy(void);
     NS_IMETHOD SetWindow(nsPluginWindow* window);
-#ifndef NEW_PLUGIN_STREAM_API
+#ifdef NEW_PLUGIN_STREAM_API
+    NS_IMETHOD NewStream(nsIPluginStreamListener** listener);
+#else
     NS_IMETHOD NewStream(nsIPluginStreamPeer* peer, nsIPluginStream* *result);
 #endif
     NS_IMETHOD Print(nsPluginPrint* platformPrint);