diff --git a/bin/openpam_dump_policy/Makefile.am b/bin/openpam_dump_policy/Makefile.am
index 64f795e..3c24bdb 100644
--- a/bin/openpam_dump_policy/Makefile.am
+++ b/bin/openpam_dump_policy/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 noinst_PROGRAMS = openpam_dump_policy
 openpam_dump_policy_SOURCES = openpam_dump_policy.c
diff --git a/bin/pamtest/Makefile.am b/bin/pamtest/Makefile.am
index af5f44b..95c7432 100644
--- a/bin/pamtest/Makefile.am
+++ b/bin/pamtest/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = pamtest
 pamtest_SOURCES = pamtest.c
diff --git a/bin/su/Makefile.am b/bin/su/Makefile.am
index 11c3f16..90ee342 100644
--- a/bin/su/Makefile.am
+++ b/bin/su/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = su
 su_SOURCES = su.c
diff --git a/lib/Makefile.am b/lib/Makefile.am
index aa2de00..3481c16 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@
 
 NULL =
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libpam.la
 
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index 918aa95..19cd3da 100644
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 pkglibdir = @OPENPAM_MODULES_DIR@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 pkglib_LTLIBRARIES = pam_deny.la
 
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index ad57003..f985a73 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 pkglibdir = @OPENPAM_MODULES_DIR@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 pkglib_LTLIBRARIES = pam_permit.la
 
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 5d3f0c3..8c50d3c 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 pkglibdir = @OPENPAM_MODULES_DIR@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 if WITH_PAM_UNIX
 pkglib_LTLIBRARIES = pam_unix.la
diff --git a/t/Makefile.am b/t/Makefile.am
index 9c867cd..0412a53 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 noinst_HEADERS = t.h