diff --git a/embedding/Makefile.in b/embedding/Makefile.in
index e4fdcd1d4dbc..7933693ae7f9 100644
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -13,17 +13,8 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE       = embed
 
-DIRS = base components browser
-
-TEST_DIRS += test
 ifdef ENABLE_TESTS
 XPCSHELL_TESTS = tests/unit
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-ifneq (,$(filter mobile/xul b2g,$(MOZ_BUILD_APP)))
-DIRS += android
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index 824dbeb8d9a5..d7804a44b96b 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/ipc/app/defs.mk
 
-DIRS = locales
-
 JAVAFILES = \
   GeckoApp.java \
   GeckoAppShell.java \
diff --git a/embedding/android/locales/moz.build b/embedding/android/locales/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/android/locales/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/android/moz.build b/embedding/android/moz.build
new file mode 100644
index 000000000000..c846119d995b
--- /dev/null
+++ b/embedding/android/moz.build
@@ -0,0 +1,6 @@
+# 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 += ['locales']
diff --git a/embedding/base/moz.build b/embedding/base/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/base/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/browser/Makefile.in b/embedding/browser/Makefile.in
index c3134c06d23a..f5507889b21e 100644
--- a/embedding/browser/Makefile.in
+++ b/embedding/browser/Makefile.in
@@ -9,7 +9,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS = webBrowser build
-
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/browser/build/moz.build b/embedding/browser/build/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/browser/build/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/browser/moz.build b/embedding/browser/moz.build
new file mode 100644
index 000000000000..e9da9e9f6df5
--- /dev/null
+++ b/embedding/browser/moz.build
@@ -0,0 +1,6 @@
+# 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 += ['webBrowser', 'build']
diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/browser/webBrowser/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/Makefile.in b/embedding/components/Makefile.in
index 306246244c90..f5507889b21e 100644
--- a/embedding/components/Makefile.in
+++ b/embedding/components/Makefile.in
@@ -9,18 +9,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-# You'd think we could skip building ui if XUL is disabled,
-# but we need to export interface headers from those directories.
-
-DIRS = windowwatcher appstartup/src find webbrowserpersist commandhandler
-
-ifdef MOZ_XUL
-ifdef NS_PRINTING
-DIRS += printingui/src
-endif
-endif
-
-DIRS += build
-
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/appstartup/src/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/build/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/commandhandler/Makefile.in b/embedding/components/commandhandler/Makefile.in
index 6597bd045361..aa21e482c61f 100644
--- a/embedding/components/commandhandler/Makefile.in
+++ b/embedding/components/commandhandler/Makefile.in
@@ -11,6 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= commandhandler
-DIRS = public src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/commandhandler/moz.build b/embedding/components/commandhandler/moz.build
new file mode 100644
index 000000000000..077f40f4f5aa
--- /dev/null
+++ b/embedding/components/commandhandler/moz.build
@@ -0,0 +1,6 @@
+# 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 += ['public', 'src']
diff --git a/embedding/components/commandhandler/public/moz.build b/embedding/components/commandhandler/public/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/commandhandler/public/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/commandhandler/src/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/find/Makefile.in b/embedding/components/find/Makefile.in
index 50133d97c192..ce6b19683a83 100644
--- a/embedding/components/find/Makefile.in
+++ b/embedding/components/find/Makefile.in
@@ -11,6 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= find
-DIRS = public src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/find/moz.build b/embedding/components/find/moz.build
new file mode 100644
index 000000000000..077f40f4f5aa
--- /dev/null
+++ b/embedding/components/find/moz.build
@@ -0,0 +1,6 @@
+# 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 += ['public', 'src']
diff --git a/embedding/components/find/public/moz.build b/embedding/components/find/public/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/find/public/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/find/src/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/moz.build b/embedding/components/moz.build
new file mode 100644
index 000000000000..52f3f5309bee
--- /dev/null
+++ b/embedding/components/moz.build
@@ -0,0 +1,19 @@
+# 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 += [
+    'windowwatcher',
+    'appstartup/src',
+    'find',
+    'webbrowserpersist',
+    'commandhandler',
+]
+
+if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
+    DIRS += ['printingui/src']
+
+DIRS += ['build']
diff --git a/embedding/components/printingui/src/Makefile.in b/embedding/components/printingui/src/Makefile.in
index 069d97ff3be7..1dd4bbb28132 100644
--- a/embedding/components/printingui/src/Makefile.in
+++ b/embedding/components/printingui/src/Makefile.in
@@ -9,23 +9,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_PDF_PRINTING
-PLATFORM_DIR += unixshared
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-PLATFORM_DIR = os2
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-PLATFORM_DIR = win
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-PLATFORM_DIR = mac
-endif
-
-DIRS = $(PLATFORM_DIR)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/printingui/src/moz.build b/embedding/components/printingui/src/moz.build
new file mode 100644
index 000000000000..a10e013ebcdd
--- /dev/null
+++ b/embedding/components/printingui/src/moz.build
@@ -0,0 +1,15 @@
+# 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/.
+
+toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
+
+if toolkit == 'os2':
+    DIRS += ['os2']
+elif toolkit == 'windows':
+    DIRS += ['win']
+elif toolkit == 'cocoa':
+    DIRS += ['mac']
+elif CONFIG['MOZ_PDF_PRINTING']:
+    DIRS += ['unixshared']
diff --git a/embedding/components/printingui/src/os2/moz.build b/embedding/components/printingui/src/os2/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/printingui/src/win/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/webbrowserpersist/Makefile.in b/embedding/components/webbrowserpersist/Makefile.in
index ee0ef46bbe16..ff3adcc6a95a 100644
--- a/embedding/components/webbrowserpersist/Makefile.in
+++ b/embedding/components/webbrowserpersist/Makefile.in
@@ -11,6 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= webbrowserpersist
-DIRS = public src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/webbrowserpersist/moz.build b/embedding/components/webbrowserpersist/moz.build
new file mode 100644
index 000000000000..077f40f4f5aa
--- /dev/null
+++ b/embedding/components/webbrowserpersist/moz.build
@@ -0,0 +1,6 @@
+# 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 += ['public', 'src']
diff --git a/embedding/components/webbrowserpersist/public/moz.build b/embedding/components/webbrowserpersist/public/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/webbrowserpersist/public/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/webbrowserpersist/src/moz.build b/embedding/components/webbrowserpersist/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/windowwatcher/Makefile.in b/embedding/components/windowwatcher/Makefile.in
index 42735d2e682f..f5507889b21e 100644
--- a/embedding/components/windowwatcher/Makefile.in
+++ b/embedding/components/windowwatcher/Makefile.in
@@ -9,7 +9,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS = public src
-
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/components/windowwatcher/moz.build b/embedding/components/windowwatcher/moz.build
new file mode 100644
index 000000000000..077f40f4f5aa
--- /dev/null
+++ b/embedding/components/windowwatcher/moz.build
@@ -0,0 +1,6 @@
+# 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 += ['public', 'src']
diff --git a/embedding/components/windowwatcher/public/moz.build b/embedding/components/windowwatcher/public/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/windowwatcher/public/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/moz.build b/embedding/moz.build
new file mode 100644
index 000000000000..55a3b578756a
--- /dev/null
+++ b/embedding/moz.build
@@ -0,0 +1,10 @@
+# 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']
+TEST_DIRS += ['test']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android' and CONFIG['MOZ_BUILD_APP'] in 'mobile/xul':
+    DIRS += ['android']
diff --git a/embedding/test/moz.build b/embedding/test/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/test/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+
diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/embedding/tests/winEmbed/moz.build
@@ -0,0 +1,5 @@
+# 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/.
+