diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 91cd5b85..5f9f12ce 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -100,7 +100,7 @@ ospf_vlink_item:
  | AUTHENTICATION NONE { OSPF_PATT->autype = OSPF_AUTH_NONE ; }
  | AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE ; }
  | AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT ; }
- | password_list {OSPF_PATT->passwords = $1; }
+ | password_list {OSPF_PATT->passwords = (list *) $1; }
  ;
 
 ospf_vlink_start: VIRTUAL LINK idval
@@ -139,7 +139,7 @@ ospf_iface_item:
  | AUTHENTICATION NONE { OSPF_PATT->autype = OSPF_AUTH_NONE ; }
  | AUTHENTICATION SIMPLE { OSPF_PATT->autype = OSPF_AUTH_SIMPLE ; }
  | AUTHENTICATION CRYPTOGRAPHIC { OSPF_PATT->autype = OSPF_AUTH_CRYPT ; }
- | password_list {OSPF_PATT->passwords = $1; }
+ | password_list {OSPF_PATT->passwords = (list *) $1; }
  ;
 
 pref_list:
diff --git a/proto/ospf/lsupd.c b/proto/ospf/lsupd.c
index c6194424..d1881445 100644
--- a/proto/ospf/lsupd.c
+++ b/proto/ospf/lsupd.c
@@ -33,7 +33,7 @@ ospf_lsupd_flood(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
   int ret, retval = 0;
 
   /* pg 148 */
-  WALK_LIST(NODE ifa, po->iface_list)
+  WALK_LIST(ifa, po->iface_list)
   {
     if (ifa->stub)
       continue;
@@ -51,7 +51,7 @@ ospf_lsupd_flood(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
         continue;
     }
     ret = 0;
-    WALK_LIST(NODE nn, ifa->neigh_list)
+    WALK_LIST(nn, ifa->neigh_list)
     {
       if (nn->state < NEIGHBOR_EXCHANGE)
 	continue;
@@ -456,8 +456,8 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
       /* Remove old from all ret lists */
       /* pg 144 (5c) */
       if (lsadb)
-	WALK_LIST(NODE ift, po->iface_list)
-	  WALK_LIST(NODE ntmp, ift->neigh_list)
+	WALK_LIST(ift, po->iface_list)
+	  WALK_LIST(ntmp, ift->neigh_list)
       {
 	struct top_hash_entry *en;
 	if (ntmp->state > NEIGHBOR_EXSTART)
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 0339ec2d..58c0762b 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -532,7 +532,7 @@ struct ospf_area *
 ospf_find_area(struct proto_ospf *po, u32 aid)
 {
   struct ospf_area *oa;
-  WALK_LIST(NODE oa, po->area_list)
+  WALK_LIST(oa, po->area_list)
     if (((struct ospf_area *) oa)->areaid == aid)
     return oa;
   return NULL;
@@ -630,7 +630,7 @@ rxmt_timer_hook(timer * timer)
       init_list(&uplist);
       upslab = sl_new(n->pool, sizeof(struct l_lsr_head));
 
-      WALK_SLIST(SNODE en, n->lsrtl)
+      WALK_SLIST(en, n->lsrtl)
       {
 	if ((SNODE en)->next == (SNODE en))
 	  bug("RTList is cycled");
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index c753503b..ce01a37b 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -776,8 +776,8 @@ ospf_reconfigure(struct proto *p, struct proto_config *c)
       }
     }
 
-    NODE ac1 = (NODE(ac1))->next;
-    NODE ac2 = (NODE(ac2))->next;
+    ac1 = (struct ospf_area_config *)(NODE(ac1))->next;
+    ac2 = (struct ospf_area_config *)(NODE(ac2))->next;
   }
 
   if (((NODE(ac1))->next) != ((NODE(ac2))->next))
diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c
index 6a334d0d..ac6a06f2 100644
--- a/proto/ospf/packet.c
+++ b/proto/ospf/packet.c
@@ -373,7 +373,7 @@ ospf_send_to_agt(sock * sk, struct ospf_iface *ifa, u8 state)
 {
   struct ospf_neighbor *n;
 
-  WALK_LIST(NODE n, ifa->neigh_list) if (n->state >= state)
+  WALK_LIST(n, ifa->neigh_list) if (n->state >= state)
     ospf_send_to(sk, n->ip, ifa);
 }