diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index d05dba33ee..7e8a4a4eda 100644
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -43,6 +43,7 @@
 #include "isisd/isis_constants.h"
 #include "isisd/isis_circuit.h"
 #include "isisd/isis_network.h"
+#include "isisd/isis_pdu.h"
 
 #include "privs.h"
 
diff --git a/lib/ferr.c b/lib/ferr.c
index d1b9d514b4..17ec51c4bf 100644
--- a/lib/ferr.c
+++ b/lib/ferr.c
@@ -107,7 +107,7 @@ struct log_ref *log_ref_get(uint32_t code)
 void log_ref_display(struct vty *vty, uint32_t code, bool json)
 {
 	struct log_ref *ref;
-	struct json_object *top, *obj;
+	struct json_object *top = NULL, *obj = NULL;
 	struct list *errlist;
 	struct listnode *ln;
 
diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c
index d17a9cf498..176bb2bbad 100644
--- a/zebra/if_ioctl.c
+++ b/zebra/if_ioctl.c
@@ -37,6 +37,7 @@
 
 #include "zebra/interface.h"
 #include "zebra/rib.h"
+#include "zebra/rt.h"
 
 #include <ifaddrs.h>
 
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index f63879159d..b0fc0a39bd 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -1558,7 +1558,9 @@ static int zvni_neigh_install(zebra_vni_t *zvni, zebra_neigh_t *n)
 	struct zebra_if *zif;
 	struct zebra_l2info_vxlan *vxl;
 	struct interface *vlan_if;
+#ifdef GNU_LINUX
 	uint8_t flags;
+#endif
 	int ret = 0;
 
 	if (!(n->flags & ZEBRA_NEIGH_REMOTE))
@@ -3369,7 +3371,9 @@ static int zl3vni_nh_del(zebra_l3vni_t *zl3vni, zebra_neigh_t *n)
  */
 static int zl3vni_nh_install(zebra_l3vni_t *zl3vni, zebra_neigh_t *n)
 {
+#ifdef GNU_LINUX
 	uint8_t flags;
+#endif
 	int ret = 0;
 
 	if (!is_l3vni_oper_up(zl3vni))