diff -ur Pacemaker-1-0-Pacemaker-1.0.5-old/fencing/stonithd/stonithd.c Pacemaker-1-0-Pacemaker-1.0.5/fencing/stonithd/stonithd.c
--- Pacemaker-1-0-Pacemaker-1.0.5-old/fencing/stonithd/stonithd.c	2009-10-02 12:30:55.000000000 +0000
+++ Pacemaker-1-0-Pacemaker-1.0.5/fencing/stonithd/stonithd.c	2009-10-02 12:39:15.000000000 +0000
@@ -88,6 +88,8 @@
 #include <clplumbing/coredumps.h>
 #include <clplumbing/realtime.h>
 #if SUPPORT_HEARTBEAT
+#    undef HA_LIBDIR
+#    undef HA_HBCONF_DIR
 #    include <hb_api.h>
 #    include <heartbeat.h>
 #endif