diff --git a/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp b/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp
index b7ce1bf47ef..c7977d4b9bb 100644
--- a/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp
+++ b/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp
@@ -220,7 +220,7 @@ jobject JavaDOMEventsGlobals::CreateEventSubtype(JNIEnv *env,
         return NULL;
     }
 
-    char* buffer = (char *) eventType.GetBufferHandle();
+    char* buffer = (char *) eventType.get();
 
     if (isEventOfType(mouseEventTypes, buffer) == JNI_TRUE) {
       clazz = mouseEventClass;
diff --git a/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp b/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp
index d4a3009c476..4fc1b04e826 100644
--- a/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp
+++ b/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp
@@ -100,7 +100,7 @@ wsLoadFromStreamEvent::wsLoadFromStreamEvent(NativeBrowserControl *yourNativeBC,
 
 wsLoadFromStreamEvent::wsLoadFromStreamEvent(NativeBrowserControl *yourNativeBC,
                                              InputStreamShim *yourShim) :
-    nsActionEvent(), mNativeBrowserControl(yourNativeBC), mUriString(nsnull),
+    nsActionEvent(), mNativeBrowserControl(yourNativeBC),
     mContentType(nsnull), mProperties(nsnull), mShim(yourShim)
 {
 }
diff --git a/mozilla/java/webclient/src_moz/ns_util.cpp b/mozilla/java/webclient/src_moz/ns_util.cpp
index a11215ad4f2..f23cc9f8f87 100644
--- a/mozilla/java/webclient/src_moz/ns_util.cpp
+++ b/mozilla/java/webclient/src_moz/ns_util.cpp
@@ -33,7 +33,7 @@
 #include "nsIStringBundle.h"
 #include "nsIServiceManager.h"
 
-#include "nsString2.h"
+#include "nsString.h"
 
 #include "NativeBrowserControl.h"