--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -10,74 +10,84 @@ DIRS += [
 
 XPIDL_SOURCES += [
     'nsCDefaultURIFixup.idl',
     'nsIClipboardCommands.idl',
     'nsIContentViewer.idl',
     'nsIContentViewerContainer.idl',
     'nsIContentViewerEdit.idl',
     'nsIContentViewerFile.idl',
+    'nsIContextMenuListener.idl',
+    'nsIContextMenuListener2.idl',
     'nsIDocCharset.idl',
     'nsIDocShell.idl',
     'nsIDocShellLoadInfo.idl',
     'nsIDocShellTreeItem.idl',
     'nsIDocShellTreeOwner.idl',
     'nsIDocumentLoaderFactory.idl',
     'nsIDownloadHistory.idl',
     'nsIGlobalHistory2.idl',
     'nsILoadContext.idl',
     'nsIPrivacyTransitionObserver.idl',
     'nsIReflowObserver.idl',
     'nsIRefreshURI.idl',
     'nsIScrollable.idl',
     'nsITextScroll.idl',
+    'nsITooltipListener.idl',
+    'nsITooltipTextProvider.idl',
     'nsIURIFixup.idl',
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
     'nsIWebPageDescriptor.idl',
 ]
 
 XPIDL_MODULE = 'docshell'
 
 EXPORTS += [
+    'nsCTooltipTextProvider.h',
     'nsDocShellLoadTypes.h',
+    'nsDocShellTreeOwner.h',
     'nsILinkHandler.h',
     'nsIScrollObserver.h',
     'nsIWebShellServices.h',
     'SerializedLoadContext.h',
 ]
 
 EXPORTS.mozilla += [
     'IHistory.h',
     'LoadContext.h',
 ]
 
 UNIFIED_SOURCES += [
     'LoadContext.cpp',
     'nsAboutRedirector.cpp',
+    'nsContextMenuInfo.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
+    'nsDocShellTreeOwner.cpp',
     'nsDownloadHistory.cpp',
     'nsDSURIContentListener.cpp',
     'nsWebNavigationInfo.cpp',
     'SerializedLoadContext.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/docshell/shistory',
     '/dom/base',
+    '/embedding/browser',
     '/layout/base',
     '/layout/generic',
+    '/layout/style',
     '/layout/xul',
     '/netwerk/protocol/viewsource',
     '/tools/profiler',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     DEFINES['MOZ_TOOLKIT_SEARCH'] = True
 

rename from embedding/browser/nsCTooltipTextProvider.h
rename to docshell/base/nsCTooltipTextProvider.h

rename from embedding/browser/nsContextMenuInfo.cpp
rename to docshell/base/nsContextMenuInfo.cpp

rename from embedding/browser/nsContextMenuInfo.h
rename to docshell/base/nsContextMenuInfo.h

rename from embedding/browser/nsDocShellTreeOwner.cpp
rename to docshell/base/nsDocShellTreeOwner.cpp

rename from embedding/browser/nsDocShellTreeOwner.h
rename to docshell/base/nsDocShellTreeOwner.h

rename from embedding/browser/nsIContextMenuListener.idl
rename to docshell/base/nsIContextMenuListener.idl

rename from embedding/browser/nsIContextMenuListener2.idl
rename to docshell/base/nsIContextMenuListener2.idl

rename from embedding/browser/nsITooltipListener.idl
rename to docshell/base/nsITooltipListener.idl

rename from embedding/browser/nsITooltipTextProvider.idl
rename to docshell/base/nsITooltipTextProvider.idl

--- a/embedding/browser/moz.build
+++ b/embedding/browser/moz.build
@@ -4,21 +4,17 @@
 # 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/.
 
 DIRS += ['build']
 
 XPIDL_SOURCES += [
     'nsCWebBrowser.idl',
     'nsICommandHandler.idl',
-    'nsIContextMenuListener.idl',
-    'nsIContextMenuListener2.idl',
     'nsIEmbeddingSiteWindow.idl',
-    'nsITooltipListener.idl',
-    'nsITooltipTextProvider.idl',
     'nsIWebBrowser.idl',
     'nsIWebBrowserChrome.idl',
     'nsIWebBrowserChrome2.idl',
     'nsIWebBrowserChrome3.idl',
     'nsIWebBrowserChromeFocus.idl',
     'nsIWebBrowserFocus.idl',
     'nsIWebBrowserSetup.idl',
     'nsIWebBrowserStream.idl',
@@ -28,24 +24,18 @@ if CONFIG['NS_PRINTING']:
     XPIDL_SOURCES += [
         'nsIPrintingPrompt.idl',
         'nsIPrintingPromptService.idl',
         'nsIWebBrowserPrint.idl',
     ]
 
 XPIDL_MODULE = 'webBrowser_core'
 
-EXPORTS += [
-    'nsCTooltipTextProvider.h',
-]
-
 UNIFIED_SOURCES += [
     'nsCommandHandler.cpp',
-    'nsContextMenuInfo.cpp',
-    'nsDocShellTreeOwner.cpp',
     'nsEmbedStream.cpp',
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/docshell/base',