diff --git a/lib/zebra.h b/lib/zebra.h
index 362037bf54..39f5ae9bf6 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -134,8 +134,6 @@
 #include <netinet6/ip6.h>
 #endif /* HAVE_NETINET6_IP6_H */
 
-#include <netinet/icmp6.h>
-
 #ifdef HAVE_NETINET6_ND6_H
 #include <netinet6/nd6.h>
 #endif /* HAVE_NETINET6_ND6_H */
diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c
index 20ef9216a9..a39d182990 100644
--- a/pimd/pim6_mld.c
+++ b/pimd/pim6_mld.c
@@ -13,6 +13,7 @@
  */
 
 #include <zebra.h>
+#include <netinet/icmp6.h>
 #include <netinet/ip6.h>
 
 #include "lib/memory.h"
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 7ea6ed9e14..e1b861b45b 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -5,6 +5,8 @@
  */
 
 #include <zebra.h>
+#include <netinet/icmp6.h>
+
 #include "log.h"
 #include "privs.h"
 #include "if.h"
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index df444ee523..00f018d192 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -6,6 +6,7 @@
  */
 
 #include <zebra.h>
+#include <netinet/icmp6.h>
 
 #include "memory.h"
 #include "sockopt.h"