diff --git configure.ac configure.ac
index a1696a9..69aba69 100644
--- configure.ac
+++ configure.ac
@@ -50,7 +50,8 @@ AM_PROG_LD
 AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/socket.h syslog.h unistd.h])
 
 AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([[int i;]], [], [AC_MSG_ERROR([C++ compiler missing or inoperational])])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
+   [], [AC_MSG_ERROR([C++ compiler missing or inoperational])])
 AC_LANG_POP([C++])
 
 #Make sure all types are covered
diff --git plugin/Makefile.am plugin/Makefile.am
index 26e07b3..113c156 100644
--- plugin/Makefile.am
+++ plugin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I@srcdir@/include \
+AM_CPPFLAGS= -I$(top_srcdir)/include -I@srcdir@/include \
             $(LIBXML_CFLAGS) $(DEFS) $(LIBGLIB_CFLAGS)
 
 bin_PROGRAMS = simc_lsmplugin
diff --git src/Makefile.am src/Makefile.am
index 14c8263..837bc13 100644
--- src/Makefile.am
+++ src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I@srcdir@/include $(LIBXML_CFLAGS) $(LIBGLIB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I@srcdir@/include $(LIBXML_CFLAGS) $(LIBGLIB_CFLAGS)
 
 lib_LTLIBRARIES = libstoragemgmt.la
 
diff --git test/Makefile.am test/Makefile.am
index e5b8817..e164964 100644
--- test/Makefile.am
+++ test/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I@srcdir@/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I@srcdir@/include
 
 EXTRA_DIST=cmdtest.py runtests.sh
 
diff --git tools/lsmcli/Makefile.am tools/lsmcli/Makefile.am
index fdff639..d383737 100644
--- tools/lsmcli/Makefile.am
+++ tools/lsmcli/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I@srcdir@/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I@srcdir@/include
 
 noinst_PROGRAMS = lsmcli
 #bin_PROGRAMS = lsmcli