diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am
index 0ce1c1399..37475abdf 100644
--- a/heartbeat/Makefile.am
+++ b/heartbeat/Makefile.am
@@ -1,143 +1,143 @@
 # Makefile.am for OCF RAs
 #
 # Author: Sun Jing Dong
 # Copyright (C) 2004 IBM
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST		= $(ocf_SCRIPTS) $(ocfcommon_DATA) \
 			  $(common_DATA) $(hb_DATA) $(dtd_DATA) \
 			  README
 
-INCLUDES		= -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
+AM_CPPFLAGS		= -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
 
 halibdir		= $(libexecdir)/heartbeat
 
 ocfdir		        = $(OCF_RA_DIR_PREFIX)/heartbeat
 
 dtddir			= $(datadir)/$(PACKAGE_NAME)
 dtd_DATA		= ra-api-1.dtd
 
 if USE_IPV6ADDR
 ocf_PROGRAMS           = IPv6addr
 halib_PROGRAMS         = send_ua
 else
 ocf_PROGRAMS           =
 halib_PROGRAMS         =
 endif
 
 IPv6addr_SOURCES        = IPv6addr.c
 send_ua_SOURCES         = IPv6addr.c
 
 IPv6addr_LDADD          = -lplumb $(LIBNETLIBS)
 send_ua_LDADD           = -lplumb $(LIBNETLIBS)
 
 ocf_SCRIPTS	     =  ClusterMon		\
 			CTDB			\
 			Dummy			\
 		        IPaddr			\
 		        IPaddr2			\
 			anything		\
 			AoEtarget		\
 			apache			\
 			asterisk		\
 			nginx			\
 			AudibleAlarm		\
 			conntrackd		\
 			db2			\
 			dhcpd		\
 			Delay			\
 			eDir88			\
 			EvmsSCC			\
 			Evmsd			\
 			ethmonitor		\
 			exportfs		\
 			Filesystem		\
 			fio			\
 			ids			\
 			iscsi			\
 			ICP			\
 			IPsrcaddr		\
 			iSCSITarget		\
 			iSCSILogicalUnit	\
 			iface-bridge		\
 			iface-vlan		\
 			jboss			\
 			LinuxSCSI		\
 			LVM			\
 			lxc			\
 			MailTo			\
 			ManageRAID		\
 			ManageVE		\
 			mysql			\
 			mysql-proxy		\
 			named			\
 			nfsserver		\
 			oracle			\
 			oralsnr			\
 			pingd			\
 			portblock		\
 			postfix			\
 			pound			\
 			pgsql			\
 			proftpd			\
 			Pure-FTPd		\
 			Raid1			\
 			Route			\
 			rsyncd			\
 			rsyslog			\
 			SAPDatabase		\
 			SAPInstance		\
 			SendArp			\
 			ServeRAID		\
 			slapd			\
 			SphinxSearchDaemon	\
 			Squid			\
 			Stateful		\
 			SysInfo			\
 			scsi2reservation	\
 			sfex			\
 			symlink			\
 			syslog-ng		\
 			tomcat			\
 			VIPArip			\
 			VirtualDomain		\
 			varnish			\
 			vmware			\
 			WAS			\
 			WAS6			\
 			WinPopup		\
 			Xen			\
 			Xinetd			\
 			zabbixserver
 
 ocfcommondir		= $(OCF_LIB_DIR_PREFIX)/heartbeat
 ocfcommon_DATA		= ocf-shellfuncs 	\
 			  ocf-binaries	 	\
 			  ocf-directories 	\
 			  ocf-returncodes 	\
  			  ocf-rarun		\
 			  apache-conf.sh 	\
 			  http-mon.sh    	\
 			  sapdb-nosha.sh	\
 			  sapdb.sh		\
 			  ora-common.sh		\
 			  findif.sh
 
 # Legacy locations
 hbdir			= $(sysconfdir)/ha.d
 hb_DATA			= shellfuncs
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3205bbda6..1186967cf 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,75 +1,75 @@
 #
 # heartbeat: Linux-HA heartbeat code
 #
 # Copyright (C) 2001 Michael Moerz
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 SUBDIRS			= ocft
 
-INCLUDES                = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
 halibdir		= $(libexecdir)/heartbeat
 
 EXTRA_DIST		= ocf-tester.8 sfex_init.8
 
 sbin_PROGRAMS		= 
 sbin_SCRIPTS		= ocf-tester
 halib_PROGRAMS		= findif
 
 man8_MANS		= ocf-tester.8
 
 if BUILD_SFEX
 halib_PROGRAMS		+= sfex_daemon
 sbin_PROGRAMS		+= sfex_init sfex_stat
 man8_MANS		+= sfex_init.8
 endif
 
 if USE_LIBNET
 halib_PROGRAMS		+= send_arp
 send_arp_SOURCES	= send_arp.libnet.c
 send_arp_CFLAGS		= @LIBNETDEFINES@
 send_arp_LDADD		= $(GLIBLIB) -lplumb @LIBNETLIBS@
 else
 
 if SENDARP_LINUX
 halib_PROGRAMS		+= send_arp
 send_arp_SOURCES	= send_arp.linux.c
 endif
 
 endif
 
 sfex_daemon_SOURCES	= sfex_daemon.c sfex.h sfex_lib.c sfex_lib.h
 sfex_daemon_CFLAGS	= -D_GNU_SOURCE
 sfex_daemon_LDADD	= $(GLIBLIB) -lplumb -lplumbgpl
 
 sfex_init_SOURCES	= sfex_init.c sfex.h sfex_lib.c sfex_lib.h
 sfex_init_CFLAGS	= -D_GNU_SOURCE
 sfex_init_LDADD		= $(GLIBLIB) -lplumb -lplumbgpl
 
 sfex_stat_SOURCES	= sfex_stat.c sfex.h sfex_lib.c sfex_lib.h
 sfex_stat_CFLAGS	= -D_GNU_SOURCE
 sfex_stat_LDADD		= $(GLIBLIB) -lplumb -lplumbgpl
 
 findif_SOURCES		= findif.c
 
 if BUILD_TICKLE
 halib_PROGRAMS		+= tickle_tcp
 tickle_tcp_SOURCES	= tickle_tcp.c
 endif
 
 .PHONY: install-exec-hook