summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <fx.lebail@yahoo.com>2015-09-09 22:42:38 +0200
committerFrancois-Xavier Le Bail <fx.lebail@yahoo.com>2015-09-10 08:50:40 +0200
commit99c91c3aec40b691641374f58e798bd8d6b657bd (patch)
treef4976adb4273c43522bc0fd4ae96ef276e918d14
parentbf0e85248db6220282b98140d110fd1f3a123f8e (diff)
downloadtcpdump-99c91c3aec40b691641374f58e798bd8d6b657bd.tar.gz
Rename 'tcpdump-stdinc.h' to 'netdissect-stdinc.h'
Get the full log via: git log --follow netdissect-stdinc.h
-rw-r--r--Makefile.in2
-rw-r--r--addrtoname.c2
-rw-r--r--af.c2
-rw-r--r--bpf_dump.c2
-rw-r--r--checksum.c2
-rwxr-xr-xconfigure6
-rw-r--r--configure.in6
-rw-r--r--cpack.c2
-rw-r--r--gmpls.c2
-rw-r--r--gmt2local.c2
-rw-r--r--in_cksum.c2
-rw-r--r--ipproto.c2
-rw-r--r--l2vpn.c2
-rw-r--r--machdep.c2
-rw-r--r--missing/datalinks.c2
-rw-r--r--missing/dlnames.c2
-rw-r--r--missing/inet_aton.c2
-rw-r--r--missing/inet_ntop.c2
-rw-r--r--missing/inet_pton.c2
-rw-r--r--missing/strlcat.c2
-rw-r--r--missing/strlcpy.c2
-rw-r--r--missing/strsep.c2
-rw-r--r--netdissect-stdinc.h (renamed from tcpdump-stdinc.h)8
-rw-r--r--nlpid.c2
-rw-r--r--oui.c2
-rw-r--r--parsenfsfh.c2
-rw-r--r--print-802_11.c2
-rw-r--r--print-802_15_4.c2
-rw-r--r--print-ah.c2
-rw-r--r--print-ahcp.c2
-rw-r--r--print-aodv.c2
-rw-r--r--print-aoe.c2
-rw-r--r--print-ap1394.c2
-rw-r--r--print-arcnet.c2
-rw-r--r--print-arp.c2
-rw-r--r--print-ascii.c2
-rw-r--r--print-atalk.c2
-rw-r--r--print-atm.c2
-rw-r--r--print-babel.c2
-rw-r--r--print-beep.c2
-rw-r--r--print-bfd.c2
-rw-r--r--print-bgp.c2
-rw-r--r--print-bootp.c2
-rw-r--r--print-bt.c2
-rw-r--r--print-calm-fast.c2
-rw-r--r--print-carp.c2
-rw-r--r--print-cdp.c2
-rw-r--r--print-cfm.c2
-rw-r--r--print-chdlc.c2
-rw-r--r--print-cip.c2
-rw-r--r--print-cnfp.c2
-rw-r--r--print-dccp.c2
-rw-r--r--print-decnet.c2
-rw-r--r--print-dhcp6.c2
-rw-r--r--print-domain.c2
-rw-r--r--print-dtp.c2
-rw-r--r--print-dvmrp.c2
-rw-r--r--print-eap.c2
-rw-r--r--print-egp.c2
-rw-r--r--print-eigrp.c2
-rw-r--r--print-enc.c2
-rw-r--r--print-esp.c2
-rw-r--r--print-ether.c2
-rw-r--r--print-fddi.c2
-rw-r--r--print-forces.c2
-rw-r--r--print-fr.c2
-rw-r--r--print-frag6.c2
-rw-r--r--print-ftp.c2
-rw-r--r--print-geneve.c2
-rw-r--r--print-geonet.c2
-rw-r--r--print-gre.c2
-rw-r--r--print-hsrp.c2
-rw-r--r--print-http.c2
-rw-r--r--print-icmp.c2
-rw-r--r--print-icmp6.c2
-rw-r--r--print-igmp.c2
-rw-r--r--print-igrp.c2
-rw-r--r--print-ip.c2
-rw-r--r--print-ip6.c2
-rw-r--r--print-ip6opts.c2
-rw-r--r--print-ipcomp.c2
-rw-r--r--print-ipfc.c2
-rw-r--r--print-ipnet.c2
-rw-r--r--print-ipx.c2
-rw-r--r--print-isakmp.c2
-rw-r--r--print-isoclns.c2
-rw-r--r--print-juniper.c2
-rw-r--r--print-krb.c2
-rw-r--r--print-l2tp.c2
-rw-r--r--print-lane.c2
-rw-r--r--print-ldp.c2
-rw-r--r--print-llc.c2
-rw-r--r--print-lldp.c2
-rw-r--r--print-lmp.c2
-rw-r--r--print-loopback.c2
-rw-r--r--print-lspping.c2
-rw-r--r--print-lwapp.c2
-rw-r--r--print-lwres.c2
-rw-r--r--print-m3ua.c2
-rw-r--r--print-medsa.c2
-rw-r--r--print-mobile.c2
-rw-r--r--print-mobility.c2
-rw-r--r--print-mpcp.c2
-rw-r--r--print-mpls.c2
-rw-r--r--print-mptcp.c2
-rw-r--r--print-msdp.c2
-rw-r--r--print-msnlb.c2
-rw-r--r--print-nflog.c2
-rw-r--r--print-nfs.c2
-rw-r--r--print-ntp.c2
-rw-r--r--print-null.c2
-rw-r--r--print-olsr.c2
-rw-r--r--print-openflow-1.0.c2
-rw-r--r--print-openflow.c2
-rw-r--r--print-ospf.c2
-rw-r--r--print-ospf6.c2
-rw-r--r--print-otv.c2
-rw-r--r--print-pflog.c2
-rw-r--r--print-pgm.c2
-rw-r--r--print-pim.c2
-rw-r--r--print-pktap.c2
-rw-r--r--print-ppi.c2
-rw-r--r--print-ppp.c2
-rw-r--r--print-pppoe.c2
-rw-r--r--print-pptp.c2
-rw-r--r--print-radius.c2
-rw-r--r--print-raw.c2
-rw-r--r--print-rip.c2
-rw-r--r--print-ripng.c2
-rw-r--r--print-rpki-rtr.c2
-rw-r--r--print-rrcp.c2
-rw-r--r--print-rsvp.c2
-rw-r--r--print-rt6.c2
-rw-r--r--print-rtsp.c2
-rw-r--r--print-rx.c2
-rw-r--r--print-sctp.c2
-rw-r--r--print-sflow.c2
-rw-r--r--print-sip.c2
-rw-r--r--print-sl.c2
-rw-r--r--print-sll.c2
-rw-r--r--print-slow.c2
-rw-r--r--print-smb.c2
-rw-r--r--print-smtp.c2
-rw-r--r--print-snmp.c2
-rw-r--r--print-stp.c2
-rw-r--r--print-sunatm.c2
-rw-r--r--print-sunrpc.c2
-rw-r--r--print-symantec.c2
-rw-r--r--print-syslog.c2
-rw-r--r--print-tcp.c2
-rw-r--r--print-telnet.c2
-rw-r--r--print-tftp.c2
-rw-r--r--print-timed.c2
-rw-r--r--print-tipc.c2
-rw-r--r--print-token.c2
-rw-r--r--print-udld.c2
-rw-r--r--print-udp.c2
-rw-r--r--print-usb.c2
-rw-r--r--print-vjc.c2
-rw-r--r--print-vqp.c2
-rw-r--r--print-vrrp.c2
-rw-r--r--print-vtp.c2
-rw-r--r--print-vxlan.c2
-rw-r--r--print-wb.c2
-rw-r--r--print-zephyr.c2
-rw-r--r--print-zeromq.c2
-rw-r--r--print.c2
-rw-r--r--setsignal.c2
-rw-r--r--signature.c2
-rw-r--r--smbutil.c2
-rw-r--r--tcpdump.c2
-rw-r--r--util-print.c2
-rw-r--r--util.c2
-rw-r--r--win32/src/ether_ntohost.c2
174 files changed, 181 insertions, 181 deletions
diff --git a/Makefile.in b/Makefile.in
index cfd619c1..1f9dc07f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,7 +276,7 @@ HDR = \
slcompress.h \
smb.h \
tcp.h \
- tcpdump-stdinc.h \
+ netdissect-stdinc.h \
timeval-operations.h \
udp.h
diff --git a/addrtoname.c b/addrtoname.c
index 34499127..527f4055 100644
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#ifdef USE_ETHER_NTOHOST
#ifdef HAVE_NETINET_IF_ETHER_H
diff --git a/af.c b/af.c
index 2a2159d7..cfa0648e 100644
--- a/af.c
+++ b/af.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
#include "af.h"
diff --git a/bpf_dump.c b/bpf_dump.c
index 05ae760a..b7d649a1 100644
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/checksum.c b/checksum.c
index 8778d93c..9f6bb24d 100644
--- a/checksum.c
+++ b/checksum.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/configure b/configure
index 1968499c..4b8fcee6 100755
--- a/configure
+++ b/configure
@@ -7422,7 +7422,7 @@ savedcppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $V_INCLS"
for ac_header in pcap/bluetooth.h
do :
- ac_fn_c_check_header_compile "$LINENO" "pcap/bluetooth.h" "ac_cv_header_pcap_bluetooth_h" "#include \"tcpdump-stdinc.h\"
+ ac_fn_c_check_header_compile "$LINENO" "pcap/bluetooth.h" "ac_cv_header_pcap_bluetooth_h" "#include \"netdissect-stdinc.h\"
"
if test "x$ac_cv_header_pcap_bluetooth_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
@@ -7435,7 +7435,7 @@ done
for ac_header in pcap/nflog.h
do :
- ac_fn_c_check_header_compile "$LINENO" "pcap/nflog.h" "ac_cv_header_pcap_nflog_h" "#include \"tcpdump-stdinc.h\"
+ ac_fn_c_check_header_compile "$LINENO" "pcap/nflog.h" "ac_cv_header_pcap_nflog_h" "#include \"netdissect-stdinc.h\"
"
if test "x$ac_cv_header_pcap_nflog_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
@@ -7448,7 +7448,7 @@ done
for ac_header in pcap/usb.h
do :
- ac_fn_c_check_header_compile "$LINENO" "pcap/usb.h" "ac_cv_header_pcap_usb_h" "#include \"tcpdump-stdinc.h\"
+ ac_fn_c_check_header_compile "$LINENO" "pcap/usb.h" "ac_cv_header_pcap_usb_h" "#include \"netdissect-stdinc.h\"
"
if test "x$ac_cv_header_pcap_usb_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 0640f5a8..1e87c151 100644
--- a/configure.in
+++ b/configure.in
@@ -1077,9 +1077,9 @@ fi
#
savedcppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $V_INCLS"
-AC_CHECK_HEADERS(pcap/bluetooth.h,,,[#include "tcpdump-stdinc.h"])
-AC_CHECK_HEADERS(pcap/nflog.h,,,[#include "tcpdump-stdinc.h"])
-AC_CHECK_HEADERS(pcap/usb.h,,,[#include "tcpdump-stdinc.h"])
+AC_CHECK_HEADERS(pcap/bluetooth.h,,,[#include "netdissect-stdinc.h"])
+AC_CHECK_HEADERS(pcap/nflog.h,,,[#include "netdissect-stdinc.h"])
+AC_CHECK_HEADERS(pcap/usb.h,,,[#include "netdissect-stdinc.h"])
CPPFLAGS="$savedcppflags"
AC_PROG_RANLIB
diff --git a/cpack.c b/cpack.c
index 0611a071..e37d813d 100644
--- a/cpack.c
+++ b/cpack.c
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <string.h>
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "cpack.h"
#include "extract.h"
diff --git a/gmpls.c b/gmpls.c
index b4837a1e..463a21de 100644
--- a/gmpls.c
+++ b/gmpls.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
#include "gmpls.h"
diff --git a/gmt2local.c b/gmt2local.c
index 2ab9c102..d6cd93b8 100644
--- a/gmt2local.c
+++ b/gmt2local.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/in_cksum.c b/in_cksum.c
index 0f19befc..caf4b6af 100644
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -39,7 +39,7 @@
# include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
diff --git a/ipproto.c b/ipproto.c
index 8143eda8..eeece52b 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
#include "ipproto.h"
diff --git a/l2vpn.c b/l2vpn.c
index e9b72fff..be47dbd7 100644
--- a/l2vpn.c
+++ b/l2vpn.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
#include "l2vpn.h"
diff --git a/machdep.c b/machdep.c
index 7b259ae1..1f086161 100644
--- a/machdep.c
+++ b/machdep.c
@@ -29,7 +29,7 @@
* need to do to get it defined? This is clearly wrong, as we shouldn't
* have to include UNIX or Windows system header files to get it.
*/
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#ifndef HAVE___ATTRIBUTE__
#define __attribute__(x)
diff --git a/missing/datalinks.c b/missing/datalinks.c
index e7d526bc..4a7d6fe9 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -35,7 +35,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <pcap.h>
#include <stdlib.h>
diff --git a/missing/dlnames.c b/missing/dlnames.c
index c1795b3d..16bfcf79 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -35,7 +35,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <pcap.h>
#include <string.h>
diff --git a/missing/inet_aton.c b/missing/inet_aton.c
index e85ad5f8..098dc857 100644
--- a/missing/inet_aton.c
+++ b/missing/inet_aton.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*/
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
/* Minimal implementation of inet_aton.
* Cannot distinguish between failure and a local broadcast address. */
diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c
index 8c6f7eb8..77928db9 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -40,7 +40,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/missing/inet_pton.c b/missing/inet_pton.c
index 3466f42b..66269e22 100644
--- a/missing/inet_pton.c
+++ b/missing/inet_pton.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*/
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
int
inet_pton(int af, const char *src, void *dst)
diff --git a/missing/strlcat.c b/missing/strlcat.c
index 744ab3a6..a953034b 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -32,7 +32,7 @@
#include <config.h>
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 52ede566..0999ba30 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -32,7 +32,7 @@
#include <config.h>
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/missing/strsep.c b/missing/strsep.c
index 95673fc8..91ef72f6 100644
--- a/missing/strsep.c
+++ b/missing/strsep.c
@@ -35,7 +35,7 @@
#include <config.h>
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/tcpdump-stdinc.h b/netdissect-stdinc.h
index 54abaf5f..093fc092 100644
--- a/tcpdump-stdinc.h
+++ b/netdissect-stdinc.h
@@ -32,12 +32,12 @@
/*
* Include the appropriate OS header files on Windows and various flavors
* of UNIX, include various non-OS header files on Windows, and define
- * various items as needed, to isolate most of tcpdump's platform
+ * various items as needed, to isolate most of netdissect's platform
* differences to this one file.
*/
-#ifndef tcpdump_stdinc_h
-#define tcpdump_stdinc_h
+#ifndef netdissect_stdinc_h
+#define netdissect_stdinc_h
#include <errno.h>
@@ -349,4 +349,4 @@ typedef char* caddr_t;
#define max(a,b) ((b)>(a)?(b):(a))
#endif
-#endif /* tcpdump_stdinc_h */
+#endif /* netdissect_stdinc_h */
diff --git a/nlpid.c b/nlpid.c
index b9d59c4c..14efb0b1 100644
--- a/nlpid.c
+++ b/nlpid.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
#include "nlpid.h"
diff --git a/oui.c b/oui.c
index d29a6016..a0645693 100644
--- a/oui.c
+++ b/oui.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "interface.h"
#include "oui.h"
diff --git a/parsenfsfh.c b/parsenfsfh.c
index 2d3a3840..e7805063 100644
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -44,7 +44,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-802_11.c b/print-802_11.c
index efd34958..2aa05526 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-802_15_4.c b/print-802_15_4.c
index e60a8a9e..4a1ef49b 100644
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-ah.c b/print-ah.c
index 8d71e1b4..5db28d19 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "ah.h"
diff --git a/print-ahcp.c b/print-ahcp.c
index ebc74091..41a1bb05 100644
--- a/print-ahcp.c
+++ b/print-ahcp.c
@@ -33,7 +33,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-aodv.c b/print-aodv.c
index 382745a5..c0c2a6b1 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -34,7 +34,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-aoe.c b/print-aoe.c
index 6a3cbb03..abad1548 100644
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -33,7 +33,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-ap1394.c b/print-ap1394.c
index 17877579..a7096fb6 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-arcnet.c b/print-arcnet.c
index b1cb4f13..6d49c14d 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-arp.c b/print-arp.c
index 0d352215..b007257a 100644
--- a/print-arp.c
+++ b/print-arp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-ascii.c b/print-ascii.c
index 92229a68..6fefb966 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,7 +40,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include "netdissect.h"
diff --git a/print-atalk.c b/print-atalk.c
index a8ed07ae..72fd72ad 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-atm.c b/print-atm.c
index c2514d22..7489158b 100644
--- a/print-atm.c
+++ b/print-atm.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-babel.c b/print-babel.c
index 2e9c26ca..1d20988c 100644
--- a/print-babel.c
+++ b/print-babel.c
@@ -30,7 +30,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-beep.c b/print-beep.c
index c0f6d524..1240a3e6 100644
--- a/print-beep.c
+++ b/print-beep.c
@@ -13,7 +13,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-bfd.c b/print-bfd.c
index 724032ac..2950d22e 100644
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-bgp.c b/print-bgp.c
index 8d3ea155..a55ea706 100644
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -34,7 +34,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-bootp.c b/print-bootp.c
index 2bd47bee..83fa0278 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-bt.c b/print-bt.c
index 55252bc0..6055e3c6 100644
--- a/print-bt.c
+++ b/print-bt.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-calm-fast.c b/print-calm-fast.c
index 0b502499..a1690c0a 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-carp.c b/print-carp.c
index c7a74379..eb893e2a 100644
--- a/print-carp.c
+++ b/print-carp.c
@@ -38,7 +38,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h" /* for checksum structure and functions */
#include "extract.h"
diff --git a/print-cdp.c b/print-cdp.c
index 05017a94..3065193e 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -28,7 +28,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-cfm.c b/print-cfm.c
index 5ec177a6..c48b1a29 100644
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/print-chdlc.c b/print-chdlc.c
index a27adaac..ef22a36d 100644
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-cip.c b/print-cip.c
index 44d62925..2ea50bc0 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -26,7 +26,7 @@
#include <string.h>
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-cnfp.c b/print-cnfp.c
index 2ea5427a..b1113c99 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -42,7 +42,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-dccp.c b/print-dccp.c
index 1fcba845..5e286c76 100644
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -11,7 +11,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-decnet.c b/print-decnet.c
index 41d022fc..cd88dfac 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
struct mbuf;
struct rtentry;
diff --git a/print-dhcp6.c b/print-dhcp6.c
index f6225d72..fc7dbdf7 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -44,7 +44,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-domain.c b/print-domain.c
index 15974bfa..1d99f142 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "nameser.h"
diff --git a/print-dtp.c b/print-dtp.c
index ae896d03..3381ad80 100644
--- a/print-dtp.c
+++ b/print-dtp.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-dvmrp.c b/print-dvmrp.c
index 6ec253d0..9e9b569f 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-eap.c b/print-eap.c
index 9420d110..4572c8a0 100644
--- a/print-eap.c
+++ b/print-eap.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-egp.c b/print-egp.c
index 3b010f87..e87d0d66 100644
--- a/print-egp.c
+++ b/print-egp.c
@@ -22,7 +22,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-eigrp.c b/print-eigrp.c
index f4f2d9cb..a56aae71 100644
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -18,7 +18,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-enc.c b/print-enc.c
index 7466b358..05775c86 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-esp.c b/print-esp.c
index fe494a39..426aa845 100644
--- a/print-esp.c
+++ b/print-esp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
#include <stdlib.h>
diff --git a/print-ether.c b/print-ether.c
index 1bccc056..e7a18b3d 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-fddi.c b/print-fddi.c
index 4b5be590..49fd2bbf 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-forces.c b/print-forces.c
index 0f4b2560..40789611 100644
--- a/print-forces.c
+++ b/print-forces.c
@@ -18,7 +18,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-fr.c b/print-fr.c
index 14964466..2df3892b 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-frag6.c b/print-frag6.c
index b8c49fd9..967e6373 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -25,7 +25,7 @@
#ifdef INET6
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "ip6.h"
#include "netdissect.h"
diff --git a/print-ftp.c b/print-ftp.c
index 54790420..93591395 100644
--- a/print-ftp.c
+++ b/print-ftp.c
@@ -20,7 +20,7 @@ static const char rcsid[] _U_ =
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/print-geneve.c b/print-geneve.c
index cbe44a1d..54542c0e 100644
--- a/print-geneve.c
+++ b/print-geneve.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-geonet.c b/print-geonet.c
index 9b61ef20..420ec5f7 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-gre.c b/print-gre.c
index ebdebbf7..89cbe076 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -40,7 +40,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-hsrp.c b/print-hsrp.c
index 5fd923de..b63f3190 100644
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -33,7 +33,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-http.c b/print-http.c
index 4f6a5d23..b18b8861 100644
--- a/print-http.c
+++ b/print-http.c
@@ -20,7 +20,7 @@ static const char rcsid[] _U_ =
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/print-icmp.c b/print-icmp.c
index 7609fc0c..ab3624e2 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-icmp6.c b/print-icmp6.c
index af23cc8b..ce4b1856 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -25,7 +25,7 @@
#ifdef INET6
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-igmp.c b/print-igmp.c
index 6cdcde27..4b8e82dc 100644
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-igrp.c b/print-igrp.c
index 62060c2c..0f36655c 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-ip.c b/print-ip.c
index 0752199c..32304aed 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-ip6.c b/print-ip6.c
index 4a876995..dda9ba35 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-ip6opts.c b/print-ip6opts.c
index 8be9113e..a90ce65b 100644
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -32,7 +32,7 @@
#endif
#ifdef INET6
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "ip6.h"
diff --git a/print-ipcomp.c b/print-ipcomp.c
index cf8de2a1..a6d25257 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
struct ipcomp {
uint8_t comp_nxt; /* Next Header */
diff --git a/print-ipfc.c b/print-ipfc.c
index bf1b3382..6907ba3e 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-ipnet.c b/print-ipnet.c
index 87b1b501..7fb2e77a 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -2,7 +2,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
diff --git a/print-ipx.c b/print-ipx.c
index 3ad45c73..22e613e7 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/print-isakmp.c b/print-isakmp.c
index 158b2584..4b04ccde 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -39,7 +39,7 @@
#undef HAVE_LIBCRYPTO
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-isoclns.c b/print-isoclns.c
index b1b4e215..59a72f15 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -28,7 +28,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-juniper.c b/print-juniper.c
index 91d40b13..9eafd515 100644
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -24,7 +24,7 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-krb.c b/print-krb.c
index ab9ff8dc..a0f26781 100644
--- a/print-krb.c
+++ b/print-krb.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-l2tp.c b/print-l2tp.c
index 0c7d5114..4ce38b2c 100644
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-lane.c b/print-lane.c
index f179c7db..9fb67b88 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-ldp.c b/print-ldp.c
index 51b8d164..ceaca150 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -18,7 +18,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-llc.c b/print-llc.c
index ac930378..2edf6435 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-lldp.c b/print-lldp.c
index 7d4c792b..ac58198f 100644
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/print-lmp.c b/print-lmp.c
index 069a3a33..53e62d18 100644
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-loopback.c b/print-loopback.c
index 1391ba71..9e728656 100644
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -34,7 +34,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-lspping.c b/print-lspping.c
index 779c7f7d..064243ed 100644
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-lwapp.c b/print-lwapp.c
index e75a354f..447ca60a 100644
--- a/print-lwapp.c
+++ b/print-lwapp.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-lwres.c b/print-lwres.c
index d03f6b45..f6252cba 100644
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -31,7 +31,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "nameser.h"
diff --git a/print-m3ua.c b/print-m3ua.c
index 9e37a9fb..40e52389 100644
--- a/print-m3ua.c
+++ b/print-m3ua.c
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-medsa.c b/print-medsa.c
index b4c441e6..a29bf4a0 100644
--- a/print-medsa.c
+++ b/print-medsa.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "ether.h"
diff --git a/print-mobile.c b/print-mobile.c
index a006cb03..885e4dd2 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -40,7 +40,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-mobility.c b/print-mobility.c
index 58dabe11..37410373 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -32,7 +32,7 @@
#endif
#ifdef INET6
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "ip6.h"
#include "netdissect.h"
diff --git a/print-mpcp.c b/print-mpcp.c
index 32fa958d..5bd04669 100644
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-mpls.c b/print-mpls.c
index e2e827ac..504ce197 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -30,7 +30,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-mptcp.c b/print-mptcp.c
index c7ca2f15..95402ef6 100644
--- a/print-mptcp.c
+++ b/print-mptcp.c
@@ -36,7 +36,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-msdp.c b/print-msdp.c
index 6b2dc51a..624ffdda 100644
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -20,7 +20,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-msnlb.c b/print-msnlb.c
index 27828f40..d4f66037 100644
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -30,7 +30,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-nflog.c b/print-nflog.c
index b096e9ec..222d5c3f 100644
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -29,7 +29,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
diff --git a/print-nfs.c b/print-nfs.c
index 7ec799cd..87b6f5a4 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-ntp.c b/print-ntp.c
index e48bd0f9..ffbdd8f6 100644
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -27,7 +27,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#ifdef HAVE_STRFTIME
#include <time.h>
diff --git a/print-null.c b/print-null.c
index 60c9bf04..6e05a138 100644
--- a/print-null.c
+++ b/print-null.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-olsr.c b/print-olsr.c
index 9625728e..97cf59b5 100644
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index a9817599..bc7fa42b 100644
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -60,7 +60,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-openflow.c b/print-openflow.c
index b1315f03..edad2148 100644
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -34,7 +34,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-ospf.c b/print-ospf.c
index c516a90a..6024c640 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-ospf6.c b/print-ospf6.c
index 5032d8bc..69f337ce 100644
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-otv.c b/print-otv.c
index 7f619df3..3490d066 100644
--- a/print-otv.c
+++ b/print-otv.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-pflog.c b/print-pflog.c
index d08ceddb..9815dc56 100644
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -32,7 +32,7 @@
#include <net/pfvar.h>
#include <net/if_pflog.h>
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-pgm.c b/print-pgm.c
index 5fa1fcb9..6b02d34e 100644
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-pim.c b/print-pim.c
index 149f027a..f023207d 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-pktap.c b/print-pktap.c
index 90d50619..a49421bb 100644
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-ppi.c b/print-ppi.c
index b40acd00..ddf674d2 100644
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -6,7 +6,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-ppp.c b/print-ppp.c
index b245625f..078f6a56 100644
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -33,7 +33,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#ifdef __bsdi__
#include <net/slcompress.h>
diff --git a/print-pppoe.c b/print-pppoe.c
index 90c9a2fe..a6c1c625 100644
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-pptp.c b/print-pptp.c
index 58b1c56c..5083015d 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-radius.c b/print-radius.c
index 83e432ff..c30e24cb 100644
--- a/print-radius.c
+++ b/print-radius.c
@@ -56,7 +56,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-raw.c b/print-raw.c
index 83f66b48..a89af5bf 100644
--- a/print-raw.c
+++ b/print-raw.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
diff --git a/print-rip.c b/print-rip.c
index 9fbe7bea..f9272d48 100644
--- a/print-rip.c
+++ b/print-rip.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/print-ripng.c b/print-ripng.c
index 76468077..a9edfb48 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -25,7 +25,7 @@
#ifdef INET6
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index 1512fefc..d4fd60d8 100644
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-rrcp.c b/print-rrcp.c
index c4d43757..31551475 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-rsvp.c b/print-rsvp.c
index 06cd215f..74b6358b 100644
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-rt6.c b/print-rt6.c
index 0f944e7b..9b87777f 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -25,7 +25,7 @@
#ifdef INET6
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-rtsp.c b/print-rtsp.c
index 9f4a3039..7b6edb63 100644
--- a/print-rtsp.c
+++ b/print-rtsp.c
@@ -20,7 +20,7 @@ static const char rcsid[] _U_ =
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/print-rx.c b/print-rx.c
index 9657d2bf..322e0c0c 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -39,7 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-sctp.c b/print-sctp.c
index bde78be5..aebd3c22 100644
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -37,7 +37,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-sflow.c b/print-sflow.c
index f3d6ff5f..7eecf0a0 100644
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-sip.c b/print-sip.c
index 836fb9e2..cbe298c6 100644
--- a/print-sip.c
+++ b/print-sip.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-sl.c b/print-sl.c
index 186516f9..b69a07d5 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-sll.c b/print-sll.c
index 5003a3dd..1d1a3d10 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-slow.c b/print-slow.c
index c289f118..7e83d166 100644
--- a/print-slow.c
+++ b/print-slow.c
@@ -22,7 +22,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-smb.c b/print-smb.c
index d02de99e..7330d6b5 100644
--- a/print-smb.c
+++ b/print-smb.c
@@ -10,7 +10,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-smtp.c b/print-smtp.c
index fe0bbc2f..56109bdf 100644
--- a/print-smtp.c
+++ b/print-smtp.c
@@ -15,7 +15,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/print-snmp.c b/print-snmp.c
index 43464c18..8e7af5f5 100644
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -60,7 +60,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-stp.c b/print-stp.c
index 189def7d..47089e52 100644
--- a/print-stp.c
+++ b/print-stp.c
@@ -13,7 +13,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/print-sunatm.c b/print-sunatm.c
index eef9c035..fad2859f 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -34,7 +34,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
struct mbuf;
struct rtentry;
diff --git a/print-sunrpc.c b/print-sunrpc.c
index 82a2f0d6..771602d2 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -38,7 +38,7 @@
*/
#undef _XOPEN_SOURCE_EXTENDED
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#if defined(HAVE_GETRPCBYNUMBER) && defined(HAVE_RPC_RPC_H)
#include <rpc/rpc.h>
diff --git a/print-symantec.c b/print-symantec.c
index 679235f9..15653abf 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-syslog.c b/print-syslog.c
index 9be3b52a..08407d53 100644
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -18,7 +18,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-tcp.c b/print-tcp.c
index 9c5ffbdc..a97fc1ca 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -32,7 +32,7 @@ __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdlib.h>
#include <string.h>
diff --git a/print-telnet.c b/print-telnet.c
index ae29b474..e01e91b8 100644
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -49,7 +49,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
diff --git a/print-tftp.c b/print-tftp.c
index c77297d8..e7201ebd 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-timed.c b/print-timed.c
index dcf01db0..a1cd89e3 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-tipc.c b/print-tipc.c
index e080c4f4..2809d072 100644
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "ether.h"
diff --git a/print-token.c b/print-token.c
index e213f6fe..6f9950db 100644
--- a/print-token.c
+++ b/print-token.c
@@ -28,7 +28,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/print-udld.c b/print-udld.c
index 4ff889e8..9d6c19bd 100644
--- a/print-udld.c
+++ b/print-udld.c
@@ -22,7 +22,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-udp.c b/print-udp.c
index b59675f0..21102391 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-usb.c b/print-usb.c
index 7f453e33..52231a02 100644
--- a/print-usb.c
+++ b/print-usb.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
diff --git a/print-vjc.c b/print-vjc.c
index 85b500eb..0f37924c 100644
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "slcompress.h"
diff --git a/print-vqp.c b/print-vqp.c
index 8305d5d2..76140113 100644
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -21,7 +21,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-vrrp.c b/print-vrrp.c
index f29272ee..a6e23143 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -27,7 +27,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-vtp.c b/print-vtp.c
index 3b2c95c5..cba34a6c 100644
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-vxlan.c b/print-vxlan.c
index fd12d2d3..b9c87e20 100644
--- a/print-vxlan.c
+++ b/print-vxlan.c
@@ -17,7 +17,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print-wb.c b/print-wb.c
index 23db3de5..6ad912ed 100644
--- a/print-wb.c
+++ b/print-wb.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "addrtoname.h"
diff --git a/print-zephyr.c b/print-zephyr.c
index 90bd52b8..71ca9e3e 100644
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
diff --git a/print-zeromq.c b/print-zeromq.c
index 410241e4..0b1cd94f 100644
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -32,7 +32,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "extract.h"
diff --git a/print.c b/print.c
index 876d09c6..c055e3c7 100644
--- a/print.c
+++ b/print.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "netdissect.h"
#include "interface.h"
diff --git a/setsignal.c b/setsignal.c
index 1bcc032e..4d93cebf 100644
--- a/setsignal.c
+++ b/setsignal.c
@@ -23,7 +23,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <signal.h>
#ifdef HAVE_SIGACTION
diff --git a/signature.c b/signature.c
index 84a3a64d..f27a6a52 100644
--- a/signature.c
+++ b/signature.c
@@ -19,7 +19,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
diff --git a/smbutil.c b/smbutil.c
index 06354fb4..8e5e5087 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -10,7 +10,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tcpdump.c b/tcpdump.c
index c7cf1755..1e8638a3 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -54,7 +54,7 @@ The Regents of the University of California. All rights reserved.\n";
#endif
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#ifdef _WIN32
#include "w32_fzs.h"
diff --git a/util-print.c b/util-print.c
index 32eca56f..5b6e3731 100644
--- a/util-print.c
+++ b/util-print.c
@@ -39,7 +39,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <sys/stat.h>
diff --git a/util.c b/util.c
index 4a20a4b5..a6f520e2 100644
--- a/util.c
+++ b/util.c
@@ -39,7 +39,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <sys/stat.h>
diff --git a/win32/src/ether_ntohost.c b/win32/src/ether_ntohost.c
index ae988f78..0217b195 100644
--- a/win32/src/ether_ntohost.c
+++ b/win32/src/ether_ntohost.c
@@ -27,7 +27,7 @@
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include "ether.h"
#include "interface.h"