diff --git a/client_examples/Makefile.am b/client_examples/Makefile.am
index a6ba020..9cb2c32 100644
--- a/client_examples/Makefile.am
+++ b/client_examples/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = ../libvncclient/libvncclient.la @WSOCKLIB@
 
 if WITH_FFMPEG
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6a7d656..829f735 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = ../libvncserver/libvncserver.la @WSOCKLIB@
 
 if OSX
diff --git a/examples/android/Makefile.am b/examples/android/Makefile.am
index 2104967..9cb5c02 100644
--- a/examples/android/Makefile.am
+++ b/examples/android/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = $(top_srcdir)/libvncserver/libvncserver.la @WSOCKLIB@
 
 noinst_PROGRAMS=androidvncserver
diff --git a/libvncclient/Makefile.am b/libvncclient/Makefile.am
index 53b349e..71118e2 100644
--- a/libvncclient/Makefile.am
+++ b/libvncclient/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common
 
 if HAVE_GNUTLS
 TLSSRCS = tls_gnutls.c
diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am
index deb0e09..cb38c64 100644
--- a/libvncserver/Makefile.am
+++ b/libvncserver/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common
 
 if WITH_TIGHTVNC_FILETRANSFER
 TIGHTVNCFILETRANSFERHDRS=tightvnc-filetransfer/filelistinfo.h \
diff --git a/test/Makefile.am b/test/Makefile.am
index 808ebf3..3b19d61 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -9,7 +9,7 @@ tjbench_SOURCES=tjbench.c ../common/turbojpeg.c ../common/turbojpeg.h \
 tjbench_LDADD=$(LDADD) -lm
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common
 LDADD = ../libvncserver/libvncserver.la ../libvncclient/libvncclient.la @WSOCKLIB@
 
 if HAVE_LIBPTHREAD