diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 790008be10f..43eab50cf34 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -92,12 +92,6 @@ endif
 
 CPPSRCS = nsBrowserApp.cpp
 
-LIBS += \
-  $(call EXPAND_LIBNAME_PATH,browsercomps,../components/build) \
-  $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-  $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
index b5514e79f07..f8cbf793382 100644
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -106,8 +106,6 @@ public:
   ~ScopedLogging() { NS_LogTerm(); }
 };
 
-extern const mozilla::Module kBrowserModule;
-
 int main(int argc, char* argv[])
 {
   ScopedLogging log;
@@ -157,8 +155,6 @@ int main(int argc, char* argv[])
     return 255;
   }
 
-  XRE_AddStaticComponent(&kBrowserModule);
-
   int result = XRE_main(argc, argv, appData);
   XRE_FreeAppData(appData);
   if (appEnv)
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 42cf6a1260e..3947a1fe8c5 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -7,15 +7,18 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = browsercomps
 LIBRARY_NAME = browsercomps
-
-ifdef LIBXUL_SDK
+SHORT_LIBNAME = brwsrcmp
 IS_COMPONENT = 1
+MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
-else
-FORCE_STATIC_LIB = 1
-DEFINES += -DBROWSERCOMPS_LINK_STATICALLY
+
+# Because we are an application component, link against the CRT statically
+# (on Windows, but only if we're not building our own CRT for jemalloc)
+ifndef MOZ_MEMORY
+USE_STATIC_LIBS = 1
 endif
 
+
 EXPORTS = nsBrowserCompsCID.h
 
 CPPSRCS = nsModule.cpp \
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index ac8a741bd16..8275c704ca2 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -237,13 +237,12 @@ static const mozilla::Module::CategoryEntry kBrowserCategories[] = {
     { NULL }
 };
 
-extern const mozilla::Module kBrowserModule = {
+static const mozilla::Module kBrowserModule = {
     mozilla::Module::kVersion,
     kBrowserCIDs,
     kBrowserContracts,
     kBrowserCategories
 };
 
-#ifndef BROWSERCOMPS_LINK_STATICALLY
 NSMODULE_DEFN(nsBrowserCompsModule) = &kBrowserModule;
-#endif
+
diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in
index 9fbce58f66b..4175d002529 100644
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -63,4 +63,9 @@ CPPSRCS = DirectoryProvider.cpp
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
+EXTRA_DSO_LDOPTS = \
+	$(XPCOM_GLUE_LDOPTS) \
+	$(NSPR_LIBS) \
+	$(NULL)
+
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 8322b06c90d..88d11f3b884 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -110,8 +110,6 @@ endif
 
 ifndef LIBXUL_SDK
 INSTALL_SDK = 1
-else
-DEFINES += -DLIBXUL_SDK=1
 endif
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 7ac5f095471..d2b66c98dd6 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -334,8 +334,10 @@
 @BINPATH@/components/nsSessionStore.js
 @BINPATH@/components/nsURLFormatter.manifest
 @BINPATH@/components/nsURLFormatter.js
-#ifdef LIBXUL_SDK
+#ifndef XP_OS2
 @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
+#else
+@BINPATH@/components/brwsrcmp@DLL_SUFFIX@
 #endif
 @BINPATH@/components/txEXSLTRegExFunctions.manifest
 @BINPATH@/components/txEXSLTRegExFunctions.js
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index ba68c30be7b..d8666aa0f14 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -37,9 +37,6 @@ chrome/toolkit.manifest
 component.reg
 components/browser.manifest
 components/components.list
-#ifndef LIBXUL_SDK
-components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
-#endif
 components/@DLL_PREFIX@browserdirprovider@DLL_SUFFIX@
 components/@DLL_PREFIX@brwsrdir@DLL_SUFFIX@
 components/@DLL_PREFIX@myspell@DLL_SUFFIX@