diff --git a/Octave/Makefile.am b/Octave/Makefile.am
index 6186861d..3f0078e1 100644
--- a/Octave/Makefile.am
+++ b/Octave/Makefile.am
@@ -21,7 +21,7 @@ OCT_LIB_DIR = @OCT_LIB_DIR@
 OCT_LIBS = @OCT_LIBS@
 
 SNDFILEDIR = $(top_builddir)/src
-INCLUDES = -I$(SNDFILEDIR)
+AM_CPPFLAGS = -I$(SNDFILEDIR)
 
 oct_module_srcs = sndfile.cc
 oct_module_files = sndfile.oct PKG_ADD
diff --git a/configure.ac b/configure.ac
index 0d974f67..9c8d9d20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_CANONICAL_TARGET([])
 AC_CONFIG_MACRO_DIR([M4])
 AC_CONFIG_HEADERS([src/config.h])
 
-AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_LANG([C])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9797a72c..3704b1dc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text
 
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 sndfile_to_text_SOURCES = sndfile-to-text.c
 sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la
diff --git a/programs/Makefile.am b/programs/Makefile.am
index b513c562..066b61d5 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-cmp \
 OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
 OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
 
-INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
 
 CLEANFILES = *~
 
diff --git a/regtest/Makefile.am b/regtest/Makefile.am
index 4d1ed4c0..1102a9ba 100644
--- a/regtest/Makefile.am
+++ b/regtest/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = sndfile-regtest
 
 noinst_HEADERS = regtest.h
 
-INCLUDES = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS)
 
 sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c
 sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c05a446..f7d3e75a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-INCLUDES = @EXTERNAL_CFLAGS@
+AM_CPPFLAGS = @EXTERNAL_CFLAGS@
 
 lib_LTLIBRARIES = libsndfile.la
 include_HEADERS = sndfile.hh
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc2f5d92..7fc6850c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@ else
 CPP_TEST = cpp_test
 endif
 
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 check_PROGRAMS = sfversion floating_point_test write_read_test \
 	lossy_comp_test error_test ulaw_test alaw_test dwvw_test \