diff --git a/config/system-headers b/config/system-headers
index 437845d30970..5a59f0607d92 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1041,4 +1041,6 @@ proxy.h
 #if MOZ_PLATFORM_MAEMO==6
 contentaction/contentaction.h
 #endif
-
+#ifndef MOZ_TREE_PIXMAN
+pixman.h
+#endif
diff --git a/gfx/cairo/cairo/src/cairo-rename.h b/gfx/cairo/cairo/src/cairo-rename.h
index e3cddf992441..e62cdb823e65 100644
--- a/gfx/cairo/cairo/src/cairo-rename.h
+++ b/gfx/cairo/cairo/src/cairo-rename.h
@@ -324,6 +324,7 @@
 #define cairo_xlib_surface_get_xrender_format _moz_cairo_xlib_surface_get_xrender_format
 #define cairo_xlib_surface_set_drawable _moz_cairo_xlib_surface_set_drawable
 #define cairo_xlib_surface_set_size _moz_cairo_xlib_surface_set_size
+#ifdef MOZ_TREE_PIXMAN
 #define pixman_region_set_static_pointers _moz_pixman_region_set_static_pointers
 #define pixman_region_init _moz_pixman_region_init
 #define pixman_region_init_rect _moz_pixman_region_init_rect
@@ -409,3 +410,4 @@
 #define pixman_add_traps _moz_pixman_add_traps
 #define pixman_add_trapezoids _moz_pixman_add_trapezoids
 #define pixman_rasterize_trapezoid _moz_pixman_rasterize_trapezoid
+#endif
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index 437845d30970..37f5e6a46f9d 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -1041,4 +1041,7 @@ proxy.h
 #if MOZ_PLATFORM_MAEMO==6
 contentaction/contentaction.h
 #endif
+#ifndef MOZ_TREE_PIXMAN
+pixman.h
+#endif