diff --git a/mozilla/expat/xmlparse/Makefile.in b/mozilla/expat/xmlparse/Makefile.in
index dc935a7237b..ef758340d7f 100644
--- a/mozilla/expat/xmlparse/Makefile.in
+++ b/mozilla/expat/xmlparse/Makefile.in
@@ -22,7 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = expat
+LIBRARY_NAME = expat_s
 
 ifdef MOZ_STRIP_NOT_EXPORTED
 DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
@@ -43,7 +43,11 @@ MODULE=expat
 
 LOCAL_INCLUDES = -I$(srcdir)/../xmltok
 
-include $(topsrcdir)/config/config.mk
+MKSHLIB :=
+
+# We want only the static lib, not the shared lib
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/expat/xmltok/Makefile.in b/mozilla/expat/xmltok/Makefile.in
index 38a9ce1a496..9220ec11b13 100644
--- a/mozilla/expat/xmltok/Makefile.in
+++ b/mozilla/expat/xmltok/Makefile.in
@@ -22,7 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = xmltok
+LIBRARY_NAME = xmltok_s
 
 ifdef MOZ_STRIP_NOT_EXPORTED
 DEFINES += -DXMLTOKAPI="__attribute__ ((dllexport))"
@@ -38,7 +38,11 @@ EXPORTS = \
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
-include $(topsrcdir)/config/config.mk
+MKSHLIB :=
+
+# We want only the static lib, not the shared lib
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in
index 975f6faa632..8d10cb7238d 100644
--- a/mozilla/htmlparser/robot/Makefile.in
+++ b/mozilla/htmlparser/robot/Makefile.in
@@ -35,8 +35,6 @@ endif
 ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-lsecfree \
 		-lpref \
 		-lxp \
diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index 0d92f0023d1..f631e19d42a 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -22,8 +22,6 @@ VPATH		= .:@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
 LIBRARY_NAME = raptorhtmlpars
 
 DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
@@ -105,6 +103,12 @@ MODULE=htmlparser
 
 REQUIRES = xpcom netlib raptor
 
+EXTRA_DSO_LDOPTS =\
+		-L$(DIST)/lib \
+		-lexpat_s \
+		-lxmltok_s \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I.
diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index 1f73bfc112d..af0b8a2df98 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@@ -58,8 +58,6 @@ LIBS		+= \
 		-lmozreg \
 		-lxp \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-ljsurl \
 		-ljsdom \
 		$(ZLIB_LIBS) \
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index def86ac56ae..892bf39b820 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -52,10 +52,19 @@ else
 NET_LIBS	= -lneckoutil_s
 endif
 
+GECKO_LIBS = \
+		$(DIST)/lib/libraptorhtmlbase_s.a \
+		$(DIST)/lib/libnglhtmlcon_s.a \
+		$(DIST)/lib/libraptorhtmldoc_s.a \
+		$(DIST)/lib/libraptorhtmlstyle_s.a \
+		$(DIST)/lib/libraptorhtmltable_s.a \
+		$(DIST)/lib/libraptorlayout_s.a \
+		$(DIST)/lib/libraptorevents_s.a \
+		$(NULL)
+
 LIBS		= \
+		$(GECKO_LIBS) \
 		-limg \
-		$(PNG_LIBS) \
-		$(JPEG_LIBS) \
 		-lmozutil \
 		-lpref \
 		-lsecfree \
@@ -65,9 +74,6 @@ LIBS		= \
 		-lxpcom \
 		-lxp \
 		-lraptorhtmlpars \
-		$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
-		-lexpat \
-		-lxmltok \
 		-ljsurl \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in
index e31c856b2a3..6b91b14712d 100644
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in
@@ -41,8 +41,6 @@ BASE_LIBS	= \
 
 GECKO_LIBS	= \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-ljsdom \
 		-lraptorplugin \
 		$(NULL)
diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in
index 9f71ff85031..3257add109a 100644
--- a/mozilla/mailnews/compose/tests/smtp/Makefile.in
+++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in
@@ -33,8 +33,6 @@ LIBS = \
 	-lpref	\
 	-lmozjs	\
 	-lraptorhtmlpars \
-	-lexpat \
-	-lxmltok \
 	-ljsdom	\
 	-ljsurl	\
 	-limg	\
diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in
index 8a5ace3cfe9..24a8d7cec93 100644
--- a/mozilla/mailnews/imap/tests/harness/Makefile.in
+++ b/mozilla/mailnews/imap/tests/harness/Makefile.in
@@ -40,8 +40,6 @@ LIBS =	\
 		-ljsdom \
 		-ljsurl \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-limg \
 		-lmozutil \
 		-lmsgbaseutil \
diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
index 75b16de301a..391c59b86fd 100644
--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
@@ -37,8 +37,6 @@ BASE_LIBS	= \
 
 GECKO_LIBS	= \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-ljsdom \
 		-lraptorplugin \
 		$(NULL)
diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in
index d2f71ba3b8f..f8eb02427c5 100644
--- a/mozilla/mailnews/news/tests/newsParser/Makefile.in
+++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in
@@ -48,8 +48,6 @@ LIBS		= \
 		-ljsdom \
 		-ljsurl \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-lraptorgfx \
 		-limg \
 		-lmozutil \
diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in
index e06fbbd5cdf..23375a0f5d5 100644
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/Makefile.in
@@ -34,8 +34,6 @@ LIBS = \
 	-lmozjs	\
 	-lsecfree \
 	-lraptorhtmlpars	\
-	-lexpat \
-	-lxmltok \
 	-ljsdom	\
 	-ljsurl	\
 	-limg	\
diff --git a/mozilla/parser/expat/lib/Makefile.in b/mozilla/parser/expat/lib/Makefile.in
index dc935a7237b..ef758340d7f 100644
--- a/mozilla/parser/expat/lib/Makefile.in
+++ b/mozilla/parser/expat/lib/Makefile.in
@@ -22,7 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = expat
+LIBRARY_NAME = expat_s
 
 ifdef MOZ_STRIP_NOT_EXPORTED
 DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
@@ -43,7 +43,11 @@ MODULE=expat
 
 LOCAL_INCLUDES = -I$(srcdir)/../xmltok
 
-include $(topsrcdir)/config/config.mk
+MKSHLIB :=
+
+# We want only the static lib, not the shared lib
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in
index 975f6faa632..8d10cb7238d 100644
--- a/mozilla/parser/htmlparser/robot/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/Makefile.in
@@ -35,8 +35,6 @@ endif
 ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-lsecfree \
 		-lpref \
 		-lxp \
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 0d92f0023d1..f631e19d42a 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -22,8 +22,6 @@ VPATH		= .:@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
 LIBRARY_NAME = raptorhtmlpars
 
 DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
@@ -105,6 +103,12 @@ MODULE=htmlparser
 
 REQUIRES = xpcom netlib raptor
 
+EXTRA_DSO_LDOPTS =\
+		-L$(DIST)/lib \
+		-lexpat_s \
+		-lxmltok_s \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I.
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index 75863092f3b..36a23df0c4c 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -105,8 +105,6 @@ GECKO_LIBS		= \
 			$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 			$(TIMER_LIBS) \
 			-lraptorhtmlpars \
-			-lexpat \
-			-lxmltok \
 			-ljsdom \
 			$(NULL)
 
diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in
index e8879d5b723..c5260b2e18f 100644
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@@ -56,8 +56,6 @@ LIBS		= \
 		-lsecfree \
 		-lmozutil \
 		-limg \
-		$(PNG_LIBS) \
-		$(JPEG_LIBS) \
 		-lxpcom \
 		-lmozreg \
 		-lmozjs \
@@ -65,14 +63,10 @@ LIBS		= \
 		-lraptorgfx \
 		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 		$(TIMER_LIBS) \
-		-lxp \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-ljsurl \
 		-ljsdom \
 		$(NET_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in
index 9e167bee413..37d93e0cae7 100644
--- a/mozilla/widget/tests/widget/Makefile.in
+++ b/mozilla/widget/tests/widget/Makefile.in
@@ -56,8 +56,6 @@ LIBS		= \
 		-lsecfree \
 		-lmozutil \
 		-limg \
-		$(PNG_LIBS) \
-		$(JPEG_LIBS) \
 		-lxpcom \
 		-lmozreg \
 		-lmozjs \
@@ -65,14 +63,10 @@ LIBS		= \
 		-lraptorgfx \
 		$(MOZ_GFX_TOOLKIT_LDFLAGS) \
 		$(TIMER_LIBS) \
-		-lxp \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-ljsurl \
 		-ljsdom \
 		$(NET_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 4643e07f336..cdbccfb5159 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -73,8 +73,6 @@ LIBS		+= \
 		-lmozreg \
 		-lraptorwebwidget \
 		-lraptorhtmlpars \
-		-lexpat \
-		-lxmltok \
 		-ljsdom \
 		-ljsurl \
 		-lsecfree \