First batch of unincludes. Last attempt...

Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

epan/dissectors/file-gif.c

@@ -37,7 +37,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 

epan/dissectors/file-jpeg.c

@@ -36,7 +36,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>

epan/dissectors/file-mp4.c

@@ -31,7 +31,6 @@
 
 #include "config.h"
 
-#include <math.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>

epan/dissectors/packet-6lowpan.c

@@ -28,10 +28,8 @@
 #include <epan/expert.h>
 #include <epan/reassemble.h>
 #include <epan/ipproto.h>
-#include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
 #include "packet-ipv6.h"
-#include "packet-ieee802154.h"
 #include "packet-6lowpan.h"
 void proto_register_6lowpan(void);
 void proto_reg_handoff_6lowpan(void);

epan/dissectors/packet-9p.c

@@ -25,12 +25,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdio.h>
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 
 #include "packet-tcp.h"

epan/dissectors/packet-aarp.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/etypes.h>
 #include <epan/to_str.h>
 

epan/dissectors/packet-aastra-aasp.c

@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 /* commands id */
 #define BEGIN_BLOCK_DATA    0x80

epan/dissectors/packet-acn.c

@@ -41,7 +41,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/ipv6-utils.h>
 #include <epan/to_str.h>
 
 /* Forward declarations */

epan/dissectors/packet-adb_service.c

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

epan/dissectors/packet-adwin-config.c

@@ -23,10 +23,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #include "packet-tcp.h"
 
 /* Forward declarations */

epan/dissectors/packet-afp.c

@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>

epan/dissectors/packet-afs.c

@@ -32,12 +32,9 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 #include <epan/reassemble.h>
 
 #include "packet-rx.h"

epan/dissectors/packet-aim-adverts.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim-chat.c

@@ -25,8 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
-#include "packet-tcp.h"
 #include "packet-aim.h"
 
 void proto_register_aim_chat(void);

epan/dissectors/packet-aim-chatnav.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim-directory.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim-icq.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim-messaging.c

@@ -26,7 +26,6 @@
 #include "config.h"
 
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/strutil.h>

epan/dissectors/packet-aim-oft.c

@@ -24,9 +24,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
-#include "packet-aim.h"
 
 void proto_register_aim_oft(void);
 void proto_reg_handoff_aim_oft(void);

epan/dissectors/packet-aim-popup.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim-sst.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim-userlookup.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 

epan/dissectors/packet-aim.c

@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/strutil.h>

epan/dissectors/packet-ajp13.c

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "packet-tcp.h"
 
 void proto_register_ajp13(void);

epan/dissectors/packet-amr.c

@@ -33,7 +33,6 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
-#include <epan/prefs.h>
 
 void proto_register_amr(void);
 void proto_reg_handoff_amr(void);

epan/dissectors/packet-ancp.c

@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/tap.h>
 #include <epan/stats_tree.h>
 #include "packet-tcp.h"
 

epan/dissectors/packet-ansi_683.c

@@ -30,11 +30,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
 
 void proto_register_ansi_683(void);
 void proto_reg_handoff_ansi_683(void);

epan/dissectors/packet-ansi_801.c

@@ -33,12 +33,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 
-#include <math.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 
 void proto_register_ansi_801(void);
 void proto_reg_handoff_ansi_801(void);

epan/dissectors/packet-ansi_a.c

@@ -39,7 +39,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
@@ -49,7 +48,6 @@
 #include <epan/expert.h>
 #include <epan/to_str.h>
 
-#include "packet-mtp3.h"
 #include "packet-rtp.h"
 #include "packet-bssap.h"
 #include "packet-ansi_a.h"

epan/dissectors/packet-aol.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>

epan/dissectors/packet-ap1394.c

@@ -25,7 +25,6 @@
 #include <epan/packet.h>
 #include <wsutil/pint.h>
 #include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 
 #include "packet-ap1394.h"
 #include <epan/etypes.h>

epan/dissectors/packet-aprs.c

@@ -39,12 +39,9 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <math.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/wmem/wmem.h>
 #include <epan/to_str.h>
 
 #define STRLEN	100

epan/dissectors/packet-arp.c

@@ -25,9 +25,7 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/arptypes.h>
 #include <epan/addr_resolv.h>
 #include "packet-arp.h"

epan/dissectors/packet-asterix.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>

epan/dissectors/packet-atalk.c

@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/etypes.h>

epan/dissectors/packet-ayiya.c

@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include <epan/strutil.h>
 
 void proto_register_ayiya(void);
 void proto_reg_handoff_ayiya(void);

epan/dissectors/packet-beep.c

@@ -30,7 +30,6 @@
 
 #include <stdio.h>
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>

epan/dissectors/packet-ber.c

@@ -61,14 +61,10 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/strutil.h>
-#include <epan/to_str.h>
-#include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/oids.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
-#include <epan/asn1.h>
 #include <epan/decode_as.h>
 #include <wiretap/wtap.h>
 

epan/dissectors/packet-bgp.c

@@ -56,7 +56,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>

epan/dissectors/packet-bittorrent.c

@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 
 #include "packet-tcp.h"

epan/dissectors/packet-bluetooth.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <wiretap/wtap.h>
 

epan/dissectors/packet-bootp.c

@@ -107,8 +107,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>

epan/dissectors/packet-bootparams.c

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 
 #include "packet-rpc.h"
 

epan/dissectors/packet-bpdu.c

@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/llcsaps.h>
-#include <epan/ppptypes.h>
 #include <epan/chdlctypes.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>

epan/dissectors/packet-bssap.c

@@ -35,7 +35,6 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
 

epan/dissectors/packet-btavdtp.c

@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 #include "packet-btl2cap.h"

epan/dissectors/packet-bthci_evt.c

@@ -39,7 +39,6 @@
 #include <epan/decode_as.h>
 
 #include "packet-bluetooth.h"
-#include "packet-sdp.h"
 
 static dissector_handle_t bthci_cmd_handle;
 static dissector_handle_t bthci_evt_handle;

epan/dissectors/packet-bthci_sco.c

@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 

epan/dissectors/packet-btle.c

@@ -32,10 +32,8 @@
 #include <epan/expert.h>
 #include <wiretap/wtap.h>
 
-#include "packet-bluetooth.h"
 #include "packet-btle.h"
 #include "packet-bthci_acl.h"
-#include "packet-ubertooth.h"
 
 static int proto_btle = -1;
 

epan/dissectors/packet-btle_rf.c

@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 
-#include "packet-bluetooth.h"
 #include "packet-btle.h"
 
 #define LE_DEWHITENED        0x0001

epan/dissectors/packet-btmcap.c

@@ -29,7 +29,6 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
-#include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 
 static int proto_btmcap = -1;

epan/dissectors/packet-btobex.c

@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/reassemble.h>
-#include <epan/tap.h>
 #include <epan/expert.h>
 #include "packet-bluetooth.h"
 #include "packet-btrfcomm.h"

epan/dissectors/packet-btsap.c

@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 
 enum {

epan/dissectors/packet-btsdp.c

@@ -34,8 +34,6 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/etypes.h>
-#include <epan/ip_opts.h>
-#include <epan/strutil.h>
 #include <epan/to_str.h>
 
 #include "packet-bluetooth.h"

epan/dissectors/packet-bvlc.c

@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 
 void proto_register_bvlc(void);
 void proto_reg_handoff_bvlc(void);

epan/dissectors/packet-bzr.c

@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "packet-tcp.h"
 
 void proto_register_bzr(void);
 void proto_reg_handoff_bzr(void);

epan/dissectors/packet-catapult-dct2000.c

@@ -28,9 +28,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/addr_resolv.h>
 
 #include <wiretap/catapult_dct2000.h>

epan/dissectors/packet-cell_broadcast.c

@@ -33,7 +33,6 @@
 #include <epan/reassemble.h>
 
 #include "packet-gsm_map.h"
-#include "packet-gsm_sms.h"
 
 #include "packet-cell_broadcast.h"
 

epan/dissectors/packet-cimd.c

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #define CIMD_STX   0x02 /* Start of CIMD PDU */
 #define CIMD_ETX   0x03 /* End of CIMD PDU */
 #define CIMD_COLON 0x3A /* CIMD colon */

epan/dissectors/packet-cip.c

@@ -41,7 +41,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include "packet-cip.h"
-#include "packet-enip.h"
 #include "packet-cipsafety.h"
 #include "packet-mbtcp.h"
 

epan/dissectors/packet-cipsafety.c

@@ -30,7 +30,6 @@
 #include <epan/expert.h>
 #include <wsutil/pint.h>
 #include "packet-cip.h"
-#include "packet-enip.h"
 #include "packet-cipsafety.h"
 
 

epan/dissectors/packet-cisco-wids.c

@@ -47,7 +47,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/show_exception.h>

epan/dissectors/packet-coap.c

@@ -30,7 +30,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>

epan/dissectors/packet-collectd.c

@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>

epan/dissectors/packet-cops.c

@@ -54,16 +54,12 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "packet-tcp.h"
 
 #include <epan/oids.h>
-#include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/asn1.h>
 #include "packet-ber.h"
 
 /* XXX - The "plain" COPS port (3288) can be overridden in the prefs.

epan/dissectors/packet-cp2179.c

@@ -52,13 +52,9 @@ F = 16-bit CRC
 
 #include "config.h"
 #include <epan/packet.h>
-#include "packet-tcp.h"
 #include "packet-rtacser.h"
-#include <epan/to_str.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
-#include <epan/reassemble.h>
-#include <epan/expert.h>
 
 void proto_reg_handoff_cp2179(void);
 void proto_register_cp2179(void);

epan/dissectors/packet-cpha.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 
 void proto_register_cpha(void);
 void proto_reg_handoff_cpha(void);

epan/dissectors/packet-csm-encaps.c

@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/tap.h>
 #include <epan/etypes.h>
 
 

epan/dissectors/packet-db-lsp.c

@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
-#include <epan/expert.h>
 
 #include "packet-tcp.h"
 #include "packet-x509af.h"

epan/dissectors/packet-dccp.c

@@ -54,7 +54,6 @@
 #include <epan/in_cksum.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include "packet-ip.h"
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-dccp.h"

epan/dissectors/packet-dcerpc-dtsprovider.c

@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_dtsprovider (void);
 void proto_reg_handoff_dtsprovider (void);

epan/dissectors/packet-dcerpc-epm.c

@@ -27,7 +27,6 @@
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-nt.h"
 
 void proto_register_epm (void);
 void proto_reg_handoff_epm (void);

epan/dissectors/packet-dcerpc-krb5rpc.c

@@ -31,7 +31,6 @@
 #include <epan/asn1.h>
 #include "packet-dcerpc.h"
 #include "packet-kerberos.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_krb5rpc (void);
 void proto_reg_handoff_krb5rpc (void);

epan/dissectors/packet-dcerpc-llb.c

@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_llb (void);
 void proto_reg_handoff_llb (void);

epan/dissectors/packet-dcerpc-mgmt.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"

epan/dissectors/packet-dcerpc-netlogon.c

@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wsutil/rc4.h>
@@ -38,7 +37,6 @@
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-netlogon.h"
 #include "packet-windows-common.h"
-#include "packet-ntlmssp.h"
 #include "packet-dcerpc-lsa.h"
 /* for keytab format */
 #include <epan/asn1.h>

epan/dissectors/packet-dcerpc-nt.c

@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>

epan/dissectors/packet-dcerpc-rs_bind.c

@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_rs_bind (void);
 void proto_reg_handoff_rs_bind (void);

epan/dissectors/packet-dcerpc-spoolss.c

@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"

epan/dissectors/packet-dcerpc-trksvr.c

@@ -28,8 +28,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-nt.h"
-#include "packet-windows-common.h"
 
 void proto_register_dcerpc_trksvr(void);
 void proto_reg_handoff_dcerpc_trksvr(void);

epan/dissectors/packet-dcerpc-update.c

@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_dce_update(void);
 void proto_reg_handoff_dce_update(void);

epan/dissectors/packet-dcerpc.c

@@ -29,16 +29,13 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
-#include <epan/strutil.h>
 #include <epan/addr_resolv.h>
 #include <epan/show_exception.h>
 #include <epan/decode_as.h>

epan/dissectors/packet-dcm.c

@@ -210,13 +210,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include <epan/reassemble.h>

epan/dissectors/packet-dcom-remunkn.c

@@ -28,7 +28,6 @@
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
 #include "packet-dcom.h"
-#include "guid-utils.h"
 
 void proto_register_remunk(void);
 void proto_reg_handoff_remunk(void);

epan/dissectors/packet-dcp-etsi.c

@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>

epan/dissectors/packet-dec-bpdu.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/etypes.h>
 #include <epan/ppptypes.h>
 

epan/dissectors/packet-dect.c

@@ -36,10 +36,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #define ETHERTYPE_DECT 0x2323
 
 #define DECT_PACKET_INFO_LEN 11

epan/dissectors/packet-devicenet.c

@@ -30,7 +30,6 @@
 #include <epan/uat.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/reassemble.h>
 #include "packet-cip.h"
 
 void proto_register_devicenet(void);

epan/dissectors/packet-dhcpv6.c

@@ -54,8 +54,6 @@
 
 #include <epan/packet.h>
 #include <epan/sminmpec.h>
-#include <epan/strutil.h>
-#include <epan/arptypes.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/to_str.h>

epan/dissectors/packet-diameter.c

@@ -41,9 +41,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
@@ -51,7 +48,6 @@
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/expert.h>
-#include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include <epan/diam_dict.h>

epan/dissectors/packet-diameter_3gpp.c

@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/asn1.h>
 
 #include "packet-diameter.h"
 #include "packet-gsm_a_common.h"

epan/dissectors/packet-distcc.c

@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <time.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>

epan/dissectors/packet-dmp.c

@@ -36,12 +36,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <math.h>
 
 #include <epan/packet.h>
-#include <epan/address.h>
-#include <epan/addr_resolv.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>

epan/dissectors/packet-dnp.c

@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <math.h>
 
 #include <epan/packet.h>
@@ -37,7 +36,6 @@
 #include <epan/reassemble.h>
 #include "packet-tcp.h"
 #include "packet-rtacser.h"
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
 #include <epan/crc16-tvb.h>

epan/dissectors/packet-dns.c

@@ -31,12 +31,9 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <memory.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
 #include "packet-dns.h"

epan/dissectors/packet-dplay.c

@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/aftypes.h>

epan/dissectors/packet-drda.c

@@ -48,7 +48,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"

epan/dissectors/packet-dtls.c

@@ -49,9 +49,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/expert.h>
-#include <epan/prefs.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
@@ -59,8 +56,6 @@
 #include <epan/uat.h>
 #include <epan/sctpppids.h>
 #include <epan/exported_pdu.h>
-#include <wsutil/file_util.h>
-#include "packet-x509af.h"
 #include "packet-ssl-utils.h"
 
 void proto_register_dtls(void);

epan/dissectors/packet-dtpt.c

@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/conversation.h>

epan/dissectors/packet-dvmrp.c

@@ -52,7 +52,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
 #include "packet-igmp.h"