diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 0aac403..ee0b311 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-23 Hasso Tepper <hasso at quagga.net>
+
+	* *.[c|h]: list -> struct list *, listnode -> struct listnode *.
+
 2004-07-09 Paul Jakma <paul@dishone.st>
 
 	* Merge of GNU Zebra cvs2svn changesets r799, r800 and r807.
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index aa369bc..85e12d9 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -175,7 +175,7 @@
 {
   struct prefix_ipv4 *p;
   struct connected *connected;
-  listnode node;
+  struct listnode *node;
 
   for (node = listhead (ifp->connected); node; nextnode (node))
     {
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index e94ecf2..4100e3d 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -815,8 +815,8 @@
 int
 bgp_nexthop_self (afi_t afi, struct attr *attr)
 {
-  listnode node;
-  listnode node2;
+  struct listnode *node;
+  struct listnode *node2;
   struct interface *ifp;
   struct connected *ifc;
   struct prefix *p;
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 394bde6..42b8fc7 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -45,7 +45,7 @@
 bgp_if_update (struct interface *ifp)
 {
   struct bgp *bgp;
-  listnode cn;
+  struct listnode *cn;
   struct listnode *nn;
   struct listnode *nm;
   struct peer *peer;
@@ -86,7 +86,7 @@
 int
 bgp_if_update_all ()
 {
-  listnode node;
+  struct listnode *node;
   struct interface *ifp;
 
   for (node = listhead (iflist); node; node = nextnode (node))
@@ -128,7 +128,7 @@
   struct stream *s;
   struct interface *ifp;
   struct connected *c;
-  listnode node;
+  struct listnode *node;
 
   s = zclient->ibuf;
   ifp = zebra_interface_state_read (s);
@@ -151,7 +151,7 @@
   struct stream *s;
   struct interface *ifp;
   struct connected *c;
-  listnode node;
+  struct listnode *node;
 
   s = zclient->ibuf;
   ifp = zebra_interface_state_read (s);
@@ -348,8 +348,8 @@
 struct interface *
 if_lookup_by_ipv4 (struct in_addr *addr)
 {
-  listnode ifnode;
-  listnode cnode;
+  struct listnode *ifnode;
+  struct listnode *cnode;
   struct interface *ifp;
   struct connected *connected;
   struct prefix_ipv4 p;
@@ -379,8 +379,8 @@
 struct interface *
 if_lookup_by_ipv4_exact (struct in_addr *addr)
 {
-  listnode ifnode;
-  listnode cnode;
+  struct listnode *ifnode;
+  struct listnode *cnode;
   struct interface *ifp;
   struct connected *connected;
   struct prefix *cp; 
@@ -406,8 +406,8 @@
 struct interface *
 if_lookup_by_ipv6 (struct in6_addr *addr)
 {
-  listnode ifnode;
-  listnode cnode;
+  struct listnode *ifnode;
+  struct listnode *cnode;
   struct interface *ifp;
   struct connected *connected;
   struct prefix_ipv6 p;
@@ -437,8 +437,8 @@
 struct interface *
 if_lookup_by_ipv6_exact (struct in6_addr *addr)
 {
-  listnode ifnode;
-  listnode cnode;
+  struct listnode *ifnode;
+  struct listnode *cnode;
   struct interface *ifp;
   struct connected *connected;
   struct prefix *cp; 
@@ -463,7 +463,7 @@
 int
 if_get_ipv6_global (struct interface *ifp, struct in6_addr *addr)
 {
-  listnode cnode;
+  struct listnode *cnode;
   struct connected *connected;
   struct prefix *cp; 
   
@@ -485,7 +485,7 @@
 int
 if_get_ipv6_local (struct interface *ifp, struct in6_addr *addr)
 {
-  listnode cnode;
+  struct listnode *cnode;
   struct connected *connected;
   struct prefix *cp; 
   
@@ -621,8 +621,8 @@
 unsigned int
 bgp_ifindex_by_nexthop (struct in6_addr *addr)
 {
-  listnode ifnode;
-  listnode cnode;
+  struct listnode *ifnode;
+  struct listnode *cnode;
   struct interface *ifp;
   struct connected *connected;
   struct prefix_ipv6 p;