--- a/other-licenses/skia-npapi/Makefile.in
+++ b/other-licenses/skia-npapi/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 
 DEFINES += \
   -DSK_BUILD_FOR_ANDROID_NDK \
   $(NULL)
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/plugins/base \

--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
     'ANPPaint.cpp',
     'ANPPath.cpp',
     'ANPTypeface.cpp',
     'SkANP.cpp',
 ]
 
 LIBRARY_NAME = 'skia_npapi'
 
+LIBXUL_LIBRARY = True
+

--- a/other-licenses/snappy/Makefile.in
+++ b/other-licenses/snappy/Makefile.in
@@ -8,12 +8,11 @@ srcdir    = @srcdir@
 
 VPATH = \
   @srcdir@ \
   $(topsrcdir)/other-licenses/snappy/src
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/other-licenses/snappy/moz.build
+++ b/other-licenses/snappy/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'snappy-c.cc',
     'snappy-sinksource.cc',
     'snappy-stubs-internal.cc',
     'snappy.cc',
 ]
 
 LIBRARY_NAME = 'snappy_s'
 
+LIBXUL_LIBRARY = True
+

--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -5,17 +5,15 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
 #DEFINES		+= -DENABLE_VOID_MENUITEM

--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -80,8 +80,10 @@ CPP_SOURCES += [
     'nsHtml5TreeOperation.cpp',
     'nsHtml5UTF16Buffer.cpp',
     'nsHtml5ViewSourceUtils.cpp',
     'nsParserUtils.cpp',
 ]
 
 LIBRARY_NAME = 'html5p_s'
 
+LIBXUL_LIBRARY = True
+

--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -5,16 +5,13 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
-
 SHARED_LIBRARY_LIBS = \
 		$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/parser/htmlparser/src/moz.build
+++ b/parser/htmlparser/src/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'nsParserNode.cpp',
     'nsParserService.cpp',
     'nsScanner.cpp',
     'nsScannerString.cpp',
 ]
 
 LIBRARY_NAME = 'htmlpars'
 
+LIBXUL_LIBRARY = True
+

--- a/parser/xml/src/Makefile.in
+++ b/parser/xml/src/Makefile.in
@@ -7,11 +7,9 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 
 MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
-
 include $(topsrcdir)/config/rules.mk

--- a/parser/xml/src/moz.build
+++ b/parser/xml/src/moz.build
@@ -15,8 +15,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsSAXAttributes.cpp',
     'nsSAXLocator.cpp',
     'nsSAXXMLReader.cpp',
 ]
 
 LIBRARY_NAME = 'saxp'
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/rdf/base/src/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY  = 1
-
-include $(topsrcdir)/config/rules.mk
-

--- a/rdf/base/src/moz.build
+++ b/rdf/base/src/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'nsRDFXMLParser.cpp',
     'nsRDFXMLSerializer.cpp',
     'rdfTriplesSerializer.cpp',
     'rdfutil.cpp',
 ]
 
 LIBRARY_NAME = 'rdfbase_s'
 
+LIBXUL_LIBRARY = True
+

--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -6,20 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY = 1
-
-# XXX Note dependencies on implementation headers for factory functions
-
 SHARED_LIBRARY_LIBS = \
 		../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
 		../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \

--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'nsRDFModule.cpp',
 ]
 
 LIBRARY_NAME = 'rdf'
 
+LIBXUL_LIBRARY = True
+

--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk
 
 # XXX This is a dependency on rdfutil.h: it'll go away once that becomes
 # a first-class XPCOM interface.
 INCLUDES	+= -I$(srcdir)/../../base/src
 

--- a/rdf/datasource/src/moz.build
+++ b/rdf/datasource/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'rdf'
 
 CPP_SOURCES += [
     'nsFileSystemDataSource.cpp',
     'nsLocalStore.cpp',
 ]
 
 LIBRARY_NAME = 'rdfdatasource_s'
 
+LIBXUL_LIBRARY = True
+

--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY	= 1
 DEFINES += -D__STDC_CONSTANT_MACROS
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
 

--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'nsSecurityWarningDialogs.cpp',
     'nsSiteSecurityService.cpp',
 ]
 
 LIBRARY_NAME = 'pipboot'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -7,15 +7,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY	= 1
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'nsPKIModule.cpp',
     'nsPKIParamBlock.cpp',
 ]
 
 LIBRARY_NAME = 'pippki'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -7,17 +7,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY	= 1
 CSRCS += md4.c
 
 DEFINES += \
   -DNSS_ENABLE_ECC \
   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)
 

--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -80,8 +80,10 @@ if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY'
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsCertTree.cpp',
     ]
 
 LIBRARY_NAME = 'pipnss'
 
+LIBXUL_LIBRARY = True
+

--- a/security/sandbox/Makefile.in
+++ b/security/sandbox/Makefile.in
@@ -5,16 +5,14 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = sandbox_s
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
-include $(topsrcdir)/config/rules.mk
 

--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -9,8 +9,10 @@ MODULE = 'sandbox'
 EXPORTS.mozilla += [
     'Sandbox.h',
 ]
 
 CPP_SOURCES += [
     'Sandbox.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@@ -5,12 +5,11 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY := 1
-LIBXUL_LIBRARY := 1
 MOZILLA_INTERNAL_API := 1
 
 include $(topsrcdir)/config/rules.mk

--- a/services/crypto/component/moz.build
+++ b/services/crypto/component/moz.build
@@ -17,8 +17,10 @@ MODULE = 'services-crypto'
 CPP_SOURCES += [
     'nsSyncJPAKE.cpp',
 ]
 
 LIBRARY_NAME = 'services-crypto'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -6,11 +6,9 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk

--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -21,8 +21,10 @@ EXPORTS.mozilla.scache += [
 CPP_SOURCES += [
     'StartupCache.cpp',
     'StartupCacheModule.cpp',
     'StartupCacheUtils.cpp',
 ]
 
 LIBRARY_NAME = 'startupcache'
 
+LIBXUL_LIBRARY = True
+

--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -6,19 +6,16 @@
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES = \
 	$(SQLITE_CFLAGS) \
 	-I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
 	../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
 	$(NULL)
 

--- a/storage/build/moz.build
+++ b/storage/build/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'mozStorageModule.cpp',
 ]
 
 LIBRARY_NAME = 'storagecomps'
 
+LIBXUL_LIBRARY = True
+

--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 # Don't use the jemalloc allocator on Android, because we can't guarantee
 # that Gecko will configure sqlite before it is first used (bug 730495).
 #
 # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
 # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
 # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
 ifdef MOZ_MEMORY
 ifneq ($(OS_TARGET), Android)

--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -34,8 +34,10 @@ CPP_SOURCES += [
     'mozStorageStatement.cpp',
     'mozStorageStatementJSHelper.cpp',
     'mozStorageStatementParams.cpp',
     'mozStorageStatementRow.cpp',
 ]
 
 LIBRARY_NAME = 'storage_s'
 
+LIBXUL_LIBRARY = True
+

--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -13,18 +13,16 @@ VPATH = \
   $(srcdir)/gtest/src \
   $(srcdir)/mozilla \
   $(srcdir)/gmock/src \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES += \
   -I$(srcdir)/gtest \
   -I$(srcdir)/gtest/include \
   -I$(srcdir)/gmock \
   -I$(srcdir)/gmock/include \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@@ -60,8 +60,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'gtest'
 
 GTEST_CPP_SOURCES += [
     'SanityTest.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = alerts_s
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -12,8 +12,10 @@ XPIDL_SOURCES += [
 
 MODULE = 'alerts'
 
 CPP_SOURCES += [
     'nsAlertsService.cpp',
     'nsXULAlerts.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -5,10 +5,9 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -21,8 +21,10 @@ CPP_SOURCES += [
     'nsAutoCompleteController.cpp',
     'nsAutoCompleteSimpleResult.cpp',
 ]
 
 LIBRARY_NAME = 'tkautocomplete'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -7,18 +7,16 @@ DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = toolkitcomps
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../alerts \
   -I$(srcdir)/../downloads \
   -I$(srcdir)/../feeds \
   -I$(srcdir)/../find \
   -I$(srcdir)/../intl \
   -I$(srcdir)/../protobuf \
   -I$(srcdir)/../startup \

--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'toolkitcomps'
 EXPORTS += [
     'nsToolkitCompsCID.h',
 ]
 
 CPP_SOURCES += [
     'nsToolkitCompsModule.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -5,11 +5,9 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -18,8 +18,10 @@ XPIDL_MODULE = 'commandlines'
 MODULE = 'toolkitcomps'
 
 CPP_SOURCES += [
     'nsCommandLine.cpp',
 ]
 
 LIBRARY_NAME = 'commandlines'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -12,8 +12,11 @@ CPP_SOURCES += [
     'ctypes.cpp',
 ]
 
 LIBRARY_NAME = 'jsctypes'
 
 EXTRA_JS_MODULES += [
     'ctypes.jsm',
 ]
+
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/diskspacewatcher/Makefile.in
+++ b/toolkit/components/diskspacewatcher/Makefile.in
@@ -6,12 +6,10 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = diskspacewatcher
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/toolkit/components/diskspacewatcher/moz.build
+++ b/toolkit/components/diskspacewatcher/moz.build
@@ -13,8 +13,11 @@ EXPORTS += [
 ]
 
 XPIDL_MODULE = 'diskspacewatcher'
 MODULE = 'toolkitcomps'
 
 CPP_SOURCES = [
     'DiskSpaceWatcher.cpp',
 ]
+
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -6,16 +6,15 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = download_s
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../protobuf \
   $(NULL)

--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -33,8 +33,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 if not CONFIG['MOZ_SUITE']:
     EXTRA_COMPONENTS += [
         'nsDownloadManagerUI.js',
         'nsDownloadManagerUI.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -6,19 +6,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 ABS_SRCDIR := $(call core_abspath,$(srcdir))
 ifeq ($(OS_ARCH),WINNT)
 
 check::
 	cd $(srcdir)/test; $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) shell.js 
 

--- a/toolkit/components/feeds/moz.build
+++ b/toolkit/components/feeds/moz.build
@@ -23,8 +23,10 @@ MODULE = 'feeds'
 
 EXTRA_COMPONENTS += [
     'FeedProcessor.js',
     'FeedProcessor.manifest',
 ]
 
 LIBRARY_NAME = 'feed_s'
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/toolkit/components/find/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/find/moz.build
+++ b/toolkit/components/find/moz.build
@@ -11,8 +11,10 @@ XPIDL_SOURCES += [
 MODULE = 'mozfind'
 
 CPP_SOURCES += [
     'nsFindService.cpp',
 ]
 
 LIBRARY_NAME = 'mozfind_s'
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/toolkit/components/intl/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY    = 1
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/intl/moz.build
+++ b/toolkit/components/intl/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'intl'
 
 CPP_SOURCES += [
     'nsCharsetMenu.cpp',
 ]
 
 LIBRARY_NAME = 'intl_s'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/mediasniffer/Makefile.in
+++ b/toolkit/components/mediasniffer/Makefile.in
@@ -5,12 +5,11 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mediasniffer
-LIBXUL_LIBRARY  = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -15,8 +15,11 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsMediaSniffer.cpp',
     'nsMediaSnifferModule.cpp',
 ]
 
 CSRCS += [
     'mp3sniff.c',
 ]
+
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
 ifdef ENABLE_TESTS
 MOCHITEST_CHROME_FILES = \
     test_pm.xul \

--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'jsperf'
 
 EXTRA_JS_MODULES += [
     'PerfMeasurement.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/reflect/Makefile.in
+++ b/toolkit/components/reflect/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/reflect/moz.build
+++ b/toolkit/components/reflect/moz.build
@@ -10,8 +10,11 @@ CPP_SOURCES += [
     'reflect.cpp',
 ]
 
 LIBRARY_NAME = 'jsreflect'
 
 EXTRA_JS_MODULES += [
     'reflect.jsm',
 ]
+
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@@ -7,14 +7,12 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
 

--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
@@ -22,8 +22,10 @@ if CONFIG['MOZ_ENABLE_GTK']:
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     CPP_SOURCES += [
         'nsQtRemoteService.cpp',
     ]
 
 LIBRARY_NAME = 'remoteservice'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(NULL)
 
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -35,8 +35,10 @@ LIBRARY_NAME = 'satchel'
 EXTRA_JS_MODULES += [
     'nsFormAutoCompleteResult.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'FormHistory.jsm',
 ]
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/toolkit/components/startup/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -35,8 +35,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     ]
 else:
     CPP_SOURCES += [
         'nsUserInfoUnix.cpp',
     ]
 
 LIBRARY_NAME = 'appstartup_s'
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/toolkit/components/statusfilter/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/statusfilter/moz.build
+++ b/toolkit/components/statusfilter/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'browser'
 
 CPP_SOURCES += [
     'nsBrowserStatusFilter.cpp',
 ]
 
 LIBRARY_NAME = 'mozbrwsr_s'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -7,17 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
 
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
 

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -34,8 +34,10 @@ EXTRA_PP_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'TelemetryFile.jsm',
     'TelemetryStopwatch.jsm',
     'ThirdPartyCookieProbe.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/toolkit/components/typeaheadfind/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/typeaheadfind/moz.build
+++ b/toolkit/components/typeaheadfind/moz.build
@@ -11,8 +11,10 @@ XPIDL_SOURCES += [
 MODULE = 'fastfind'
 
 CPP_SOURCES += [
     'nsTypeAheadFind.cpp',
 ]
 
 LIBRARY_NAME = 'fastfind_s'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -6,16 +6,15 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(SQLITE_CFLAGS) \
   $(NULL)
 
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -45,8 +45,10 @@ EXTRA_PP_COMPONENTS += [
 LIBRARY_NAME = 'urlclassifier_s'
 
 EXTRA_JS_MODULES += [
     'SafeBrowsing.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 LIBRARY_NAME = exception_handler_s
 MSVC_ENABLE_PGO := 1
 
 ifeq ($(OS_ARCH),Linux)
 # MOZ_APP_NAME is needed on Android, where we
 # need to launch by package name.
 DEFINES += \
   -DANDROID_PACKAGE_NAME=\"$(ANDROID_PACKAGE_NAME)\"

--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -72,8 +72,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
         'mac_utils.mm',
     ]
 
 EXTRA_JS_MODULES += [
     'CrashSubmit.jsm',
     'KeyValueParser.jsm',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/devtools/server/Makefile.in
+++ b/toolkit/devtools/server/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/devtools/server/moz.build
+++ b/toolkit/devtools/server/moz.build
@@ -13,8 +13,10 @@ XPIDL_SOURCES += [
 MODULE = 'jsinspector'
 
 CPP_SOURCES += [
     'nsJSInspector.cpp',
 ]
 
 LIBRARY_NAME = 'jsinspector'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -4,12 +4,11 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -29,8 +29,10 @@ EXTRA_JS_MODULES += [
     'MinimalIdentity.jsm',
     'RelyingParty.jsm',
     'Sandbox.jsm',
     'jwcrypto.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/mozapps/update/common/Makefile.in
+++ b/toolkit/mozapps/update/common/Makefile.in
@@ -4,15 +4,14 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -27,8 +27,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 
 CPP_SOURCES += [
     'readstrings.cpp',
     'updatelogging.cpp',
 ]
 
 LIBRARY_NAME = 'updatecommon'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xre \
   -I$(topsrcdir)/profile/dirserviceprovider/src \
   $(NULL)
 
 GARBAGE += nsProfileLock.cpp
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -18,8 +18,10 @@ MODULE = 'xulapp'
 
 CPP_SOURCES += [
     'nsProfileLock.cpp',
     'nsToolkitProfileService.cpp',
 ]
 
 LIBRARY_NAME = 'profile_s'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/system/androidproxy/Makefile.in
+++ b/toolkit/system/androidproxy/Makefile.in
@@ -5,12 +5,9 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/system/androidproxy/moz.build
+++ b/toolkit/system/androidproxy/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'androidproxy'
 
 CPP_SOURCES += [
     'nsAndroidSystemProxySettings.cpp',
 ]
 
 LIBRARY_NAME = 'androidproxy'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -5,12 +5,9 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/system/osxproxy/moz.build
+++ b/toolkit/system/osxproxy/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'osxproxy'
 
 CMMSRCS += [
     'nsOSXSystemProxySettings.mm',
 ]
 
 LIBRARY_NAME = 'osxproxy'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -5,15 +5,13 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
 ifdef MOZ_ENABLE_LIBPROXY
 CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS)
 endif # MOZ_ENABLE_LIBPROXY
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/system/unixproxy/moz.build
+++ b/toolkit/system/unixproxy/moz.build
@@ -12,8 +12,10 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
     ]
 else:
     CPP_SOURCES += [
         'nsUnixSystemProxySettings.cpp',
     ]
 
 LIBRARY_NAME = 'unixproxy'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -5,12 +5,9 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/system/windowsproxy/moz.build
+++ b/toolkit/system/windowsproxy/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'windowsproxy'
 
 CPP_SOURCES += [
     'nsWindowsSystemProxySettings.cpp',
 ]
 
 LIBRARY_NAME = 'windowsproxy'
 
+LIBXUL_LIBRARY = True
+

--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -14,18 +14,16 @@ include $(DEPTH)/config/autoconf.mk
 
 USE_RCS_MK=1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
 milestone_txt = $(topsrcdir)/config/milestone.txt
 
 LIBRARY_NAME = xulapp_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX)
 DEFINES += -DUSE_GLX_TEST
 endif
 
 DEFINES += \
   -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' \
   -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"' \
   $(NULL)

--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -88,8 +88,11 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
         'EventTracer.cpp',
     ]
 
 if CONFIG['MOZ_UPDATER']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         CPP_SOURCES += [
             'nsUpdateDriver.cpp',
         ]
+
+LIBXUL_LIBRARY = True
+

--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 DEFFILE		= $(win_srcdir)/tm.def
 
-LIBXUL_LIBRARY	= 1
-
 STL_FLAGS	=
 
 CSRCS		= \
 		nsTraceMalloc.c \
 		$(NULL)
 
 DEFINES		+= -DMOZ_NO_MOZALLOC
 

--- a/tools/trace-malloc/lib/moz.build
+++ b/tools/trace-malloc/lib/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsDebugHelpWin32.cpp',
         'nsWinTraceMalloc.cpp',
     ]
 
 LIBRARY_NAME = 'tracemalloc'
 
+LIBXUL_LIBRARY = True
+

--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -6,11 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 include $(topsrcdir)/config/rules.mk
 

--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -27,8 +27,10 @@ CPP_SOURCES += [
     'nsDocLoader.cpp',
     'nsURILoader.cpp',
 ]
 
 LIBRARY_NAME = 'uriloaderbase_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -29,17 +29,16 @@ endif
 endif
 endif
 endif
 endif
 
 VPATH		:= $(srcdir) $(srcdir)/$(OSDIR)
 
 LIBRARY_NAME    = exthandler_s
-LIBXUL_LIBRARY  = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 
 CMMSRCS	= nsOSHelperAppService.mm \
 			nsMIMEInfoMac.mm \
 			nsLocalHandlerAppMac.mm \
 			$(NULL)
 endif
 

--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -120,8 +120,10 @@ EXTRA_COMPONENTS += [
 ]
 
 IPDL_SOURCES += [
     'PExternalHelperApp.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= prefetch_s
-LIBXUL_LIBRARY	= 1
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -30,8 +30,10 @@ CPP_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'POfflineCacheUpdate.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -6,16 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = \
                 -I$(srcdir)/../../content/events/src/ \
                 $(NULL)
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)

--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsView.cpp',
     'nsViewManager.cpp',
 ]
 
 LIBRARY_NAME = 'gkview_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -6,18 +6,16 @@ DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = widget_android
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 #DEFINES += -DDEBUG_WIDGETS
 
 LOCAL_INCLUDES += \

--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -35,8 +35,10 @@ CPP_SOURCES += [
     'nsPrintOptionsAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -6,20 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY = 1
-
-
-
 CMMSRCS = \
   nsBidiKeyboard.mm \
   nsClipboard.mm \
   nsMenuX.mm \
   nsMenuBarX.mm \
   nsMenuItemX.mm \
   nsMenuItemIconX.mm \
   nsMenuUtilsX.mm \

--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -16,8 +16,10 @@ EXPORTS += [
     'mozView.h',
     'nsChangeObserver.h',
     'nsCocoaFeatures.h',
     'nsCocoaUtils.h',
 ]
 
 LIBRARY_NAME = 'widget_mac'
 
+LIBXUL_LIBRARY = True
+

--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -19,18 +19,16 @@ VPATH           = \
   $(srcdir) \
   $(srcdir)/libui \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = widget_gonk
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 DEFINES += -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK
 
 LOCAL_INCLUDES += \

--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -55,8 +55,11 @@ CPP_SOURCES += [
     'nsWindow.cpp',
     'GfxInfo.cpp',
 ]
 
 if CONFIG['ANDROID_VERSION'] == '15':
     CPP_SOURCES += [
         'HwcComposer2D.cpp'
     ]
+
+LIBXUL_LIBRARY = True
+

--- a/widget/gonk/nativewindow/Makefile.in
+++ b/widget/gonk/nativewindow/Makefile.in
@@ -14,13 +14,12 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = nativewindow
-LIBXUL_LIBRARY   = 1
 STL_FLAGS=
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -29,8 +29,10 @@ EXPORTS += [
 if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['MOZ_OMX_DECODER']:
     CPP_SOURCES += [
         'GonkNativeWindowICS.cpp',
         'GonkNativeWindowClientICS.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -12,17 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_ENABLE_GTK2
 LIBRARY_NAME	= widget_gtk2
 else
 LIBRARY_NAME	= widget_gtk3
 endif
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY = 1
 NATIVE_THEME_SUPPORT = 1
 
 
 
 CSRCS		= \
 		mozcontainer.c \
 		$(NULL)
 

--- a/widget/gtk2/moz.build
+++ b/widget/gtk2/moz.build
@@ -51,8 +51,10 @@ if CONFIG['NS_PRINTING']:
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsClipboard.cpp',
         'nsDragService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/widget/gtkxtbin/Makefile.in
+++ b/widget/gtkxtbin/Makefile.in
@@ -7,18 +7,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 ifdef MOZ_ENABLE_GTK2
 CSRCS		= \
 		gtk2xtbin.c \
 		$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/widget/gtkxtbin/moz.build
+++ b/widget/gtkxtbin/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'gtkxtbin'
 
 EXPORTS += [
     'gtk2xtbin.h',
 ]
 
 LIBRARY_NAME = 'gtkxtbin'
 
+LIBXUL_LIBRARY = True
+

--- a/widget/os2/Makefile.in
+++ b/widget/os2/Makefile.in
@@ -7,19 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 RESFILE		= widget.res
-LIBXUL_LIBRARY = 1
-
-
 SHARED_LIBRARY_LIBS = \
 	../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
 

--- a/widget/os2/moz.build
+++ b/widget/os2/moz.build
@@ -24,8 +24,10 @@ CPP_SOURCES += [
     'nsSound.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
     'os2FrameWindow.cpp',
 ]
 
 LIBRARY_NAME = 'wdgtos2'
 
+LIBXUL_LIBRARY = True
+

--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_qt
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY	= 1
-
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS	+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
 CFLAGS		+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \

--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -45,8 +45,11 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
         'nsMFilePicker.cpp',
     ]
 
 if CONFIG[' MOZ_ENABLE_QTMOBILITY']:
     CPP_SOURCES += [
         'moc_mozqorientationsensorfilter.cpp',
         'mozqorientationsensorfilter.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+

--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -6,14 +6,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_shared
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS	+= $(TK_CFLAGS)

--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -9,8 +9,10 @@ if CONFIG['MOZ_X11']:
 
 MODULE = 'widget'
 
 CPP_SOURCES += [
     'WidgetUtils.cpp',
     'nsShmImage.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -6,18 +6,15 @@
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = widget_shared_x11
-LIBXUL_LIBRARY  = 1
-
-
 CSRCS      = \
        keysym2ucs.c \
        $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS   += $(TK_CFLAGS)

--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'widget'
 
+LIBXUL_LIBRARY = True
+

--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -9,18 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_windows
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY	= 1
 RESFILE		= widget.res
-LIBXUL_LIBRARY = 1
-
 DEFINES		+= -DMOZ_UNICODE 
 
 ifdef MOZ_ENABLE_D3D9_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D9_LAYER
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER

--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -76,8 +76,11 @@ if CONFIG['NS_PRINTING']:
         'nsPrintSettingsWin.cpp',
         'nsDeviceContextSpecWin.cpp',
     ]
 
 if CONFIG['NS_ENABLE_TSF']:
     CPP_SOURCES += [
         'nsTextStore.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+

--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -6,18 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME		= widget_winrt
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY	= 1
-
 DEFINES		+= -DMOZ_UNICODE
 
 ifdef MOZ_ENABLE_D3D9_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D9_LAYER
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER

--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -22,8 +22,10 @@ CPP_SOURCES += [
     'nsWinMetroUtils.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'MetroUIUtils.js',
     'MetroUIUtils.manifest',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpwidgets_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
 SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX)
 ifdef MOZ_X11
 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif

--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -49,8 +49,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt'
     CPP_SOURCES += [
         'nsBaseFilePicker.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3', 'windows', 'cocoa'):
     CPP_SOURCES += [
         'nsNativeTheme.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+

--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcombase_s
 MSVC_ENABLE_PGO := 1
 MOZILLA_INTERNAL_API =1
-LIBXUL_LIBRARY = 1
-
 CSRCS = \
 		nsErrorAssertsC.c \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 
 ifdef MOZ_DEBUG
 CSRCS		+= pure_api.c

--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -120,8 +120,11 @@ if CONFIG['OS_ARCH'] == 'Linux':
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsMacUtilsImpl.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'nsCrashOnException.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+

--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -11,17 +11,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../glue/objs.mk
 
 EXTRA_DEPS += $(srcdir)/../glue/objs.mk
 
 LIBRARY_NAME	= xpcom_core
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 MOZILLA_INTERNAL_API = 1
 
 ifeq (Darwin, $(OS_ARCH))
 CSRCS = mach_override.c
 endif
 

--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -46,8 +46,11 @@ CPP_SOURCES += [
     '$(XPCOM_GLUE_SRC_LCPPSRCS)',
     'FileLocation.cpp',
     'FrozenFunctions.cpp',
     'Omnijar.cpp',
     'Services.cpp',
     'nsXPCOMStrings.cpp',
     'nsXPComInit.cpp',
 ]
+
+LIBXUL_LIBRARY = True
+

--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../reflect/xptinfo/src \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../ds \
 	-I$(srcdir)/../build \
 	-I.. \

--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -32,8 +32,10 @@ CPP_SOURCES += [
     'ManifestParser.cpp',
     'nsCategoryManager.cpp',
     'nsComponentManager.cpp',
     'nsNativeComponentLoader.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomcomponents_s'
 
+LIBXUL_LIBRARY = True
+

--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -6,15 +6,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 MOZILLA_INTERNAL_API = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../io
 

--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -111,8 +111,10 @@ else:
 
 EXTRA_COMPONENTS += [
     'nsINIProcessor.js',
     'nsINIProcessor.manifest',
 ]
 
 LIBRARY_NAME = 'xpcomds_s'
 
+LIBXUL_LIBRARY = True
+

--- a/xpcom/glue/tests/gtest/Makefile.in
+++ b/xpcom/glue/tests/gtest/Makefile.in
@@ -6,13 +6,11 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = -I$(srcdir)/../..
 
 include $(topsrcdir)/config/rules.mk

--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'xpcom_glue_gtest'
 
 CPP_SOURCES += [
     'TestFileUtils.cpp',
 ]
 
 LIBRARY_NAME = 'xpcom_glue_gtest'
 
+LIBXUL_LIBRARY = True
+

--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcomio_s
 MSVC_ENABLE_PGO := 1
 MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR
 endif
 endif

--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -112,13 +112,15 @@ CPP_SOURCES += [
     'nsSegmentedBuffer.cpp',
     'nsStorageStream.cpp',
     'nsStreamUtils.cpp',
     'nsStringStream.cpp',
     'nsUnicharInputStream.cpp',
     'nsWildCard.cpp',
 ]
 
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'CocoaFileUtils.mm',
     ]
+
+LIBXUL_LIBRARY = True
+

--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -7,16 +7,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES	= -I$(srcdir)/../components
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 
 include $(topsrcdir)/config/rules.mk
 

--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -46,8 +46,10 @@ CPP_SOURCES += [
     'nsThread.cpp',
     'nsThreadManager.cpp',
     'nsThreadPool.cpp',
     'nsTimerImpl.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomthreads_s'
 
+LIBXUL_LIBRARY = True
+

--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 DIST_INSTALL	= 1
 USE_STATIC_LIBS = 1
 
 CSRCS		= xpt_arena.c xpt_struct.c xpt_xdr.c
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER

--- a/xpcom/typelib/xpt/src/moz.build
+++ b/xpcom/typelib/xpt/src/moz.build
@@ -3,8 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom'
 
 LIBRARY_NAME = 'xpt'
 
+LIBXUL_LIBRARY = True
+

--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@@ -7,14 +7,12 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY	= 1
-
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base
 
 include $(topsrcdir)/config/rules.mk
 

--- a/xpfe/appshell/src/moz.build
+++ b/xpfe/appshell/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsContentTreeOwner.cpp',
     'nsWebShellWindow.cpp',
     'nsWindowMediator.cpp',
     'nsXULWindow.cpp',
 ]
 
 LIBRARY_NAME = 'nsappshell'
 
+LIBXUL_LIBRARY = True
+

--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -7,15 +7,12 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= appcomps
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY	= 1
-
-# General includes
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory
 
 include $(topsrcdir)/config/rules.mk

--- a/xpfe/components/build/moz.build
+++ b/xpfe/components/build/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'appcomps'
 
 CPP_SOURCES += [
     'nsModule.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/xpfe/components/directory/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY	= 1
-
-include $(topsrcdir)/config/rules.mk
-

--- a/xpfe/components/directory/moz.build
+++ b/xpfe/components/directory/moz.build
@@ -13,8 +13,10 @@ XPIDL_MODULE = 'directory'
 MODULE = 'appcomps'
 
 CPP_SOURCES += [
     'nsDirectoryViewer.cpp',
 ]
 
 LIBRARY_NAME = 'directory_s'
 
+LIBXUL_LIBRARY = True
+

--- a/xpfe/components/windowds/Makefile.in
+++ b/xpfe/components/windowds/Makefile.in
@@ -5,13 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 
 
 include $(topsrcdir)/config/rules.mk

--- a/xpfe/components/windowds/moz.build
+++ b/xpfe/components/windowds/moz.build
@@ -13,8 +13,10 @@ XPIDL_MODULE = 'windowds'
 MODULE = 'appcomps'
 
 CPP_SOURCES += [
     'nsWindowDataSource.cpp',
 ]
 
 LIBRARY_NAME = 'windowds'
 
+LIBXUL_LIBRARY = True
+