diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in
index 70be75d8af480..ba15996103403 100644
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -10,8 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK
diff --git a/accessible/src/atk/moz.build b/accessible/src/atk/moz.build
index 90baa27fc5c7e..106d43b869d86 100644
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -35,3 +35,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in
index 67191a4b573d8..90f2439452538 100644
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -9,8 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build
index 26519c08b1460..3448d52b7b48e 100644
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -63,3 +63,5 @@ if a11y_log:
 
 LIBRARY_NAME = 'accessibility_base_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in
index 68825db73f759..e62fab2c6e0d0 100644
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -9,8 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build
index 3af56bafd7b45..a602225b40f06 100644
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -29,3 +29,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_generic_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in
index c73ec9317cf12..6b8c0b8822869 100644
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -10,8 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build
index 972a0c463890a..52a3b74308764 100644
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -19,3 +19,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_html_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in
index 90a6b6ae2d5c8..2b98846b0236a 100644
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -10,9 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
-LIBXUL_LIBRARY = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build
index dab37e183b1ac..ae2c455087f1d 100644
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -29,3 +29,6 @@ CMMSRCS += [
     'mozHTMLAccessible.mm',
     'mozTextAccessible.mm',
 ]
+
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in
index 1c65f82a96a60..5e146623d448a 100644
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -10,8 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
diff --git a/accessible/src/other/moz.build b/accessible/src/other/moz.build
index 8f2f2bba7e8fe..a2f29f28ebd25 100644
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -18,3 +18,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in
index 5827bd89c687f..0b57d0c5b6cba 100644
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_ia2_s
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build
index 54f52890d53d8..883f99786644c 100644
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -30,3 +30,5 @@ CPP_SOURCES += [
     'ia2AccessibleValue.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in
index b595e30c82efd..e019041a9a76a 100644
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build
index febc7f713ddc3..52b83aa601ba7 100644
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -41,3 +41,6 @@ if CONFIG['MOZ_XUL']:
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in
index cbc3681e8f37e..ba998fda49421 100644
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_sdn_s
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
+
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build
index 3736a2980ac09..b5768afe05a8a 100644
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -11,3 +11,5 @@ CPP_SOURCES += [
     'sdnTextAccessible.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in
index 6fa292fc92988..d39f7f9a6cd31 100644
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_uia_s
 EXPORT_LIBRARY = ..
-LIBXUL_LIBRARY = 1
+
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build
index f6c2ee69dc5c0..eb3bb01e2989b 100644
--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -10,3 +10,5 @@ CPP_SOURCES += [
     'uiaRawElmProvider.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in
index f484a05ff8efd..a87748938cc6a 100644
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -9,8 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 include $(topsrcdir)/config/rules.mk
diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build
index cd6a44e8fd80f..9bbe85607176a 100644
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -19,3 +19,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_xpcom_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in
index c2dd89d8ffbf5..a57c3f469823d 100644
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -10,8 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build
index 5625280f2fc6d..599e3c36bbf6f 100644
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -23,3 +23,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_xul_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in
index b5804cf4278e3..fa3083fad3e12 100644
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -11,9 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
diff --git a/caps/src/moz.build b/caps/src/moz.build
index 59683de668df6..01c2ca2ae2da5 100644
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -18,3 +18,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'caps_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in
index 31b73227007c1..007975f627403 100644
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = chrome_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/chrome/src/moz.build b/chrome/src/moz.build
index 5fb69ed750c80..f128712e89435 100644
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -17,3 +17,5 @@ CPP_SOURCES += [
     'nsChromeRegistryContent.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 9242219de584a..9759825fcaa56 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconbase_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index a149aec820ddc..be1a4b13a1e3b 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -172,3 +172,5 @@ EXTRA_JS_MODULES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index e3f47d8ffcc55..cadc7033d7cdc 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconcvs_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build
index 3b1c142763060..f9e6c83a5abb0 100644
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -76,3 +76,5 @@ else:
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
index 8dc9ad447ef36..b56a5ac13788e 100644
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconevents_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/events/src/moz.build b/content/events/src/moz.build
index 06ac1db0c42cd..6e5b6e6fc7979 100644
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -69,3 +69,5 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index d426ab3236154..9cfaa0f26a7f9 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconhtmlcon_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index 8212d436a4513..8933e1d970eb7 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -156,3 +156,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in
index 8657240f049b6..c52e0426a1537 100644
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index 80520f44d4831..e8b0b9bf451e6 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -27,3 +27,5 @@ LIBRARY_NAME = 'gkconhtmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in
index 63de0e78b7af6..5a711f04ccf9b 100644
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentmathml_s
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build
index 6dd667b1e395d..738d55c31c85b 100644
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -13,3 +13,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 4b43651df2bf9..2f6b8bb2cd73e 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconmedia_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in
index 40bccbe10b2e9..40c9391db93b8 100644
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@@ -15,8 +15,6 @@ VPATH      := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY := 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES := \
diff --git a/content/media/dash/moz.build b/content/media/dash/moz.build
index 921b926977c0d..560bd7362bcc5 100644
--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@@ -21,3 +21,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gkcondash_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in
index ae7aac70d127d..41d6d9ae847df 100644
--- a/content/media/directshow/Makefile.in
+++ b/content/media/directshow/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcondirectshow_s
-LIBXUL_LIBRARY 	= 1
-
 LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build
index 6a405dd6b8fda..8787ee845b099 100644
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -36,3 +36,5 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']:
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/encoder/Makefile.in b/content/media/encoder/Makefile.in
deleted file mode 100644
index 865181c4ce43d..0000000000000
--- a/content/media/encoder/Makefile.in
+++ /dev/null
@@ -1,13 +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
diff --git a/content/media/encoder/moz.build b/content/media/encoder/moz.build
index cf0ea9304b334..001ca84f2c1d6 100644
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconencoder_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in
index 0aee85c596521..73436052c9cdf 100644
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -8,8 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY 	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= $(GSTREAMER_CFLAGS)
diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build
index 09cccea4f7612..9e48ad07956ee 100644
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkcongstreamer_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in
index 75a112639e585..e533fc0a4d0e7 100644
--- a/content/media/mediasource/Makefile.in
+++ b/content/media/mediasource/Makefile.in
@@ -9,6 +9,4 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconmediasource_s
-LIBXUL_LIBRARY 	= 1
-
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build
index a90461521bd41..2e4e68fe31b8b 100644
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -28,3 +28,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/moz.build b/content/media/moz.build
index 2ebeb4c436269..9fcea014d7875 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -132,8 +132,10 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
-
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
     CPP_SOURCES += [
         'AudioNodeEngineNEON.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in
deleted file mode 100644
index 5ce55c06d6e36..0000000000000
--- a/content/media/ogg/Makefile.in
+++ /dev/null
@@ -1,13 +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
diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build
index 7cbf704820533..b83d8287af6fd 100644
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconogg_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in
index 791e89f17f639..f82b0b53091d8 100644
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconomx_s
-LIBXUL_LIBRARY 	= 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build
index e36b67f1cae51..39da61420601d 100644
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -19,3 +19,5 @@ CPP_SOURCES += [
     'OMXCodecProxy.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in
index 105ec7f29a5d2..28f33d995a16b 100644
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -9,8 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY 	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/media/plugins/moz.build b/content/media/plugins/moz.build
index c7d49fb392079..c2845273bc8ea 100644
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -21,3 +21,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gkconmediaplugins_s'
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in
index 0990e6e376518..480a76049b5df 100644
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -10,7 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build
index a8dabceaf135d..7c8e2b0d5286f 100644
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconraw_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
deleted file mode 100644
index bdacd989c366a..0000000000000
--- a/content/media/wave/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
diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build
index ca2ede1e260e0..3f4e6254a59ce 100644
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -20,3 +20,5 @@ LIBRARY_NAME = 'gkconwave_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in
index 2e675ecfe7e43..087db3ab8b816 100644
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -10,6 +10,5 @@ VPATH            := @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_s
-LIBXUL_LIBRARY := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in
index a4b980ba86c08..39dabd4fcc9c2 100644
--- a/content/media/webaudio/blink/Makefile.in
+++ b/content/media/webaudio/blink/Makefile.in
@@ -10,8 +10,6 @@ VPATH            := @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_blink_s
-LIBXUL_LIBRARY := 1
-
 LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build
index 95074f0f7ae02..3041b726753a3 100644
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -25,3 +25,5 @@ CPP_SOURCES += [
     'ZeroPole.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build
index bf44474ec8500..5c8d4d5055589 100644
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -86,3 +86,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
index d8e73b908a3f5..47ea451c6b0f6 100644
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -8,9 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY 	= 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build
index a9b1f22165e44..1923a76883b32 100644
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconwebm_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in
index 440c145572712..b97113262296d 100644
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconwebrtc_s
-LIBXUL_LIBRARY = 1
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build
index ab8eae1e0cf57..c7020ac1c2b5a 100644
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -23,3 +23,5 @@ CPP_SOURCES += [
     'MediaEngineDefault.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in
index 3b04c8faceffb..af4b62f4ff22b 100644
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -15,8 +15,6 @@ VPATH += \
   $(NULL)
 
 LIBRARY_NAME   := gkconwebspeechrecognition_s
-LIBXUL_LIBRARY := 1
-
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build
index 4952784aa5977..047c7da23896f 100644
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -40,3 +40,5 @@ CPP_SOURCES += [
     'energy_endpointer_params.cc',
 ]
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in
index 505406ba8a192..25eecb68aaa17 100644
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -15,8 +15,6 @@ VPATH += \
 
 LIBRARY_NAME   := gkconwebspeechsynth_s
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build
index 46609f0f8c499..c8459bea17839 100644
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -45,3 +45,5 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in
index 48665405f0820..1185c8b7f8177 100644
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -8,8 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY 	= 1
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build
index 1b13aea2fb9ee..bdc6cb8ea8571 100644
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconwmf_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
index 4137896ddf9b8..f1a5232f7d836 100644
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconsmil_s
-LIBXUL_LIBRARY	= 1
 LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
diff --git a/content/smil/moz.build b/content/smil/moz.build
index ca099a10c0416..846a95370d8cd 100644
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -63,3 +63,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
index 25e0d81cce8d4..72baafae11b3c 100644
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentsvg_s
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build
index fa0eba9037c8a..dc553bfc0cf7d 100644
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -246,3 +246,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in
index c1379e2f23824..ea1a3ada93a75 100644
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build
index 1acbbbe49d3df..d0723654f0f3f 100644
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -18,3 +18,5 @@ LIBRARY_NAME = 'gkconsvgdoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in
index 94105b980e652..91cfbc7137053 100644
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconxbl_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build
index 10fa50a5f721b..507d049c06b8c 100644
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -38,3 +38,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
index 2a325fe32219a..f19f9c89f1665 100644
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build
index a36a89a124eeb..89f1347d7d213 100644
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconxmlcon_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in
index b439a0c106f99..bf4a622b898ac 100644
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build
index a117870b15761..65e515273b2a6 100644
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconxmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in
index b998d654e42ae..e6de70ac28eee 100644
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -9,7 +9,6 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build
index 272c27cc365f6..073bd662fe49f 100644
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -18,3 +18,5 @@ LIBRARY_NAME = 'txbase_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in
index 5ea8eda299acc..1eaa5430e0af8 100644
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -9,7 +9,6 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build
index e6202e1ade7d4..471e2db7c0f09 100644
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -15,3 +15,5 @@ LIBRARY_NAME = 'txxml_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in
index 868af65fdf744..0155c25628826 100644
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -9,7 +9,6 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build
index cf2fa2902411a..4e878fb2b4f88 100644
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -51,3 +51,5 @@ LIBRARY_NAME = 'txxpath_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in
index 3b4cca3b3349a..a61c3bd47f2d2 100644
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -9,8 +9,6 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 # For nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build
index d0860baf19ee9..c86961f42636b 100644
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -48,3 +48,5 @@ LIBRARY_NAME = 'txxslt_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in
index b8cdfe75429a4..a5c2a58fdd379 100644
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build
index 6eb1d60fa5a9f..7759b397835a2 100644
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -23,3 +23,5 @@ LIBRARY_NAME = 'gkconxuldoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in
index d0d9d829d788f..5d299fb0325d6 100644
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -11,8 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
diff --git a/content/xul/templates/src/moz.build b/content/xul/templates/src/moz.build
index 149d5dcef032e..84e5fd2fcdbbc 100644
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@@ -37,3 +37,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gkconxultmpl_s'
 
+LIBXUL_LIBRARY = True
+