diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in
index 22a4eddd70a..cbc19bae447 100644
--- a/mozilla/js/src/xpconnect/shell/Makefile.in
+++ b/mozilla/js/src/xpconnect/shell/Makefile.in
@@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcshell
 SIMPLE_PROGRAMS	= xpcshell$(BIN_SUFFIX)
-MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpconnect \
 		  xpcom \
@@ -56,6 +55,7 @@ REQUIRES	= xpconnect \
 CPPSRCS		= xpcshell.cpp
 
 LIBS		= \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
diff --git a/mozilla/js/src/xpconnect/shell/xpcshell.cpp b/mozilla/js/src/xpconnect/shell/xpcshell.cpp
index 665a150eb1c..3589386101a 100644
--- a/mozilla/js/src/xpconnect/shell/xpcshell.cpp
+++ b/mozilla/js/src/xpconnect/shell/xpcshell.cpp
@@ -45,6 +45,8 @@
 /* XPConnect JavaScript interactive shell. */
 
 #include <stdio.h>
+#include "nsServiceManagerUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIXPConnect.h"
 #include "nsIXPCScriptable.h"
 #include "nsIInterfaceInfo.h"
diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in
index c713a59aa57..c5beb8cdd7e 100644
--- a/mozilla/js/src/xpconnect/tests/Makefile.in
+++ b/mozilla/js/src/xpconnect/tests/Makefile.in
@@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= TestXPC
 SIMPLE_PROGRAMS = TestXPC$(BIN_SUFFIX)
-MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpconnect \
 		  xpcom \
@@ -54,11 +53,16 @@ REQUIRES	= xpconnect \
 		  xpconnect_tests \
 		  $(NULL)
 
-DIRS		= idl components
+DIRS		= idl
+
+ifndef MOZ_ENABLE_LIBXUL
+DIRS += components
+endif
 
 CPPSRCS		= TestXPC.cpp
 
 LIBS		= \
+		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(LIBS_DIR) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
diff --git a/mozilla/js/src/xpconnect/tests/TestXPC.cpp b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
index bfd47c9c4e5..cfb3a6d8f64 100644
--- a/mozilla/js/src/xpconnect/tests/TestXPC.cpp
+++ b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
@@ -42,6 +42,8 @@
 
 #include <stdio.h>
 
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
 #include "nsIXPConnect.h"
 #include "nsIScriptError.h"
 #include "nsIServiceManager.h"
@@ -52,8 +54,9 @@
 #include "nsMemory.h"
 #include "nsIXPCSecurityManager.h"
 #include "nsICategoryManager.h"
-#include "nsString.h"
 #include "nsIVariant.h"
+#include "nsStringAPI.h"
+#include "nsEmbedString.h"
 
 #include "jsapi.h"
 
@@ -515,7 +518,7 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc)
         goto out;
     }
 
-    if(d_in != d_out)
+    if(!d_in.Equals(d_out))
     {
         printf(" JS to native for %%is returned the wrong value -- FAILED!\n");
         goto out;