diff --git a/src/ca/repeater.c b/src/ca/repeater.c
index dc06e852b..7defb4af9 100644
--- a/src/ca/repeater.c
+++ b/src/ca/repeater.c
@@ -91,12 +91,12 @@ static char *sccsId = "$Id$\t$Date$";
  *	per machine so we dont care about reentrancy
  */
 struct one_client{
-	NODE			node;
+	DLLNODE			node;
   	struct sockaddr_in	from;
 };
 
 static
-LIST	client_list;
+DLLLIST	client_list;
 
 static
 char	buf[MAX_UDP]; 
@@ -270,7 +270,7 @@ ca_repeater()
 					malloc(sizeof *pclient);
 				if(pclient){
 					pclient->from = from;
-					dllAdd(&client_list, pclient);
+					dllAdd(&client_list, (DLLNODE *)pclient);
 #ifdef DEBUG
 					ca_printf("Added %x %d\n", from.sin_port, size);
 #endif
@@ -352,7 +352,7 @@ struct one_client		*pclient;
 	socket_close(sock);
 
 	if(!present){
-		dllDelete(&client_list, pclient);
+		dllDelete(&client_list, (DLLNODE *)pclient);
 		free(pclient);
 #ifdef DEBUG
 		ca_printf("Deleted\n");
diff --git a/src/ca/service.c b/src/ca/service.c
index 1cb23d3f9..982c10858 100644
--- a/src/ca/service.c
+++ b/src/ca/service.c
@@ -200,8 +200,8 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
 				UNLOCKEVENTS;
 			}
 			LOCK;
-			dllDelete(&pend_read_list, monix);
-			dllAdd(&free_event_list, monix);
+			dllDelete(&pend_read_list, (DLLNODE *)monix);
+			dllAdd(&free_event_list, (DLLNODE *)monix);
 			UNLOCK;
 
 			piiu->outstanding_ack_count--;
@@ -225,8 +225,8 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
 			 */
 			if (!t_postsize) {
 				LOCK;
-				dllDelete(&monix->chan->eventq, monix);
-				dllAdd(&free_event_list, monix);
+				dllDelete(&monix->chan->eventq, (DLLNODE *)monix);
+				dllAdd(&free_event_list, (DLLNODE *)monix);
 				UNLOCK;
 
 				piiu->outstanding_ack_count--;
@@ -438,8 +438,8 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
 			struct ioc_in_use *piiu = &iiu[chix->iocix];
 
 			LOCK;
-			dllDelete(&piiu->chidlist, chix);
-			dllAdd(&iiu[BROADCAST_IIU].chidlist, chix);
+			dllDelete(&piiu->chidlist, (DLLNODE *)chix);
+			dllAdd(&iiu[BROADCAST_IIU].chidlist, (DLLNODE *)chix);
 			chix->iocix = BROADCAST_IIU;
 			if (!piiu->chidlist.count)
 				close_ioc(piiu);
@@ -471,11 +471,11 @@ post_msg(hdrptr, pbufcnt, pnet_addr, piiu)
 			     monix;
 			     monix = (evid) monix->node.next)
 				if (monix->chan == chix) {
-					dllDelete(&pend_read_list, monix);
-					dllAdd(&free_event_list, monix);
+					dllDelete(&pend_read_list, (DLLNODE *)monix);
+					dllAdd(&free_event_list, (DLLNODE *)monix);
 				}
 			dllConcat(&free_event_list, &chix->eventq);
-			dllDelete(&piiu->chidlist, chix);
+			dllDelete(&piiu->chidlist, (DLLNODE *)chix);
 			free(chix);
 			piiu->outstanding_ack_count--;
 			if (!piiu->chidlist.count)
@@ -625,9 +625,9 @@ struct in_addr			*pnet_addr;
 	  	if(chan->iocix != BROADCAST_IIU)
 	   		ca_signal(ECA_NEWADDR, (char *)(chan+1));
 		chpiiu = &iiu[chan->iocix];
-          	dllDelete(&chpiiu->chidlist, chan);
+          	dllDelete(&chpiiu->chidlist, (DLLNODE *)chan);
           	chan->iocix = newiocix;
-          	dllAdd(&iiu[newiocix].chidlist, chan);
+          	dllAdd(&iiu[newiocix].chidlist, (DLLNODE *)chan);
         }
 
 	/*
@@ -742,7 +742,7 @@ client_channel_exists(chan)
                 /*
                  * dllFind returns the node number or ERROR
                  */
-                status = dllFind(&piiu->chidlist, chan);
+                status = dllFind(&piiu->chidlist, (DLLNODE *)chan);
                 if (status != ERROR) {
                         return TRUE;
                 }