diff --git a/azbox/Makefile.am b/azbox/Makefile.am
index 46a3f6c..0e6b74f 100644
--- a/azbox/Makefile.am
+++ b/azbox/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = \
-	-I$(top_srcdir)/common
-
 noinst_LTLIBRARIES = libazbox.la
 
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/common
+
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 AM_LDFLAGS = -lpthread
 
diff --git a/configure.ac b/configure.ac
index 88dbf02..cf816f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT(libstb-hal,0.1.1)
-AM_INIT_AUTOMAKE(libstb-hal,0.1.1)
+AC_INIT([libstb-hal], [0.1.1])
+AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AC_CONFIG_MACRO_DIR([m4])
 AC_GNU_SOURCE
diff --git a/generic-pc/Makefile.am b/generic-pc/Makefile.am
index 130e419..f4dbbc7 100644
--- a/generic-pc/Makefile.am
+++ b/generic-pc/Makefile.am
@@ -1,9 +1,9 @@
-INCLUDES = \
-	-I$(top_srcdir)/common
-
 noinst_LTLIBRARIES = libgeneric.la
 
 AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
+AM_CPPFLAGS += \
+	-I$(top_srcdir)/common
+
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
 AM_LDFLAGS = \
diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am
index cb31f9d..a5fb28c 100644
--- a/libeplayer3/Makefile.am
+++ b/libeplayer3/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libeplayer3.la
 
 CXXFLAGS = -Wall
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(srcdir)/include
 
 libeplayer3_la_SOURCES =  \
@@ -24,7 +24,7 @@ AM_CFLAGS += \
 	-Wno-unused -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable \
 	-Wno-sign-compare -Wno-missing-field-initializers
 # silence ffmpeg deprecation warnings
-AM_CPPFLAGS = -Dattribute_deprecated=''
+AM_CPPFLAGS += -Dattribute_deprecated=''
 
 #libeplayer3_la_LIBADD = -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng
 
diff --git a/libspark/Makefile.am b/libspark/Makefile.am
index 39afbd1..6d0384c 100644
--- a/libspark/Makefile.am
+++ b/libspark/Makefile.am
@@ -1,9 +1,9 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libspark.la
+
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/libeplayer3/include
 
-noinst_LTLIBRARIES = libspark.la
-
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 AM_LDFLAGS = -lpthread -lass
 
@@ -19,4 +19,4 @@ libspark_la_SOURCES = \
 	pwrmngr.cpp \
 	record.cpp
 
-AM_CPPFLAGS = -DF_INTERRUPTS=20000 -DIRMP_EMBED -DLIRC_IRMP
+AM_CPPFLAGS += -DF_INTERRUPTS=20000 -DIRMP_EMBED -DLIRC_IRMP
diff --git a/libtriple/Makefile.am b/libtriple/Makefile.am
index 1bad773..6df87cb 100644
--- a/libtriple/Makefile.am
+++ b/libtriple/Makefile.am
@@ -1,9 +1,9 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libtriple.la
+
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/common \
 	@DIRECTFB_CFLAGS@
 
-noinst_LTLIBRARIES = libtriple.la
-
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 AM_LDFLAGS = \
 	@DIRECTFB_LIBS@