From: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Date: Sat, 5 Sep 2015 21:35:58 +0000 (+0200)
Subject: Printers must include 'netdissect.h', not 'interface.h'
X-Git-Tag: tcpdump-4.8.0~175
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c1c3c77463d592cc576eaa491e604752044ca55a?hp=e847135d66e822a96198a8d15771cf3a827b1ee9

Printers must include 'netdissect.h', not 'interface.h'
---

diff --git a/print-802_11.c b/print-802_11.c
index e61cbde6..efd34958 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -28,7 +28,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 #include "extract.h"
diff --git a/print-802_15_4.c b/print-802_15_4.c
index ba8e396c..08317c56 100644
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -26,7 +26,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 #include "extract.h"
diff --git a/print-ah.c b/print-ah.c
index 015967ca..8d71e1b4 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -29,7 +29,7 @@
 
 #include "ah.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 int
diff --git a/print-ahcp.c b/print-ahcp.c
index 7c69e7b3..520c23a6 100644
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -35,7 +35,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-aodv.c b/print-aodv.c
index ab31b034..8bf0b37e 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -36,7 +36,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
diff --git a/print-aoe.c b/print-aoe.c
index a1dfc66b..0834a243 100644
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -35,7 +35,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"
diff --git a/print-ap1394.c b/print-ap1394.c
index 13526465..17877579 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
diff --git a/print-arcnet.c b/print-arcnet.c
index cd6f5d9a..b1cb4f13 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
diff --git a/print-arp.c b/print-arp.c
index b54a30f0..5a655f2a 100644
--- a/print-arp.c
+++ b/print-arp.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"
diff --git a/print-ascii.c b/print-ascii.c
index 71f16ff4..92229a68 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -43,7 +43,7 @@
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
diff --git a/print-atalk.c b/print-atalk.c
index f3618d79..073bd1ab 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"			/* must come after interface.h */
diff --git a/print-atm.c b/print-atm.c
index d2f18f7a..c2514d22 100644
--- a/print-atm.c
+++ b/print-atm.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "atm.h"
diff --git a/print-babel.c b/print-babel.c
index cdf08913..375c9a8b 100644
--- a/print-babel.c
+++ b/print-babel.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-beep.c b/print-beep.c
index 4c5bc84a..1ddb9eb5 100644
--- a/print-beep.c
+++ b/print-beep.c
@@ -17,7 +17,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise
diff --git a/print-bfd.c b/print-bfd.c
index 0450175f..724032ac 100644
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -19,7 +19,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #include "udp.h"
diff --git a/print-bgp.c b/print-bgp.c
index 84241415..9b622234 100644
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "af.h"
diff --git a/print-bootp.c b/print-bootp.c
index 07c518e8..bc03be9f 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-bt.c b/print-bt.c
index 68c02a61..55252bc0 100644
--- a/print-bt.c
+++ b/print-bt.c
@@ -23,7 +23,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
diff --git a/print-calm-fast.c b/print-calm-fast.c
index 5d1cb64f..0b502499 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -21,7 +21,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 /*
diff --git a/print-carp.c b/print-carp.c
index 6417c1a8..c7a74379 100644
--- a/print-carp.c
+++ b/print-carp.c
@@ -40,7 +40,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h" /* for checksum structure and functions */
+#include "netdissect.h" /* for checksum structure and functions */
 #include "extract.h"
 
 void
diff --git a/print-cdp.c b/print-cdp.c
index c28bd882..1046193d 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 #include "nlpid.h"
diff --git a/print-cfm.c b/print-cfm.c
index 735fb1ee..5ec177a6 100644
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"
diff --git a/print-chdlc.c b/print-chdlc.c
index 766ae381..a27adaac 100644
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"
diff --git a/print-cip.c b/print-cip.c
index fde5ab44..44d62925 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -28,7 +28,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 #define RFC1483LLC_LEN	8
diff --git a/print-cnfp.c b/print-cnfp.c
index ea8b318d..2ea5427a 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -47,7 +47,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-dccp.c b/print-dccp.c
index a41f68bf..74054fb6 100644
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 #include "ip.h"
diff --git a/print-decnet.c b/print-decnet.c
index e94cc6b9..41d022fc 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -37,7 +37,7 @@ struct rtentry;
 #include <string.h>
 
 #include "extract.h"
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 static const char tstr[] = "[|decnet]";
diff --git a/print-dhcp6.c b/print-dhcp6.c
index 3e7aa803..31211e3b 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-domain.c b/print-domain.c
index a6a6d3a2..7a7c6942 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
diff --git a/print-dtp.c b/print-dtp.c
index 5983b843..ae896d03 100644
--- a/print-dtp.c
+++ b/print-dtp.c
@@ -23,7 +23,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-dvmrp.c b/print-dvmrp.c
index 8e008326..6ec253d0 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-eap.c b/print-eap.c
index 58b1159e..9420d110 100644
--- a/print-eap.c
+++ b/print-eap.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #define	EAP_FRAME_TYPE_PACKET		0
diff --git a/print-egp.c b/print-egp.c
index e15f688b..3b010f87 100644
--- a/print-egp.c
+++ b/print-egp.c
@@ -24,7 +24,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-eigrp.c b/print-eigrp.c
index 5718d511..f4f2d9cb 100644
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-enc.c b/print-enc.c
index 445bc4a9..7466b358 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /* From $OpenBSD: if_enc.h,v 1.8 2001/06/25 05:14:00 angelos Exp $ */
diff --git a/print-esp.c b/print-esp.c
index 5dbb28d4..fe494a39 100644
--- a/print-esp.c
+++ b/print-esp.c
@@ -47,7 +47,7 @@
 #include "ip6.h"
 #endif
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #include "ascii_strcasecmp.h"
diff --git a/print-ether.c b/print-ether.c
index ddf6a530..1bccc056 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
diff --git a/print-fddi.c b/print-fddi.c
index fbda09d7..4b5be590 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ether.h"
 
diff --git a/print-forces.c b/print-forces.c
index d3ffb1e5..0f4b2560 100644
--- a/print-forces.c
+++ b/print-forces.c
@@ -20,7 +20,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = "[|forces]";
diff --git a/print-fr.c b/print-fr.c
index 2e04cbdc..14964466 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "llc.h"
diff --git a/print-frag6.c b/print-frag6.c
index 53dafb4c..b8c49fd9 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -28,7 +28,7 @@
 #include <tcpdump-stdinc.h>
 
 #include "ip6.h"
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 int
diff --git a/print-geneve.c b/print-geneve.c
index 28cb92bd..cbe44a1d 100644
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -21,7 +21,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ethertype.h"
 
diff --git a/print-geonet.c b/print-geonet.c
index b83723dc..45326154 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -21,7 +21,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-gre.c b/print-gre.c
index aafd8846..ee26d0d3 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -44,7 +44,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ethertype.h"
 
diff --git a/print-hsrp.c b/print-hsrp.c
index 6dc43de1..5fd923de 100644
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -35,7 +35,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 /* HSRP op code types. */
diff --git a/print-http.c b/print-http.c
index 49df1748..4f6a5d23 100644
--- a/print-http.c
+++ b/print-http.c
@@ -25,7 +25,7 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
diff --git a/print-icmp.c b/print-icmp.c
index e270cde1..ff628c8b 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
diff --git a/print-icmp6.c b/print-icmp6.c
index fbc77ec2..af23cc8b 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-igmp.c b/print-igmp.c
index d3a685aa..dcbe1050 100644
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"            /* must come after interface.h */
 
diff --git a/print-igrp.c b/print-igrp.c
index 9b59dc5a..ebea26f5 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"			/* must come after interface.h */
 
 /* Cisco IGRP definitions */
diff --git a/print-ip.c b/print-ip.c
index a7a3b470..09a44ae5 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
diff --git a/print-ip6.c b/print-ip6.c
index 98d6adf5..4a876995 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-ip6opts.c b/print-ip6opts.c
index b1af8f86..8be9113e 100644
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -36,7 +36,7 @@
 
 #include "ip6.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-ipcomp.c b/print-ipcomp.c
index 633de9be..cf8de2a1 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -35,7 +35,7 @@ struct ipcomp {
 #include <zlib.h>
 #endif
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 int
diff --git a/print-ipfc.c b/print-ipfc.c
index 61e4f825..bf1b3382 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
 #include "ether.h"
diff --git a/print-ipnet.c b/print-ipnet.c
index 20ebbfd3..87b1b501 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -4,7 +4,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 typedef struct ipnet_hdr {
 	uint8_t		iph_version;
diff --git a/print-ipx.c b/print-ipx.c
index b06ff613..3ad45c73 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-isakmp.c b/print-isakmp.c
index 5b7ecd66..78f0d93b 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -43,7 +43,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
diff --git a/print-isoclns.c b/print-isoclns.c
index fb4c0b26..4298d5e4 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "nlpid.h"
diff --git a/print-juniper.c b/print-juniper.c
index d5fd79d0..91d40b13 100644
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -26,7 +26,7 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ppp.h"
diff --git a/print-krb.c b/print-krb.c
index b57c12d8..ab9ff8dc 100644
--- a/print-krb.c
+++ b/print-krb.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = " [|kerberos]";
diff --git a/print-l2tp.c b/print-l2tp.c
index 514eb2c5..0c7d5114 100644
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #define L2TP_FLAG_TYPE		0x8000	/* Type (0=Data, 1=Control) */
diff --git a/print-lane.c b/print-lane.c
index edf5451c..f179c7db 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -26,7 +26,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ether.h"
 
diff --git a/print-ldp.c b/print-ldp.c
index cf421c43..51b8d164 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -20,7 +20,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-llc.c b/print-llc.c
index c86618b8..11f248bb 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -28,7 +28,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
diff --git a/print-lldp.c b/print-lldp.c
index e4bed732..7d4c792b 100644
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "af.h"
diff --git a/print-lmp.c b/print-lmp.c
index ca1d5cd0..069a3a33 100644
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -23,7 +23,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "gmpls.h"
diff --git a/print-loopback.c b/print-loopback.c
index 481cf6ee..e54d1dbf 100644
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -36,7 +36,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"
diff --git a/print-lspping.c b/print-lspping.c
index ae43fef3..779c7f7d 100644
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -19,7 +19,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-lwapp.c b/print-lwapp.c
index a6c05a39..e75a354f 100644
--- a/print-lwapp.c
+++ b/print-lwapp.c
@@ -23,7 +23,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-lwres.c b/print-lwres.c
index 90a6866a..38a5c6ff 100644
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
diff --git a/print-m3ua.c b/print-m3ua.c
index be7a30a4..b217e8ff 100644
--- a/print-m3ua.c
+++ b/print-m3ua.c
@@ -28,7 +28,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = " [|m3ua]";
diff --git a/print-medsa.c b/print-medsa.c
index e9ec317b..c4fc7198 100644
--- a/print-medsa.c
+++ b/print-medsa.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "ether.h"
 #include "ethertype.h"
 #include "extract.h"			/* must come after interface.h */
diff --git a/print-mobile.c b/print-mobile.c
index c06b84af..95410b3f 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -42,7 +42,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"		/* must come after interface.h */
 
diff --git a/print-mobility.c b/print-mobility.c
index d08984d1..dad68589 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -35,7 +35,7 @@
 #include <tcpdump-stdinc.h>
 
 #include "ip6.h"
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"		/* must come after interface.h */
 
diff --git a/print-mpcp.c b/print-mpcp.c
index e2b6c394..32fa958d 100644
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -23,7 +23,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #define MPCP_TIMESTAMP_LEN        4
diff --git a/print-mpls.c b/print-mpls.c
index 03ff1b3e..027b6729 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -32,7 +32,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"			/* must come after interface.h */
 #include "mpls.h"
 
diff --git a/print-mptcp.c b/print-mptcp.c
index a37a59d9..c7ca2f15 100644
--- a/print-mptcp.c
+++ b/print-mptcp.c
@@ -38,7 +38,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-msdp.c b/print-msdp.c
index 16abc3ec..6b2dc51a 100644
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -22,7 +22,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-msnlb.c b/print-msnlb.c
index 2721246d..27828f40 100644
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -32,7 +32,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-nflog.c b/print-nflog.c
index a29b930c..b096e9ec 100644
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -31,7 +31,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 #if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
 #include <pcap/nflog.h>
diff --git a/print-nfs.c b/print-nfs.c
index ac51f7ee..7ec799cd 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-ntp.c b/print-ntp.c
index eed98f7e..e48bd0f9 100644
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #endif
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-null.c b/print-null.c
index b6fdf9f8..60c9bf04 100644
--- a/print-null.c
+++ b/print-null.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "af.h"
 
 /*
diff --git a/print-olsr.c b/print-olsr.c
index dfa09da4..9625728e 100644
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index 9fb0f635..8cfc00c3 100644
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -62,7 +62,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"
diff --git a/print-openflow.c b/print-openflow.c
index 0563edea..603ed2b6 100644
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -36,7 +36,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "openflow.h"
 #include "oui.h"
diff --git a/print-ospf.c b/print-ospf.c
index 3fc0c948..c516a90a 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
diff --git a/print-ospf6.c b/print-ospf6.c
index 7ae1733a..5032d8bc 100644
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-otv.c b/print-otv.c
index 3255ddb0..7f619df3 100644
--- a/print-otv.c
+++ b/print-otv.c
@@ -19,7 +19,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
diff --git a/print-pflog.c b/print-pflog.c
index 0df10c84..d08ceddb 100644
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -34,7 +34,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = "[|pflog]";
diff --git a/print-pgm.c b/print-pgm.c
index 1821c2ba..5fa1fcb9 100644
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -19,7 +19,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-pim.c b/print-pim.c
index 1c1050b1..149f027a 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-pktap.c b/print-pktap.c
index daabe41e..90d50619 100644
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #ifdef DLT_PKTAP
diff --git a/print-ppi.c b/print-ppi.c
index b9f76579..b40acd00 100644
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -8,7 +8,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 typedef struct ppi_header {
diff --git a/print-ppp.c b/print-ppp.c
index d9bca84c..b245625f 100644
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -42,7 +42,7 @@
 
 #include <stdlib.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ppp.h"
diff --git a/print-pppoe.c b/print-pppoe.c
index aeb38630..e54a345e 100644
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"			/* must come after interface.h */
 
 /* Codes */
diff --git a/print-pptp.c b/print-pptp.c
index bac6078c..58b1c56c 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = " [|pptp]";
diff --git a/print-radius.c b/print-radius.c
index 3018a5fb..83e432ff 100644
--- a/print-radius.c
+++ b/print-radius.c
@@ -60,7 +60,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "oui.h"
diff --git a/print-raw.c b/print-raw.c
index 74d63639..83f66b48 100644
--- a/print-raw.c
+++ b/print-raw.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
diff --git a/print-rip.c b/print-rip.c
index 3c64bf9a..087b2d9f 100644
--- a/print-rip.c
+++ b/print-rip.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
diff --git a/print-ripng.c b/print-ripng.c
index afe1c5e6..76468077 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index 409125da..1512fefc 100644
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-rrcp.c b/print-rrcp.c
index 5f24a43e..c4d43757 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -27,7 +27,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"
diff --git a/print-rsvp.c b/print-rsvp.c
index 2c510f30..06cd215f 100644
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -21,7 +21,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
diff --git a/print-rt6.c b/print-rt6.c
index 8c1ff6a9..0f944e7b 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -31,7 +31,7 @@
 
 #include "ip6.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-rtsp.c b/print-rtsp.c
index d721b8db..9f4a3039 100644
--- a/print-rtsp.c
+++ b/print-rtsp.c
@@ -25,7 +25,7 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char *rtspcmds[] = {
diff --git a/print-rx.c b/print-rx.c
index 246ba6fe..9657d2bf 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-sctp.c b/print-sctp.c
index 6c41766d..04d99c17 100644
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -39,7 +39,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 #include "ip.h"
diff --git a/print-sflow.c b/print-sflow.c
index e16f0ab3..f3d6ff5f 100644
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-sip.c b/print-sip.c
index 5c5d1fec..836fb9e2 100644
--- a/print-sip.c
+++ b/print-sip.c
@@ -21,7 +21,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char *sipcmds[] = {
diff --git a/print-sl.c b/print-sl.c
index 87daa47f..1733b419 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"			/* must come after interface.h */
 
 #include "ip.h"
diff --git a/print-sll.c b/print-sll.c
index e3e6ec96..5003a3dd 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"
diff --git a/print-slow.c b/print-slow.c
index b46ae007..c289f118 100644
--- a/print-slow.c
+++ b/print-slow.c
@@ -24,7 +24,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"
diff --git a/print-smb.c b/print-smb.c
index b8c5d9d5..d02de99e 100644
--- a/print-smb.c
+++ b/print-smb.c
@@ -14,7 +14,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "smb.h"
 
diff --git a/print-snmp.c b/print-snmp.c
index f348cd3b..e6141ca4 100644
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -69,7 +69,7 @@
 #include <smi.h>
 #endif
 
-#include "interface.h"
+#include "netdissect.h"
 
 #undef OPAQUE  /* defined in <wingdi.h> */
 
diff --git a/print-stp.c b/print-stp.c
index d3879615..189def7d 100644
--- a/print-stp.c
+++ b/print-stp.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #define	RSTP_EXTRACT_PORT_ROLE(x) (((x)&0x0C)>>2)
diff --git a/print-sunatm.c b/print-sunatm.c
index d22e83a4..eef9c035 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -39,7 +39,7 @@
 struct mbuf;
 struct rtentry;
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #include "atm.h"
diff --git a/print-sunrpc.c b/print-sunrpc.c
index e1da350a..82a2f0d6 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -50,7 +50,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-symantec.c b/print-symantec.c
index e4328880..679235f9 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ethertype.h"
 
diff --git a/print-syslog.c b/print-syslog.c
index 2d481815..9be3b52a 100644
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -20,7 +20,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = "[|syslog]";
diff --git a/print-tcp.c b/print-tcp.c
index a1d68a8a..5fbb2ebb 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -37,7 +37,7 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #include <stdlib.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-telnet.c b/print-telnet.c
index b3f17ed2..ae29b474 100644
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -53,7 +53,7 @@
 
 #include <stdio.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 #define TELCMDS
 #define TELOPTS
diff --git a/print-tftp.c b/print-tftp.c
index d996b8cf..c77297d8 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
diff --git a/print-timed.c b/print-timed.c
index 1b7d3ab8..7b817141 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
diff --git a/print-tipc.c b/print-tipc.c
index 9c760fdd..3e41e08d 100644
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "ether.h"
 #include "ethertype.h"
 #include "extract.h"			/* must come after interface.h */
diff --git a/print-token.c b/print-token.c
index 6bf2b23d..e213f6fe 100644
--- a/print-token.c
+++ b/print-token.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ether.h"
diff --git a/print-udld.c b/print-udld.c
index fd6fdf91..4ff889e8 100644
--- a/print-udld.c
+++ b/print-udld.c
@@ -24,7 +24,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 #define UDLD_HEADER_LEN			4
diff --git a/print-udp.c b/print-udp.c
index d718f856..b59675f0 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "appletalk.h"
diff --git a/print-usb.c b/print-usb.c
index d0ad6141..7f453e33 100644
--- a/print-usb.c
+++ b/print-usb.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 
 #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX)
diff --git a/print-vjc.c b/print-vjc.c
index 65aa8e6a..85b500eb 100644
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "slcompress.h"
 #include "ppp.h"
 
diff --git a/print-vqp.c b/print-vqp.c
index 45150b6d..8305d5d2 100644
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -23,7 +23,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-vrrp.c b/print-vrrp.c
index 3caa0b24..f29272ee 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -29,7 +29,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
diff --git a/print-vtp.c b/print-vtp.c
index 2ee37542..3b2c95c5 100644
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -28,7 +28,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-vxlan.c b/print-vxlan.c
index c123b4ce..fd12d2d3 100644
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -19,7 +19,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
diff --git a/print-wb.c b/print-wb.c
index 92b8c2c3..23db3de5 100644
--- a/print-wb.c
+++ b/print-wb.c
@@ -25,7 +25,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
diff --git a/print-zephyr.c b/print-zephyr.c
index 700d0bc0..90bd52b8 100644
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 struct z_packet {
     const char *version;
diff --git a/print-zeromq.c b/print-zeromq.c
index b7302035..410241e4 100644
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -34,7 +34,7 @@
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 static const char tstr[] = " [|zmtp1]";