--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -72,19 +72,19 @@ UNIFIED_SOURCES += [
     'nsWebNavigationInfo.cpp',
     'SerializedLoadContext.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
+    '/docshell/components/browser',
     '/docshell/shistory',
     '/dom/base',
-    '/embedding/browser',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/netwerk/protocol/viewsource',
     '/tools/profiler',
 ]
 

rename from embedding/browser/build/moz.build
rename to docshell/components/browser/build/moz.build

rename from embedding/browser/build/nsWebBrowserModule.cpp
rename to docshell/components/browser/build/nsWebBrowserModule.cpp

rename from embedding/browser/moz.build
rename to docshell/components/browser/moz.build

rename from embedding/browser/nsCWebBrowser.idl
rename to docshell/components/browser/nsCWebBrowser.idl

rename from embedding/browser/nsCommandHandler.cpp
rename to docshell/components/browser/nsCommandHandler.cpp

rename from embedding/browser/nsCommandHandler.h
rename to docshell/components/browser/nsCommandHandler.h

rename from embedding/browser/nsEmbedStream.cpp
rename to docshell/components/browser/nsEmbedStream.cpp

rename from embedding/browser/nsEmbedStream.h
rename to docshell/components/browser/nsEmbedStream.h

rename from embedding/browser/nsICommandHandler.idl
rename to docshell/components/browser/nsICommandHandler.idl

rename from embedding/browser/nsIEmbeddingSiteWindow.idl
rename to docshell/components/browser/nsIEmbeddingSiteWindow.idl

rename from embedding/browser/nsIPrintPreviewNavigation.idl
rename to docshell/components/browser/nsIPrintPreviewNavigation.idl

rename from embedding/browser/nsIPrintingPrompt.idl
rename to docshell/components/browser/nsIPrintingPrompt.idl

rename from embedding/browser/nsIPrintingPromptService.idl
rename to docshell/components/browser/nsIPrintingPromptService.idl

rename from embedding/browser/nsIWebBrowser.idl
rename to docshell/components/browser/nsIWebBrowser.idl

rename from embedding/browser/nsIWebBrowserChrome.idl
rename to docshell/components/browser/nsIWebBrowserChrome.idl

rename from embedding/browser/nsIWebBrowserChrome2.idl
rename to docshell/components/browser/nsIWebBrowserChrome2.idl

rename from embedding/browser/nsIWebBrowserChrome3.idl
rename to docshell/components/browser/nsIWebBrowserChrome3.idl

rename from embedding/browser/nsIWebBrowserChromeFocus.idl
rename to docshell/components/browser/nsIWebBrowserChromeFocus.idl

rename from embedding/browser/nsIWebBrowserFocus.idl
rename to docshell/components/browser/nsIWebBrowserFocus.idl

rename from embedding/browser/nsIWebBrowserPrint.idl
rename to docshell/components/browser/nsIWebBrowserPrint.idl

rename from embedding/browser/nsIWebBrowserSetup.idl
rename to docshell/components/browser/nsIWebBrowserSetup.idl

rename from embedding/browser/nsIWebBrowserStream.idl
rename to docshell/components/browser/nsIWebBrowserStream.idl

rename from embedding/browser/nsWebBrowser.cpp
rename to docshell/components/browser/nsWebBrowser.cpp

rename from embedding/browser/nsWebBrowser.h
rename to docshell/components/browser/nsWebBrowser.h

rename from embedding/browser/nsWebBrowserContentPolicy.cpp
rename to docshell/components/browser/nsWebBrowserContentPolicy.cpp

rename from embedding/browser/nsWebBrowserContentPolicy.h
rename to docshell/components/browser/nsWebBrowserContentPolicy.h

--- a/docshell/components/moz.build
+++ b/docshell/components/moz.build
@@ -2,16 +2,17 @@
 # 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/.
 
 # You'd think we could skip building ui if XUL is disabled,
 # but we need to export interface headers from those directories.
 DIRS += [
+    'browser',
     'windowwatcher',
     'appstartup',
     'find',
     'webbrowserpersist',
     'commandhandler',
 ]
 
 if CONFIG['MOZ_XUL']:

--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; 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/.
 
-DIRS += ['browser']
-
 TEST_DIRS += ['test']
 
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIWindowCreator.idl',
     'nsIWindowCreator2.idl',