diff options
author | John Thacker <johnthacker@gmail.com> | 2023-06-06 21:25:06 -0400 |
---|---|---|
committer | John Thacker <johnthacker@gmail.com> | 2023-06-08 11:05:42 +0000 |
commit | bda350d8fdab87c4cb54358abb44a0efa6cc5968 (patch) | |
tree | 10d7756441f34a85b3ae0bafd9c9828f06bf8b02 /epan/dissectors | |
parent | a82d5b56d10ff0c25141b3b6ff9f46a7a62c426b (diff) |
Don't have every dissector include wtap.h
The header for frame_data can forward declare an incomplete type
for wtap_rec, since it only takes a pointer to it.
This prevents every dissector from automatically including
wiretap/wtap.h
Add wiretap/wtap.h to some dissectors that need it.
Remove it from some other dissectors that had the explicit include
but don't actually need it.
A few other dissectors actually need wsutil/inet_addr.h but were
getting that via wtap.h - include what they actually need.
This reduces the number of files that are recompiled when
wiretap/wtap.h is touched from ~2500 to ~800.
Note that most of the dissectors that still include wiretap/wtap.h
really only need to use a WTAP_ENCAP_ value, and most of the rest
just need a pseudoheader. Those could be moved into another wiretap
include to further reduce recompilation.
Related to #19127
Diffstat (limited to 'epan/dissectors')
50 files changed, 35 insertions, 40 deletions
diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c index 31e010612b..bca31e2395 100644 --- a/epan/dissectors/file-btsnoop.c +++ b/epan/dissectors/file-btsnoop.c @@ -15,7 +15,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> - +#include <wiretap/wtap.h> static dissector_handle_t btsnoop_handle; static dissector_handle_t hci_h1_handle; diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index d8e75fe75d..2c5ee342fb 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -25,10 +25,9 @@ #include <epan/tap.h> #include <epan/expert.h> #include <epan/proto_data.h> - -#include <wsutil/str_util.h> - #include <epan/color_filters.h> +#include <wiretap/wtap.h> +#include <wsutil/str_util.h> #include "file-file.h" diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c index 9f094f093b..12a7e57873 100644 --- a/epan/dissectors/file-jpeg.c +++ b/epan/dissectors/file-jpeg.c @@ -26,7 +26,7 @@ #include <epan/packet.h> #include <epan/expert.h> - +#include <wiretap/wtap.h> void proto_register_jfif(void); void proto_reg_handoff_jfif(void); diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c index ce6669a862..63a46b6a99 100644 --- a/epan/dissectors/file-mp4.c +++ b/epan/dissectors/file-mp4.c @@ -25,6 +25,7 @@ #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> +#include <wiretap/wtap.h> #define MAKE_TYPE_VAL(a, b, c, d) ((a)<<24 | (b)<<16 | (c)<<8 | (d)) diff --git a/epan/dissectors/file-rfc7468.c b/epan/dissectors/file-rfc7468.c index 481df0e560..85c4397257 100644 --- a/epan/dissectors/file-rfc7468.c +++ b/epan/dissectors/file-rfc7468.c @@ -11,6 +11,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> void proto_register_rfc7468(void); void proto_reg_handoff_rfc7468(void); diff --git a/epan/dissectors/file-rtpdump.c b/epan/dissectors/file-rtpdump.c index d42001f135..694dd6f69f 100644 --- a/epan/dissectors/file-rtpdump.c +++ b/epan/dissectors/file-rtpdump.c @@ -20,7 +20,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <wsutil/strtoi.h> - +#include <wsutil/inet_addr.h> void proto_register_rtpdump(void); void proto_reg_handoff_rtpdump(void); diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 652adb094f..83a597d304 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -15,7 +15,9 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/tap.h> +#include <wiretap/wtap.h> #include "packet-actrace.h" + #define UDP_PORT_ACTRACE 2428 /* Not IANA registered */ #define NOT_ACTRACE 0 diff --git a/epan/dissectors/packet-alp.c b/epan/dissectors/packet-alp.c index 02a531b1ca..4d7bcbedf5 100644 --- a/epan/dissectors/packet-alp.c +++ b/epan/dissectors/packet-alp.c @@ -18,6 +18,7 @@ #include <stdbool.h> #include <epan/packet.h> #include <epan/to_str.h> +#include <wiretap/wtap.h> void proto_reg_handoff_alp(void); void proto_register_alp(void); diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 21469afe95..c774f819be 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -13,7 +13,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include <epan/address_types.h> #include <epan/arcnet_pids.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index bb333828f0..561defeb2d 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -27,7 +27,6 @@ #include <epan/to_str.h> #include <epan/expert.h> #include <epan/dissectors/packet-llc.h> -#include <wiretap/wtap.h> #include <epan/capture_dissectors.h> #include "packet-atalk.h" #include "packet-afp.h" diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c index c84a992093..abb442da11 100644 --- a/epan/dissectors/packet-ax25-kiss.c +++ b/epan/dissectors/packet-ax25-kiss.c @@ -101,7 +101,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> #include <epan/prefs.h> -#include <wiretap/wtap.h> #define STRLEN 80 diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index 6ec4d78363..d700ade6d0 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -34,7 +34,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include <epan/to_str.h> #include <epan/xdlc.h> #include <epan/ax25_pids.h> diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 4e1947554b..da81d2c184 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -24,7 +24,6 @@ #include <epan/decode_as.h> #include <epan/proto_data.h> #include <epan/reassemble.h> - #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-btlmp.c b/epan/dissectors/packet-btlmp.c index 7d81cd9a15..9015088c3d 100644 --- a/epan/dissectors/packet-btlmp.c +++ b/epan/dissectors/packet-btlmp.c @@ -15,7 +15,6 @@ #include <epan/packet.h> #include <epan/expert.h> -#include <wiretap/wtap.h> #include "packet-bluetooth.h" #include "packet-btbredr_rf.h" diff --git a/epan/dissectors/packet-dlt.c b/epan/dissectors/packet-dlt.c index 9e213f1d46..4e850d4207 100644 --- a/epan/dissectors/packet-dlt.c +++ b/epan/dissectors/packet-dlt.c @@ -31,6 +31,7 @@ #include <epan/to_str.h> #include <epan/uat.h> +#include <wiretap/wtap.h> #include <epan/dissectors/packet-dlt.h> diff --git a/epan/dissectors/packet-docsis.c b/epan/dissectors/packet-docsis.c index 58f53efb92..648295318e 100644 --- a/epan/dissectors/packet-docsis.c +++ b/epan/dissectors/packet-docsis.c @@ -44,7 +44,6 @@ #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/addr_resolv.h> -#include <wiretap/wtap.h> #include <epan/exceptions.h> #include <epan/crc16-tvb.h> #include <epan/crc32-tvb.h> diff --git a/epan/dissectors/packet-dpauxmon.c b/epan/dissectors/packet-dpauxmon.c index f0a4315e35..d1f47c4950 100644 --- a/epan/dissectors/packet-dpauxmon.c +++ b/epan/dissectors/packet-dpauxmon.c @@ -10,12 +10,13 @@ */ #include <config.h> -#include <conversation.h> - -#include "packet-dpaux.h" #include <epan/packet.h> +#include <epan/conversation.h> #include <epan/proto_data.h> +#include <wiretap/wtap.h> + +#include "packet-dpaux.h" enum { DPAUXMON_DATA = 0x00, diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index bbab7e2206..193fbcf006 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -16,12 +16,14 @@ #include <epan/ipproto.h> #include <epan/to_str.h> #include <wsutil/str_util.h> +#include <wiretap/wtap.h> +#include <wiretap/erf_record.h> + #include "packet-erf.h" #include "packet-ptp.h" /* */ -#include "wiretap/erf_record.h" void proto_register_erf(void); void proto_reg_handoff_erf(void); diff --git a/epan/dissectors/packet-etw.c b/epan/dissectors/packet-etw.c index 0f80520ef1..d46c9f8b32 100644 --- a/epan/dissectors/packet-etw.c +++ b/epan/dissectors/packet-etw.c @@ -17,6 +17,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> void proto_register_etw(void); void proto_reg_handoff_etw(void); diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 171f01bc89..7cfb34a754 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -28,7 +28,6 @@ #include <epan/expert.h> #include <epan/conversation.h> #include <epan/arptypes.h> -#include <wiretap/wtap.h> #include "packet-llc.h" #include "packet-chdlc.h" diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index bb569f9de5..fa4fac8aa4 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -24,7 +24,6 @@ #include <epan/prefs.h> #include <epan/to_str.h> #include <epan/sequence_analysis.h> -#include <wiretap/wtap.h> #include <epan/tap.h> #include <epan/expert.h> #include <wsutil/wsgcrypt.h> diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index dc0c19ccf4..377d0ecb26 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -36,6 +36,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/dissectors/packet-gsm_rlcmac.h> +#include <wiretap/wtap.h> #include "packet-gsmtap.h" #include "packet-lapdm.h" diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index e3ed45944e..2fe05f90e3 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -15,7 +15,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> -#include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c index ff92a73de6..d5d5e68e7c 100644 --- a/epan/dissectors/packet-i2c.c +++ b/epan/dissectors/packet-i2c.c @@ -16,7 +16,6 @@ #include <epan/capture_dissectors.h> #include <epan/prefs.h> #include <epan/decode_as.h> -#include <wiretap/wtap.h> void proto_register_i2c(void); void proto_reg_handoff_i2c(void); diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index b8eec55f94..99a77df0f4 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -17,7 +17,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include <wsutil/pint.h> #include <wsutil/802_11-utils.h> #include "packet-ieee80211.h" diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index e5d07e3304..7640eb3219 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -14,7 +14,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include <wsutil/pint.h> #include <wsutil/802_11-utils.h> diff --git a/epan/dissectors/packet-indigocare-icall.c b/epan/dissectors/packet-indigocare-icall.c index 65b0b8f0e1..51593f790d 100644 --- a/epan/dissectors/packet-indigocare-icall.c +++ b/epan/dissectors/packet-indigocare-icall.c @@ -13,7 +13,6 @@ #include "config.h" #include <range.h> -#include <wiretap/wtap.h> #include <epan/packet.h> #include <epan/expert.h> #include <wsutil/strtoi.h> diff --git a/epan/dissectors/packet-indigocare-netrix.c b/epan/dissectors/packet-indigocare-netrix.c index b68e49a737..e5f3a867cf 100644 --- a/epan/dissectors/packet-indigocare-netrix.c +++ b/epan/dissectors/packet-indigocare-netrix.c @@ -13,7 +13,6 @@ #include "config.h" #include <range.h> -#include <wiretap/wtap.h> #include <epan/packet.h> #include <epan/expert.h> #include <wsutil/strtoi.h> diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index d4ebc4013d..087fec7962 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -21,6 +21,7 @@ #include <epan/show_exception.h> #include <epan/decode_as.h> #include <wiretap/erf_record.h> +#include <wiretap/wtap.h> #include "packet-infiniband.h" diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c index f9995b8916..e9bee2a808 100644 --- a/epan/dissectors/packet-ipfc.c +++ b/epan/dissectors/packet-ipfc.c @@ -16,7 +16,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include <epan/to_str.h> #include "packet-llc.h" diff --git a/epan/dissectors/packet-knxip_decrypt.c b/epan/dissectors/packet-knxip_decrypt.c index c881233eee..ddb06d28f2 100644 --- a/epan/dissectors/packet-knxip_decrypt.c +++ b/epan/dissectors/packet-knxip_decrypt.c @@ -14,12 +14,13 @@ #define WS_LOG_DOMAIN "packet-knxip" #include <wsutil/file_util.h> -#include "proto.h" +#include <epan/proto.h> #include "packet-knxip_decrypt.h" #include <epan/wmem_scopes.h> #include <wsutil/wsgcrypt.h> #include <wsutil/strtoi.h> #include <wsutil/wslog.h> +#include <wsutil/inet_addr.h> #define TEXT_BUFFER_SIZE 128 diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 13d418de55..df0ce1be7c 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -13,7 +13,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/oui.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-log3gpp.c b/epan/dissectors/packet-log3gpp.c index 6109320ac7..995c509f00 100644 --- a/epan/dissectors/packet-log3gpp.c +++ b/epan/dissectors/packet-log3gpp.c @@ -16,7 +16,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/proto_data.h> - +#include <wiretap/wtap.h> #include <wsutil/strtoi.h> #include "packet-mac-lte.h" diff --git a/epan/dissectors/packet-loratap.c b/epan/dissectors/packet-loratap.c index 12e1d197bf..9f377c89ab 100644 --- a/epan/dissectors/packet-loratap.c +++ b/epan/dissectors/packet-loratap.c @@ -15,7 +15,6 @@ */ #include "config.h" -#include <wiretap/wtap.h> #include <epan/packet.h> #include <epan/capture_dissectors.h> #include <epan/decode_as.h> diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 49f25aaa4c..98ed2ddd96 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -42,6 +42,7 @@ #include <epan/to_str.h> #include <epan/strutil.h> #include <epan/ipproto.h> +#include <wiretap/wtap.h> #include "packet-gsm_a_common.h" #include "packet-gsm_map.h" diff --git a/epan/dissectors/packet-messageanalyzer.c b/epan/dissectors/packet-messageanalyzer.c index 3b97ab871c..cd1c6acec2 100644 --- a/epan/dissectors/packet-messageanalyzer.c +++ b/epan/dissectors/packet-messageanalyzer.c @@ -16,7 +16,6 @@ #include <epan/expert.h> #include <wsutil/inet_ipv6.h> #include <wsutil/utf8_entities.h> -#include <wiretap/wtap.h> #include "packet-netmon.h" #include "packet-windows-common.h" diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 687732ad80..4ab8394600 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -128,7 +128,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/ipproto.h> -#include <wiretap/wtap.h> #include <epan/sminmpec.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 98c32e050c..6fd4827bed 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -20,7 +20,6 @@ #include "packet-ppp.h" #include <epan/etypes.h> #include <epan/aftypes.h> -#include <wiretap/wtap.h> void proto_register_null(void); void proto_reg_handoff_null(void); diff --git a/epan/dissectors/packet-pcap_pktdata.c b/epan/dissectors/packet-pcap_pktdata.c index ba0e83fb31..0e4fcd3ef1 100644 --- a/epan/dissectors/packet-pcap_pktdata.c +++ b/epan/dissectors/packet-pcap_pktdata.c @@ -16,7 +16,6 @@ #include <epan/packet.h> #include <epan/expert.h> -#include <wiretap/wtap.h> #include <wiretap/pcap-encap.h> #include <epan/dissectors/packet-pcap_pktdata.h> diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 7b46a8f101..ec409e033e 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -14,7 +14,6 @@ #include <epan/packet.h> #include <epan/capture_dissectors.h> -#include <wiretap/wtap.h> #include "packet-ip.h" #include "packet-ppp.h" diff --git a/epan/dissectors/packet-snort.c b/epan/dissectors/packet-snort.c index fbf56f22c4..06bdea345f 100644 --- a/epan/dissectors/packet-snort.c +++ b/epan/dissectors/packet-snort.c @@ -36,6 +36,7 @@ #include <epan/expert.h> #include <wsutil/file_util.h> #include <wsutil/report_message.h> +#include <wiretap/wtap.h> #include "packet-snort-config.h" diff --git a/epan/dissectors/packet-solaredge.c b/epan/dissectors/packet-solaredge.c index 577d926ea3..e9bedf98b5 100644 --- a/epan/dissectors/packet-solaredge.c +++ b/epan/dissectors/packet-solaredge.c @@ -17,7 +17,6 @@ #include <epan/prefs.h> #include <epan/strutil.h> #include <range.h> -#include <wiretap/wtap.h> #include <wsutil/crc16-plain.h> #include <wsutil/pint.h> #include <wsutil/wsgcrypt.h> diff --git a/epan/dissectors/packet-srt.c b/epan/dissectors/packet-srt.c index 4ef92148a2..8b7352c581 100644 --- a/epan/dissectors/packet-srt.c +++ b/epan/dissectors/packet-srt.c @@ -23,11 +23,12 @@ */ #include <config.h> -#include <wsutil/str_util.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/conversation.h> +#include <wsutil/str_util.h> +#include <wsutil/inet_addr.h> /* Prototypes */ void proto_reg_handoff_srt(void); diff --git a/epan/dissectors/packet-systemd-journal.c b/epan/dissectors/packet-systemd-journal.c index de4b901e8e..afc9bdd6a4 100644 --- a/epan/dissectors/packet-systemd-journal.c +++ b/epan/dissectors/packet-systemd-journal.c @@ -29,7 +29,7 @@ #include <epan/exceptions.h> #include <epan/packet.h> #include <epan/expert.h> - +#include <wiretap/wtap.h> #include <wsutil/strtoi.h> #include "packet-syslog.h" diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 39d17b2a80..89ab0f2045 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -21,7 +21,6 @@ #include "packet-llc.h" #include "packet-sflow.h" #include <epan/prefs.h> -#include <wiretap/wtap.h> void proto_register_tr(void); void proto_reg_handoff_tr(void); diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index 0e5a962986..fe52439401 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/epan/dissectors/packet-uaudp.c @@ -16,6 +16,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <wsutil/report_message.h> +#include <wsutil/inet_addr.h> #include "packet-uaudp.h" diff --git a/epan/dissectors/packet-uci.c b/epan/dissectors/packet-uci.c index a432cb9823..5a667418f2 100644 --- a/epan/dissectors/packet-uci.c +++ b/epan/dissectors/packet-uci.c @@ -24,6 +24,7 @@ #include <epan/conversation.h> #include <epan/proto_data.h> #include <epan/dissectors/packet-tcp.h> +#include <wiretap/wtap.h> void proto_reg_handoff_uci(void); void proto_register_uci(void); diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c index 309cb0e8fa..ca8a9559b1 100644 --- a/epan/dissectors/packet-usbll.c +++ b/epan/dissectors/packet-usbll.c @@ -22,6 +22,7 @@ #include <epan/to_str.h> #include <epan/proto_data.h> #include <epan/reassemble.h> +#include <wiretap/wtap.h> #include "packet-usb.h" void proto_register_usbll(void); diff --git a/epan/dissectors/packet-vpp.c b/epan/dissectors/packet-vpp.c index 3b92cc6745..8e7525fdd2 100644 --- a/epan/dissectors/packet-vpp.c +++ b/epan/dissectors/packet-vpp.c @@ -20,6 +20,7 @@ #include <epan/nlpid.h> #include <epan/etypes.h> #include <epan/ws_printf.h> +#include <wiretap/wtap.h> void proto_register_vpp(void); void proto_reg_handoff_vpp(void); diff --git a/epan/dissectors/packet-zbncp.c b/epan/dissectors/packet-zbncp.c index 3c78bbf091..1c7bcfe15a 100644 --- a/epan/dissectors/packet-zbncp.c +++ b/epan/dissectors/packet-zbncp.c @@ -11,10 +11,11 @@ #include <config.h> #include <epan/packet.h> +#include <epan/conversation.h> +#include <wiretap/wtap.h> #include "packet-ieee802154.h" #include "packet-zbncp.h" -#include "conversation.h" void proto_reg_handoff_zbncp(void); void proto_register_zbncp(void); |