--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -7,18 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = basedocshell_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \

--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -59,8 +59,10 @@ CPP_SOURCES += [
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
     'nsDownloadHistory.cpp',
     'nsWebNavigationInfo.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -7,19 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY	= 1
-
-
 SHARED_LIBRARY_LIBS= \
 		../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
 		../shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
 		$(NULL)
 

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

--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -6,12 +6,11 @@
 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)/../../base

--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsSHTransaction.cpp',
     'nsSHistory.cpp',
 ]
 
 LIBRARY_NAME = 'shistory_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -5,12 +5,11 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_activities_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -25,8 +25,10 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'ActivitiesService.jsm',
     'ActivitiesServiceFilter.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -5,15 +5,14 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME        = domalarm_s
-LIBXUL_LIBRARY      = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -30,8 +30,10 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'AlarmDB.jsm',
     'AlarmService.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -15,13 +15,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domaudiochannel_s
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -24,8 +24,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',
     'AudioChannelServiceChild.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= jsdombase_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
 
 ifdef MOZ_B2G_RIL
 DEFINES += -DMOZ_B2G_RIL

--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -106,8 +106,10 @@ EXTRA_JS_MODULES += [
     'ConsoleAPIStorage.jsm',
     'DOMRequestHelper.jsm',
     'IndexedDBHelper.jsm',
     'ObjectWrapper.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -12,8 +12,10 @@ EXPORTS.mozilla.dom.battery += [
 ]
 
 CPP_SOURCES += [
     'BatteryManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/dom/webidl/WebIDL.mk
 
 binding_include_path := mozilla/dom

--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -23,8 +23,10 @@ EXPORTS.mozilla.dom += [
     'NonRefcountedDOMObject.h',
     'Nullable.h',
     'PrimitiveConversions.h',
     'TypedArray.h',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 LIBRARY_NAME     = dombindings_test_s
-LIBXUL_LIBRARY   = 1
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 
 # pymake can't handle descending into dom/bindings several times simultaneously
 ifdef .PYMAKE
 .NOTPARALLEL:
 endif
 

--- a/dom/bindings/test/moz.build
+++ b/dom/bindings/test/moz.build
@@ -5,8 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 CPP_SOURCES += [
     '$(subst .webidl,Binding.cpp,$(test_webidl_files))',
 ]
 
+LIBXUL_LIBRARY = True
+# Do NOT export this library.  We don't actually want our test code
+# being added to libxul or anything.
+

--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_browserelement_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/dom/base \

--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -37,8 +37,10 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'BrowserElementParent.jsm',
     'BrowserElementPromptService.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domcamera_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -42,8 +42,10 @@ if CONFIG['MOZ_B2G_CAMERA']:
 else:
     CPP_SOURCES += [
         'FallbackCameraManager.cpp',
         'FallbackCameraControl.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@@ -5,12 +5,11 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_cellbroadcast_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.dom += [
 ]
 
 CPP_SOURCES += [
     'CellBroadcast.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domdevicestorage_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)

--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -27,8 +27,10 @@ CPP_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PDeviceStorageRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= domencoding_s
-LIBXUL_LIBRARY	= 1
-
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
 	$(NULL)
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 
 EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h

--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -19,8 +19,10 @@ EXPORTS.mozilla.dom += [
 CPP_SOURCES += [
     'EncodingUtils.cpp',
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfile_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 

--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -52,8 +52,10 @@ CPP_SOURCES += [
     'FileStreamWrappers.cpp',
     'LockedFile.cpp',
     'MemoryStreams.cpp',
     'MetadataHelper.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@@ -5,15 +5,13 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfm_s
-LIBXUL_LIBRARY   = 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@@ -22,8 +22,10 @@ EXTRA_JS_MODULES += [
     'DOMFMRadioParent.jsm',
 ]
 
 EXTRA_COMPONENTS += [
     'DOMFMRadio.manifest',
     'DOMFMRadioChild.js',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/dom/gamepad/Makefile.in
+++ b/dom/gamepad/Makefile.in
@@ -5,15 +5,14 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domgamepad_s
-LIBXUL_LIBRARY  = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.dom += [
 
 CPP_SOURCES = [
     'Gamepad.cpp',
     'GamepadService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -10,8 +10,10 @@ EXPORTS.mozilla.dom.icc += [
 
 CPP_SOURCES += [
     'IccManager.cpp',
     'StkCommandEvent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dom_indexeddb_s
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/db/sqlite3/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/src/storage \
   -I$(topsrcdir)/dom/quota \

--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 relativesrcdir = @relativesrcdir@
 VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dom_indexeddb_ipc_s
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/indexedDB \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 MOCHITEST_FILES = test_ipc.html
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -27,8 +27,10 @@ IPDL_SOURCES += [
     'PIndexedDBIndex.ipdl',
     'PIndexedDBObjectStore.ipdl',
     'PIndexedDBRequest.ipdl',
     'PIndexedDBTransaction.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -60,8 +60,10 @@ CPP_SOURCES += [
     'Key.cpp',
     'KeyPath.cpp',
     'OpenDatabaseHelper.cpp',
     'TransactionThreadPool.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@@ -5,15 +5,13 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domdevicestorage_s
-LIBXUL_LIBRARY   = 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 

--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@@ -8,8 +8,10 @@ XPIDL_SOURCES += [
     'nsIDOMDeviceStorage.idl',
     'nsIDOMDeviceStorageChangeEvent.idl',
 ]
 
 XPIDL_MODULE = 'dom_devicestorage'
 
 MODULE = 'dom'
 
+LIBXUL_LIBRARY = True
+

--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = domipc_s
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../../content/base/src \
 	-I$(srcdir)/../../content/events/src \
 	-I$(srcdir)/../../docshell/base \

--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -68,8 +68,10 @@ IPDL_SOURCES += [
     'PCrashReporter.ipdl',
     'PDocumentRenderer.ipdl',
     'PMemoryReportRequest.ipdl',
     'PTabContext.ipdlh',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_media_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/trunk/webrtc \
   -I$(topsrcdir)/media/webrtc/signaling/src/common \
   $(NULL)

--- a/dom/media/bridge/Makefile.in
+++ b/dom/media/bridge/Makefile.in
@@ -6,18 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/mtransport \
   -I$(topsrcdir)/media/webrtc/signaling/include \
   -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/include \
   -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
   -I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
   -I$(topsrcdir)/media/webrtc/signaling/src/media-conduit \
   -I$(topsrcdir)/ipc/chromium/src \

--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -11,8 +11,10 @@ XPIDL_SOURCES += [
 MODULE = 'peerconnection'
 
 CPP_SOURCES += [
     'MediaModule.cpp',
 ]
 
 LIBRARY_NAME = 'peerconnection'
 
+LIBXUL_LIBRARY = True
+

--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -29,8 +29,10 @@ CPP_SOURCES += [
 
 EXTRA_COMPONENTS += [
     'PeerConnection.js',
     'PeerConnection.manifest',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -17,17 +17,16 @@ VPATH += $(srcdir)/android
 else ifdef MOZ_B2G_RIL
 VPATH += $(srcdir)/gonk
 else
 VPATH += $(srcdir)/fallback
 endif
 
 LIBRARY_NAME     = dom_mobilemessage_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 # Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend

--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -76,8 +76,10 @@ IPDL_SOURCES += [
     'ipc/PMobileMessageCursor.ipdl',
     'ipc/PSms.ipdl',
     'ipc/PSmsRequest.ipdl',
     'ipc/SmsTypes.ipdlh',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_network_s
-LIBXUL_LIBRARY   = 1
 ifdef MOZ_B2G_RIL
 endif
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)

--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -45,8 +45,10 @@ if CONFIG['MOZ_B2G_RIL']:
 
 IPDL_SOURCES += [
     'PTCPServerSocket.ipdl',
     'PTCPSocket.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkplugin
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 	LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 

--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkpluginandroid_s
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
   -I$(topsrcdir)/widget/xpwidgets \
   -I$(topsrcdir)/dom/plugins/base \
   -I$(topsrcdir)/dom/plugins/base/android/include \
   -I$(topsrcdir)/gfx/gl \
   $(MOZ_CAIRO_CFLAGS) \

--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -22,8 +22,10 @@ CPP_SOURCES += [
     'ANPSurface.cpp',
     'ANPSystem.cpp',
     'ANPVideo.cpp',
     'ANPWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -89,8 +89,11 @@ else:
             'nsPluginNativeWindow.cpp',
         ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     # android_npapi.h extends the NPNVariable and NPPVariable enums
     # using #defines, which results in Wswitch warnings in gcc-4.6.
     # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms.
     FAIL_ON_WARNINGS = True
+
+LIBXUL_LIBRARY = True
+

--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domplugins_s
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 
 ifeq (WINNT,$(OS_ARCH))
 DEFINES += \
   -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
   $(NULL)
 endif
 

--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -100,8 +100,10 @@ IPDL_SOURCES += [
     'PPluginScriptableObject.ipdl',
     'PPluginStream.ipdl',
     'PPluginSurface.ipdl',
     'PStreamNotify.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_power_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -24,8 +24,10 @@ EXPORTS.mozilla.dom.power += [
 CPP_SOURCES += [
     'PowerManager.cpp',
     'PowerManagerService.cpp',
     'WakeLock.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/promise/Makefile.in
+++ b/dom/promise/Makefile.in
@@ -5,15 +5,14 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dompromise_s
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/workers \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -18,8 +18,10 @@ EXPORTS.mozilla.dom += [
 CPP_SOURCES += [
     'Promise.cpp',
     'PromiseResolver.cpp',
     'PromiseCallback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domquota_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -36,8 +36,10 @@ CPP_SOURCES += [
     'CheckQuotaHelper.cpp',
     'FileStreams.cpp',
     'QuotaManager.cpp',
     'QuotaObject.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -5,15 +5,13 @@
 
 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$(topsrcdir)/dom/base
 INCLUDES	+= -I$(topsrcdir)/content/base/src
 

--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -9,8 +9,10 @@ MODULE = 'dom'
 CPP_SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomevents_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomgeolocation_s
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
 ifdef MOZ_MAEMO_LIBLOCATION

--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsGeoPosition.cpp',
     'nsGeolocation.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -4,15 +4,13 @@
 # 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
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/content/events/src
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -15,8 +15,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsJSON.cpp',
 ]
 
 LIBRARY_NAME = 'json_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -4,18 +4,16 @@
 # 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
-
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -15,8 +15,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'jsurl_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomnotification_s
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/ipc \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -13,8 +13,10 @@ EXPORTS.mozilla.dom += [
 
 CPP_SOURCES += [
     'DesktopNotification.cpp',
     'Notification.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomoffline_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomstorage_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
                 -I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/events/src
 
 ifdef ENABLE_TESTS
 DEFINES += -DDOM_STORAGE_TESTS
 endif
 

--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PStorage.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystem_s
-LIBXUL_LIBRARY  = 1
 DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/bindings \
   -I$(topsrcdir)/js/xpconnect/loader \

--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -6,17 +6,16 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemandroid_s
 
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
                      $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -8,8 +8,10 @@ MODULE = 'dom'
 
 CPP_SOURCES += [
     'AndroidLocationProvider.cpp',
     'nsHapticFeedback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -17,17 +17,16 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domsystemgonk_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/src/geolocation \
   -I$(topsrcdir)/dom/telephony \
   -I$(topsrcdir)/dom/wifi \
   -I$(topsrcdir)/dom/bluetooth \

--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -77,8 +77,10 @@ EXTRA_JS_MODULES += [
     'net_worker.js',
     'ril_consts.js',
     'ril_worker.js',
     'systemlibs.js',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -6,15 +6,14 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemmac_s
 
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 CMMSRCS += ['CoreLocationLocationProvider.mm']
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -46,8 +46,10 @@ CPP_SOURCES += [
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [
         'NetworkGeolocationProvider.js',
         'NetworkGeolocationProvider.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -6,17 +6,16 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemunix_s
 
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 ifdef MOZ_MAEMO_LIBLOCATION
         LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                            -I$(topsrcdir)/dom/src/geolocation \
                            $(NULL)
 endif
 
 ifdef MOZ_PLATFORM_MAEMO

--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -19,8 +19,10 @@ if CONFIG['MOZ_PLATFORM_MAEMO']:
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     CPP_SOURCES += [
         'moc_QTMLocationProvider.cpp',
         'QTMLocationProvider.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -6,15 +6,14 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemwindows_s
 
-LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'dom'
 
 CPP_SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domtelephony_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 

--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'CallsList.cpp',
     'Telephony.cpp',
     'TelephonyCall.cpp',
     'TelephonyCallGroup.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_time_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
     'DateCacheCleaner.cpp',
     'TimeChangeObserver.cpp',
     'TimeManager.cpp',
     'TimeService.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domvoicemail_s
-LIBXUL_LIBRARY   = 1
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 

--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -20,8 +20,10 @@ EXPORTS.mozilla.dom += [
 ]
 
 CPP_SOURCES += [
     'Voicemail.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@@ -5,15 +5,13 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domwifi_s
-LIBXUL_LIBRARY   = 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 

--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -21,8 +21,10 @@ EXTRA_COMPONENTS += [
     'WifiWorker.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'libhardware_legacy.js',
     'wifi_worker.js',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY   = 1
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/system \
   -I$(topsrcdir)/xpcom/build \
   $(NULL)
 

--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -54,8 +54,10 @@ CPP_SOURCES += [
     'XMLHttpRequestEventTarget.cpp',
     'XMLHttpRequestUpload.cpp',
 ]
 
 LIBRARY_NAME = 'domworkers_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -6,17 +6,16 @@
 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
 
 _FILES = \
 	$(srcdir)/res/EditorOverride.css \
 	$(srcdir)/res/grabber.gif \
 	$(srcdir)/res/table-add-column-after-active.gif \
 	$(srcdir)/res/table-add-column-after-hover.gif \
 	$(srcdir)/res/table-add-column-after.gif \

--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
 LIBRARY_NAME = 'composer'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/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$(topsrcdir)/editor/libeditor/text \
 		-I$(topsrcdir)/editor/txmgr/src \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/extensions/spellcheck/src \
 		$(NULL)

--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -32,8 +32,10 @@ CPP_SOURCES += [
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
 ]
 
 LIBRARY_NAME = 'editorbase_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -4,18 +4,16 @@
 # 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
 
 INCLUDES        += -I$(topsrcdir)/editor/libeditor/base \
                    -I$(topsrcdir)/editor/libeditor/text \
                    -I$(topsrcdir)/editor/txmgr/src \
                    -I$(topsrcdir)/content/base/src \
                    -I$(topsrcdir)/layout/style \
                    $(NULL)

--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -27,8 +27,10 @@ CPP_SOURCES += [
     'nsTableEditor.cpp',
     'nsWSRunObject.cpp',
 ]
 
 LIBRARY_NAME = 'htmleditor_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -4,17 +4,15 @@
 # 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
 
 INCLUDES	+= \
 		-I$(topsrcdir)/editor/libeditor/base \
 		-I$(topsrcdir)/editor/txmgr/src \
 		-I$(topsrcdir)/content/base/src \
 		$(NULL)

--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
 LIBRARY_NAME = 'texteditor_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -5,13 +5,10 @@
 
 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/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
     'nsTransactionManagerFactory.cpp',
     'nsTransactionStack.cpp',
 ]
 
 LIBRARY_NAME = 'txmgr'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/editor/txtsvc/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/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]
 
 LIBRARY_NAME = 'txtsvc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY	= 1
 SHARED_LIBRARY_LIBS= \
 		../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)			\

--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'webbrwsr'
 CPP_SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
 LIBRARY_NAME = 'webbrwsr'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY	= 1
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../content/base/src \
 		-I$(srcdir)/../../../content/svg/content/src \
 		$(NULL)
 		
 include $(topsrcdir)/config/rules.mk

--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -45,8 +45,10 @@ CPP_SOURCES += [
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
 LIBRARY_NAME = 'nsWebBrowser_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/embedding/components/appstartup/src/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/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsAppStartupNotifier.cpp',
 ]
 
 LIBRARY_NAME = 'appstartupnotifier_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY	= 1
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
 	../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
 	../find/src/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \
 	../webbrowserpersist/src/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
 	../commandhandler/src/$(LIB_PREFIX)commandhandler_s.$(LIB_SUFFIX) \
 	$(NULL)
 

--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'embedcomponents'
 CPP_SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
 
 LIBRARY_NAME = 'embedcomponents'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/embedding/components/commandhandler/src/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/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 
 LIBRARY_NAME = 'commandhandler_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/embedding/components/find/src/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/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
 LIBRARY_NAME = 'find_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -6,12 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
-LIBXUL_LIBRARY	= 1
-
 include $(topsrcdir)/config/rules.mk
 

--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'printingui_s'
 
 CMMSRCS += [
     'nsPrintingPromptServiceX.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@@ -6,12 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
-LIBXUL_LIBRARY	= 1
-
 include $(topsrcdir)/config/rules.mk
 

--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -9,8 +9,10 @@ MODULE = 'embedcomponents'
 CPP_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -6,11 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 

--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -6,11 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 

--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 	-I$(topsrcdir)/content/html/content/src \
 	-I$(topsrcdir)/content/base/src \
 	$(NULL)
 

--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'webbrowserpersist'
 CPP_SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
 
 LIBRARY_NAME = 'webbrowserpersist_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY	= 1
-
 # For nsJSUtils
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -15,8 +15,10 @@ if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsDialogParamBlock.cpp',
     ]
 
 LIBRARY_NAME = 'windowwatcher_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -6,16 +6,13 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY = 1
-
-
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -DUSE_SSPI
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -19,8 +19,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
 else:
     CPP_SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 
 LIBRARY_NAME = 'auth'
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -8,12 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= cookie
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsCookiePromptService.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',
     'nsPopupWindowManager.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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

--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -9,8 +9,10 @@ MODULE = 'nkgio'
 CPP_SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkgio'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/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/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -8,8 +8,10 @@ MODULE = 'permissions'
 
 CPP_SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]
 
 LIBRARY_NAME = 'permissions'
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -6,18 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = autoconfig
 EXPORT_LIBRARY   = 1
-LIBXUL_LIBRARY   = 1
-
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), windows)

--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'autoconfig'
 
 CPP_SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
     'nsJSConfigTriggers.cpp',
     'nsReadConfig.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -4,19 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY   = 1
-
-
 ifndef MOZ_NATIVE_HUNSPELL
 # This variable is referenced in configure.in.  Make sure to change that file
 # too if you need to change this variable.
 DEFINES = -DHUNSPELL_STATIC
 endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -23,8 +23,10 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
         'hunzip.cpp',
         'phonet.cpp',
         'replist.cpp',
         'suggestmgr.cpp',
     ]
 
 LIBRARY_NAME = 'hunspell_s'
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -5,19 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
-
 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../hunspell/src \
 	-I$(topsrcdir)/content/base/src \
 	-I$(topsrcdir)/editor/libeditor/base \

--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'mozPersonalDictionary.cpp',
     'mozSpellChecker.cpp',
     'mozSpellCheckerFactory.cpp',
     'mozSpellI18NManager.cpp',
 ]
 
 LIBRARY_NAME = 'spellchecker'
 
+LIBXUL_LIBRARY = True
+

deleted file mode 100644
--- a/extensions/universalchardet/src/base/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/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -31,8 +31,10 @@ CPP_SOURCES += [
     'nsSBCharSetProber.cpp',
     'nsSJISProber.cpp',
     'nsUTF8Prober.cpp',
     'nsUniversalDetector.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet_s'
 
+LIBXUL_LIBRARY = True
+

--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -6,17 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 SHARED_LIBRARY_LIBS = \
 		../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -8,8 +8,10 @@ MODULE = 'universalchardet'
 
 CPP_SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet'
 
+LIBXUL_LIBRARY = True
+