diff --git a/configure.ac b/configure.ac
index 01fd523..02f3780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@
 
 AC_PREREQ(2.61)
 AC_INIT([Infinity plugin],[0.9.0alpha],[dprotti@users.sourceforge.net],[infinity-plugin-4-audacious])
+AC_CANONICAL_TARGET
+
 AM_INIT_AUTOMAKE([1.9.0 dist-bzip2])
 
 AC_CONFIG_HEADER(config.h)
@@ -9,8 +11,6 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_PREFIX_PROGRAM(audacious)
 
-AC_CANONICAL_TARGET
-
 # Check for programs.
 AC_PROG_CXX
 AC_PROG_INSTALL
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fd52ff..4d420af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ COMMON_FLAGS = @AUDACIOUS_CFLAGS@ @AUDCLIENT_CFLAGS@ @SDL_CFLAGS@ @GTK_CFLAGS@\
 
 AM_CFLAGS = @CFLAGS@ $(COMMON_FLAGS)
 AM_CXXFLAGS = @CXXFLAGS@ $(COMMON_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)
 
 libinfinite_la_LDFLAGS = ${CXX}
 libinfinite_la_LIBADD = @AUDACIOUS_LIBS@ @AUDCLIENT_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @GLIB_LIBS@
@@ -23,6 +24,4 @@ libinfinite_la_SOURCES = \
 	cputest.c cputest.h\
 	mmx.h types.h
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)
-
 EXTRA_DIST = infinite_states