diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index 405c97c3cf19..d218b93597f9 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -33,9 +33,9 @@ struct rtentry;
 #endif
 
 #include <net/if.h>
+#include <net/ethernet.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 
 #include <stdlib.h>
 #include <memory.h>
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 6e50138682c6..7cd5c4d0fefc 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -38,8 +38,8 @@ struct rtentry;
 #endif
 
 #include <net/if.h>
+#include <net/ethernet.h>
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 #include <arpa/inet.h>
 
 #include <ctype.h>
diff --git a/contrib/tcpdump/addrtoname.c b/contrib/tcpdump/addrtoname.c
index 8bfc3c379b49..11d150f21939 100644
--- a/contrib/tcpdump/addrtoname.c
+++ b/contrib/tcpdump/addrtoname.c
@@ -37,7 +37,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <arpa/inet.h>
 
diff --git a/contrib/tcpdump/print-arp.c b/contrib/tcpdump/print-arp.c
index 14f6d8e558f3..e58aeab2d00c 100644
--- a/contrib/tcpdump/print-arp.c
+++ b/contrib/tcpdump/print-arp.c
@@ -33,6 +33,7 @@ struct mbuf;
 struct rtentry;
 #endif
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/contrib/tcpdump/print-atalk.c b/contrib/tcpdump/print-atalk.c
index aa64fafbe9cd..e81afb120fb7 100644
--- a/contrib/tcpdump/print-atalk.c
+++ b/contrib/tcpdump/print-atalk.c
@@ -39,7 +39,7 @@ struct rtentry;
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
diff --git a/contrib/tcpdump/print-atm.c b/contrib/tcpdump/print-atm.c
index f8754a1adcd5..e07fa2a6fcdc 100644
--- a/contrib/tcpdump/print-atm.c
+++ b/contrib/tcpdump/print-atm.c
@@ -34,7 +34,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c
index 0a699f124cae..4402e499caac 100644
--- a/contrib/tcpdump/print-bootp.c
+++ b/contrib/tcpdump/print-bootp.c
@@ -36,7 +36,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c
index cbeae4ba1b20..e6651e7ae59d 100644
--- a/contrib/tcpdump/print-domain.c
+++ b/contrib/tcpdump/print-domain.c
@@ -35,7 +35,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c
index 405f495a9c42..bab00596d903 100644
--- a/contrib/tcpdump/print-ether.c
+++ b/contrib/tcpdump/print-ether.c
@@ -34,7 +34,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/contrib/tcpdump/print-fddi.c b/contrib/tcpdump/print-fddi.c
index 59999b860653..c5775629f7a8 100644
--- a/contrib/tcpdump/print-fddi.c
+++ b/contrib/tcpdump/print-fddi.c
@@ -38,7 +38,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
diff --git a/contrib/tcpdump/print-icmp.c b/contrib/tcpdump/print-icmp.c
index 429000b1a422..a94dd1388388 100644
--- a/contrib/tcpdump/print-icmp.c
+++ b/contrib/tcpdump/print-icmp.c
@@ -35,7 +35,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
diff --git a/contrib/tcpdump/print-isoclns.c b/contrib/tcpdump/print-isoclns.c
index 4a214b574ba7..d5e1496e1932 100644
--- a/contrib/tcpdump/print-isoclns.c
+++ b/contrib/tcpdump/print-isoclns.c
@@ -39,7 +39,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <stdio.h>
 
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index da7145878aba..c70557407646 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/contrib/tcpdump/print-nfs.c
@@ -31,7 +31,7 @@ static char rcsid[] =
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c
index ec6c8f00f182..eedca7a4d2b2 100644
--- a/contrib/tcpdump/print-ntp.c
+++ b/contrib/tcpdump/print-ntp.c
@@ -39,7 +39,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c
index 89e16950f3dd..eaa8a26e8c26 100644
--- a/contrib/tcpdump/print-null.c
+++ b/contrib/tcpdump/print-null.c
@@ -39,7 +39,7 @@ struct rtentry;
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
diff --git a/contrib/tcpdump/print-ppp.c b/contrib/tcpdump/print-ppp.c
index 2c21c2bc6a89..50c3c2aa6b97 100644
--- a/contrib/tcpdump/print-ppp.c
+++ b/contrib/tcpdump/print-ppp.c
@@ -47,7 +47,7 @@ struct rtentry;
 #include <signal.h>
 #include <stdio.h>
 
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include "ethertype.h"
 
 #include <net/ppp_defs.h>
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c
index 631714d454c1..97a283b22802 100644
--- a/contrib/tcpdump/print-sl.c
+++ b/contrib/tcpdump/print-sl.c
@@ -41,7 +41,7 @@ struct rtentry;
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
diff --git a/contrib/tcpdump/print-sunrpc.c b/contrib/tcpdump/print-sunrpc.c
index 71055aa1953d..281194a498dc 100644
--- a/contrib/tcpdump/print-sunrpc.c
+++ b/contrib/tcpdump/print-sunrpc.c
@@ -35,7 +35,7 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>