Dissectors: Include what we use.

epan/dissectors/file-blf.c

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/expert.h>
 
 #include <wiretap/blf.h>

epan/dissectors/file-dlt.c

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 static int proto_dlt;
 

epan/dissectors/file-file.c

@@ -16,14 +16,9 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/epan.h>
 #include <epan/exceptions.h>
 #include <epan/show_exception.h>
-#include <epan/timestamp.h>
-#include <epan/prefs.h>
-#include <epan/to_str.h>
 #include <epan/tap.h>
-#include <epan/expert.h>
 #include <epan/proto_data.h>
 #include <epan/color_filters.h>
 #include <wiretap/wtap.h>

epan/dissectors/file-file.h

@@ -9,7 +9,6 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include "ws_symbol_export.h"
 
 /*
  * Routine used to register file record end routine.  The routine should only

epan/dissectors/file-jpeg.c

@@ -25,8 +25,8 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/proto_data.h>
 #include <epan/expert.h>
+#include <epan/unit_strings.h>
 #include <wiretap/wtap.h>
 
 void proto_register_jfif(void);

epan/dissectors/file-pcapng.c

@@ -19,6 +19,7 @@
 #include <epan/exceptions.h>
 #include <epan/show_exception.h>
 #include <epan/addr_resolv.h>
+#include <epan/tfs.h>
 #include <wiretap/pcapng_module.h>
 #include <wiretap/secrets-types.h>
 

epan/dissectors/file-png.c

@@ -16,7 +16,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-
+#include <epan/tfs.h>
 
 #define MAKE_TYPE_VAL(a, b, c, d)   ((a)<<24 | (b)<<16 | (c)<<8 | (d))
 

epan/dissectors/packet-3g-a11.c

@@ -35,6 +35,7 @@
 /* Include vendor id translation */
 #include <epan/sminmpec.h>
 #include <epan/addr_resolv.h>
+#include <epan/tfs.h>
 
 #include "packet-radius.h"
 

epan/dissectors/packet-5co-legacy.c

@@ -27,9 +27,11 @@
 #include <config.h>
 #include <epan/packet.h>
 #include <epan/proto_data.h>
-#include <string.h>
+#include <wsutil/array.h>
 #include "packet-tcp.h"
-
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
 /* Prototypes */
 void proto_reg_handoff_FiveCoLegacy(void);
 void proto_register_FiveCoLegacy(void);

epan/dissectors/packet-5co-rap.c

@@ -28,8 +28,9 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
+#include <epan/unit_strings.h>
 #include <wsutil/utf8_entities.h>
-#include <string.h>
+#include <wsutil/array.h>
 #include "packet-tcp.h"
 
 /* Prototypes */
@@ -784,7 +785,7 @@ void proto_register_FiveCoRAP(void)
     wmem_strbuf_t* hf_abbrev_write_buf = NULL;
 
     /* Setup list of header fields (based on static table and specific table) */
-    static hf_register_info hf[array_length(hf_base) + 2*array_length(registers_def)];
+    static hf_register_info hf[(array_length(hf_base)) + (2*array_length(registers_def))];
     for (i = 0; i < array_length(hf_base); i++) {
         hf[i] = hf_base[i];
     }

epan/dissectors/packet-6lowpan.c

@@ -25,6 +25,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/proto_data.h>
 #include <epan/etypes.h>
+#include <epan/tfs.h>
 #include "packet-6lowpan.h"
 #include "packet-btl2cap.h"
 #include "packet-ipv6.h"

epan/dissectors/packet-9p.c

@@ -16,6 +16,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 
 #include "packet-tcp.h"
 

epan/dissectors/packet-a21.c

@@ -16,6 +16,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 
 #include "packet-e212.h"
 #include "packet-a21.h"

epan/dissectors/packet-acr122.c

@@ -15,6 +15,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+
 #include "packet-usb.h"
 
 static int proto_acr122;

epan/dissectors/packet-adb.c

@@ -15,6 +15,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+
 #include <wiretap/wtap.h>
 
 #include "packet-adb_service.h"

epan/dissectors/packet-adwin-config.c

@@ -13,6 +13,7 @@
 
 
 #include <epan/packet.h>
+#include <epan/tfs.h>
 #include "packet-tcp.h"
 
 /* Forward declarations */

epan/dissectors/packet-aeron.c

@@ -16,12 +16,9 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/uat.h>
-#include <epan/tap.h>
 #include <epan/conversation.h>
-#include <epan/exceptions.h>
 #include <epan/to_str.h>
-#include <wsutil/pint.h>
+#include <epan/tfs.h>
 #include <wsutil/ws_roundup.h>
 
 /*

epan/dissectors/packet-agentx.c

@@ -15,6 +15,7 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
+#include <epan/tfs.h>
 #include <wsutil/ws_roundup.h>
 
 #include "packet-tcp.h"

epan/dissectors/packet-aim.c

@@ -17,6 +17,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/to_str.h>
+#include <epan/tfs.h>
 
 #include "packet-tcp.h"
 #include "packet-tls.h"

epan/dissectors/packet-alcap.c

@@ -21,6 +21,7 @@
 
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 #include <wsutil/str_util.h>
 #include "packet-alcap.h"
 #include "packet-mtp3.h"

epan/dissectors/packet-alp.c

@@ -17,6 +17,7 @@
 #include <config.h>
 #include <epan/packet.h>
 #include <epan/to_str.h>
+#include <epan/unit_strings.h>
 #include <wiretap/wtap.h>
 
 void proto_reg_handoff_alp(void);

epan/dissectors/packet-amp.c

@@ -14,6 +14,7 @@
 #include <epan/exceptions.h>
 #include <epan/expert.h>
 #include <epan/packet.h>
+#include <epan/tfs.h>
 #include "packet-amp.h"
 
 /* The AMP standard can be found here:

epan/dissectors/packet-amqp.c

@@ -28,13 +28,12 @@
 #include <math.h>
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/decode_as.h>
 #include <epan/to_str.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
 #include <wsutil/str_util.h>
 #include <epan/uat.h>
 #include "packet-tcp.h"

epan/dissectors/packet-amr.c

@@ -20,6 +20,7 @@
 #include <epan/expert.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
+#include <epan/tfs.h>
 
 #include "packet-rtp.h"
 

epan/dissectors/packet-amt.c

@@ -16,6 +16,7 @@
 #include <config.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 
 #define AMT_UDP_PORT 2268
 

epan/dissectors/packet-ancp.c

@@ -23,6 +23,8 @@
 
 #include <epan/packet.h>
 #include <epan/stats_tree.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include <wsutil/ws_roundup.h>
 #include "packet-tcp.h"
 

epan/dissectors/packet-ansi_637.c

@@ -29,7 +29,9 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
-#include <epan/to_str.h>
+#include <epan/tfs.h>
+#include <epan/value_string.h>
+#include <wsutil/array.h>
 
 #include "packet-gsm_sms.h"
 #include "packet-ansi_a.h"

epan/dissectors/packet-ansi_683.c

@@ -21,6 +21,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 
 void proto_register_ansi_683(void);
 void proto_reg_handoff_ansi_683(void);

epan/dissectors/packet-ansi_801.c

@@ -25,6 +25,9 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
+#include <wsutil/array.h>
 
 void proto_register_ansi_801(void);
 void proto_reg_handoff_ansi_801(void);

epan/dissectors/packet-ansi_a.c

@@ -28,14 +28,13 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
+#include <epan/tfs.h>
 
+#include <wsutil/array.h>
 #include <wsutil/str_util.h>
 
 #include "packet-rtp.h"

epan/dissectors/packet-aodv.c

@@ -11,11 +11,11 @@
 
 #include "config.h"
 
-#include <stddef.h>
-
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 /*
  * See

epan/dissectors/packet-aoe.c

@@ -15,6 +15,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
+#include <epan/tfs.h>
 
 void proto_register_aoe(void);
 void proto_reg_handoff_aoe(void);

epan/dissectors/packet-arp.c

@@ -25,6 +25,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
 
 void proto_register_arp(void);
 void proto_reg_handoff_arp(void);

epan/dissectors/packet-artnet.c

@@ -16,6 +16,8 @@
 #include <stdlib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include "packet-rdm.h"
 
 /*

epan/dissectors/packet-aruba-ubt.c

@@ -12,10 +12,10 @@
  /* header files */
 #include "config.h"
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
 #include "packet-ipv6.h"
+#include <epan/tfs.h>
 
 /* This is not IANA assigned nor registered */
 #define PORT_UBT 15560

epan/dissectors/packet-asam-cmp.c

@@ -20,6 +20,7 @@
 #include <epan/packet.h>
 #include <epan/uat.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 
 #include "packet-socketcan.h"
 #include "packet-flexray.h"

epan/dissectors/packet-asap.c

@@ -25,9 +25,12 @@
 #include <epan/to_str.h>
 #include <epan/sctpppids.h>
 #include <epan/stat_tap_ui.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include <wsutil/str_util.h>
 #include <wsutil/ws_roundup.h>
+#include <wsutil/array.h>
 
 #include "packet-asap+enrp-common.h"
 

epan/dissectors/packet-assa_r3.c

@@ -16,7 +16,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/range.h>
+#include <epan/tfs.h>
 #include <epan/crc16-tvb.h>
 #include "packet-tcp.h"
 

epan/dissectors/packet-atm.c

@@ -14,18 +14,15 @@
 #include <epan/capture_dissectors.h>
 #include <wsutil/pint.h>
 #include <epan/oui.h>
-#include <epan/addr_resolv.h>
 #include <epan/ppptypes.h>
 #include <epan/expert.h>
 #include <epan/crc10-tvb.h>
 #include <epan/crc32-tvb.h>
 #include <epan/decode_as.h>
+#include <epan/tfs.h>
 
 #include "packet-atm.h"
 #include "packet-snmp.h"
-#include "packet-eth.h"
-#include "packet-tr.h"
-#include "packet-llc.h"
 #include <epan/prefs.h>
 #include "packet-pw-atm.h"
 

epan/dissectors/packet-autosar-nm.c

@@ -22,6 +22,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/tfs.h>
 #include <epan/uat.h>
 #include "packet-socketcan.h"
 

epan/dissectors/packet-awdl.c

@@ -18,10 +18,12 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/oui.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include "packet-llc.h"
 #include "packet-ieee80211.h"
 #include "packet-dns.h"
-#include <epan/oui.h>
 
 void proto_register_awdl(void);
 void proto_reg_handoff_awdl(void);

epan/dissectors/packet-ax25.c

@@ -38,6 +38,7 @@
 #include <epan/xdlc.h>
 #include <epan/ax25_pids.h>
 #include <epan/ipproto.h>
+#include <epan/tfs.h>
 
 #define STRLEN	80
 

epan/dissectors/packet-bacapp.c

@@ -21,6 +21,7 @@
 #include <epan/reassemble.h>
 #include <epan/expert.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
 #include <epan/stats_tree.h>
 #include "packet-bacapp.h"
 

epan/dissectors/packet-bacnet.c

@@ -15,7 +15,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-
+#include <epan/tfs.h>
 #include <epan/llcsaps.h>
 #include "packet-bacnet.h"
 

epan/dissectors/packet-bat.c

@@ -14,6 +14,9 @@
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <epan/addr_resolv.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
+
 void proto_register_bat(void);
 void proto_reg_handoff_bat(void);
 

epan/dissectors/packet-batadv.c

@@ -17,6 +17,8 @@
 #include <epan/addr_resolv.h>
 #include <epan/reassemble.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include <wsutil/crc32.h>
 

epan/dissectors/packet-bblog.c

@@ -15,6 +15,7 @@
 
 #include <wiretap/wtap.h>
 #include <epan/packet.h>
+#include <epan/tfs.h>
 #include "packet-bblog.h"
 
 #define PEN_NFLX 10949

epan/dissectors/packet-ber.c

@@ -52,6 +52,7 @@
 #include <epan/expert.h>
 #include <epan/uat.h>
 #include <epan/decode_as.h>
+#include <epan/tfs.h>
 #include <wiretap/wtap.h>
 #ifdef DEBUG_BER
 #include <epan/ws_printf.h>

epan/dissectors/packet-bfcp.c

@@ -20,6 +20,7 @@
 #include <epan/expert.h>
 #include <epan/conversation.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
 
 #include "packet-bfcp.h"
 

epan/dissectors/packet-bfd.c

@@ -32,6 +32,8 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include "packet-bfd.h"
 #include "packet-mpls.h"

epan/dissectors/packet-bgp.c

@@ -69,15 +69,13 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
-#include <epan/show_exception.h>
 #include <epan/afn.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/etypes.h>
 #include <epan/to_str.h>
 #include <epan/proto_data.h>
 #include <epan/ipproto.h>
+#include <epan/tfs.h>
 #include <wsutil/str_util.h>
 #include "packet-ip.h"
 #include "packet-tcp.h"

epan/dissectors/packet-bitcoin.c

@@ -29,9 +29,9 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
 
 #include "packet-tcp.h"
 

epan/dissectors/packet-bluetooth.h

@@ -10,8 +10,7 @@
 #ifndef __PACKET_BLUETOOTH_H__
 #define __PACKET_BLUETOOTH_H__
 
-#include <epan/wmem_scopes.h>
-
+#include <epan/packet.h>
 #include "packet-usb.h"
 #include "packet-ubertooth.h"
 

epan/dissectors/packet-bmp.c

@@ -22,10 +22,10 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
+#include <epan/tfs.h>
 
 #include "packet-tcp.h"
 #include "packet-bgp.h"
-#include "exceptions.h"
 
 void proto_register_bmp(void);
 void proto_reg_handoff_bmp(void);

epan/dissectors/packet-bpsec.c

@@ -13,6 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 #include "config.h"
+#include <stdint.h>
 
 #include "packet-bpsec.h"
 #include "packet-bpv7.h"
@@ -20,10 +21,7 @@
 #include <epan/prefs.h>
 #include <epan/proto.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
-#include <wsutil/crc16.h>
-#include <wsutil/crc32.h>
-#include <inttypes.h>
+#include <epan/tfs.h>
 #include "epan/wscbor.h"
 
 void proto_register_bpsec(void);

epan/dissectors/packet-bpsec.h

@@ -16,8 +16,6 @@
 
 #include <ws_symbol_export.h>
 #include <epan/tvbuff.h>
-#include <epan/proto.h>
-#include <epan/expert.h>
 
 #ifdef __cplusplus
 extern "C" {

epan/dissectors/packet-bpv7.c

@@ -14,11 +14,13 @@
 #include "config.h"
 #define WS_LOG_DOMAIN "packet-bpv7"
 
+#include <inttypes.h>
+
 #include "packet-bpv7.h"
 #include "epan/wscbor.h"
+#include <epan/proto.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/proto.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
 #include <epan/reassemble.h>
@@ -28,10 +30,11 @@
 #include <epan/conversation_filter.h>
 #include <epan/exceptions.h>
 #include <epan/ftypes/ftypes.h>
+#include <epan/unit_strings.h>
+#include <epan/tfs.h>
 #include <wsutil/crc16.h>
+#include <wsutil/array.h>
 #include <wsutil/crc32.h>
-#include <wsutil/utf8_entities.h>
-#include <inttypes.h>
 
 void proto_register_bpv7(void);
 void proto_reg_handoff_bpv7(void);

epan/dissectors/packet-bssgp.c

@@ -18,6 +18,7 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-bssgp.h"
 #include "packet-e212.h"

epan/dissectors/packet-bt-tracker.c

@@ -15,6 +15,7 @@
 #include <epan/conversation.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>
+#include <epan/unit_strings.h>
 
 void proto_register_bt_tracker(void);
 void proto_reg_handoff_bt_tracker(void);

epan/dissectors/packet-bt-utp.c

@@ -19,9 +19,8 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/proto_data.h>
-#include <epan/reassemble.h>
+#include <epan/unit_strings.h>
 
-#include "packet-udp.h"
 #include "packet-bt-utp.h"
 
 void proto_register_bt_utp(void);

epan/dissectors/packet-btavdtp.c

@@ -15,10 +15,10 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
+#include <epan/unit_strings.h>
 
 #include "packet-bluetooth.h"
 #include "packet-btl2cap.h"
-#include "packet-btsdp.h"
 #include "packet-btavdtp.h"
 #include "packet-btavrcp.h"
 #include "packet-rtp.h"

epan/dissectors/packet-bthci_cmd.c

@@ -33,13 +33,14 @@
 #include <epan/decode_as.h>
 #include <epan/tap.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include <wsutil/utf8_entities.h>
 
 #include "packet-bluetooth.h"
 #include "packet-bthci_cmd.h"
 #include "packet-bthci_evt.h"
-#include "packet-btsdp.h"
 #include "packet-btatt.h"
 
 static int proto_bthci_cmd;

epan/dissectors/packet-bthci_evt.c

@@ -31,6 +31,7 @@
 #include <epan/decode_as.h>
 #include <epan/tap.h>
 #include <epan/proto_data.h>
+#include <epan/unit_strings.h>
 
 #include <wsutil/utf8_entities.h>
 

epan/dissectors/packet-bthci_iso.c

@@ -16,6 +16,7 @@
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
+#include <epan/unit_strings.h>
 
 #include "packet-bluetooth.h"
 #include "packet-bthci_iso.h"

epan/dissectors/packet-bthfp.c

@@ -21,6 +21,8 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
+#include <epan/unit_strings.h>
+
 #include "packet-btrfcomm.h"
 #include "packet-btsdp.h"
 

epan/dissectors/packet-bthsp.c

@@ -16,6 +16,8 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
+#include <epan/unit_strings.h>
+
 #include "packet-btrfcomm.h"
 #include "packet-btsdp.h"
 

epan/dissectors/packet-btl2cap.c

@@ -24,6 +24,8 @@
 #include <epan/decode_as.h>
 #include <epan/proto_data.h>
 #include <epan/reassemble.h>
+#include <epan/unit_strings.h>
+
 #include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"

epan/dissectors/packet-btle.c

@@ -22,6 +22,8 @@
 #include <epan/expert.h>
 #include <epan/proto_data.h>
 #include <epan/reassemble.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include <wiretap/wtap.h>
 

epan/dissectors/packet-btlmp.c

@@ -13,10 +13,9 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/expert.h>
+#include <epan/unit_strings.h>
 
 
-#include "packet-bluetooth.h"
 #include "packet-btbredr_rf.h"
 
 static int proto_btlmp;

epan/dissectors/packet-btmcap.c

@@ -16,8 +16,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-
-#include "packet-btsdp.h"
+#include <epan/unit_strings.h>
 
 static int proto_btmcap;
 

epan/dissectors/packet-btmesh.c

@@ -26,6 +26,8 @@
 #include <epan/uat.h>
 #include <epan/reassemble.h>
 #include <epan/to_str.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #define BTMESH_NOT_USED 0
 #define BTMESH_KEY_ENTRY_VALID 4

epan/dissectors/packet-calcappprotocol.c

@@ -19,6 +19,7 @@
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 #include <epan/stat_tap_ui.h>
+#include <wsutil/array.h>
 
 void proto_register_calcappprotocol(void);
 void proto_reg_handoff_calcappprotocol(void);

epan/dissectors/packet-cattp.c

@@ -18,6 +18,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/in_cksum.h>
+#include <epan/unit_strings.h>
 
 #define CATTP_SHORTNAME "CAT-TP"
 #define CATTP_HBLEN 18

epan/dissectors/packet-cdp.c

@@ -18,6 +18,8 @@
 #include <epan/nlpid.h>
 #include <epan/etypes.h>
 #include <epan/cisco_pid.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 /*
  *

epan/dissectors/packet-cip.c

@@ -54,6 +54,8 @@
 #include <epan/prefs.h>
 #include <epan/proto_data.h>
 #include <epan/wmem_scopes.h>
+#include <epan/unit_strings.h>
+#include <wsutil/array.h>
 #include "packet-cip.h"
 #include "packet-cipmotion.h"
 #include "packet-cipsafety.h"

epan/dissectors/packet-cipmotion.c

@@ -19,6 +19,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/unit_strings.h>
 
 #include "packet-cipmotion.h"
 

epan/dissectors/packet-componentstatus.c

@@ -20,6 +20,7 @@
 #include <epan/ipproto.h>
 #include <epan/sctpppids.h>
 #include <epan/stat_tap_ui.h>
+#include <wsutil/array.h>
 
 
 void proto_register_componentstatusprotocol(void);

epan/dissectors/packet-couchbase.c

@@ -35,6 +35,8 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #ifdef HAVE_SNAPPY
 #include <snappy-c.h>

epan/dissectors/packet-csn1.h

@@ -15,6 +15,7 @@
 #define _PACKET_CSN1_H_
 
 #include <epan/expert.h>
+#include <wsutil/array.h>
 
 /* Error codes */
 #define  CSN_OK                               0

epan/dissectors/packet-dccp.c

@@ -56,10 +56,10 @@
 #include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <epan/conversation_filter.h>
-#include <epan/exported_pdu.h>
 #include <epan/tap.h>
+#include <epan/unit_strings.h>
+
 #include <wsutil/str_util.h>
-#include <wsutil/utf8_entities.h>
 
 #include "packet-dccp.h"
 

epan/dissectors/packet-dhcp-failover.c

@@ -33,6 +33,8 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include "packet-arp.h"
 #include "packet-tcp.h"

epan/dissectors/packet-dhcp.c

@@ -130,7 +130,6 @@
 #include <stdio.h>		/* for sscanf() */
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
 #include "packet-arp.h"
 #include "packet-dns.h"				/* for get_dns_name() */
 #include <epan/addr_resolv.h>
@@ -138,13 +137,13 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/arptypes.h>
-#include <epan/addr_resolv.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
-#include <epan/strutil.h>
 #include <epan/sminmpec.h>
 #include <wsutil/str_util.h>
 #include <wsutil/strtoi.h>
+#include <wsutil/array.h>
+
 void proto_register_dhcp(void);
 void proto_reg_handoff_dhcp(void);
 

epan/dissectors/packet-dhcpv6.c

@@ -53,6 +53,8 @@
 #include <epan/arptypes.h>
 #include <epan/sminmpec.h>
 #include <epan/strutil.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include "packet-tcp.h"
 #include "packet-arp.h"
 #include "packet-dns.h"

epan/dissectors/packet-dmp.c

@@ -33,11 +33,11 @@
 #include <epan/expert.h>
 #include <epan/crc16-tvb.h>
 #include <epan/asn1.h>
-#include <epan/strutil.h>
 #include <epan/uat.h>
 #include <epan/proto_data.h>
 
 #include <wsutil/str_util.h>
+#include <wsutil/array.h>
 
 #include "packet-p1.h"
 #include "packet-p22.h"

epan/dissectors/packet-dnp.c

@@ -27,6 +27,8 @@
 #include <epan/expert.h>
 #include <epan/to_str.h>
 #include <epan/crc16-tvb.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include <wsutil/crc16.h>
 #include <wsutil/str_util.h>
 #include "packet-tls.h"

epan/dissectors/packet-do-irp.c

@@ -21,6 +21,7 @@
 #include "config.h"
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/unit_strings.h>
 #include "packet-tcp.h"
 
 /* N.B. IANA has these ports registered for hdl-srv (name from original RFC) */

epan/dissectors/packet-docsis-macmgmt.c

@@ -91,6 +91,9 @@
 #include "packet-x509af.h"
 #include <epan/reassemble.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
+#include <wsutil/array.h>
 
 void proto_register_docsis_mgmt(void);
 void proto_reg_handoff_docsis_mgmt(void);

epan/dissectors/packet-docsis-tlv.c

@@ -17,6 +17,8 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/reassemble.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include "packet-docsis-tlv.h"
 

epan/dissectors/packet-drbd.c

@@ -20,10 +20,11 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/prefs.h>
+#include <epan/unit_strings.h>
 #include "packet-tcp.h"
 
 #include <wsutil/str_util.h>
+#include <wsutil/array.h>
 
 /* Known as SHARED_SECRET_MAX in the DRBD sources */
 #define DRBD_STRING_MAX 64

epan/dissectors/packet-dsi.c

@@ -15,6 +15,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
+#include <epan/unit_strings.h>
 
 #include "packet-tcp.h"
 #include "packet-afp.h"

epan/dissectors/packet-ecmp.c

@@ -21,6 +21,8 @@
 #include "config.h"
 #include <epan/packet.h>
 #include <epan/expert.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include "packet-mbtcp.h"
 
 #define PROTO_TAG_ECMP	"ECMP"

epan/dissectors/packet-ecpri.c

@@ -19,6 +19,8 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/etypes.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 /**************************************************************************************************/
 /* Definition for eCPRI lengths                                                                   */

epan/dissectors/packet-enrp.c

@@ -26,9 +26,12 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/expert.h>
 #include <epan/proto_data.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #include <wsutil/str_util.h>
 #include <wsutil/ws_roundup.h>
+#include <wsutil/array.h>
 
 #include "packet-asap+enrp-common.h"
 

epan/dissectors/packet-erf.c

@@ -14,7 +14,8 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/ipproto.h>
-#include <epan/to_str.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 #include <wsutil/str_util.h>
 #include <wiretap/wtap.h>
 #include <wiretap/erf_record.h>

epan/dissectors/packet-esis.c

@@ -16,6 +16,7 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/nlpid.h>
+#include <epan/unit_strings.h>
 #include "packet-osi.h"
 #include "packet-osi-options.h"
 

epan/dissectors/packet-fcswils.c

@@ -13,7 +13,8 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
+#include <epan/unit_strings.h>
+
 #include "packet-fc.h"
 #include "packet-fcswils.h"
 #include "packet-fcct.h"

epan/dissectors/packet-forces.c

@@ -15,6 +15,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <epan/unit_strings.h>
 
 void proto_register_forces(void);
 void proto_reg_handoff_forces(void);

epan/dissectors/packet-fractalgeneratorprotocol.c

@@ -19,7 +19,7 @@
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 #include <epan/stat_tap_ui.h>
-
+#include <wsutil/array.h>
 
 void proto_register_fractalgeneratorprotocol(void);
 void proto_reg_handoff_fractalgeneratorprotocol(void);

epan/dissectors/packet-gearman.c

@@ -19,6 +19,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
+#include <wsutil/array.h>
 #include "packet-tcp.h"
 
 void proto_register_gearman(void);

epan/dissectors/packet-geneve.c

@@ -21,6 +21,8 @@
 #include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/value_string.h>
+#include <epan/tfs.h>
+#include <epan/unit_strings.h>
 
 #define UDP_PORT_GENEVE  6081
 #define GENEVE_VER 0