Bug 990855 part.2 Remove dom/events from local includes of moz.build files r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 03 Apr 2014 13:18:38 +0900
changeset 176830 145bb26f61802a02ba2344991e27cf82014ad2b3
parent 176829 0e798623921458627aa0f1b64447e8e1c77543ed
child 176831 c064b7930598cd0e0ec97c397617c18a0c815092
push id41854
push usermasayuki@d-toybox.com
push dateThu, 03 Apr 2014 04:18:46 +0000
treeherdermozilla-inbound@145bb26f6180 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs990855
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 990855 part.2 Remove dom/events from local includes of moz.build files r=smaug
accessible/src/windows/msaa/moz.build
content/base/src/moz.build
content/html/content/src/moz.build
content/html/document/src/moz.build
content/svg/content/src/moz.build
content/svg/document/src/moz.build
content/xml/document/src/moz.build
content/xul/content/src/moz.build
content/xul/document/src/moz.build
dom/battery/moz.build
dom/bindings/moz.build
dom/devicestorage/moz.build
dom/icc/src/moz.build
dom/indexedDB/ipc/moz.build
dom/indexedDB/moz.build
dom/ipc/moz.build
dom/mobileconnection/src/moz.build
dom/network/src/moz.build
dom/smil/moz.build
dom/src/geolocation/moz.build
dom/src/notification/moz.build
dom/src/offline/moz.build
dom/src/storage/moz.build
dom/system/android/moz.build
dom/system/gonk/moz.build
dom/system/moz.build
dom/system/windows/moz.build
dom/workers/moz.build
dom/xbl/moz.build
editor/libeditor/base/moz.build
editor/libeditor/text/moz.build
gfx/layers/moz.build
js/xpconnect/src/moz.build
layout/base/moz.build
layout/build/moz.build
layout/xul/moz.build
layout/xul/tree/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/websocket/moz.build
netwerk/sctp/src/moz.build
uriloader/exthandler/moz.build
uriloader/prefetch/moz.build
view/src/moz.build
widget/android/moz.build
widget/gonk/moz.build
widget/windows/moz.build
widget/xpwidgets/moz.build
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -41,17 +41,16 @@ if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '../../../../content/base/src',
-    '../../../../dom/events',
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../ia2',
     '../sdn',
     '../uia',
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -208,17 +208,16 @@ LOCAL_INCLUDES += [
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
-    '/dom/events',
     '/dom/ipc',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -167,17 +167,16 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
-    '/dom/events',
     '/dom/xbl',
     '/editor/libeditor/base',
     '/editor/libeditor/text',
     '/editor/txmgr/src',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -32,13 +32,12 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
     '/caps/include',
     '/content/base/src',
     '/docshell/base',
     '/dom/base',
-    '/dom/events',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -250,17 +250,16 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/xml/content/src',
     '/dom',
-    '/dom/events',
     '/dom/smil',
     '/dom/xbl',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
     '/layout/xul',
 ]
 
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -14,13 +14,12 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xml/document/src',
-    '/dom/events',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -20,13 +20,12 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/html/document/src',
     '/content/xul/content/src',
     '/dom/base',
-    '/dom/events',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -17,16 +17,15 @@ FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../document/src',
     '../../templates/src',
     '/content/base/src',
     '/content/html/content/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
-    '/dom/events',
     '/dom/xbl',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -23,17 +23,16 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/base',
-    '/dom/events',
     '/dom/xbl',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -15,12 +15,8 @@ SOURCES += [
     'BatteryManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
-LOCAL_INCLUDES += [
-    '/dom/events',
-]
-
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -47,17 +47,16 @@ LOCAL_INCLUDES += [
     '/content/svg/content/src',
     '/content/xml/content/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
-    '/dom/events',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
     '/js/ipc',
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -28,17 +28,16 @@ IPDL_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
-    '/dom/events',
     '/dom/ipc',
 ]
 
 MOCHITEST_MANIFESTS += [
     'ipc/mochitest.ini',
     'test/mochitest.ini',
 ]
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -18,11 +18,10 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '../../system/gonk',
-    '/dom/events',
 ]
 
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -31,12 +31,11 @@ IPDL_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/dom/events',
     '/dom/indexedDB',
 ]
 
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -70,14 +70,13 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/db/sqlite3/src',
     '/dom/base',
-    '/dom/events',
     '/dom/quota',
     '/dom/src/storage',
     '/xpcom/build',
 ]
 
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -98,17 +98,16 @@ LOCAL_INCLUDES += [
     '/chrome/src',
     '/content/base/src',
     '/content/media/webspeech/synth/ipc',
     '/docshell/base',
     '/dom/base',
     '/dom/bluetooth',
     '/dom/bluetooth/ipc',
     '/dom/devicestorage',
-    '/dom/events',
     '/dom/filesystem',
     '/dom/fmradio/ipc',
     '/dom/indexedDB',
     '/dom/indexedDB/ipc',
     '/dom/mobilemessage/src/ipc',
     '/extensions/cookie',
     '/hal/sandbox',
     '/js/ipc',
--- a/dom/mobileconnection/src/moz.build
+++ b/dom/mobileconnection/src/moz.build
@@ -14,12 +14,8 @@ SOURCES += [
     'MobileConnectionArray.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
-
-LOCAL_INCLUDES += [
-    '/dom/events',
-]
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -62,12 +62,8 @@ IPDL_SOURCES += [
     'PUDPSocket.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
-
-LOCAL_INCLUDES += [
-    '/dom/events',
-]
--- a/dom/smil/moz.build
+++ b/dom/smil/moz.build
@@ -62,13 +62,12 @@ UNIFIED_SOURCES += [
     'TimeEvent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/svg/content/src',
-    '/dom/events',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -17,17 +17,16 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
-    '/dom/events',
     '/dom/ipc',
 ]
 
 if CONFIG['MOZ_ENABLE_QT5GEOPOSITION']:
     LOCAL_INCLUDES += [
         '/dom/system/qt',
     ]
 
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -26,12 +26,11 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
-    '/dom/events',
     '/dom/ipc',
 ]
 
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -11,12 +11,11 @@ UNIFIED_SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/content/base/src",
     "/dom/base",
-    "/dom/events",
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -25,13 +25,12 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/base',
-    '/dom/events',
 ]
 
 if CONFIG['ENABLE_TESTS']:
     DEFINES['DOM_STORAGE_TESTS'] = True
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -10,12 +10,11 @@ SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/dom/events',
     '/dom/src/geolocation',
 ]
 
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -104,15 +104,14 @@ if CONFIG['MOZ_NFC']:
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/bluetooth',
-    '/dom/events',
     '/dom/nfc',
     '/dom/src/geolocation',
     '/dom/wifi',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -47,14 +47,13 @@ FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/bindings',
-    '/dom/events',
     '/js/xpconnect/loader',
 ]
 
 DEFINES['DLL_PREFIX'] = '"%s"' % CONFIG['DLL_PREFIX']
 DEFINES['DLL_SUFFIX'] = '"%s"' % CONFIG['DLL_SUFFIX']
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -3,16 +3,11 @@
 # 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/.
 
 SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
-# We fire the nsDOMDeviceAcceleration
-LOCAL_INCLUDES += [
-    '/dom/events',
-]
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -53,16 +53,15 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../system',
     '/content/base/src',
-    '/dom/events',
     '/xpcom/build',
     '/xpcom/threads',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -43,13 +43,12 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
-    '/dom/events',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -31,15 +31,14 @@ UNIFIED_SOURCES += [
     'SplitElementTxn.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../text',
     '/content/base/src',
-    '/dom/events',
     '/editor/txmgr/src',
     '/extensions/spellcheck/src',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -13,17 +13,16 @@ UNIFIED_SOURCES += [
     'nsTextEditUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '/content/base/src',
-    '/dom/events',
     '/editor/txmgr/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -331,20 +331,16 @@ IPDL_SOURCES = [
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'thebes'
 
-LOCAL_INCLUDES += [
-    '/dom/events',
-]
-
 if CONFIG['MOZ_DEBUG']:
     DEFINES['D3D_DEBUG_INFO'] = True
 
 if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
     DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True
 
 GENERATED_FILES = [
     'PremultiplyTables.h',
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -83,17 +83,16 @@ LOCAL_INCLUDES += [
     '../wrappers',
     '/caps/include',
     '/content/base/public',
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/dom/base',
-    '/dom/events',
     '/dom/workers',
     '/js/ipc',
     '/layout/base',
     '/layout/style',
 ]
 
 if CONFIG['MOZ_B2G_BT']:
     LOCAL_INCLUDES += [
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -125,17 +125,16 @@ LOCAL_INCLUDES += [
     '../printing',
     '../style',
     '../svg',
     '../tables',
     '../xul',
     '../xul/tree/',
     '/docshell/base',
     '/dom/base',
-    '/dom/events',
     '/dom/xbl',
 ]
 
 FINAL_LIBRARY = 'gklayout'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -46,17 +46,16 @@ LOCAL_INCLUDES += [
     '/content/svg/content/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
-    '/dom/events',
     '/dom/file',
     '/dom/filesystem',
     '/dom/media',
     '/dom/speakermanager',
     '/dom/src/geolocation',
     '/dom/src/json',
     '/dom/src/jsurl',
     '/dom/src/offline',
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -86,11 +86,10 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../style',
     '/content/base/src',
-    '/dom/events',
 ]
 
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -36,11 +36,10 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '..',
     '../../base',
     '../../forms',
     '../../generic',
     '../../style',
     '/content/base/src',
-    '/dom/events',
 ]
 
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -100,10 +100,9 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/dom/events',
 ]
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -50,17 +50,16 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'necko'
 
 DEFINES['IMPL_NS_NET'] = True
 DEFINES['FORCE_PR_LOG'] = True
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/dom/events',
     'controller',
     'rtsp',
 ]
 
 for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
     DEFINES[var] = True
 
 if CONFIG['ANDROID_VERSION'] == '15':
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -37,10 +37,9 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/dom/events',
 ]
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -44,17 +44,16 @@ LIBRARY_NAME = 'nksctp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/dom/events',
 ]
 
 for var in ('SCTP_SIMPLE_ALLOCATOR',
             'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
             'CALLBACK_API', 'SCTP_DEBUG'):
     DEFINES[var] = 1
 
 # Android NDK r5c, used on the builders at the time of this writing, doesn't
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -136,14 +136,13 @@ FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
-    '/dom/events',
     '/dom/ipc',
     '/netwerk/base/src',
     '/netwerk/protocol/http',
 ]
 
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -40,11 +40,10 @@ IPDL_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/dom/events',
 ]
 
--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -11,15 +11,11 @@ SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 
-LOCAL_INCLUDES += [
-    '/dom/events/',
-]
-
 if CONFIG['GNU_CC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     # Work around bug 986928
     CXXFLAGS += ['-Wno-error=format']
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -44,17 +44,16 @@ FAIL_ON_WARNINGS = True
 LIBRARY_NAME = 'widget_android'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/docshell/base',
-    '/dom/events',
     '/dom/system/android',
     '/netwerk/cache',
     '/widget/android/android',
     '/widget/shared',
     '/widget/xpwidgets',
 ]
 
 #DEFINES['DEBUG_WIDGETS'] = True
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -64,17 +64,16 @@ SOURCES += [
 LIBRARY_NAME = 'widget_gonk'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/content/media/omx/mediaresourcemanager',
-    '/dom/events',
     '/dom/system/android',
     '/gfx/skia/trunk/include/config',
     '/gfx/skia/trunk/include/core',
     '/widget/shared',
     '/widget/xpwidgets',
 ]
 
 DEFINES['HAVE_OFF64_T'] = True
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -95,17 +95,16 @@ LIBRARY_NAME = 'widget_windows'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
     '../xpwidgets',
-    '/dom/events',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
     '/xpcom/base',
 ]
 
 DEFINES['MOZ_UNICODE'] = True
 
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -74,17 +74,16 @@ if not CONFIG['MOZ_B2G']:
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpwidgets_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../shared',
-    '/dom/events',
     '/layout/base',
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
     '/view/src',
 ]
 
 widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']