--- a/b2g/components/test/moz.build
+++ b/b2g/components/test/moz.build
@@ -2,11 +2,8 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'B2GComponents'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
-FAIL_ON_WARNINGS = True
-

--- a/dom/activities/tests/moz.build
+++ b/dom/activities/tests/moz.build
@@ -1,10 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
-FAIL_ON_WARNINGS = True
-

--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -15,12 +15,8 @@ MODULE = 'dom'
 EXTRA_COMPONENTS += [
     'InputMethod.manifest',
     'MozKeyboard.js',
 ]
 
 EXTRA_JS_MODULES += [
     'Keyboard.jsm',
 ]
-
-FAIL_ON_WARNINGS = True
-
-LIBXUL_LIBRARY = True

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

--- a/editor/moz.build
+++ b/editor/moz.build
@@ -13,11 +13,8 @@ PARALLEL_DIRS += [
     'composer',
 ]
 
 MODULE = 'editor'
 
 EXTRA_JS_MODULES += [
     'AsyncSpellCheckTestHelper.jsm',
 ]
-
-FAIL_ON_WARNINGS = True
-

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

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

--- a/toolkit/components/feeds/moz.build
+++ b/toolkit/components/feeds/moz.build
@@ -20,14 +20,8 @@ XPIDL_SOURCES += [
 ]
 
 MODULE = 'feeds'
 
 EXTRA_COMPONENTS += [
     'FeedProcessor.js',
     'FeedProcessor.manifest',
 ]
-
-LIBRARY_NAME = 'feed_s'
-
-LIBXUL_LIBRARY = True
-
-FINAL_LIBRARY = 'toolkitcomps'