diff --git a/mozilla/uriloader/extprotocol/Makefile.in b/mozilla/uriloader/extprotocol/Makefile.in
index c5482543108..e3d518f114e 100644
--- a/mozilla/uriloader/extprotocol/Makefile.in
+++ b/mozilla/uriloader/extprotocol/Makefile.in
@@ -19,14 +19,14 @@
 # Contributor(s): 
 #
 
-DEPTH		= ..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public
+DIRS		= public unix base
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/uriloader/extprotocol/base/Makefile.in b/mozilla/uriloader/extprotocol/base/Makefile.in
index 87b53c734ad..07d5ec79a26 100644
--- a/mozilla/uriloader/extprotocol/base/Makefile.in
+++ b/mozilla/uriloader/extprotocol/base/Makefile.in
@@ -28,10 +28,11 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= extprotocol
 LIBRARY_NAME	= extprotocol
+SHORT_LIBNAME	= extproto
 IS_COMPONENT	= 1
 
 
-CPPSRCS		= 	nsExternalFactory.cpp 				\
+CPPSRCS		= 	nsExternalFactory.cpp 			\
         		nsExternalProtocol.cpp			\
 				$(NULL)
 			
@@ -40,11 +41,13 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	-L$(DIST)/bin \
-	$(SHARED_LIBRARY_LIBS)	\
-	$(NSPR_LIBS) \
-	$(XPCOM_LIBS) \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/lib	\
+		-L$(DIST)/bin \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/uriloader/extprotocol/unix/Makefile.in b/mozilla/uriloader/extprotocol/unix/Makefile.in
index b116b69d1ab..71b0aff801f 100644
--- a/mozilla/uriloader/extprotocol/unix/Makefile.in
+++ b/mozilla/uriloader/extprotocol/unix/Makefile.in
@@ -29,9 +29,12 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= extprotocol
 LIBRARY_NAME	= extprotocolunix_s
 
-CPPSRCS = 							\
-				nsExternalProcotolUnix.cpp 		\
-				$(NULL)
+CPPSRCS = 		nsExternalProcotolUnix.cpp 		\
+			$(NULL)
+
+XPIDLSRCS = $(NULL)
+
+EXPORTS = $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1