diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 208cbfa6..34ea47e5 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-INCLUDES=$(GMIME_CFLAGS) $(GLIB_CFLAGS) -I${prefix}/include
+AM_CPPFLAGS=$(GMIME_CFLAGS) $(GLIB_CFLAGS) -I${prefix}/include
 AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement -pedantic
 
 noinst_PROGRAMS=gmime-test
diff --git a/guile/Makefile.am b/guile/Makefile.am
index 472732c2..0f9f95e3 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
 # with separate builddir)
 SUBDIRS= . mu scripts examples tests
 
-INCLUDES=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFLAGS}
+AM_CPPFLAGS=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFLAGS}
 
 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not
@@ -54,7 +54,7 @@ mu_guile_TEXINFOS=			\
 
 BUILT_SOURCES=$(XFILES)
 
-snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS)
 SUFFIXES = .x .doc
 .c.x:
 	$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
diff --git a/guile/tests/Makefile.am b/guile/tests/Makefile.am
index 9d14e34a..63778067 100644
--- a/guile/tests/Makefile.am
+++ b/guile/tests/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-INCLUDES=$(XAPIAN_CXXFLAGS)					\
+AM_CPPFLAGS=$(XAPIAN_CXXFLAGS)					\
 	 $(GMIME_CFLAGS)					\
 	 $(GLIB_CFLAGS)						\
 	-I ${top_srcdir}					\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 331792f0..b5eeda3a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -26,7 +26,7 @@ else
 crypto=
 endif
 
-INCLUDES=$(XAPIAN_CXXFLAGS) $(GMIME_CFLAGS) $(GLIB_CFLAGS) $(GUILE_CFLAGS)
+AM_CPPFLAGS=$(XAPIAN_CXXFLAGS) $(GMIME_CFLAGS) $(GLIB_CFLAGS) $(GUILE_CFLAGS)
 
 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not
diff --git a/lib/mu-container.c b/lib/mu-container.c
index fc88db5f..2551b16a 100644
--- a/lib/mu-container.c
+++ b/lib/mu-container.c
@@ -432,8 +432,10 @@ mu_container_dump (MuContainer *c, gboolean recursive)
 	if (!recursive)
 		dump_container (c);
 	else
-		mu_container_foreach (c, (MuContainerForeachFunc)dump_container,
-				   NULL);
+		mu_container_foreach
+			(c,
+			 (MuContainerForeachFunc)dump_container,
+			 NULL);
 }
 
 
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 36c83243..02de737b 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-INCLUDES=$(XAPIAN_CXXFLAGS)					\
+AM_CPPFLAGS=$(XAPIAN_CXXFLAGS)					\
 	 $(GMIME_CFLAGS)					\
 	 $(GLIB_CFLAGS)						\
 	-I ${top_srcdir}					\
diff --git a/mu/Makefile.am b/mu/Makefile.am
index 37e7f23a..37df1ac0 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
 # before decending into tests/
 SUBDIRS= . tests
 
-INCLUDES=-I${top_srcdir}/lib $(GLIB_CFLAGS)
+AM_CPPFLAGS=-I${top_srcdir}/lib $(GLIB_CFLAGS)
 
 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not
diff --git a/mu/tests/Makefile.am b/mu/tests/Makefile.am
index f6123257..45d8a6eb 100644
--- a/mu/tests/Makefile.am
+++ b/mu/tests/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-INCLUDES=$(XAPIAN_CXXFLAGS)						\
+AM_CPPFLAGS=$(XAPIAN_CXXFLAGS)						\
 	 $(GMIME_CFLAGS)						\
 	 $(GLIB_CFLAGS)							\
 	-I ${top_srcdir}						\
diff --git a/toys/msg2pdf/Makefile.am b/toys/msg2pdf/Makefile.am
index e85ce3d5..8977acfa 100644
--- a/toys/msg2pdf/Makefile.am
+++ b/toys/msg2pdf/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
 SUBDIRS= .
 
 
-INCLUDES=-I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"'
+AM_CPPFLAGS=-I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"'
 
 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not
diff --git a/toys/mug/Makefile.am b/toys/mug/Makefile.am
index edfdf075..924aefb8 100644
--- a/toys/mug/Makefile.am
+++ b/toys/mug/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/gtest.mk
 # enforce compiling this dir first before decending into tests/
 SUBDIRS= .
 
-INCLUDES=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) \
+AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) \
 	-DICONDIR='"$(icondir)"' -DMUGDIR='"$(abs_srcdir)"' \
 	-DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE