--- a/docshell/components/moz.build
+++ b/docshell/components/moz.build
@@ -8,14 +8,15 @@
 # but we need to export interface headers from those directories.
 DIRS += [
     'browser',
     'windowwatcher',
     'appstartup',
     'find',
     'webbrowserpersist',
     'commandhandler',
+    'windowcreator',
 ]
 
 if CONFIG['MOZ_XUL']:
     DIRS += ['printingui']
 
 DIRS += ['build']

new file mode 100644
--- /dev/null
+++ b/docshell/components/windowcreator/moz.build
@@ -0,0 +1,18 @@
+# -*- 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/.
+
+TEST_DIRS += ['test']
+
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
+XPIDL_SOURCES += [
+    'nsIWindowCreator.idl',
+    'nsIWindowCreator2.idl',
+    'nsIWindowProvider.idl',
+]
+
+XPIDL_MODULE = 'windowcreator'

rename from embedding/nsIWindowCreator.idl
rename to docshell/components/windowcreator/nsIWindowCreator.idl

rename from embedding/nsIWindowCreator2.idl
rename to docshell/components/windowcreator/nsIWindowCreator2.idl

rename from embedding/nsIWindowProvider.idl
rename to docshell/components/windowcreator/nsIWindowProvider.idl

rename from embedding/test/320x240.ogv
rename to docshell/components/windowcreator/test/320x240.ogv

rename from embedding/test/browser.ini
rename to docshell/components/windowcreator/test/browser.ini

rename from embedding/test/browser_bug1204626.js
rename to docshell/components/windowcreator/test/browser_bug1204626.js

rename from embedding/test/bug1170334_iframe.xml
rename to docshell/components/windowcreator/test/bug1170334_iframe.xml

rename from embedding/test/bug1170334_style.css
rename to docshell/components/windowcreator/test/bug1170334_style.css

rename from embedding/test/bug1204626_doc0.html
rename to docshell/components/windowcreator/test/bug1204626_doc0.html

rename from embedding/test/bug1204626_doc1.html
rename to docshell/components/windowcreator/test/bug1204626_doc1.html

rename from embedding/test/bug293834_form.html
rename to docshell/components/windowcreator/test/bug293834_form.html

rename from embedding/test/bug449141_page.html
rename to docshell/components/windowcreator/test/bug449141_page.html

rename from embedding/test/chrome.ini
rename to docshell/components/windowcreator/test/chrome.ini

rename from embedding/test/mochitest.ini
rename to docshell/components/windowcreator/test/mochitest.ini

rename from embedding/test/moz.build
rename to docshell/components/windowcreator/test/moz.build

rename from embedding/test/test_bug1170334_wbp_xmlstyle.html
rename to docshell/components/windowcreator/test/test_bug1170334_wbp_xmlstyle.html

rename from embedding/test/test_bug1192654.html
rename to docshell/components/windowcreator/test/test_bug1192654.html

rename from embedding/test/test_bug293834.html
rename to docshell/components/windowcreator/test/test_bug293834.html

rename from embedding/test/test_bug449141.html
rename to docshell/components/windowcreator/test/test_bug449141.html

rename from embedding/test/test_bug499115.html
rename to docshell/components/windowcreator/test/test_bug499115.html

rename from embedding/test/test_nsFind.html
rename to docshell/components/windowcreator/test/test_nsFind.html

rename from embedding/test/test_private_window_from_content.html
rename to docshell/components/windowcreator/test/test_private_window_from_content.html

rename from embedding/test/test_window_open_position_constraint.html
rename to docshell/components/windowcreator/test/test_window_open_position_constraint.html

rename from embedding/test/test_window_open_units.html
rename to docshell/components/windowcreator/test/test_window_open_units.html

rename from embedding/tests/unit/test_wwauthpromptfactory.js
rename to docshell/components/windowcreator/tests/unit/test_wwauthpromptfactory.js

rename from embedding/tests/unit/test_wwpromptfactory.js
rename to docshell/components/windowcreator/tests/unit/test_wwpromptfactory.js

rename from embedding/tests/unit/xpcshell.ini
rename to docshell/components/windowcreator/tests/unit/xpcshell.ini

--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -1,22 +1,9 @@
 # -*- 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/.
 
-TEST_DIRS += ['test']
-
-if CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
-
-XPIDL_SOURCES += [
-    'nsIWindowCreator.idl',
-    'nsIWindowCreator2.idl',
-    'nsIWindowProvider.idl',
-]
-
-XPIDL_MODULE = 'embed_base'
-
 EXPORTS += [
     'nsEmbedCID.h',
 ]