diff --git a/gfx/2d/DrawTargetCairo.cpp b/gfx/2d/DrawTargetCairo.cpp
index 8687e5ba0f0..ae6d4671895 100644
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -37,8 +37,6 @@
 #include "DrawTargetCairo.h"
 #include "SourceSurfaceCairo.h"
 
-#include "cairo/cairo.h"
-
 namespace mozilla {
 namespace gfx {
 
diff --git a/gfx/2d/DrawTargetCairo.h b/gfx/2d/DrawTargetCairo.h
index 3a69fe98183..fbc11c9cb47 100644
--- a/gfx/2d/DrawTargetCairo.h
+++ b/gfx/2d/DrawTargetCairo.h
@@ -38,7 +38,7 @@
 #define _MOZILLA_GFX_DRAWTARGET_CAIRO_H_
 
 #include "2D.h"
-#include "cairo/cairo.h"
+#include "cairo.h"
 
 namespace mozilla {
 namespace gfx {
diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in
index e7ed0f45058..91728dc71c2 100644
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -95,6 +95,6 @@ endif
 #EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit -framework QuartzCore
 #endif
 
-
-
 include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
diff --git a/gfx/2d/SourceSurfaceCairo.cpp b/gfx/2d/SourceSurfaceCairo.cpp
index 45939ee6960..e63571bbeea 100644
--- a/gfx/2d/SourceSurfaceCairo.cpp
+++ b/gfx/2d/SourceSurfaceCairo.cpp
@@ -37,7 +37,7 @@
 
 #include "SourceSurfaceCairo.h"
 
-#include "cairo/cairo.h"
+#include "cairo.h"
 
 namespace mozilla {
 namespace gfx {