diff --git a/mozilla/accessible/build/Makefile.in b/mozilla/accessible/build/Makefile.in
index 15e6c8ebc99..e1f07409c01 100644
--- a/mozilla/accessible/build/Makefile.in
+++ b/mozilla/accessible/build/Makefile.in
@@ -43,9 +43,9 @@ CPPSRCS		= nsAccessibilityFactory.cpp
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
-    $(DIST)/lib/libaccessibility_base_s.$(LIB_SUFFIX) \
-    $(DIST)/lib/libaccessibility_html_s.$(LIB_SUFFIX) \
-    $(DIST)/lib/libaccessibility_xul_s.$(LIB_SUFFIX) \
+    $(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
+    $(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
+    $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) \
     $(NULL)
 
 
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 3887a3ef162..8a0a596b0c9 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -181,9 +181,9 @@ NSS_LIBS	= \
 	$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
 	$(NULL)
 
-MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libunicharutil_s.$(LIB_SUFFIX)
-MOZ_REGISTRY_LIBS          = $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX)
-MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)
+MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
+MOZ_REGISTRY_LIBS          = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
+MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
 
 # determine debug-related options
 _DEBUG_CFLAGS :=
@@ -520,7 +520,7 @@ endif
 # We need to know where to find the libraries we
 # put on the link line for binaries, and should
 # we link statically or dynamic?  Assuming dynamic for now.
-ifneq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+ifneq (,$(filter-out WINNT OS2, $(OS_ARCH)))
 LIBS_DIR	= -L$(DIST)/bin -L$(DIST)/lib
 endif
 
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index d52a92fe5f0..86012c615cb 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -105,12 +105,6 @@ endif
 #	the static library will  be built.
 #
 
-ifeq ($(OS_ARCH),OS2)
-STATIC_LIBS		= $(filter %_s, $(EXTRA_DSO_LIBS))
-SHARED_LIBS		= $(filter-out %_s, $(EXTRA_DSO_LIBS))
-EXTRA_DSO_LIBS		:= $(addprefix lib,$(STATIC_LIBS)) $(SHARED_LIBS)
-endif
-
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 _EXTRA_DSO_RELATIVE_PATHS=1
 else
@@ -123,7 +117,7 @@ ifdef _EXTRA_DSO_RELATIVE_PATHS
 EXTRA_DSO_LIBS		:= $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/,$(EXTRA_DSO_LIBS)))
 EXTRA_DSO_LIBS		:= $(filter-out %/bin %/lib,$(EXTRA_DSO_LIBS))
 EXTRA_DSO_LDOPTS    := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_DSO_LDOPTS))
-LIBS                := $(patsubst -l%,$(DIST)/lib/lib%.$(LIB_SUFFIX),$(LIBS))
+LIBS                := $(patsubst -l%,$(DIST)/lib/$(LIB_PREFIX)%.$(LIB_SUFFIX),$(LIBS))
 else
 EXTRA_DSO_LIBS		:= $(addprefix -l,$(EXTRA_DSO_LIBS))
 endif
@@ -163,7 +157,6 @@ DEF_OBJS		= $(OBJS)
 ifneq ($(EXPORT_OBJS),1)
 DEF_OBJS		+= $(SHARED_LIBRARY_LIBS)
 endif
-SHARED_LIBRARY		:= $(LIBRARY_NAME)$(DLL_SUFFIX)
 DEF_FILE		:= $(SHARED_LIBRARY:.dll=.def)
 endif
 
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 014d1749050..700107f3982 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -1099,12 +1099,20 @@ case "$target" in
         BIN_FLAGS='-Zlinker /PM:VIO -Zlinker /ST:0x30000'
         IMPLIB='emximp -o'
         FILTER='emxexp'
+        LIB_PREFIX=lib
         AC_DEFINE(OS2)
         AC_DEFINE(XP_OS2_EMX)
         AC_DEFINE(OS2EMX_PLAIN_CHAR)
         MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/lib $(NSPR_LIBS)'
         MOZ_COMPONENT_XPCOM_LIBS='-L$(DIST)/lib $(DIST)/lib/xpcom.lib'
         XPCOM_LIBS='-L$(DIST)/lib -lxpcom'
+        MOZ_JS_LIBS='$(DIST)/lib/libmozjs.lib'
+        MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/libxpcom.lib'
+        XPCOM_LIBS='$(DIST)/lib/libxpcom.lib'
+        MOZ_JPEG_LIBS='$(DIST)/lib/libmozjpeg.$(LIB_SUFFIX)'
+        MOZ_ZLIB_LIBS='$(DIST)/lib/libmozz.$(LIB_SUFFIX)'
+        MOZ_PNG_LIBS='$(DIST)/lib/libmozpng.$(LIB_SUFFIX)'
+        MOZ_MNG_LIBS='$(DIST)/lib/libmozmng.$(LIB_SUFFIX)'
     fi
 
     # Visual Age C++ build
@@ -1130,6 +1138,7 @@ case "$target" in
         DSO_LDOPTS=''
         IMPLIB='implib /NOL /NOI'
         FILTER='cppfilt -q -B -P'
+        LIB_PREFIX=
         AC_DEFINE(NO_ANSI_KEYWORDS)
         AC_DEFINE(OS2,4)
         AC_DEFINE(_X86_)
@@ -1140,6 +1149,13 @@ case "$target" in
         MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
         MKSHLIB='$(LD) $(DSO_LDOPTS)'
         MKCSHLIB='$(LD) $(DSO_LDOPTS)'
+        MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
+        MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
+        XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
+        MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)'
+        MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
+        MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)'
+        MOZ_MNG_LIBS='$(DIST)/lib/mozmng.$(LIB_SUFFIX)'
     fi
     ;;
 
@@ -1757,10 +1773,10 @@ then
 			AC_DEFINE(_REENTRANT) 
 			;;
 
-        *-*-os2*)
-            USE_PTHREADS=
-            _PTHREAD_LDFLAGS=
-            ;;
+	    *-*-os2*)
+	    USE_PTHREADS=
+	    _PTHREAD_LDFLAGS=
+	    ;;
 
 	    alpha*-*-osf*)
 			AC_DEFINE(_REENTRANT)
@@ -3931,26 +3947,6 @@ case "$target" in
 	AC_SUBST(AIX_SHLIB_BIN)
 	;;
 
-*-os2*)
-  if test "${BUILD_STATIC_LIBS}" = "1"; then
-    MOZ_JS_LIBS='$(DIST)/lib/libmozjs.lib'
-    MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/libxpcom.lib'
-    XPCOM_LIBS='$(DIST)/lib/libxpcom.lib'
-    MOZ_JPEG_LIBS='$(DIST)/lib/libmozjpeg.$(LIB_SUFFIX)'
-    MOZ_ZLIB_LIBS='$(DIST)/lib/libmozz.$(LIB_SUFFIX)'
-    MOZ_PNG_LIBS='$(DIST)/lib/libmozpng.$(LIB_SUFFIX)'
-    MOZ_MNG_LIBS='$(DIST)/lib/libmozmng.$(LIB_SUFFIX)'
-  else
-    MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
-    MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
-    XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
-    MOZ_JPEG_LIBS='$(DIST)/lib/libmozjpeg.$(LIB_SUFFIX)'
-    MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
-    MOZ_PNG_LIBS='$(DIST)/lib/libmozpng.$(LIB_SUFFIX)'
-    MOZ_MNG_LIBS='$(DIST)/lib/libmozmng.$(LIB_SUFFIX)'
-  fi
-	;;
-
 esac
 
 dnl ========================================================
diff --git a/mozilla/content/build/Makefile.in b/mozilla/content/build/Makefile.in
index 929d9c98fc2..be8a2bc925d 100644
--- a/mozilla/content/build/Makefile.in
+++ b/mozilla/content/build/Makefile.in
@@ -67,31 +67,31 @@ CPPSRCS		= \
 EXPORTS		= nsContentCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libgkconevents_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconhtmlcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxmlcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxsldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxulcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxuldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxultmpl_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxbl_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconshared_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconevents_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxsldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconshared_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef MOZ_SVG
 SHARED_LIBRARY_LIBS += \
-		$(DIST)/lib/libgkconsvgdoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkcontentsvg_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconsvgdoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkcontentsvg_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 ifdef MOZ_PERF_METRICS
 SHARED_LIBRARY_LIBS += \
-		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
diff --git a/mozilla/db/mork/build/Makefile.in b/mozilla/db/mork/build/Makefile.in
index 7d3333ca30a..e7a38afd75b 100644
--- a/mozilla/db/mork/build/Makefile.in
+++ b/mozilla/db/mork/build/Makefile.in
@@ -41,7 +41,7 @@ EXPORTS		= \
 		nsIMdbFactoryFactory.h \
 		$(NULL)
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in
index 219ccef5943..1e419e75c72 100644
--- a/mozilla/docshell/build/Makefile.in
+++ b/mozilla/docshell/build/Makefile.in
@@ -56,7 +56,7 @@ CPPSRCS		= \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS= \
-		$(DIST)/lib/libbasedocshell_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in
index b42f72acb24..4f34741488f 100644
--- a/mozilla/dom/src/build/Makefile.in
+++ b/mozilla/dom/src/build/Makefile.in
@@ -55,8 +55,8 @@ CPPSRCS		= \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libjsdombase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libjsdomevents_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in
index 011e489a5dd..2acfab2c6f4 100644
--- a/mozilla/editor/libeditor/build/Makefile.in
+++ b/mozilla/editor/libeditor/build/Makefile.in
@@ -62,9 +62,9 @@ else
 # We're building both plain and html editing
 CPPSRCS = nsEditorRegistration.cpp
 SHARED_LIBRARY_LIBS = \
-		../html/libhtmleditor_s.$(LIB_SUFFIX)      \
+		../html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX)      \
 		$(NULL)
-#		../composer/src/libcomposer_s.$(LIB_SUFFIX)    
+#		../composer/src/$(LIB_PREFIX)composer_s.$(LIB_SUFFIX)    
 endif
 
 #ifndef MKSHLIB_FORCE_ALL
@@ -73,8 +73,8 @@ endif
 
 # These libraries always get built:
 SHARED_LIBRARY_LIBS += \
-		../text/libtexteditor_s.$(LIB_SUFFIX)      \
-		../base/libeditorbase_s.$(LIB_SUFFIX)      \
+		../text/$(LIB_PREFIX)texteditor_s.$(LIB_SUFFIX)      \
+		../base/$(LIB_PREFIX)editorbase_s.$(LIB_SUFFIX)      \
 		$(NULL)
 
 ifdef ENABLE_EDITOR_API_LOG
diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in
index af6b5176f4c..ee47addbc51 100644
--- a/mozilla/embedding/browser/build/Makefile.in
+++ b/mozilla/embedding/browser/build/Makefile.in
@@ -53,7 +53,7 @@ CPPSRCS		= \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS= \
-		$(DIST)/lib/libnsWebBrowser_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index 9174b187434..538b87e4928 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -48,15 +48,15 @@ REQUIRES	= js \
 CPPSRCS		= nsModule.cpp
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libjsconsole_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libfind_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libwebbrowserpersist_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)jsconsole_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
 endif
 
 LOCAL_INCLUDES	= \
diff --git a/mozilla/extensions/inspector/build/src/Makefile.in b/mozilla/extensions/inspector/build/src/Makefile.in
index 819f87e22a5..fcc332ed205 100644
--- a/mozilla/extensions/inspector/build/src/Makefile.in
+++ b/mozilla/extensions/inspector/build/src/Makefile.in
@@ -57,7 +57,7 @@ LOCAL_INCLUDES += -I$(srcdir)/../../base/src
 EXTRA_DSO_LIBS = rdfutil_s gkgfx gkconshared_s
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libinspector_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in
index a08736e4740..ec594bf24c6 100644
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -161,4 +161,4 @@ GARBAGE += install.js $(wildcard transformiix*.xpi)
 xpi:
 	$(PERL) $(topsrcdir)/xpinstall/packager/unix/makejs.pl $(srcdir)/transformiix.jst $(_T_VERSION) . install.js
 	zip transformiix$(_T_VERSION).xpi install.js
-	cd $(DIST); zip -u ../extensions/transformiix/build/transformiix$(_T_VERSION).xpi bin/components/libtransformiix.so
+	cd $(DIST); zip -u ../extensions/transformiix/build/transformiix$(_T_VERSION).xpi bin/components/$(LIB_PREFIX)transformiix.$(LIB_SUFFIX)
diff --git a/mozilla/extensions/wallet/build/Makefile.in b/mozilla/extensions/wallet/build/Makefile.in
index 3a8b9d7cf24..628c93fe21b 100644
--- a/mozilla/extensions/wallet/build/Makefile.in
+++ b/mozilla/extensions/wallet/build/Makefile.in
@@ -44,9 +44,9 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libsignonviewer_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libwalletpreview_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libwalleteditor_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)signonviewer_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)walletpreview_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)walleteditor_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in
index b90fff338c1..ceb43d4eaec 100644
--- a/mozilla/extensions/xmlextras/build/src/Makefile.in
+++ b/mozilla/extensions/xmlextras/build/src/Makefile.in
@@ -48,12 +48,12 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsXMLExtrasModule.cpp
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libxmlextrasbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xmlextrasbase_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 
 ifdef MOZ_SOAP
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libxmlextrasschema_s.$(LIB_SUFFIX) $(DIST)/lib/libxmlextraswsdl_s.$(LIB_SUFFIX) $(DIST)/lib/libxmlextrassoap_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)xmlextrasschema_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xmlextraswsdl_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xmlextrassoap_s.$(LIB_SUFFIX)
 DEFINES = -DMOZ_SOAP
 endif
 
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 5f9481ef416..7d266925e49 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -112,7 +112,7 @@ CPPSRCS += \
 endif
 
 SHARED_LIBRARY_LIBS = \
-        $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
+        $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
         $(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index e61a1cccc9a..c353082334d 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -47,12 +47,12 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)expat_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xmltok_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
 endif
 
 CPPSRCS = \
@@ -87,10 +87,6 @@ endif
 EXPORTS  := $(addprefix $(srcdir)/, $(EXPORTS))
 
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
-endif
-
 EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_LIBS) $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/intl/locale/src/os2/Makefile.in b/mozilla/intl/locale/src/os2/Makefile.in
index 64fefe0d99f..17978f682d9 100644
--- a/mozilla/intl/locale/src/os2/Makefile.in
+++ b/mozilla/intl/locale/src/os2/Makefile.in
@@ -35,7 +35,7 @@ REQUIRES	= xpcom \
 		  uconv \
 		  $(NULL)
 
-SHARED_LIBRARY_LIBS = ../libnslocale_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = ../$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX)
 
 CPPSRCS		= \
 		nsOS2Locale.cpp \
diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index 6e75f4611c0..94c2e9daf8d 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -132,11 +132,7 @@ EXPORTS		= \
 		jsstddef.h \
 		$(NULL)
 
-ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
-FDLIBM_LIBRARY	= fdlibm/fdm.$(LIB_SUFFIX)
-else
-FDLIBM_LIBRARY	= fdlibm/libfdm.$(LIB_SUFFIX)
-endif
+FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
 JSMATH_PRELINK	= jsmathtemp.o
 JS_SAFE_ARENA	= 1
 
diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in
index 9ef26d0766d..d01e198db7f 100644
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@@ -43,7 +43,7 @@ LOCAL_INCLUDES	= \
 EXTRA_DSO_LIBS	= gkgfx
 
 LIBS		+= \
-		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(EXTRA_DSO_LIBS) \
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 7595d316f8b..3cefa34aa9d 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -55,34 +55,34 @@ endif
 EXPORTS		= nsLayoutCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libgkhtmlbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmlforms_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmltable_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkxulbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconshared_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkxuloutliner_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkxulgrid_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmlbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmlforms_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmlstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmltable_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconshared_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkxuloutliner_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS
 SHARED_LIBRARY_LIBS += \
-		$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 ifdef MOZ_MATHML
 SHARED_LIBRARY_LIBS += \
-                $(DIST)/lib/libgkmathmlcon_s.$(LIB_SUFFIX) \
-                $(DIST)/lib/libgkmathmlbase_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/$(LIB_PREFIX)gkmathmlcon_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/$(LIB_PREFIX)gkmathmlbase_s.$(LIB_SUFFIX) \
                 $(NSNULL)
 endif
 
 ifdef MOZ_SVG
 SHARED_LIBRARY_LIBS += \
-                $(DIST)/lib/libgksvgbase_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/$(LIB_PREFIX)gksvgbase_s.$(LIB_SUFFIX) \
                 $(NSNULL)
 endif
 
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 9760cb55500..4500692846c 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -42,20 +42,20 @@ LOCAL_INCLUDES	= -I$(srcdir)/../style/src
 EXTRA_DSO_LIBS += gkgfx
 
 LIBS		= \
-		$(DIST)/lib/libgkconhtmlcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmlforms_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmltable_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkhtmlbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconevents_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxmlcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconxmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkxulbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libgkconshared_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmlforms_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmlstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconhtmlstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmltable_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkhtmlbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconevents_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconshared_s.$(LIB_SUFFIX) \
 		$(MOZ_JS_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(TK_LIBS) \
diff --git a/mozilla/mailnews/absync/build/Makefile.in b/mozilla/mailnews/absync/build/Makefile.in
index d100b513fc4..ec287c8ad92 100644
--- a/mozilla/mailnews/absync/build/Makefile.in
+++ b/mozilla/mailnews/absync/build/Makefile.in
@@ -54,7 +54,7 @@ CPPSRCS		= nsAbSyncFactory.cpp
 EXPORTS		= nsAbSyncCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libabsync_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)absync_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/mailnews/addrbook/build/Makefile.in b/mozilla/mailnews/addrbook/build/Makefile.in
index 22d42ca0cfd..dc46e0cbaa8 100644
--- a/mozilla/mailnews/addrbook/build/Makefile.in
+++ b/mozilla/mailnews/addrbook/build/Makefile.in
@@ -58,11 +58,11 @@ DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/libaddrbook_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)addrbook_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 	-L$(DIST)/bin \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in
index 45863d94aba..65e5caa5469 100644
--- a/mozilla/mailnews/base/build/Makefile.in
+++ b/mozilla/mailnews/base/build/Makefile.in
@@ -70,13 +70,13 @@ CPPSRCS		= nsMsgFactory.cpp
 EXPORTS		= nsMsgBaseCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libmsgbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libmsgsearch_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)msgbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)msgsearch_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib	\
-		$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 		-L$(DIST)/bin \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in
index b8d8450518f..255c66516ac 100644
--- a/mozilla/mailnews/base/util/Makefile.in
+++ b/mozilla/mailnews/base/util/Makefile.in
@@ -106,7 +106,7 @@ EXPORTS		= \
 EXTRA_DSO_LDOPTS = \
 	-L$(DIST)/bin \
 	-L$(DIST)/lib \
-	$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in
index dbb2f8ed1a9..7bae679559e 100644
--- a/mozilla/mailnews/compose/build/Makefile.in
+++ b/mozilla/mailnews/compose/build/Makefile.in
@@ -62,7 +62,7 @@ CPPSRCS		= nsMsgCompFactory.cpp
 EXPORTS		= nsMsgCompCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libmsgcompose_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)msgcompose_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/mailnews/db/msgdb/build/Makefile.in b/mozilla/mailnews/db/msgdb/build/Makefile.in
index 7ea68da6170..5aa4a1a41cc 100644
--- a/mozilla/mailnews/db/msgdb/build/Makefile.in
+++ b/mozilla/mailnews/db/msgdb/build/Makefile.in
@@ -52,7 +52,7 @@ endif
 CPPSRCS		= nsMsgDBFactory.cpp
 EXPORTS		= nsMsgDBCID.h
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgdb_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
diff --git a/mozilla/mailnews/extensions/smime/build/Makefile.in b/mozilla/mailnews/extensions/smime/build/Makefile.in
index 5bc8fc0acbc..d68d932eab6 100644
--- a/mozilla/mailnews/extensions/smime/build/Makefile.in
+++ b/mozilla/mailnews/extensions/smime/build/Makefile.in
@@ -52,7 +52,7 @@ CPPSRCS		= nsMsgSMIMEFactory.cpp
 EXPORTS		= nsMsgSMIMECID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libmsgsmime_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in
index 6c087e1c77f..cd73473e196 100644
--- a/mozilla/mailnews/imap/build/Makefile.in
+++ b/mozilla/mailnews/imap/build/Makefile.in
@@ -59,8 +59,8 @@ CPPSRCS		= nsImapFactory.cpp
 EXPORTS		= nsMsgImapCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libmsgimap_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/mailnews/local/build/Makefile.in b/mozilla/mailnews/local/build/Makefile.in
index 88ab074904e..6b179c7bfda 100644
--- a/mozilla/mailnews/local/build/Makefile.in
+++ b/mozilla/mailnews/local/build/Makefile.in
@@ -59,12 +59,12 @@ CPPSRCS		= nsMsgLocalFactory.cpp
 EXPORTS		= nsMsgLocalCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libmsglocal_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)msglocal_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
-		$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 		-L$(DIST)/bin \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
diff --git a/mozilla/mailnews/mime/build/Makefile.in b/mozilla/mailnews/mime/build/Makefile.in
index 69142b393e2..1e7de1afd41 100644
--- a/mozilla/mailnews/mime/build/Makefile.in
+++ b/mozilla/mailnews/mime/build/Makefile.in
@@ -50,7 +50,7 @@ CPPSRCS			= nsMimeModule.cpp
 EXPORTS		= nsMsgMimeCID.h
 
 SHARED_LIBRARY_LIBS = \
-                $(DIST)/lib/libmime_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/$(LIB_PREFIX)mime_s.$(LIB_SUFFIX) \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/mailnews/mime/emitters/build/Makefile.in b/mozilla/mailnews/mime/emitters/build/Makefile.in
index a2085d5eb3e..bbba8b4717e 100644
--- a/mozilla/mailnews/mime/emitters/build/Makefile.in
+++ b/mozilla/mailnews/mime/emitters/build/Makefile.in
@@ -53,7 +53,7 @@ CPPSRCS		= nsEmitterFactory.cpp
 EXPORTS		= nsMimeEmitterCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libemitterutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)emitterutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/mailnews/news/build/Makefile.in b/mozilla/mailnews/news/build/Makefile.in
index d9c91ef494e..2f8c026fa4b 100644
--- a/mozilla/mailnews/news/build/Makefile.in
+++ b/mozilla/mailnews/news/build/Makefile.in
@@ -55,7 +55,7 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsMsgNewsFactory.cpp
 EXPORTS		= nsMsgNewsCID.h
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgnews_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgnews_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LIBS = rdfutil_s
 
diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in
index 7accd128916..08a25529011 100644
--- a/mozilla/netwerk/build/Makefile.in
+++ b/mozilla/netwerk/build/Makefile.in
@@ -50,29 +50,21 @@ CPPSRCS		= nsNetModule.cpp
 EXPORTS		= nsNetCID.h
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libneckobase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libneckodns_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libneckosocket_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkconv_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkcnvts_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkmime_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkhttp_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkfile_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkdata_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkjar_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkres_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkabout_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkkwd_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkhttp_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkfile_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkdata_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkjar_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkres_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkabout_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkkwd_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX)
-endif
-
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../dns/src \
@@ -95,4 +87,13 @@ EXTRA_DSO_LDOPTS = \
 		$(ZLIB_LIBS) \
 		$(NULL)
 
+ifdef MOZ_PERF_METRICS
+SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
+endif
+
 include $(topsrcdir)/config/rules.mk
+
+DEFINES                += -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES                += -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/build2/Makefile.in b/mozilla/netwerk/build2/Makefile.in
index 5a00fe8ade8..a0cf014ac55 100644
--- a/mozilla/netwerk/build2/Makefile.in
+++ b/mozilla/netwerk/build2/Makefile.in
@@ -41,11 +41,11 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsNetModule2.cpp
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libnkgopher_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkftp_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkfinger_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkdatetm_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnkviewsource_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkgopher_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkftp_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkfinger_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkdatetm_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)nkviewsource_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 LOCAL_INCLUDES	= \
@@ -62,3 +62,7 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES                += -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES                += -DWIN32_LEAN_AND_MEAN
+endif
diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in
index 76a9b875f7c..e97e3390734 100644
--- a/mozilla/netwerk/test/Makefile.in
+++ b/mozilla/netwerk/test/Makefile.in
@@ -37,8 +37,6 @@ REQUIRES	= xpcom \
 		  util \
 		  $(NULL)
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX)
-
 CPPSRCS		= \
 		TestSocketIO.cpp \
 		TestSocketInput.cpp \
@@ -46,7 +44,7 @@ CPPSRCS		= \
 		TestFileInput.cpp \
 		TestFileTransport.cpp \
 		TestProtocols.cpp \
-        TestHttp.cpp \
+		TestHttp.cpp \
 		urltest.cpp \
 		TestFileInput2.cpp \
 		TestCallbacks.cpp \
@@ -54,9 +52,9 @@ CPPSRCS		= \
 		TestMCTransport.cpp \
 		TestPageLoad.cpp \
 		TestIDN.cpp \
-        TestURLParser.cpp \
-        TestStandardURL.cpp \
-        TestPerf.cpp \
+		TestURLParser.cpp \
+		TestStandardURL.cpp \
+		TestPerf.cpp \
 		$(NULL)
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
@@ -64,17 +62,21 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 include $(topsrcdir)/config/config.mk
 
 LIBS		= \
+		$(DIST)/lib/$(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) \
 		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
-		$(SHARED_LIBRARY_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
-libs:: $(TARGETS)
-	$(INSTALL) $(srcdir)/urlparse.dat $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/urlparse_unx.dat $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/jarlist.dat $(DIST)/bin/res
+_RES_FILES = \
+		urlparse.dat \
+		urlparse_unx.dat \
+		jarlist.dat \
+		$(NULL)
+
+libs:: $(_RES_FILES)
+		$(INSTALL) $^ $(DIST)/bin/res
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index e61a1cccc9a..c353082334d 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -47,12 +47,12 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)expat_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)xmltok_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
 endif
 
 CPPSRCS = \
@@ -87,10 +87,6 @@ endif
 EXPORTS  := $(addprefix $(srcdir)/, $(EXPORTS))
 
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
-endif
-
 EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_LIBS) $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in
index 6eada7bcb78..d6f1e0d7948 100644
--- a/mozilla/rdf/build/Makefile.in
+++ b/mozilla/rdf/build/Makefile.in
@@ -49,9 +49,9 @@ EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 # XXX Note dependencies on implementation headers for factory functions
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/librdfbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/librdfdatasource_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/rdf/chrome/build/Makefile.in b/mozilla/rdf/chrome/build/Makefile.in
index e250f38b210..117c65743f4 100644
--- a/mozilla/rdf/chrome/build/Makefile.in
+++ b/mozilla/rdf/chrome/build/Makefile.in
@@ -43,7 +43,7 @@ CPPSRCS		= nsChromeFactory.cpp
 
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libchrome_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)chrome_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
diff --git a/mozilla/themes/classic/global/Makefile.in b/mozilla/themes/classic/global/Makefile.in
index 6447e27a6d6..3fa3bfd1393 100644
--- a/mozilla/themes/classic/global/Makefile.in
+++ b/mozilla/themes/classic/global/Makefile.in
@@ -26,10 +26,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),OS2)
 DIRS = win
-else
-DIRS = win
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/uriloader/build/Makefile.in b/mozilla/uriloader/build/Makefile.in
index 00e50f6b4ea..7900009aa4f 100644
--- a/mozilla/uriloader/build/Makefile.in
+++ b/mozilla/uriloader/build/Makefile.in
@@ -45,8 +45,8 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsURILoaderModule.cpp
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/liburiloaderbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libexthandler_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index 3ad1ce20cb8..43c5171d006 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -99,12 +99,8 @@ GTK_GLUE		= -lgtksuperwin
 endif
 
 ifdef MOZ_OJI
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-JSJ_LIB			= $(DIST)/lib/jsj.lib
-else
 JSJ_LIB			= -ljsj
 endif
-endif
 
 XP_DIST_LIBS		= \
 			$(MOZ_JS_LIBS) \
diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in
index 679500c4b19..c471488e1de 100644
--- a/mozilla/widget/src/os2/Makefile.in
+++ b/mozilla/widget/src/os2/Makefile.in
@@ -74,12 +74,13 @@ CPPSRCS		= \
 #		nsDataObj.cpp      \
 #		nsDataObjCollection.cpp      \
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libtimeros2_s.$(LIB_SUFFIX) \
+SHARED_LIBRARY_LIBS = \
+	$(DIST)/lib/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)timeros2_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	  	$(EXTRA_DSO_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 78e43d60e1b..ab82318a75e 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -87,7 +87,7 @@ CPPSRCS		= \
 		nsSetupRegistry.cpp \
 		nsWindowCreator.cpp \
 		nsSigHandlers.cpp \
-                showOSAlert.cpp \
+		showOSAlert.cpp \
 		$(NULL)
 
 XP_LIBS		= \
@@ -119,18 +119,10 @@ XP_LIBS		+= \
 endif
 
 ifdef MOZ_LDAP_XPCOM
-ifeq ($(OS_ARCH),OS2)
-# link with import ldap libs on os/2
-XP_LIBS   += \
-		$(DIST)/lib/ldap40.lib \
-		$(DIST)/lib/lber40.lib \
-		$(NULL)
-else  
 XP_LIBS		+= \
 		-lldap40 -llber40 \
 		$(NULL)
 endif
-endif
 
 ifdef MOZ_SVG
 XP_LIBS		+= $(MOZ_LIBART_LIBS)
@@ -169,12 +161,8 @@ XP_LIBS         += -ljprof
 endif
 
 ifdef MOZ_OJI
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OJI_LIBS	= $(DIST)/lib/jsj.lib
-else
 OJI_LIBS	= -ljsj
 endif
-endif
 
 LIBS		= $(XP_LIBS)
 
diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in
index e1d04b173c0..578461ec4de 100644
--- a/mozilla/xpfe/components/build/Makefile.in
+++ b/mozilla/xpfe/components/build/Makefile.in
@@ -57,18 +57,18 @@ DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/libautocomplete_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libbookmarks_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libdirectory_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libhistory_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libappcompintl_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/librelated_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/libsearch_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/liburlbarhistory_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)appcompintl_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)search_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)urlbarhistory_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
 endif
 
 LOCAL_INCLUDES	= \