diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 731af966d24..0a47fff1fd1 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -83,7 +83,9 @@ CPPSRCS =\
 
 EXTRA_DSO_LDOPTS =\
 				-L$(DIST)/lib \
+				-limg_s \
 				-lneckoutil_s \
+				-lmozutil_s \
 				$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in
index 07388a5c7c9..ae73953cf24 100644
--- a/mozilla/gfx/tests/Makefile.in
+++ b/mozilla/gfx/tests/Makefile.in
@@ -50,24 +50,15 @@ NET_LIBS	= \
 		-lnetcache \
 		-lpwcac \
 		$(NULL)
-else
-NET_LIBS	= -lneckoutil_s
 endif
 
 LIBS		= \
 		-lraptorgfx \
 		-lxpcom \
 		-lmozjs \
-		-limg \
-		$(JPEG_LIBS) \
-		$(PNG_LIBS) \
-		-lmozutil \
-		-lxp \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(NSPR_LIBS) \
-		$(NET_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in
index 79da6529071..5b33055e91a 100644
--- a/mozilla/htmlparser/robot/Makefile.in
+++ b/mozilla/htmlparser/robot/Makefile.in
@@ -49,8 +49,6 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-lmozjs \
-		-limg \
-		-lmozutil \
 		-lxpcom \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/intl/strres/tests/Makefile.in b/mozilla/intl/strres/tests/Makefile.in
index 76a1ba59ab7..43fa0c25cb0 100644
--- a/mozilla/intl/strres/tests/Makefile.in
+++ b/mozilla/intl/strres/tests/Makefile.in
@@ -56,13 +56,9 @@ endif
 
 LIBS		= \
 		-lmozjs \
-		-limg \
-		-lmozutil \
-		-lxp \
 		-lxpcom \
 		$(NETLIB_LIBS) \
 		$(MOZ_TIMER_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in
index 46a9c29d30d..0e97ae38d2f 100644
--- a/mozilla/js/src/xpconnect/shell/Makefile.in
+++ b/mozilla/js/src/xpconnect/shell/Makefile.in
@@ -28,11 +28,8 @@ SIMPLE_PROGRAMS	= xpcshell
 CPPSRCS		= xpcshell.cpp
 
 LIBS		= \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in
index 88c4af076c6..a9d9c825a36 100644
--- a/mozilla/js/src/xpconnect/tests/Makefile.in
+++ b/mozilla/js/src/xpconnect/tests/Makefile.in
@@ -34,7 +34,6 @@ LIBS		= \
 		-L$(DIST)/lib \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index 7ef563a19db..284a3343803 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@@ -30,32 +30,11 @@ LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 
 LIBS		+= \
-		-lnetlib \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lsockstuburl \
-		-lremoturl \
-		-lnetcnvts \
-		-lhttpurl \
-		-lmimetype \
-		-lpwcac \
-		-lnetcache \
-		-lnetwork \
-		$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
+		 $(DIST)/lib/libraptorlayout_s.a \
 		-lraptorgfx \
-		-limg \
-		-lmozutil \
-		$(PNG_LIBS) \
-		$(JPEG_LIBS) \
 		-lmozjs \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
-		-lxp \
-		-ljsurl \
-		-ljsdom \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 8417fc01783..ec4c1e28925 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -48,8 +48,6 @@ NET_LIBS	= \
 		-lnetwork \
 		-lsockstuburl \
 		$(NULL)
-else
-NET_LIBS	= -lneckoutil_s
 endif
 
 GECKO_LIBS = \
@@ -64,8 +62,6 @@ GECKO_LIBS = \
 
 LIBS		= \
 		$(GECKO_LIBS) \
-		-limg \
-		-lmozutil \
 		-lmozjs \
 		-ljsdom \
 		-lraptorgfx \
diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in
index 6da3d41337a..36b5f4c2e20 100644
--- a/mozilla/mailnews/compose/tests/compose/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose/Makefile.in
@@ -35,10 +35,7 @@ LIBS = \
 		$(MOZ_TIMER_LIBS) \
         $(ZLIB_LIBS) \
         $(NSPR_LIBS) \
-        -limg           \
-        -lmozutil       \
         $(TK_LIBS) \
-		-lneckoutil_s \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in
index 55b1a34a51d..cc04024f51b 100644
--- a/mozilla/mailnews/compose/tests/compose2/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in
@@ -46,8 +46,6 @@ LIBS		= \
 		-lxp \
 		-lmozjs \
 		-lraptorgfx \
-		-limg \
-		-lmozutil \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in
index 50726db7c6d..50e55a6dc69 100644
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in
@@ -32,7 +32,6 @@ CPPSRCS		= \
 BASE_LIBS	= \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NULL)
 
 GECKO_LIBS	= \
diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
index 4e369d948f2..cdd7961bab0 100644
--- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
@@ -48,8 +48,6 @@ LIBS		= \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		-lraptorgfx \
-		-limg \
-		-lmozutil \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in
index ddebea5296e..4077dbe491a 100644
--- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in
@@ -27,27 +27,12 @@ PROGRAM		= sendpage
 CPPSRCS		= Test.cpp
 
 LIBS		= \
-		-labouturl \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lremoturl \
-		-lhttpurl \
-		-lsockstuburl \
-		-lnetcache \
-		-lmimetype \
-		-lnetcnvts \
-		-lnetwork \
-		-lnetlib \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
-		-lpwcac \
 		-lmozdbm \
 		-lxp \
 		-lmozjs \
-		-lraptorgfx \
-		-limg \
-		-lmozutil \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in
index 0c7749a2537..9a46d7ba613 100644
--- a/mozilla/mailnews/compose/tests/smtp/Makefile.in
+++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in
@@ -31,15 +31,12 @@ LIBS = \
 	-lmozdbm	\
 	-lxp	\
 	-lmozjs	\
-	-limg	\
 	-lxp	\
-	-lmozutil \
 	$(MOZ_TIMER_LIBS) \
 	$(ZLIB_LIBS) \
 	$(DIST)/lib/librdfbase_s.a \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
-	-lneckoutil_s \
 	$(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 2a8a981bd0d..7fbaa22f6e7 100644
--- a/mozilla/mailnews/imap/tests/harness/Makefile.in
+++ b/mozilla/mailnews/imap/tests/harness/Makefile.in
@@ -34,14 +34,11 @@ LIBS =	\
 		-lmozdbm \
 		-lxp \
 		-lmozjs \
-		-limg \
-		-lmozutil \
 		-lmsgbaseutil \
 		$(MOZ_TIMER_LIBS) \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
-		-lneckoutil_s \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in
index d2a56fa567d..2f1949f4c40 100644
--- a/mozilla/mailnews/local/tests/pop3/Makefile.in
+++ b/mozilla/mailnews/local/tests/pop3/Makefile.in
@@ -35,9 +35,6 @@ LIBS = \
 	$(MOZ_TIMER_LIBS) \
 	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
-	-limg		\
-	-lmozutil	\
-	-lneckoutil_s \
 	$(TK_LIBS) \
 	$(NULL)
 
diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
index f7660feecd6..00d4dc6bb63 100644
--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
@@ -28,17 +28,12 @@ CPPSRCS		= mimetest.cpp
 BASE_LIBS	= \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NULL)
 
 GECKO_LIBS	= \
 		-lraptorplugin \
 		$(NULL)
 
-IMGLIB_LIBS	= \
-		-limg \
-		$(NULL)
-
 NETLIB_LIBS	= \
 		-labouturl \
 		-lfileurl \
@@ -61,7 +56,6 @@ LIBS		= \
 		$(GECKO_LIBS) \
 		$(NETLIB_LIBS) \
 		$(MOZ_TIMER_LIBS) \
-		$(IMGLIB_LIBS) \
 		$(BASE_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in
index d792947af97..9c63959ff3f 100644
--- a/mozilla/mailnews/news/tests/newsParser/Makefile.in
+++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in
@@ -43,8 +43,6 @@ LIBS		= \
 		-lxp \
 		-lmozjs \
 		-lraptorgfx \
-		-limg \
-		-lmozutil \
 		$(DIST)/lib/libmsgnews_s.a \
 		-lmsgbaseutil \
 		$(MOZ_TIMER_LIBS) \
diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in
index e1d23e12cb3..5bbcff38169 100644
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/Makefile.in
@@ -30,8 +30,6 @@ LIBS = \
 	-lmozdbm	\
 	-lxp	\
 	-lmozjs	\
-	-limg	\
-	-lmozutil	\
 	-lmsgbaseutil \
 	$(MOZ_TIMER_LIBS) \
 	$(ZLIB_LIBS) \
diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in
index 7c5740981e2..3b0bd2985ae 100644
--- a/mozilla/modules/libimg/src/Makefile.in
+++ b/mozilla/modules/libimg/src/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= img
-LIBRARY_NAME	= img
+LIBRARY_NAME	= img_s
 
 LOCAL_INCLUDES	= -I$(srcdir) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
 EXTRA_LIBS	= $(PNG_LIBS) $(ZLIB_LIBS)
@@ -53,5 +53,8 @@ EXTRA_LIBS	+= $(NSPR_LIBS)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
-include $(topsrcdir)/config/rules.mk
+MKSHLIB :=
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/modules/libutil/src/Makefile.in b/mozilla/modules/libutil/src/Makefile.in
index e5a7819e052..e6e4ea6c47a 100644
--- a/mozilla/modules/libutil/src/Makefile.in
+++ b/mozilla/modules/libutil/src/Makefile.in
@@ -23,7 +23,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= util
-LIBRARY_NAME	= mozutil
+LIBRARY_NAME	= mozutil_s
 
 INHIBIT_STRIP_NOT_EXPORTED = 1
 
@@ -31,6 +31,10 @@ CSRCS		= obs.c
 
 REQUIRES	= util
 
+MKSHLIB :=
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(DIST)/include/libutil
diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in
index b7631fa12be..db2a0bd9f2a 100644
--- a/mozilla/netwerk/test/Makefile.in
+++ b/mozilla/netwerk/test/Makefile.in
@@ -43,12 +43,7 @@ endif
 LIBS		= \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
-		-lxpcom \
 		-lneckoutil_s \
-		-lxp \
-		-ljsurl \
-		-lmozdbm \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/netwerk/util/src/Makefile.in b/mozilla/netwerk/util/src/Makefile.in
index 53894d9dcc7..3f69e33e610 100644
--- a/mozilla/netwerk/util/src/Makefile.in
+++ b/mozilla/netwerk/util/src/Makefile.in
@@ -35,8 +35,6 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
 MODULE = necko
 
-include $(topsrcdir)/config/config.mk
-
 MKSHLIB :=
 
 # we don't want the shared lib, but we want to force the creation of a 
diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in
index 79da6529071..5b33055e91a 100644
--- a/mozilla/parser/htmlparser/robot/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/Makefile.in
@@ -49,8 +49,6 @@ LIBS		= \
 		-lhttpurl \
 		-lpwcac \
 		-lmozjs \
-		-limg \
-		-lmozutil \
 		-lxpcom \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in
index 8f77940fac0..e63e04d537e 100644
--- a/mozilla/rdf/tests/rdfcat/Makefile.in
+++ b/mozilla/rdf/tests/rdfcat/Makefile.in
@@ -26,10 +26,8 @@ PROGRAM		= rdfcat
 CPPSRCS		= rdfcat.cpp
 
 BASE_LIBS	= \
-		$(ZLIB_LIBS) \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NULL)
 
 ifndef NECKO
@@ -54,9 +52,6 @@ NETLIB_LIBS	= \
 else
 NETLIB_LIBS	= \
 		-lneckoutil_s \
-		-lxp \
-		-ljsurl \
-		-lmozdbm \
 		$(NULL)
 endif
 
diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in
index 8aa257f7bed..cc1624f176e 100644
--- a/mozilla/rdf/tests/rdfpoll/Makefile.in
+++ b/mozilla/rdf/tests/rdfpoll/Makefile.in
@@ -26,10 +26,8 @@ PROGRAM		= rdfpoll
 CPPSRCS		= rdfpoll.cpp
 
 BASE_LIBS	= \
-		$(ZLIB_LIBS) \
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NULL)
 
 ifndef NECKO
@@ -54,9 +52,6 @@ NETLIB_LIBS	= \
 else
 NETLIB_LIBS	= \
 		-lneckoutil_s \
-		-lxp \
-		-ljsurl \
-		-lmozdbm \
 		$(NULL)
 endif
 
diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.am b/mozilla/webshell/embed/gtk/lib/Makefile.am
index 9742c9c4d11..c03f2a5af83 100644
--- a/mozilla/webshell/embed/gtk/lib/Makefile.am
+++ b/mozilla/webshell/embed/gtk/lib/Makefile.am
@@ -21,23 +21,17 @@ NSPR_LIBS       = -lplds3 -lplc3 -lnspr3 -lpthread
 BASE_LIBS =          \
         -lmozjs \
         -lxpcom      \
-        -lmozutil \
         $(NULL)
 
 GECKO_LIBS =\
 		-lraptorgfx \
 		$(NULL)
 
-IMGLIB_LIBS =        \
-        -limg        \
-        $(NULL)
-
 JSJ_LIB =
 TK_LIBS = 
 
 ALL_MOZ_LIBS =                 \
         $(GECKO_LIBS)  \
-        $(IMGLIB_LIBS) \
         $(BASE_LIBS)   \
         $(JSJ_LIB)     \
         $(NSPR_LIBS)   \
diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.in b/mozilla/webshell/embed/gtk/lib/Makefile.in
index 8ae65e9f00d..280f7730674 100644
--- a/mozilla/webshell/embed/gtk/lib/Makefile.in
+++ b/mozilla/webshell/embed/gtk/lib/Makefile.in
@@ -91,19 +91,16 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include
 NULL = 
 NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread
 
-BASE_LIBS =          -lmozjs         -lxpcom              -lmozutil         $(NULL)
+BASE_LIBS =          -lmozjs         -lxpcom              $(NULL)
 
 
 GECKO_LIBS =  		-lraptorgfx 		$(NULL)
 
 
-IMGLIB_LIBS =          -limg                $(NULL)
-
-
 JSJ_LIB = 
 TK_LIBS = 
 
-ALL_MOZ_LIBS =          $(GECKO_LIBS)          $(IMGLIB_LIBS)         $(BASE_LIBS)           $(JSJ_LIB)             $(NSPR_LIBS)           $(TK_LIBS)             $(NULL)
+ALL_MOZ_LIBS =          $(GECKO_LIBS)          $(BASE_LIBS)           $(JSJ_LIB)             $(NSPR_LIBS)           $(TK_LIBS)             $(NULL)
 
 
 MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib          $(ALL_MOZ_LIBS)
diff --git a/mozilla/webshell/embed/xlib/gtk/Makefile.in b/mozilla/webshell/embed/xlib/gtk/Makefile.in
index 725788bf4a2..939f8f437ee 100644
--- a/mozilla/webshell/embed/xlib/gtk/Makefile.in
+++ b/mozilla/webshell/embed/xlib/gtk/Makefile.in
@@ -32,7 +32,6 @@ CPPSRCS		= \
 BASE_LIBS	= \
 			-lmozjs \
 			-lxpcom \
-			-lmozutil \
 			$(NULL)
 
 GECKO_LIBS		= \
@@ -40,14 +39,9 @@ GECKO_LIBS		= \
 			$(MOZ_TIMER_LIBS) \
 			$(NULL)
 
-IMGLIB_LIBS		= \
-			-limg \
-			$(NULL)
-
 LIBS		= \
 			$(GECKO_LIBS) \
 			$(NETLIB_LIBS) \
-			$(IMGLIB_LIBS) \
 			$(BASE_LIBS) \
 			$(JSJ_LIB) \
 			$(NSPR_LIBS) \
diff --git a/mozilla/webshell/embed/xlib/motif/Makefile.in b/mozilla/webshell/embed/xlib/motif/Makefile.in
index 74d486fb93a..5ef9fc1853d 100644
--- a/mozilla/webshell/embed/xlib/motif/Makefile.in
+++ b/mozilla/webshell/embed/xlib/motif/Makefile.in
@@ -36,7 +36,6 @@ CSRCS		= \
 BASE_LIBS	= \
 			-lmozjs \
 			-lxpcom \
-			-lmozutil \
 			$(NULL)
 
 GECKO_LIBS		= \
@@ -44,14 +43,9 @@ GECKO_LIBS		= \
 			$(MOZ_TIMER_LIBS) \
 			$(NULL)
 
-IMGLIB_LIBS		= \
-			-limg \
-			$(NULL)
-
 LIBS		= \
 			$(GECKO_LIBS) \
 			$(NETLIB_LIBS) \
-			$(IMGLIB_LIBS) \
 			$(BASE_LIBS) \
 			$(JSJ_LIB) \
 			$(NSPR_LIBS) \
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index e89fb15cf9a..78e464eb445 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -92,7 +92,6 @@ endif
 BASE_LIBS		= \
 			-lmozjs \
 			-lxpcom \
-			-lmozutil \
 			$(NULL)
 
 GECKO_LIBS		= \
@@ -100,10 +99,6 @@ GECKO_LIBS		= \
 			-lraptorgfx \
 			$(NULL)
 
-IMGLIB_LIBS		= \
-			-limg \
-			$(NULL)
-
 ifndef NECKO
 NETLIB_LIBS		= \
 			-labouturl \
@@ -132,7 +127,6 @@ endif
 XP_DIST_LIBS = \
 			$(GECKO_LIBS) \
 			$(NETLIB_LIBS) \
-			$(IMGLIB_LIBS) \
 			$(MOZ_TIMER_LIBS) \
 			$(BASE_LIBS) \
 			$(JSJ_LIB) \
diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in
index b084d367868..e630841f50b 100644
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@@ -50,8 +50,6 @@ NET_LIBS	= \
 endif
 
 LIBS		= \
-		-lmozutil \
-		-limg \
 		-lxpcom \
 		-lmozjs \
 		-lwidgetsupport_s \
diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in
index 2ca03165ca7..13558e597c2 100644
--- a/mozilla/widget/tests/widget/Makefile.in
+++ b/mozilla/widget/tests/widget/Makefile.in
@@ -50,8 +50,6 @@ NET_LIBS	= \
 endif
 
 LIBS		= \
-		-lmozutil \
-		-limg \
 		-lxpcom \
 		-lmozjs \
 		-lwidgetsupport_s \
diff --git a/mozilla/xpcom/proxy/tests/Makefile.in b/mozilla/xpcom/proxy/tests/Makefile.in
index b56034e1fae..2c4279fc92a 100644
--- a/mozilla/xpcom/proxy/tests/Makefile.in
+++ b/mozilla/xpcom/proxy/tests/Makefile.in
@@ -34,10 +34,7 @@ LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo
 endif
 
 LIBS		= \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
 		-lxpcom \
-		-lmozutil \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
index 9472cb69992..304843e9ec7 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in
@@ -28,10 +28,7 @@ SIMPLE_PROGRAMS	= TestXPTCInvoke
 CPPSRCS		= TestXPTCInvoke.cpp
 
 LIBS		= \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
 		-lxpcom \
-		-lmozutil \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index 52c9976d971..d6f15890f2a 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -85,15 +85,12 @@ NETLIB_LIBS	= -lneckoutil_s
 endif
 
 LIBS		+= \
-		-limg \
-		-lmozutil \
-		$(NETLIB_LIBS) \
 		-lmozjs \
 		-lxp \
 		-lxpcom \
+		$(NETLIB_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
-		$(ZLIB_LIBS) \
 		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index e4e20f57388..5c023657951 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -67,21 +67,15 @@ endif
 BASE_LIBS =\
 		-lmozjs \
 		-lxpcom \
-		-lmozutil \
 		$(NULL)
 
 GECKO_LIBS =\
 		-lraptorgfx \
 		$(NULL)
 
-IMGLIB_LIBS =\
-		-limg \
-		$(NULL)
-
 XP_DIST_LIBS = \
 		$(GECKO_LIBS) \
 		$(NETLIB_LIBS) \
-		$(IMGLIB_LIBS) \
 		$(MOZ_TIMER_LIBS) \
 		$(BASE_LIBS) \
 		$(OJI_LIBS) \