diff --git a/gfx/src/thebes/Makefile.in b/gfx/src/thebes/Makefile.in
index 9026c47fc48..2893908aca5 100644
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -147,3 +147,6 @@ ifdef MOZ_ENABLE_GTK2
 DEFINES += -DMOZ_ENABLE_GTK2
 endif
 
+ifdef MOZ_ENABLE_PANGO
+CXXFLAGS += $(MOZ_PANGO_CFLAGS)
+endif
diff --git a/gfx/src/thebes/nsThebesFontMetrics.cpp b/gfx/src/thebes/nsThebesFontMetrics.cpp
index 62eccbcc10e..8165aa7ea15 100644
--- a/gfx/src/thebes/nsThebesFontMetrics.cpp
+++ b/gfx/src/thebes/nsThebesFontMetrics.cpp
@@ -49,7 +49,7 @@ NS_IMPL_ISUPPORTS1(nsThebesFontMetrics, nsIFontMetrics)
 
 #if defined(XP_WIN)
 #include "gfxWindowsFonts.h"
-#elif defined(MOZ_ENABLE_GTK2)
+#elif defined(MOZ_ENABLE_PANGO)
 #include "gfxPangoFonts.h"
 #elif defined(XP_MACOSX)
 #include "gfxAtsuiFonts.h"
@@ -96,7 +96,7 @@ nsThebesFontMetrics::Init(const nsFont& aFont, nsIAtom* aLangGroup,
 
 #if defined(XP_WIN)
     mFontGroup = new gfxWindowsFontGroup(aFont.name, mFontStyle, (HDC)mDeviceContext->GetHDC());
-#elif defined(MOZ_ENABLE_GTK2)
+#elif defined(MOZ_ENABLE_PANGO)
     mFontGroup = new gfxPangoFontGroup(aFont.name, mFontStyle);
 #elif defined(XP_MACOSX)
     mFontGroup = new gfxAtsuiFontGroup(aFont.name, mFontStyle);
diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp
index f2c11e90a4b..d34feabd518 100644
--- a/gfx/thebes/src/gfxPangoFonts.cpp
+++ b/gfx/thebes/src/gfxPangoFonts.cpp
@@ -56,11 +56,12 @@
 
 #include "cairo.h"
 
+#ifndef THEBES_USE_PANGO_CAIRO
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkpango.h>
 
-#ifndef THEBES_USE_PANGO_CAIRO
+
 #include <freetype/tttables.h>
 #include <fontconfig/fontconfig.h>
 
@@ -640,6 +641,7 @@ gfxPangoTextRun::EnsurePangoLayout(gfxContext *aContext)
     if (aContext) {
         pango_cairo_update_context (aContext->GetCairo(), pf->GetPangoContext());
     }
+    pango_layout_context_changed (mPangoLayout);
 #endif
 }
 
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index b7a511da57d..21eaf08a0f7 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -176,4 +176,8 @@ LOCAL_INCLUDES += \
         -I$(srcdir)/../svg/base/src
 endif
 
+ifdef MOZ_ENABLE_CAIRO_GFX
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+endif
+
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index b274597f7c5..97143f7cf01 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -193,6 +193,7 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../../content/xul/content/src \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
+		$(MOZ_CAIRO_CFLAGS) \
 		$(NULL)
 
 libs::
diff --git a/view/src/Makefile.in b/view/src/Makefile.in
index d9bc19464cb..9566f17b0de 100644
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -69,5 +69,8 @@ CPPSRCS		= \
 		nsViewManager.cpp \
 		$(NULL)
 
-
 include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_ENABLE_CAIRO_GFX
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+endif