deleted file mode 100644
--- a/embedding/base/moz.build
+++ /dev/null
@@ -1,17 +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 += [
-    'nsIWindowCreator.idl',
-    'nsIWindowCreator2.idl',
-    'nsIWindowProvider.idl',
-]
-
-XPIDL_MODULE = 'embed_base'
-
-EXPORTS += [
-    'nsEmbedCID.h',
-]

--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -1,15 +1,27 @@
 # -*- 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/.
 
-DIRS += ['base', 'components', 'browser']
+DIRS += ['components', 'browser']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['android/geckoview_example']
 
 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',
+]

rename from embedding/base/nsEmbedCID.h
rename to embedding/nsEmbedCID.h

rename from embedding/base/nsIWindowCreator.idl
rename to embedding/nsIWindowCreator.idl

rename from embedding/base/nsIWindowCreator2.idl
rename to embedding/nsIWindowCreator2.idl

rename from embedding/base/nsIWindowProvider.idl
rename to embedding/nsIWindowProvider.idl