diff options
101 files changed, 134 insertions, 8 deletions
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index fd5c3d775d..28b398230b 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -39,6 +39,7 @@ #include <epan/exceptions.h> #include <epan/strutil.h> #include <wsutil/pint.h> +#include <epan/addr_resolv.h> #include <string.h> diff --git a/capture_info.c b/capture_info.c index b792845fb5..ad1028ad3b 100644 --- a/capture_info.c +++ b/capture_info.c @@ -33,6 +33,8 @@ #include <epan/prefs.h> /* XXX - try to remove this later */ +#include <wiretap/wtap.h> + #include "capture_info.h" #include <epan/dissectors/packet-ap1394.h> diff --git a/epan/column.h b/epan/column.h index d145c9901a..5a26edf8ee 100644 --- a/epan/column.h +++ b/epan/column.h @@ -26,6 +26,7 @@ #define __COLUMN_H__ #include "ws_symbol_export.h" +#include <epan/column-info.h> #ifdef __cplusplus extern "C" { diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 8ff36ecff8..8198a53740 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -32,6 +32,7 @@ #include <epan/reassemble.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> +#include <epan/addr_resolv.h> #include <epan/wmem/wmem.h> #include "packet-ipv6.h" #include "packet-ieee802154.h" diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index e3c43c2120..b868c2e01c 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -46,6 +46,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/ipv6-utils.h> +#include <epan/to_str.h> /* Forward declarations */ void proto_register_acn(void); diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index a05600c483..39530686be 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -29,6 +29,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include <epan/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 7fb091ae22..49ca186914 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -34,6 +34,7 @@ #include <epan/packet.h> #include <epan/strutil.h> +#include <epan/to_str.h> #include "packet-tcp.h" #include "packet-aim.h" diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 6c6e63e985..3f940feff9 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -51,6 +51,7 @@ #include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/tfs.h> +#include <epan/to_str.h> #include "packet-mtp3.h" #include "packet-rtp.h" diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index f6530eb748..9137efa8dd 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -37,6 +37,8 @@ #include <epan/arcnet_pids.h> #include <epan/atalk-utils.h> #include <epan/conversation.h> +#include <epan/to_str.h> +#include <wiretap/wtap.h> #include <epan/prefs.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 1c7943f220..c2d3cf19b4 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -75,6 +75,7 @@ #include <epan/asn1.h> #include <epan/wmem/wmem.h> #include <epan/decode_as.h> +#include <wiretap/wtap.h> #include "packet-ber.h" diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index c56d758c9c..b4a9454e40 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -67,6 +67,7 @@ #include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/etypes.h> +#include <epan/to_str.h> #include <packet-ip.h> void proto_register_bgp(void); diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 06962b769d..95de9c28bf 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -34,6 +34,7 @@ #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> void proto_register_bt_dht(void); void proto_reg_handoff_bt_dht(void); diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 6970cbe9c0..56aaa4dd0f 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -33,6 +33,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/addr_resolv.h> #include <epan/wmem/wmem.h> #include "packet-bluetooth-hci.h" diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 018d54edce..d5f71d0ef0 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -39,6 +39,7 @@ #include <epan/ip_opts.h> #include <epan/wmem/wmem.h> #include <epan/strutil.h> +#include <epan/to_str.h> #include "packet-btsdp.h" #include "packet-btl2cap.h" diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index 59860ffaef..98727ac0da 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -31,6 +31,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <epan/to_str.h> void proto_register_ccsds(void); void proto_reg_handoff_ccsds(void); diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 3b003d1aee..b13ac428cf 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -37,6 +37,7 @@ #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> /* Forward declaration */ void proto_register_cigi(void); diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 376f9e8385..42711aa07e 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -34,6 +34,7 @@ #include <epan/expert.h> #include <epan/stats_tree.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> #define STR_NONNULL(str) ((str) ? (str) : "(null)") diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index 7d31975210..9056f5d257 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -33,6 +33,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include "packet-data.h" /* proto_data cannot be static because it's referenced in the diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 74f809cb87..ddedeae8d9 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -43,6 +43,8 @@ #include <epan/strutil.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/to_str.h> + #include "packet-arp.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 6b35b8fe91..e44b7c2cf4 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -61,6 +61,7 @@ #include <epan/arptypes.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include <epan/wmem/wmem.h> #include "packet-tcp.h" #include "packet-arp.h" diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 38ed175873..c1657e85f2 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -43,6 +43,7 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/conversation.h> #include <epan/expert.h> +#include <epan/to_str.h> /* * See diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index a8b2c9fbfc..1c8c6b386c 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -28,9 +28,11 @@ #include "config.h" #include <glib.h> -#include <epan/packet.h> +#include <epan/packet.h> +#include <epan/to_str.h> #include <epan/prefs.h> + #include "packet-tcp.h" #include "packet-afp.h" diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index df17a66fde..b47e3995b8 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -56,6 +56,7 @@ #include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include <epan/asn1.h> #include <epan/dissectors/packet-x509af.h> #include <epan/wmem/wmem.h> diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 99e880ce5b..d3a531b124 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -36,6 +36,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include <epan/aftypes.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 55b50df774..b4e7e8faf9 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -32,6 +32,8 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> +#include <epan/to_str.h> +#include <wiretap/wtap.h> #include <epan/reassemble.h> #include <epan/conversation.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 752fca46dd..76746b351b 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -30,6 +30,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include "packet-fc.h" void proto_register_fcip(void); diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index b832852bb8..7bc6d57231 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.c @@ -35,6 +35,7 @@ #include <epan/etypes.h> #include <epan/expert.h> #include <epan/wmem/wmem.h> +#include <epan/addr_resolv.h> #include <errno.h> #include "packet-infiniband.h" #include "packet-fc.h" diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 9dffe606d9..31c0757e24 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -37,8 +37,11 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> + #include "packet-llc.h" #include "packet-chdlc.h" #include "packet-eth.h" diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index c46202d5db..ac0043234b 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -39,6 +39,8 @@ #include <epan/show_exception.h> #include <epan/timestamp.h> #include <epan/prefs.h> +#include <epan/to_str.h> +#include <wiretap/wtap.h> #include <epan/tap.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index 6da3d15873..a3046ba533 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -29,6 +29,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> void proto_register_llcgprs(void); void proto_reg_handoff_llcgprs(void); diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index ba27a60870..2523ef4340 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -44,6 +44,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> +#include <epan/to_str.h> #include <epan/wmem/wmem.h> #include "packet-gsm_sms.h" diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index 77f0f16633..5d736ee143 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -27,8 +27,10 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include <epan/circuit.h> void proto_register_gsm_um(void); diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 31daa40490..aa83b2e4de 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -62,6 +62,7 @@ #include <epan/sminmpec.h> #include <epan/asn1.h> #include <epan/tap.h> +#include <epan/to_str.h> #include "packet-ppp.h" #include "packet-radius.h" #include "packet-bssap.h" diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 4710c1c575..1d46692baf 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -47,6 +47,7 @@ #include <epan/exceptions.h> #include <epan/strutil.h> #include <wsutil/pint.h> +#include <epan/addr_resolv.h> #include <string.h> @@ -216,7 +217,7 @@ typedef enum _IndicationMessage_enum { } IndicationMessage_enum; /*--- End of included file: packet-h245-val.h ---*/ -#line 89 "../../asn1/h245/packet-h245-template.c" +#line 90 "../../asn1/h245/packet-h245-template.c" static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, @@ -1927,7 +1928,7 @@ static int hf_h245_encrypted = -1; /* OCTET_STRING */ static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ /*--- End of included file: packet-h245-hf.c ---*/ -#line 393 "../../asn1/h245/packet-h245-template.c" +#line 394 "../../asn1/h245/packet-h245-template.c" /* Initialize the subtree pointers */ static int ett_h245 = -1; @@ -2428,7 +2429,7 @@ static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; /*--- End of included file: packet-h245-ett.c ---*/ -#line 398 "../../asn1/h245/packet-h245-template.c" +#line 399 "../../asn1/h245/packet-h245-template.c" /* Forward declarations */ static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -14495,7 +14496,7 @@ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-h245-fn.c ---*/ -#line 407 "../../asn1/h245/packet-h245-template.c" +#line 408 "../../asn1/h245/packet-h245-template.c" static void dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -20189,7 +20190,7 @@ void proto_register_h245(void) { NULL, HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ -#line 488 "../../asn1/h245/packet-h245-template.c" +#line 489 "../../asn1/h245/packet-h245-template.c" }; /* List of subtrees */ @@ -20692,7 +20693,7 @@ void proto_register_h245(void) { &ett_h245_MobileMultilinkReconfigurationIndication, /*--- End of included file: packet-h245-ettarr.c ---*/ -#line 495 "../../asn1/h245/packet-h245-template.c" +#line 496 "../../asn1/h245/packet-h245-template.c" }; module_t *h245_module; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 1a9529e8ea..58cdd50fc6 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -43,6 +43,7 @@ #include <epan/strutil.h> #include <wsutil/base64.h> #include <epan/stats_tree.h> +#include <epan/to_str.h> #include <epan/req_resp_hdrs.h> #include "packet-http.h" diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c index 87358e46f6..61cfa56171 100644 --- a/epan/dissectors/packet-i2c.c +++ b/epan/dissectors/packet-i2c.c @@ -31,6 +31,7 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include "packet-i2c.h" #include "packet-hdcp.h" diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 6f04211e0c..1a081606dc 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -44,6 +44,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/in_cksum.h> +#include <epan/to_str.h> #include "packet-ip.h" #include "packet-icmp.h" diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index f3ccb64262..af721644f9 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -30,13 +30,17 @@ #include <string.h> #include <glib.h> + #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include <epan/etypes.h> #include <epan/show_exception.h> +#include <epan/to_str.h> + #include "packet-infiniband.h" void proto_register_infiniband(void); diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index d9a3604ef6..06ffa5ddf2 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -30,6 +30,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/addr_resolv.h> #include <epan/conversation.h> #include <epan/wmem/wmem.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index e3bda33933..b668f6da10 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -57,6 +57,7 @@ #include <epan/dissectors/packet-isakmp.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/to_str.h> #ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index 8a71b6ba0d..676002d2ea 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -25,8 +25,10 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include <epan/circuit.h> void proto_register_isdn(void); diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 6db4cd4e72..271800b22c 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -36,9 +36,10 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include "packet-tcp.h" #include <epan/prefs.h> +#include "packet-tcp.h" + void proto_register_isns(void); void proto_reg_handoff_isns(void); diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 3e5efd23b2..286cb55c0b 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -61,6 +61,7 @@ #include <epan/wmem/wmem.h> #include <epan/circuit.h> #include <epan/reassemble.h> +#include <epan/to_str.h> #include <packet-mtp3.h> void proto_register_isup(void); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 28d058bc58..63f9f3d0fb 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -45,6 +45,7 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> #include "packet-jxta.h" diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index e100ad1cfc..85fb437412 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -33,6 +33,7 @@ #include <wsutil/pint.h> #include <epan/conversation.h> #include <prefs.h> +#include <wiretap/wtap.h> #include <epan/emem.h> #include <epan/wmem/wmem.h> #include <epan/uat.h> diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 7f72ee9682..5a87155357 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -31,6 +31,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> +#include <epan/to_str.h> #include <epan/strutil.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index cef006940b..136d304e9f 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -46,6 +46,7 @@ #include <epan/xdlc.h> #include <epan/crc16-tvb.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include <epan/lapd_sapi.h> #include <epan/expert.h> #include <epan/wmem/wmem.h> diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 26948670ad..ebd9a80a0d 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -55,6 +55,7 @@ #include <epan/etypes.h> #include <epan/ipproto.h> #include <epan/expert.h> +#include <epan/to_str.h> #include "packet-ip.h" #include "packet-rsvp.h" diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index e74eeb892c..b3c55fcce4 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -32,6 +32,8 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> + #include "packet-dns.h" void proto_register_lwres(void); diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index 24aae45cdb..3a01711ac0 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -34,6 +34,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> void proto_register_mactelnet(void); void proto_reg_handoff_mactelnet(void); diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index d17493ab20..26594d3ad4 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -37,6 +37,7 @@ #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/reassemble.h> +#include <epan/to_str.h> #include "packet-gsm_a_common.h" #include "packet-gsm_map.h" diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 26035cee81..46516bcb10 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -40,6 +40,8 @@ #include <epan/prefs.h> #include <epan/sminmpec.h> #include <epan/expert.h> +#include <epan/to_str.h> + #include "packet-ldp.h" #include "packet-mpls.h" diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index 835ee0828b..ace6bd4af6 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -31,10 +31,12 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/crc16-tvb.h> #include <epan/expert.h> +#include <wiretap/wtap.h> void proto_register_mtp2(void); void proto_reg_handoff_mtp2(void); diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 91b596c3fc..b16b98b22a 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -46,6 +46,8 @@ #include <epan/tap.h> #include <epan/prefs.h> #include <epan/wmem/wmem.h> +#include <wiretap/wtap.h> + #include "packet-q708.h" #include "packet-sccp.h" #include "packet-frame.h" diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index dc284c40be..1bb0cdb50c 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -35,6 +35,7 @@ #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/show_exception.h> +#include <epan/to_str.h> #include "packet-dns.h" #include "packet-netbios.h" diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 6ea7a27341..c3afdfae97 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -128,7 +128,9 @@ #include <epan/packet.h> #include <epan/wmem/wmem.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include <epan/sminmpec.h> +#include <epan/to_str.h> #include <epan/dissectors/packet-tcp.h> #include <epan/dissectors/packet-udp.h> #include "packet-ntp.h" diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c index 1bdb6eefae..de5728760a 100644 --- a/epan/dissectors/packet-nflog.c +++ b/epan/dissectors/packet-nflog.c @@ -31,6 +31,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/aftypes.h> +#include <wiretap/wtap.h> void proto_register_nflog(void); void proto_reg_handoff_nflog(void); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index ebe0d364a0..c4641192ec 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -39,6 +39,7 @@ #include <wsutil/crc16.h> #include <wsutil/crc32.h> #include <epan/expert.h> +#include <epan/to_str.h> void proto_register_nfs(void); void proto_reg_handoff_nfs(void); diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index d4f48f5491..5d3456c1db 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -30,6 +30,7 @@ #include <epan/packet.h> #include <prefs.h> +#include <epan/to_str.h> void proto_register_nsip(void); void proto_reg_handoff_nsip(void); diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 80bb03d44c..0a7b59b718 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -40,6 +40,7 @@ #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-olsr.c b/epan/dissectors/packet-olsr.c index f77ea2357d..39724f0d46 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -39,6 +39,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/to_str.h> void proto_register_olsr(void); void proto_reg_handoff_olsr(void); diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 5399f4be89..37422d388a 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -33,6 +33,8 @@ #include <epan/prefs.h> #include <epan/in_cksum.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> + #include "packet-pim.h" void proto_register_pim(void); diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 84cf8a3add..a82ffba13f 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -32,6 +32,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/ppptypes.h> +#include <wiretap/wtap.h> void proto_register_pppoed(void); void proto_reg_handoff_pppoed(void); diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 54048bf4d1..28c57eb712 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -30,6 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include "packet-raw.h" #include "packet-ip.h" #include "packet-ppp.h" diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index fa36da7bab..b92c5b4a26 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -41,6 +41,7 @@ #include <epan/asn1.h> #include <epan/uat.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> #include <epan/dissectors/packet-x509af.h> #include <packet-tcp.h> #include <packet-ssl-utils.h> diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 7aaf7751b1..624eb0bf8c 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -35,6 +35,7 @@ #include <epan/packet.h> #include <epan/emem.h> #include <epan/prefs.h> +#include <epan/to_str.h> #define UDP_PORT_RIP 520 diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index 474bfdc3e7..3d4ec78856 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -33,6 +33,7 @@ #include <epan/asn1.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> /* * Optional include, for KASUMI support, diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index f389180f6a..b9e46ec82b 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -105,6 +105,7 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <prefs.h> +#include <epan/to_str.h> #include <epan/in_cksum.h> #include <epan/etypes.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index 248c2c7102..3c7cbc751c 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -64,6 +64,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> void proto_register_rtacser(void); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 178f5faf6d..6307bcab7b 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -78,6 +78,7 @@ #include <epan/expert.h> #include <epan/strutil.h> #include <epan/wmem/wmem.h> +#include <epan/to_str.h> void proto_register_rtcp(void); void proto_reg_handoff_rtcp(void); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index e9fd13cde3..4971725776 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -75,6 +75,7 @@ #include <epan/conversation.h> #include <epan/strutil.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include "packet-tcp.h" /* #define DEBUG_RTMPT 1 */ diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index f5cc756e16..6670c1def3 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -40,6 +40,7 @@ #include <epan/conversation.h> #include <epan/expert.h> #include <epan/rtp_pt.h> +#include <epan/addr_resolv.h> /* For setting up RTP/RTCP dissectors based on the RTPproxy's answers */ #include "packet-rtp.h" diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c index 02c51a937c..8465d74a60 100644 --- a/epan/dissectors/packet-s5066dts.c +++ b/epan/dissectors/packet-s5066dts.c @@ -34,6 +34,7 @@ #include <epan/dissectors/packet-tcp.h> /* For tcp_dissect_pdus() */ #include <epan/crc16-tvb.h> #include <epan/crc32-tvb.h> +#include <wiretap/wtap.h> #define DISSECTOR_NAME "s5066dts" /* STANAG 5066 DPDU properties */ diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 9b1a0b6dd7..f755d05222 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -31,6 +31,7 @@ #include <epan/expert.h> #include "packet-tcp.h" #include <epan/prefs.h> +#include <epan/to_str.h> /* forward reference */ void proto_register_sasp(void); diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index fe5e7f16a1..9aa87d96d8 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -53,6 +53,8 @@ #include <epan/expert.h> #include <epan/tap.h> #include <address.h> +#include <epan/to_str.h> +#include <wiretap/wtap.h> #include "packet-mtp3.h" #include "packet-tcap.h" #include "packet-sccp.h" diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c index fd3990fca2..8abbffe936 100644 --- a/epan/dissectors/packet-sdh.c +++ b/epan/dissectors/packet-sdh.c @@ -25,8 +25,10 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> +#include <wiretap/wtap.h> #include "packet-erf.h" diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index d6f7f165aa..dc6d24a893 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -40,6 +40,7 @@ #include <epan/tap.h> #include <epan/rtp_pt.h> #include <epan/show_exception.h> +#include <epan/addr_resolv.h> #include "packet-sdp.h" #include "packet-rtp.h" diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 35b09734be..cf853af7ae 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -62,6 +62,7 @@ #include <epan/packet.h> #include "packet-tcp.h" #include <epan/prefs.h> +#include <epan/to_str.h> #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 3716eb1844..434ce8cb5c 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -57,6 +57,7 @@ #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/to_str.h> #include <epan/ipproto.h> #define SFLOW_UDP_PORTS "6343" diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 7554ffa40d..0b5ee69fd8 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -39,6 +39,7 @@ #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/expert.h> +#include <epan/to_str.h> #include <epan/wmem/wmem.h> #include <epan/sigcomp-udvm.h> #include <epan/sigcomp_state_hdlr.h> diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index cac70eb19f..8262ae3105 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -40,6 +40,7 @@ #include <epan/reassemble.h> #include <epan/tap.h> #include <epan/expert.h> +#include <epan/to_str.h> #include "packet-ipx.h" #include "packet-idp.h" diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index e7cf127580..bfcb669d9d 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -37,6 +37,7 @@ #include <epan/tap.h> #include <epan/wmem/wmem.h> #include <epan/aftypes.h> +#include <epan/to_str.h> #include "packet-smb2.h" #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index b37bce03df..d416b0224e 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -33,6 +33,8 @@ #include <epan/packet.h> #include <prefs.h> +#include <wiretap/wtap.h> + #include "packet-sll.h" /* controller area network (CAN) kernel definitions diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 47cd6bf219..8ff32028ef 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -36,6 +36,7 @@ #include <epan/prefs.h> #include <epan/sctpppids.h> #include <epan/tap.h> +#include <epan/to_str.h> #include "packet-mtp3.h" #include "packet-sccp.h" diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index fed9e4fc26..b3fd9ca1e0 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -44,6 +44,8 @@ #include <epan/prefs.h> #include <epan/wmem/wmem.h> #include <epan/expert.h> +#include <epan/addr_resolv.h> + #include "packet-tacacs.h" void proto_reg_handoff_tacacs(void); diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c index 22255e0b66..68cd241622 100644 --- a/epan/dissectors/packet-time.c +++ b/epan/dissectors/packet-time.c @@ -30,6 +30,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> void proto_reg_handoff_time(void); void proto_register_time(void); diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 5fe8a1efab..95f5a5f0bd 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -43,6 +43,7 @@ #include <wsutil/filesystem.h> #include <epan/dissectors/packet-tcp.h> #include <epan/strutil.h> +#include <epan/to_str.h> /*-------------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 6b7538260d..f10cdcb44c 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -33,6 +33,7 @@ #include "packet-tr.h" #include "packet-llc.h" #include <epan/prefs.h> +#include <wiretap/wtap.h> #include <epan/tap.h> #include <epan/wmem/wmem.h> diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c index 49049644bc..86564fe9b0 100644 --- a/epan/dissectors/packet-uasip.c +++ b/epan/dissectors/packet-uasip.c @@ -32,6 +32,7 @@ #include "epan/packet.h" #include "epan/prefs.h" #include "epan/tap.h" +#include <epan/addr_resolv.h> #include "packet-uaudp.h" diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index 11cb5e03a8..1fa9b0cf57 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.c @@ -31,6 +31,7 @@ #include <epan/prefs.h> #include <epan/uat.h> #include <epan/wmem/wmem.h> +#include <wiretap/wtap.h> #ifdef _MSC_VER /* disable: warning C4090: 'XY' : different 'const' qualifiers */ diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index f6533745f4..f57fa70747 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -29,6 +29,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include <epan/wmem/wmem.h> #include <epan/uat.h> diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 4f15ac62c3..e99760f565 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -24,8 +24,10 @@ */ #include "config.h" + #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/to_str.h> #define DEFAULT_UDP_PORT 11273 diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 769b6155c4..89b3e63226 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -36,6 +36,7 @@ #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/tap.h> +#include <epan/to_str.h> #include "packet-windows-common.h" #include "packet-netbios.h" diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 1b2cebb0f4..50d8176f83 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -40,6 +40,7 @@ #include <epan/nlpid.h> #include <epan/x264_prt_id.h> #include <epan/lapd_sapi.h> +#include <wiretap/wtap.h> void proto_register_x25(void); void proto_reg_handoff_x25(void); diff --git a/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c index ecb5ecd1eb..dd80915b44 100644 --- a/epan/dissectors/packet-yami.c +++ b/epan/dissectors/packet-yami.c @@ -33,6 +33,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> +#include <epan/to_str.h> #include <epan/dissectors/packet-tcp.h> void proto_reg_handoff_yami(void); diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 0a62c80419..c64633b8ad 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -36,6 +36,7 @@ #include <epan/expert.h> #include <epan/wmem/wmem.h> #include <epan/reassemble.h> +#include <epan/to_str.h> #include "packet-zbee.h" #include "packet-zbee-nwk.h" diff --git a/epan/filter_expressions.c b/epan/filter_expressions.c index 9bd0e54025..ec1c3f2ba6 100644 --- a/epan/filter_expressions.c +++ b/epan/filter_expressions.c @@ -25,6 +25,7 @@ #include "config.h" #include <stdlib.h> +#include <string.h> #include <glib.h> #include <epan/prefs.h> diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index ba739de61d..7fa4bbd450 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -31,6 +31,7 @@ #include <string.h> #include <epan/prefs.h> +#include <epan/to_str.h> #include "../capture_opts.h" #include "../capture_session.h" diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index 1ef4b4adeb..5fa41833c9 100644 --- a/ui/gtk/dfilter_expr_dlg.c +++ b/ui/gtk/dfilter_expr_dlg.c @@ -46,6 +46,7 @@ #include <gtk/gtk.h> #include <epan/ftypes/ftypes-int.h> +#include <epan/to_str.h> #include "ui/simple_dialog.h" diff --git a/ui/gtk/packet_panes.h b/ui/gtk/packet_panes.h index 48bd3aad12..a507888d52 100644 --- a/ui/gtk/packet_panes.h +++ b/ui/gtk/packet_panes.h @@ -26,6 +26,8 @@ #ifndef __PACKET_PANES_H__ #define __PACKET_PANES_H__ +#include <epan/addr_resolv.h> + /** @file * Packet tree and details panes. * @ingroup main_window_group diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index 2d09712c55..baabd00ede 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -49,6 +49,7 @@ #include "ui/gtk/old-gtk-compat.h" #include <epan/strutil.h> +#include <wiretap/wtap.h> #define DEVICE_KEY "device" #define PROM_MODE_KEY "prom_mode" |