diff --git a/configure.in b/configure.in
index 1cc08aebf74e..8a21074f5a38 100644
--- a/configure.in
+++ b/configure.in
@@ -6941,6 +6941,7 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then
        # Define macros for cairo-features.h
        if test "$MOZ_X11"; then
            XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
+           XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1"
            PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
            PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
            FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
diff --git a/gfx/cairo/cairo/src/cairo-features.h.in b/gfx/cairo/cairo/src/cairo-features.h.in
index e078c8e31f44..e8ba8345079c 100644
--- a/gfx/cairo/cairo/src/cairo-features.h.in
+++ b/gfx/cairo/cairo/src/cairo-features.h.in
@@ -65,6 +65,8 @@
 
 @XLIB_SURFACE_FEATURE@
 
+@XLIB_XRENDER_SURFACE_FEATURE@
+
 @QUARTZ_SURFACE_FEATURE@
 
 @XCB_SURFACE_FEATURE@
diff --git a/gfx/cairo/cairo/src/cairo-platform.h b/gfx/cairo/cairo/src/cairo-platform.h
index 8f88dd0aa241..ee214ea213ef 100644
--- a/gfx/cairo/cairo/src/cairo-platform.h
+++ b/gfx/cairo/cairo/src/cairo-platform.h
@@ -93,4 +93,6 @@
 #define FLOAT_WORDS_BIGENDIAN
 #endif
 
+#define CAIRO_NO_MUTEX 1
+
 #endif /* CAIRO_PLATFORM_H */
diff --git a/gfx/cairo/cairo/src/cairo-win32-private.h b/gfx/cairo/cairo/src/cairo-win32-private.h
index 08aeafa759c0..6d995460b6fc 100644
--- a/gfx/cairo/cairo/src/cairo-win32-private.h
+++ b/gfx/cairo/cairo/src/cairo-win32-private.h
@@ -46,7 +46,11 @@
 #define SB_NONE 0
 #endif
 
+#ifdef MOZILLA_CAIRO_NOT_DEFINED
 #define WIN32_FONT_LOGICAL_SCALE 32
+#else
+#define WIN32_FONT_LOGICAL_SCALE 1
+#endif
 
 typedef struct _cairo_win32_surface {
     cairo_surface_t base;