diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 7fb817a4..3cb99e00 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -39,7 +39,7 @@ struct attr_desc {
 };
 
 static int
-bgp_check_origin(struct bgp_proto *p, byte *a, int len)
+bgp_check_origin(struct bgp_proto *p UNUSED, byte *a UNUSED, int len)
 {
   if (len > 2)
     return 6;
@@ -55,7 +55,7 @@ bgp_format_origin(eattr *a, byte *buf)
 }
 
 static int
-bgp_check_path(struct bgp_proto *p, byte *a, int len)
+bgp_check_path(struct bgp_proto *p UNUSED, byte *a, int len)
 {
   while (len)
     {
@@ -71,7 +71,7 @@ bgp_check_path(struct bgp_proto *p, byte *a, int len)
 }
 
 static int
-bgp_check_next_hop(struct bgp_proto *p, byte *a, int len)
+bgp_check_next_hop(struct bgp_proto *p UNUSED, byte *a, int len)
 {
 #ifdef IPV6
   return -1;
@@ -88,7 +88,7 @@ bgp_check_next_hop(struct bgp_proto *p, byte *a, int len)
 }
 
 static int
-bgp_check_reach_nlri(struct bgp_proto *p, byte *a, int len)
+bgp_check_reach_nlri(struct bgp_proto *p UNUSED, byte *a UNUSED, int len UNUSED)
 {
 #ifdef IPV6
   p->mp_reach_start = a;
@@ -98,7 +98,7 @@ bgp_check_reach_nlri(struct bgp_proto *p, byte *a, int len)
 }
 
 static int
-bgp_check_unreach_nlri(struct bgp_proto *p, byte *a, int len)
+bgp_check_unreach_nlri(struct bgp_proto *p UNUSED, byte *a UNUSED, int len UNUSED)
 {
 #ifdef IPV6
   p->mp_unreach_start = a;
@@ -415,7 +415,7 @@ bgp_export_check(struct bgp_proto *p, ea_list *new)
 static struct bgp_bucket *
 bgp_get_bucket(struct bgp_proto *p, ea_list *attrs, int originate)
 {
-  ea_list *t, *new;
+  ea_list *new;
   unsigned i, cnt, hash, code;
   eattr *a, *d;
   u32 seen = 0;
@@ -515,7 +515,7 @@ bgp_free_bucket(struct bgp_proto *p, struct bgp_bucket *buck)
 }
 
 void
-bgp_rt_notify(struct proto *P, net *n, rte *new, rte *old, ea_list *attrs)
+bgp_rt_notify(struct proto *P, net *n, rte *new, rte *old UNUSED, ea_list *attrs)
 {
   struct bgp_proto *p = (struct bgp_proto *) P;
   struct bgp_bucket *buck;
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index b8e2abbc..9258d149 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -77,7 +77,7 @@ static void bgp_initiate(struct bgp_proto *p);
 static void bgp_setup_listen_sk(void);
 
 void
-bgp_close(struct bgp_proto *p)
+bgp_close(struct bgp_proto *p UNUSED)
 {
   ASSERT(bgp_counter);
   bgp_counter--;
@@ -370,7 +370,7 @@ bgp_initiate(struct bgp_proto *p)
  * closes the new connection by sending a Notification message.
  */
 static int
-bgp_incoming_connection(sock *sk, int dummy)
+bgp_incoming_connection(sock *sk, int dummy UNUSED)
 {
   struct proto_config *pc;
   int match = 0;
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 39e83b54..2e6f0b60 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -524,7 +524,6 @@ bgp_do_rx_update(struct bgp_conn *conn,
   rta *a = NULL;
   ip_addr prefix;
   net *n;
-  rte e;
   int err = 0, pxlen;
 
   /* Withdraw routes */
@@ -787,7 +786,7 @@ bgp_rx_notification(struct bgp_conn *conn, byte *pkt, int len)
 }
 
 static void
-bgp_rx_keepalive(struct bgp_conn *conn, byte *pkt, unsigned len)
+bgp_rx_keepalive(struct bgp_conn *conn)
 {
   struct bgp_proto *p = conn->bgp;
 
@@ -826,7 +825,7 @@ bgp_rx_packet(struct bgp_conn *conn, byte *pkt, unsigned len)
     case PKT_OPEN:		return bgp_rx_open(conn, pkt, len);
     case PKT_UPDATE:		return bgp_rx_update(conn, pkt, len);
     case PKT_NOTIFICATION:      return bgp_rx_notification(conn, pkt, len);
-    case PKT_KEEPALIVE:		return bgp_rx_keepalive(conn, pkt, len);
+    case PKT_KEEPALIVE:		return bgp_rx_keepalive(conn);
     default:			bgp_error(conn, 1, 3, pkt+18, 1);
     }
 }