diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/2d/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/gfx/Makefile.in b/gfx/Makefile.in
index 461119bf37c0..f60cb2c69ef1 100644
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -12,18 +12,4 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gfx
 
-ifdef MOZ_TREE_CAIRO
-DIRS		= cairo
-endif
-
-DIRS		+= 2d ycbcr angle src qcms gl layers graphite2/src harfbuzz/src ots/src thebes ipc
-
-ifdef MOZ_ENABLE_SKIA
-DIRS        += skia
-endif
-
-ifdef ENABLE_TESTS
-TOOL_DIRS	+= tests
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
index 595a5fb2979b..e4d210059b6a 100644
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -130,9 +130,6 @@ CPPSRCS += \
 
 ifdef MOZ_ANGLE_RENDERER
 
-# libEGL depends on (links against!) libGLESv2!
-DIRS = src/libGLESv2 src/libEGL
-
 libs::
 ifdef MOZ_D3DCOMPILER_CAB
 	expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
new file mode 100644
index 000000000000..8806ed2cb322
--- /dev/null
+++ b/gfx/angle/moz.build
@@ -0,0 +1,8 @@
+# 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/.
+
+# libEGL depends on (links against!) libGLESv2!
+if CONFIG['MOZ_ANGLE_RENDERER']:
+    DIRS += ['src/libGLESv2', 'src/libEGL']
diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/angle/src/libEGL/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/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/angle/src/libGLESv2/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/gfx/cairo/Makefile.in b/gfx/cairo/Makefile.in
index cf08a6c769b5..2ea50484c56a 100644
--- a/gfx/cairo/Makefile.in
+++ b/gfx/cairo/Makefile.in
@@ -8,12 +8,5 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS = cairo/src
-
-ifdef MOZ_TREE_PIXMAN
-DIRS += libpixman/src
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 7606c861198b..49b33263a509 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -238,5 +238,3 @@ ifdef MOZ_TREE_FREETYPE
 DEFINES += -DHAVE_FT_LIBRARY_SETLCDFILTER -DFT_LCD_FILTER_H="$(topsrcdir)/modules/freetype2/include/freetype/ftlcdfil.h"
 endif
 
-cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)
-	$(PYTHON) $(DEPTH)/config.status -n --file=$@
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
new file mode 100644
index 000000000000..9858e6024fbf
--- /dev/null
+++ b/gfx/cairo/cairo/src/moz.build
@@ -0,0 +1,7 @@
+# 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/.
+
+CONFIGURE_SUBST_FILES += ['cairo-features.h']
+
diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/cairo/libpixman/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/gfx/cairo/moz.build b/gfx/cairo/moz.build
new file mode 100644
index 000000000000..4627973b4dc3
--- /dev/null
+++ b/gfx/cairo/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 += ['cairo/src']
+
+if CONFIG['MOZ_TREE_PIXMAN']:
+    DIRS += ['libpixman/src']
+
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/gl/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/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/graphite2/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/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/harfbuzz/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/gfx/ipc/moz.build b/gfx/ipc/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/ipc/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/gfx/layers/moz.build b/gfx/layers/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/layers/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/gfx/moz.build b/gfx/moz.build
new file mode 100644
index 000000000000..2d8f58c1236e
--- /dev/null
+++ b/gfx/moz.build
@@ -0,0 +1,27 @@
+# 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/.
+
+if CONFIG['MOZ_TREE_CAIRO']:
+    DIRS += ['cairo']
+
+DIRS += [
+    '2d',
+    'ycbcr',
+    'angle',
+    'src',
+    'qcms',
+    'gl',
+    'layers',
+    'graphite2/src',
+    'harfbuzz/src',
+    'ots/src',
+    'thebes',
+    'ipc',
+]
+
+if CONFIG['MOZ_ENABLE_SKIA']:
+    DIRS += ['skia']
+
+TEST_TOOL_DIRS += ['tests']
diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/ots/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/gfx/qcms/moz.build b/gfx/qcms/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/qcms/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/gfx/skia/moz.build b/gfx/skia/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/skia/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/gfx/src/moz.build b/gfx/src/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/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/gfx/tests/moz.build b/gfx/tests/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/tests/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/gfx/thebes/moz.build b/gfx/thebes/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/thebes/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/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
new file mode 100644
index 000000000000..58ce5e273390
--- /dev/null
+++ b/gfx/ycbcr/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/.
+