--- a/accessible/interfaces/moz.build
+++ b/accessible/interfaces/moz.build
@@ -32,14 +32,12 @@ XPIDL_SOURCES += [
     'nsIAccessibleTextChangeEvent.idl',
     'nsIAccessibleTextRange.idl',
     'nsIAccessibleTypes.idl',
     'nsIAccessibleValue.idl',
     'nsIAccessibleVirtualCursorChangeEvent.idl',
     'nsIXBLAccessible.idl',
 ]
 
-XPIDL_MODULE = 'accessibility'
-
 EXPORTS += [
     'nsIAccessibilityService.h',
 ]
 

--- a/browser/components/feeds/moz.build
+++ b/browser/components/feeds/moz.build
@@ -10,18 +10,16 @@ MOCHITEST_MANIFESTS += ['test/mochitest.
 
 JAR_MANIFESTS += ['jar.mn']
 
 XPIDL_SOURCES += [
     'nsIFeedResultService.idl',
     'nsIWebContentConverterRegistrar.idl',
 ]
 
-XPIDL_MODULE = 'browser-feeds'
-
 SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'BrowserFeeds.manifest',
     'FeedConverter.js',
     'FeedWriter.js',

--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -7,18 +7,16 @@
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 JAR_MANIFESTS += ['jar.mn']
 
 XPIDL_SOURCES += [
     'nsIBrowserProfileMigrator.idl',
 ]
 
-XPIDL_MODULE = 'migration'
-
 EXTRA_COMPONENTS += [
     'ChromeProfileMigrator.js',
     'FirefoxProfileMigrator.js',
     'ProfileMigrator.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'BrowserProfileMigrators.manifest',

--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -28,18 +28,16 @@ DIRS += [
 
 DIRS += ['build']
 
 XPIDL_SOURCES += [
     'nsIBrowserGlue.idl',
     'nsIBrowserHandler.idl',
 ]
 
-XPIDL_MODULE = 'browsercompsbase'
-
 EXTRA_PP_COMPONENTS += [
     'BrowserComponents.manifest',
 ]
 
 EXTRA_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsBrowserGlue.js',
 ]

--- a/browser/components/newtab/moz.build
+++ b/browser/components/newtab/moz.build
@@ -19,14 +19,12 @@ EXTRA_JS_MODULES += [
     'PlacesProvider.jsm',
     'PreviewProvider.jsm'
 ]
 
 XPIDL_SOURCES += [
     'nsIAboutNewTabService.idl',
 ]
 
-XPIDL_MODULE = 'browser-newtab'
-
 EXTRA_COMPONENTS += [
     'aboutNewTabService.js',
     'NewTabComponents.manifest',
 ]

--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -9,18 +9,16 @@ BROWSER_CHROME_MANIFESTS += ['test/brows
 
 JAR_MANIFESTS += ['jar.mn']
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
 ]
 
-XPIDL_MODULE = 'sessionstore'
-
 EXTRA_COMPONENTS += [
     'nsSessionStartup.js',
     'nsSessionStore.js',
     'nsSessionStore.manifest',
 ]
 
 EXTRA_JS_MODULES.sessionstore = [
     'ContentRestore.jsm',

--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@@ -21,18 +21,16 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     XPIDL_SOURCES += [
         'nsIMacShellService.idl',
     ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     XPIDL_SOURCES += [
         'nsIGNOMEShellService.idl',
     ]
 
-XPIDL_MODULE = 'shellservice'
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsWindowsShellService.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'nsMacShellService.cpp',
     ]

--- a/caps/moz.build
+++ b/caps/moz.build
@@ -15,18 +15,16 @@ TESTING_JS_MODULES += [
 
 XPIDL_SOURCES += [
     'nsIAddonPolicyService.idl',
     'nsIDomainPolicy.idl',
     'nsIPrincipal.idl',
     'nsIScriptSecurityManager.idl',
 ]
 
-XPIDL_MODULE = 'caps'
-
 EXPORTS += [
     'nsJSPrincipals.h',
     'nsNullPrincipal.h',
     'nsNullPrincipalURI.h',
 ]
 
 EXPORTS.mozilla = [
     'BasePrincipal.h'

--- a/chrome/moz.build
+++ b/chrome/moz.build
@@ -6,18 +6,16 @@
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIChromeRegistry.idl',
     'nsIToolkitChromeRegistry.idl',
 ]
 
-XPIDL_MODULE = 'chrome'
-
 EXPORTS.mozilla.chrome += [
     'RegistryMessageUtils.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsChromeProtocolHandler.cpp',
     'nsChromeRegistry.cpp',
     'nsChromeRegistryChrome.cpp',

--- a/devtools/server/moz.build
+++ b/devtools/server/moz.build
@@ -15,18 +15,16 @@ DIRS += [
 BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIJSInspector.idl',
 ]
 
-XPIDL_MODULE = 'jsinspector'
-
 SOURCES += [
     'nsJSInspector.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 DevToolsModules(
     'child.js',

--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -30,18 +30,16 @@ XPIDL_SOURCES += [
     'nsIScrollable.idl',
     'nsITextScroll.idl',
     'nsIURIFixup.idl',
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
     'nsIWebPageDescriptor.idl',
 ]
 
-XPIDL_MODULE = 'docshell'
-
 EXPORTS += [
     'nsDocShellLoadTypes.h',
     'nsILinkHandler.h',
     'nsIScrollObserver.h',
     'nsIWebShellServices.h',
     'SerializedLoadContext.h',
 ]
 

--- a/docshell/shistory/moz.build
+++ b/docshell/shistory/moz.build
@@ -9,18 +9,16 @@ XPIDL_SOURCES += [
     'nsISHContainer.idl',
     'nsISHEntry.idl',
     'nsISHistory.idl',
     'nsISHistoryInternal.idl',
     'nsISHistoryListener.idl',
     'nsISHTransaction.idl',
 ]
 
-XPIDL_MODULE = 'shistory'
-
 EXPORTS += [
     'nsSHEntryShared.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsSHEntry.cpp',
     'nsSHEntryShared.cpp',
     'nsSHistory.cpp',

--- a/dom/activities/interfaces/moz.build
+++ b/dom/activities/interfaces/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIActivityProxy.idl',
     'nsIActivityUIGlue.idl',
 ]
 
-XPIDL_MODULE = 'dom_activities'
 

--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIAlarmHalService.idl',
 ]
 
-XPIDL_MODULE = 'dom_alarm'
-
 EXPORTS.mozilla.dom.alarm += [
     'AlarmHalService.h',
 ]
 
 SOURCES += [
     'AlarmHalService.cpp',
 ]
 

--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIAudioChannelAgent.idl',
     'nsIAudioChannelService.idl',
 ]
 
-XPIDL_MODULE = 'dom_audiochannel'
-
 EXPORTS += [
     'AudioChannelAgent.h',
     'AudioChannelService.h',
 ]
 
 UNIFIED_SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',

--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -35,18 +35,16 @@ XPIDL_SOURCES += [
     'nsISelectionListener.idl',
     'nsISelectionPrivate.idl',
     'nsISimpleContentPolicy.idl',
     'nsISiteSpecificUserAgent.idl',
     'nsISlowScriptDebug.idl',
     'nsIXMLHttpRequest.idl',
 ]
 
-XPIDL_MODULE = 'dom'
-
 EXPORTS += [
     'AutocompleteFieldList.h',
     'Crypto.h',
     'HTMLSplitOnSpacesTokenizer.h',
     'mozAutoDocUpdate.h',
     'mozFlushType.h',
     'nsAtomListUtils.h',
     'nsAttrAndChildArray.h',

--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -16,18 +16,16 @@ SOURCES += [
     'BrowserElementAudioChannel.cpp',
     'BrowserElementParent.cpp',
 ]
 
 XPIDL_SOURCES += [
     'nsIBrowserElementAPI.idl',
 ]
 
-XPIDL_MODULE = 'browser-element'
-
 EXTRA_COMPONENTS += [
     'BrowserElementParent.js',
     'BrowserElementParent.manifest',
     'BrowserElementProxy.js',
     'BrowserElementProxy.manifest',
 ]
 
 EXTRA_JS_MODULES += [

--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -24,18 +24,16 @@ UNIFIED_SOURCES += [
     'DOMCameraManager.cpp',
 ]
 
 if CONFIG['MOZ_B2G_CAMERA']:
     XPIDL_SOURCES += [
         'nsICameraTestHardware.idl',
     ]
 
-    XPIDL_MODULE = 'dom_camera'
-
     UNIFIED_SOURCES += [
         'GonkCameraControl.cpp',
         'GonkCameraHwMgr.cpp',
         'GonkCameraManager.cpp',
         'GonkCameraParameters.cpp',
         'GonkRecorderProfiles.cpp',
         'TestGonkCameraControl.cpp',
         'TestGonkCameraHardware.cpp',

--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@@ -9,9 +9,8 @@ XPIDL_SOURCES += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsICellbroadcastMessenger.idl',
         'nsIGonkCellBroadcastService.idl',
     ]
 
-XPIDL_MODULE = 'dom_cellbroadcast'

--- a/dom/engineeringmode/moz.build
+++ b/dom/engineeringmode/moz.build
@@ -10,10 +10,8 @@ if CONFIG['MOZ_B2G']:
         'EngineeringModeAPI.js',
         'EngineeringModeService.js',
     ]
 
     XPIDL_SOURCES += [
         'nsIEngineeringMode.idl',
     ]
 
-    XPIDL_MODULE = 'dom_engineeringmode'
-

--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -10,18 +10,16 @@ MOCHITEST_MANIFESTS += [
 ]
 
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 XPIDL_SOURCES += [
     'nsIEventListenerService.idl',
 ]
 
-XPIDL_MODULE = 'content_events'
-
 EXPORTS.mozilla += [
     'AsyncEventDispatcher.h',
     'DOMEventTargetHelper.h',
     'EventDispatcher.h',
     'EventListenerManager.h',
     'EventNameList.h',
     'EventStateManager.h',
     'EventStates.h',

--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -20,18 +20,16 @@ BROWSER_CHROME_MANIFESTS += ['test/brows
 XPIDL_SOURCES += [
     'nsIFormSubmitObserver.idl',
     'nsIHTMLMenu.idl',
     'nsIImageDocument.idl',
     'nsIMenuBuilder.idl',
     'nsIPhonetic.idl',
 ]
 
-XPIDL_MODULE = 'content_html'
-
 EXPORTS += [
     'HTMLPropertiesCollection.h',
     'nsFormSubmission.h',
     'nsGenericHTMLElement.h',
     'nsHTMLDNSPrefetch.h',
     'nsIConstraintValidation.h',
     'nsIForm.h',
     'nsIFormControl.h',

--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@@ -13,9 +13,8 @@ XPIDL_SOURCES += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsIGonkIccService.idl',
         'nsIIccMessenger.idl',
     ]
 
-XPIDL_MODULE = 'dom_icc'

--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 if CONFIG['MOZ_B2G']:
     XPIDL_SOURCES += [
         'nsIHardwareKeyHandler.idl',
     ]
 
-    XPIDL_MODULE = 'inputmethod'
-
     EXPORTS.mozilla += [
         'HardwareKeyHandler.h',
     ]
 
     SOURCES += [
         'HardwareKeyHandler.cpp'
     ]
 

--- a/dom/inputport/moz.build
+++ b/dom/inputport/moz.build
@@ -30,18 +30,16 @@ UNIFIED_SOURCES += [
     'InputPortManager.cpp',
     'InputPortServiceFactory.cpp',
 ]
 
 XPIDL_SOURCES += [
     'nsIInputPortService.idl',
 ]
 
-XPIDL_MODULE = 'dom_inputport'
-
 MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 

--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@@ -7,10 +7,9 @@
 XPIDL_SOURCES += [
     'mozIApplication.idl',
     'mozIApplicationClearPrivateDataParams.idl',
     'nsIAppsService.idl',
     'nsIInterAppCommService.idl',
     'nsIInterAppCommUIGlue.idl'
 ]
 
-XPIDL_MODULE = 'dom_apps'
 

--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -32,10 +32,9 @@ XPIDL_SOURCES += [
     'nsIServiceWorkerManager.idl',
     'nsIStructuredCloneContainer.idl',
     'nsITabChild.idl',
     'nsITabParent.idl',
     'nsITextInputProcessor.idl',
     'nsITextInputProcessorCallback.idl',
 ]
 
-XPIDL_MODULE = 'dom_base'
 

--- a/dom/interfaces/canvas/moz.build
+++ b/dom/interfaces/canvas/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMCanvasRenderingContext2D.idl',
     'nsIDOMWebGLRenderingContext.idl',
 ]
 
-XPIDL_MODULE = 'dom_canvas'
 

--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@@ -19,10 +19,9 @@ XPIDL_SOURCES += [
     'nsIDOMNode.idl',
     'nsIDOMNodeList.idl',
     'nsIDOMNSEditableElement.idl',
     'nsIDOMProcessingInstruction.idl',
     'nsIDOMText.idl',
     'nsIDOMXMLDocument.idl',
 ]
 
-XPIDL_MODULE = 'dom_core'
 

--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -26,10 +26,9 @@ XPIDL_SOURCES += [
     'nsIDOMCSSSupportsRule.idl',
     'nsIDOMCSSUnknownRule.idl',
     'nsIDOMCSSValue.idl',
     'nsIDOMCSSValueList.idl',
     'nsIDOMElementCSSInlineStyle.idl',
     'nsIDOMRect.idl',
 ]
 
-XPIDL_MODULE = 'dom_css'
 

--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -26,10 +26,9 @@ XPIDL_SOURCES += [
     'nsIDOMPaintRequest.idl',
     'nsIDOMScrollAreaEvent.idl',
     'nsIDOMSimpleGestureEvent.idl',
     'nsIDOMTransitionEvent.idl',
     'nsIDOMUIEvent.idl',
     'nsIDOMWheelEvent.idl',
 ]
 
-XPIDL_MODULE = 'dom_events'
 

--- a/dom/interfaces/gamepad/moz.build
+++ b/dom/interfaces/gamepad/moz.build
@@ -1,11 +1,9 @@
 # -*- 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/.
 
-XPIDL_MODULE = 'dom_gamepad'
-
 XPIDL_SOURCES = [
   'nsIGamepadServiceTest.idl',
   ]

--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@@ -8,10 +8,9 @@ XPIDL_SOURCES += [
     'nsIDOMGeoGeolocation.idl',
     'nsIDOMGeoPosition.idl',
     'nsIDOMGeoPositionCallback.idl',
     'nsIDOMGeoPositionCoords.idl',
     'nsIDOMGeoPositionError.idl',
     'nsIDOMGeoPositionErrorCallback.idl',
 ]
 
-XPIDL_MODULE = 'dom_geolocation'
 

--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -53,10 +53,9 @@ XPIDL_SOURCES += [
     'nsIDOMHTMLUListElement.idl',
     'nsIDOMMediaError.idl',
     'nsIDOMMozBrowserFrame.idl',
     'nsIDOMTimeRanges.idl',
     'nsIDOMValidityState.idl',
     'nsIMozBrowserFrame.idl',
 ]
 
-XPIDL_MODULE = 'dom_html'
 

--- a/dom/interfaces/json/moz.build
+++ b/dom/interfaces/json/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIJSON.idl',
 ]
 
-XPIDL_MODULE = 'dom_json'
 

--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMDesktopNotification.idl',
     'nsINotificationStorage.idl',
 ]
 
-XPIDL_MODULE = 'dom_notification'
 

--- a/dom/interfaces/offline/moz.build
+++ b/dom/interfaces/offline/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMOfflineResourceList.idl',
 ]
 
-XPIDL_MODULE = 'dom_offline'
 

--- a/dom/interfaces/permission/moz.build
+++ b/dom/interfaces/permission/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIPermissionPromptService.idl',
 ]
 
-XPIDL_MODULE = 'dom_permissionsettings'
 

--- a/dom/interfaces/push/moz.build
+++ b/dom/interfaces/push/moz.build
@@ -5,9 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIPushErrorReporter.idl',
     'nsIPushNotifier.idl',
     'nsIPushService.idl',
 ]
 
-XPIDL_MODULE = 'dom_push'

--- a/dom/interfaces/range/moz.build
+++ b/dom/interfaces/range/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMRange.idl',
 ]
 
-XPIDL_MODULE = 'dom_range'
 

--- a/dom/interfaces/security/moz.build
+++ b/dom/interfaces/security/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIContentSecurityManager.idl',
     'nsIContentSecurityPolicy.idl'
 ]
 
-XPIDL_MODULE = 'dom_security'
 

--- a/dom/interfaces/settings/moz.build
+++ b/dom/interfaces/settings/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsISettingsService.idl',
 ]
 
-XPIDL_MODULE = 'dom_settings'
 

--- a/dom/interfaces/sidebar/moz.build
+++ b/dom/interfaces/sidebar/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIWebContentHandlerRegistrar.idl',
 ]
 
-XPIDL_MODULE = 'dom_sidebar'
 

--- a/dom/interfaces/smil/moz.build
+++ b/dom/interfaces/smil/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMTimeEvent.idl',
 ]
 
-XPIDL_MODULE = 'dom_smil'
 

--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -4,9 +4,8 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMStorage.idl',
     'nsIDOMStorageManager.idl',
 ]
 
-XPIDL_MODULE = 'dom_storage'

--- a/dom/interfaces/stylesheets/moz.build
+++ b/dom/interfaces/stylesheets/moz.build
@@ -5,10 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIDOMMediaList.idl',
     'nsIDOMStyleSheet.idl',
     'nsIDOMStyleSheetList.idl',
 ]
 
-XPIDL_MODULE = 'dom_stylesheets'
 

--- a/dom/interfaces/svg/moz.build
+++ b/dom/interfaces/svg/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMSVGElement.idl',
     'nsIDOMSVGLength.idl',
 ]
 
-XPIDL_MODULE = 'dom_svg'
 

--- a/dom/interfaces/traversal/moz.build
+++ b/dom/interfaces/traversal/moz.build
@@ -5,10 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIDOMNodeFilter.idl',
     'nsIDOMNodeIterator.idl',
     'nsIDOMTreeWalker.idl',
 ]
 
-XPIDL_MODULE = 'dom_traversal'
 

--- a/dom/interfaces/xbl/moz.build
+++ b/dom/interfaces/xbl/moz.build
@@ -3,10 +3,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMDocumentXBL.idl',
 ]
 
-XPIDL_MODULE = 'dom_xbl'
 

--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMXPathEvaluator.idl',
     'nsIDOMXPathResult.idl',
 ]
 
-XPIDL_MODULE = 'dom_xpath'
 

--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@@ -22,10 +22,9 @@ XPIDL_SOURCES += [
     'nsIDOMXULPopupElement.idl',
     'nsIDOMXULRelatedElement.idl',
     'nsIDOMXULSelectCntrlEl.idl',
     'nsIDOMXULSelectCntrlItemEl.idl',
     'nsIDOMXULTextboxElement.idl',
     'nsIDOMXULTreeElement.idl',
 ]
 
-XPIDL_MODULE = 'dom_xul'
 

--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIHangReport.idl',
 ]
 
-XPIDL_MODULE = 'dom_ipc'
-
 EXPORTS += [
     'nsICachedFileDescriptorListener.h',
 ]
 
 EXPORTS.mozilla.dom.ipc += [
     'BlobChild.h',
     'BlobParent.h',
     'IdType.h',

--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'IPeerConnection.idl',
 ]
 
-XPIDL_MODULE = 'peerconnection'
-
 SOURCES += [
     'MediaModule.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/ipc/chromium/src',
     '/media/mtransport',
     '/media/mtransport',

--- a/dom/media/gmp/moz.build
+++ b/dom/media/gmp/moz.build
@@ -2,18 +2,16 @@
 # 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/.
 
 for cdm in CONFIG['MOZ_EME_MODULES']:
     DEFINES['MOZ_%s_EME' % cdm.upper()] = True
 
-XPIDL_MODULE = 'content_geckomediaplugins'
-
 XPIDL_SOURCES += [
     'mozIGeckoMediaPluginChromeService.idl',
     'mozIGeckoMediaPluginService.idl',
 ]
 
 EXPORTS += [
     'gmp-api/gmp-async-shutdown.h',
     'gmp-api/gmp-audio-codec.h',

--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -75,18 +75,16 @@ if CONFIG['MOZ_WEBRTC']:
     WEBRTC_SIGNALLING_TEST_MANIFESTS += ['tests/mochitest/steeplechase.ini']
     WEBRTC_SIGNALLING_TEST_MANIFESTS += ['tests/mochitest/steeplechase_long/steeplechase_long.ini']
 
 XPIDL_SOURCES += [
     'nsIDOMNavigatorUserMedia.idl',
     'nsIMediaManager.idl',
 ]
 
-XPIDL_MODULE = 'dom_media'
-
 EXPORTS += [
     'AbstractMediaDecoder.h',
     'ADTSDecoder.h',
     'ADTSDemuxer.h',
     'AudioBufferUtils.h',
     'AudioChannelFormat.h',
     'AudioCompactor.h',
     'AudioConverter.h',

--- a/dom/media/webrtc/moz.build
+++ b/dom/media/webrtc/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('*'):
     BUG_COMPONENT = ('Core', 'WebRTC: Audio/Video')
 
 with Files('PeerIdentity.*'):
     BUG_COMPONENT = ('Core', 'WebRTC: Signaling')
 
-XPIDL_MODULE = 'content_webrtc'
-
 EXPORTS += [
     'MediaEngine.h',
     'MediaEngineCameraVideoSource.h',
     'MediaEngineDefault.h',
     'MediaTrackConstraints.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:

--- a/dom/media/webspeech/recognition/moz.build
+++ b/dom/media/webspeech/recognition/moz.build
@@ -1,17 +1,15 @@
 # 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/.
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
-XPIDL_MODULE = 'dom_webspeechrecognition'
-
 XPIDL_SOURCES = [
   'nsISpeechRecognitionService.idl'
 ]
 
 EXPORTS.mozilla.dom += [
     'SpeechGrammar.h',
     'SpeechGrammarList.h',
     'SpeechRecognition.h',

--- a/dom/media/webspeech/synth/moz.build
+++ b/dom/media/webspeech/synth/moz.build
@@ -4,18 +4,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WEBSPEECH']:
     MOCHITEST_MANIFESTS += [
         'test/mochitest.ini',
         'test/startup/mochitest.ini',
     ]
 
-    XPIDL_MODULE = 'dom_webspeechsynth'
-
     XPIDL_SOURCES += [
         'nsISpeechService.idl',
         'nsISynthVoiceRegistry.idl'
     ]
 
     EXPORTS.mozilla.dom += [
         'ipc/SpeechSynthesisChild.h',
         'ipc/SpeechSynthesisParent.h',

--- a/dom/media/webvtt/moz.build
+++ b/dom/media/webvtt/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
   'nsIWebVTTListener.idl',
   'nsIWebVTTParserWrapper.idl',
 ]
 
-XPIDL_MODULE = 'webvtt'
-
 EXTRA_COMPONENTS += [
   'WebVTT.manifest',
   'WebVTTParserWrapper.js',
 ]
 
 EXTRA_JS_MODULES += [
   'vtt.jsm',
 ]

--- a/dom/messages/interfaces/moz.build
+++ b/dom/messages/interfaces/moz.build
@@ -6,10 +6,9 @@
 
 XPIDL_SOURCES += [
     'nsIDOMNavigatorSystemMessages.idl',
     'nsISystemMessageCache.idl',
     'nsISystemMessageGlue.idl',
     'nsISystemMessagesInternal.idl',
 ]
 
-XPIDL_MODULE = 'dom_messages'
 

--- a/dom/mobileconnection/moz.build
+++ b/dom/mobileconnection/moz.build
@@ -72,9 +72,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
 LOCAL_INCLUDES += [
     '/dom/system/gonk',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-XPIDL_MODULE = 'dom_mobileconnection'

--- a/dom/mobileid/interfaces/moz.build
+++ b/dom/mobileid/interfaces/moz.build
@@ -3,9 +3,8 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIMobileIdentityService.idl',
 ]
 
-XPIDL_MODULE = 'dom_mobileidentity'

--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -20,10 +20,9 @@ XPIDL_SOURCES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsIGonkMobileMessageDatabaseService.idl',
         'nsIGonkSmsService.idl',
         'nsISmsMessenger.idl',
     ]
 
-XPIDL_MODULE = 'dom_mobilemessage'
 

--- a/dom/network/interfaces/moz.build
+++ b/dom/network/interfaces/moz.build
@@ -11,9 +11,8 @@ XPIDL_SOURCES += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     XPIDL_SOURCES += [
         'nsIEthernetManager.idl',
         'nsINetworkStatsServiceProxy.idl',
     ]
 
-XPIDL_MODULE = 'dom_network'

--- a/dom/newapps/interfaces/moz.build
+++ b/dom/newapps/interfaces/moz.build
@@ -3,9 +3,8 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIInstallPackagedWebapp.idl'
 ]
 
-XPIDL_MODULE = 'dom_newapps'

--- a/dom/nfc/moz.build
+++ b/dom/nfc/moz.build
@@ -1,17 +1,15 @@
 # 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/.
 #
 # Copyright © 2013 Deutsche Telekom, Inc.
 
-XPIDL_MODULE = 'dom_nfc'
-
 if CONFIG['MOZ_NFC']:
     XPIDL_SOURCES += [
         'nsINfcContentHelper.idl',
     ]
     EXPORTS.mozilla.dom += [
         'MozIsoDepTech.h',
         'MozNDEFRecord.h',
         'MozNfcATech.h',

--- a/dom/payment/interfaces/moz.build
+++ b/dom/payment/interfaces/moz.build
@@ -6,10 +6,9 @@
 
 XPIDL_SOURCES += [
     'nsIPaymentContentHelperService.idl',
     'nsIPaymentFlowInfo.idl',
     'nsIPaymentProviderStrategy.idl',
     'nsIPaymentUIGlue.idl',
 ]
 
-XPIDL_MODULE = 'dom_payment'
 

--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -12,18 +12,16 @@ XPIDL_SOURCES += [
     'nsIPluginDocument.idl',
     'nsIPluginHost.idl',
     'nsIPluginInputStream.idl',
     'nsIPluginInstanceOwner.idl',
     'nsIPluginTag.idl',
     'nspluginroot.idl',
 ]
 
-XPIDL_MODULE = 'plugin'
-
 EXPORTS += [
     'npapi.h',
     'npfunctions.h',
     'npruntime.h',
     'nptypes.h',
     'nsJSNPRuntime.h',
     'nsNPAPIPluginInstance.h',
     'nsPluginDirServiceProvider.h',

--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMWakeLockListener.idl',
     'nsIPowerManagerService.idl',
 ]
 
-XPIDL_MODULE = 'dom_power'
-
 EXPORTS.mozilla.dom += [
     'PowerManager.h',
     'WakeLock.h',
 ]
 
 EXPORTS.mozilla.dom.power += [
     'PowerManagerService.h',
     'Types.h',

--- a/dom/presentation/interfaces/moz.build
+++ b/dom/presentation/interfaces/moz.build
@@ -20,10 +20,9 @@ XPIDL_SOURCES += [
     'nsITCPPresentationServer.idl',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     XPIDL_SOURCES += [
         'nsIPresentationNetworkHelper.idl',
     ]
 
-XPIDL_MODULE = 'dom_presentation'
 

--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIQuotaCallbacks.idl',
     'nsIQuotaManagerService.idl',
     'nsIQuotaRequests.idl',
 ]
 
-XPIDL_MODULE = 'dom_quota'
-
 EXPORTS.mozilla.dom.quota += [
     'ActorsParent.h',
     'Client.h',
     'FileStreams.h',
     'OriginScope.h',
     'PersistenceType.h',
     'QuotaCommon.h',
     'QuotaManager.h',

--- a/dom/secureelement/moz.build
+++ b/dom/secureelement/moz.build
@@ -15,17 +15,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
     EXTRA_COMPONENTS += [
         'gonk/ACEService.js',
         'gonk/ACEService.manifest',
         'gonk/GPAccessRulesManager.js',
         'gonk/GPAccessRulesManager.manifest',
         'gonk/SecureElement.js',
         'gonk/SecureElement.manifest',
     ]
-    XPIDL_MODULE = 'dom_secureelement'
+
     XPIDL_SOURCES += [
         'gonk/nsIAccessControlEnforcer.idl',
         'gonk/nsIAccessRulesManager.idl',
         'gonk/nsISecureElementConnector.idl',
     ]
     EXTRA_JS_MODULES += [
         'gonk/gp_consts.js',
         'gonk/se_consts.js',

--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -25,18 +25,16 @@ XPIDL_SOURCES += [
     'nsITetheringService.idl',
     'nsIVolume.idl',
     'nsIVolumeMountLock.idl',
     'nsIVolumeService.idl',
     'nsIVolumeStat.idl',
     'nsIWorkerHolder.idl',
 ]
 
-XPIDL_MODULE = 'dom_system_gonk'
-
 EXPORTS += [
     'GeolocationUtil.h',
     'GonkGPSGeolocationProvider.h',
     'nsVolume.h',
     'nsVolumeService.h',
     'SystemProperty.h',
 ]
 UNIFIED_SOURCES += [

--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -17,18 +17,16 @@ elif toolkit == 'android':
 elif toolkit == 'gonk':
     DIRS += ['gonk']
 
 XPIDL_SOURCES += [
     'nsIOSFileConstantsService.idl',
     'nsISystemUpdateProvider.idl',
 ]
 
-XPIDL_MODULE = 'dom_system'
-
 EXPORTS += [
     'nsDeviceSensors.h',
 ]
 
 EXPORTS.mozilla += [
     'OSFileConstants.h',
 ]
 

--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsITelephonyCallInfo.idl',
     'nsITelephonyService.idl',
 ]
 
-XPIDL_MODULE = 'dom_telephony'
-
 EXPORTS.mozilla.dom += [
     'CallsList.h',
     'MMICall.h',
     'Telephony.h',
     'TelephonyCall.h',
     'TelephonyCallGroup.h',
     'TelephonyCallId.h',
     'USSDSession.h'

--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsITimeService.idl',
 ]
 
-XPIDL_MODULE = 'dom_time'
-
 EXPORTS.mozilla.dom.time += [
     'DateCacheCleaner.h',
     'TimeChangeObserver.h',
     'TimeManager.h',
     'TimeService.h',
 ]
 
 UNIFIED_SOURCES += [

--- a/dom/tv/moz.build
+++ b/dom/tv/moz.build
@@ -35,18 +35,16 @@ XPIDL_SOURCES += [
     'nsITVSimulatorService.idl',
 ]
 
 EXTRA_COMPONENTS += [
     'TVSimulatorService.js',
     'TVSimulatorService.manifest',
 ]
 
-XPIDL_MODULE = 'dom_tv'
-
 MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 

--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIVoicemailService.idl',
 ]
 
-XPIDL_MODULE = 'dom_voicemail'
-
 EXPORTS.mozilla.dom += [
     'Voicemail.h',
     'VoicemailStatus.h',
 ]
 
 EXPORTS.mozilla.dom.voicemail += [
     'ipc/VoicemailIPCService.h',
     'ipc/VoicemailParent.h',

--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIWifi.idl',
     'nsIWifiCertService.idl',
     'nsIWifiService.idl',
 ]
 
-XPIDL_MODULE = 'dom_wifi'
-
 EXTRA_COMPONENTS += [
     'DOMWifiManager.js',
     'DOMWifiManager.manifest',
     'DOMWifiP2pManager.js',
     'DOMWifiP2pManager.manifest',
     'WifiWorker.js',
     'WifiWorker.manifest',
 ]

--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -39,18 +39,16 @@ EXPORTS.mozilla.dom.workers.bindings += 
     'ServiceWorkerWindowClient.h',
     'SharedWorker.h',
     'URL.h',
     'WorkerFeature.h',
     'XMLHttpRequest.h',
     'XMLHttpRequestUpload.h',
 ]
 
-XPIDL_MODULE = 'dom_workers'
-
 XPIDL_SOURCES += [
     'nsIWorkerDebugger.idl',
     'nsIWorkerDebuggerManager.idl',
 ]
 
 UNIFIED_SOURCES += [
     'ChromeWorkerScope.cpp',
     'FileReaderSync.cpp',

--- a/dom/workers/test/extensions/traditional/moz.build
+++ b/dom/workers/test/extensions/traditional/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIWorkerTest.idl',
 ]
 
-XPIDL_MODULE = 'WorkerTest'
-
 EXTRA_COMPONENTS += [
     'WorkerTest.js',
     'WorkerTest.manifest',
 ]
 
 XPI_NAME = 'worker'
 
 JAR_MANIFESTS += ['jar.mn']

--- a/dom/xslt/moz.build
+++ b/dom/xslt/moz.build
@@ -8,18 +8,16 @@ XPIDL_SOURCES += [
     'nsIXSLTProcessor.idl',
     'nsIXSLTProcessorPrivate.idl',
     'txIEXSLTRegExFunctions.idl',
     'txIFunctionEvaluationContext.idl',
     'txINodeSet.idl',
     'txIXPathObject.idl',
 ]
 
-XPIDL_MODULE = 'content_xslt'
-
 EXPORTS += [
     'nsIDocumentTransformer.h',
 ]
 
 DIRS += [
     'base',
     'xml',
     'xpath',

--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -29,18 +29,16 @@ if CONFIG['MOZ_XUL']:
         'XULDocument.cpp',
     ]
 
 XPIDL_SOURCES += [
     'nsIController.idl',
     'nsIControllers.idl',
 ]
 
-XPIDL_MODULE = 'xul'
-
 UNIFIED_SOURCES += [
     'nsXULControllers.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/html',

--- a/dom/xul/templates/moz.build
+++ b/dom/xul/templates/moz.build
@@ -10,18 +10,16 @@ XPIDL_SOURCES += [
     'nsIXULBuilderListener.idl',
     'nsIXULSortService.idl',
     'nsIXULTemplateBuilder.idl',
     'nsIXULTemplateQueryProcessor.idl',
     'nsIXULTemplateResult.idl',
     'nsIXULTemplateRuleFilter.idl',
 ]
 
-XPIDL_MODULE = 'xultmpl'
-
 UNIFIED_SOURCES += [
     'nsContentSupportMap.cpp',
     'nsContentTestNode.cpp',
     'nsInstantiationNode.cpp',
     'nsRDFBinding.cpp',
     'nsRDFConInstanceTestNode.cpp',
     'nsRDFConMemberTestNode.cpp',
     'nsRDFPropertyTestNode.cpp',

--- a/editor/composer/moz.build
+++ b/editor/composer/moz.build
@@ -7,18 +7,16 @@
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 XPIDL_SOURCES += [
     'nsIEditingSession.idl',
 ]
 
-XPIDL_MODULE = 'composer'
-
 UNIFIED_SOURCES += [
     'nsComposerCommands.cpp',
     'nsComposerCommandsUpdater.cpp',
     'nsComposerController.cpp',
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsComposeTxtSrvFilter.cpp',
     'nsEditingSession.cpp',

--- a/editor/moz.build
+++ b/editor/moz.build
@@ -27,17 +27,15 @@ XPIDL_SOURCES += [
     'nsIHTMLObjectResizeListener.idl',
     'nsIHTMLObjectResizer.idl',
     'nsIPlaintextEditor.idl',
     'nsITableEditor.idl',
     'nsIURIRefObject.idl',
     'nsPIEditorTransaction.idl',
 ]
 
-XPIDL_MODULE = 'editor'
-
 EXPORTS += [
     'nsEditorCID.h',
 ]
 
 EXTRA_JS_MODULES += [
     'AsyncSpellCheckTestHelper.jsm',
 ]

--- a/editor/txmgr/moz.build
+++ b/editor/txmgr/moz.build
@@ -8,18 +8,16 @@ TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsITransaction.idl',
     'nsITransactionList.idl',
     'nsITransactionListener.idl',
     'nsITransactionManager.idl',
 ]
 
-XPIDL_MODULE = 'txmgr'
-
 EXPORTS += [
     'nsTransactionManagerCID.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsTransactionItem.cpp',
     'nsTransactionList.cpp',
     'nsTransactionManager.cpp',

--- a/editor/txtsvc/moz.build
+++ b/editor/txtsvc/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIInlineSpellChecker.idl',
     'nsITextServicesFilter.idl',
 ]
 
-XPIDL_MODULE = 'txtsvc'
-
 EXPORTS += [
     'nsISpellChecker.h',
     'nsITextService.h',
     'nsITextServicesDocument.h',
     'nsTextServicesCID.h',
 ]
 
 UNIFIED_SOURCES += [

--- a/embedding/browser/moz.build
+++ b/embedding/browser/moz.build
@@ -26,18 +26,16 @@ XPIDL_SOURCES += [
 
 if CONFIG['NS_PRINTING']:
     XPIDL_SOURCES += [
         'nsIPrintingPrompt.idl',
         'nsIPrintingPromptService.idl',
         'nsIWebBrowserPrint.idl',
     ]
 
-XPIDL_MODULE = 'webBrowser_core'
-
 EXPORTS += [
     'nsCTooltipTextProvider.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsCommandHandler.cpp',
     'nsContextMenuInfo.cpp',
     'nsDocShellTreeOwner.cpp',

--- a/embedding/components/commandhandler/moz.build
+++ b/embedding/components/commandhandler/moz.build
@@ -8,18 +8,16 @@ XPIDL_SOURCES += [
     'nsICommandManager.idl',
     'nsICommandParams.idl',
     'nsIControllerCommand.idl',
     'nsIControllerCommandTable.idl',
     'nsIControllerContext.idl',
     'nsPICommandUpdater.idl',
 ]
 
-XPIDL_MODULE = 'commandhandler'
-
 UNIFIED_SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 

--- a/embedding/components/find/moz.build
+++ b/embedding/components/find/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIFind.idl',
     'nsIWebBrowserFind.idl',
 ]
 
-XPIDL_MODULE = 'find'
-
 UNIFIED_SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['GNU_CXX']:

--- a/embedding/components/webbrowserpersist/moz.build
+++ b/embedding/components/webbrowserpersist/moz.build
@@ -6,18 +6,16 @@
 
 XPIDL_SOURCES += [
     'nsCWebBrowserPersist.idl',
     'nsIWebBrowserPersist.idl',
     'nsIWebBrowserPersistable.idl',
     'nsIWebBrowserPersistDocument.idl',
 ]
 
-XPIDL_MODULE = 'webbrowserpersist'
-
 IPDL_SOURCES += [
     'PWebBrowserPersistDocument.ipdl',
     'PWebBrowserPersistResources.ipdl',
     'PWebBrowserPersistSerialize.ipdl',
 ]
 
 SOURCES += [
     'nsWebBrowserPersist.cpp',

--- a/embedding/components/windowwatcher/moz.build
+++ b/embedding/components/windowwatcher/moz.build
@@ -9,18 +9,16 @@ XPIDL_SOURCES += [
     'nsIPromptFactory.idl',
     'nsIPromptService.idl',
     'nsIPromptService2.idl',
     'nsIWindowWatcher.idl',
     'nsPIPromptService.idl',
     'nsPIWindowWatcher.idl',
 ]
 
-XPIDL_MODULE = 'windowwatcher'
-
 EXPORTS += [
     'nsPromptUtils.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsAutoWindowStateHelper.cpp',
     'nsWindowWatcher.cpp',
 ]

--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -12,13 +12,11 @@ if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIWindowCreator.idl',
     'nsIWindowCreator2.idl',
     'nsIWindowProvider.idl',
 ]
 
-XPIDL_MODULE = 'embed_base'
-
 EXPORTS += [
     'nsEmbedCID.h',
 ]

--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -6,18 +6,16 @@
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICookieAcceptDialog.idl',
     'nsICookiePromptService.idl',
 ]
 
-XPIDL_MODULE = 'cookie'
-
 UNIFIED_SOURCES += [
     'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsCookiePromptService.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',
     'nsPopupWindowManager.cpp',
 ]

--- a/extensions/pref/autoconfig/public/moz.build
+++ b/extensions/pref/autoconfig/public/moz.build
@@ -4,10 +4,9 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIAutoConfig.idl',
     'nsIReadConfig.idl',
 ]
 
-XPIDL_MODULE = 'autoconfig'
 

--- a/extensions/spellcheck/idl/moz.build
+++ b/extensions/spellcheck/idl/moz.build
@@ -6,10 +6,9 @@
 
 XPIDL_SOURCES += [
     'mozIPersonalDictionary.idl',
     'mozISpellCheckingEngine.idl',
     'mozISpellI18NManager.idl',
     'mozISpellI18NUtil.idl',
 ]
 
-XPIDL_MODULE = 'spellchecker'
 

--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIFontEnumerator.idl',
     'nsIScriptableRegion.idl',
 ]
 
-XPIDL_MODULE = 'gfx'
-
 DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']
 
 EXPORTS += [
     'DriverCrashGuard.h',
     'FilterSupport.h',
     'gfxCrashReporterUtils.h',
     'gfxTelemetry.h',
     'nsBoundingMetrics.h',

--- a/hal/moz.build
+++ b/hal/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'gonk/nsIRecoveryService.idl',
 ]
 
-XPIDL_MODULE = 'hal'
-
 EXPORTS.mozilla += [
     'Hal.h',
     'HalImpl.h',
     'HalSandbox.h',
     'HalScreenConfiguration.h',
     'HalSensor.h',
     'HalTypes.h',
     'HalWakeLock.h',

--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsGtkQtIconsConverter.idl',
 ]
 
-XPIDL_MODULE = 'gtkqticonsconverter'
-
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'gtkqticonsconverter.manifest',
 ]
 

--- a/image/moz.build
+++ b/image/moz.build
@@ -28,18 +28,16 @@ XPIDL_SOURCES += [
     'imgINotificationObserver.idl',
     'imgIOnloadBlocker.idl',
     'imgIRequest.idl',
     'imgIScriptedNotificationObserver.idl',
     'imgITools.idl',
     'nsIIconURI.idl',
 ]
 
-XPIDL_MODULE = 'imglib2'
-
 EXPORTS += [
     'DrawResult.h',
     'ImageCacheKey.h',
     'ImageLogging.h',
     'ImageOps.h',
     'ImageRegion.h',
     'imgLoader.h',
     'imgRequest.h',

--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -17,18 +17,16 @@ else:
 
 XPIDL_SOURCES += [
     'nsICollation.idl',
     'nsILocale.idl',
     'nsILocaleService.idl',
     'nsIScriptableDateFormat.idl',
 ]
 
-XPIDL_MODULE = 'locale'
-
 EXPORTS += [
     'nsCollation.h',
     'nsCollationCID.h',
     'nsDateTimeFormatCID.h',
     'nsIDateTimeFormat.h',
     'nsILanguageAtomService.h',
     'nsIPlatformCharset.h',
     'nsPosixLocale.h',

--- a/intl/lwbrk/moz.build
+++ b/intl/lwbrk/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsISemanticUnitScanner.idl',
 ]
 
-XPIDL_MODULE = 'lwbrk'
-
 EXPORTS += [
     'nsILineBreaker.h',
     'nsIWordBreaker.h',
     'nsLWBrkCIID.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsJISx4051LineBreaker.cpp',

--- a/intl/strres/moz.build
+++ b/intl/strres/moz.build
@@ -6,16 +6,14 @@
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIStringBundle.idl',
     'nsIStringBundleOverride.idl',
 ]
 
-XPIDL_MODULE = 'intl'
-
 UNIFIED_SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'

--- a/intl/uconv/moz.build
+++ b/intl/uconv/moz.build
@@ -7,18 +7,16 @@
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIScriptableUConv.idl',
     'nsITextToSubURI.idl',
     'nsIUTF8ConverterService.idl',
 ]
 
-XPIDL_MODULE = 'uconv'
-
 EXPORTS += [
     'nsEncoderDecoderUtils.h',
     'nsIUnicodeDecoder.h',
     'nsIUnicodeEncoder.h',
     'nsNCRFallbackEncoderWrapper.h',
     'nsUConvCID.h',
     'nsUCSupport.h',
     'uconvutil.h',

--- a/intl/unicharutil/moz.build
+++ b/intl/unicharutil/moz.build
@@ -8,18 +8,16 @@ DIRS += ['util', 'tables']
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIEntityConverter.idl',
     'nsISaveAsCharset.idl',
     'nsIUnicodeNormalizer.idl',
 ]
 
-XPIDL_MODULE = 'unicharutil'
-
 EXPORTS += [
     'nsICaseConversion.h',
     'nsIUGenCategory.h',
     'nsUnicharUtilCIID.h',
     'nsUnicodeNormalizer.h',
 ]
 
 UNIFIED_SOURCES += [

--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'IJSDebugger.idl',
 ]
 
-XPIDL_MODULE = 'jsdebugger'
-
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 SOURCES += [
     'JSDebugger.cpp',
 ]
 
 EXTRA_JS_MODULES += [
     'jsdebugger.jsm',

--- a/js/xpconnect/idl/moz.build
+++ b/js/xpconnect/idl/moz.build
@@ -13,10 +13,9 @@ XPIDL_SOURCES += [
     'xpccomponents.idl',
     'xpcexception.idl',
     'xpcIJSGetFactory.idl',
     'xpcIJSModuleLoader.idl',
     'xpcIJSWeakReference.idl',
     'xpcjsid.idl',
 ]
 
-XPIDL_MODULE = 'xpconnect'
 

--- a/js/xpconnect/tests/idl/moz.build
+++ b/js/xpconnect/tests/idl/moz.build
@@ -8,18 +8,16 @@ XPIDL_SOURCES += [
     'xpctest_attributes.idl',
     'xpctest_bug809674.idl',
     'xpctest_interfaces.idl',
     'xpctest_params.idl',
     'xpctest_returncode.idl',
     'xpctest_utils.idl',
 ]
 
-XPIDL_MODULE = 'xpctest'
-
 # XXX: This relies on js_xpconnect_tests_idl.xpt being created in
 # dist/bin/components/ during the export tier AND TEST_HARNESS_FILES
 # being processed after that.
 TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.native.components += [
     '!/dist/bin/components/js_xpconnect_tests_idl.xpt',
 ]
 TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.js += [
     '!/dist/bin/components/js_xpconnect_tests_idl.xpt',

--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -47,18 +47,16 @@ XPIDL_SOURCES += [
     'nsIStyleSheetService.idl',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     UNIFIED_SOURCES += [
         'nsAutoLayoutPhase.cpp',
     ]
 
-XPIDL_MODULE = 'layout_base'
-
 EXPORTS += [
     'ActiveLayerTracker.h',
     'CaretAssociationHint.h',
     'DisplayItemClip.h',
     'DisplayItemScrollClip.h',
     'DisplayListClipState.h',
     'FrameLayerBuilder.h',
     'FramePropertyTable.h',

--- a/layout/inspector/moz.build
+++ b/layout/inspector/moz.build
@@ -14,18 +14,16 @@ XPIDL_SOURCES += [
     'inIDOMUtils.idl',
     'inIDOMView.idl',
     'inISearchObserver.idl',
     'inISearchProcess.idl',
     'nsIDOMFontFace.idl',
     'nsIDOMFontFaceList.idl',
 ]
 
-XPIDL_MODULE = 'inspector'
-
 EXPORTS += [
     'nsFontFace.h',
     'nsFontFaceList.h',
 ]
 
 UNIFIED_SOURCES += [
     'inCSSValueSearch.cpp',
     'inDeepTreeWalker.cpp',

--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -10,18 +10,16 @@ XPIDL_SOURCES += [
     'nsIPrintStatusFeedback.idl',
 ]
 
 EXPORTS.mozilla.layout += [
     'ipc/RemotePrintJobChild.h',
     'ipc/RemotePrintJobParent.h',
 ]
 
-XPIDL_MODULE = 'layout_printing'
-
 UNIFIED_SOURCES += [
     'ipc/RemotePrintJobChild.cpp',
     'ipc/RemotePrintJobParent.cpp',
     'nsPagePrintTimer.cpp',
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',

--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -21,18 +21,16 @@ with Files('nsDOM*'):
 
 DIRS += ['xbl-marquee']
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICSSUnprefixingService.idl',
 ]
 
-XPIDL_MODULE = 'layout_style'
-
 EXPORTS += [
     '!nsStyleStructList.h',
     'AnimationCommon.h',
     'CounterStyleManager.h',
     'nsAnimationManager.h',
     'nsComputedDOMStylePropertyList.h',
     'nsCSSAnonBoxes.h',
     'nsCSSAnonBoxList.h',

--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsILayoutDebuggingTools.idl',
     'nsILayoutRegressionTester.idl',
 ]
 
-XPIDL_MODULE = 'layout_debug'
-
 EXPORTS += [
     'nsLayoutDebugCIID.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',

--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -20,18 +20,16 @@ XPIDL_SOURCES += [
     'nsIBrowserBoxObject.idl',
     'nsIContainerBoxObject.idl',
     'nsIListBoxObject.idl',
     'nsIMenuBoxObject.idl',
     'nsIScrollBoxObject.idl',
     'nsISliderListener.idl',
 ]
 
-XPIDL_MODULE = 'layout_xul'
-
 EXPORTS += [
     'nsBox.h',
     'nsIScrollbarMediator.h',
     'nsPIBoxObject.h',
     'nsPIListBoxObject.h',
     'nsXULPopupManager.h',
 ]
 

--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -10,18 +10,16 @@ with Files('**'):
 XPIDL_SOURCES += [
     'nsITreeBoxObject.idl',
     'nsITreeColumns.idl',
     'nsITreeContentView.idl',
     'nsITreeSelection.idl',
     'nsITreeView.idl',
 ]
 
-XPIDL_MODULE = 'layout_xul_tree'
-
 EXPORTS += [
     'nsTreeColFrame.h',
     'nsTreeColumns.h',
     'nsTreeUtils.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'TreeBoxObject.h'

--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIShellService.idl',
 ]
 
-XPIDL_MODULE = 'browsercomps'
-
 EXPORTS += [
     'nsBrowserComponents.h',
 ]
 
 SOURCES += [
     'nsBrowserModule.cpp',
     'nsShellService.cpp',
 ]

--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
-XPIDL_MODULE = 'MobileComponents'
-
 EXTRA_COMPONENTS += [
     'AboutRedirector.js',
     'AddonUpdateService.js',
     'AndroidActivitiesGlue.js',
     'BlocklistPrompt.js',
     'BrowserCLH.js',
     'ColorPicker.js',
     'ContentDispatchChooser.js',

--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -15,18 +15,16 @@ XPCSHELL_TESTS_MANIFESTS += ['test/unit/
 
 XPIDL_SOURCES += [
     'nsIJARChannel.idl',
     'nsIJARProtocolHandler.idl',
     'nsIJARURI.idl',
     'nsIZipReader.idl',
 ]
 
-XPIDL_MODULE = 'jar'
-
 EXPORTS += [
     'nsJARURI.h',
     'nsZipArchive.h',
     'zipstruct.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsJARProtocolHandler.cpp',

--- a/modules/libjar/zipwriter/moz.build
+++ b/modules/libjar/zipwriter/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIZipWriter.idl',
 ]
 
-XPIDL_MODULE = 'zipwriter'
-
 UNIFIED_SOURCES += [
     'nsDeflateConverter.cpp',
     'nsZipDataStream.cpp',
     'nsZipHeader.cpp',
     'nsZipWriter.cpp',
     'StreamFunctions.cpp',
     'ZipWriterModule.cpp',
 ]

--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -13,18 +13,16 @@ XPIDL_SOURCES += [
     'nsIPrefBranch.idl',
     'nsIPrefBranch2.idl',
     'nsIPrefBranchInternal.idl',
     'nsIPrefLocalizedString.idl',
     'nsIPrefService.idl',
     'nsIRelativeFilePref.idl',
 ]
 
-XPIDL_MODULE = 'pref'
-
 EXPORTS.mozilla += [
     'Preferences.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsPrefBranch.cpp',
     'nsPrefsFactory.cpp',
     'Preferences.cpp',

--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -140,18 +140,16 @@ XPIDL_SOURCES += [
     'nsPISocketTransportService.idl',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     XPIDL_SOURCES += [
         'nsIBrowserSearchService.idl',
     ]
 
-XPIDL_MODULE = 'necko'
-
 EXPORTS += [
     'netCore.h',
     'nsASocketHandler.h',
     'nsAsyncRedirectVerifyHelper.h',
     'nsFileStreams.h',
     'nsInputStreamPump.h',
     'nsMIMEInputStream.h',
     'nsNetUtil.h',

--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -8,18 +8,16 @@ XPIDL_SOURCES += [
     'nsICache.idl',
     'nsICacheEntryDescriptor.idl',
     'nsICacheListener.idl',
     'nsICacheService.idl',
     'nsICacheSession.idl',
     'nsICacheVisitor.idl',
 ]
 
-XPIDL_MODULE = 'necko_cache'
-
 EXPORTS += [
     'nsApplicationCacheService.h',
     'nsCacheService.h',
     'nsDeleteDir.h'
 ]
 
 UNIFIED_SOURCES += [
     'nsApplicationCacheService.cpp',

--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -9,18 +9,16 @@ XPIDL_SOURCES += [
     'nsICacheEntryDoomCallback.idl',
     'nsICacheEntryOpenCallback.idl',
     'nsICacheStorage.idl',
     'nsICacheStorageService.idl',
     'nsICacheStorageVisitor.idl',
     'nsICacheTesting.idl',
 ]
 
-XPIDL_MODULE = 'necko_cache2'
-
 EXPORTS += [
     'CacheObserver.h',
     'CacheStorageService.h',
 ]
 
 UNIFIED_SOURCES += [
     'CacheEntry.cpp',
     'CacheFile.cpp',

--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -9,18 +9,16 @@ XPIDL_SOURCES += [
     'nsICookie.idl',
     'nsICookie2.idl',
     'nsICookieManager.idl',
     'nsICookieManager2.idl',
     'nsICookiePermission.idl',
     'nsICookieService.idl',
 ]
 
-XPIDL_MODULE = 'necko_cookie'
-
 if CONFIG['NECKO_COOKIES']:
     EXPORTS.mozilla.net = [
         'CookieServiceChild.h',
         'CookieServiceParent.h',
     ]
     UNIFIED_SOURCES += [
         'CookieServiceChild.cpp',
         'CookieServiceParent.cpp',

--- a/netwerk/dns/mdns/moz.build
+++ b/netwerk/dns/mdns/moz.build
@@ -5,9 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['libmdns']
 
 XPIDL_SOURCES += [
     'nsIDNSServiceDiscovery.idl',
 ]
 
-XPIDL_MODULE = 'necko_mdns'

--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -12,18 +12,16 @@ XPIDL_SOURCES += [
     'nsIDNSListener.idl',
     'nsIDNSRecord.idl',
     'nsIDNSService.idl',
     'nsIEffectiveTLDService.idl',
     'nsIIDNService.idl',
     'nsPIDNSService.idl',
 ]
 
-XPIDL_MODULE = 'necko_dns'
-
 EXPORTS.mozilla.net += [
     'ChildDNSService.h',
     'DNS.h',
     'DNSListenerProxy.h',
     'DNSRequestChild.h',
     'DNSRequestParent.h',
     'PDNSParams.h',
 ]

--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIRemoteOpenFileListener.idl',
 ]
 
-XPIDL_MODULE = 'necko_ipc'
-
 EXPORTS.mozilla.net += [
     'ChannelEventQueue.h',
     'NeckoChild.h',
     'NeckoCommon.h',
     'NeckoMessageUtils.h',
     'NeckoParent.h',
     'RemoteOpenFileChild.h',
     'RemoteOpenFileParent.h',

--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIMIMEHeaderParam.idl',
     'nsIMIMEInfo.idl',
     'nsIMIMEService.idl',
 ]
 
-XPIDL_MODULE = 'mimetype'
-
 EXPORTS += [
     'nsMimeTypes.h',
 ]
 
 SOURCES += [
     'nsMIMEHeaderParamImpl.cpp',
 ]
 

--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIAboutModule.idl',
 ]
 
-XPIDL_MODULE = 'necko_about'
-
 EXPORTS += [
     'nsAboutProtocolUtils.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsAboutBlank.cpp',
     'nsAboutBloat.cpp',
     'nsAboutCache.cpp',

--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -8,18 +8,16 @@ EXPORTS.mozilla.net += [
     'nsFileProtocolHandler.h',
 ]
 
 XPIDL_SOURCES += [
     'nsIFileChannel.idl',
     'nsIFileProtocolHandler.idl',
 ]
 
-XPIDL_MODULE = 'necko_file'
-
 UNIFIED_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [

--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIFTPChannel.idl',
 ]
 
-XPIDL_MODULE = 'necko_ftp'
-
 EXPORTS += [
     'ftpCore.h',
 ]
 
 EXPORTS.mozilla.net += [
     'FTPChannelChild.h',
     'FTPChannelParent.h',
 ]

--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -13,18 +13,16 @@ XPIDL_SOURCES += [
     'nsIHttpChannelAuthProvider.idl',
     'nsIHttpChannelChild.idl',
     'nsIHttpChannelInternal.idl',
     'nsIHttpEventSink.idl',
     'nsIHttpHeaderVisitor.idl',
     'nsIHttpProtocolHandler.idl',
 ]
 
-XPIDL_MODULE = 'necko_http'
-
 EXPORTS += [
     'nsCORSListenerProxy.h',
     'nsHttp.h',
     'nsHttpAtomList.h',
     'nsHttpHeaderArray.h',
     'nsHttpRequestHead.h',
     'nsHttpResponseHead.h',
 ]

--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIResProtocolHandler.idl',
     'nsISubstitutingProtocolHandler.idl',
 ]
 
-XPIDL_MODULE = 'necko_res'
-
 UNIFIED_SOURCES += [
     'ExtensionProtocolHandler.cpp',
     'nsResProtocolHandler.cpp',
     'SubstitutingProtocolHandler.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 

--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIViewSourceChannel.idl',
 ]
 
-XPIDL_MODULE = 'necko_viewsource'
-
 UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wshadow']
 

--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIWebSocketChannel.idl',
     'nsIWebSocketEventService.idl',
     'nsIWebSocketListener.idl',
 ]
 
-XPIDL_MODULE = 'necko_websocket'
-
 EXPORTS.mozilla.net += [
     'BaseWebSocketChannel.h',
     'WebSocketChannel.h',
     'WebSocketChannelChild.h',
     'WebSocketChannelParent.h',
     'WebSocketEventListenerChild.h',
     'WebSocketEventListenerParent.h',
     'WebSocketEventService.h',

--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIWyciwygChannel.idl',
 ]
 
-XPIDL_MODULE = 'necko_wyciwyg'
-
 EXPORTS.mozilla.net += [
     'WyciwygChannelChild.h',
     'WyciwygChannelParent.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsWyciwyg.cpp',
     'nsWyciwygChannel.cpp',

--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -7,18 +7,16 @@
 XPIDL_SOURCES += [
     'nsISocketProvider.idl',
     'nsISocketProviderService.idl',
     'nsISOCKSSocketInfo.idl',
     'nsISSLSocketControl.idl',
     'nsITransportSecurityInfo.idl',
 ]
 
-XPIDL_MODULE = 'necko_socket'
-
 UNIFIED_SOURCES += [
     'nsSocketProviderService.cpp',
     'nsSOCKSIOLayer.cpp',
     'nsSOCKSSocketProvider.cpp',
     'nsUDPSocketProvider.cpp',
 ]
 
 if CONFIG['GNU_CXX']:

--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsICompressConvStats.idl'
 ]
 
-XPIDL_MODULE = 'necko_streamconv_converters'
-
 UNIFIED_SOURCES += [
     'mozTXTToHTMLConv.cpp',
     'nsDirIndex.cpp',
     'nsDirIndexParser.cpp',
     'nsHTTPCompressConv.cpp',
     'nsIndexedToHTML.cpp',
     'nsMultiMixedConv.cpp',
     'nsTXTToHTMLConv.cpp',

--- a/netwerk/streamconv/moz.build
+++ b/netwerk/streamconv/moz.build
@@ -15,14 +15,12 @@ XPIDL_SOURCES += [
     'nsIStreamConverterService.idl',
     'nsITXTToHTMLConv.idl',
 ]
 
 SOURCES += [
     'nsStreamConverterService.cpp',
 ]
 
-XPIDL_MODULE = 'necko_strconv'
-
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wshadow']

--- a/netwerk/test/httpserver/moz.build
+++ b/netwerk/test/httpserver/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIHttpServer.idl',
 ]
 
-XPIDL_MODULE = 'test_necko'
-
 # Don't add our test-only .xpt files to the normal manifests
 XPIDL_NO_MANIFEST = True
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
 EXTRA_COMPONENTS += [
     'httpd.js',
     'httpd.manifest',

--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIWifiAccessPoint.idl',
     'nsIWifiListener.idl',
     'nsIWifiMonitor.idl',
 ]
 
-XPIDL_MODULE = 'necko_wifi'
-
 UNIFIED_SOURCES += [
     'nsWifiAccessPoint.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     UNIFIED_SOURCES += [
         'nsWifiMonitorGonk.cpp',
     ]

--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIParserUtils.idl',
     'nsIScriptableUnescapeHTML.idl',
 ]
 
-XPIDL_MODULE = 'html5'
-
 EXPORTS += [
     'jArray.h',
     'nsAHtml5TreeBuilderState.h',
     'nsAHtml5TreeOpSink.h',
     'nsHtml5ArrayCopy.h',
     'nsHtml5AtomList.h',
     'nsHtml5Atoms.h',
     'nsHtml5AtomTable.h',

--- a/parser/htmlparser/moz.build
+++ b/parser/htmlparser/moz.build
@@ -7,18 +7,16 @@
 MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
 BROWSER_CHROME_MANIFESTS += ['tests/mochitest/browser.ini']
 
 XPIDL_SOURCES += [
     'nsIExpatSink.idl',
     'nsIExtendedExpatSink.idl',
 ]
 
-XPIDL_MODULE = 'htmlparser'
-
 EXPORTS += [
     'nsHTMLTagList.h',
     'nsHTMLTags.h',
     'nsIContentSink.h',
     'nsIDTD.h',
     'nsIFragmentContentSink.h',
     'nsIHTMLContentSink.h',
     'nsIParser.h',

--- a/parser/xml/moz.build
+++ b/parser/xml/moz.build
@@ -14,18 +14,16 @@ XPIDL_SOURCES += [
     'nsISAXErrorHandler.idl',
     'nsISAXLexicalHandler.idl',
     'nsISAXLocator.idl',
     'nsISAXMutableAttributes.idl',
     'nsISAXXMLFilter.idl',
     'nsISAXXMLReader.idl',
 ]
 
-XPIDL_MODULE = 'saxparser'
-
 EXPORTS += [
     'nsSAXAttributes.h',
     'nsSAXLocator.h',
     'nsSAXXMLReader.h',
 ]
 
 SOURCES += [
     'nsSAXAttributes.cpp',

--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -131,17 +131,16 @@ MOZBUILD_VARIABLES = [
     b'SIMPLE_PROGRAMS',
     b'SONAME',
     b'STATIC_LIBRARY_NAME',
     b'TEST_DIRS',
     b'TOOL_DIRS',
     # XXX config/Makefile.in specifies this in a make invocation
     #'USE_EXTENSION_MANIFEST',
     b'XPCSHELL_TESTS',
-    b'XPIDL_MODULE',
 ]
 
 DEPRECATED_VARIABLES = [
     b'ANDROID_RESFILES',
     b'EXPORT_LIBRARY',
     b'EXTRA_LIBS',
     b'HOST_LIBS',
     b'LIBXUL_LIBRARY',

--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1413,24 +1413,16 @@ VARIABLES = {
     'XPIDL_SOURCES': (StrictOrderingOnAppendList, list,
         """XPCOM Interface Definition Files (xpidl).
 
         This is a list of files that define XPCOM interface definitions.
         Entries must be files that exist. Entries are almost certainly ``.idl``
         files.
         """),
 
-    'XPIDL_MODULE': (unicode, unicode,
-        """XPCOM Interface Definition Module Name.
-
-        This is the name of the ``.xpt`` file that is created by linking
-        ``XPIDL_SOURCES`` together. If unspecified, it defaults to be the same
-        as ``MODULE``.
-        """),
-
     'XPIDL_NO_MANIFEST': (bool, bool,
         """Indicate that the XPIDL module should not be added to a manifest.
 
         This flag exists primarily to prevent test-only XPIDL modules from being
         added to the application's chrome manifest. Most XPIDL modules should
         not use this flag.
         """),
 

--- a/python/mozbuild/mozbuild/test/backend/data/xpidl/interfaces/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/xpidl/interfaces/moz.build
@@ -1,6 +1,5 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-XPIDL_MODULE = 'my_module'
 XPIDL_SOURCES = ['bar.idl', 'foo.idl']

--- a/rdf/base/moz.build
+++ b/rdf/base/moz.build
@@ -24,18 +24,16 @@ XPIDL_SOURCES += [
     'nsIRDFXMLSerializer.idl',
     'nsIRDFXMLSink.idl',
     'nsIRDFXMLSource.idl',
     'rdfIDataSource.idl',
     'rdfISerializer.idl',
     'rdfITripleVisitor.idl',
 ]
 
-XPIDL_MODULE = 'rdf'
-
 EXPORTS += [
     'nsIRDFContentSink.h',
     'rdf.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsCompositeDataSource.cpp',
     'nsContainerEnumerator.cpp',