diff --git a/Makefile.am b/Makefile.am
index f86ddc748f..14e51fe3f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,112 +1,104 @@
 #
 # linux-ha: Linux-HA code
 #
 # Copyright (C) 2002 Alan Robertson
 #
 # 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.
 #
 
 ##auxdir                  = @ac_aux_dir@
 ##AUX_DIST                = $(auxdir)/install-sh $(auxdir)/missing \
 ##                        $(auxdir)/mkinstalldirs
 ##AUX_DIST_EXTRA          = $(auxdir)/readline.m4 $(auxdir)/sys_errlist.m4 \
 ##                        $(auxdir)/sys_siglist.m4
-EXTRA_DIST              = bootstrap rc.config.heartbeat 	\
-			heartbeat.spec.in heartbeat.spec	\
-			ConfigureMe README.in libltdl.tar
+EXTRA_DIST              = bootstrap ConfigureMe README.in libltdl.tar
 
 RPMREL			= @RPMREL@
 RPM			= @RPM@
 RPMFLAGS		= -ta
 TARFILE			= @TARFILE@
 AM_TAR			= tar
-RPMDIR=$(HOME)/rpms
-RPMSRC=$(DESTDIR)$(RPMDIR)/SRPMS/$(PACKAGE)-$(VERSION)-$(RPMREL).src.rpm
-RPM386=$(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-$(VERSION)-$(RPMREL).i586.rpm
-RPMstonith=$(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-stonith-$(VERSION)-$(RPMREL).i586.rpm
-RPMpils=$(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-pils-$(VERSION)-$(RPMREL).i586.rpm
-RPMldir=$(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-ldirectord-$(VERSION)-$(RPMREL).i586.rpm
 SHAREDIR=@HA_DATADIR@
 HBSHAREDIR=@HA_NOARCHDATAHBDIR@
 
 ALL_RPMS = $(RPMSRC) $(RPM386) $(RPMstonith) $(RPMldir) $(RPMpils)
 
 AUTOMAKE_OPTIONS	= foreign
 ##ACLOCAL                 = aclocal -I $(auxdir)
 
 MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
                         DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
 coredir = 		@HA_COREDIR@
 hauser = 		@HA_CCMUSER@
 
 ## proc-ha is left out from SUBDIRS (completely obsolete)
 
 if SNMP_SUBAGENT_BUILD
 SNMP_SUBAGENT_DIR = snmp_subagent
 endif
 
 if CIM_PROVIDER_BUILD
 CIM_PROVIDER_DIR = cim
 endif
 
 SUBDIRS	= debian build replace include lib cib crmd pengine transitioner crm tools doc cts
 
 HANDY_DOCS = doc/ChangeLog doc/GettingStarted.html doc/DirectoryMap.txt
 HBDOCS = doc/heartbeat_api.html
 
 # Pass these to configure when running "make distcheck"
 DISTCHECK_CONFIGURE_FLAGS = --with-initdir=prefix
 
 rpm:		dist
 		$(RPM) $(RPMFLAGS) $(TARFILE) </dev/null;
 
 deb:		dist
 		rm -rf $(distdir)
 		tar -zxf $(TARFILE)
 		cd $(distdir) ; dpkg-buildpackage -rfakeroot -us -uc 
 		rm -rf $(distdir)
 
 install-exec-local:
 	test -p $(DESTDIR)$(coredir) || mkdir -p $(DESTDIR)$(coredir)
 	-chown root $(DESTDIR)$(coredir)
 	chmod 755 $(DESTDIR)$(coredir)
 	mkdir -p $(DESTDIR)$(coredir)/root
 	-chown root $(DESTDIR)$(coredir)/root
 	chmod 700 $(DESTDIR)$(coredir)/root
 	mkdir -p $(DESTDIR)$(coredir)/nobody
 	-chown nobody $(DESTDIR)$(coredir)/nobody
 	chmod 700 $(DESTDIR)$(coredir)/nobody
 	mkdir -p $(DESTDIR)$(coredir)/$(hauser)
 	-chown $(hauser) $(DESTDIR)$(coredir)/$(hauser)
 	chmod 700 $(DESTDIR)$(coredir)/$(hauser)
 
 dist-clean-local:
 	rm -f autoconf automake autoheader $(PACKAGE)-*.tar.gz
 
 maintainer-clean-local:
 	rm -f libltdl.tar
 
 # "pkg" format for Solaris etc.
 pkg:
-		(cd pkg && $(MAKE) PWD=`pwd` pkg)
+		(cd build/pkg && $(MAKE) PWD=`pwd` pkg)
 
 # "port" format for BSD
 portfile:	dist
-		( cd port && $(MAKE) PWD=`pwd` portfile)
+		( cd build/port && $(MAKE) PWD=`pwd` portfile)
 
 drpm:		dist
 		$(RPM) --nodeps $(RPMFLAGS) $(TARFILE) </dev/null;
 
 .PHONY: rpm pkg handy handy-copy
diff --git a/cib/Makefile.am b/cib/Makefile.am
index 69d518da1f..130d0ed0b1 100644
--- a/cib/Makefile.am
+++ b/cib/Makefile.am
@@ -1,74 +1,72 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # 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
 
 INCLUDES        = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl  \
-		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-		  -I$(top_builddir)          -I$(top_srcdir)	      \
 		  -I$(AISPREFIX)/include/openais
 
 
 EXTRA_DIST	= cib.pam
 
 hadir		= $(sysconfdir)/ha.d
 halibdir	= $(libdir)/@HB_PKG@
 commmoddir	= $(halibdir)/modules/comm
 havarlibdir	= $(localstatedir)/lib/@HB_PKG@
 
 # sockets with path
 crmdir		= $(havarlibdir)/crm
 crmreqsocket	= $(havarlibdir)/api/crm.req
 crmressocket	= $(havarlibdir)/api/crm.rsp
 
 COMMONLIBS	= 					\
 		  -lhbclient						\
 		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
 		  $(top_builddir)/lib/crm/cib/libcib.la			\
 		  $(GLIBLIB)						\
 		  $(AISLIBS)						\
 		  $(LIBRT)
 
 LIBRT 		= @LIBRT@
 AM_CFLAGS	= @CFLAGS@ $(CRM_DEBUG_FLAGS)
 
 ## binary progs
 halib_PROGRAMS	= cib cibmon
 
 ## SOURCES
 #noinst_HEADERS		= config.h control.h crmd.h
 noinst_HEADERS		= cibio.h cibmessages.h cibprimatives.h notify.h \
 			callbacks.h
 
 cib_SOURCES		= io.c primatives.c messages.c cib.c notify.c	\
 			callbacks.c main.c remote.c
 cib_LDADD		= $(COMMONLIBS) $(CRYPTOLIB) -lccmclient	\
 			$(top_builddir)/lib/crm/common/libcrmcluster.la
 
 cib_LDFLAGS		= $(GNUTLSLIBS)
 
 cibmon_SOURCES		= cibmon.c
 cibmon_LDADD		= $(COMMONLIBS)
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 #	cp -f $(top_srcdir)/crm/cib/cib.pam $(DESTDIR)/etc/pam.d/cib
 
 uninstall-local:
diff --git a/crm/admin/Makefile.am b/crm/admin/Makefile.am
index c9efb4650f..672053f771 100644
--- a/crm/admin/Makefile.am
+++ b/crm/admin/Makefile.am
@@ -1,103 +1,103 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # 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
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
+		-I$(top_builddir)           -I$(top_srcdir)		\
 		-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl 	\
-		-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha	\
-		-I$(top_builddir) -I$(top_srcdir) -I$(AISPREFIX)/include/openais
+		-I$(AISPREFIX)/include/openais
 
 halibdir	= $(libdir)/@HB_PKG@
 hasbindir	= $(sbindir)
 LIBRT 		= @LIBRT@
 AM_CFLAGS	= @CFLAGS@ $(CRM_DEBUG_FLAGS)
 
 COMMONLIBS	= 					\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la		\
 		$(top_builddir)/lib/crm/cib/libcib.la			\
 		-lplumb					  		\
 		$(GLIBLIB)						\
 		$(CURSESLIBS)						\
 		$(AISLIBS)						\
 		$(LIBRT)
 
 
 halib_PYTHON		= crm_primitive.py crm_utils.py crm_commands.py
 hasbin_PROGRAMS		= crmadmin cibadmin ccm_tool crm_diff crm_mon iso8601 \
 			crm_master crm_standby crm_failcount crm_attribute \
 			crm_resource crm_verify crm_uuid 
 
 hasbin_SCRIPTS		= crm_sh
 
 ## SOURCES
 
 #noinst_HEADERS		= config.h control.h crmd.h
 noinst_HEADERS		= 
 
 crmadmin_SOURCES	= crmadmin.c
 crmadmin_LDADD		= $(COMMONLIBS) -lhbclient \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
 crm_uuid_SOURCES	= crm_uuid.c
 crm_uuid_LDADD		= $(GLIBLIB)
 
 cibadmin_SOURCES	= cibadmin.c
 cibadmin_LDADD		= $(COMMONLIBS)
 
 ccm_tool_SOURCES	= ccm_epoche.c
 ccm_tool_LDADD		= $(COMMONLIBS) -lccmclient -lhbclient \
 			$(top_builddir)/lib/crm/common/libcrmcluster.la
 
 crm_diff_SOURCES	= xml_diff.c
 crm_diff_LDADD		= $(COMMONLIBS)
 
 crm_mon_SOURCES		= crm_mon.c
 crm_mon_LDADD		= $(COMMONLIBS) \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
 # Arguments could be made that this should live in crm/pengine
 crm_verify_SOURCES	= crm_verify.c
 crm_verify_LDADD	= $(COMMONLIBS) \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la \
 			$(top_builddir)/pengine/libpengine.la
 
 crm_master_SOURCES	= crm_attribute.c
 crm_master_LDADD	= $(COMMONLIBS)
 
 crm_standby_SOURCES	= crm_attribute.c
 crm_standby_LDADD	= $(COMMONLIBS)
 
 crm_attribute_SOURCES	= crm_attribute.c
 crm_attribute_LDADD	= $(COMMONLIBS)
 
 crm_failcount_SOURCES	= crm_attribute.c
 crm_failcount_LDADD	= $(COMMONLIBS)
 
 crm_resource_SOURCES	= crm_resource.c
 crm_resource_LDADD	= $(COMMONLIBS) \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
 iso8601_SOURCES		= test.iso8601.c
 iso8601_LDADD		= $(COMMONLIBS) 
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
diff --git a/crmd/Makefile.am b/crmd/Makefile.am
index ac46e2ba08..f44b7652bd 100644
--- a/crmd/Makefile.am
+++ b/crmd/Makefile.am
@@ -1,87 +1,85 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # 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
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl	\
-		-I$(top_builddir)/linux-ha  -I$(top_srcdir)/linux-ha 	\
-		-I$(top_builddir)           -I$(top_srcdir)		\
 		-I$(AISPREFIX)/include/openais
 
 EXTRA_DIST	= 
 
 hadir		= $(sysconfdir)/ha.d
 halibdir	= $(libdir)/@HB_PKG@
 commmoddir	= $(halibdir)/modules/comm
 havarlibdir	= $(localstatedir)/lib/@HB_PKG@
 
 # sockets with path
 crmdir		= $(havarlibdir)/crm
 
 COMMONLIBS	= 					\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la	\
 		$(top_builddir)/lib/crm/pengine/libpe_rules.la	\
 		$(top_builddir)/lib/crm/cib/libcib.la			\
 		-lplumb							\
 		$(GLIBLIB)						\
 		$(AISLIBS)						\
 		$(LIBRT)
 
 LIBRT 		= @LIBRT@
 AM_CFLAGS	= @CFLAGS@						\
 		$(CRM_DEBUG_FLAGS)
 
 ## libraries
 lib_LTLIBRARIES	= 
 
 ## binary progs
 halib_PROGRAMS	= crmd atest
 
 ## SOURCES
 
 noinst_HEADERS	= crmd.h crmd_fsa.h crmd_messages.h fsa_defines.h 	\
 		fsa_matrix.h fsa_proto.h crmd_utils.h crmd_callbacks.h \
 		crmd_lrm.h
 
 atest_SOURCES	= atest.c
 atest_LDADD	= $(COMMONLIBS)
 
 
 crmd_SOURCES	= main.c crmd.c 					\
 		fsa.c control.c messages.c ccm.c callbacks.c		\
 		election.c join_client.c join_dc.c subsystems.c 	\
 		cib.c pengine.c tengine.c lrm.c 			\
 		utils.c misc.c
 
 crmd_LDADD	= $(COMMONLIBS) $(top_builddir)/lib/crm/common/libcrmcluster.la\
 		-lhbclient -llrm -lccmclient
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
 
 graphs:	fsa_inputs.png fsa_inputs_by_action.png fsa_actions_by_state.png
 
 %.png: %.dot
 	dot -Tpng $< > $@ 
 
 %.dot : fsa_matrix.h make_dot.pl
 	perl $(top_srcdir)/crm/crmd/make_dot.pl $(top_srcdir)/crm/crmd/fsa_matrix.h $(top_builddir)/crm/crmd
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
index 88419b202e..b937377ad6 100644
--- a/pengine/Makefile.am
+++ b/pengine/Makefile.am
@@ -1,82 +1,81 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # 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
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
-		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl	\
-		-I$(top_builddir)/linux-ha  -I$(top_srcdir)/linux-ha 	\
-		-I$(top_builddir)           -I$(top_srcdir)
+		-I$(top_builddir)           -I$(top_srcdir)		\
+		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
 
 hadir		= $(sysconfdir)/ha.d
 hasbindir	= $(sbindir)
 halibdir	= $(libdir)/@HB_PKG@
 commmoddir	= $(halibdir)/modules/comm
 havarlibdir	= $(localstatedir)/lib/@HB_PKG@
 pe_varlibdir	= $(HA_VARLIBDIR)/$(HB_PKG)/pengine
 
 # sockets with path
 crmdir		= $(havarlibdir)/crm
 
 COMMONLIBS	= 					\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la		\
 		$(top_builddir)/lib/crm/pengine/libpe_status.la		\
 		libpengine.la						\
 		$(GLIBLIB)						\
 		$(CURSESLIBS)						\
 		$(AISLIBS)						\
 		$(LIBRT)
 
 LIBRT 		= @LIBRT@
 AM_CFLAGS	= @CFLAGS@ $(CRM_DEBUG_FLAGS)
 
 ## libraries
 lib_LTLIBRARIES	= libpengine.la
 
 ## binary progs
 halib_PROGRAMS	= pengine
 hasbin_PROGRAMS	= ptest
 
 ## SOURCES
 noinst_HEADERS	= allocate.h utils.h pengine.h
 #utils.h pengine.h
 
 libpengine_la_LDFLAGS	= -version-info 3:0:0
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
 libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c \
 			native.c group.c clone.c master.c graph.c
 
 pengine_SOURCES	= main.c
 pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/crm/cib/libcib.la
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
 
 ptest_SOURCES	= ptest.c 
 ptest_LDADD	= $(COMMONLIBS)						\
 		$(top_builddir)/lib/crm/cib/libcib.la			\
 		$(top_builddir)/lib/crm/transition/libtransitioner.la
 
 clean-generic:
 	rm -f *.log *.debug *~ .gres.* testcases/.gres.*
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(pe_varlibdir)
 	-chown $(HA_CCMUSER) $(DESTDIR)/$(pe_varlibdir)
 	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(pe_varlibdir)
 	-chmod 750 $(DESTDIR)/$(pe_varlibdir)
 
 uninstall-local:
diff --git a/replace/Makefile.am b/replace/Makefile.am
index 52892ba3da..c2e6e517df 100644
--- a/replace/Makefile.am
+++ b/replace/Makefile.am
@@ -1,29 +1,28 @@
 #
 #
 # 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
 
-INCLUDES	= -I$(top_srcdir)/include -I$(top_builddir)/include \
-		-I$(top_srcdir)/linux-ha -I$(top_builddir)/linux-ha
+INCLUDES	= -I$(top_srcdir)/include -I$(top_builddir)/include
 
 QUIET_LIBTOOL_OPTS	= @QUIET_LIBTOOL_OPTS@
 LIBTOOL		= @LIBTOOL@ @QUIET_LIBTOOL_OPTS@
 
 
 noinst_LTLIBRARIES	= libreplace.la
 libreplace_la_SOURCES	=
 libreplace_la_LIBADD	= @LTLIBOBJS@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dc99ca2a8f..d58dfad66f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,67 +1,65 @@
 #
 # 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 ccdv
 
 INCLUDES                = -I$(top_builddir)/include -I$(top_srcdir)/include   \
-			  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl   \
 			  -I$(AISPREFIX)/include/openais
 
 EXTRA_DIST		= ccdv.c attrd.h
 
 halibdir		= $(libdir)/@HB_PKG@
 halib_SCRIPTS		= haresources2cib.py
 halib_PROGRAMS		= attrd pingd
 
 sbin_PROGRAMS		= attrd_updater
 
 ## SOURCES
 ccdv: 	$(top_srcdir)/tools/ccdv.c
 	gcc $(AM_CFLAGS) $(CFLAGS) -o ccdv $(top_srcdir)/tools/ccdv.c
 
 # A little trick. Now ccdv can be auto-built but not auto-cleaned.
 attrd_DEPENDENCIES	= ccdv
 attrd_SOURCES		= attrd.c
 attrd_LDADD		=  						\
 		  -lhbclient						\
 		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
 		  $(top_builddir)/lib/crm/common/libcrmcluster.la	\
 		  $(top_builddir)/lib/crm/cib/libcib.la			\
 		  $(GLIBLIB)						\
 		  $(AISLIBS)						\
 		  $(LIBRT)
 
 pingd_SOURCES		= pingd.c
 pingd_LDADD		=  						\
 		  -lhbclient						\
 		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
 		  $(GLIBLIB)						\
 		  $(AISLIBS)						\
 		  $(LIBRT)
 
 attrd_updater_SOURCES	= attrd_updater.c
 attrd_updater_LDADD	=  						\
 		  -lhbclient						\
 		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
 		  $(GLIBLIB)						\
 		  $(AISLIBS)						\
 		  $(LIBRT)
 
 .PHONY: install-exec-hook
diff --git a/transitioner/Makefile.am b/transitioner/Makefile.am
index 49da351a85..37a61f89d5 100644
--- a/transitioner/Makefile.am
+++ b/transitioner/Makefile.am
@@ -1,64 +1,62 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # 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
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
-		-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl 	\
-		-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha	\
-		-I$(top_builddir) -I$(top_srcdir)
+		-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
 hadir		= $(sysconfdir)/ha.d
 halibdir	= $(libdir)/@HB_PKG@
 commmoddir	= $(halibdir)/modules/comm
 havarlibdir	= $(localstatedir)/lib/@HB_PKG@
 
 crmdir		= $(havarlibdir)/crm
 
 COMMONLIBS	=  					\
 		$(top_builddir)/lib/crm/common/libcrmcommon.la 	\
 		$(top_builddir)/lib/crm/cib/libcib.la	 	\
 		$(AISLIBS)						\
 		$(GLIBLIB)						\
 		$(LIBRT)
 
 LIBRT 		= @LIBRT@
 AM_CFLAGS	= @CFLAGS@ $(CRM_DEBUG_FLAGS)
 
 
 ## binary progs
 halib_PROGRAMS	= tengine ttest
 
 ## SOURCES
 noinst_HEADERS	= tengine.h te_callbacks.h
 
 tengine_SOURCES	= actions.c events.c utils.c callbacks.c main.c
 tengine_LDADD	= $(COMMONLIBS) \
                     -lstonithd	\
                     $(top_builddir)/lib/crm/transition/libtransitioner.la
 
 ttest_SOURCES	= actions.c events.c utils.c callbacks.c ttest.c
 ttest_LDADD	= $(COMMONLIBS) \
                     -lstonithd  \
                     $(top_builddir)/lib/crm/transition/libtransitioner.la
 
 clean-generic:
 	rm -f *.log *.debug *~
 
 install-exec-local:
 
 uninstall-local: