diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index 379e35c0f4..cecced3ccc 100644
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -2107,16 +2107,18 @@ int bp_peer_srh_socketv6(struct bfd_session *bs)
 		close(sd);
 		return -1;
 	}
-#if defined(HAVE_IPV6_HDRINCL)
+#ifdef IPV6_HDRINCL
 	int on = 1;
 
 	/*manage the IP6 header all on own onwn*/
 	if (setsockopt(sd, IPPROTO_IPV6, IPV6_HDRINCL, &on, sizeof(on))) {
+#else
+	if (true) {
+#endif
 		zlog_err("setsockopt IPV6_HDRINCL error: %s", strerror(errno));
 		close(sd);
 		return -1;
 	}
-#endif
 
 	return sd;
 }
diff --git a/lib/bfd.c b/lib/bfd.c
index f7ae57e8e4..6300f6f5c0 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -374,7 +374,6 @@ int zclient_bfd_command(struct zclient *zc, struct bfd_session_arg *args)
 	stream_putc(s, args->profilelen);
 	if (args->profilelen)
 		stream_put(s, args->profile, args->profilelen);
-
 #else /* PTM BFD */
 	/* Encode timers if this is a registration message. */
 	if (args->command != ZEBRA_BFD_DEST_DEREGISTER) {
@@ -752,7 +751,6 @@ void bfd_sess_install(struct bfd_session_params *bsp)
 	event_add_event(bsglobal.tm, _bfd_sess_send, bsp, 0, &bsp->installev);
 }
 
-
 void bfd_sess_uninstall(struct bfd_session_params *bsp)
 {
 	bsp->lastev = BSE_UNINSTALL;