diff --git a/mozilla/storage/test/Makefile.in b/mozilla/storage/test/Makefile.in
index 8ef9002e080..022884ef209 100644
--- a/mozilla/storage/test/Makefile.in
+++ b/mozilla/storage/test/Makefile.in
@@ -44,7 +44,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PROGRAM = teststorage1$(BIN_SUFFIX)
-MOZILLA_INTERNAL_API = 1
 
 CPPSRCS = storage1.cpp
 
@@ -57,7 +56,7 @@ REQUIRES = \
 
 LIBS = \
 	$(LIBS_DIR) \
-	$(XPCOM_LIBS) \
+	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
diff --git a/mozilla/storage/test/storage1.cpp b/mozilla/storage/test/storage1.cpp
index d4f73b82ef0..fdfceb1b641 100644
--- a/mozilla/storage/test/storage1.cpp
+++ b/mozilla/storage/test/storage1.cpp
@@ -5,8 +5,9 @@
 #include "nsIComponentManager.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIServiceManager.h"
+#include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsILocalFile.h"
 
 #include "mozIStorageService.h"