--- mozilla/layout/generic/Makefile.in.orig	2011-07-06 05:09:28.000000000 +0200
+++ mozilla/layout/generic/Makefile.in	2011-07-06 21:49:25.105659269 +0200
@@ -159,9 +159,10 @@
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../dom/base \
 		-I$(srcdir)/../../dom/plugins/base \
-		$(MOZ_CAIRO_CFLAGS) \
 		$(NULL)
 
+ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+
 ifdef MOZ_ENABLE_GTK2
 CXXFLAGS += $(MOZ_GTK2_CFLAGS)
 endif