diff --git a/caca/Makefile.am b/caca/Makefile.am
index 8150d93..2cec852 100644
--- a/caca/Makefile.am
+++ b/caca/Makefile.am
@@ -20,7 +20,7 @@ libcaca_la_SOURCES = \
 	driver_win32.c \
 	driver_x11.c \
 	$(NULL)
-libcaca_la_CPPFLAGS = -I$(top_srcdir)/cucul
+AM_CPPFLAGS = -I$(top_srcdir)/cucul
 libcaca_la_LDFLAGS = -no-undefined
 libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 768398f..9807655 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,28 +3,24 @@
 pkgdata_DATA = caca.txt
 
 EXTRA_DIST = caca.txt
+AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
 
 bin_PROGRAMS = cacafire cacaball cacaplas cacaview cacamoir
 
 cacafire_SOURCES = aafire.c
 cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-cacafire_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1
 
 cacaball_SOURCES = cacaball.c
 cacaball_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
-cacaball_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 cacaplas_SOURCES = cacaplas.c
 cacaplas_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
-cacaplas_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 cacamoir_SOURCES = cacamoir.c
 cacamoir_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
-cacamoir_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 cacaview_SOURCES = cacaview.c
 cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-cacaview_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DX_DISPLAY_MISSING=1
 if USE_IMLIB2
 cacaview_CFLAGS = `imlib2-config --cflags`
 cacaview_LDFLAGS = `imlib2-config --libs`
diff --git a/test/Makefile.am b/test/Makefile.am
index 8a02e38..95cfbc5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,48 +1,39 @@
 # $Id$
 
+AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+
 noinst_PROGRAMS = colors demo dithering event export gamma hsv optipal spritedit transform unicode
 
 colors_SOURCES = colors.c
 colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-colors_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 demo_SOURCES = demo.c
 demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
-demo_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 dithering_SOURCES = dithering.c
 dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-dithering_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 event_SOURCES = event.c
 event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-event_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 export_SOURCES = export.c
 export_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
-export_CPPFLAGS = -I$(top_srcdir)/cucul
 
 gamma_SOURCES = gamma.c
 gamma_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
-gamma_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 hsv_SOURCES = hsv.c
 hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-hsv_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 optipal_SOURCES = optipal.c
 optipal_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
-optipal_CPPFLAGS = -I$(top_srcdir)/cucul
 
 spritedit_SOURCES = spritedit.c
 spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-spritedit_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 transform_SOURCES = transform.c
 transform_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-transform_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 unicode_SOURCES = unicode.c
 unicode_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
-unicode_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca