diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in
index 60cb85b8992..f19d7a51db7 100644
--- a/mozilla/widget/src/build/Makefile.in
+++ b/mozilla/widget/src/build/Makefile.in
@@ -35,9 +35,12 @@ LOCAL_INCLUDES := \
 	$(NULL)
 
 CPPSRCS_gtk	:= \
-	GTKdlldeps.cpp \
 	nsGTKWidgetFactory.cpp
 
+ifndef MKSHLIB_FORCE_ALL
+CPPSRCS_gtk += GTKdlldeps.cpp
+endif
+
 # nsMotifWidgetFactory actually has no Motif/Xt/Xlib code in it -- surprise!
 
 CPPSRCS_motif	:= \
@@ -53,26 +56,29 @@ include $(topsrcdir)/config/config.mk
 
 CFLAGS += $(TK_CFLAGS)
 
-ifeq ($(OS_ARCH),IRIX)
-LD = $(CCC)
-LD_ALL = -all
-LD_NONE = -none
-endif
-
 TOOLKIT_DSO_LDOPTS = $(addprefix $(DIST)/lib/libraptorwidget, \
 			$(addsuffix _s.a, $(MOZ_TOOLKIT)))
 
-EXTRA_DSO_LDOPTS+=\
-	$(TOOLKIT_DSO_LDOPTS) \
+SHARED_LIBRARY_LIBS =			    \
+	$(TOOLKIT_DSO_LDOPTS)		    \
 	$(DIST)/lib/libraptorbasewidget_s.a \
-	-L$(DIST)/bin \
-	-lxpcom \
-	-lraptorbase \
-	-lreg \
-	$(NSPR_LIBS)
+	$(NULL)
+
+EXTRA_DSO_LDOPTS+=	       \
+	$(MKSHLIB_FORCE_ALL)   \
+	$(SHARED_LIBRARY_LIBS) \
+	$(MKSHLIB_UNFORCE_ALL) \
+	-L$(DIST)/bin	       \
+	-lxpcom		       \
+	-lraptorbase	       \
+	-lreg		       \
+	$(NSPR_LIBS)	       \
+	$(NULL)
 
 EXTRA_DSO_LDOPTS += $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS)
 
 NO_STATIC_LIB=1
 
 include $(topsrcdir)/config/rules.mk
+
+$(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
diff --git a/mozilla/widget/src/build/nsGTKWidgetFactory.cpp b/mozilla/widget/src/build/nsGTKWidgetFactory.cpp
index 3e336c7b37b..a551aa71577 100644
--- a/mozilla/widget/src/build/nsGTKWidgetFactory.cpp
+++ b/mozilla/widget/src/build/nsGTKWidgetFactory.cpp
@@ -109,6 +109,7 @@ private:
 
 nsWidgetFactory::nsWidgetFactory(const nsCID &aClass)   
 {   
+ NS_INIT_REFCNT();
  mClassID = aClass;
 }