diff -x saru.spec -ruN saru-0.0.1.pristine/saru/block.c saru-0.0.1.hb_cruft/saru/block.c
--- saru-0.0.1.pristine/saru/block.c	2003-08-05 11:23:00.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/block.c	2005-04-12 13:13:46.000000000 +0900
@@ -50,14 +50,6 @@
 	}
 
 	return(block);
-
-        /* Sillyness: 
-         * The varible is defined (in ha_msg.h) but need never be used.
-         * But -Werror is turned on by default so we have to
-         * do something with it, else we can't compile.
-         */
-        if(_ha_msg_h_Id){ ; }
-        /* End of sillyness */
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/block_state.c saru-0.0.1.hb_cruft/saru/block_state.c
--- saru-0.0.1.pristine/saru/block_state.c	2003-08-05 11:23:21.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/block_state.c	2005-04-12 13:13:52.000000000 +0900
@@ -77,14 +77,6 @@
 	}
 
 	return(SARU_S_BLOCK_UNKNOWN_STR);
-
-	/* Sillyness: 
-	 * The varible is defined (in ha_msg.h) but need never be used.
-	 * But -Werror is turned on by default so we have to
-	 * do something with it, else we can't compile.
-	 */
-	if(_ha_msg_h_Id){ ; }
-	/* End of sillyness */
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/candidate.c saru-0.0.1.hb_cruft/saru/candidate.c
--- saru-0.0.1.pristine/saru/candidate.c	2003-08-05 11:23:28.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/candidate.c	2005-04-12 13:13:59.000000000 +0900
@@ -47,11 +47,6 @@
 	}
 
 	return(candidate);
-
-	/* We have to use this somewhere, but we have no use for it */
-	{
-		(void)_ha_msg_h_Id;
-	}
 }
 
 void 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/cluster_util.c saru-0.0.1.hb_cruft/saru/cluster_util.c
--- saru-0.0.1.pristine/saru/cluster_util.c	2003-08-05 11:23:33.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/cluster_util.c	2005-04-12 13:14:11.000000000 +0900
@@ -39,14 +39,6 @@
 
 #include "cluster_util.h"
 
-void
-saru_dummy_function_that_does_nothing_and_never_gets_called(void)
-{
-	/* We have to use these somewhere, but we have no use for them */
-	(void)_ha_msg_h_Id;
-	(void)_heartbeat_h_Id;
-}
-
 #ifdef SARU_WALK
 int 
 saru_walknode(ll_cluster_t *cluster) 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/election.c saru-0.0.1.hb_cruft/saru/election.c
--- saru-0.0.1.pristine/saru/election.c	2003-08-05 11:23:38.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/election.c	2005-04-12 13:14:20.000000000 +0900
@@ -74,12 +74,6 @@
 	}
 
 	return(0);
-	
-	/* We have to use these somewhere, but we have no use for them */
-	{
-		(void)_ha_msg_h_Id;
-		(void)_heartbeat_h_Id;
-	}
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/ipt.c saru-0.0.1.hb_cruft/saru/ipt.c
--- saru-0.0.1.pristine/saru/ipt.c	2003-08-05 11:23:15.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/ipt.c	2005-04-12 13:14:27.000000000 +0900
@@ -64,11 +64,6 @@
 	DO_SETSOCKOPT(fd, map, id, IPT_SARU_F_UPDATE);
 
 	return(0);
-
-	/* We have to use this somwhere, but we have no use for it */
-	{
-		(void)_ha_msg_h_Id;
-	}
 }
 
 int
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/master.c saru-0.0.1.hb_cruft/saru/master.c
--- saru-0.0.1.pristine/saru/master.c	2003-08-05 11:23:48.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/master.c	2005-04-12 13:14:36.000000000 +0900
@@ -140,14 +140,6 @@
 	master->since = time(NULL);
 
 	return;
-
-	/* Sillyness: 
-	 * The varible is defined (in ha_msg.h) but need never be used.
-	 * But -Werror is turned on by default so we have to
-	 * do something with it, else we can't compile. 
-	 */     
-	if(_ha_msg_h_Id){ ; }
-	/* End of sillyness */
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/node_state.c saru-0.0.1.hb_cruft/saru/node_state.c
--- saru-0.0.1.pristine/saru/node_state.c	2003-08-05 11:24:36.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/node_state.c	2005-04-12 13:14:46.000000000 +0900
@@ -55,13 +55,6 @@
 	node_state->state = SARU_S_NODE_LEAVE;
 
 	return(node_state);
-
-        /* We have to use these, but we have no use for them */
-	{
-		(void)_heartbeat_h_Id;
-		(void)_ha_msg_h_Id;
-		(void)_heartbeat_h_Id;
-	}
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/options.c saru-0.0.1.hb_cruft/saru/options.c
--- saru-0.0.1.pristine/saru/options.c	2003-08-05 11:23:53.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/options.c	2005-04-12 13:14:52.000000000 +0900
@@ -98,11 +98,6 @@
 	opt->state_timeout = -1;
 
 	return(opt);
-
-	/* We have to use this somewhere but we have no use for it */
-	{
-		(void)_ha_msg_h_Id;
-	}
 }
 
 /**********************************************************************
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/ping.c saru-0.0.1.hb_cruft/saru/ping.c
--- saru-0.0.1.pristine/saru/ping.c	2003-08-05 11:23:57.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/ping.c	2005-04-12 13:13:15.000000000 +0900
@@ -562,15 +562,6 @@
 int 
 main(int argc, const char **argv) 
 {
-	/* Sillyness: 
-	 * The varible is defined (in ha_msg.h) but need never be used.
-	 * But -Werror is turned on by default so we have to
-	 * do something with it, else we can't compile.
-	 */
-	if(_ha_msg_h_Id){ ; }
-	if(_heartbeat_h_Id){ ; }
-	/* End of sillyness */
-
 	if(argc > 1 && !strcmp(argv[1], "-s")) {
 		server = 1;
 	}
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/saru.c saru-0.0.1.hb_cruft/saru/saru.c
--- saru-0.0.1.pristine/saru/saru.c	2003-08-05 11:23:46.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/saru.c	2005-04-12 13:13:25.000000000 +0900
@@ -1167,15 +1167,6 @@
 {
 	pid_t pid;
 
-	/* Sillyness: 
-	 * The varible is defined (in ha_msg.h) but need never be used.
-	 * But -Werror is turned on by default so we have to
-	 * do something with it, else we can't compile.
-	 */
-	if(_ha_msg_h_Id){ ; }
-	if(_heartbeat_h_Id){ ; }
-	/* End of sillyness */
-
         /* Initialise logger */
 	saru_vl = vanessa_logger_openlog_filehandle(stdout, SARU_ID_BASE, 
 			LOG_DEBUG, 0);
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/saru_cluster.c saru-0.0.1.hb_cruft/saru/saru_cluster.c
--- saru-0.0.1.pristine/saru/saru_cluster.c	2003-08-05 11:24:02.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/saru_cluster.c	2005-04-12 13:13:36.000000000 +0900
@@ -126,12 +126,6 @@
 leave:
 	saru_cluster_destroy(cluster);
 	return(NULL);
-
-	/* We have to use this somewhere but we have no use for it */
-	{
-		(void)_ha_msg_h_Id;
-		(void)_heartbeat_h_Id;
-	}
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/state.c saru-0.0.1.hb_cruft/saru/state.c
--- saru-0.0.1.pristine/saru/state.c	2003-08-05 11:24:16.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/state.c	2005-04-12 13:14:59.000000000 +0900
@@ -92,12 +92,6 @@
 	}
 
 	return(state);
-
-        /* We need to use these somewhere, but we have no use for them */
-	{
-        	(void)_ha_msg_h_Id;
-        	(void)_heartbeat_h_Id;
-	}
 }
 
 
diff -x saru.spec -ruN saru-0.0.1.pristine/saru/us.c saru-0.0.1.hb_cruft/saru/us.c
--- saru-0.0.1.pristine/saru/us.c	2003-08-05 11:24:20.000000000 +0900
+++ saru-0.0.1.hb_cruft/saru/us.c	2005-04-12 13:15:06.000000000 +0900
@@ -60,13 +60,6 @@
 	us->state = SARU_S_US_NONE;
 
 	return(us);
-
-        /* We have to use these, but we have no use for them */
-	{
-		(void)_heartbeat_h_Id;
-		(void)_ha_msg_h_Id;
-		(void)_heartbeat_h_Id;
-	}
 }