diff --git a/components/gfx/font_cache_task.rs b/components/gfx/font_cache_task.rs
index af528ee5c3be..5332fbde69af 100644
--- a/components/gfx/font_cache_task.rs
+++ b/components/gfx/font_cache_task.rs
@@ -77,7 +77,7 @@ impl FontFamily {
 }
 
 /// Commands that the FontContext sends to the font cache task.
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub enum Command {
     GetFontTemplate(String, FontTemplateDescriptor, IpcSender<Reply>),
     GetLastResortFontTemplate(FontTemplateDescriptor, IpcSender<Reply>),
@@ -87,7 +87,7 @@ pub enum Command {
 }
 
 /// Reply messages sent from the font cache task to the FontContext caller.
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub enum Reply {
     GetFontTemplateReply(Option<Arc<FontTemplateData>>),
 }
@@ -271,7 +271,7 @@ impl FontCache {
 
 /// The public interface to the font cache task, used exclusively by
 /// the per-thread/task FontContext structures.
-#[derive(Clone, Deserialize, Serialize)]
+#[derive(Clone, Deserialize, Serialize, Debug)]
 pub struct FontCacheTask {
     chan: IpcSender<Command>,
 }
diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs
index facd815f9c70..52ad52201243 100644
--- a/components/gfx/font_context.rs
+++ b/components/gfx/font_context.rs
@@ -44,17 +44,20 @@ fn create_scaled_font(template: &Arc<FontTemplateData>, pt_size: Au) -> ScaledFo
 
 static SMALL_CAPS_SCALE_FACTOR: f32 = 0.8;      // Matches FireFox (see gfxFont.h)
 
+#[derive(Debug)]
 struct LayoutFontCacheEntry {
     family: String,
     font: Option<Rc<RefCell<Font>>>,
 }
 
+#[derive(Debug)]
 struct FallbackFontCacheEntry {
     font: Rc<RefCell<Font>>,
 }
 
 /// A cached azure font (per paint task) that
 /// can be shared by multiple text runs.
+#[derive(Debug)]
 struct PaintFontCacheEntry {
     pt_size: Au,
     identifier: Atom,
@@ -69,6 +72,7 @@ static FONT_CACHE_EPOCH: AtomicUsize = ATOMIC_USIZE_INIT;
 /// working with fonts. It is the public API used by the layout and
 /// paint code. It talks directly to the font cache task where
 /// required.
+#[derive(Debug)]
 pub struct FontContext {
     platform_handle: FontContextHandle,
     font_cache_task: FontCacheTask,
@@ -317,6 +321,7 @@ impl HeapSizeOf for FontContext {
     }
 }
 
+#[derive(Debug)]
 struct LayoutFontGroupCacheKey {
     pointer: Arc<SpecifiedFontStyle>,
     size: Au,
diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs
index 5076f9e77e1f..65fd8b6084d1 100644
--- a/components/style/properties.mako.rs
+++ b/components/style/properties.mako.rs
@@ -6115,7 +6115,7 @@ pub mod style_structs {
 
     % for style_struct in STYLE_STRUCTS:
         % if style_struct.name == "Font":
-        #[derive(Clone, HeapSizeOf)]
+        #[derive(Clone, HeapSizeOf, Debug)]
         % else:
         #[derive(PartialEq, Clone, HeapSizeOf)]
         % endif