diff --git a/mozilla/gfx/thebes/src/gfxASurface.cpp b/mozilla/gfx/thebes/src/gfxASurface.cpp
index 3d86f029eb3..073b9f4eb1f 100644
--- a/mozilla/gfx/thebes/src/gfxASurface.cpp
+++ b/mozilla/gfx/thebes/src/gfxASurface.cpp
@@ -48,6 +48,8 @@
 
 #ifdef CAIRO_HAS_XLIB_SURFACE
 #include "gfxXlibSurface.h"
+// X11 really blows, and #define's Status
+#undef Status
 #endif
 
 #ifdef CAIRO_HAS_QUARTZ_SURFACE