--- layout/generic/Makefile.in.orig	2009-04-28 11:16:16.059107000 +0000
+++ layout/generic/Makefile.in	2009-04-28 11:16:41.171110062 +0000
@@ -188,9 +188,10 @@
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../dom/src/base \
-		$(MOZ_CAIRO_CFLAGS) \
 		$(NULL)
 
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+
 ifdef MOZ_ENABLE_GTK2
 CXXFLAGS += $(MOZ_GTK2_CFLAGS)
 endif