diff --git a/src/Makefile.am b/src/Makefile.am
index c28e2550..e0808137 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,4 +52,4 @@ rtorrent_LDADD = \
 rtorrent_SOURCES = \
 	main.cc
 
-INCLUDES = -I$(srcdir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index c71f1ce0..1fa4183a 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -30,4 +30,4 @@ libsub_core_a_SOURCES = \
 	view_manager.cc \
 	view_manager.h
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/src/display/Makefile.am b/src/display/Makefile.am
index 0bdf072d..5ac2ea21 100644
--- a/src/display/Makefile.am
+++ b/src/display/Makefile.am
@@ -50,4 +50,4 @@ libsub_display_a_SOURCES = \
 	window_tracker_list.cc \
 	window_tracker_list.h
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 4ac2af1a..deb951bd 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -12,4 +12,4 @@ libsub_input_a_SOURCES = \
 	text_input.cc \
 	text_input.h
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/src/rpc/Makefile.am b/src/rpc/Makefile.am
index 849a9c4c..02ae61d9 100644
--- a/src/rpc/Makefile.am
+++ b/src/rpc/Makefile.am
@@ -27,4 +27,4 @@ libsub_rpc_a_SOURCES = \
 	xmlrpc.h \
 	xmlrpc.cc
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 1b493151..7a18a7ca 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -30,4 +30,4 @@ libsub_ui_a_SOURCES = \
 	root.cc \
 	root.h
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 55ea9ff1..939bbb37 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -11,4 +11,4 @@ libsub_utils_a_SOURCES = \
 	socket_fd.cc \
 	socket_fd.h
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
diff --git a/test/Makefile.am b/test/Makefile.am
index 9c352b7d..dd4d641e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,4 +25,4 @@ rtorrentTest_SOURCES = \
 rtorrentTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
 rtorrentTest_LDFLAGS = $(CPPUNIT_LIBS)  -ldl
 
-INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src