diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index fec195c77eb6..a336ede68be3 100644
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -23,6 +23,7 @@
 #endif /* BFD_LINUX */
 
 #include <netinet/if_ether.h>
+
 #include <netinet/udp.h>
 
 #include "lib/sockopt.h"
diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index 42370a431ad7..dd6d387c796e 100644
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -12,7 +12,9 @@
 #include <fcntl.h>
 
 #if ISIS_METHOD == ISIS_METHOD_BPF
+#ifndef GNU_LINUX
 #include <netinet/if_ether.h>
+#endif /* !GNU_LINUX */
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <net/bpf.h>
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 7819b20e8f31..83dd0aca8d33 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -7,11 +7,9 @@
  *                           Institute of Communications Engineering
  */
 #include <zebra.h>
-#ifdef GNU_LINUX
-#include <net/ethernet.h>
-#else
+#ifndef GNU_LINUX
 #include <netinet/if_ether.h>
-#endif
+#endif /* !GNU_LINUX */
 
 #include "log.h"
 #include "memory.h"
diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c
index c2b744797910..66a92046d906 100644
--- a/isisd/isis_dlpi.c
+++ b/isisd/isis_dlpi.c
@@ -9,7 +9,9 @@
 
 #include <zebra.h>
 #if ISIS_METHOD == ISIS_METHOD_DLPI
+#ifndef GNU_LINUX
 #include <netinet/if_ether.h>
+#endif /* !GNU_LINUX */
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
index aed59aa0a459..de7e1bf34858 100644
--- a/nhrpd/netlink_arp.c
+++ b/nhrpd/netlink_arp.c
@@ -12,7 +12,6 @@
 #endif
 
 #include <fcntl.h>
-#include <netinet/if_ether.h>
 #include <linux/netlink.h>
 #include <linux/neighbour.h>
 #include <linux/netfilter/nfnetlink_log.h>
diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c
index 5d904f694801..4142c210af59 100644
--- a/nhrpd/nhrp_multicast.c
+++ b/nhrpd/nhrp_multicast.c
@@ -13,7 +13,9 @@
 
 #include <fcntl.h>
 #include <net/ethernet.h>
+#ifndef GNU_LINUX
 #include <netinet/if_ether.h>
+#endif /* !GNU_LINUX */
 #include <linux/netlink.h>
 #include <linux/neighbour.h>
 #include <linux/netfilter/nfnetlink_log.h>
diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c
index 19667e66acc0..5e61df3994f3 100644
--- a/zebra/tc_netlink.c
+++ b/zebra/tc_netlink.c
@@ -12,7 +12,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/pkt_cls.h>
 #include <linux/pkt_sched.h>
-#include <netinet/if_ether.h>
 #include <sys/socket.h>
 
 #include "if.h"