diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 854c0bb1dd6..455a4d7a1e9 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -30,7 +30,10 @@ MOZ_MONOLITHIC_TOOLKIT = @MOZ_MONOLITHIC_TOOLKIT@
 ### XXX ### BROKEN MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@
 ### XXX ### BROKEN MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@
 
-MOZ_TIMER_LIBS = @MOZ_TIMER_LIBS@
+MOZ_TIMER_LIBS             = @MOZ_TIMER_LIBS@
+MOZ_NECKO_UTIL_LIBS        = $(DIST)/lib/libneckoutil_s.a
+MOZ_REGISTRY_LIBS          = $(DIST)/lib/libmozreg_s.a
+MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.a
 
 MOZ_GFX_TOOLKIT_LDFLAGS     = -lgfx_$(MOZ_WIDGET_TOOLKIT) $(MOZ_XLIBRGB_LDFLAGS)
 MOZ_WIDGET_TOOLKIT_LDFLAGS	= -lwidget_$(MOZ_WIDGET_TOOLKIT)
diff --git a/mozilla/configure.in b/mozilla/configure.in
index d9728a680c5..b78f732bfc9 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -2717,7 +2717,7 @@ dnl =
 dnl = Set the timer libs according to MOZ_MONOLITHIC_TOOLKIT
 dnl =
 dnl ========================================================
-MOZ_TIMER_LIBS=-ltimer_s
+MOZ_TIMER_LIBS='$(DIST)/lib/libtimer_s.a'
 
 # Beos needs to link the timer in dynamically
 case "$target" in
diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in
index 489707785d7..009fa9150c1 100644
--- a/mozilla/dom/src/build/Makefile.in
+++ b/mozilla/dom/src/build/Makefile.in
@@ -41,16 +41,14 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libjsdomrange_s.a \
 		$(DIST)/lib/libjsdomhtml_s.a \
 		$(DIST)/lib/libjsdomcss_s.a \
-		$(DIST)/lib/libneckoutil_s.a \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
-		-L$(DIST)/lib \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
-		-L$(DIST)/bin \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/base/Makefile.in b/mozilla/editor/base/Makefile.in
index 8e7937772b4..79f98f73f9a 100644
--- a/mozilla/editor/base/Makefile.in
+++ b/mozilla/editor/base/Makefile.in
@@ -65,8 +65,7 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index cc887be11f8..cd646642c7e 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -72,11 +72,10 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib \
-		-limg_s \
-		-lneckoutil_s \
-		-lmozutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
+		$(DIST)/lib/libimg_s.a \
+		$(DIST)/lib/libmozutil_s.a \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/gfx/tests/coverage/Makefile.in b/mozilla/gfx/tests/coverage/Makefile.in
index c94f23f21eb..bdcdfacab00 100644
--- a/mozilla/gfx/tests/coverage/Makefile.in
+++ b/mozilla/gfx/tests/coverage/Makefile.in
@@ -32,7 +32,7 @@ CPPSRCS		= \
 LIBS		= \
 		-lxpcom \
 		-lmozjs \
-		-lwidgetsupport_s \
+		$(MOZ_WIDGET_SUPPORT_LIBS) \
 		-lraptorgfx \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index 1c0987f4e3c..585101c661d 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -103,10 +103,9 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib \
-		-lexpat_s \
-		-lxmltok_s \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(DIST)/lib/libexpat_s.a \
+		$(DIST)/lib/libxmltok_s.a \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/intl/strres/src/Makefile.in b/mozilla/intl/strres/src/Makefile.in
index ba1191ae582..aa36932a8b2 100644
--- a/mozilla/intl/strres/src/Makefile.in
+++ b/mozilla/intl/strres/src/Makefile.in
@@ -28,7 +28,9 @@ IS_COMPONENT	= 1
 
 CPPSRCS		= nsStringBundle.cpp
 
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
+EXTRA_DSO_LDOPTS =\
+				$(MOZ_NECKO_UTIL_LIBS) \
+				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/strres/tests/Makefile.in b/mozilla/intl/strres/tests/Makefile.in
index b6dd74925a2..96d187bc52b 100644
--- a/mozilla/intl/strres/tests/Makefile.in
+++ b/mozilla/intl/strres/tests/Makefile.in
@@ -37,7 +37,7 @@ EXPORT_RESOURCE	= \
 LIBS		= \
 		-lmozjs \
 		-lxpcom \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in
index 939371b02d8..35da48e2e92 100644
--- a/mozilla/intl/uconv/src/Makefile.in
+++ b/mozilla/intl/uconv/src/Makefile.in
@@ -51,7 +51,9 @@ EXPORT_RESOURCE	= \
 		$(srcdir)/charsetalias.properties \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
+EXTRA_DSO_LDOPTS =\
+				$(MOZ_NECKO_UTIL_LIBS) \
+				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/unicharutil/src/Makefile.in b/mozilla/intl/unicharutil/src/Makefile.in
index edae77d067f..f9413a46578 100644
--- a/mozilla/intl/unicharutil/src/Makefile.in
+++ b/mozilla/intl/unicharutil/src/Makefile.in
@@ -36,7 +36,9 @@ CPPSRCS		= \
 		nsEntityConverter.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
+EXTRA_DSO_LDOPTS =\
+				$(MOZ_NECKO_UTIL_LIBS) \
+				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index c7a6d051a3f..97debc7375c 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@@ -29,14 +29,14 @@ CPPSRCS		= TestSpaceManager.cpp
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 LIBS		+= \
-		 $(DIST)/lib/libraptorlayout_s.a \
-		-lraptorgfx \
-		-lmozjs \
-		$(MOZ_TIMER_LIBS) \
-		-lxpcom \
-		$(NSPR_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
+			$(DIST)/lib/libraptorlayout_s.a \
+			-lraptorgfx \
+			-lmozjs \
+			$(MOZ_TIMER_LIBS) \
+			-lxpcom \
+			$(NSPR_LIBS) \
+			$(TK_LIBS) \
+			$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 8f592635f9c..b243b6d46be 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -52,13 +52,14 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libraptorxulcontent_s.a \
 		$(DIST)/lib/libraptorxulbase_s.a \
 		$(DIST)/lib/libraptorlayout_s.a \
-		$(DIST)/lib/libneckoutil_s.a \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		$(NSPR_LIBS) \
 		-lxpcom \
@@ -66,8 +67,6 @@ EXTRA_DSO_LDOPTS = \
 		-lraptorgfx \
 		-ljsdom \
 		-lmozjs \
-		-L$(DIST)/lib \
-		$(MOZ_TIMER_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 6278724562f..406ed578918 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -40,12 +40,12 @@ LIBS		= \
 		$(DIST)/lib/libraptorhtmltable_s.a \
 		$(DIST)/lib/libraptorlayout_s.a \
 		$(DIST)/lib/libraptorevents_s.a \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		-lraptorgfx \
 		-lxpcom \
-		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
-		$(DIST)/lib/libneckoutil_s.a \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in
index f61dd4db523..887f6c4a5bf 100644
--- a/mozilla/mailnews/base/build/Makefile.in
+++ b/mozilla/mailnews/base/build/Makefile.in
@@ -39,10 +39,10 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		-lxpcom \
+		$(MOZ_TIMER_LIBS)	\
 		$(MOZ_TIMER_LIBS) \
+		-L$(DIST)/bin \
+		-lxpcom \
 		-lmsgbaseutil \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in
index 8f00b1b12bd..5d17b7c0666 100644
--- a/mozilla/mailnews/base/tests/identity/Makefile.in
+++ b/mozilla/mailnews/base/tests/identity/Makefile.in
@@ -26,7 +26,6 @@ PROGRAM		= identity
 CPPSRCS		= identity.cpp
 
 LIBS		= \
-		-L$(DIST)/lib \
 		-L$(DIST)/bin \
 		-lxpcom \
 		-lmozjs \
diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in
index 509b2ab9d26..96064d690d9 100644
--- a/mozilla/mailnews/compose/tests/compose2/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in
@@ -27,21 +27,9 @@ PROGRAM		= msgcomposetest2
 CPPSRCS		= test2.cpp
 
 LIBS		= \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lremoturl \
-		-lhttpurl \
-		-lsockstuburl \
-		-lnetcache \
-		-lmimetype \
-		-lnetcnvts \
-		-lnetwork \
-		-lnetlib \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
-		-lpwcac \
 		-lmozjs \
 		-lraptorgfx \
 		$(NULL)
diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in
index 4d8565ffe12..f0048decc44 100644
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in
@@ -28,22 +28,7 @@ CPPSRCS		= \
 		geturl.cpp \
 		nsURLFetcher.cpp \
 		$(NULL)
-
-LIBS		= \
-		-lraptorplugin \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lhttpurl \
-		-lremoturl \
-		-lsockstuburl \
-		-lmimetype \
-		-lnetcache \
-		-lnetcnvts \
-		-lnetlib \
-		-lnetwork \
-		-lpwcac \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		$(NSPR_LIBS) \
diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
index f5ec0786f85..558dce1d1c5 100644
--- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
@@ -27,24 +27,12 @@ PROGRAM		= sendlatertest
 CPPSRCS		= test.cpp
 
 LIBS		= \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lremoturl \
-		-lhttpurl \
-		-lsockstuburl \
-		-lnetcache \
-		-lmimetype \
-		-lnetcnvts \
-		-lnetwork \
-		-lnetlib \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
+		-lraptorgfx \
 		-lxpcom \
-		-lpwcac \
 		-lmozjs \
 		$(NSPR_LIBS) \
-		-lraptorgfx \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in
index 19d7e5fe9ac..11f65468150 100644
--- a/mozilla/mailnews/imap/tests/harness/Makefile.in
+++ b/mozilla/mailnews/imap/tests/harness/Makefile.in
@@ -27,8 +27,7 @@ PROGRAM		= testimap
 
 CPPSRCS		= imapProtocolTest.cpp
 
-LIBS		= \
-		-L$(DIST)/lib \
+LIBS =	\
 		-L$(DIST)/bin \
 		-lxpcom \
 		-lmozjs \
diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
index e8117ed7e87..4cf522d692a 100644
--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
@@ -25,24 +25,12 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= mimetest
 CPPSRCS		= mimetest.cpp
 
-LIBS		= \
-		-lraptorplugin \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lhttpurl \
-		-lremoturl \
-		-lsockstuburl \
-		-lmimetype \
-		-lnetcache \
-		-lnetcnvts \
-		-lnetlib \
-		-lnetwork \
-		-lpwcac \
-		$(MOZ_TIMER_LIBS) \
+LIBS	= \
+		-L$(DIST)/bin \
 		-lmozjs \
 		-lxpcom \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in
index 0f30339a2a5..92c06754d3a 100644
--- a/mozilla/mailnews/news/tests/newsParser/Makefile.in
+++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in
@@ -26,24 +26,12 @@ PROGRAM		= newsParserTest
 CPPSRCS		= newsParserTest.cpp
 
 LIBS		= \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lremoturl \
-		-lhttpurl \
-		-lsockstuburl \
-		-lnetcache \
-		-lmimetype \
-		-lnetcnvts \
-		-lnetwork \
-		-lnetlib \
-		-lpwcac \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS) \
+		$(DIST)/lib/libmsgnews_s.a \
 		-lmozjs \
 		-lraptorgfx \
-		$(DIST)/lib/libmsgnews_s.a \
 		-lmsgbaseutil \
-		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in
index ec1be1ab042..73b0008a408 100644
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/Makefile.in
@@ -25,16 +25,17 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= nntpTest
 CPPSRCS		= nntpTest.cpp
 
-LIBS		= \
-		-lxpcom \
-		-lmozjs \
-		-lmsgbaseutil \
-		$(MOZ_TIMER_LIBS) \
-		$(DIST)/lib/librdfbase_s.a \
-		$(NSPR_LIBS) \
-		$(TK_LIBS) \
-		-lneckoutil_s \
-		$(NULL)
+LIBS = \
+	$(DIST)/lib/librdfbase_s.a \
+	-L$(DIST)/bin \
+	-lxpcom	\
+	-lmozjs	\
+	-lmsgbaseutil \
+	$(MOZ_NECKO_UTIL_LIBS) \
+	$(MOZ_TIMER_LIBS) \
+	$(NSPR_LIBS) \
+	$(TK_LIBS) \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index 0d97dc66ba1..a9a06475bae 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -44,7 +44,9 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
+EXTRA_DSO_LDOPTS = \
+				$(MOZ_NECKO_UTIL_LIBS) \
+				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in
index 0d97dc66ba1..a9a06475bae 100644
--- a/mozilla/modules/plugin/nglsrc/Makefile.in
+++ b/mozilla/modules/plugin/nglsrc/Makefile.in
@@ -44,7 +44,9 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
+EXTRA_DSO_LDOPTS = \
+				$(MOZ_NECKO_UTIL_LIBS) \
+				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in
index 7c61ac17c4a..3f56ce832d8 100644
--- a/mozilla/netwerk/test/Makefile.in
+++ b/mozilla/netwerk/test/Makefile.in
@@ -43,7 +43,7 @@ endif
 LIBS		= \
 		-lmozjs \
 		-lxpcom \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 1c0987f4e3c..585101c661d 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -103,10 +103,9 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib \
-		-lexpat_s \
-		-lxmltok_s \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(DIST)/lib/libexpat_s.a \
+		$(DIST)/lib/libxmltok_s.a \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/profile/pref-migrator/src/Makefile.in b/mozilla/profile/pref-migrator/src/Makefile.in
index 2f1ac028f90..7b59aa5de21 100644
--- a/mozilla/profile/pref-migrator/src/Makefile.in
+++ b/mozilla/profile/pref-migrator/src/Makefile.in
@@ -37,15 +37,12 @@ CPPSRCS = \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS =	\
+	$(MOZ_NECKO_UTIL_LIBS) \
 	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
 	$(NSPR_LIBS)	\
 	-lxpcom			\
-	-lneckoutil_s	\
 	$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
diff --git a/mozilla/profile/src/Makefile.in b/mozilla/profile/src/Makefile.in
index d82e345b672..f3a35129d16 100644
--- a/mozilla/profile/src/Makefile.in
+++ b/mozilla/profile/src/Makefile.in
@@ -30,14 +30,10 @@ CPPSRCS = \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS =	\
-	-L$(DIST)/bin	\
-	-lxpcom		\
-	-L$(DIST)/lib	\
-	-lneckoutil_s	\
-	$(NSPR_LIBS)	\
+	$(MOZ_NECKO_UTIL_LIBS) \
+	-L$(DIST)/bin \
+	-lxpcom \
+	$(NSPR_LIBS) \
 	$(NULL)
 
-
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in
index fb1e9c1c93e..84db8a5eb50 100644
--- a/mozilla/rdf/build/Makefile.in
+++ b/mozilla/rdf/build/Makefile.in
@@ -43,14 +43,13 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/librdfcontent_s.a \
 		$(DIST)/lib/librdfdatasource_s.a \
 		$(DIST)/lib/librdfutil_s.a \
-		$(DIST)/lib/libneckoutil_s.a \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
-		-L$(DIST)/lib \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		-ljsdom \
diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in
index 7aafccbc2f5..9b50042c8ea 100644
--- a/mozilla/rdf/tests/rdfcat/Makefile.in
+++ b/mozilla/rdf/tests/rdfcat/Makefile.in
@@ -26,7 +26,7 @@ PROGRAM		= rdfcat
 CPPSRCS		= rdfcat.cpp
 
 LIBS		= \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		-lxpcom \
diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in
index 2fc5ea6f1d6..120673db10c 100644
--- a/mozilla/rdf/tests/rdfpoll/Makefile.in
+++ b/mozilla/rdf/tests/rdfpoll/Makefile.in
@@ -26,9 +26,8 @@ PROGRAM		= rdfpoll
 CPPSRCS		= rdfpoll.cpp
 
 LIBS		= \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
-		$(IMGLIB_LIBS) \
 		-lmozjs \
 		-lxpcom \
 		$(NSPR_LIBS) \
diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in
index a6aabd635ce..cf6ed977c72 100644
--- a/mozilla/view/src/Makefile.in
+++ b/mozilla/view/src/Makefile.in
@@ -34,9 +34,9 @@ CPPSRCS		= \
 
 REQUIRES	= raptor xpcom
 
-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/lib \
-		$(MOZ_TIMER_LIBS) \
+EXTRA_DSO_LDOPTS =\
+				$(MOZ_TIMER_LIBS) \
+				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/webshell/src/Makefile.in b/mozilla/webshell/src/Makefile.in
index e7d85f9d3aa..234345c28bd 100644
--- a/mozilla/webshell/src/Makefile.in
+++ b/mozilla/webshell/src/Makefile.in
@@ -26,16 +26,15 @@ MODULE		= raptor
 LIBRARY_NAME	= raptorwebwidget
 
 CPPSRCS		= \
-    		dlldeps.cpp \
-		nsDLLFactory.cpp \
-		nsDocLoader.cpp \
-		nsThrobber.cpp \
-		nsWebShell.cpp \
-		$(NULL)
+			dlldeps.cpp \
+			nsDLLFactory.cpp \
+			nsDocLoader.cpp \
+			nsThrobber.cpp \
+			nsWebShell.cpp \
+			$(NULL)
 
 EXTRA_DSO_LDOPTS =\
-		-L$(DIST)/lib \
-		-lneckoutil_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		-ljsdom \
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index c82cee31314..41f344ca345 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -90,16 +90,20 @@ JSJ_LIB			= -ljsj
 endif
 
 XP_DIST_LIBS		= \
-			-lwidgetsupport_s \
 			-lraptorgfx \
-			-lneckoutil_s \
-			$(MOZ_TIMER_LIBS) \
 			-lmozjs \
 			-lxpcom \
 			$(JSJ_LIB) \
 			$(NULL)
 
-XP_LIBS			= \
+XP_NS_UNDERBAR_CRAP = \
+			$(MOZ_NECKO_UTIL_LIBS) \
+			$(MOZ_TIMER_LIBS) \
+			$(MOZ_WIDGET_SUPPORT_LIBS) \
+			$(NULL)
+
+XP_LIBS		= \
+			$(XP_NS_UNDERBAR_CRAP) \
 			$(XP_DIST_LIBS) \
 			$(NSPR_LIBS) \
 			$(NULL)
@@ -125,6 +129,8 @@ EXTRA_DEPS		= \
 			$(UNIX_VIEWER_TK_LIBS) \
 			$(NULL)
 
+EXTRA_DEPS += $(XP_NS_UNDERBAR_CRAP)
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
@@ -166,3 +172,6 @@ ifdef MOZ_ENABLE_XLIB
 install:: $(PROGRAM)_xlib
 	$(INSTALL) -m 555 $< $(DIST)/bin
 endif
+
+caca:
+	@echo $(EXTRA_DEPS)
diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in
index c34c7dcbc00..bd5166a1416 100644
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@@ -30,11 +30,11 @@ CPPSRCS		= \
 		$(NULL)
 
 LIBS		= \
+		$(MOZ_WIDGET_SUPPORT_LIBS) \
+		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
 		-lmozjs \
-		-lwidgetsupport_s \
 		-lraptorgfx \
-		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in
index c94f23f21eb..b65a6acff8b 100644
--- a/mozilla/widget/tests/widget/Makefile.in
+++ b/mozilla/widget/tests/widget/Makefile.in
@@ -30,11 +30,11 @@ CPPSRCS		= \
 		$(NULL)
 
 LIBS		= \
+		$(MOZ_TIMER_LIBS) \
+		$(MOZ_WIDGET_SUPPORT_LIBS) \
 		-lxpcom \
 		-lmozjs \
-		-lwidgetsupport_s \
 		-lraptorgfx \
-		$(MOZ_TIMER_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index ef3c87454b2..2c7b9f36e99 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -62,10 +62,10 @@ CPPSRCS		+= \
 endif
 
 LIBS		+= \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		-lxpcom \
-		-lneckoutil_s \
-		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in
index 64ea434e3a8..3ac675e7476 100644
--- a/mozilla/xpcom/tools/registry/Makefile.in
+++ b/mozilla/xpcom/tools/registry/Makefile.in
@@ -32,9 +32,7 @@ endif
 
 LIBS		+= \
 		-lxpcom \
-		-lneckoutil_s \
 		-lmozjs \
-		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
diff --git a/mozilla/xpcom/tools/registry/regxpcom.cpp b/mozilla/xpcom/tools/registry/regxpcom.cpp
index f241a97f0ca..a3fd646e93c 100644
--- a/mozilla/xpcom/tools/registry/regxpcom.cpp
+++ b/mozilla/xpcom/tools/registry/regxpcom.cpp
@@ -128,18 +128,3 @@ int main(int argc, char *argv[])
 
     return ret;
 }
-
-#ifdef XP_UNIX
-/* The timer code doesn't get linked in. Some components link with libraries
- * in bin/ directory that assume that app that they are used in has libtimer_s.a
- * So ensure libtimer_s.a gets linked in.
- */
-#include "nsITimer.h"
-
-void dummy()
-{
-  nsITimer *timer;
-  (void) NS_NewTimer(&timer);
-  NS_IF_RELEASE(timer);
-}
-#endif /* XP_UNIX */
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index fb8c49534c5..b3f143d369e 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -38,16 +38,22 @@ ifdef MOZ_OJI
 OJI_LIBS	= -ljsj
 endif
 
+
+
 XP_DIST_LIBS	= \
 		-lraptorgfx \
-		$(MOZ_TIMER_LIBS) \
 		-lmozjs \
 		-lxpcom \
-		-lneckoutil_s \
 		$(OJI_LIBS) \
 		$(NULL)
 
+XP_NS_UNDERBAR_CRAP = \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS) \
+		$(NULL)
+
 XP_LIBS		= \
+		$(XP_NS_UNDERBAR_CRAP) \
 		$(XP_DIST_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
@@ -65,6 +71,8 @@ LIBS		= $(XP_LIBS)
 # cls/shaver are responsible for this amazingness
 EXTRA_DEPS	= $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
 
+EXTRA_DEPS += $(XP_NS_UNDERBAR_CRAP)
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
diff --git a/mozilla/xpfe/components/bookmarks/src/Makefile.in b/mozilla/xpfe/components/bookmarks/src/Makefile.in
index fd9f179d8cb..b3178fc6077 100644
--- a/mozilla/xpfe/components/bookmarks/src/Makefile.in
+++ b/mozilla/xpfe/components/bookmarks/src/Makefile.in
@@ -29,13 +29,12 @@ IS_COMPONENT	= 1
 CPPSRCS		= nsBookmarksService.cpp
 
 EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_TIMER_LIBS)	\
 		-L$(DIST)/bin	\
 		-lxpcom		\
 		-lmozjs		\
 		$(NSPR_LIBS)	\
-		-L$(DIST)/lib	\
-		-lneckoutil_s	\
-		$(MOZ_TIMER_LIBS)	\
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in
index 38130c12ad0..5526df5fc36 100644
--- a/mozilla/xpfe/components/directory/Makefile.in
+++ b/mozilla/xpfe/components/directory/Makefile.in
@@ -49,9 +49,8 @@ CHROME_L10N	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		-lneckoutil_s \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpfe/components/related/src/Makefile.in b/mozilla/xpfe/components/related/src/Makefile.in
index d4d0e6ce1ab..f17fa5a04f8 100644
--- a/mozilla/xpfe/components/related/src/Makefile.in
+++ b/mozilla/xpfe/components/related/src/Makefile.in
@@ -29,9 +29,8 @@ IS_COMPONENT	= 1
 CPPSRCS		= nsRelatedLinksHandler.cpp
 
 EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		-lneckoutil_s \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in
index 1bda18d4335..8167a7eb6af 100644
--- a/mozilla/xpfe/components/xfer/src/Makefile.in
+++ b/mozilla/xpfe/components/xfer/src/Makefile.in
@@ -32,11 +32,10 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
+		$(MOZ_NECKO_UTIL_LIBS) \
 		-L$(DIST)/bin \
-		-L$(DIST)/lib \
 		-lxpcom \
 		-lmozjs \
-		-lneckoutil_s \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in
index 090267c7d3a..3323db91d16 100644
--- a/mozilla/xpinstall/src/Makefile.in
+++ b/mozilla/xpinstall/src/Makefile.in
@@ -65,9 +65,8 @@ CPPSRCS		= \
 LOCAL_INCLUDES	= -I$(srcdir)/../public
 
 EXTRA_DSO_LDOPTS =\
-			-L$(DIST)/lib \
-			-lneckoutil_s \
-			-lmozreg_s \
+			$(MOZ_NECKO_UTIL_LIBS) \
+			$(MOZ_REGISTRY_LIBS) \
 			-L$(DIST)/bin \
 			-ljsdom \
 			$(ZLIB_LIBS)