diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build
index 3bca2ea80d41..50481469122c 100644
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -4,6 +4,9 @@
 # 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/.
 
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'Graphics: Layers')
+
 EXPORTS.mozilla += [
     'D3DMessageUtils.h',
     'GfxMessageUtils.h'
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 79b293256f35..2f2221e19f0b 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -4,6 +4,9 @@
 # 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/.
 
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'Graphics: Layers')
+
 with Files('apz/**'):
     BUG_COMPONENT = ('Core', 'Panning and Zooming')
 
diff --git a/gfx/moz.build b/gfx/moz.build
index edd080c3faad..ee51608660eb 100644
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -4,6 +4,9 @@
 # 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/.
 
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'Graphics')
+
 if CONFIG['MOZ_TREE_CAIRO']:
     DIRS += ['cairo']
 
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 7a6863fac44e..b841a45de1f4 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -4,6 +4,12 @@
 # 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/.
 
+with Files('*Text*'):
+    BUG_COMPONENT = ('Core', 'Graphics: Text')
+
+with Files('*DWrite*'):
+    BUG_COMPONENT = ('Core', 'Graphics: Text')
+
 EXPORTS += [
     'ContextStateTracker.h',
     'DrawMode.h',