diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build
index 224d84492a6..af814ccaa68 100644
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -64,7 +64,7 @@ LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/style',
     '../../../layout/svg',
-    '../../../layout/xul/base/src',
+    '../../../layout/xul',
     '../../../layout/xul/tree/',
     '../generic',
     '../html',
diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build
index 5db24877cd1..2694aed6b17 100644
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -27,7 +27,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '../../../layout/generic',
-    '../../../layout/xul/base/src',
+    '../../../layout/xul',
     '../base',
     '../html',
     '../xpcom',
diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build
index 4452eb34e97..c5d249db2b4 100644
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -18,7 +18,7 @@ UNIFIED_SOURCES += [
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/tables',
-    '../../../layout/xul/base/src',
+    '../../../layout/xul',
     '../base',
     '../generic',
     '../xpcom',
diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build
index 91a37b16f87..c175be69e19 100644
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -32,7 +32,7 @@ LOCAL_INCLUDES += [
     '../html',
     '../xul',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/widget/cocoa',
     '/widget/xpwidgets',
 ]
diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build
index 6584b0b55c8..fd1f5ba117b 100644
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -21,8 +21,8 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '../../../layout/generic',
-    '../../../layout/xul/base/src',
-    '../../../layout/xul/tree//',
+    '../../../layout/xul',
+    '../../../layout/xul/tree',
     '../base',
     '../generic',
     '../html',
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index c37867568c8..da356a949d4 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -215,6 +215,6 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/netwerk/base/src',
 ]
diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build
index de0a7dfe167..fe1cd29f2c1 100644
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -95,6 +95,6 @@ LOCAL_INCLUDES += [
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
 
diff --git a/content/events/src/moz.build b/content/events/src/moz.build
index 3deaa99424e..c4c306f01fd 100644
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -87,7 +87,7 @@ LOCAL_INCLUDES += [
     '/dom/settings',
     '/dom/src/storage',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/layout/xul/tree/',
 ]
 
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index 478346192d8..b27e1d8c960 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -179,7 +179,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/netwerk/base/src',
     '/xpcom/ds',
 ]
diff --git a/content/media/moz.build b/content/media/moz.build
index 4ed1347e042..b09fbca9bb3 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -164,7 +164,7 @@ FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
 
 if CONFIG['MOZ_DIRECTSHOW']:
diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build
index 8b13994c1e9..302a7dde506 100644
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -259,6 +259,6 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
 
diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build
index 71467e7762b..282472b4595 100644
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -26,7 +26,7 @@ LOCAL_INCLUDES += [
     '/content/xml/document/src',
     '/layout/generic',
     '/layout/style',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/xpcom/ds',
 ]
 
diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build
index 0b877f4b9ec..7ec6cc3f529 100644
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -33,7 +33,7 @@ LOCAL_INCLUDES += [
     '/layout/base',
     '/layout/generic',
     '/layout/style',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/xpcom/ds',
 ]
 
diff --git a/docshell/base/moz.build b/docshell/base/moz.build
index f772af88a90..5db6181b7a3 100644
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -79,7 +79,7 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/layout/base',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/netwerk/protocol/viewsource',
     '/xpcom/ds',
 ]
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 6f5bdaef6e4..95b3f93d644 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -145,7 +145,7 @@ LOCAL_INCLUDES += [
     '/content/xul/document/src',
     '/layout/generic',
     '/layout/style',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index a11fd025c25..8781a1eb973 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -107,7 +107,7 @@ LOCAL_INCLUDES += [
     '/gfx/skia/include/config',
     '/gfx/skia/include/core',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/widget/android',
     '/widget/xpwidgets',
     '/xpcom/base',
diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build
index 25be2d71fcd..f2c34220e25 100644
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -36,7 +36,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 4626a98ee96..62a18efe7ab 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -126,7 +126,7 @@ LOCAL_INCLUDES += [
     '../style',
     '../svg',
     '../tables',
-    '../xul/base/src',
+    '../xul',
     '../xul/tree/',
     '/docshell/base',
     '/xpcom/ds',
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 57fa009f0a7..12b89a916c9 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -37,7 +37,7 @@ LOCAL_INCLUDES += [
     '../mathml',
     '../style',
     '../tables',
-    '../xul/base/src',
+    '../xul',
     '/caps/include',
     '/content/base/src',
     '/content/canvas/src',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 5a76ad2fa24..6ffd5477fd7 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -50,5 +50,5 @@ LOCAL_INCLUDES += [
     '../../editor/txmgr/src',
     '../base',
     '../generic',
-    '../xul/base/src',
+    '../xul',
 ]
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 474857ce2c2..b4785819f4d 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -119,5 +119,5 @@ LOCAL_INCLUDES += [
     '../style',
     '../svg',
     '../tables',
-    '../xul/base/src',
+    '../xul',
 ]
diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build
index 1cf998ec0f7..aebe290082b 100644
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -29,5 +29,5 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/layout/base',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index b24f2922ffd..ef8a2cb7e69 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -37,7 +37,7 @@ LOCAL_INCLUDES += [
     '../generic',
     '../style',
     '../tables',
-    '../xul/base/src',
+    '../xul',
     '/content/base/src',
     '/content/mathml/content/src',
 ]
diff --git a/layout/moz.build b/layout/moz.build
index b087271b471..a311fad2dc5 100644
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -11,8 +11,7 @@ PARALLEL_DIRS += [
     'forms',
     'tables',
     'svg',
-    'xul/base/public',
-    'xul/base/src',
+    'xul',
     'ipc',
     'mathml',
     'inspector',
@@ -22,15 +21,6 @@ PARALLEL_DIRS += [
 if CONFIG['NS_PRINTING']:
     PARALLEL_DIRS += ['printing']
 
-if CONFIG['MOZ_XUL']:
-    PARALLEL_DIRS += ['xul/tree', 'xul/grid']
-
-if CONFIG['ENABLE_TESTS']:
-    PARALLEL_DIRS += [
-        'xul/test',
-        'xul/base/test',
-    ]
-
 TEST_TOOL_DIRS += [
     'tools/reftest',
     'reftests/fonts',
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 3c3bb056e81..36e6e201f58 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -328,7 +328,7 @@ skip-if(B2G) include xul/reftest.list
 include webcomponents/reftest.list
 
 # xul
-skip-if(B2G) include ../xul/base/reftest/reftest.list
+skip-if(B2G) include ../xul/reftest/reftest.list
 
 # xul grid
 skip-if(B2G) include ../xul/grid/reftests/reftest.list
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 8abf9e93744..e9593e959eb 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -141,6 +141,6 @@ LOCAL_INCLUDES += [
     '../../content/xul/document/src',
     '../base',
     '../generic',
-    '../xul/base/src',
+    '../xul',
     '/dom/base',
 ]
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index c1fa9658db1..c70a8e2fbec 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -56,6 +56,6 @@ LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../style',
-    '../xul/base/src',
+    '../xul',
 ]
 
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index 60a5c622790..48ef2cdc95b 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -38,7 +38,7 @@ LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../style',
-    '../xul/base/src',
+    '../xul',
 ]
 
 DEFINES['DEBUG_TABLE_STRATEGY_off'] = True
diff --git a/layout/xul/base/public/moz.build b/layout/xul/base/public/moz.build
deleted file mode 100644
index e1a84a9039e..00000000000
--- a/layout/xul/base/public/moz.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIBoxObject.idl',
-    'nsIBrowserBoxObject.idl',
-    'nsIContainerBoxObject.idl',
-    'nsIEditorBoxObject.idl',
-    'nsIIFrameBoxObject.idl',
-    'nsIListBoxObject.idl',
-    'nsIMenuBoxObject.idl',
-    'nsIPopupBoxObject.idl',
-    'nsIScrollBoxObject.idl',
-    'nsISliderListener.idl',
-]
-
-XPIDL_MODULE = 'layout_xul'
-
-EXPORTS += [
-    'nsIScrollbarMediator.h',
-    'nsPIBoxObject.h',
-    'nsXULPopupManager.h',
-]
-
diff --git a/layout/xul/base/test/chrome.ini b/layout/xul/base/test/chrome.ini
deleted file mode 100644
index 88dbfbc0073..00000000000
--- a/layout/xul/base/test/chrome.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-support-files =
-  window_resizer.xul
-  window_resizer_element.xul
-
-[test_bug381167.xhtml]
-[test_bug393970.xul]
-[test_bug477754.xul]
-[test_popupSizeTo.xul]
-[test_resizer.xul]
-[test_stack.xul]
-[test_windowminmaxsize.xul]
diff --git a/layout/xul/base/test/mochitest.ini b/layout/xul/base/test/mochitest.ini
deleted file mode 100644
index 29cba1c1a9d..00000000000
--- a/layout/xul/base/test/mochitest.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-
-[test_bug511075.html]
-[test_resizer_incontent.xul]
-[test_splitter.xul]
diff --git a/layout/xul/base/test/moz.build b/layout/xul/base/test/moz.build
deleted file mode 100644
index 99b068bc92a..00000000000
--- a/layout/xul/base/test/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/layout/xul/base/src/crashtests/131008-1.xul b/layout/xul/crashtests/131008-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/131008-1.xul
rename to layout/xul/crashtests/131008-1.xul
diff --git a/layout/xul/base/src/crashtests/137216-1.xul b/layout/xul/crashtests/137216-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/137216-1.xul
rename to layout/xul/crashtests/137216-1.xul
diff --git a/layout/xul/base/src/crashtests/140218-1.xml b/layout/xul/crashtests/140218-1.xml
similarity index 100%
rename from layout/xul/base/src/crashtests/140218-1.xml
rename to layout/xul/crashtests/140218-1.xml
diff --git a/layout/xul/base/src/crashtests/151826-1.xul b/layout/xul/crashtests/151826-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/151826-1.xul
rename to layout/xul/crashtests/151826-1.xul
diff --git a/layout/xul/base/src/crashtests/168724-1.xul b/layout/xul/crashtests/168724-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/168724-1.xul
rename to layout/xul/crashtests/168724-1.xul
diff --git a/layout/xul/base/src/crashtests/189814-1.xul b/layout/xul/crashtests/189814-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/189814-1.xul
rename to layout/xul/crashtests/189814-1.xul
diff --git a/layout/xul/base/src/crashtests/237787-1.xul b/layout/xul/crashtests/237787-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/237787-1.xul
rename to layout/xul/crashtests/237787-1.xul
diff --git a/layout/xul/base/src/crashtests/265161-1.xul b/layout/xul/crashtests/265161-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/265161-1.xul
rename to layout/xul/crashtests/265161-1.xul
diff --git a/layout/xul/base/src/crashtests/289410-1.xul b/layout/xul/crashtests/289410-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/289410-1.xul
rename to layout/xul/crashtests/289410-1.xul
diff --git a/layout/xul/base/src/crashtests/291702-1.xul b/layout/xul/crashtests/291702-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/291702-1.xul
rename to layout/xul/crashtests/291702-1.xul
diff --git a/layout/xul/base/src/crashtests/291702-2.xul b/layout/xul/crashtests/291702-2.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/291702-2.xul
rename to layout/xul/crashtests/291702-2.xul
diff --git a/layout/xul/base/src/crashtests/291702-3.xul b/layout/xul/crashtests/291702-3.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/291702-3.xul
rename to layout/xul/crashtests/291702-3.xul
diff --git a/layout/xul/base/src/crashtests/294371-1.xul b/layout/xul/crashtests/294371-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/294371-1.xul
rename to layout/xul/crashtests/294371-1.xul
diff --git a/layout/xul/base/src/crashtests/311457-1.html b/layout/xul/crashtests/311457-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/311457-1.html
rename to layout/xul/crashtests/311457-1.html
diff --git a/layout/xul/base/src/crashtests/321056-1.xhtml b/layout/xul/crashtests/321056-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/321056-1.xhtml
rename to layout/xul/crashtests/321056-1.xhtml
diff --git a/layout/xul/base/src/crashtests/322786-1.xul b/layout/xul/crashtests/322786-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/322786-1.xul
rename to layout/xul/crashtests/322786-1.xul
diff --git a/layout/xul/base/src/crashtests/325377.xul b/layout/xul/crashtests/325377.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/325377.xul
rename to layout/xul/crashtests/325377.xul
diff --git a/layout/xul/base/src/crashtests/326834-1-inner.xul b/layout/xul/crashtests/326834-1-inner.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/326834-1-inner.xul
rename to layout/xul/crashtests/326834-1-inner.xul
diff --git a/layout/xul/base/src/crashtests/326834-1.html b/layout/xul/crashtests/326834-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/326834-1.html
rename to layout/xul/crashtests/326834-1.html
diff --git a/layout/xul/base/src/crashtests/326879-1.xul b/layout/xul/crashtests/326879-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/326879-1.xul
rename to layout/xul/crashtests/326879-1.xul
diff --git a/layout/xul/base/src/crashtests/327776-1.xul b/layout/xul/crashtests/327776-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/327776-1.xul
rename to layout/xul/crashtests/327776-1.xul
diff --git a/layout/xul/base/src/crashtests/328135-1.xul b/layout/xul/crashtests/328135-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/328135-1.xul
rename to layout/xul/crashtests/328135-1.xul
diff --git a/layout/xul/base/src/crashtests/329327-1.xul b/layout/xul/crashtests/329327-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/329327-1.xul
rename to layout/xul/crashtests/329327-1.xul
diff --git a/layout/xul/base/src/crashtests/329407-1.xml b/layout/xul/crashtests/329407-1.xml
similarity index 100%
rename from layout/xul/base/src/crashtests/329407-1.xml
rename to layout/xul/crashtests/329407-1.xml
diff --git a/layout/xul/base/src/crashtests/329477-1.xhtml b/layout/xul/crashtests/329477-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/329477-1.xhtml
rename to layout/xul/crashtests/329477-1.xhtml
diff --git a/layout/xul/base/src/crashtests/336962-1.xul b/layout/xul/crashtests/336962-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/336962-1.xul
rename to layout/xul/crashtests/336962-1.xul
diff --git a/layout/xul/base/src/crashtests/344228-1.xul b/layout/xul/crashtests/344228-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/344228-1.xul
rename to layout/xul/crashtests/344228-1.xul
diff --git a/layout/xul/base/src/crashtests/346083-1.xul b/layout/xul/crashtests/346083-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/346083-1.xul
rename to layout/xul/crashtests/346083-1.xul
diff --git a/layout/xul/base/src/crashtests/346281-1.xul b/layout/xul/crashtests/346281-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/346281-1.xul
rename to layout/xul/crashtests/346281-1.xul
diff --git a/layout/xul/base/src/crashtests/350460.xul b/layout/xul/crashtests/350460.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/350460.xul
rename to layout/xul/crashtests/350460.xul
diff --git a/layout/xul/base/src/crashtests/360642-1.xul b/layout/xul/crashtests/360642-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/360642-1.xul
rename to layout/xul/crashtests/360642-1.xul
diff --git a/layout/xul/base/src/crashtests/365151.xul b/layout/xul/crashtests/365151.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/365151.xul
rename to layout/xul/crashtests/365151.xul
diff --git a/layout/xul/base/src/crashtests/366112-1.xul b/layout/xul/crashtests/366112-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/366112-1.xul
rename to layout/xul/crashtests/366112-1.xul
diff --git a/layout/xul/base/src/crashtests/369942-1.xhtml b/layout/xul/crashtests/369942-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/369942-1.xhtml
rename to layout/xul/crashtests/369942-1.xhtml
diff --git a/layout/xul/base/src/crashtests/374102-1.xul b/layout/xul/crashtests/374102-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/374102-1.xul
rename to layout/xul/crashtests/374102-1.xul
diff --git a/layout/xul/base/src/crashtests/376137-1.html b/layout/xul/crashtests/376137-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/376137-1.html
rename to layout/xul/crashtests/376137-1.html
diff --git a/layout/xul/base/src/crashtests/376137-2.html b/layout/xul/crashtests/376137-2.html
similarity index 100%
rename from layout/xul/base/src/crashtests/376137-2.html
rename to layout/xul/crashtests/376137-2.html
diff --git a/layout/xul/base/src/crashtests/377592-1.svg b/layout/xul/crashtests/377592-1.svg
similarity index 100%
rename from layout/xul/base/src/crashtests/377592-1.svg
rename to layout/xul/crashtests/377592-1.svg
diff --git a/layout/xul/base/src/crashtests/381862.html b/layout/xul/crashtests/381862.html
similarity index 100%
rename from layout/xul/base/src/crashtests/381862.html
rename to layout/xul/crashtests/381862.html
diff --git a/layout/xul/base/src/crashtests/382746-1.xul b/layout/xul/crashtests/382746-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/382746-1.xul
rename to layout/xul/crashtests/382746-1.xul
diff --git a/layout/xul/base/src/crashtests/382899-1.xul b/layout/xul/crashtests/382899-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/382899-1.xul
rename to layout/xul/crashtests/382899-1.xul
diff --git a/layout/xul/base/src/crashtests/383236-1.xul b/layout/xul/crashtests/383236-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/383236-1.xul
rename to layout/xul/crashtests/383236-1.xul
diff --git a/layout/xul/base/src/crashtests/384037-1.xhtml b/layout/xul/crashtests/384037-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/384037-1.xhtml
rename to layout/xul/crashtests/384037-1.xhtml
diff --git a/layout/xul/base/src/crashtests/384105-1-inner.xul b/layout/xul/crashtests/384105-1-inner.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/384105-1-inner.xul
rename to layout/xul/crashtests/384105-1-inner.xul
diff --git a/layout/xul/base/src/crashtests/384105-1.html b/layout/xul/crashtests/384105-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/384105-1.html
rename to layout/xul/crashtests/384105-1.html
diff --git a/layout/xul/base/src/crashtests/384491-1.xhtml b/layout/xul/crashtests/384491-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/384491-1.xhtml
rename to layout/xul/crashtests/384491-1.xhtml
diff --git a/layout/xul/base/src/crashtests/384871-1-inner.xul b/layout/xul/crashtests/384871-1-inner.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/384871-1-inner.xul
rename to layout/xul/crashtests/384871-1-inner.xul
diff --git a/layout/xul/base/src/crashtests/384871-1.html b/layout/xul/crashtests/384871-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/384871-1.html
rename to layout/xul/crashtests/384871-1.html
diff --git a/layout/xul/base/src/crashtests/387033-1.xhtml b/layout/xul/crashtests/387033-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/387033-1.xhtml
rename to layout/xul/crashtests/387033-1.xhtml
diff --git a/layout/xul/base/src/crashtests/387080-1.xul b/layout/xul/crashtests/387080-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/387080-1.xul
rename to layout/xul/crashtests/387080-1.xul
diff --git a/layout/xul/base/src/crashtests/391974-1-inner.xul b/layout/xul/crashtests/391974-1-inner.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/391974-1-inner.xul
rename to layout/xul/crashtests/391974-1-inner.xul
diff --git a/layout/xul/base/src/crashtests/391974-1.html b/layout/xul/crashtests/391974-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/391974-1.html
rename to layout/xul/crashtests/391974-1.html
diff --git a/layout/xul/base/src/crashtests/394120-1.xhtml b/layout/xul/crashtests/394120-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/394120-1.xhtml
rename to layout/xul/crashtests/394120-1.xhtml
diff --git a/layout/xul/base/src/crashtests/397293.xhtml b/layout/xul/crashtests/397293.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/397293.xhtml
rename to layout/xul/crashtests/397293.xhtml
diff --git a/layout/xul/base/src/crashtests/397304-1.html b/layout/xul/crashtests/397304-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/397304-1.html
rename to layout/xul/crashtests/397304-1.html
diff --git a/layout/xul/base/src/crashtests/398326-1.xhtml b/layout/xul/crashtests/398326-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/398326-1.xhtml
rename to layout/xul/crashtests/398326-1.xhtml
diff --git a/layout/xul/base/src/crashtests/399013.xul b/layout/xul/crashtests/399013.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/399013.xul
rename to layout/xul/crashtests/399013.xul
diff --git a/layout/xul/base/src/crashtests/400779-1.xhtml b/layout/xul/crashtests/400779-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/400779-1.xhtml
rename to layout/xul/crashtests/400779-1.xhtml
diff --git a/layout/xul/base/src/crashtests/402912-1.xhtml b/layout/xul/crashtests/402912-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/402912-1.xhtml
rename to layout/xul/crashtests/402912-1.xhtml
diff --git a/layout/xul/base/src/crashtests/408904-1.xul b/layout/xul/crashtests/408904-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/408904-1.xul
rename to layout/xul/crashtests/408904-1.xul
diff --git a/layout/xul/base/src/crashtests/412479-1.xhtml b/layout/xul/crashtests/412479-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/412479-1.xhtml
rename to layout/xul/crashtests/412479-1.xhtml
diff --git a/layout/xul/base/src/crashtests/415394-1.xhtml b/layout/xul/crashtests/415394-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/415394-1.xhtml
rename to layout/xul/crashtests/415394-1.xhtml
diff --git a/layout/xul/base/src/crashtests/420424-1.xul b/layout/xul/crashtests/420424-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/420424-1.xul
rename to layout/xul/crashtests/420424-1.xul
diff --git a/layout/xul/base/src/crashtests/430356-1.xhtml b/layout/xul/crashtests/430356-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/430356-1.xhtml
rename to layout/xul/crashtests/430356-1.xhtml
diff --git a/layout/xul/base/src/crashtests/431738.xhtml b/layout/xul/crashtests/431738.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/431738.xhtml
rename to layout/xul/crashtests/431738.xhtml
diff --git a/layout/xul/base/src/crashtests/432058-1.xul b/layout/xul/crashtests/432058-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/432058-1.xul
rename to layout/xul/crashtests/432058-1.xul
diff --git a/layout/xul/base/src/crashtests/432068-1.xul b/layout/xul/crashtests/432068-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/432068-1.xul
rename to layout/xul/crashtests/432068-1.xul
diff --git a/layout/xul/base/src/crashtests/432068-2.xul b/layout/xul/crashtests/432068-2.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/432068-2.xul
rename to layout/xul/crashtests/432068-2.xul
diff --git a/layout/xul/base/src/crashtests/433296-1.xul b/layout/xul/crashtests/433296-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/433296-1.xul
rename to layout/xul/crashtests/433296-1.xul
diff --git a/layout/xul/base/src/crashtests/433429.xul b/layout/xul/crashtests/433429.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/433429.xul
rename to layout/xul/crashtests/433429.xul
diff --git a/layout/xul/base/src/crashtests/434458-1.xul b/layout/xul/crashtests/434458-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/434458-1.xul
rename to layout/xul/crashtests/434458-1.xul
diff --git a/layout/xul/base/src/crashtests/452185.html b/layout/xul/crashtests/452185.html
similarity index 100%
rename from layout/xul/base/src/crashtests/452185.html
rename to layout/xul/crashtests/452185.html
diff --git a/layout/xul/base/src/crashtests/452185.xml b/layout/xul/crashtests/452185.xml
similarity index 100%
rename from layout/xul/base/src/crashtests/452185.xml
rename to layout/xul/crashtests/452185.xml
diff --git a/layout/xul/base/src/crashtests/460900-1.xul b/layout/xul/crashtests/460900-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/460900-1.xul
rename to layout/xul/crashtests/460900-1.xul
diff --git a/layout/xul/base/src/crashtests/464149-1.xul b/layout/xul/crashtests/464149-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/464149-1.xul
rename to layout/xul/crashtests/464149-1.xul
diff --git a/layout/xul/base/src/crashtests/464407-1.xhtml b/layout/xul/crashtests/464407-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/464407-1.xhtml
rename to layout/xul/crashtests/464407-1.xhtml
diff --git a/layout/xul/base/src/crashtests/467080.xul b/layout/xul/crashtests/467080.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/467080.xul
rename to layout/xul/crashtests/467080.xul
diff --git a/layout/xul/base/src/crashtests/467481-1.xul b/layout/xul/crashtests/467481-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/467481-1.xul
rename to layout/xul/crashtests/467481-1.xul
diff --git a/layout/xul/base/src/crashtests/470063-1.html b/layout/xul/crashtests/470063-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/470063-1.html
rename to layout/xul/crashtests/470063-1.html
diff --git a/layout/xul/base/src/crashtests/470272.html b/layout/xul/crashtests/470272.html
similarity index 100%
rename from layout/xul/base/src/crashtests/470272.html
rename to layout/xul/crashtests/470272.html
diff --git a/layout/xul/base/src/crashtests/472189.xul b/layout/xul/crashtests/472189.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/472189.xul
rename to layout/xul/crashtests/472189.xul
diff --git a/layout/xul/base/src/crashtests/475133.html b/layout/xul/crashtests/475133.html
similarity index 100%
rename from layout/xul/base/src/crashtests/475133.html
rename to layout/xul/crashtests/475133.html
diff --git a/layout/xul/base/src/crashtests/488210-1.xhtml b/layout/xul/crashtests/488210-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/488210-1.xhtml
rename to layout/xul/crashtests/488210-1.xhtml
diff --git a/layout/xul/base/src/crashtests/495728-1.xul b/layout/xul/crashtests/495728-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/495728-1.xul
rename to layout/xul/crashtests/495728-1.xul
diff --git a/layout/xul/base/src/crashtests/508927-1.xul b/layout/xul/crashtests/508927-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/508927-1.xul
rename to layout/xul/crashtests/508927-1.xul
diff --git a/layout/xul/base/src/crashtests/508927-2.xul b/layout/xul/crashtests/508927-2.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/508927-2.xul
rename to layout/xul/crashtests/508927-2.xul
diff --git a/layout/xul/base/src/crashtests/514300-1.xul b/layout/xul/crashtests/514300-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/514300-1.xul
rename to layout/xul/crashtests/514300-1.xul
diff --git a/layout/xul/base/src/crashtests/536931-1.xhtml b/layout/xul/crashtests/536931-1.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/536931-1.xhtml
rename to layout/xul/crashtests/536931-1.xhtml
diff --git a/layout/xul/base/src/crashtests/538308-1.xul b/layout/xul/crashtests/538308-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/538308-1.xul
rename to layout/xul/crashtests/538308-1.xul
diff --git a/layout/xul/base/src/crashtests/557174-1.xml b/layout/xul/crashtests/557174-1.xml
similarity index 100%
rename from layout/xul/base/src/crashtests/557174-1.xml
rename to layout/xul/crashtests/557174-1.xml
diff --git a/layout/xul/base/src/crashtests/564705-1.xul b/layout/xul/crashtests/564705-1.xul
similarity index 100%
rename from layout/xul/base/src/crashtests/564705-1.xul
rename to layout/xul/crashtests/564705-1.xul
diff --git a/layout/xul/base/src/crashtests/583957-1.html b/layout/xul/crashtests/583957-1.html
similarity index 100%
rename from layout/xul/base/src/crashtests/583957-1.html
rename to layout/xul/crashtests/583957-1.html
diff --git a/layout/xul/base/src/crashtests/crashtests.list b/layout/xul/crashtests/crashtests.list
similarity index 100%
rename from layout/xul/base/src/crashtests/crashtests.list
rename to layout/xul/crashtests/crashtests.list
diff --git a/layout/xul/base/src/crashtests/menulist-focused.xhtml b/layout/xul/crashtests/menulist-focused.xhtml
similarity index 100%
rename from layout/xul/base/src/crashtests/menulist-focused.xhtml
rename to layout/xul/crashtests/menulist-focused.xhtml
diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build
index 379368f4a1c..90e6b7ba850 100644
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -32,9 +32,9 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
+    '..',
     '../../forms',
     '../../generic',
     '../../style',
-    '../base/src',
 ]
 
diff --git a/layout/xul/base/src/moz.build b/layout/xul/moz.build
similarity index 71%
rename from layout/xul/base/src/moz.build
rename to layout/xul/moz.build
index a3fcbcf78ce..2c9ff9a6e33 100644
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/moz.build
@@ -4,6 +4,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+XPIDL_SOURCES += [
+    'nsIBoxObject.idl',
+    'nsIBrowserBoxObject.idl',
+    'nsIContainerBoxObject.idl',
+    'nsIEditorBoxObject.idl',
+    'nsIIFrameBoxObject.idl',
+    'nsIListBoxObject.idl',
+    'nsIMenuBoxObject.idl',
+    'nsIPopupBoxObject.idl',
+    'nsIScrollBoxObject.idl',
+    'nsISliderListener.idl',
+]
+
+XPIDL_MODULE = 'layout_xul'
+
+EXPORTS += [
+    'nsIScrollbarMediator.h',
+    'nsPIBoxObject.h',
+    'nsXULPopupManager.h',
+]
+
 UNIFIED_SOURCES += [
     'nsBox.cpp',
     'nsBoxFrame.cpp',
@@ -52,16 +73,24 @@ if CONFIG['MOZ_XUL']:
         'nsXULPopupManager.cpp',
     ]
 
+if CONFIG['ENABLE_TESTS']:
+    PARALLEL_DIRS += [
+        'test',
+    ]
+
+if CONFIG['MOZ_XUL']:
+    PARALLEL_DIRS += ['tree', 'grid']
+
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '../../../../content/base/src',
-    '../../../../content/events/src',
-    '../../../base',
-    '../../../generic',
-    '../../../style',
+    '../../content/base/src',
+    '../../content/events/src',
+    '../base',
+    '../generic',
+    '../style',
 ]
 
diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/nsBox.cpp
similarity index 100%
rename from layout/xul/base/src/nsBox.cpp
rename to layout/xul/nsBox.cpp
diff --git a/layout/xul/base/src/nsBox.h b/layout/xul/nsBox.h
similarity index 100%
rename from layout/xul/base/src/nsBox.h
rename to layout/xul/nsBox.h
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/nsBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsBoxFrame.cpp
rename to layout/xul/nsBoxFrame.cpp
diff --git a/layout/xul/base/src/nsBoxFrame.h b/layout/xul/nsBoxFrame.h
similarity index 100%
rename from layout/xul/base/src/nsBoxFrame.h
rename to layout/xul/nsBoxFrame.h
diff --git a/layout/xul/base/src/nsBoxLayout.cpp b/layout/xul/nsBoxLayout.cpp
similarity index 100%
rename from layout/xul/base/src/nsBoxLayout.cpp
rename to layout/xul/nsBoxLayout.cpp
diff --git a/layout/xul/base/src/nsBoxLayout.h b/layout/xul/nsBoxLayout.h
similarity index 100%
rename from layout/xul/base/src/nsBoxLayout.h
rename to layout/xul/nsBoxLayout.h
diff --git a/layout/xul/base/src/nsBoxLayoutState.cpp b/layout/xul/nsBoxLayoutState.cpp
similarity index 100%
rename from layout/xul/base/src/nsBoxLayoutState.cpp
rename to layout/xul/nsBoxLayoutState.cpp
diff --git a/layout/xul/base/src/nsBoxLayoutState.h b/layout/xul/nsBoxLayoutState.h
similarity index 100%
rename from layout/xul/base/src/nsBoxLayoutState.h
rename to layout/xul/nsBoxLayoutState.h
diff --git a/layout/xul/base/src/nsBoxObject.cpp b/layout/xul/nsBoxObject.cpp
similarity index 100%
rename from layout/xul/base/src/nsBoxObject.cpp
rename to layout/xul/nsBoxObject.cpp
diff --git a/layout/xul/base/src/nsBoxObject.h b/layout/xul/nsBoxObject.h
similarity index 100%
rename from layout/xul/base/src/nsBoxObject.h
rename to layout/xul/nsBoxObject.h
diff --git a/layout/xul/base/src/nsButtonBoxFrame.cpp b/layout/xul/nsButtonBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsButtonBoxFrame.cpp
rename to layout/xul/nsButtonBoxFrame.cpp
diff --git a/layout/xul/base/src/nsButtonBoxFrame.h b/layout/xul/nsButtonBoxFrame.h
similarity index 100%
rename from layout/xul/base/src/nsButtonBoxFrame.h
rename to layout/xul/nsButtonBoxFrame.h
diff --git a/layout/xul/base/src/nsContainerBoxObject.cpp b/layout/xul/nsContainerBoxObject.cpp
similarity index 100%
rename from layout/xul/base/src/nsContainerBoxObject.cpp
rename to layout/xul/nsContainerBoxObject.cpp
diff --git a/layout/xul/base/src/nsDeckFrame.cpp b/layout/xul/nsDeckFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsDeckFrame.cpp
rename to layout/xul/nsDeckFrame.cpp
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/nsDeckFrame.h
similarity index 100%
rename from layout/xul/base/src/nsDeckFrame.h
rename to layout/xul/nsDeckFrame.h
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/nsDocElementBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsDocElementBoxFrame.cpp
rename to layout/xul/nsDocElementBoxFrame.cpp
diff --git a/layout/xul/base/src/nsGroupBoxFrame.cpp b/layout/xul/nsGroupBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsGroupBoxFrame.cpp
rename to layout/xul/nsGroupBoxFrame.cpp
diff --git a/layout/xul/base/public/nsIBoxObject.idl b/layout/xul/nsIBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIBoxObject.idl
rename to layout/xul/nsIBoxObject.idl
diff --git a/layout/xul/base/public/nsIBrowserBoxObject.idl b/layout/xul/nsIBrowserBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIBrowserBoxObject.idl
rename to layout/xul/nsIBrowserBoxObject.idl
diff --git a/layout/xul/base/public/nsIContainerBoxObject.idl b/layout/xul/nsIContainerBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIContainerBoxObject.idl
rename to layout/xul/nsIContainerBoxObject.idl
diff --git a/layout/xul/base/public/nsIEditorBoxObject.idl b/layout/xul/nsIEditorBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIEditorBoxObject.idl
rename to layout/xul/nsIEditorBoxObject.idl
diff --git a/layout/xul/base/public/nsIIFrameBoxObject.idl b/layout/xul/nsIIFrameBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIIFrameBoxObject.idl
rename to layout/xul/nsIIFrameBoxObject.idl
diff --git a/layout/xul/base/public/nsIListBoxObject.idl b/layout/xul/nsIListBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIListBoxObject.idl
rename to layout/xul/nsIListBoxObject.idl
diff --git a/layout/xul/base/public/nsIMenuBoxObject.idl b/layout/xul/nsIMenuBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIMenuBoxObject.idl
rename to layout/xul/nsIMenuBoxObject.idl
diff --git a/layout/xul/base/public/nsIPopupBoxObject.idl b/layout/xul/nsIPopupBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIPopupBoxObject.idl
rename to layout/xul/nsIPopupBoxObject.idl
diff --git a/layout/xul/base/src/nsIRootBox.h b/layout/xul/nsIRootBox.h
similarity index 100%
rename from layout/xul/base/src/nsIRootBox.h
rename to layout/xul/nsIRootBox.h
diff --git a/layout/xul/base/public/nsIScrollBoxObject.idl b/layout/xul/nsIScrollBoxObject.idl
similarity index 100%
rename from layout/xul/base/public/nsIScrollBoxObject.idl
rename to layout/xul/nsIScrollBoxObject.idl
diff --git a/layout/xul/base/public/nsIScrollbarMediator.h b/layout/xul/nsIScrollbarMediator.h
similarity index 100%
rename from layout/xul/base/public/nsIScrollbarMediator.h
rename to layout/xul/nsIScrollbarMediator.h
diff --git a/layout/xul/base/public/nsISliderListener.idl b/layout/xul/nsISliderListener.idl
similarity index 100%
rename from layout/xul/base/public/nsISliderListener.idl
rename to layout/xul/nsISliderListener.idl
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsImageBoxFrame.cpp
rename to layout/xul/nsImageBoxFrame.cpp
diff --git a/layout/xul/base/src/nsImageBoxFrame.h b/layout/xul/nsImageBoxFrame.h
similarity index 100%
rename from layout/xul/base/src/nsImageBoxFrame.h
rename to layout/xul/nsImageBoxFrame.h
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/nsLeafBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsLeafBoxFrame.cpp
rename to layout/xul/nsLeafBoxFrame.cpp
diff --git a/layout/xul/base/src/nsLeafBoxFrame.h b/layout/xul/nsLeafBoxFrame.h
similarity index 100%
rename from layout/xul/base/src/nsLeafBoxFrame.h
rename to layout/xul/nsLeafBoxFrame.h
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/nsListBoxBodyFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsListBoxBodyFrame.cpp
rename to layout/xul/nsListBoxBodyFrame.cpp
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.h b/layout/xul/nsListBoxBodyFrame.h
similarity index 100%
rename from layout/xul/base/src/nsListBoxBodyFrame.h
rename to layout/xul/nsListBoxBodyFrame.h
diff --git a/layout/xul/base/src/nsListBoxLayout.cpp b/layout/xul/nsListBoxLayout.cpp
similarity index 100%
rename from layout/xul/base/src/nsListBoxLayout.cpp
rename to layout/xul/nsListBoxLayout.cpp
diff --git a/layout/xul/base/src/nsListBoxLayout.h b/layout/xul/nsListBoxLayout.h
similarity index 100%
rename from layout/xul/base/src/nsListBoxLayout.h
rename to layout/xul/nsListBoxLayout.h
diff --git a/layout/xul/base/src/nsListBoxObject.cpp b/layout/xul/nsListBoxObject.cpp
similarity index 100%
rename from layout/xul/base/src/nsListBoxObject.cpp
rename to layout/xul/nsListBoxObject.cpp
diff --git a/layout/xul/base/src/nsListItemFrame.cpp b/layout/xul/nsListItemFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsListItemFrame.cpp
rename to layout/xul/nsListItemFrame.cpp
diff --git a/layout/xul/base/src/nsListItemFrame.h b/layout/xul/nsListItemFrame.h
similarity index 100%
rename from layout/xul/base/src/nsListItemFrame.h
rename to layout/xul/nsListItemFrame.h
diff --git a/layout/xul/base/src/nsMenuBarFrame.cpp b/layout/xul/nsMenuBarFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsMenuBarFrame.cpp
rename to layout/xul/nsMenuBarFrame.cpp
diff --git a/layout/xul/base/src/nsMenuBarFrame.h b/layout/xul/nsMenuBarFrame.h
similarity index 100%
rename from layout/xul/base/src/nsMenuBarFrame.h
rename to layout/xul/nsMenuBarFrame.h
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/nsMenuBarListener.cpp
similarity index 100%
rename from layout/xul/base/src/nsMenuBarListener.cpp
rename to layout/xul/nsMenuBarListener.cpp
diff --git a/layout/xul/base/src/nsMenuBarListener.h b/layout/xul/nsMenuBarListener.h
similarity index 100%
rename from layout/xul/base/src/nsMenuBarListener.h
rename to layout/xul/nsMenuBarListener.h
diff --git a/layout/xul/base/src/nsMenuBoxObject.cpp b/layout/xul/nsMenuBoxObject.cpp
similarity index 100%
rename from layout/xul/base/src/nsMenuBoxObject.cpp
rename to layout/xul/nsMenuBoxObject.cpp
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsMenuFrame.cpp
rename to layout/xul/nsMenuFrame.cpp
diff --git a/layout/xul/base/src/nsMenuFrame.h b/layout/xul/nsMenuFrame.h
similarity index 100%
rename from layout/xul/base/src/nsMenuFrame.h
rename to layout/xul/nsMenuFrame.h
diff --git a/layout/xul/base/src/nsMenuParent.h b/layout/xul/nsMenuParent.h
similarity index 100%
rename from layout/xul/base/src/nsMenuParent.h
rename to layout/xul/nsMenuParent.h
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsMenuPopupFrame.cpp
rename to layout/xul/nsMenuPopupFrame.cpp
diff --git a/layout/xul/base/src/nsMenuPopupFrame.h b/layout/xul/nsMenuPopupFrame.h
similarity index 100%
rename from layout/xul/base/src/nsMenuPopupFrame.h
rename to layout/xul/nsMenuPopupFrame.h
diff --git a/layout/xul/base/public/nsPIBoxObject.h b/layout/xul/nsPIBoxObject.h
similarity index 100%
rename from layout/xul/base/public/nsPIBoxObject.h
rename to layout/xul/nsPIBoxObject.h
diff --git a/layout/xul/base/src/nsPIListBoxObject.h b/layout/xul/nsPIListBoxObject.h
similarity index 100%
rename from layout/xul/base/src/nsPIListBoxObject.h
rename to layout/xul/nsPIListBoxObject.h
diff --git a/layout/xul/base/src/nsPopupBoxObject.cpp b/layout/xul/nsPopupBoxObject.cpp
similarity index 100%
rename from layout/xul/base/src/nsPopupBoxObject.cpp
rename to layout/xul/nsPopupBoxObject.cpp
diff --git a/layout/xul/base/src/nsPopupSetFrame.cpp b/layout/xul/nsPopupSetFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsPopupSetFrame.cpp
rename to layout/xul/nsPopupSetFrame.cpp
diff --git a/layout/xul/base/src/nsPopupSetFrame.h b/layout/xul/nsPopupSetFrame.h
similarity index 100%
rename from layout/xul/base/src/nsPopupSetFrame.h
rename to layout/xul/nsPopupSetFrame.h
diff --git a/layout/xul/base/src/nsProgressMeterFrame.cpp b/layout/xul/nsProgressMeterFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsProgressMeterFrame.cpp
rename to layout/xul/nsProgressMeterFrame.cpp
diff --git a/layout/xul/base/src/nsProgressMeterFrame.h b/layout/xul/nsProgressMeterFrame.h
similarity index 100%
rename from layout/xul/base/src/nsProgressMeterFrame.h
rename to layout/xul/nsProgressMeterFrame.h
diff --git a/layout/xul/base/src/nsRepeatService.cpp b/layout/xul/nsRepeatService.cpp
similarity index 100%
rename from layout/xul/base/src/nsRepeatService.cpp
rename to layout/xul/nsRepeatService.cpp
diff --git a/layout/xul/base/src/nsRepeatService.h b/layout/xul/nsRepeatService.h
similarity index 100%
rename from layout/xul/base/src/nsRepeatService.h
rename to layout/xul/nsRepeatService.h
diff --git a/layout/xul/base/src/nsResizerFrame.cpp b/layout/xul/nsResizerFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsResizerFrame.cpp
rename to layout/xul/nsResizerFrame.cpp
diff --git a/layout/xul/base/src/nsResizerFrame.h b/layout/xul/nsResizerFrame.h
similarity index 100%
rename from layout/xul/base/src/nsResizerFrame.h
rename to layout/xul/nsResizerFrame.h
diff --git a/layout/xul/base/src/nsRootBoxFrame.cpp b/layout/xul/nsRootBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsRootBoxFrame.cpp
rename to layout/xul/nsRootBoxFrame.cpp
diff --git a/layout/xul/base/src/nsScrollBoxFrame.cpp b/layout/xul/nsScrollBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsScrollBoxFrame.cpp
rename to layout/xul/nsScrollBoxFrame.cpp
diff --git a/layout/xul/base/src/nsScrollBoxObject.cpp b/layout/xul/nsScrollBoxObject.cpp
similarity index 100%
rename from layout/xul/base/src/nsScrollBoxObject.cpp
rename to layout/xul/nsScrollBoxObject.cpp
diff --git a/layout/xul/base/src/nsScrollbarButtonFrame.cpp b/layout/xul/nsScrollbarButtonFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsScrollbarButtonFrame.cpp
rename to layout/xul/nsScrollbarButtonFrame.cpp
diff --git a/layout/xul/base/src/nsScrollbarButtonFrame.h b/layout/xul/nsScrollbarButtonFrame.h
similarity index 100%
rename from layout/xul/base/src/nsScrollbarButtonFrame.h
rename to layout/xul/nsScrollbarButtonFrame.h
diff --git a/layout/xul/base/src/nsScrollbarFrame.cpp b/layout/xul/nsScrollbarFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsScrollbarFrame.cpp
rename to layout/xul/nsScrollbarFrame.cpp
diff --git a/layout/xul/base/src/nsScrollbarFrame.h b/layout/xul/nsScrollbarFrame.h
similarity index 100%
rename from layout/xul/base/src/nsScrollbarFrame.h
rename to layout/xul/nsScrollbarFrame.h
diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsSliderFrame.cpp
rename to layout/xul/nsSliderFrame.cpp
diff --git a/layout/xul/base/src/nsSliderFrame.h b/layout/xul/nsSliderFrame.h
similarity index 100%
rename from layout/xul/base/src/nsSliderFrame.h
rename to layout/xul/nsSliderFrame.h
diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/nsSplitterFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsSplitterFrame.cpp
rename to layout/xul/nsSplitterFrame.cpp
diff --git a/layout/xul/base/src/nsSplitterFrame.h b/layout/xul/nsSplitterFrame.h
similarity index 100%
rename from layout/xul/base/src/nsSplitterFrame.h
rename to layout/xul/nsSplitterFrame.h
diff --git a/layout/xul/base/src/nsSprocketLayout.cpp b/layout/xul/nsSprocketLayout.cpp
similarity index 100%
rename from layout/xul/base/src/nsSprocketLayout.cpp
rename to layout/xul/nsSprocketLayout.cpp
diff --git a/layout/xul/base/src/nsSprocketLayout.h b/layout/xul/nsSprocketLayout.h
similarity index 100%
rename from layout/xul/base/src/nsSprocketLayout.h
rename to layout/xul/nsSprocketLayout.h
diff --git a/layout/xul/base/src/nsStackFrame.cpp b/layout/xul/nsStackFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsStackFrame.cpp
rename to layout/xul/nsStackFrame.cpp
diff --git a/layout/xul/base/src/nsStackFrame.h b/layout/xul/nsStackFrame.h
similarity index 100%
rename from layout/xul/base/src/nsStackFrame.h
rename to layout/xul/nsStackFrame.h
diff --git a/layout/xul/base/src/nsStackLayout.cpp b/layout/xul/nsStackLayout.cpp
similarity index 100%
rename from layout/xul/base/src/nsStackLayout.cpp
rename to layout/xul/nsStackLayout.cpp
diff --git a/layout/xul/base/src/nsStackLayout.h b/layout/xul/nsStackLayout.h
similarity index 100%
rename from layout/xul/base/src/nsStackLayout.h
rename to layout/xul/nsStackLayout.h
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/nsTextBoxFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsTextBoxFrame.cpp
rename to layout/xul/nsTextBoxFrame.cpp
diff --git a/layout/xul/base/src/nsTextBoxFrame.h b/layout/xul/nsTextBoxFrame.h
similarity index 100%
rename from layout/xul/base/src/nsTextBoxFrame.h
rename to layout/xul/nsTextBoxFrame.h
diff --git a/layout/xul/base/src/nsTitleBarFrame.cpp b/layout/xul/nsTitleBarFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsTitleBarFrame.cpp
rename to layout/xul/nsTitleBarFrame.cpp
diff --git a/layout/xul/base/src/nsTitleBarFrame.h b/layout/xul/nsTitleBarFrame.h
similarity index 100%
rename from layout/xul/base/src/nsTitleBarFrame.h
rename to layout/xul/nsTitleBarFrame.h
diff --git a/layout/xul/base/src/nsXULLabelFrame.cpp b/layout/xul/nsXULLabelFrame.cpp
similarity index 100%
rename from layout/xul/base/src/nsXULLabelFrame.cpp
rename to layout/xul/nsXULLabelFrame.cpp
diff --git a/layout/xul/base/src/nsXULLabelFrame.h b/layout/xul/nsXULLabelFrame.h
similarity index 100%
rename from layout/xul/base/src/nsXULLabelFrame.h
rename to layout/xul/nsXULLabelFrame.h
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp
similarity index 100%
rename from layout/xul/base/src/nsXULPopupManager.cpp
rename to layout/xul/nsXULPopupManager.cpp
diff --git a/layout/xul/base/public/nsXULPopupManager.h b/layout/xul/nsXULPopupManager.h
similarity index 100%
rename from layout/xul/base/public/nsXULPopupManager.h
rename to layout/xul/nsXULPopupManager.h
diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/nsXULTooltipListener.cpp
similarity index 100%
rename from layout/xul/base/src/nsXULTooltipListener.cpp
rename to layout/xul/nsXULTooltipListener.cpp
diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/nsXULTooltipListener.h
similarity index 100%
rename from layout/xul/base/src/nsXULTooltipListener.h
rename to layout/xul/nsXULTooltipListener.h
diff --git a/layout/xul/base/reftest/image-scaling-min-height-1-ref.xul b/layout/xul/reftest/image-scaling-min-height-1-ref.xul
similarity index 100%
rename from layout/xul/base/reftest/image-scaling-min-height-1-ref.xul
rename to layout/xul/reftest/image-scaling-min-height-1-ref.xul
diff --git a/layout/xul/base/reftest/image-scaling-min-height-1.xul b/layout/xul/reftest/image-scaling-min-height-1.xul
similarity index 100%
rename from layout/xul/base/reftest/image-scaling-min-height-1.xul
rename to layout/xul/reftest/image-scaling-min-height-1.xul
diff --git a/layout/xul/base/reftest/image-size-ref.xul b/layout/xul/reftest/image-size-ref.xul
similarity index 100%
rename from layout/xul/base/reftest/image-size-ref.xul
rename to layout/xul/reftest/image-size-ref.xul
diff --git a/layout/xul/base/reftest/image-size.xul b/layout/xul/reftest/image-size.xul
similarity index 100%
rename from layout/xul/base/reftest/image-size.xul
rename to layout/xul/reftest/image-size.xul
diff --git a/layout/xul/base/reftest/image4x3.png b/layout/xul/reftest/image4x3.png
similarity index 100%
rename from layout/xul/base/reftest/image4x3.png
rename to layout/xul/reftest/image4x3.png
diff --git a/layout/xul/base/reftest/popup-explicit-size-ref.xul b/layout/xul/reftest/popup-explicit-size-ref.xul
similarity index 100%
rename from layout/xul/base/reftest/popup-explicit-size-ref.xul
rename to layout/xul/reftest/popup-explicit-size-ref.xul
diff --git a/layout/xul/base/reftest/popup-explicit-size.xul b/layout/xul/reftest/popup-explicit-size.xul
similarity index 100%
rename from layout/xul/base/reftest/popup-explicit-size.xul
rename to layout/xul/reftest/popup-explicit-size.xul
diff --git a/layout/xul/base/reftest/reftest.list b/layout/xul/reftest/reftest.list
similarity index 100%
rename from layout/xul/base/reftest/reftest.list
rename to layout/xul/reftest/reftest.list
diff --git a/layout/xul/base/reftest/textbox-multiline-noresize.xul b/layout/xul/reftest/textbox-multiline-noresize.xul
similarity index 100%
rename from layout/xul/base/reftest/textbox-multiline-noresize.xul
rename to layout/xul/reftest/textbox-multiline-noresize.xul
diff --git a/layout/xul/base/reftest/textbox-multiline-ref.xul b/layout/xul/reftest/textbox-multiline-ref.xul
similarity index 100%
rename from layout/xul/base/reftest/textbox-multiline-ref.xul
rename to layout/xul/reftest/textbox-multiline-ref.xul
diff --git a/layout/xul/base/reftest/textbox-multiline-resize.xul b/layout/xul/reftest/textbox-multiline-resize.xul
similarity index 100%
rename from layout/xul/base/reftest/textbox-multiline-resize.xul
rename to layout/xul/reftest/textbox-multiline-resize.xul
diff --git a/layout/xul/test/chrome.ini b/layout/xul/test/chrome.ini
index af3adfbbd84..4c438eef59f 100644
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,7 +1,17 @@
 [DEFAULT]
+support-files =
+  window_resizer.xul
+  window_resizer_element.xul
 
 [test_bug159346.xul]
 [test_bug372685.xul]
+[test_bug381167.xhtml]
+[test_bug393970.xul]
 [test_bug398982-1.xul]
 [test_bug398982-2.xul]
+[test_bug477754.xul]
 [test_bug703150.xul]
+[test_popupSizeTo.xul]
+[test_resizer.xul]
+[test_stack.xul]
+[test_windowminmaxsize.xul]
diff --git a/layout/xul/test/mochitest.ini b/layout/xul/test/mochitest.ini
index 483cdaa93ee..840428a31e6 100644
--- a/layout/xul/test/mochitest.ini
+++ b/layout/xul/test/mochitest.ini
@@ -2,4 +2,7 @@
 
 [test_bug386386.html]
 [test_bug394800.xhtml]
+[test_bug511075.html]
 [test_bug563416.html]
+[test_resizer_incontent.xul]
+[test_splitter.xul]
diff --git a/layout/xul/base/test/test_bug381167.xhtml b/layout/xul/test/test_bug381167.xhtml
similarity index 100%
rename from layout/xul/base/test/test_bug381167.xhtml
rename to layout/xul/test/test_bug381167.xhtml
diff --git a/layout/xul/base/test/test_bug393970.xul b/layout/xul/test/test_bug393970.xul
similarity index 100%
rename from layout/xul/base/test/test_bug393970.xul
rename to layout/xul/test/test_bug393970.xul
diff --git a/layout/xul/base/test/test_bug477754.xul b/layout/xul/test/test_bug477754.xul
similarity index 100%
rename from layout/xul/base/test/test_bug477754.xul
rename to layout/xul/test/test_bug477754.xul
diff --git a/layout/xul/base/test/test_bug511075.html b/layout/xul/test/test_bug511075.html
similarity index 100%
rename from layout/xul/base/test/test_bug511075.html
rename to layout/xul/test/test_bug511075.html
diff --git a/layout/xul/base/test/test_popupSizeTo.xul b/layout/xul/test/test_popupSizeTo.xul
similarity index 100%
rename from layout/xul/base/test/test_popupSizeTo.xul
rename to layout/xul/test/test_popupSizeTo.xul
diff --git a/layout/xul/base/test/test_resizer.xul b/layout/xul/test/test_resizer.xul
similarity index 100%
rename from layout/xul/base/test/test_resizer.xul
rename to layout/xul/test/test_resizer.xul
diff --git a/layout/xul/base/test/test_resizer_incontent.xul b/layout/xul/test/test_resizer_incontent.xul
similarity index 100%
rename from layout/xul/base/test/test_resizer_incontent.xul
rename to layout/xul/test/test_resizer_incontent.xul
diff --git a/layout/xul/base/test/test_splitter.xul b/layout/xul/test/test_splitter.xul
similarity index 100%
rename from layout/xul/base/test/test_splitter.xul
rename to layout/xul/test/test_splitter.xul
diff --git a/layout/xul/base/test/test_stack.xul b/layout/xul/test/test_stack.xul
similarity index 100%
rename from layout/xul/base/test/test_stack.xul
rename to layout/xul/test/test_stack.xul
diff --git a/layout/xul/base/test/test_windowminmaxsize.xul b/layout/xul/test/test_windowminmaxsize.xul
similarity index 100%
rename from layout/xul/base/test/test_windowminmaxsize.xul
rename to layout/xul/test/test_windowminmaxsize.xul
diff --git a/layout/xul/base/test/window_resizer.xul b/layout/xul/test/window_resizer.xul
similarity index 100%
rename from layout/xul/base/test/window_resizer.xul
rename to layout/xul/test/window_resizer.xul
diff --git a/layout/xul/base/test/window_resizer_element.xul b/layout/xul/test/window_resizer_element.xul
similarity index 100%
rename from layout/xul/base/test/window_resizer_element.xul
rename to layout/xul/test/window_resizer_element.xul
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index 820c5ad68b0..920a4e6417a 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -35,11 +35,11 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
+    '..',
     '../../base',
     '../../forms',
     '../../generic',
     '../../style',
-    '../base/src',
     '/content/base/src',
     '/content/events/src',
 ]
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 01739ab7bd5..62c6768c102 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -51,7 +51,7 @@ include ../../layout/mathml/crashtests/crashtests.list
 include ../../layout/style/crashtests/crashtests.list
 include ../../layout/svg/crashtests/crashtests.list
 include ../../layout/tables/crashtests/crashtests.list
-include ../../layout/xul/base/src/crashtests/crashtests.list
+include ../../layout/xul/crashtests/crashtests.list
 include ../../layout/xul/grid/crashtests/crashtests.list
 include ../../layout/xul/tree/crashtests/crashtests.list
 
diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
index b26e5e27b2e..41ff12af9b4 100644
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -274,7 +274,7 @@
  "layout/style/test/test_visited_lying.html": "",
  "layout/style/test/test_visited_pref.html": "TIMED_OUT",
  "layout/style/test/test_visited_reftests.html": "TIMED_OUT",
- "layout/xul/base/test/test_bug511075.html": "bug 798806",
+ "layout/xul/test/test_bug511075.html": "bug 798806",
  "parser/htmlparser/tests/mochitest/test_html5_tree_construction.html": "TIMED_OUT",
  "parser/htmlparser/tests/mochitest/test_html5_tree_construction_part2.html": "TIMED_OUT",
  "robocop": "TIMED_OUT",
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index 46d204bf6cf..d093569dee5 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -356,7 +356,7 @@
  "layout/style/test/test_visited_lying.html": "",
  "layout/style/test/test_visited_pref.html": "TIMED_OUT",
  "layout/style/test/test_visited_reftests.html": "TIMED_OUT",
- "layout/xul/base/test/test_bug511075.html": "bug 798806",
+ "layout/xul/test/test_bug511075.html": "bug 798806",
  "parser/htmlparser/tests/mochitest/test_html5_tree_construction.html": "TIMED_OUT",
  "parser/htmlparser/tests/mochitest/test_html5_tree_construction_part2.html": "TIMED_OUT",
  "robocop": "TIMED_OUT",
diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
index bd4caa5fd44..a7b69e2bdba 100644
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -75,6 +75,6 @@ LOCAL_INCLUDES += [
     '../xpwidgets',
     '/layout/forms',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
 ]
 
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
index ce77d007fc4..762bc463f0b 100644
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -85,7 +85,7 @@ LOCAL_INCLUDES += [
     '../shared',
     '../xpwidgets',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/other-licenses/atk-1.0',
 ]
 
diff --git a/widget/windows/moz.build b/widget/windows/moz.build
index 08d0ab31439..5d1faeb04e4 100644
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -94,7 +94,7 @@ LOCAL_INCLUDES += [
     '../xpwidgets',
     '/content/events/src',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/toolkit/xre',
     '/xpcom/base',
 ]
diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build
index 4d2ea98e33e..41273d8cd39 100644
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -34,7 +34,7 @@ LOCAL_INCLUDES += [
     '../../shared',
     '../../xpwidgets',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/toolkit/xre',
     '/xpcom/base',
 ]
diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build
index 691fdd7e013..ad66c3c5b96 100644
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -74,7 +74,7 @@ LOCAL_INCLUDES += [
     '/layout/base',
     '/layout/forms',
     '/layout/generic',
-    '/layout/xul/base/src',
+    '/layout/xul',
     '/view/src',
 ]