diff --git a/lib/bfd.c b/lib/bfd.c
index 78e015898f..862a95dacd 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -51,7 +51,7 @@ bfd_info_create(void)
  * bfd_info_free - Free the BFD information.
  */
 void
-bfd_info_free(void **bfd_info)
+bfd_info_free(struct bfd_info **bfd_info)
 {
   if (*bfd_info)
     {
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 61fd629b8a..6e43462ff7 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -31,6 +31,7 @@
 #include "command.h"
 #include "stream.h"
 #include "log.h"
+#include "zclient.h"
 #include "bfd.h"
 
 #include "ospfd/ospfd.h"
diff --git a/ospfd/ospf_interface.h b/ospfd/ospf_interface.h
index addc8c7ba3..68dbf186d2 100644
--- a/ospfd/ospf_interface.h
+++ b/ospfd/ospf_interface.h
@@ -80,7 +80,7 @@ struct ospf_if_params
   u_int32_t network_lsa_seqnum;		/* Network LSA seqnum */
 
   /* BFD configuration */
-  void *bfd_info;
+  struct bfd_info *bfd_info;
 };
 
 enum