diff --git a/configure.in b/configure.in
index bcdb50db9..1335e4ce9 100644
--- a/configure.in
+++ b/configure.in
@@ -586,6 +586,8 @@ if test "x$GCC" = "xyes"; then
 	-Wnested-externs -fno-strict-aliasing"
 fi
 
+AC_SUBST(WARN_CFLAGS)
+
 CAIRO_CFLAGS="$CAIRO_CFLAGS $WARN_CFLAGS"
 CAIRO_LIBS="$CAIRO_LIBS"
 
diff --git a/pixman/src/Makefile.am b/pixman/src/Makefile.am
index 376d69654..179c557bc 100644
--- a/pixman/src/Makefile.am
+++ b/pixman/src/Makefile.am
@@ -36,8 +36,8 @@ noinst_LTLIBRARIES += libpixman-mmx.la
 libpixman_mmx_la_SOURCES = \
 	fbmmx.c		\
 	fbmmx.h
-libpixman_mmx_la_CFLAGS = @MMX_CFLAGS@
+libpixman_mmx_la_CFLAGS = @MMX_CFLAGS@ $(WARN_CFLAGS)
 libpixman_la_LIBADD = libpixman-mmx.la
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(srcdir) $(WARN_CFLAGS)
+INCLUDES = -I$(top_srcdir) -I$(srcdir) @WARN_CFLAGS@