Issue %3005 - Move widget/ to system/interface

458 files changed, 18 insertions, 18 deletions

diff --git a/dom/base/moz.build b/dom/base/moz.build
index a1f456036..ab0568b3e 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -452,7 +452,7 @@ LOCAL_INCLUDES += [
     '/security/manager/ssl',
     '/system/docshell/base',
     '/system/graphics/2d',
-    '/widget',
+    '/system/interface',
     '/xpcom/ds',
 ]
 
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index abbd31ba0..72f4ed051 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -120,8 +120,8 @@ LOCAL_INCLUDES += [
     '/netwerk/base',
     '/system/docshell/base',
     '/system/graphics/2d',
+    '/system/interface',
     '/system/runtime',
-    '/widget',
     '/xpcom/base',
     '/xpcom/threads',
 ]
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index 11649a862..bc421e280 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -76,7 +76,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/xul',
     '/netwerk/base',
-    '/widget',
+    '/system/interface',
     '/xpcom/base',
 ]
 
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
index 00f9a4712..59f13f83e 100644
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -49,7 +49,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
     DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
     LOCAL_INCLUDES += [
-        '/widget',
+        '/system/interface',
         'hangui',
     ]
 
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 2da3dd9f6..46723d1e0 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -65,7 +65,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     LOCAL_INCLUDES += [
-        '/widget/gtk',
+        '/system/interface/gtk',
     ]
 
 if CONFIG['MOZ_WEBSPEECH']:
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 48f20f2d5..12b42e78f 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -364,7 +364,7 @@ include web-animations/reftest.list
 include webcomponents/reftest.list
 
 # widget/
-include ../../widget/reftests/reftest.list
+include ../../system/interface/reftests/reftest.list
 
 # xml-stylesheet/
 include ../../dom/tests/reftest/xml-stylesheet/reftest.list
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index 0def568b0..e079a7a7d 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -61,13 +61,13 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../widget',
     '../base',
     '../generic',
     '../style',
     '../xul',
     '/dom/base',
     '/dom/svg',
+    '/system/interface',
 ]
 
 RESOURCE_FILES += [
diff --git a/system/evil/moz.build b/system/evil/moz.build
index 36c323459..67a98cfe6 100644
--- a/system/evil/moz.build
+++ b/system/evil/moz.build
@@ -37,7 +37,7 @@ def Libxul(name):
 
     if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
         LOCAL_INCLUDES += [
-            '/widget/windows',
+            '/system/interface/windows',
             '/xpcom/base',
         ]
         # config/version.mk says $(srcdir)/$(RCINCLUDE), and this needs to
@@ -79,7 +79,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 LOCAL_INCLUDES += [
     '/config',
     # need widget/windows for resource.h (included from widget.rc)
-    '/widget/windows',
+    '/system/interface/windows',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
diff --git a/widget/BasicEvents.h b/system/interface/BasicEvents.h
index 0ce0f587d..0ce0f587d 100644
--- a/widget/BasicEvents.h
+++ b/system/interface/BasicEvents.h
diff --git a/widget/CommandList.h b/system/interface/CommandList.h
index 2bd327c86..2bd327c86 100644
--- a/widget/CommandList.h
+++ b/system/interface/CommandList.h
diff --git a/widget/CompositorWidget.cpp b/system/interface/CompositorWidget.cpp
index 2cdf8010a..2cdf8010a 100644
--- a/widget/CompositorWidget.cpp
+++ b/system/interface/CompositorWidget.cpp
diff --git a/widget/CompositorWidget.h b/system/interface/CompositorWidget.h
index 829255b62..829255b62 100644
--- a/widget/CompositorWidget.h
+++ b/system/interface/CompositorWidget.h
diff --git a/widget/ContentCache.cpp b/system/interface/ContentCache.cpp
index 52d62d588..52d62d588 100644
--- a/widget/ContentCache.cpp
+++ b/system/interface/ContentCache.cpp
diff --git a/widget/ContentCache.h b/system/interface/ContentCache.h
index 77a9d5617..77a9d5617 100644
--- a/widget/ContentCache.h
+++ b/system/interface/ContentCache.h
diff --git a/widget/ContentEvents.h b/system/interface/ContentEvents.h
index 09d4d9928..09d4d9928 100644
--- a/widget/ContentEvents.h
+++ b/system/interface/ContentEvents.h
diff --git a/widget/EventClassList.h b/system/interface/EventClassList.h
index 9667a72c5..9667a72c5 100644
--- a/widget/EventClassList.h
+++ b/system/interface/EventClassList.h
diff --git a/widget/EventForwards.h b/system/interface/EventForwards.h
index 4efac5498..4efac5498 100644
--- a/widget/EventForwards.h
+++ b/system/interface/EventForwards.h
diff --git a/widget/EventMessageList.h b/system/interface/EventMessageList.h
index 7ff16c484..7ff16c484 100644
--- a/widget/EventMessageList.h
+++ b/system/interface/EventMessageList.h
diff --git a/widget/FontRange.h b/system/interface/FontRange.h
index ef7b601e9..ef7b601e9 100644
--- a/widget/FontRange.h
+++ b/system/interface/FontRange.h
diff --git a/widget/GfxDriverInfo.cpp b/system/interface/GfxDriverInfo.cpp
index 6f9a74a4f..6f9a74a4f 100644
--- a/widget/GfxDriverInfo.cpp
+++ b/system/interface/GfxDriverInfo.cpp
diff --git a/widget/GfxDriverInfo.h b/system/interface/GfxDriverInfo.h
index ad4337b0f..ad4337b0f 100644
--- a/widget/GfxDriverInfo.h
+++ b/system/interface/GfxDriverInfo.h
diff --git a/widget/GfxInfoBase.cpp b/system/interface/GfxInfoBase.cpp
index d68cfc07f..d68cfc07f 100644
--- a/widget/GfxInfoBase.cpp
+++ b/system/interface/GfxInfoBase.cpp
diff --git a/widget/GfxInfoBase.h b/system/interface/GfxInfoBase.h
index 5bc23f762..5bc23f762 100644
--- a/widget/GfxInfoBase.h
+++ b/system/interface/GfxInfoBase.h
diff --git a/widget/GfxInfoCollector.cpp b/system/interface/GfxInfoCollector.cpp
index 59c842a77..59c842a77 100644
--- a/widget/GfxInfoCollector.cpp
+++ b/system/interface/GfxInfoCollector.cpp
diff --git a/widget/GfxInfoCollector.h b/system/interface/GfxInfoCollector.h
index 9436b2333..9436b2333 100644
--- a/widget/GfxInfoCollector.h
+++ b/system/interface/GfxInfoCollector.h
diff --git a/widget/GfxInfoWebGL.cpp b/system/interface/GfxInfoWebGL.cpp
index 6583ee475..6583ee475 100644
--- a/widget/GfxInfoWebGL.cpp
+++ b/system/interface/GfxInfoWebGL.cpp
diff --git a/widget/GfxInfoWebGL.h b/system/interface/GfxInfoWebGL.h
index f18be14f0..f18be14f0 100644
--- a/widget/GfxInfoWebGL.h
+++ b/system/interface/GfxInfoWebGL.h
diff --git a/widget/GfxInfoX11.cpp b/system/interface/GfxInfoX11.cpp
index 9a5065eb6..9a5065eb6 100644
--- a/widget/GfxInfoX11.cpp
+++ b/system/interface/GfxInfoX11.cpp
diff --git a/widget/GfxInfoX11.h b/system/interface/GfxInfoX11.h
index 0fd036f46..0fd036f46 100644
--- a/widget/GfxInfoX11.h
+++ b/system/interface/GfxInfoX11.h
diff --git a/widget/IMEData.h b/system/interface/IMEData.h
index ff458e447..ff458e447 100644
--- a/widget/IMEData.h
+++ b/system/interface/IMEData.h
diff --git a/widget/InProcessCompositorWidget.cpp b/system/interface/InProcessCompositorWidget.cpp
index df7250d9f..df7250d9f 100644
--- a/widget/InProcessCompositorWidget.cpp
+++ b/system/interface/InProcessCompositorWidget.cpp
diff --git a/widget/InProcessCompositorWidget.h b/system/interface/InProcessCompositorWidget.h
index ae9e51b3b..ae9e51b3b 100644
--- a/widget/InProcessCompositorWidget.h
+++ b/system/interface/InProcessCompositorWidget.h
diff --git a/widget/InputData.cpp b/system/interface/InputData.cpp
index 70072778d..70072778d 100644
--- a/widget/InputData.cpp
+++ b/system/interface/InputData.cpp
diff --git a/widget/InputData.h b/system/interface/InputData.h
index 347653e97..347653e97 100644
--- a/widget/InputData.h
+++ b/system/interface/InputData.h
diff --git a/widget/LSBUtils.cpp b/system/interface/LSBUtils.cpp
index fdb954425..fdb954425 100644
--- a/widget/LSBUtils.cpp
+++ b/system/interface/LSBUtils.cpp
diff --git a/widget/LSBUtils.h b/system/interface/LSBUtils.h
index 1f1614936..1f1614936 100644
--- a/widget/LSBUtils.h
+++ b/system/interface/LSBUtils.h
diff --git a/widget/LookAndFeel.h b/system/interface/LookAndFeel.h
index 226aa0d61..226aa0d61 100644
--- a/widget/LookAndFeel.h
+++ b/system/interface/LookAndFeel.h
diff --git a/widget/MiscEvents.h b/system/interface/MiscEvents.h
index 2ef581d79..2ef581d79 100644
--- a/widget/MiscEvents.h
+++ b/system/interface/MiscEvents.h
diff --git a/widget/MouseEvents.h b/system/interface/MouseEvents.h
index 4b8ff44ce..4b8ff44ce 100644
--- a/widget/MouseEvents.h
+++ b/system/interface/MouseEvents.h
diff --git a/widget/NativeKeyToDOMCodeName.h b/system/interface/NativeKeyToDOMCodeName.h
index 05bcd3bab..05bcd3bab 100644
--- a/widget/NativeKeyToDOMCodeName.h
+++ b/system/interface/NativeKeyToDOMCodeName.h
diff --git a/widget/NativeKeyToDOMKeyName.h b/system/interface/NativeKeyToDOMKeyName.h
index 45400e956..45400e956 100644
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/system/interface/NativeKeyToDOMKeyName.h
diff --git a/widget/PCompositorWidget.ipdl b/system/interface/PCompositorWidget.ipdl
index 4c83d92fa..4c83d92fa 100644
--- a/widget/PCompositorWidget.ipdl
+++ b/system/interface/PCompositorWidget.ipdl
diff --git a/widget/PlatformWidgetTypes.ipdlh b/system/interface/PlatformWidgetTypes.ipdlh
index af2579155..af2579155 100644
--- a/widget/PlatformWidgetTypes.ipdlh
+++ b/system/interface/PlatformWidgetTypes.ipdlh
diff --git a/widget/PluginWidgetProxy.cpp b/system/interface/PluginWidgetProxy.cpp
index 679bf29e3..679bf29e3 100644
--- a/widget/PluginWidgetProxy.cpp
+++ b/system/interface/PluginWidgetProxy.cpp
diff --git a/widget/PluginWidgetProxy.h b/system/interface/PluginWidgetProxy.h
index 3fb86a516..3fb86a516 100644
--- a/widget/PluginWidgetProxy.h
+++ b/system/interface/PluginWidgetProxy.h
diff --git a/widget/PuppetBidiKeyboard.cpp b/system/interface/PuppetBidiKeyboard.cpp
index 94d371631..94d371631 100644
--- a/widget/PuppetBidiKeyboard.cpp
+++ b/system/interface/PuppetBidiKeyboard.cpp
diff --git a/widget/PuppetBidiKeyboard.h b/system/interface/PuppetBidiKeyboard.h
index 403b3248a..403b3248a 100644
--- a/widget/PuppetBidiKeyboard.h
+++ b/system/interface/PuppetBidiKeyboard.h
diff --git a/widget/PuppetWidget.cpp b/system/interface/PuppetWidget.cpp
index 657f70551..657f70551 100644
--- a/widget/PuppetWidget.cpp
+++ b/system/interface/PuppetWidget.cpp
diff --git a/widget/PuppetWidget.h b/system/interface/PuppetWidget.h
index 5d0581356..5d0581356 100644
--- a/widget/PuppetWidget.h
+++ b/system/interface/PuppetWidget.h
diff --git a/widget/ScreenProxy.cpp b/system/interface/ScreenProxy.cpp
index d8abbad01..d8abbad01 100644
--- a/widget/ScreenProxy.cpp
+++ b/system/interface/ScreenProxy.cpp
diff --git a/widget/ScreenProxy.h b/system/interface/ScreenProxy.h
index 6fa1283ca..6fa1283ca 100644
--- a/widget/ScreenProxy.h
+++ b/system/interface/ScreenProxy.h
diff --git a/widget/SharedWidgetUtils.cpp b/system/interface/SharedWidgetUtils.cpp
index ab3513fc5..ab3513fc5 100644
--- a/widget/SharedWidgetUtils.cpp
+++ b/system/interface/SharedWidgetUtils.cpp
diff --git a/widget/SystemTimeConverter.h b/system/interface/SystemTimeConverter.h
index 5eb201fc8..5eb201fc8 100644
--- a/widget/SystemTimeConverter.h
+++ b/system/interface/SystemTimeConverter.h
diff --git a/widget/TextEventDispatcher.cpp b/system/interface/TextEventDispatcher.cpp
index 6c54376a4..6c54376a4 100644
--- a/widget/TextEventDispatcher.cpp
+++ b/system/interface/TextEventDispatcher.cpp
diff --git a/widget/TextEventDispatcher.h b/system/interface/TextEventDispatcher.h
index 1bed15a3b..1bed15a3b 100644
--- a/widget/TextEventDispatcher.h
+++ b/system/interface/TextEventDispatcher.h
diff --git a/widget/TextEventDispatcherListener.h b/system/interface/TextEventDispatcherListener.h
index 52634fc6e..52634fc6e 100644
--- a/widget/TextEventDispatcherListener.h
+++ b/system/interface/TextEventDispatcherListener.h
diff --git a/widget/TextEvents.h b/system/interface/TextEvents.h
index 736effeea..736effeea 100644
--- a/widget/TextEvents.h
+++ b/system/interface/TextEvents.h
diff --git a/widget/TextRange.h b/system/interface/TextRange.h
index 7934e9e23..7934e9e23 100644
--- a/widget/TextRange.h
+++ b/system/interface/TextRange.h
diff --git a/widget/TouchEvents.h b/system/interface/TouchEvents.h
index 8bc18a963..8bc18a963 100644
--- a/widget/TouchEvents.h
+++ b/system/interface/TouchEvents.h
diff --git a/widget/VsyncDispatcher.cpp b/system/interface/VsyncDispatcher.cpp
index 7bb32b89b..7bb32b89b 100644
--- a/widget/VsyncDispatcher.cpp
+++ b/system/interface/VsyncDispatcher.cpp
diff --git a/widget/VsyncDispatcher.h b/system/interface/VsyncDispatcher.h
index 8850952ac..8850952ac 100644
--- a/widget/VsyncDispatcher.h
+++ b/system/interface/VsyncDispatcher.h
diff --git a/widget/WidgetEventImpl.cpp b/system/interface/WidgetEventImpl.cpp
index 1302c3e94..1302c3e94 100644
--- a/widget/WidgetEventImpl.cpp
+++ b/system/interface/WidgetEventImpl.cpp
diff --git a/widget/WidgetMessageUtils.h b/system/interface/WidgetMessageUtils.h
index 8ab831a20..8ab831a20 100644
--- a/widget/WidgetMessageUtils.h
+++ b/system/interface/WidgetMessageUtils.h
diff --git a/widget/WidgetTraceEvent.h b/system/interface/WidgetTraceEvent.h
index d6e8f2c97..d6e8f2c97 100644
--- a/widget/WidgetTraceEvent.h
+++ b/system/interface/WidgetTraceEvent.h
diff --git a/widget/WidgetUtils.cpp b/system/interface/WidgetUtils.cpp
index 4352f837c..4352f837c 100644
--- a/widget/WidgetUtils.cpp
+++ b/system/interface/WidgetUtils.cpp
diff --git a/widget/WidgetUtils.h b/system/interface/WidgetUtils.h
index c61873e47..c61873e47 100644
--- a/widget/WidgetUtils.h
+++ b/system/interface/WidgetUtils.h
diff --git a/widget/WindowSurface.h b/system/interface/WindowSurface.h
index 3c6ed923e..3c6ed923e 100644
--- a/widget/WindowSurface.h
+++ b/system/interface/WindowSurface.h
diff --git a/widget/WindowSurfaceX11SHM.cpp b/system/interface/WindowSurfaceX11SHM.cpp
index 37834756f..37834756f 100644
--- a/widget/WindowSurfaceX11SHM.cpp
+++ b/system/interface/WindowSurfaceX11SHM.cpp
diff --git a/widget/WindowSurfaceX11SHM.h b/system/interface/WindowSurfaceX11SHM.h
index 323f99e3b..323f99e3b 100644
--- a/widget/WindowSurfaceX11SHM.h
+++ b/system/interface/WindowSurfaceX11SHM.h
diff --git a/widget/crashtests/1128214.html b/system/interface/crashtests/1128214.html
index 749871c9e..749871c9e 100644
--- a/widget/crashtests/1128214.html
+++ b/system/interface/crashtests/1128214.html
diff --git a/widget/crashtests/303901-1.html b/system/interface/crashtests/303901-1.html
index 51511ba18..51511ba18 100644
--- a/widget/crashtests/303901-1.html
+++ b/system/interface/crashtests/303901-1.html
diff --git a/widget/crashtests/303901-2.html b/system/interface/crashtests/303901-2.html
index 00a70945d..00a70945d 100644
--- a/widget/crashtests/303901-2.html
+++ b/system/interface/crashtests/303901-2.html
diff --git a/widget/crashtests/380359-1.xhtml b/system/interface/crashtests/380359-1.xhtml
index 3a06376c0..3a06376c0 100644
--- a/widget/crashtests/380359-1.xhtml
+++ b/system/interface/crashtests/380359-1.xhtml
diff --git a/widget/crashtests/crashtests.list b/system/interface/crashtests/crashtests.list
index 957f3f005..957f3f005 100644
--- a/widget/crashtests/crashtests.list
+++ b/system/interface/crashtests/crashtests.list
diff --git a/widget/gtk/CompositorWidgetChild.cpp b/system/interface/gtk/CompositorWidgetChild.cpp
index 066251060..066251060 100644
--- a/widget/gtk/CompositorWidgetChild.cpp
+++ b/system/interface/gtk/CompositorWidgetChild.cpp
diff --git a/widget/gtk/CompositorWidgetChild.h b/system/interface/gtk/CompositorWidgetChild.h
index 403b90506..403b90506 100644
--- a/widget/gtk/CompositorWidgetChild.h
+++ b/system/interface/gtk/CompositorWidgetChild.h
diff --git a/widget/gtk/CompositorWidgetParent.cpp b/system/interface/gtk/CompositorWidgetParent.cpp
index c882f4f08..c882f4f08 100644
--- a/widget/gtk/CompositorWidgetParent.cpp
+++ b/system/interface/gtk/CompositorWidgetParent.cpp
diff --git a/widget/gtk/CompositorWidgetParent.h b/system/interface/gtk/CompositorWidgetParent.h
index e80c0f8b2..e80c0f8b2 100644
--- a/widget/gtk/CompositorWidgetParent.h
+++ b/system/interface/gtk/CompositorWidgetParent.h
diff --git a/widget/gtk/IMContextWrapper.cpp b/system/interface/gtk/IMContextWrapper.cpp
index 441bb7bbf..441bb7bbf 100644
--- a/widget/gtk/IMContextWrapper.cpp
+++ b/system/interface/gtk/IMContextWrapper.cpp
diff --git a/widget/gtk/IMContextWrapper.h b/system/interface/gtk/IMContextWrapper.h
index e869c160a..e869c160a 100644
--- a/widget/gtk/IMContextWrapper.h
+++ b/system/interface/gtk/IMContextWrapper.h
diff --git a/widget/gtk/InProcessX11CompositorWidget.cpp b/system/interface/gtk/InProcessX11CompositorWidget.cpp
index 9580b3150..9580b3150 100644
--- a/widget/gtk/InProcessX11CompositorWidget.cpp
+++ b/system/interface/gtk/InProcessX11CompositorWidget.cpp
diff --git a/widget/gtk/InProcessX11CompositorWidget.h b/system/interface/gtk/InProcessX11CompositorWidget.h
index 7f4077451..7f4077451 100644
--- a/widget/gtk/InProcessX11CompositorWidget.h
+++ b/system/interface/gtk/InProcessX11CompositorWidget.h
diff --git a/widget/gtk/NativeKeyBindings.cpp b/system/interface/gtk/NativeKeyBindings.cpp
index 55a3508e2..55a3508e2 100644
--- a/widget/gtk/NativeKeyBindings.cpp
+++ b/system/interface/gtk/NativeKeyBindings.cpp
diff --git a/widget/gtk/NativeKeyBindings.h b/system/interface/gtk/NativeKeyBindings.h
index f1632f9c5..f1632f9c5 100644
--- a/widget/gtk/NativeKeyBindings.h
+++ b/system/interface/gtk/NativeKeyBindings.h
diff --git a/widget/gtk/PCompositorWidget.ipdl b/system/interface/gtk/PCompositorWidget.ipdl
index fe98fc116..fe98fc116 100644
--- a/widget/gtk/PCompositorWidget.ipdl
+++ b/system/interface/gtk/PCompositorWidget.ipdl
diff --git a/widget/gtk/PlatformWidgetTypes.ipdlh b/system/interface/gtk/PlatformWidgetTypes.ipdlh
index cab34a4cc..cab34a4cc 100644
--- a/widget/gtk/PlatformWidgetTypes.ipdlh
+++ b/system/interface/gtk/PlatformWidgetTypes.ipdlh
diff --git a/widget/gtk/WakeLockListener.cpp b/system/interface/gtk/WakeLockListener.cpp
index 54bad17ff..54bad17ff 100644
--- a/widget/gtk/WakeLockListener.cpp
+++ b/system/interface/gtk/WakeLockListener.cpp
diff --git a/widget/gtk/WakeLockListener.h b/system/interface/gtk/WakeLockListener.h
index fc7281822..fc7281822 100644
--- a/widget/gtk/WakeLockListener.h
+++ b/system/interface/gtk/WakeLockListener.h
diff --git a/widget/gtk/WidgetStyleCache.cpp b/system/interface/gtk/WidgetStyleCache.cpp
index 7296146f9..7296146f9 100644
--- a/widget/gtk/WidgetStyleCache.cpp
+++ b/system/interface/gtk/WidgetStyleCache.cpp
diff --git a/widget/gtk/WidgetStyleCache.h b/system/interface/gtk/WidgetStyleCache.h
index fbdfa9349..fbdfa9349 100644
--- a/widget/gtk/WidgetStyleCache.h
+++ b/system/interface/gtk/WidgetStyleCache.h
diff --git a/widget/gtk/WidgetTraceEvent.cpp b/system/interface/gtk/WidgetTraceEvent.cpp
index c09944ac0..c09944ac0 100644
--- a/widget/gtk/WidgetTraceEvent.cpp
+++ b/system/interface/gtk/WidgetTraceEvent.cpp
diff --git a/widget/gtk/WidgetUtilsGtk.cpp b/system/interface/gtk/WidgetUtilsGtk.cpp
index 393f66908..393f66908 100644
--- a/widget/gtk/WidgetUtilsGtk.cpp
+++ b/system/interface/gtk/WidgetUtilsGtk.cpp
diff --git a/widget/gtk/WidgetUtilsGtk.h b/system/interface/gtk/WidgetUtilsGtk.h
index 8c132c11b..8c132c11b 100644
--- a/widget/gtk/WidgetUtilsGtk.h
+++ b/system/interface/gtk/WidgetUtilsGtk.h
diff --git a/widget/gtk/WindowSurfaceProvider.cpp b/system/interface/gtk/WindowSurfaceProvider.cpp
index 526fe6a25..526fe6a25 100644
--- a/widget/gtk/WindowSurfaceProvider.cpp
+++ b/system/interface/gtk/WindowSurfaceProvider.cpp
diff --git a/widget/gtk/WindowSurfaceProvider.h b/system/interface/gtk/WindowSurfaceProvider.h
index 73b23031e..73b23031e 100644
--- a/widget/gtk/WindowSurfaceProvider.h
+++ b/system/interface/gtk/WindowSurfaceProvider.h
diff --git a/widget/gtk/WindowSurfaceX11.cpp b/system/interface/gtk/WindowSurfaceX11.cpp
index 32e3c43ef..32e3c43ef 100644
--- a/widget/gtk/WindowSurfaceX11.cpp
+++ b/system/interface/gtk/WindowSurfaceX11.cpp
diff --git a/widget/gtk/WindowSurfaceX11.h b/system/interface/gtk/WindowSurfaceX11.h
index 46bc10d10..46bc10d10 100644
--- a/widget/gtk/WindowSurfaceX11.h
+++ b/system/interface/gtk/WindowSurfaceX11.h
diff --git a/widget/gtk/WindowSurfaceX11Image.cpp b/system/interface/gtk/WindowSurfaceX11Image.cpp
index 5de028804..5de028804 100644
--- a/widget/gtk/WindowSurfaceX11Image.cpp
+++ b/system/interface/gtk/WindowSurfaceX11Image.cpp
diff --git a/widget/gtk/WindowSurfaceX11Image.h b/system/interface/gtk/WindowSurfaceX11Image.h
index 236e275d6..236e275d6 100644
--- a/widget/gtk/WindowSurfaceX11Image.h
+++ b/system/interface/gtk/WindowSurfaceX11Image.h
diff --git a/widget/gtk/WindowSurfaceXRender.cpp b/system/interface/gtk/WindowSurfaceXRender.cpp
index 015d623b3..015d623b3 100644
--- a/widget/gtk/WindowSurfaceXRender.cpp
+++ b/system/interface/gtk/WindowSurfaceXRender.cpp
diff --git a/widget/gtk/WindowSurfaceXRender.h b/system/interface/gtk/WindowSurfaceXRender.h
index 044fd3412..044fd3412 100644
--- a/widget/gtk/WindowSurfaceXRender.h
+++ b/system/interface/gtk/WindowSurfaceXRender.h
diff --git a/widget/gtk/X11CompositorWidget.cpp b/system/interface/gtk/X11CompositorWidget.cpp
index 05113a0c3..05113a0c3 100644
--- a/widget/gtk/X11CompositorWidget.cpp
+++ b/system/interface/gtk/X11CompositorWidget.cpp
diff --git a/widget/gtk/X11CompositorWidget.h b/system/interface/gtk/X11CompositorWidget.h
index c0e0edeb3..c0e0edeb3 100644
--- a/widget/gtk/X11CompositorWidget.h
+++ b/system/interface/gtk/X11CompositorWidget.h
diff --git a/widget/gtk/compat-gtk3/gdk/gdkversionmacros.h b/system/interface/gtk/compat-gtk3/gdk/gdkversionmacros.h
index 068c54b54..068c54b54 100644
--- a/widget/gtk/compat-gtk3/gdk/gdkversionmacros.h
+++ b/system/interface/gtk/compat-gtk3/gdk/gdkversionmacros.h
diff --git a/widget/gtk/compat-gtk3/gtk/gtkenums.h b/system/interface/gtk/compat-gtk3/gtk/gtkenums.h
index 68e4d736d..68e4d736d 100644
--- a/widget/gtk/compat-gtk3/gtk/gtkenums.h
+++ b/system/interface/gtk/compat-gtk3/gtk/gtkenums.h
diff --git a/widget/gtk/compat/gdk/gdkdnd.h b/system/interface/gtk/compat/gdk/gdkdnd.h
index e20cdea84..e20cdea84 100644
--- a/widget/gtk/compat/gdk/gdkdnd.h
+++ b/system/interface/gtk/compat/gdk/gdkdnd.h
diff --git a/widget/gtk/compat/gdk/gdkkeysyms.h b/system/interface/gtk/compat/gdk/gdkkeysyms.h
index d310ae616..d310ae616 100644
--- a/widget/gtk/compat/gdk/gdkkeysyms.h
+++ b/system/interface/gtk/compat/gdk/gdkkeysyms.h
diff --git a/widget/gtk/compat/gdk/gdkvisual.h b/system/interface/gtk/compat/gdk/gdkvisual.h
index 6476b4494..6476b4494 100644
--- a/widget/gtk/compat/gdk/gdkvisual.h
+++ b/system/interface/gtk/compat/gdk/gdkvisual.h
diff --git a/widget/gtk/compat/gdk/gdkwindow.h b/system/interface/gtk/compat/gdk/gdkwindow.h
index 40efbb07d..40efbb07d 100644
--- a/widget/gtk/compat/gdk/gdkwindow.h
+++ b/system/interface/gtk/compat/gdk/gdkwindow.h
diff --git a/widget/gtk/compat/gdk/gdkx.h b/system/interface/gtk/compat/gdk/gdkx.h
index 240c12e30..240c12e30 100644
--- a/widget/gtk/compat/gdk/gdkx.h
+++ b/system/interface/gtk/compat/gdk/gdkx.h
diff --git a/widget/gtk/compat/glib/gmem.h b/system/interface/gtk/compat/glib/gmem.h
index 1e728197e..1e728197e 100644
--- a/widget/gtk/compat/glib/gmem.h
+++ b/system/interface/gtk/compat/glib/gmem.h
diff --git a/widget/gtk/compat/gtk/gtkwidget.h b/system/interface/gtk/compat/gtk/gtkwidget.h
index b1d4d1405..b1d4d1405 100644
--- a/widget/gtk/compat/gtk/gtkwidget.h
+++ b/system/interface/gtk/compat/gtk/gtkwidget.h
diff --git a/widget/gtk/compat/gtk/gtkwindow.h b/system/interface/gtk/compat/gtk/gtkwindow.h
index 488061d40..488061d40 100644
--- a/widget/gtk/compat/gtk/gtkwindow.h
+++ b/system/interface/gtk/compat/gtk/gtkwindow.h
diff --git a/widget/gtk/crashtests/540078-1.xhtml b/system/interface/gtk/crashtests/540078-1.xhtml
index 9effb4ed6..9effb4ed6 100644
--- a/widget/gtk/crashtests/540078-1.xhtml
+++ b/system/interface/gtk/crashtests/540078-1.xhtml
diff --git a/widget/gtk/crashtests/673390-1.html b/system/interface/gtk/crashtests/673390-1.html
index 8463f67f0..8463f67f0 100644
--- a/widget/gtk/crashtests/673390-1.html
+++ b/system/interface/gtk/crashtests/673390-1.html
diff --git a/widget/gtk/crashtests/crashtests.list b/system/interface/gtk/crashtests/crashtests.list
index 9ae47c223..9ae47c223 100644
--- a/widget/gtk/crashtests/crashtests.list
+++ b/system/interface/gtk/crashtests/crashtests.list
diff --git a/widget/gtk/gtk2drawing.c b/system/interface/gtk/gtk2drawing.c
index 7fcac4de6..7fcac4de6 100644
--- a/widget/gtk/gtk2drawing.c
+++ b/system/interface/gtk/gtk2drawing.c
diff --git a/widget/gtk/gtk3drawing.cpp b/system/interface/gtk/gtk3drawing.cpp
index c592fa51c..c592fa51c 100644
--- a/widget/gtk/gtk3drawing.cpp
+++ b/system/interface/gtk/gtk3drawing.cpp
diff --git a/widget/gtk/gtkdrawing.h b/system/interface/gtk/gtkdrawing.h
index 8ad456911..8ad456911 100644
--- a/widget/gtk/gtkdrawing.h
+++ b/system/interface/gtk/gtkdrawing.h
diff --git a/widget/gtk/maiRedundantObjectFactory.c b/system/interface/gtk/maiRedundantObjectFactory.c
index 3db26c8bb..3db26c8bb 100644
--- a/widget/gtk/maiRedundantObjectFactory.c
+++ b/system/interface/gtk/maiRedundantObjectFactory.c
diff --git a/widget/gtk/maiRedundantObjectFactory.h b/system/interface/gtk/maiRedundantObjectFactory.h
index 809af23ce..809af23ce 100644
--- a/widget/gtk/maiRedundantObjectFactory.h
+++ b/system/interface/gtk/maiRedundantObjectFactory.h
diff --git a/widget/gtk/moz.build b/system/interface/gtk/moz.build
index fc65dc45c..d82b9e1a7 100644
--- a/widget/gtk/moz.build
+++ b/system/interface/gtk/moz.build
@@ -112,16 +112,16 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '..',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/libs/atk-1.0',
-    '/widget',
 ]
 
 if CONFIG['MOZ_X11']:
     LOCAL_INCLUDES += [
-        '/widget/x11',
+        '../x11',
     ]
 
 DEFINES['CAIRO_GFX'] = True
diff --git a/widget/gtk/mozcontainer.c b/system/interface/gtk/mozcontainer.c
index 9b596e4fb..9b596e4fb 100644
--- a/widget/gtk/mozcontainer.c
+++ b/system/interface/gtk/mozcontainer.c
diff --git a/widget/gtk/mozcontainer.h b/system/interface/gtk/mozcontainer.h
index 23e17f7b3..23e17f7b3 100644
--- a/widget/gtk/mozcontainer.h
+++ b/system/interface/gtk/mozcontainer.h
diff --git a/widget/gtk/mozgtk/gtk2/moz.build b/system/interface/gtk/mozgtk/gtk2/moz.build
index db7bb0972..db7bb0972 100644
--- a/widget/gtk/mozgtk/gtk2/moz.build
+++ b/system/interface/gtk/mozgtk/gtk2/moz.build
diff --git a/widget/gtk/mozgtk/gtk3/moz.build b/system/interface/gtk/mozgtk/gtk3/moz.build
index ec9a5ef46..ec9a5ef46 100644
--- a/widget/gtk/mozgtk/gtk3/moz.build
+++ b/system/interface/gtk/mozgtk/gtk3/moz.build
diff --git a/widget/gtk/mozgtk/moz.build b/system/interface/gtk/mozgtk/moz.build
index 43f94aabf..43f94aabf 100644
--- a/widget/gtk/mozgtk/moz.build
+++ b/system/interface/gtk/mozgtk/moz.build
diff --git a/widget/gtk/mozgtk/mozgtk.c b/system/interface/gtk/mozgtk/mozgtk.c
index d0b87613b..d0b87613b 100644
--- a/widget/gtk/mozgtk/mozgtk.c
+++ b/system/interface/gtk/mozgtk/mozgtk.c
diff --git a/widget/gtk/mozgtk/stub/moz.build b/system/interface/gtk/mozgtk/stub/moz.build
index 7713bfaaf..7713bfaaf 100644
--- a/widget/gtk/mozgtk/stub/moz.build
+++ b/system/interface/gtk/mozgtk/stub/moz.build
diff --git a/widget/gtk/nsAppShell.cpp b/system/interface/gtk/nsAppShell.cpp
index 5473dd883..5473dd883 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/system/interface/gtk/nsAppShell.cpp
diff --git a/widget/gtk/nsAppShell.h b/system/interface/gtk/nsAppShell.h
index afdea5074..afdea5074 100644
--- a/widget/gtk/nsAppShell.h
+++ b/system/interface/gtk/nsAppShell.h
diff --git a/widget/gtk/nsApplicationChooser.cpp b/system/interface/gtk/nsApplicationChooser.cpp
index 76c231cf6..76c231cf6 100644
--- a/widget/gtk/nsApplicationChooser.cpp
+++ b/system/interface/gtk/nsApplicationChooser.cpp
diff --git a/widget/gtk/nsApplicationChooser.h b/system/interface/gtk/nsApplicationChooser.h
index da16dac71..da16dac71 100644
--- a/widget/gtk/nsApplicationChooser.h
+++ b/system/interface/gtk/nsApplicationChooser.h
diff --git a/widget/gtk/nsBidiKeyboard.cpp b/system/interface/gtk/nsBidiKeyboard.cpp
index 51102d945..51102d945 100644
--- a/widget/gtk/nsBidiKeyboard.cpp
+++ b/system/interface/gtk/nsBidiKeyboard.cpp
diff --git a/widget/gtk/nsBidiKeyboard.h b/system/interface/gtk/nsBidiKeyboard.h
index 08c02f354..08c02f354 100644
--- a/widget/gtk/nsBidiKeyboard.h
+++ b/system/interface/gtk/nsBidiKeyboard.h
diff --git a/widget/gtk/nsCUPSShim.cpp b/system/interface/gtk/nsCUPSShim.cpp
index d05da307f..d05da307f 100644
--- a/widget/gtk/nsCUPSShim.cpp
+++ b/system/interface/gtk/nsCUPSShim.cpp
diff --git a/widget/gtk/nsCUPSShim.h b/system/interface/gtk/nsCUPSShim.h
index 3e7d96f3a..3e7d96f3a 100644
--- a/widget/gtk/nsCUPSShim.h
+++ b/system/interface/gtk/nsCUPSShim.h
diff --git a/widget/gtk/nsClipboard.cpp b/system/interface/gtk/nsClipboard.cpp
index 1ae3673b0..1ae3673b0 100644
--- a/widget/gtk/nsClipboard.cpp
+++ b/system/interface/gtk/nsClipboard.cpp
diff --git a/widget/gtk/nsClipboard.h b/system/interface/gtk/nsClipboard.h
index c3129bf20..c3129bf20 100644
--- a/widget/gtk/nsClipboard.h
+++ b/system/interface/gtk/nsClipboard.h
diff --git a/widget/gtk/nsColorPicker.cpp b/system/interface/gtk/nsColorPicker.cpp
index 93ab8bb9a..93ab8bb9a 100644
--- a/widget/gtk/nsColorPicker.cpp
+++ b/system/interface/gtk/nsColorPicker.cpp
diff --git a/widget/gtk/nsColorPicker.h b/system/interface/gtk/nsColorPicker.h
index 107e6f058..107e6f058 100644
--- a/widget/gtk/nsColorPicker.h
+++ b/system/interface/gtk/nsColorPicker.h
diff --git a/widget/gtk/nsDbusmenu.cpp b/system/interface/gtk/nsDbusmenu.cpp
index 2849536e9..2849536e9 100644
--- a/widget/gtk/nsDbusmenu.cpp
+++ b/system/interface/gtk/nsDbusmenu.cpp
diff --git a/widget/gtk/nsDbusmenu.h b/system/interface/gtk/nsDbusmenu.h
index c0d9e7979..c0d9e7979 100644
--- a/widget/gtk/nsDbusmenu.h
+++ b/system/interface/gtk/nsDbusmenu.h
diff --git a/widget/gtk/nsDeviceContextSpecG.cpp b/system/interface/gtk/nsDeviceContextSpecG.cpp
index 0bd87bd85..0bd87bd85 100644
--- a/widget/gtk/nsDeviceContextSpecG.cpp
+++ b/system/interface/gtk/nsDeviceContextSpecG.cpp
diff --git a/widget/gtk/nsDeviceContextSpecG.h b/system/interface/gtk/nsDeviceContextSpecG.h
index 921c6275c..921c6275c 100644
--- a/widget/gtk/nsDeviceContextSpecG.h
+++ b/system/interface/gtk/nsDeviceContextSpecG.h
diff --git a/widget/gtk/nsDragService.cpp b/system/interface/gtk/nsDragService.cpp
index aa5ee2c7a..aa5ee2c7a 100644
--- a/widget/gtk/nsDragService.cpp
+++ b/system/interface/gtk/nsDragService.cpp
diff --git a/widget/gtk/nsDragService.h b/system/interface/gtk/nsDragService.h
index f3027eeea..f3027eeea 100644
--- a/widget/gtk/nsDragService.h
+++ b/system/interface/gtk/nsDragService.h
diff --git a/widget/gtk/nsFilePicker.cpp b/system/interface/gtk/nsFilePicker.cpp
index 05d8bb0f0..05d8bb0f0 100644
--- a/widget/gtk/nsFilePicker.cpp
+++ b/system/interface/gtk/nsFilePicker.cpp
diff --git a/widget/gtk/nsFilePicker.h b/system/interface/gtk/nsFilePicker.h
index e0a1d541d..e0a1d541d 100644
--- a/widget/gtk/nsFilePicker.h
+++ b/system/interface/gtk/nsFilePicker.h
diff --git a/widget/gtk/nsGTKToolkit.h b/system/interface/gtk/nsGTKToolkit.h
index ae0d55b63..ae0d55b63 100644
--- a/widget/gtk/nsGTKToolkit.h
+++ b/system/interface/gtk/nsGTKToolkit.h
diff --git a/widget/gtk/nsGtkCursors.h b/system/interface/gtk/nsGtkCursors.h
index b7df7f65e..b7df7f65e 100644
--- a/widget/gtk/nsGtkCursors.h
+++ b/system/interface/gtk/nsGtkCursors.h
diff --git a/widget/gtk/nsGtkKeyUtils.cpp b/system/interface/gtk/nsGtkKeyUtils.cpp
index ce55cf18e..ce55cf18e 100644
--- a/widget/gtk/nsGtkKeyUtils.cpp
+++ b/system/interface/gtk/nsGtkKeyUtils.cpp
diff --git a/widget/gtk/nsGtkKeyUtils.h b/system/interface/gtk/nsGtkKeyUtils.h
index 67528d817..67528d817 100644
--- a/widget/gtk/nsGtkKeyUtils.h
+++ b/system/interface/gtk/nsGtkKeyUtils.h
diff --git a/widget/gtk/nsGtkUtils.h b/system/interface/gtk/nsGtkUtils.h
index cb41ddaf7..cb41ddaf7 100644
--- a/widget/gtk/nsGtkUtils.h
+++ b/system/interface/gtk/nsGtkUtils.h
diff --git a/widget/gtk/nsIImageToPixbuf.h b/system/interface/gtk/nsIImageToPixbuf.h
index 0faa1c6e8..0faa1c6e8 100644
--- a/widget/gtk/nsIImageToPixbuf.h
+++ b/system/interface/gtk/nsIImageToPixbuf.h
diff --git a/widget/gtk/nsIdleServiceGTK.cpp b/system/interface/gtk/nsIdleServiceGTK.cpp
index 6b6832c82..6b6832c82 100644
--- a/widget/gtk/nsIdleServiceGTK.cpp
+++ b/system/interface/gtk/nsIdleServiceGTK.cpp
diff --git a/widget/gtk/nsIdleServiceGTK.h b/system/interface/gtk/nsIdleServiceGTK.h
index 01ae9268e..01ae9268e 100644
--- a/widget/gtk/nsIdleServiceGTK.h
+++ b/system/interface/gtk/nsIdleServiceGTK.h
diff --git a/widget/gtk/nsImageToPixbuf.cpp b/system/interface/gtk/nsImageToPixbuf.cpp
index e06605b2b..e06605b2b 100644
--- a/widget/gtk/nsImageToPixbuf.cpp
+++ b/system/interface/gtk/nsImageToPixbuf.cpp
diff --git a/widget/gtk/nsImageToPixbuf.h b/system/interface/gtk/nsImageToPixbuf.h
index 9c026048a..9c026048a 100644
--- a/widget/gtk/nsImageToPixbuf.h
+++ b/system/interface/gtk/nsImageToPixbuf.h
diff --git a/widget/gtk/nsLookAndFeel.cpp b/system/interface/gtk/nsLookAndFeel.cpp
index 7a95f81c6..7a95f81c6 100644
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/system/interface/gtk/nsLookAndFeel.cpp
diff --git a/widget/gtk/nsLookAndFeel.h b/system/interface/gtk/nsLookAndFeel.h
index 726859b41..726859b41 100644
--- a/widget/gtk/nsLookAndFeel.h
+++ b/system/interface/gtk/nsLookAndFeel.h
diff --git a/widget/gtk/nsMenu.cpp b/system/interface/gtk/nsMenu.cpp
index 073a4acf6..073a4acf6 100644
--- a/widget/gtk/nsMenu.cpp
+++ b/system/interface/gtk/nsMenu.cpp
diff --git a/widget/gtk/nsMenu.h b/system/interface/gtk/nsMenu.h
index a198a8e72..a198a8e72 100644
--- a/widget/gtk/nsMenu.h
+++ b/system/interface/gtk/nsMenu.h
diff --git a/widget/gtk/nsMenuBar.cpp b/system/interface/gtk/nsMenuBar.cpp
index e7caf119c..e7caf119c 100644
--- a/widget/gtk/nsMenuBar.cpp
+++ b/system/interface/gtk/nsMenuBar.cpp
diff --git a/widget/gtk/nsMenuBar.h b/system/interface/gtk/nsMenuBar.h
index 9ce179651..9ce179651 100644
--- a/widget/gtk/nsMenuBar.h
+++ b/system/interface/gtk/nsMenuBar.h
diff --git a/widget/gtk/nsMenuContainer.cpp b/system/interface/gtk/nsMenuContainer.cpp
index 081e98a6a..081e98a6a 100644
--- a/widget/gtk/nsMenuContainer.cpp
+++ b/system/interface/gtk/nsMenuContainer.cpp
diff --git a/widget/gtk/nsMenuContainer.h b/system/interface/gtk/nsMenuContainer.h
index 95d65a2f1..95d65a2f1 100644
--- a/widget/gtk/nsMenuContainer.h
+++ b/system/interface/gtk/nsMenuContainer.h
diff --git a/widget/gtk/nsMenuItem.cpp b/system/interface/gtk/nsMenuItem.cpp
index 00cc5477c..00cc5477c 100644
--- a/widget/gtk/nsMenuItem.cpp
+++ b/system/interface/gtk/nsMenuItem.cpp
diff --git a/widget/gtk/nsMenuItem.h b/system/interface/gtk/nsMenuItem.h
index e81b6e308..e81b6e308 100644
--- a/widget/gtk/nsMenuItem.h
+++ b/system/interface/gtk/nsMenuItem.h
diff --git a/widget/gtk/nsMenuObject.cpp b/system/interface/gtk/nsMenuObject.cpp
index 58d1716fd..58d1716fd 100644
--- a/widget/gtk/nsMenuObject.cpp
+++ b/system/interface/gtk/nsMenuObject.cpp
diff --git a/widget/gtk/nsMenuObject.h b/system/interface/gtk/nsMenuObject.h
index c7637cd05..c7637cd05 100644
--- a/widget/gtk/nsMenuObject.h
+++ b/system/interface/gtk/nsMenuObject.h
diff --git a/widget/gtk/nsMenuSeparator.cpp b/system/interface/gtk/nsMenuSeparator.cpp
index 893c5c7f0..893c5c7f0 100644
--- a/widget/gtk/nsMenuSeparator.cpp
+++ b/system/interface/gtk/nsMenuSeparator.cpp
diff --git a/widget/gtk/nsMenuSeparator.h b/system/interface/gtk/nsMenuSeparator.h
index 9ba770a85..9ba770a85 100644
--- a/widget/gtk/nsMenuSeparator.h
+++ b/system/interface/gtk/nsMenuSeparator.h
diff --git a/widget/gtk/nsNativeMenuAtomList.h b/system/interface/gtk/nsNativeMenuAtomList.h
index 4a8b3869a..4a8b3869a 100644
--- a/widget/gtk/nsNativeMenuAtomList.h
+++ b/system/interface/gtk/nsNativeMenuAtomList.h
diff --git a/widget/gtk/nsNativeMenuAtoms.cpp b/system/interface/gtk/nsNativeMenuAtoms.cpp
index f43d8b24b..f43d8b24b 100644
--- a/widget/gtk/nsNativeMenuAtoms.cpp
+++ b/system/interface/gtk/nsNativeMenuAtoms.cpp
diff --git a/widget/gtk/nsNativeMenuAtoms.h b/system/interface/gtk/nsNativeMenuAtoms.h
index 4a9766ee8..4a9766ee8 100644
--- a/widget/gtk/nsNativeMenuAtoms.h
+++ b/system/interface/gtk/nsNativeMenuAtoms.h
diff --git a/widget/gtk/nsNativeMenuDocListener.cpp b/system/interface/gtk/nsNativeMenuDocListener.cpp
index 46a9c3aa9..46a9c3aa9 100644
--- a/widget/gtk/nsNativeMenuDocListener.cpp
+++ b/system/interface/gtk/nsNativeMenuDocListener.cpp
diff --git a/widget/gtk/nsNativeMenuDocListener.h b/system/interface/gtk/nsNativeMenuDocListener.h
index c0a503da1..c0a503da1 100644
--- a/widget/gtk/nsNativeMenuDocListener.h
+++ b/system/interface/gtk/nsNativeMenuDocListener.h
diff --git a/widget/gtk/nsNativeMenuService.cpp b/system/interface/gtk/nsNativeMenuService.cpp
index 7b92e73e8..7b92e73e8 100644
--- a/widget/gtk/nsNativeMenuService.cpp
+++ b/system/interface/gtk/nsNativeMenuService.cpp
diff --git a/widget/gtk/nsNativeMenuService.h b/system/interface/gtk/nsNativeMenuService.h
index 5ce022526..5ce022526 100644
--- a/widget/gtk/nsNativeMenuService.h
+++ b/system/interface/gtk/nsNativeMenuService.h
diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/system/interface/gtk/nsNativeThemeGTK.cpp
index cb4e7debf..cb4e7debf 100644
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/system/interface/gtk/nsNativeThemeGTK.cpp
diff --git a/widget/gtk/nsNativeThemeGTK.h b/system/interface/gtk/nsNativeThemeGTK.h
index 56ae0317f..56ae0317f 100644
--- a/widget/gtk/nsNativeThemeGTK.h
+++ b/system/interface/gtk/nsNativeThemeGTK.h
diff --git a/widget/gtk/nsPSPrinters.cpp b/system/interface/gtk/nsPSPrinters.cpp
index 2d3183e9a..2d3183e9a 100644
--- a/widget/gtk/nsPSPrinters.cpp
+++ b/system/interface/gtk/nsPSPrinters.cpp
diff --git a/widget/gtk/nsPSPrinters.h b/system/interface/gtk/nsPSPrinters.h
index b584ef715..b584ef715 100644
--- a/widget/gtk/nsPSPrinters.h
+++ b/system/interface/gtk/nsPSPrinters.h
diff --git a/widget/gtk/nsPaperPS.cpp b/system/interface/gtk/nsPaperPS.cpp
index 7d583efac..7d583efac 100644
--- a/widget/gtk/nsPaperPS.cpp
+++ b/system/interface/gtk/nsPaperPS.cpp
diff --git a/widget/gtk/nsPaperPS.h b/system/interface/gtk/nsPaperPS.h
index 1acc1780c..1acc1780c 100644
--- a/widget/gtk/nsPaperPS.h
+++ b/system/interface/gtk/nsPaperPS.h
diff --git a/widget/gtk/nsPrintDialogGTK.cpp b/system/interface/gtk/nsPrintDialogGTK.cpp
index 77fa2bb69..77fa2bb69 100644
--- a/widget/gtk/nsPrintDialogGTK.cpp
+++ b/system/interface/gtk/nsPrintDialogGTK.cpp
diff --git a/widget/gtk/nsPrintDialogGTK.h b/system/interface/gtk/nsPrintDialogGTK.h
index c60fa6a2b..c60fa6a2b 100644
--- a/widget/gtk/nsPrintDialogGTK.h
+++ b/system/interface/gtk/nsPrintDialogGTK.h
diff --git a/widget/gtk/nsPrintOptionsGTK.cpp b/system/interface/gtk/nsPrintOptionsGTK.cpp
index ca86a1f89..ca86a1f89 100644
--- a/widget/gtk/nsPrintOptionsGTK.cpp
+++ b/system/interface/gtk/nsPrintOptionsGTK.cpp
diff --git a/widget/gtk/nsPrintOptionsGTK.h b/system/interface/gtk/nsPrintOptionsGTK.h
index d558bb800..d558bb800 100644
--- a/widget/gtk/nsPrintOptionsGTK.h
+++ b/system/interface/gtk/nsPrintOptionsGTK.h
diff --git a/widget/gtk/nsPrintSettingsGTK.cpp b/system/interface/gtk/nsPrintSettingsGTK.cpp
index a8fd60bd1..a8fd60bd1 100644
--- a/widget/gtk/nsPrintSettingsGTK.cpp
+++ b/system/interface/gtk/nsPrintSettingsGTK.cpp
diff --git a/widget/gtk/nsPrintSettingsGTK.h b/system/interface/gtk/nsPrintSettingsGTK.h
index 21f389449..21f389449 100644
--- a/widget/gtk/nsPrintSettingsGTK.h
+++ b/system/interface/gtk/nsPrintSettingsGTK.h
diff --git a/widget/gtk/nsScreenGtk.cpp b/system/interface/gtk/nsScreenGtk.cpp
index 61e6605b7..61e6605b7 100644
--- a/widget/gtk/nsScreenGtk.cpp
+++ b/system/interface/gtk/nsScreenGtk.cpp
diff --git a/widget/gtk/nsScreenGtk.h b/system/interface/gtk/nsScreenGtk.h
index d58ea4b1e..d58ea4b1e 100644
--- a/widget/gtk/nsScreenGtk.h
+++ b/system/interface/gtk/nsScreenGtk.h
diff --git a/widget/gtk/nsScreenManagerGtk.cpp b/system/interface/gtk/nsScreenManagerGtk.cpp
index 98166cc92..98166cc92 100644
--- a/widget/gtk/nsScreenManagerGtk.cpp
+++ b/system/interface/gtk/nsScreenManagerGtk.cpp
diff --git a/widget/gtk/nsScreenManagerGtk.h b/system/interface/gtk/nsScreenManagerGtk.h
index 9afb3bf22..9afb3bf22 100644
--- a/widget/gtk/nsScreenManagerGtk.h
+++ b/system/interface/gtk/nsScreenManagerGtk.h
diff --git a/widget/gtk/nsSound.cpp b/system/interface/gtk/nsSound.cpp
index 4e81fe43f..4e81fe43f 100644
--- a/widget/gtk/nsSound.cpp
+++ b/system/interface/gtk/nsSound.cpp
diff --git a/widget/gtk/nsSound.h b/system/interface/gtk/nsSound.h
index 0039b8556..0039b8556 100644
--- a/widget/gtk/nsSound.h
+++ b/system/interface/gtk/nsSound.h
diff --git a/widget/gtk/nsToolkit.cpp b/system/interface/gtk/nsToolkit.cpp
index 41d47ff96..41d47ff96 100644
--- a/widget/gtk/nsToolkit.cpp
+++ b/system/interface/gtk/nsToolkit.cpp
diff --git a/widget/gtk/nsWidgetFactory.cpp b/system/interface/gtk/nsWidgetFactory.cpp
index a1508d1d6..a1508d1d6 100644
--- a/widget/gtk/nsWidgetFactory.cpp
+++ b/system/interface/gtk/nsWidgetFactory.cpp
diff --git a/widget/gtk/nsWindow.cpp b/system/interface/gtk/nsWindow.cpp
index 6f222a705..6f222a705 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/system/interface/gtk/nsWindow.cpp
diff --git a/widget/gtk/nsWindow.h b/system/interface/gtk/nsWindow.h
index c45176cea..c45176cea 100644
--- a/widget/gtk/nsWindow.h
+++ b/system/interface/gtk/nsWindow.h
diff --git a/widget/gtkxtbin/gtk2xtbin.c b/system/interface/gtkxtbin/gtk2xtbin.c
index 01e4b0bdd..01e4b0bdd 100644
--- a/widget/gtkxtbin/gtk2xtbin.c
+++ b/system/interface/gtkxtbin/gtk2xtbin.c
diff --git a/widget/gtkxtbin/gtk2xtbin.h b/system/interface/gtkxtbin/gtk2xtbin.h
index cffb752e6..cffb752e6 100644
--- a/widget/gtkxtbin/gtk2xtbin.h
+++ b/system/interface/gtkxtbin/gtk2xtbin.h
diff --git a/widget/gtkxtbin/moz.build b/system/interface/gtkxtbin/moz.build
index 41b867c3c..41b867c3c 100644
--- a/widget/gtkxtbin/moz.build
+++ b/system/interface/gtkxtbin/moz.build
diff --git a/widget/gtkxtbin/xembed.h b/system/interface/gtkxtbin/xembed.h
index 5a5390091..5a5390091 100644
--- a/widget/gtkxtbin/xembed.h
+++ b/system/interface/gtkxtbin/xembed.h
diff --git a/widget/moz.build b/system/interface/moz.build
index 4999a3f60..2f6fb4fdf 100644
--- a/widget/moz.build
+++ b/system/interface/moz.build
@@ -228,7 +228,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/view',
     '/layout/xul',
-    '/widget',
+    '/system/interface',
 ]
 
 if toolkit == 'windows':
@@ -253,7 +253,7 @@ if widget_dir in ('gtk3', 'gtk2'):
     widget_dir = 'gtk'
 
 LOCAL_INCLUDES += [
-    '/widget/%s' % widget_dir,
+    '/system/interface/%s' % widget_dir,
 ]
 FINAL_LIBRARY = 'xul'
 
diff --git a/widget/nsAppShellSingleton.h b/system/interface/nsAppShellSingleton.h
index 0b736c8dc..0b736c8dc 100644
--- a/widget/nsAppShellSingleton.h
+++ b/system/interface/nsAppShellSingleton.h
diff --git a/widget/nsBaseAppShell.cpp b/system/interface/nsBaseAppShell.cpp
index c6b88cba0..c6b88cba0 100644
--- a/widget/nsBaseAppShell.cpp
+++ b/system/interface/nsBaseAppShell.cpp
diff --git a/widget/nsBaseAppShell.h b/system/interface/nsBaseAppShell.h
index 4ee9e3d2e..4ee9e3d2e 100644
--- a/widget/nsBaseAppShell.h
+++ b/system/interface/nsBaseAppShell.h
diff --git a/widget/nsBaseClipboard.cpp b/system/interface/nsBaseClipboard.cpp
index 850216ba4..850216ba4 100644
--- a/widget/nsBaseClipboard.cpp
+++ b/system/interface/nsBaseClipboard.cpp
diff --git a/widget/nsBaseClipboard.h b/system/interface/nsBaseClipboard.h
index f2e916f76..f2e916f76 100644
--- a/widget/nsBaseClipboard.h
+++ b/system/interface/nsBaseClipboard.h
diff --git a/widget/nsBaseDragService.cpp b/system/interface/nsBaseDragService.cpp
index 10d3163b3..10d3163b3 100644
--- a/widget/nsBaseDragService.cpp
+++ b/system/interface/nsBaseDragService.cpp
diff --git a/widget/nsBaseDragService.h b/system/interface/nsBaseDragService.h
index 300ea693a..300ea693a 100644
--- a/widget/nsBaseDragService.h
+++ b/system/interface/nsBaseDragService.h
diff --git a/widget/nsBaseFilePicker.cpp b/system/interface/nsBaseFilePicker.cpp
index 1bcd78b46..1bcd78b46 100644
--- a/widget/nsBaseFilePicker.cpp
+++ b/system/interface/nsBaseFilePicker.cpp
diff --git a/widget/nsBaseFilePicker.h b/system/interface/nsBaseFilePicker.h
index c0a197e26..c0a197e26 100644
--- a/widget/nsBaseFilePicker.h
+++ b/system/interface/nsBaseFilePicker.h
diff --git a/widget/nsBaseScreen.cpp b/system/interface/nsBaseScreen.cpp
index da523853a..da523853a 100644
--- a/widget/nsBaseScreen.cpp
+++ b/system/interface/nsBaseScreen.cpp
diff --git a/widget/nsBaseScreen.h b/system/interface/nsBaseScreen.h
index b07de8a9c..b07de8a9c 100644
--- a/widget/nsBaseScreen.h
+++ b/system/interface/nsBaseScreen.h
diff --git a/widget/nsBaseWidget.cpp b/system/interface/nsBaseWidget.cpp
index 23859383c..23859383c 100644
--- a/widget/nsBaseWidget.cpp
+++ b/system/interface/nsBaseWidget.cpp
diff --git a/widget/nsBaseWidget.h b/system/interface/nsBaseWidget.h
index 4065a7f1e..4065a7f1e 100644
--- a/widget/nsBaseWidget.h
+++ b/system/interface/nsBaseWidget.h
diff --git a/widget/nsClipboardHelper.cpp b/system/interface/nsClipboardHelper.cpp
index 16eed0d89..16eed0d89 100644
--- a/widget/nsClipboardHelper.cpp
+++ b/system/interface/nsClipboardHelper.cpp
diff --git a/widget/nsClipboardHelper.h b/system/interface/nsClipboardHelper.h
index 71c3aa60f..71c3aa60f 100644
--- a/widget/nsClipboardHelper.h
+++ b/system/interface/nsClipboardHelper.h
diff --git a/widget/nsClipboardProxy.cpp b/system/interface/nsClipboardProxy.cpp
index f7d863475..f7d863475 100644
--- a/widget/nsClipboardProxy.cpp
+++ b/system/interface/nsClipboardProxy.cpp
diff --git a/widget/nsClipboardProxy.h b/system/interface/nsClipboardProxy.h
index c24bcbee9..c24bcbee9 100644
--- a/widget/nsClipboardProxy.h
+++ b/system/interface/nsClipboardProxy.h
diff --git a/widget/nsColorPickerProxy.cpp b/system/interface/nsColorPickerProxy.cpp
index 9ded27ef3..9ded27ef3 100644
--- a/widget/nsColorPickerProxy.cpp
+++ b/system/interface/nsColorPickerProxy.cpp
diff --git a/widget/nsColorPickerProxy.h b/system/interface/nsColorPickerProxy.h
index 0f3af3793..0f3af3793 100644
--- a/widget/nsColorPickerProxy.h
+++ b/system/interface/nsColorPickerProxy.h
diff --git a/widget/nsContentProcessWidgetFactory.cpp b/system/interface/nsContentProcessWidgetFactory.cpp
index 7430721f2..7430721f2 100644
--- a/widget/nsContentProcessWidgetFactory.cpp
+++ b/system/interface/nsContentProcessWidgetFactory.cpp
diff --git a/widget/nsDeviceContextSpecProxy.cpp b/system/interface/nsDeviceContextSpecProxy.cpp
index df0927237..df0927237 100644
--- a/widget/nsDeviceContextSpecProxy.cpp
+++ b/system/interface/nsDeviceContextSpecProxy.cpp
diff --git a/widget/nsDeviceContextSpecProxy.h b/system/interface/nsDeviceContextSpecProxy.h
index df065fc7b..df065fc7b 100644
--- a/widget/nsDeviceContextSpecProxy.h
+++ b/system/interface/nsDeviceContextSpecProxy.h
diff --git a/widget/nsDragServiceProxy.cpp b/system/interface/nsDragServiceProxy.cpp
index 7005a3e0b..7005a3e0b 100644
--- a/widget/nsDragServiceProxy.cpp
+++ b/system/interface/nsDragServiceProxy.cpp
diff --git a/widget/nsDragServiceProxy.h b/system/interface/nsDragServiceProxy.h
index fcde3d25d..fcde3d25d 100644
--- a/widget/nsDragServiceProxy.h
+++ b/system/interface/nsDragServiceProxy.h
diff --git a/widget/nsFilePickerProxy.cpp b/system/interface/nsFilePickerProxy.cpp
index 077168c45..077168c45 100644
--- a/widget/nsFilePickerProxy.cpp
+++ b/system/interface/nsFilePickerProxy.cpp
diff --git a/widget/nsFilePickerProxy.h b/system/interface/nsFilePickerProxy.h
index 62d343d72..62d343d72 100644
--- a/widget/nsFilePickerProxy.h
+++ b/system/interface/nsFilePickerProxy.h
diff --git a/widget/nsGUIEventIPC.h b/system/interface/nsGUIEventIPC.h
index bf0365244..bf0365244 100644
--- a/widget/nsGUIEventIPC.h
+++ b/system/interface/nsGUIEventIPC.h
diff --git a/widget/nsHTMLFormatConverter.cpp b/system/interface/nsHTMLFormatConverter.cpp
index 6c8191927..6c8191927 100644
--- a/widget/nsHTMLFormatConverter.cpp
+++ b/system/interface/nsHTMLFormatConverter.cpp
diff --git a/widget/nsHTMLFormatConverter.h b/system/interface/nsHTMLFormatConverter.h
index 8356b7313..8356b7313 100644
--- a/widget/nsHTMLFormatConverter.h
+++ b/system/interface/nsHTMLFormatConverter.h
diff --git a/widget/nsIAppShell.idl b/system/interface/nsIAppShell.idl
index c21c4d107..c21c4d107 100644
--- a/widget/nsIAppShell.idl
+++ b/system/interface/nsIAppShell.idl
diff --git a/widget/nsIApplicationChooser.idl b/system/interface/nsIApplicationChooser.idl
index 05d15f7ac..05d15f7ac 100644
--- a/widget/nsIApplicationChooser.idl
+++ b/system/interface/nsIApplicationChooser.idl
diff --git a/widget/nsIBaseWindow.idl b/system/interface/nsIBaseWindow.idl
index 7da3fe1dc..7da3fe1dc 100644
--- a/widget/nsIBaseWindow.idl
+++ b/system/interface/nsIBaseWindow.idl
diff --git a/widget/nsIBidiKeyboard.idl b/system/interface/nsIBidiKeyboard.idl
index fc68d1ae8..fc68d1ae8 100644
--- a/widget/nsIBidiKeyboard.idl
+++ b/system/interface/nsIBidiKeyboard.idl
diff --git a/widget/nsIClipboard.idl b/system/interface/nsIClipboard.idl
index aaf97a5ec..aaf97a5ec 100644
--- a/widget/nsIClipboard.idl
+++ b/system/interface/nsIClipboard.idl
diff --git a/widget/nsIClipboardDragDropHookList.idl b/system/interface/nsIClipboardDragDropHookList.idl
index 1f6231b82..1f6231b82 100644
--- a/widget/nsIClipboardDragDropHookList.idl
+++ b/system/interface/nsIClipboardDragDropHookList.idl
diff --git a/widget/nsIClipboardDragDropHooks.idl b/system/interface/nsIClipboardDragDropHooks.idl
index 0810ff70f..0810ff70f 100644
--- a/widget/nsIClipboardDragDropHooks.idl
+++ b/system/interface/nsIClipboardDragDropHooks.idl
diff --git a/widget/nsIClipboardHelper.idl b/system/interface/nsIClipboardHelper.idl
index 427105abb..427105abb 100644
--- a/widget/nsIClipboardHelper.idl
+++ b/system/interface/nsIClipboardHelper.idl
diff --git a/widget/nsIClipboardOwner.idl b/system/interface/nsIClipboardOwner.idl
index 00a2258aa..00a2258aa 100644
--- a/widget/nsIClipboardOwner.idl
+++ b/system/interface/nsIClipboardOwner.idl
diff --git a/widget/nsIColorPicker.idl b/system/interface/nsIColorPicker.idl
index 24b128e1b..24b128e1b 100644
--- a/widget/nsIColorPicker.idl
+++ b/system/interface/nsIColorPicker.idl
diff --git a/widget/nsIDeviceContextSpec.h b/system/interface/nsIDeviceContextSpec.h
index fc0fd2c12..fc0fd2c12 100644
--- a/widget/nsIDeviceContextSpec.h
+++ b/system/interface/nsIDeviceContextSpec.h
diff --git a/widget/nsIDisplayInfo.idl b/system/interface/nsIDisplayInfo.idl
index 69d5064e4..69d5064e4 100644
--- a/widget/nsIDisplayInfo.idl
+++ b/system/interface/nsIDisplayInfo.idl
diff --git a/widget/nsIDragService.idl b/system/interface/nsIDragService.idl
index c7779bc5c..c7779bc5c 100644
--- a/widget/nsIDragService.idl
+++ b/system/interface/nsIDragService.idl
diff --git a/widget/nsIDragSession.idl b/system/interface/nsIDragSession.idl
index 6b9f603a1..6b9f603a1 100644
--- a/widget/nsIDragSession.idl
+++ b/system/interface/nsIDragSession.idl
diff --git a/widget/nsIFilePicker.idl b/system/interface/nsIFilePicker.idl
index 8de69c56e..8de69c56e 100644
--- a/widget/nsIFilePicker.idl
+++ b/system/interface/nsIFilePicker.idl
diff --git a/widget/nsIFormatConverter.idl b/system/interface/nsIFormatConverter.idl
index 1a82a1cba..1a82a1cba 100644
--- a/widget/nsIFormatConverter.idl
+++ b/system/interface/nsIFormatConverter.idl
diff --git a/widget/nsIGfxInfo.idl b/system/interface/nsIGfxInfo.idl
index 430e30bb1..430e30bb1 100644
--- a/widget/nsIGfxInfo.idl
+++ b/system/interface/nsIGfxInfo.idl
diff --git a/widget/nsIGfxInfoDebug.idl b/system/interface/nsIGfxInfoDebug.idl
index fab30c4e9..fab30c4e9 100644
--- a/widget/nsIGfxInfoDebug.idl
+++ b/system/interface/nsIGfxInfoDebug.idl
diff --git a/widget/nsIIdleService.idl b/system/interface/nsIIdleService.idl
index d2db6ad14..d2db6ad14 100644
--- a/widget/nsIIdleService.idl
+++ b/system/interface/nsIIdleService.idl
diff --git a/widget/nsIIdleServiceInternal.idl b/system/interface/nsIIdleServiceInternal.idl
index 350766ec3..350766ec3 100644
--- a/widget/nsIIdleServiceInternal.idl
+++ b/system/interface/nsIIdleServiceInternal.idl
diff --git a/widget/nsIJumpListBuilder.idl b/system/interface/nsIJumpListBuilder.idl
index 35846f005..35846f005 100644
--- a/widget/nsIJumpListBuilder.idl
+++ b/system/interface/nsIJumpListBuilder.idl
diff --git a/widget/nsIJumpListItem.idl b/system/interface/nsIJumpListItem.idl
index e7fcbb3fb..e7fcbb3fb 100644
--- a/widget/nsIJumpListItem.idl
+++ b/system/interface/nsIJumpListItem.idl
diff --git a/widget/nsIKeyEventInPluginCallback.h b/system/interface/nsIKeyEventInPluginCallback.h
index 8b5e85e97..8b5e85e97 100644
--- a/widget/nsIKeyEventInPluginCallback.h
+++ b/system/interface/nsIKeyEventInPluginCallback.h
diff --git a/widget/nsINativeMenuService.h b/system/interface/nsINativeMenuService.h
index 405763fe3..405763fe3 100644
--- a/widget/nsINativeMenuService.h
+++ b/system/interface/nsINativeMenuService.h
diff --git a/widget/nsIPluginWidget.h b/system/interface/nsIPluginWidget.h
index 3ddf79d39..3ddf79d39 100644
--- a/widget/nsIPluginWidget.h
+++ b/system/interface/nsIPluginWidget.h
diff --git a/widget/nsIPrintDialogService.h b/system/interface/nsIPrintDialogService.h
index ef9402835..ef9402835 100644
--- a/widget/nsIPrintDialogService.h
+++ b/system/interface/nsIPrintDialogService.h
diff --git a/widget/nsIPrintSession.idl b/system/interface/nsIPrintSession.idl
index ca7541371..ca7541371 100644
--- a/widget/nsIPrintSession.idl
+++ b/system/interface/nsIPrintSession.idl
diff --git a/widget/nsIPrintSettings.idl b/system/interface/nsIPrintSettings.idl
index 5c391c1ac..5c391c1ac 100644
--- a/widget/nsIPrintSettings.idl
+++ b/system/interface/nsIPrintSettings.idl
diff --git a/widget/nsIPrintSettingsService.idl b/system/interface/nsIPrintSettingsService.idl
index 198581b34..198581b34 100644
--- a/widget/nsIPrintSettingsService.idl
+++ b/system/interface/nsIPrintSettingsService.idl
diff --git a/widget/nsIPrintSettingsWin.idl b/system/interface/nsIPrintSettingsWin.idl
index ae840b085..ae840b085 100644
--- a/widget/nsIPrintSettingsWin.idl
+++ b/system/interface/nsIPrintSettingsWin.idl
diff --git a/widget/nsIPrinterEnumerator.idl b/system/interface/nsIPrinterEnumerator.idl
index d9d00be34..d9d00be34 100644
--- a/widget/nsIPrinterEnumerator.idl
+++ b/system/interface/nsIPrinterEnumerator.idl
diff --git a/widget/nsIRollupListener.h b/system/interface/nsIRollupListener.h
index 83c2dd142..83c2dd142 100644
--- a/widget/nsIRollupListener.h
+++ b/system/interface/nsIRollupListener.h
diff --git a/widget/nsIScreen.idl b/system/interface/nsIScreen.idl
index b1529daf7..b1529daf7 100644
--- a/widget/nsIScreen.idl
+++ b/system/interface/nsIScreen.idl
diff --git a/widget/nsIScreenManager.idl b/system/interface/nsIScreenManager.idl
index 400b5d33b..400b5d33b 100644
--- a/widget/nsIScreenManager.idl
+++ b/system/interface/nsIScreenManager.idl
diff --git a/widget/nsISound.idl b/system/interface/nsISound.idl
index 6f9acc2ce..6f9acc2ce 100644
--- a/widget/nsISound.idl
+++ b/system/interface/nsISound.idl
diff --git a/widget/nsIStandaloneNativeMenu.idl b/system/interface/nsIStandaloneNativeMenu.idl
index 4de2025c8..4de2025c8 100644
--- a/widget/nsIStandaloneNativeMenu.idl
+++ b/system/interface/nsIStandaloneNativeMenu.idl
diff --git a/widget/nsITaskbarOverlayIconController.idl b/system/interface/nsITaskbarOverlayIconController.idl
index f11cf16ed..f11cf16ed 100644
--- a/widget/nsITaskbarOverlayIconController.idl
+++ b/system/interface/nsITaskbarOverlayIconController.idl
diff --git a/widget/nsITaskbarPreview.idl b/system/interface/nsITaskbarPreview.idl
index b246586f8..b246586f8 100644
--- a/widget/nsITaskbarPreview.idl
+++ b/system/interface/nsITaskbarPreview.idl
diff --git a/widget/nsITaskbarPreviewButton.idl b/system/interface/nsITaskbarPreviewButton.idl
index 800d0bc20..800d0bc20 100644
--- a/widget/nsITaskbarPreviewButton.idl
+++ b/system/interface/nsITaskbarPreviewButton.idl
diff --git a/widget/nsITaskbarPreviewController.idl b/system/interface/nsITaskbarPreviewController.idl
index d3e178e6a..d3e178e6a 100644
--- a/widget/nsITaskbarPreviewController.idl
+++ b/system/interface/nsITaskbarPreviewController.idl
diff --git a/widget/nsITaskbarProgress.idl b/system/interface/nsITaskbarProgress.idl
index d81179d31..d81179d31 100644
--- a/widget/nsITaskbarProgress.idl
+++ b/system/interface/nsITaskbarProgress.idl
diff --git a/widget/nsITaskbarTabPreview.idl b/system/interface/nsITaskbarTabPreview.idl
index 0b7ab03cc..0b7ab03cc 100644
--- a/widget/nsITaskbarTabPreview.idl
+++ b/system/interface/nsITaskbarTabPreview.idl
diff --git a/widget/nsITaskbarWindowPreview.idl b/system/interface/nsITaskbarWindowPreview.idl
index f09946793..f09946793 100644
--- a/widget/nsITaskbarWindowPreview.idl
+++ b/system/interface/nsITaskbarWindowPreview.idl
diff --git a/widget/nsITransferable.idl b/system/interface/nsITransferable.idl
index b128586dd..b128586dd 100644
--- a/widget/nsITransferable.idl
+++ b/system/interface/nsITransferable.idl
diff --git a/widget/nsIWidget.h b/system/interface/nsIWidget.h
index 716ed85c4..716ed85c4 100644
--- a/widget/nsIWidget.h
+++ b/system/interface/nsIWidget.h
diff --git a/widget/nsIWidgetListener.cpp b/system/interface/nsIWidgetListener.cpp
index 0d18236cb..0d18236cb 100644
--- a/widget/nsIWidgetListener.cpp
+++ b/system/interface/nsIWidgetListener.cpp
diff --git a/widget/nsIWidgetListener.h b/system/interface/nsIWidgetListener.h
index 63d899be0..63d899be0 100644
--- a/widget/nsIWidgetListener.h
+++ b/system/interface/nsIWidgetListener.h
diff --git a/widget/nsIWinTaskbar.idl b/system/interface/nsIWinTaskbar.idl
index bcc2dd128..bcc2dd128 100644
--- a/widget/nsIWinTaskbar.idl
+++ b/system/interface/nsIWinTaskbar.idl
diff --git a/widget/nsIWindowsUIUtils.idl b/system/interface/nsIWindowsUIUtils.idl
index 331562a67..331562a67 100644
--- a/widget/nsIWindowsUIUtils.idl
+++ b/system/interface/nsIWindowsUIUtils.idl
diff --git a/widget/nsIdleService.cpp b/system/interface/nsIdleService.cpp
index c55fc9ca2..c55fc9ca2 100644
--- a/widget/nsIdleService.cpp
+++ b/system/interface/nsIdleService.cpp
diff --git a/widget/nsIdleService.h b/system/interface/nsIdleService.h
index 17046201d..17046201d 100644
--- a/widget/nsIdleService.h
+++ b/system/interface/nsIdleService.h
diff --git a/widget/nsNativeTheme.cpp b/system/interface/nsNativeTheme.cpp
index 35c5a84f7..35c5a84f7 100644
--- a/widget/nsNativeTheme.cpp
+++ b/system/interface/nsNativeTheme.cpp
diff --git a/widget/nsNativeTheme.h b/system/interface/nsNativeTheme.h
index 621866db4..621866db4 100644
--- a/widget/nsNativeTheme.h
+++ b/system/interface/nsNativeTheme.h
diff --git a/widget/nsPrimitiveHelpers.cpp b/system/interface/nsPrimitiveHelpers.cpp
index 242db3d50..242db3d50 100644
--- a/widget/nsPrimitiveHelpers.cpp
+++ b/system/interface/nsPrimitiveHelpers.cpp
diff --git a/widget/nsPrimitiveHelpers.h b/system/interface/nsPrimitiveHelpers.h
index 952803a66..952803a66 100644
--- a/widget/nsPrimitiveHelpers.h
+++ b/system/interface/nsPrimitiveHelpers.h
diff --git a/widget/nsPrintOptionsImpl.cpp b/system/interface/nsPrintOptionsImpl.cpp
index 97d699a93..97d699a93 100644
--- a/widget/nsPrintOptionsImpl.cpp
+++ b/system/interface/nsPrintOptionsImpl.cpp
diff --git a/widget/nsPrintOptionsImpl.h b/system/interface/nsPrintOptionsImpl.h
index 89ae391fc..89ae391fc 100644
--- a/widget/nsPrintOptionsImpl.h
+++ b/system/interface/nsPrintOptionsImpl.h
diff --git a/widget/nsPrintSession.cpp b/system/interface/nsPrintSession.cpp
index 9b334b424..9b334b424 100644
--- a/widget/nsPrintSession.cpp
+++ b/system/interface/nsPrintSession.cpp
diff --git a/widget/nsPrintSession.h b/system/interface/nsPrintSession.h
index cb349e76f..cb349e76f 100644
--- a/widget/nsPrintSession.h
+++ b/system/interface/nsPrintSession.h
diff --git a/widget/nsPrintSettingsImpl.cpp b/system/interface/nsPrintSettingsImpl.cpp
index 48cce8625..48cce8625 100644
--- a/widget/nsPrintSettingsImpl.cpp
+++ b/system/interface/nsPrintSettingsImpl.cpp
diff --git a/widget/nsPrintSettingsImpl.h b/system/interface/nsPrintSettingsImpl.h
index c28374da4..c28374da4 100644
--- a/widget/nsPrintSettingsImpl.h
+++ b/system/interface/nsPrintSettingsImpl.h
diff --git a/widget/nsScreenManagerProxy.cpp b/system/interface/nsScreenManagerProxy.cpp
index 18f400ff5..18f400ff5 100644
--- a/widget/nsScreenManagerProxy.cpp
+++ b/system/interface/nsScreenManagerProxy.cpp
diff --git a/widget/nsScreenManagerProxy.h b/system/interface/nsScreenManagerProxy.h
index bcfa387a4..bcfa387a4 100644
--- a/widget/nsScreenManagerProxy.h
+++ b/system/interface/nsScreenManagerProxy.h
diff --git a/widget/nsShmImage.cpp b/system/interface/nsShmImage.cpp
index 25d0a8c4b..25d0a8c4b 100644
--- a/widget/nsShmImage.cpp
+++ b/system/interface/nsShmImage.cpp
diff --git a/widget/nsShmImage.h b/system/interface/nsShmImage.h
index dae09c6c8..dae09c6c8 100644
--- a/widget/nsShmImage.h
+++ b/system/interface/nsShmImage.h
diff --git a/widget/nsTransferable.cpp b/system/interface/nsTransferable.cpp
index e99d45401..e99d45401 100644
--- a/widget/nsTransferable.cpp
+++ b/system/interface/nsTransferable.cpp
diff --git a/widget/nsTransferable.h b/system/interface/nsTransferable.h
index d0db18a46..d0db18a46 100644
--- a/widget/nsTransferable.h
+++ b/system/interface/nsTransferable.h
diff --git a/widget/nsWidgetInitData.h b/system/interface/nsWidgetInitData.h
index 9b91f8dda..9b91f8dda 100644
--- a/widget/nsWidgetInitData.h
+++ b/system/interface/nsWidgetInitData.h
diff --git a/widget/nsWidgetsCID.h b/system/interface/nsWidgetsCID.h
index 54ebe63ab..54ebe63ab 100644
--- a/widget/nsWidgetsCID.h
+++ b/system/interface/nsWidgetsCID.h
diff --git a/widget/nsXPLookAndFeel.cpp b/system/interface/nsXPLookAndFeel.cpp
index 28e1c2c5a..28e1c2c5a 100644
--- a/widget/nsXPLookAndFeel.cpp
+++ b/system/interface/nsXPLookAndFeel.cpp
diff --git a/widget/nsXPLookAndFeel.h b/system/interface/nsXPLookAndFeel.h
index 331363f76..331363f76 100644
--- a/widget/nsXPLookAndFeel.h
+++ b/system/interface/nsXPLookAndFeel.h
diff --git a/widget/reftests/507947.html b/system/interface/reftests/507947.html
index 2405850db..2405850db 100644
--- a/widget/reftests/507947.html
+++ b/system/interface/reftests/507947.html
diff --git a/widget/reftests/664925.xhtml b/system/interface/reftests/664925.xhtml
index b4a11a738..b4a11a738 100644
--- a/widget/reftests/664925.xhtml
+++ b/system/interface/reftests/664925.xhtml
diff --git a/widget/reftests/meter-fallback-default-style-ref.html b/system/interface/reftests/meter-fallback-default-style-ref.html
index ea7269881..ea7269881 100644
--- a/widget/reftests/meter-fallback-default-style-ref.html
+++ b/system/interface/reftests/meter-fallback-default-style-ref.html
diff --git a/widget/reftests/meter-fallback-default-style.html b/system/interface/reftests/meter-fallback-default-style.html
index a5942d7e5..a5942d7e5 100644
--- a/widget/reftests/meter-fallback-default-style.html
+++ b/system/interface/reftests/meter-fallback-default-style.html
diff --git a/widget/reftests/meter-native-style-ref.html b/system/interface/reftests/meter-native-style-ref.html
index ce434e9f1..ce434e9f1 100644
--- a/widget/reftests/meter-native-style-ref.html
+++ b/system/interface/reftests/meter-native-style-ref.html
diff --git a/widget/reftests/meter-native-style.html b/system/interface/reftests/meter-native-style.html
index 91342772f..91342772f 100644
--- a/widget/reftests/meter-native-style.html
+++ b/system/interface/reftests/meter-native-style.html
diff --git a/widget/reftests/meter-vertical-native-style-ref.html b/system/interface/reftests/meter-vertical-native-style-ref.html
index 4426fe93e..4426fe93e 100644
--- a/widget/reftests/meter-vertical-native-style-ref.html
+++ b/system/interface/reftests/meter-vertical-native-style-ref.html
diff --git a/widget/reftests/meter-vertical-native-style.html b/system/interface/reftests/meter-vertical-native-style.html
index 445671c5e..445671c5e 100644
--- a/widget/reftests/meter-vertical-native-style.html
+++ b/system/interface/reftests/meter-vertical-native-style.html
diff --git a/widget/reftests/progressbar-fallback-default-style-ref.html b/system/interface/reftests/progressbar-fallback-default-style-ref.html
index 5de4274ec..5de4274ec 100644
--- a/widget/reftests/progressbar-fallback-default-style-ref.html
+++ b/system/interface/reftests/progressbar-fallback-default-style-ref.html
diff --git a/widget/reftests/progressbar-fallback-default-style.html b/system/interface/reftests/progressbar-fallback-default-style.html
index 7594e6555..7594e6555 100644
--- a/widget/reftests/progressbar-fallback-default-style.html
+++ b/system/interface/reftests/progressbar-fallback-default-style.html
diff --git a/widget/reftests/reftest-stylo.list b/system/interface/reftests/reftest-stylo.list
index 86ac4e30e..86ac4e30e 100644
--- a/widget/reftests/reftest-stylo.list
+++ b/system/interface/reftests/reftest-stylo.list
diff --git a/widget/reftests/reftest.list b/system/interface/reftests/reftest.list
index 26057327b..26057327b 100644
--- a/widget/reftests/reftest.list
+++ b/system/interface/reftests/reftest.list
diff --git a/widget/windows/AudioSession.cpp b/system/interface/windows/AudioSession.cpp
index 1a83e2964..1a83e2964 100644
--- a/widget/windows/AudioSession.cpp
+++ b/system/interface/windows/AudioSession.cpp
diff --git a/widget/windows/AudioSession.h b/system/interface/windows/AudioSession.h
index d7c1d3787..d7c1d3787 100644
--- a/widget/windows/AudioSession.h
+++ b/system/interface/windows/AudioSession.h
diff --git a/widget/windows/CompositorWidgetChild.cpp b/system/interface/windows/CompositorWidgetChild.cpp
index 55d71d21e..55d71d21e 100644
--- a/widget/windows/CompositorWidgetChild.cpp
+++ b/system/interface/windows/CompositorWidgetChild.cpp
diff --git a/widget/windows/CompositorWidgetChild.h b/system/interface/windows/CompositorWidgetChild.h
index ee6e90ca9..ee6e90ca9 100644
--- a/widget/windows/CompositorWidgetChild.h
+++ b/system/interface/windows/CompositorWidgetChild.h
diff --git a/widget/windows/CompositorWidgetParent.cpp b/system/interface/windows/CompositorWidgetParent.cpp
index 238141f56..238141f56 100644
--- a/widget/windows/CompositorWidgetParent.cpp
+++ b/system/interface/windows/CompositorWidgetParent.cpp
diff --git a/widget/windows/CompositorWidgetParent.h b/system/interface/windows/CompositorWidgetParent.h
index a2f63bd72..a2f63bd72 100644
--- a/widget/windows/CompositorWidgetParent.h
+++ b/system/interface/windows/CompositorWidgetParent.h
diff --git a/widget/windows/GfxInfo.cpp b/system/interface/windows/GfxInfo.cpp
index ca1128c27..ca1128c27 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/system/interface/windows/GfxInfo.cpp
diff --git a/widget/windows/GfxInfo.h b/system/interface/windows/GfxInfo.h
index c7aa859a6..c7aa859a6 100644
--- a/widget/windows/GfxInfo.h
+++ b/system/interface/windows/GfxInfo.h
diff --git a/widget/windows/IEnumFE.cpp b/system/interface/windows/IEnumFE.cpp
index 4fa76258b..4fa76258b 100644
--- a/widget/windows/IEnumFE.cpp
+++ b/system/interface/windows/IEnumFE.cpp
diff --git a/widget/windows/IEnumFE.h b/system/interface/windows/IEnumFE.h
index d3875865a..d3875865a 100644
--- a/widget/windows/IEnumFE.h
+++ b/system/interface/windows/IEnumFE.h
diff --git a/widget/windows/IMMHandler.cpp b/system/interface/windows/IMMHandler.cpp
index e16517a38..e16517a38 100644
--- a/widget/windows/IMMHandler.cpp
+++ b/system/interface/windows/IMMHandler.cpp
diff --git a/widget/windows/IMMHandler.h b/system/interface/windows/IMMHandler.h
index f3120cfec..f3120cfec 100644
--- a/widget/windows/IMMHandler.h
+++ b/system/interface/windows/IMMHandler.h
diff --git a/widget/windows/InProcessWinCompositorWidget.cpp b/system/interface/windows/InProcessWinCompositorWidget.cpp
index a11790b32..a11790b32 100644
--- a/widget/windows/InProcessWinCompositorWidget.cpp
+++ b/system/interface/windows/InProcessWinCompositorWidget.cpp
diff --git a/widget/windows/InProcessWinCompositorWidget.h b/system/interface/windows/InProcessWinCompositorWidget.h
index afe5a7f53..afe5a7f53 100644
--- a/widget/windows/InProcessWinCompositorWidget.h
+++ b/system/interface/windows/InProcessWinCompositorWidget.h
diff --git a/widget/windows/InkCollector.cpp b/system/interface/windows/InkCollector.cpp
index 9871b9661..9871b9661 100644
--- a/widget/windows/InkCollector.cpp
+++ b/system/interface/windows/InkCollector.cpp
diff --git a/widget/windows/InkCollector.h b/system/interface/windows/InkCollector.h
index b466ef05b..b466ef05b 100644
--- a/widget/windows/InkCollector.h
+++ b/system/interface/windows/InkCollector.h
diff --git a/widget/windows/JumpListBuilder.cpp b/system/interface/windows/JumpListBuilder.cpp
index 566c41d4a..566c41d4a 100644
--- a/widget/windows/JumpListBuilder.cpp
+++ b/system/interface/windows/JumpListBuilder.cpp
diff --git a/widget/windows/JumpListBuilder.h b/system/interface/windows/JumpListBuilder.h
index 553ff765d..553ff765d 100644
--- a/widget/windows/JumpListBuilder.h
+++ b/system/interface/windows/JumpListBuilder.h
diff --git a/widget/windows/JumpListItem.cpp b/system/interface/windows/JumpListItem.cpp
index 57dff6466..57dff6466 100644
--- a/widget/windows/JumpListItem.cpp
+++ b/system/interface/windows/JumpListItem.cpp
diff --git a/widget/windows/JumpListItem.h b/system/interface/windows/JumpListItem.h
index 1e3152ae0..1e3152ae0 100644
--- a/widget/windows/JumpListItem.h
+++ b/system/interface/windows/JumpListItem.h
diff --git a/widget/windows/KeyboardLayout.cpp b/system/interface/windows/KeyboardLayout.cpp
index b4801fa19..b4801fa19 100644
--- a/widget/windows/KeyboardLayout.cpp
+++ b/system/interface/windows/KeyboardLayout.cpp
diff --git a/widget/windows/KeyboardLayout.h b/system/interface/windows/KeyboardLayout.h
index 70aacc80e..70aacc80e 100644
--- a/widget/windows/KeyboardLayout.h
+++ b/system/interface/windows/KeyboardLayout.h
diff --git a/widget/windows/PCompositorWidget.ipdl b/system/interface/windows/PCompositorWidget.ipdl
index 1a9c65e12..1a9c65e12 100644
--- a/widget/windows/PCompositorWidget.ipdl
+++ b/system/interface/windows/PCompositorWidget.ipdl
diff --git a/widget/windows/PlatformWidgetTypes.ipdlh b/system/interface/windows/PlatformWidgetTypes.ipdlh
index 1ebc54769..1ebc54769 100644
--- a/widget/windows/PlatformWidgetTypes.ipdlh
+++ b/system/interface/windows/PlatformWidgetTypes.ipdlh
diff --git a/widget/windows/TSFTextStore.cpp b/system/interface/windows/TSFTextStore.cpp
index 12b8cd0c1..12b8cd0c1 100644
--- a/widget/windows/TSFTextStore.cpp
+++ b/system/interface/windows/TSFTextStore.cpp
diff --git a/widget/windows/TSFTextStore.h b/system/interface/windows/TSFTextStore.h
index d1431e95d..d1431e95d 100644
--- a/widget/windows/TSFTextStore.h
+++ b/system/interface/windows/TSFTextStore.h
diff --git a/widget/windows/TaskbarPreview.cpp b/system/interface/windows/TaskbarPreview.cpp
index e7f449caf..e7f449caf 100644
--- a/widget/windows/TaskbarPreview.cpp
+++ b/system/interface/windows/TaskbarPreview.cpp
diff --git a/widget/windows/TaskbarPreview.h b/system/interface/windows/TaskbarPreview.h
index d5f6b86f1..d5f6b86f1 100644
--- a/widget/windows/TaskbarPreview.h
+++ b/system/interface/windows/TaskbarPreview.h
diff --git a/widget/windows/TaskbarPreviewButton.cpp b/system/interface/windows/TaskbarPreviewButton.cpp
index 69cea3809..69cea3809 100644
--- a/widget/windows/TaskbarPreviewButton.cpp
+++ b/system/interface/windows/TaskbarPreviewButton.cpp
diff --git a/widget/windows/TaskbarPreviewButton.h b/system/interface/windows/TaskbarPreviewButton.h
index 2b4342d15..2b4342d15 100644
--- a/widget/windows/TaskbarPreviewButton.h
+++ b/system/interface/windows/TaskbarPreviewButton.h
diff --git a/widget/windows/TaskbarTabPreview.cpp b/system/interface/windows/TaskbarTabPreview.cpp
index c89fecb32..c89fecb32 100644
--- a/widget/windows/TaskbarTabPreview.cpp
+++ b/system/interface/windows/TaskbarTabPreview.cpp
diff --git a/widget/windows/TaskbarTabPreview.h b/system/interface/windows/TaskbarTabPreview.h
index 3d043a141..3d043a141 100644
--- a/widget/windows/TaskbarTabPreview.h
+++ b/system/interface/windows/TaskbarTabPreview.h
diff --git a/widget/windows/TaskbarWindowPreview.cpp b/system/interface/windows/TaskbarWindowPreview.cpp
index c3d005252..c3d005252 100644
--- a/widget/windows/TaskbarWindowPreview.cpp
+++ b/system/interface/windows/TaskbarWindowPreview.cpp
diff --git a/widget/windows/TaskbarWindowPreview.h b/system/interface/windows/TaskbarWindowPreview.h
index d0719f739..d0719f739 100644
--- a/widget/windows/TaskbarWindowPreview.h
+++ b/system/interface/windows/TaskbarWindowPreview.h
diff --git a/widget/windows/WidgetTraceEvent.cpp b/system/interface/windows/WidgetTraceEvent.cpp
index 589449af8..589449af8 100644
--- a/widget/windows/WidgetTraceEvent.cpp
+++ b/system/interface/windows/WidgetTraceEvent.cpp
diff --git a/widget/windows/WinCompositorWidget.cpp b/system/interface/windows/WinCompositorWidget.cpp
index 99ce67573..99ce67573 100644
--- a/widget/windows/WinCompositorWidget.cpp
+++ b/system/interface/windows/WinCompositorWidget.cpp
diff --git a/widget/windows/WinCompositorWidget.h b/system/interface/windows/WinCompositorWidget.h
index 1689a8641..1689a8641 100644
--- a/widget/windows/WinCompositorWidget.h
+++ b/system/interface/windows/WinCompositorWidget.h
diff --git a/widget/windows/WinIMEHandler.cpp b/system/interface/windows/WinIMEHandler.cpp
index f411cdd50..f411cdd50 100644
--- a/widget/windows/WinIMEHandler.cpp
+++ b/system/interface/windows/WinIMEHandler.cpp
diff --git a/widget/windows/WinIMEHandler.h b/system/interface/windows/WinIMEHandler.h
index c836e8626..c836e8626 100644
--- a/widget/windows/WinIMEHandler.h
+++ b/system/interface/windows/WinIMEHandler.h
diff --git a/widget/windows/WinMessages.h b/system/interface/windows/WinMessages.h
index e722a3836..e722a3836 100644
--- a/widget/windows/WinMessages.h
+++ b/system/interface/windows/WinMessages.h
diff --git a/widget/windows/WinModifierKeyState.h b/system/interface/windows/WinModifierKeyState.h
index f2c1704b9..f2c1704b9 100644
--- a/widget/windows/WinModifierKeyState.h
+++ b/system/interface/windows/WinModifierKeyState.h
diff --git a/widget/windows/WinMouseScrollHandler.cpp b/system/interface/windows/WinMouseScrollHandler.cpp
index ef6b92ea4..ef6b92ea4 100644
--- a/widget/windows/WinMouseScrollHandler.cpp
+++ b/system/interface/windows/WinMouseScrollHandler.cpp
diff --git a/widget/windows/WinMouseScrollHandler.h b/system/interface/windows/WinMouseScrollHandler.h
index 7ebd551ea..7ebd551ea 100644
--- a/widget/windows/WinMouseScrollHandler.h
+++ b/system/interface/windows/WinMouseScrollHandler.h
diff --git a/widget/windows/WinNativeEventData.h b/system/interface/windows/WinNativeEventData.h
index 5ed5ca44a..5ed5ca44a 100644
--- a/widget/windows/WinNativeEventData.h
+++ b/system/interface/windows/WinNativeEventData.h
diff --git a/widget/windows/WinTaskbar.cpp b/system/interface/windows/WinTaskbar.cpp
index 530cfd5b9..530cfd5b9 100644
--- a/widget/windows/WinTaskbar.cpp
+++ b/system/interface/windows/WinTaskbar.cpp
diff --git a/widget/windows/WinTaskbar.h b/system/interface/windows/WinTaskbar.h
index 46968737d..46968737d 100644
--- a/widget/windows/WinTaskbar.h
+++ b/system/interface/windows/WinTaskbar.h
diff --git a/widget/windows/WinTextEventDispatcherListener.cpp b/system/interface/windows/WinTextEventDispatcherListener.cpp
index 156c7a79b..156c7a79b 100644
--- a/widget/windows/WinTextEventDispatcherListener.cpp
+++ b/system/interface/windows/WinTextEventDispatcherListener.cpp
diff --git a/widget/windows/WinTextEventDispatcherListener.h b/system/interface/windows/WinTextEventDispatcherListener.h
index d4e7965d9..d4e7965d9 100644
--- a/widget/windows/WinTextEventDispatcherListener.h
+++ b/system/interface/windows/WinTextEventDispatcherListener.h
diff --git a/widget/windows/WinUtils.cpp b/system/interface/windows/WinUtils.cpp
index 442ffeaf7..442ffeaf7 100644
--- a/widget/windows/WinUtils.cpp
+++ b/system/interface/windows/WinUtils.cpp
diff --git a/widget/windows/WinUtils.h b/system/interface/windows/WinUtils.h
index f268f907f..f268f907f 100644
--- a/widget/windows/WinUtils.h
+++ b/system/interface/windows/WinUtils.h
diff --git a/widget/windows/WindowHook.cpp b/system/interface/windows/WindowHook.cpp
index b2a3167d3..b2a3167d3 100644
--- a/widget/windows/WindowHook.cpp
+++ b/system/interface/windows/WindowHook.cpp
diff --git a/widget/windows/WindowHook.h b/system/interface/windows/WindowHook.h
index 69df4eb2f..69df4eb2f 100644
--- a/widget/windows/WindowHook.h
+++ b/system/interface/windows/WindowHook.h
diff --git a/widget/windows/WindowsUIUtils.cpp b/system/interface/windows/WindowsUIUtils.cpp
index 1c270b5ec..1c270b5ec 100644
--- a/widget/windows/WindowsUIUtils.cpp
+++ b/system/interface/windows/WindowsUIUtils.cpp
diff --git a/widget/windows/WindowsUIUtils.h b/system/interface/windows/WindowsUIUtils.h
index a33c93a94..a33c93a94 100644
--- a/widget/windows/WindowsUIUtils.h
+++ b/system/interface/windows/WindowsUIUtils.h
diff --git a/widget/windows/moz.build b/system/interface/windows/moz.build
index 22ae4a755..926518057 100644
--- a/widget/windows/moz.build
+++ b/system/interface/windows/moz.build
@@ -94,10 +94,10 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '..',
     '/layout/generic',
     '/layout/xul',
     '/system/runtime',
-    '/widget',
     '/xpcom/base',
 ]
 
diff --git a/widget/windows/nsAppShell.cpp b/system/interface/windows/nsAppShell.cpp
index e63d57d89..e63d57d89 100644
--- a/widget/windows/nsAppShell.cpp
+++ b/system/interface/windows/nsAppShell.cpp
diff --git a/widget/windows/nsAppShell.h b/system/interface/windows/nsAppShell.h
index 199c30009..199c30009 100644
--- a/widget/windows/nsAppShell.h
+++ b/system/interface/windows/nsAppShell.h
diff --git a/widget/windows/nsBidiKeyboard.cpp b/system/interface/windows/nsBidiKeyboard.cpp
index 1fac24d6c..1fac24d6c 100644
--- a/widget/windows/nsBidiKeyboard.cpp
+++ b/system/interface/windows/nsBidiKeyboard.cpp
diff --git a/widget/windows/nsBidiKeyboard.h b/system/interface/windows/nsBidiKeyboard.h
index b3b56f48f..b3b56f48f 100644
--- a/widget/windows/nsBidiKeyboard.h
+++ b/system/interface/windows/nsBidiKeyboard.h
diff --git a/widget/windows/nsClipboard.cpp b/system/interface/windows/nsClipboard.cpp
index 0ca9568d0..0ca9568d0 100644
--- a/widget/windows/nsClipboard.cpp
+++ b/system/interface/windows/nsClipboard.cpp
diff --git a/widget/windows/nsClipboard.h b/system/interface/windows/nsClipboard.h
index 18308d6db..18308d6db 100644
--- a/widget/windows/nsClipboard.h
+++ b/system/interface/windows/nsClipboard.h
diff --git a/widget/windows/nsColorPicker.cpp b/system/interface/windows/nsColorPicker.cpp
index 777169f97..777169f97 100644
--- a/widget/windows/nsColorPicker.cpp
+++ b/system/interface/windows/nsColorPicker.cpp
diff --git a/widget/windows/nsColorPicker.h b/system/interface/windows/nsColorPicker.h
index 2227ba604..2227ba604 100644
--- a/widget/windows/nsColorPicker.h
+++ b/system/interface/windows/nsColorPicker.h
diff --git a/widget/windows/nsDataObj.cpp b/system/interface/windows/nsDataObj.cpp
index 80abf3521..80abf3521 100644
--- a/widget/windows/nsDataObj.cpp
+++ b/system/interface/windows/nsDataObj.cpp
diff --git a/widget/windows/nsDataObj.h b/system/interface/windows/nsDataObj.h
index 61f209e85..61f209e85 100644
--- a/widget/windows/nsDataObj.h
+++ b/system/interface/windows/nsDataObj.h
diff --git a/widget/windows/nsDataObjCollection.cpp b/system/interface/windows/nsDataObjCollection.cpp
index 7399272e7..7399272e7 100644
--- a/widget/windows/nsDataObjCollection.cpp
+++ b/system/interface/windows/nsDataObjCollection.cpp
diff --git a/widget/windows/nsDataObjCollection.h b/system/interface/windows/nsDataObjCollection.h
index 06bd36a7d..06bd36a7d 100644
--- a/widget/windows/nsDataObjCollection.h
+++ b/system/interface/windows/nsDataObjCollection.h
diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/system/interface/windows/nsDeviceContextSpecWin.cpp
index b7750be58..b7750be58 100644
--- a/widget/windows/nsDeviceContextSpecWin.cpp
+++ b/system/interface/windows/nsDeviceContextSpecWin.cpp
diff --git a/widget/windows/nsDeviceContextSpecWin.h b/system/interface/windows/nsDeviceContextSpecWin.h
index e3706a291..e3706a291 100644
--- a/widget/windows/nsDeviceContextSpecWin.h
+++ b/system/interface/windows/nsDeviceContextSpecWin.h
diff --git a/widget/windows/nsDragService.cpp b/system/interface/windows/nsDragService.cpp
index 0040f550f..0040f550f 100644
--- a/widget/windows/nsDragService.cpp
+++ b/system/interface/windows/nsDragService.cpp
diff --git a/widget/windows/nsDragService.h b/system/interface/windows/nsDragService.h
index 7a2d29709..7a2d29709 100644
--- a/widget/windows/nsDragService.h
+++ b/system/interface/windows/nsDragService.h
diff --git a/widget/windows/nsFilePicker.cpp b/system/interface/windows/nsFilePicker.cpp
index 59ae152ec..59ae152ec 100644
--- a/widget/windows/nsFilePicker.cpp
+++ b/system/interface/windows/nsFilePicker.cpp
diff --git a/widget/windows/nsFilePicker.h b/system/interface/windows/nsFilePicker.h
index 7a3fbbe07..7a3fbbe07 100644
--- a/widget/windows/nsFilePicker.h
+++ b/system/interface/windows/nsFilePicker.h
diff --git a/widget/windows/nsIdleServiceWin.cpp b/system/interface/windows/nsIdleServiceWin.cpp
index 4bafe7253..4bafe7253 100644
--- a/widget/windows/nsIdleServiceWin.cpp
+++ b/system/interface/windows/nsIdleServiceWin.cpp
diff --git a/widget/windows/nsIdleServiceWin.h b/system/interface/windows/nsIdleServiceWin.h
index c3fb1243f..c3fb1243f 100644
--- a/widget/windows/nsIdleServiceWin.h
+++ b/system/interface/windows/nsIdleServiceWin.h
diff --git a/widget/windows/nsLookAndFeel.cpp b/system/interface/windows/nsLookAndFeel.cpp
index a907622d9..a907622d9 100644
--- a/widget/windows/nsLookAndFeel.cpp
+++ b/system/interface/windows/nsLookAndFeel.cpp
diff --git a/widget/windows/nsLookAndFeel.h b/system/interface/windows/nsLookAndFeel.h
index a77808322..a77808322 100644
--- a/widget/windows/nsLookAndFeel.h
+++ b/system/interface/windows/nsLookAndFeel.h
diff --git a/widget/windows/nsNativeDragSource.cpp b/system/interface/windows/nsNativeDragSource.cpp
index 857907076..857907076 100644
--- a/widget/windows/nsNativeDragSource.cpp
+++ b/system/interface/windows/nsNativeDragSource.cpp
diff --git a/widget/windows/nsNativeDragSource.h b/system/interface/windows/nsNativeDragSource.h
index 19d127599..19d127599 100644
--- a/widget/windows/nsNativeDragSource.h
+++ b/system/interface/windows/nsNativeDragSource.h
diff --git a/widget/windows/nsNativeDragTarget.cpp b/system/interface/windows/nsNativeDragTarget.cpp
index 1686642a3..1686642a3 100644
--- a/widget/windows/nsNativeDragTarget.cpp
+++ b/system/interface/windows/nsNativeDragTarget.cpp
diff --git a/widget/windows/nsNativeDragTarget.h b/system/interface/windows/nsNativeDragTarget.h
index fbc28fc92..fbc28fc92 100644
--- a/widget/windows/nsNativeDragTarget.h
+++ b/system/interface/windows/nsNativeDragTarget.h
diff --git a/widget/windows/nsNativeThemeWin.cpp b/system/interface/windows/nsNativeThemeWin.cpp
index 40bc3d7c2..40bc3d7c2 100644
--- a/widget/windows/nsNativeThemeWin.cpp
+++ b/system/interface/windows/nsNativeThemeWin.cpp
diff --git a/widget/windows/nsNativeThemeWin.h b/system/interface/windows/nsNativeThemeWin.h
index 32b82b1e1..32b82b1e1 100644
--- a/widget/windows/nsNativeThemeWin.h
+++ b/system/interface/windows/nsNativeThemeWin.h
diff --git a/widget/windows/nsPrintOptionsWin.cpp b/system/interface/windows/nsPrintOptionsWin.cpp
index 97b15fa3f..97b15fa3f 100644
--- a/widget/windows/nsPrintOptionsWin.cpp
+++ b/system/interface/windows/nsPrintOptionsWin.cpp
diff --git a/widget/windows/nsPrintOptionsWin.h b/system/interface/windows/nsPrintOptionsWin.h
index 7a8a89fc9..7a8a89fc9 100644
--- a/widget/windows/nsPrintOptionsWin.h
+++ b/system/interface/windows/nsPrintOptionsWin.h
diff --git a/widget/windows/nsPrintSettingsWin.cpp b/system/interface/windows/nsPrintSettingsWin.cpp
index 80e73e530..80e73e530 100644
--- a/widget/windows/nsPrintSettingsWin.cpp
+++ b/system/interface/windows/nsPrintSettingsWin.cpp
diff --git a/widget/windows/nsPrintSettingsWin.h b/system/interface/windows/nsPrintSettingsWin.h
index d4a31b41e..d4a31b41e 100644
--- a/widget/windows/nsPrintSettingsWin.h
+++ b/system/interface/windows/nsPrintSettingsWin.h
diff --git a/widget/windows/nsScreenManagerWin.cpp b/system/interface/windows/nsScreenManagerWin.cpp
index 5440be7dd..5440be7dd 100644
--- a/widget/windows/nsScreenManagerWin.cpp
+++ b/system/interface/windows/nsScreenManagerWin.cpp
diff --git a/widget/windows/nsScreenManagerWin.h b/system/interface/windows/nsScreenManagerWin.h
index c4757418a..c4757418a 100644
--- a/widget/windows/nsScreenManagerWin.h
+++ b/system/interface/windows/nsScreenManagerWin.h
diff --git a/widget/windows/nsScreenWin.cpp b/system/interface/windows/nsScreenWin.cpp
index beacbf05f..beacbf05f 100644
--- a/widget/windows/nsScreenWin.cpp
+++ b/system/interface/windows/nsScreenWin.cpp
diff --git a/widget/windows/nsScreenWin.h b/system/interface/windows/nsScreenWin.h
index 0560c5534..0560c5534 100644
--- a/widget/windows/nsScreenWin.h
+++ b/system/interface/windows/nsScreenWin.h
diff --git a/widget/windows/nsSound.cpp b/system/interface/windows/nsSound.cpp
index a7e3f8e7c..a7e3f8e7c 100644
--- a/widget/windows/nsSound.cpp
+++ b/system/interface/windows/nsSound.cpp
diff --git a/widget/windows/nsSound.h b/system/interface/windows/nsSound.h
index fc3ea30ca..fc3ea30ca 100644
--- a/widget/windows/nsSound.h
+++ b/system/interface/windows/nsSound.h
diff --git a/widget/windows/nsToolkit.cpp b/system/interface/windows/nsToolkit.cpp
index 6c3cc0508..6c3cc0508 100644
--- a/widget/windows/nsToolkit.cpp
+++ b/system/interface/windows/nsToolkit.cpp
diff --git a/widget/windows/nsToolkit.h b/system/interface/windows/nsToolkit.h
index 14bb22c18..14bb22c18 100644
--- a/widget/windows/nsToolkit.h
+++ b/system/interface/windows/nsToolkit.h
diff --git a/widget/windows/nsUXThemeConstants.h b/system/interface/windows/nsUXThemeConstants.h
index ba7afde82..ba7afde82 100644
--- a/widget/windows/nsUXThemeConstants.h
+++ b/system/interface/windows/nsUXThemeConstants.h
diff --git a/widget/windows/nsUXThemeData.cpp b/system/interface/windows/nsUXThemeData.cpp
index e13f1234d..e13f1234d 100644
--- a/widget/windows/nsUXThemeData.cpp
+++ b/system/interface/windows/nsUXThemeData.cpp
diff --git a/widget/windows/nsUXThemeData.h b/system/interface/windows/nsUXThemeData.h
index 84894cd4e..84894cd4e 100644
--- a/widget/windows/nsUXThemeData.h
+++ b/system/interface/windows/nsUXThemeData.h
diff --git a/widget/windows/nsWidgetFactory.cpp b/system/interface/windows/nsWidgetFactory.cpp
index 7e6ffd638..7e6ffd638 100644
--- a/widget/windows/nsWidgetFactory.cpp
+++ b/system/interface/windows/nsWidgetFactory.cpp
diff --git a/widget/windows/nsWinGesture.cpp b/system/interface/windows/nsWinGesture.cpp
index faec5ec22..faec5ec22 100644
--- a/widget/windows/nsWinGesture.cpp
+++ b/system/interface/windows/nsWinGesture.cpp
diff --git a/widget/windows/nsWinGesture.h b/system/interface/windows/nsWinGesture.h
index fdd1588b6..fdd1588b6 100644
--- a/widget/windows/nsWinGesture.h
+++ b/system/interface/windows/nsWinGesture.h
diff --git a/widget/windows/nsWindow.cpp b/system/interface/windows/nsWindow.cpp
index 6a0087298..6a0087298 100644
--- a/widget/windows/nsWindow.cpp
+++ b/system/interface/windows/nsWindow.cpp
diff --git a/widget/windows/nsWindow.h b/system/interface/windows/nsWindow.h
index ec4a1f019..ec4a1f019 100644
--- a/widget/windows/nsWindow.h
+++ b/system/interface/windows/nsWindow.h
diff --git a/widget/windows/nsWindowBase.cpp b/system/interface/windows/nsWindowBase.cpp
index a374b3635..a374b3635 100644
--- a/widget/windows/nsWindowBase.cpp
+++ b/system/interface/windows/nsWindowBase.cpp
diff --git a/widget/windows/nsWindowBase.h b/system/interface/windows/nsWindowBase.h
index 405f5b359..405f5b359 100644
--- a/widget/windows/nsWindowBase.h
+++ b/system/interface/windows/nsWindowBase.h
diff --git a/widget/windows/nsWindowDbg.cpp b/system/interface/windows/nsWindowDbg.cpp
index d5bfcddd9..d5bfcddd9 100644
--- a/widget/windows/nsWindowDbg.cpp
+++ b/system/interface/windows/nsWindowDbg.cpp
diff --git a/widget/windows/nsWindowDbg.h b/system/interface/windows/nsWindowDbg.h
index 660769952..660769952 100644
--- a/widget/windows/nsWindowDbg.h
+++ b/system/interface/windows/nsWindowDbg.h
diff --git a/widget/windows/nsWindowDefs.h b/system/interface/windows/nsWindowDefs.h
index 48a9356d2..48a9356d2 100644
--- a/widget/windows/nsWindowDefs.h
+++ b/system/interface/windows/nsWindowDefs.h
diff --git a/widget/windows/nsWindowGfx.cpp b/system/interface/windows/nsWindowGfx.cpp
index 5a5551753..5a5551753 100644
--- a/widget/windows/nsWindowGfx.cpp
+++ b/system/interface/windows/nsWindowGfx.cpp
diff --git a/widget/windows/nsWindowGfx.h b/system/interface/windows/nsWindowGfx.h
index 3f4d76362..3f4d76362 100644
--- a/widget/windows/nsWindowGfx.h
+++ b/system/interface/windows/nsWindowGfx.h
diff --git a/widget/windows/nsdefs.h b/system/interface/windows/nsdefs.h
index 4e0c1c397..4e0c1c397 100644
--- a/widget/windows/nsdefs.h
+++ b/system/interface/windows/nsdefs.h
diff --git a/widget/windows/res/aliasb.cur b/system/interface/windows/res/aliasb.cur
index 8d9ac9478..8d9ac9478 100644
--- a/widget/windows/res/aliasb.cur
+++ b/system/interface/windows/res/aliasb.cur
diff --git a/widget/windows/res/cell.cur b/system/interface/windows/res/cell.cur
index decfbdcac..decfbdcac 100644
--- a/widget/windows/res/cell.cur
+++ b/system/interface/windows/res/cell.cur
diff --git a/widget/windows/res/col_resize.cur b/system/interface/windows/res/col_resize.cur
index 8f7f67512..8f7f67512 100644
--- a/widget/windows/res/col_resize.cur
+++ b/system/interface/windows/res/col_resize.cur
diff --git a/widget/windows/res/copy.cur b/system/interface/windows/res/copy.cur
index 87f1519cd..87f1519cd 100644
--- a/widget/windows/res/copy.cur
+++ b/system/interface/windows/res/copy.cur
diff --git a/widget/windows/res/grab.cur b/system/interface/windows/res/grab.cur
index db7ad5aed..db7ad5aed 100644
--- a/widget/windows/res/grab.cur
+++ b/system/interface/windows/res/grab.cur
diff --git a/widget/windows/res/grabbing.cur b/system/interface/windows/res/grabbing.cur
index e0dfd04e4..e0dfd04e4 100644
--- a/widget/windows/res/grabbing.cur
+++ b/system/interface/windows/res/grabbing.cur
diff --git a/widget/windows/res/none.cur b/system/interface/windows/res/none.cur
index 2114dfaee..2114dfaee 100644
--- a/widget/windows/res/none.cur
+++ b/system/interface/windows/res/none.cur
diff --git a/widget/windows/res/row_resize.cur b/system/interface/windows/res/row_resize.cur
index a7369d32d..a7369d32d 100644
--- a/widget/windows/res/row_resize.cur
+++ b/system/interface/windows/res/row_resize.cur
diff --git a/widget/windows/res/select.cur b/system/interface/windows/res/select.cur
index 5a88b3707..5a88b3707 100644
--- a/widget/windows/res/select.cur
+++ b/system/interface/windows/res/select.cur
diff --git a/widget/windows/res/vertical_text.cur b/system/interface/windows/res/vertical_text.cur
index 3de04ebec..3de04ebec 100644
--- a/widget/windows/res/vertical_text.cur
+++ b/system/interface/windows/res/vertical_text.cur
diff --git a/widget/windows/res/zoom_in.cur b/system/interface/windows/res/zoom_in.cur
index b594d7927..b594d7927 100644
--- a/widget/windows/res/zoom_in.cur
+++ b/system/interface/windows/res/zoom_in.cur
diff --git a/widget/windows/res/zoom_out.cur b/system/interface/windows/res/zoom_out.cur
index 7e495fbaa..7e495fbaa 100644
--- a/widget/windows/res/zoom_out.cur
+++ b/system/interface/windows/res/zoom_out.cur
diff --git a/widget/windows/resource.h b/system/interface/windows/resource.h
index 45258ab2b..45258ab2b 100644
--- a/widget/windows/resource.h
+++ b/system/interface/windows/resource.h
diff --git a/widget/windows/tests/TestWinDND.cpp b/system/interface/windows/tests/TestWinDND.cpp
index 096633b09..096633b09 100644
--- a/widget/windows/tests/TestWinDND.cpp
+++ b/system/interface/windows/tests/TestWinDND.cpp
diff --git a/widget/windows/tests/moz.build b/system/interface/windows/tests/moz.build
index 83ed8d9d9..83ed8d9d9 100644
--- a/widget/windows/tests/moz.build
+++ b/system/interface/windows/tests/moz.build
diff --git a/widget/windows/touchinjection_sdk80.h b/system/interface/windows/touchinjection_sdk80.h
index e93f62089..e93f62089 100644
--- a/widget/windows/touchinjection_sdk80.h
+++ b/system/interface/windows/touchinjection_sdk80.h
diff --git a/widget/windows/widget.rc b/system/interface/windows/widget.rc
index 9361f9e48..9361f9e48 100644
--- a/widget/windows/widget.rc
+++ b/system/interface/windows/widget.rc
diff --git a/widget/x11/keysym2ucs.c b/system/interface/x11/keysym2ucs.c
index 9ea0fbbfb..9ea0fbbfb 100644
--- a/widget/x11/keysym2ucs.c
+++ b/system/interface/x11/keysym2ucs.c
diff --git a/widget/x11/keysym2ucs.h b/system/interface/x11/keysym2ucs.h
index d3c49a629..d3c49a629 100644
--- a/widget/x11/keysym2ucs.h
+++ b/system/interface/x11/keysym2ucs.h
diff --git a/widget/x11/moz.build b/system/interface/x11/moz.build
index 2d5229fc8..2d5229fc8 100644
--- a/widget/x11/moz.build
+++ b/system/interface/x11/moz.build
diff --git a/widget/xremoteclient/XRemoteClient.cpp b/system/interface/xremoteclient/XRemoteClient.cpp
index c4567f3cb..c4567f3cb 100644
--- a/widget/xremoteclient/XRemoteClient.cpp
+++ b/system/interface/xremoteclient/XRemoteClient.cpp
diff --git a/widget/xremoteclient/XRemoteClient.h b/system/interface/xremoteclient/XRemoteClient.h
index 840716ad9..840716ad9 100644
--- a/widget/xremoteclient/XRemoteClient.h
+++ b/system/interface/xremoteclient/XRemoteClient.h
diff --git a/widget/xremoteclient/moz.build b/system/interface/xremoteclient/moz.build
index cac9f2d49..cac9f2d49 100644
--- a/widget/xremoteclient/moz.build
+++ b/system/interface/xremoteclient/moz.build
diff --git a/widget/xremoteclient/nsRemoteClient.h b/system/interface/xremoteclient/nsRemoteClient.h
index 6d90d693f..6d90d693f 100644
--- a/widget/xremoteclient/nsRemoteClient.h
+++ b/system/interface/xremoteclient/nsRemoteClient.h
diff --git a/system/moz.build b/system/moz.build
index be050809f..ed89b69cf 100644
--- a/system/moz.build
+++ b/system/moz.build
@@ -6,6 +6,7 @@
 DIRS += [
   'docshell',
   'graphics',
+  'interface',
 ]
 
 DIRS += ['runtime']
diff --git a/system/runtime/moz.build b/system/runtime/moz.build
index 41560fc3c..a14248287 100644
--- a/system/runtime/moz.build
+++ b/system/runtime/moz.build
@@ -114,7 +114,7 @@ LOCAL_INCLUDES += [
 
 if CONFIG['MOZ_ENABLE_XREMOTE']:
     LOCAL_INCLUDES += [
-        '/widget/xremoteclient',
+        '/system/interface/xremoteclient',
     ]
 
 CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index 19671af27..2ac08e1f5 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -60,7 +60,6 @@ DIRS += [
     '/caps',
     '/image',
     '/dom',
-    '/widget',
     '/editor',
     '/layout',
     '/embedding',
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index e0be9bc20..e5975b54a 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -65,7 +65,7 @@ include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../layout/view/crashtests/crashtests.list
 
-include ../../widget/crashtests/crashtests.list
-include ../../widget/gtk/crashtests/crashtests.list
+include ../../system/interface/crashtests/crashtests.list
+include ../../system/interface/gtk/crashtests/crashtests.list
 
 include ../../xpcom/string/crashtests/crashtests.list