diff --git a/mozilla/extensions/java/xpcom/Makefile.in b/mozilla/extensions/java/xpcom/Makefile.in
index 8207b94dab2..cbab8691ef2 100644
--- a/mozilla/extensions/java/xpcom/Makefile.in
+++ b/mozilla/extensions/java/xpcom/Makefile.in
@@ -41,7 +41,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
 
 MODULE		= javaxpcom
 LIBRARY_NAME	= javaxpcom
diff --git a/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp b/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
index 4c18f6b7aec..db284e86e29 100644
--- a/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
+++ b/mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
@@ -1272,8 +1272,8 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult)
   if (!aResult)
     return NS_ERROR_NULL_POINTER;
 
-  long xpcom_obj = env->CallStaticIntMethod(xpcomJavaProxyClass,
-                                            getNativeXPCOMInstMID, aJavaObject);
+  long xpcom_obj = env->CallStaticLongMethod(xpcomJavaProxyClass,
+                                             getNativeXPCOMInstMID, aJavaObject);
 
   if (!xpcom_obj || env->ExceptionCheck()) {
     return NS_ERROR_FAILURE;
diff --git a/mozilla/uriloader/base/Makefile.in b/mozilla/uriloader/base/Makefile.in
index 19722fa0d83..213d125745b 100644
--- a/mozilla/uriloader/base/Makefile.in
+++ b/mozilla/uriloader/base/Makefile.in
@@ -79,6 +79,7 @@ SDK_XPIDLSRCS = 						\
 JAVA_XPIDLSRCS = \
 				nsIDownload.idl \
 				nsITransfer.idl \
+				nsIWebProgressListener2.idl \
 				$(NULL)
 
 XPIDLSRCS = 							\