diff --git a/calendar/base/backend/libical/Makefile.in b/calendar/base/backend/libical/Makefile.in
index 5632ce45af..cb8f6df00c 100644
--- a/calendar/base/backend/libical/Makefile.in
+++ b/calendar/base/backend/libical/Makefile.in
@@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
-FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 NO_INTERFACES_MANIFEST = 1
 
diff --git a/calendar/base/backend/libical/build/Makefile.in b/calendar/base/backend/libical/build/Makefile.in
index 734a965829..c36aaf669a 100644
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -12,10 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = calbasecomps
 SHORT_LIBNAME = calbscmp
-IS_COMPONENT = 1
 MODULE_NAME = calBaseModule
-# We don't want an EXPORT_LIBRARY
-FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 NO_COMPONENTS_MANIFEST = 1
 
diff --git a/calendar/base/backend/libical/build/moz.build b/calendar/base/backend/libical/build/moz.build
index c462a46625..4c8cd3ad1c 100644
--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -10,3 +10,6 @@ CPP_SOURCES += [
     'calBaseModule.cpp',
 ]
 
+# We don't want an EXPORT_LIBRARY
+FORCE_SHARED_LIB = True
+IS_COMPONENT = True
diff --git a/calendar/base/backend/libical/moz.build b/calendar/base/backend/libical/moz.build
index 453d8d68b1..04e6da6128 100644
--- a/calendar/base/backend/libical/moz.build
+++ b/calendar/base/backend/libical/moz.build
@@ -25,3 +25,5 @@ CPP_SOURCES += [
     'calUtils.cpp',
 ]
 
+FORCE_STATIC_LIB = True
+
diff --git a/calendar/libical/src/libical/Makefile.in b/calendar/libical/src/libical/Makefile.in
index e063b816e8..92b3889adf 100644
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
-FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS  = 1
 
 DEFINES += -DHAVE_CONFIG_H
diff --git a/calendar/libical/src/libical/moz.build b/calendar/libical/src/libical/moz.build
index 3824a253c9..41de14f0a1 100644
--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@@ -38,3 +38,5 @@ CSRCS += [
     'vsnprintf.c',
 ]
 
+FORCE_STATIC_LIB = True
+
diff --git a/db/mork/build/Makefile.in b/db/mork/build/Makefile.in
index 9aa621b892..8eb5e230fe 100644
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -11,15 +11,9 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mork
-EXPORT_LIBRARY = 1
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
-FORCE_SHARED_LIB = 1
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
 endif
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
diff --git a/db/mork/build/moz.build b/db/mork/build/moz.build
index 38e942637c..6cadd9830d 100644
--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -14,3 +14,11 @@ CPP_SOURCES += [
     'nsMorkFactory.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+
diff --git a/db/mork/src/Makefile.in b/db/mork/src/Makefile.in
index 7b90b8a214..c9db21d20b 100644
--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@@ -12,12 +12,5 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgmork_s
 
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
-else
-FORCE_STATIC_LIB = 1
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/db/mork/src/moz.build b/db/mork/src/moz.build
index f60ff922b8..994354ee6d 100644
--- a/db/mork/src/moz.build
+++ b/db/mork/src/moz.build
@@ -53,3 +53,8 @@ CPP_SOURCES += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += ['morkSearchRowCursor.cpp']
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/ldap/xpcom/src/Makefile.in b/ldap/xpcom/src/Makefile.in
index 3bb1ac2f99..6e55f1ba6d 100644
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -11,15 +11,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mozldap
-EXPORT_LIBRARY	= 1
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
-FORCE_SHARED_LIB = 1
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
 endif
 
 ifdef MOZ_PREF_EXTENSIONS
diff --git a/ldap/xpcom/src/moz.build b/ldap/xpcom/src/moz.build
index ffde988e09..5f1b5b88ca 100644
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -28,3 +28,11 @@ EXTRA_COMPONENTS += [
     'nsLDAPProtocolHandler.js',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+
diff --git a/mail/components/build/Makefile.in b/mail/components/build/Makefile.in
index 8cd73c0c57..87daa46831 100644
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -14,9 +14,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mailcomps
 SHORT_LIBNAME	= mailcmp
-EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY = 1
-MOZILLA_INTERNAL_API = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
diff --git a/mail/components/build/moz.build b/mail/components/build/moz.build
index 2cdbe1dee4..86a9f1e207 100644
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -9,3 +9,6 @@ CPP_SOURCES += [
     'nsMailComps.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+EXPORT_LIBRARY = True
+
diff --git a/mail/components/migration/src/Makefile.in b/mail/components/migration/src/Makefile.in
index 5dcc1ee89f..a3691c205f 100644
--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -13,6 +13,4 @@ LIBRARY_NAME = profilemigration_s
 MODULE_NAME = nsMailProfileMigratorModule
 MOZILLA_INTERNAL_API = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
diff --git a/mail/components/migration/src/moz.build b/mail/components/migration/src/moz.build
index 4d48bb9b0d..b5b9213a7d 100644
--- a/mail/components/migration/src/moz.build
+++ b/mail/components/migration/src/moz.build
@@ -26,3 +26,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'nsProfileMigratorBase.cpp',
     ]
 
+FORCE_STATIC_LIB = True
+
diff --git a/mail/components/search/Makefile.in b/mail/components/search/Makefile.in
index 572d066116..2f4f21ea73 100644
--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -16,8 +16,6 @@ MODULE_NAME = nsMailWinSearchHelperModule
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
-
-FORCE_STATIC_LIB = 1
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mail/components/search/moz.build b/mail/components/search/moz.build
index 8e83a97bab..4424d86f53 100644
--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -10,6 +10,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
     CPP_SOURCES += ['nsMailWinSearchHelper.cpp']
     EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
+    FORCE_STATIC_LIB = True
 
 MODULE = 'mailwinsearch'
 
diff --git a/mail/components/shell/Makefile.in b/mail/components/shell/Makefile.in
index 3628372b38..226cbec953 100644
--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -15,8 +15,6 @@ LIBRARY_NAME = shellservice_s
 MODULE_NAME = nsMailShellModule
 MOZILLA_INTERNAL_API = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
diff --git a/mail/components/shell/moz.build b/mail/components/shell/moz.build
index e82fa4bb02..f467244f8f 100644
--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -25,3 +25,5 @@ EXTRA_COMPONENTS += [
     'shell.manifest',
 ]
 
+FORCE_STATIC_LIB = True
+
diff --git a/mailnews/addrbook/src/Makefile.in b/mailnews/addrbook/src/Makefile.in
index 43d394f002..5ab38d1ead 100644
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= addrbook_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/mailnews/addrbook/src/moz.build b/mailnews/addrbook/src/moz.build
index 775722fbbb..dd13dd662f 100644
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -84,3 +84,8 @@ EXTRA_PP_COMPONENTS += [
     'nsAddrbook.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/base/search/src/Makefile.in b/mailnews/base/search/src/Makefile.in
index 1f790134e3..7da590c541 100644
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgsearch_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 EXPORT_DIR	= $(DIST)/bin/isp
 
 
diff --git a/mailnews/base/search/src/moz.build b/mailnews/base/search/src/moz.build
index ccc10b28ae..750771302e 100644
--- a/mailnews/base/search/src/moz.build
+++ b/mailnews/base/search/src/moz.build
@@ -26,3 +26,8 @@ EXTRA_COMPONENTS += [
     'nsMsgTraitService.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in
index 3b4548c645..52b7f615f5 100644
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgbase_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES         += -DMOZ_LDAP_XPCOM
diff --git a/mailnews/base/src/moz.build b/mailnews/base/src/moz.build
index 4a30273c00..fa387fa405 100644
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -79,3 +79,8 @@ EXTRA_JS_MODULES += [
     'virtualFolderWrapper.js',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/base/util/Makefile.in b/mailnews/base/util/Makefile.in
index cdb478cdc5..8604aff857 100644
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgbsutl_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 DEFINES		+= -D_IMPL_NS_MSG_BASE
 
diff --git a/mailnews/base/util/moz.build b/mailnews/base/util/moz.build
index 72eb3567e2..2cb68e8b80 100644
--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -66,3 +66,8 @@ EXTRA_JS_MODULES += [
     'traceHelper.js',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/build/Makefile.in b/mailnews/build/Makefile.in
index 6f6cbe6395..52df26c6fb 100644
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -11,14 +11,8 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mail
-EXPORT_LIBRARY = 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsMailModule
-FORCE_SHARED_LIB = 1
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
 endif
 
 ifdef MOZ_LDAP_XPCOM
diff --git a/mailnews/build/moz.build b/mailnews/build/moz.build
index 10a1bfc660..a2111f4a48 100644
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -9,3 +9,11 @@ CPP_SOURCES += [
     'nsMailModule.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+
diff --git a/mailnews/compose/src/Makefile.in b/mailnews/compose/src/Makefile.in
index fcd4c04c9c..2c8e6afb9d 100644
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgcompose_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/compose/src/moz.build b/mailnews/compose/src/moz.build
index f9b80ae4b5..9303ea6dc7 100644
--- a/mailnews/compose/src/moz.build
+++ b/mailnews/compose/src/moz.build
@@ -44,3 +44,8 @@ EXTRA_COMPONENTS += [
     'nsSMTPProtocolHandler.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/db/msgdb/src/Makefile.in b/mailnews/db/msgdb/src/Makefile.in
index 44a54d5e30..6145677ecd 100644
--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgdb_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/db/msgdb/src/moz.build b/mailnews/db/msgdb/src/moz.build
index b60a4a16b6..2be2ec4fa9 100644
--- a/mailnews/db/msgdb/src/moz.build
+++ b/mailnews/db/msgdb/src/moz.build
@@ -16,3 +16,8 @@ CPP_SOURCES += [
     'nsNewsDatabase.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
index 3c892ec256..b6f6f3fd59 100644
--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -11,11 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= bayesflt_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/extensions/bayesian-spam-filter/src/moz.build b/mailnews/extensions/bayesian-spam-filter/src/moz.build
index 70af71af68..5448142380 100644
--- a/mailnews/extensions/bayesian-spam-filter/src/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/src/moz.build
@@ -9,3 +9,8 @@ CPP_SOURCES += [
     'nsBayesianFilter.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/extensions/fts3/src/Makefile.in b/mailnews/extensions/fts3/src/Makefile.in
index ee3f66277f..440c2760c2 100644
--- a/mailnews/extensions/fts3/src/Makefile.in
+++ b/mailnews/extensions/fts3/src/Makefile.in
@@ -11,13 +11,6 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= fts3tok_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
-
 
 LOCAL_INCLUDES = \
 		$(SQLITE_CFLAGS)
diff --git a/mailnews/extensions/fts3/src/moz.build b/mailnews/extensions/fts3/src/moz.build
index 0d36ae399e..c14d2ba106 100644
--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -15,3 +15,8 @@ CPP_SOURCES += [
     'nsGlodaRankerFunction.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/extensions/mailviews/src/Makefile.in b/mailnews/extensions/mailviews/src/Makefile.in
index 324bc4f9ce..ab1e5016cb 100644
--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mailnews/extensions/mailviews/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mailview_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/extensions/mailviews/src/moz.build b/mailnews/extensions/mailviews/src/moz.build
index a6e73a04d1..6179eda26e 100644
--- a/mailnews/extensions/mailviews/src/moz.build
+++ b/mailnews/extensions/mailviews/src/moz.build
@@ -9,3 +9,8 @@ CPP_SOURCES += [
     'nsMsgMailViewList.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/extensions/mdn/src/Makefile.in b/mailnews/extensions/mdn/src/Makefile.in
index fde74f671e..9b5d4cde06 100644
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgmdn_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/extensions/mdn/src/moz.build b/mailnews/extensions/mdn/src/moz.build
index 34594ef0ba..219a1620ce 100644
--- a/mailnews/extensions/mdn/src/moz.build
+++ b/mailnews/extensions/mdn/src/moz.build
@@ -14,3 +14,8 @@ EXTRA_COMPONENTS += [
     'mdn-service.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/extensions/smime/src/Makefile.in b/mailnews/extensions/smime/src/Makefile.in
index 26d3e0b3b2..81f415507f 100644
--- a/mailnews/extensions/smime/src/Makefile.in
+++ b/mailnews/extensions/smime/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgsmime_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/extensions/smime/src/moz.build b/mailnews/extensions/smime/src/moz.build
index 46810c7df6..86141691d3 100644
--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -16,3 +16,8 @@ EXTRA_COMPONENTS += [
     'smime-service.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/imap/src/Makefile.in b/mailnews/imap/src/Makefile.in
index 848feca68a..9ece5b4712 100644
--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -11,15 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgimap_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
-
-
-include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/mailnews/imap/src/moz.build b/mailnews/imap/src/moz.build
index e1bae71067..74be6441ed 100644
--- a/mailnews/imap/src/moz.build
+++ b/mailnews/imap/src/moz.build
@@ -31,3 +31,8 @@ CPP_SOURCES += [
     'nsSyncRunnableHelpers.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/imap/test/Makefile.in b/mailnews/imap/test/Makefile.in
index 2ad2845404..2343c3cbb6 100644
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -11,8 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/mailnews/import/applemail/src/Makefile.in b/mailnews/import/applemail/src/Makefile.in
index 2c9cf91c2b..14822ed555 100644
--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@@ -10,11 +10,5 @@ VPATH			= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= applmail_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/import/applemail/src/moz.build b/mailnews/import/applemail/src/moz.build
index 5e415de9a2..66a7a4d2ca 100644
--- a/mailnews/import/applemail/src/moz.build
+++ b/mailnews/import/applemail/src/moz.build
@@ -13,3 +13,8 @@ CMMSRCS += [
     'nsEmlxHelperUtils.mm',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/build/Makefile.in b/mailnews/import/build/Makefile.in
index d6ae35982d..866fa724c9 100644
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -12,13 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = import
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsImportServiceModule
-FORCE_SHARED_LIB=1
-else
-EXPORT_LIBRARY = 1
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
 endif
 
 
diff --git a/mailnews/import/build/moz.build b/mailnews/import/build/moz.build
index 1173a3e46a..52145bfda7 100644
--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -9,3 +9,10 @@ CPP_SOURCES += [
     'nsImportModule.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
+
diff --git a/mailnews/import/eudora/src/Makefile.in b/mailnews/import/eudora/src/Makefile.in
index a53e982da6..a32aa8dd1e 100644
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impEudra_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/mailnews/import/eudora/src/moz.build b/mailnews/import/eudora/src/moz.build
index 4a4484ad4f..30cfc37ac7 100644
--- a/mailnews/import/eudora/src/moz.build
+++ b/mailnews/import/eudora/src/moz.build
@@ -22,3 +22,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += ['nsEudoraMac.cpp']
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/oexpress/Makefile.in b/mailnews/import/oexpress/Makefile.in
index b357fe510a..e2e80b194c 100644
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = importOE_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/mailnews/import/oexpress/moz.build b/mailnews/import/oexpress/moz.build
index 1c7db123ba..e07a411d5c 100644
--- a/mailnews/import/oexpress/moz.build
+++ b/mailnews/import/oexpress/moz.build
@@ -17,3 +17,8 @@ CPP_SOURCES += [
     'nsOEStringBundle.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/outlook/src/Makefile.in b/mailnews/import/outlook/src/Makefile.in
index 70adf2d511..c7e5ffa9bf 100644
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impOutlk_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
diff --git a/mailnews/import/outlook/src/moz.build b/mailnews/import/outlook/src/moz.build
index 6f60ea1b2b..e6b2c09768 100644
--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -18,3 +18,8 @@ CPP_SOURCES += [
     'rtfMailDecoder.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/src/Makefile.in b/mailnews/import/src/Makefile.in
index f75b6c31ac..05b72df4d5 100644
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -11,11 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = import_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/import/src/moz.build b/mailnews/import/src/moz.build
index 6911e7c998..1624c56566 100644
--- a/mailnews/import/src/moz.build
+++ b/mailnews/import/src/moz.build
@@ -23,3 +23,8 @@ CPP_SOURCES += [
     'nsImportTranslator.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/text/src/Makefile.in b/mailnews/import/text/src/Makefile.in
index ae11edbfc1..5f9aa995fd 100644
--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = imptext_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
diff --git a/mailnews/import/text/src/moz.build b/mailnews/import/text/src/moz.build
index 30c5084f74..79ee8badcd 100644
--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@@ -10,3 +10,8 @@ CPP_SOURCES += [
     'nsTextImport.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/vcard/src/Makefile.in b/mailnews/import/vcard/src/Makefile.in
index d88c68f2df..5b1cef5e4d 100644
--- a/mailnews/import/vcard/src/Makefile.in
+++ b/mailnews/import/vcard/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impvcard_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
diff --git a/mailnews/import/vcard/src/moz.build b/mailnews/import/vcard/src/moz.build
index e7a6097d9a..145f05382d 100644
--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@@ -10,3 +10,8 @@ CPP_SOURCES += [
     'nsVCardImport.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/import/winlivemail/Makefile.in b/mailnews/import/winlivemail/Makefile.in
index 9329f794e8..b682e2590e 100644
--- a/mailnews/import/winlivemail/Makefile.in
+++ b/mailnews/import/winlivemail/Makefile.in
@@ -11,11 +11,5 @@ VPATH       =   @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   =        importWM_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/import/winlivemail/moz.build b/mailnews/import/winlivemail/moz.build
index bcdccb0274..4c518c81f9 100644
--- a/mailnews/import/winlivemail/moz.build
+++ b/mailnews/import/winlivemail/moz.build
@@ -12,3 +12,8 @@ CPP_SOURCES += [
     'nsWMUtils.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/local/src/Makefile.in b/mailnews/local/src/Makefile.in
index ca3e043741..1e524a7a4a 100644
--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@@ -11,11 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msglocal_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/local/src/moz.build b/mailnews/local/src/moz.build
index c89cc73048..51a9e72c09 100644
--- a/mailnews/local/src/moz.build
+++ b/mailnews/local/src/moz.build
@@ -33,3 +33,9 @@ if CONFIG['MOZ_MOVEMAIL']:
         'nsMovemailIncomingServer.cpp',
         'nsMovemailService.cpp',
     ]
+
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/mapi/mapiDll/Makefile.in b/mailnews/mapi/mapiDll/Makefile.in
index abe62d8d0e..1bfc1446d5 100644
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -23,8 +23,6 @@ endif
 
 OS_LIBS		+= ole32.lib
 
-FORCE_SHARED_LIB = 1
-
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/mapi/mapiDll/moz.build b/mailnews/mapi/mapiDll/moz.build
index 9027f4be2b..5b57485854 100644
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -9,3 +9,5 @@ CPP_SOURCES += [
     'MapiDll.cpp',
 ]
 
+FORCE_SHARED_LIB = True
+
diff --git a/mailnews/mapi/mapihook/build/Makefile.in b/mailnews/mapi/mapihook/build/Makefile.in
index bd0e54c6ef..b59a04bf4e 100644
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -26,8 +26,6 @@ GARBAGE	+= $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 LOCAL_INCLUDES	= -I.
 
-FORCE_SHARED_LIB = 1
-
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/mapi/mapihook/build/moz.build b/mailnews/mapi/mapihook/build/moz.build
index e476a295a3..8f07f1f95e 100644
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -15,3 +15,5 @@ CSRCS += [
     'msgMapi_p.c',
 ]
 
+FORCE_SHARED_LIB = True
+
diff --git a/mailnews/mapi/mapihook/src/Makefile.in b/mailnews/mapi/mapihook/src/Makefile.in
index 43009cb07c..daf8aa284a 100644
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -12,12 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= $(MODULE)
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= msgMapiModule
-else
-EXPORT_LIBRARY  = 1
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY  = 1
 endif
 
 LOBJS		= ../build/msgMapi_i.$(OBJ_SUFFIX)
diff --git a/mailnews/mapi/mapihook/src/moz.build b/mailnews/mapi/mapihook/src/moz.build
index 8f41a0f88e..e0c2e5e779 100644
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -14,3 +14,8 @@ CPP_SOURCES += [
     'msgMapiSupport.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+else:
+    LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
diff --git a/mailnews/mime/cthandlers/glue/Makefile.in b/mailnews/mime/cthandlers/glue/Makefile.in
index c373e04548..09fdf029bf 100644
--- a/mailnews/mime/cthandlers/glue/Makefile.in
+++ b/mailnews/mime/cthandlers/glue/Makefile.in
@@ -11,13 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mimecthglue_s
-EXPORT_LIBRARY = 1
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/mime/cthandlers/glue/moz.build b/mailnews/mime/cthandlers/glue/moz.build
index c4ed0c241d..12ce560f11 100644
--- a/mailnews/mime/cthandlers/glue/moz.build
+++ b/mailnews/mime/cthandlers/glue/moz.build
@@ -14,3 +14,10 @@ CPP_SOURCES += [
     'nsMimeContentTypeHandler.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+
diff --git a/mailnews/mime/cthandlers/pgpmime/Makefile.in b/mailnews/mime/cthandlers/pgpmime/Makefile.in
index 89469098b3..1a5d10d669 100644
--- a/mailnews/mime/cthandlers/pgpmime/Makefile.in
+++ b/mailnews/mime/cthandlers/pgpmime/Makefile.in
@@ -10,13 +10,8 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = pgpmime_s
-EXPORT_LIBRARY = 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT   = 1
 MODULE_NAME    = nsPgpMimeModule
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/mime/cthandlers/pgpmime/moz.build b/mailnews/mime/cthandlers/pgpmime/moz.build
index 5e00551481..d6984abd52 100644
--- a/mailnews/mime/cthandlers/pgpmime/moz.build
+++ b/mailnews/mime/cthandlers/pgpmime/moz.build
@@ -13,3 +13,10 @@ CPP_SOURCES += [
     'nsPgpMimeProxy.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+
diff --git a/mailnews/mime/cthandlers/vcard/Makefile.in b/mailnews/mime/cthandlers/vcard/Makefile.in
index af9b29453c..142964cea9 100644
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = vcard_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
diff --git a/mailnews/mime/cthandlers/vcard/moz.build b/mailnews/mime/cthandlers/vcard/moz.build
index 123bf7d883..92b2a0c83a 100644
--- a/mailnews/mime/cthandlers/vcard/moz.build
+++ b/mailnews/mime/cthandlers/vcard/moz.build
@@ -9,3 +9,8 @@ CPP_SOURCES += [
     'mimevcrd.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/mime/emitters/Makefile.in b/mailnews/mime/emitters/Makefile.in
index 812b5f1fff..662fad14bd 100644
--- a/mailnews/mime/emitters/Makefile.in
+++ b/mailnews/mime/emitters/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= emitterutil_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/mime/emitters/moz.build b/mailnews/mime/emitters/moz.build
index 110ae04e61..664b04a631 100644
--- a/mailnews/mime/emitters/moz.build
+++ b/mailnews/mime/emitters/moz.build
@@ -19,3 +19,8 @@ CPP_SOURCES += [
     'nsMimeXmlEmitter.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/mime/src/Makefile.in b/mailnews/mime/src/Makefile.in
index cc1e64834e..1ea19232d2 100644
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -13,12 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 DEFINES		+= -DENABLE_SMIME
 
 LIBRARY_NAME	= mime_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mailnews/mime/src/moz.build b/mailnews/mime/src/moz.build
index 3488defdfa..d32f440abb 100644
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -76,3 +76,8 @@ EXTRA_COMPONENTS += [
     'msgMime.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/mailnews/news/src/Makefile.in b/mailnews/news/src/Makefile.in
index 42bef189dc..9efa58d1bf 100644
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgnews_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/mailnews/news/src/moz.build b/mailnews/news/src/moz.build
index 0515552d5d..ade7bfd9fd 100644
--- a/mailnews/news/src/moz.build
+++ b/mailnews/news/src/moz.build
@@ -20,3 +20,8 @@ CPP_SOURCES += [
     'nsNntpUrl.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
diff --git a/suite/build/Makefile.in b/suite/build/Makefile.in
index 111a429fa4..16e271e439 100644
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	 = suite
-FORCE_SHARED_LIB = 1
-IS_COMPONENT	 = 1
 MODULE_NAME	 = nsSuiteModule
 
 USE_STATIC_LIBS	 = 1
diff --git a/suite/build/moz.build b/suite/build/moz.build
index e86a538425..ba60d72354 100644
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -9,3 +9,5 @@ CPP_SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
+FORCE_SHARED_LIB = True
+IS_COMPONENT = True
diff --git a/suite/feeds/src/Makefile.in b/suite/feeds/src/Makefile.in
index 2a05030f48..9317a58190 100644
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = suitefeeds_s
-FORCE_STATIC_LIB = 1
 
 USE_STATIC_LIBS = 1
 
diff --git a/suite/feeds/src/moz.build b/suite/feeds/src/moz.build
index ad0554e1b7..dac46b48de 100644
--- a/suite/feeds/src/moz.build
+++ b/suite/feeds/src/moz.build
@@ -16,3 +16,5 @@ EXTRA_COMPONENTS += [
     'WebContentConverter.js',
 ]
 
+FORCE_STATIC_LIB = True
+
diff --git a/suite/profile/Makefile.in b/suite/profile/Makefile.in
index 04da74b339..75bd4e26bc 100644
--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@@ -13,9 +13,6 @@ LIBRARY_NAME	= suiteprofile_s
 
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/suite/profile/migration/src/Makefile.in b/suite/profile/migration/src/Makefile.in
index ec1432d1e5..f46e98843e 100644
--- a/suite/profile/migration/src/Makefile.in
+++ b/suite/profile/migration/src/Makefile.in
@@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= suitemigration_s
 
-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
diff --git a/suite/profile/migration/src/moz.build b/suite/profile/migration/src/moz.build
index 8eb8275ff5..5d05a5b7aa 100644
--- a/suite/profile/migration/src/moz.build
+++ b/suite/profile/migration/src/moz.build
@@ -18,3 +18,6 @@ EXTRA_COMPONENTS += [
 EXTRA_PP_COMPONENTS += [
     'SuiteProfileMigrator.js',
 ]
+
+FORCE_STATIC_LIB = True
+
diff --git a/suite/profile/moz.build b/suite/profile/moz.build
index aef7ac3b33..daac7048bd 100644
--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -14,3 +14,5 @@ CPP_SOURCES += [
     'nsSuiteDirectoryProvider.cpp',
 ]
 
+FORCE_STATIC_LIB = True
+
diff --git a/suite/shell/src/Makefile.in b/suite/shell/src/Makefile.in
index f54b329453..1c3a123e9d 100644
--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -9,8 +9,6 @@ VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/suite/shell/src/moz.build b/suite/shell/src/moz.build
index a4f7e84a02..50b8a1241e 100644
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -18,3 +18,5 @@ if CPP_SOURCES:
         'nsSetDefault.manifest',
     ]
 
+FORCE_STATIC_LIB = True
+