Deleting unneccessary #includes from dissectors.

Second batch (packet-eth.c -> packet-icmpv6.d).

Will look at cleaning up and committing script afterwards.

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

epan/dissectors/packet-eth.c

@@ -37,11 +37,9 @@
 #include "packet-isl.h"
 #include "packet-llc.h"
 #include "packet-sll.h"
-#include "packet-usb.h"
 #include "packet-juniper.h"
 #include "packet-sflow.h"
 #include <epan/crc32-tvb.h>
-#include <epan/tap.h>
 #include <wiretap/erf.h>
 
 void proto_register_eth(void);

epan/dissectors/packet-etsi_card_app_toolkit.c

@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/lapd_sapi.h>
 
 #include "packet-e212.h"
 #include "packet-gsm_a_common.h"

epan/dissectors/packet-evrc.c

@@ -40,7 +40,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 
 

epan/dissectors/packet-exported_pdu.c

@@ -26,7 +26,6 @@
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 #include <epan/to_str.h>
-#include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include "packet-mtp3.h"
 #include "packet-dvbci.h"

epan/dissectors/packet-extreme.c

@@ -140,7 +140,6 @@ These are the structures you will see most often in EDP frames.
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>

epan/dissectors/packet-fc.c

@@ -31,13 +31,11 @@
 #include <epan/to_str.h>
 #include <wiretap/wtap.h>
 #include <epan/reassemble.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 #include "packet-fcbls.h"
-#include <epan/tap.h>
 #include <epan/crc32-tvb.h>
 #include <epan/expert.h>
 

epan/dissectors/packet-fcct.c

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

epan/dissectors/packet-fcdns.c

@@ -28,8 +28,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcdns.h"

epan/dissectors/packet-fcels.c

@@ -30,8 +30,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 #include "packet-fc.h"
 #include "packet-fcels.h"

epan/dissectors/packet-fcfcs.c

@@ -25,8 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfcs.h"

epan/dissectors/packet-fcfzs.c

@@ -25,9 +25,7 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfzs.h"

epan/dissectors/packet-fclctl.c

@@ -24,8 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
-#include "packet-fc.h"
 #include "packet-fclctl.h"
 
 const value_string fc_lctl_proto_val[] = {

epan/dissectors/packet-fcoib.c

@@ -32,7 +32,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/crc32-tvb.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
 #include "packet-infiniband.h"

epan/dissectors/packet-fcp.c

@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-scsi.h"
 #include "packet-fc.h"
 #include "packet-fcp.h"

epan/dissectors/packet-fcsb3.c

@@ -25,8 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcsb3.h"
 

epan/dissectors/packet-fcsp.c

@@ -27,8 +27,6 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>
-#include <epan/etypes.h>
-#include "packet-fc.h"
 
 void proto_register_fcsp(void);
 

epan/dissectors/packet-fcswils.c

@@ -26,8 +26,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcswils.h"
 #include "packet-fcct.h"

epan/dissectors/packet-fddi.c

@@ -35,7 +35,6 @@
 #include "packet-fddi.h"
 #include "packet-llc.h"
 #include "packet-sflow.h"
-#include <epan/tap.h>
 
 #include <epan/addr_resolv.h>
 

epan/dissectors/packet-fefd.c

@@ -25,10 +25,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
-#include <epan/oui.h>
-#include <epan/nlpid.h>
 
 void proto_register_fefd(void);
 void proto_reg_handoff_fefd(void);

epan/dissectors/packet-fix.c

@@ -28,12 +28,10 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 
 #include "packet-tcp.h"
 #include "packet-ssl.h"

epan/dissectors/packet-flip.c

@@ -50,7 +50,6 @@
 #include <epan/in_cksum.h>
 
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 
 #include <epan/rtp_pt.h>
 

epan/dissectors/packet-fmp_notify.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-rpc.h"
 #include "packet-fmp.h"

epan/dissectors/packet-fp_hint.c

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

epan/dissectors/packet-fr.c

@@ -52,7 +52,6 @@
 #include <epan/etypes.h>
 #include <epan/oui.h>
 #include <epan/nlpid.h>
-#include <epan/greproto.h>
 
 void proto_register_fr(void);
 void proto_reg_handoff_fr(void);

epan/dissectors/packet-ftp.c

@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>

epan/dissectors/packet-gdb.c

@@ -35,7 +35,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/expert.h>
 #include <epan/tvbparse.h>
 
 enum {

epan/dissectors/packet-giop.c

@@ -278,14 +278,12 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>

epan/dissectors/packet-glusterfs.c

@@ -35,7 +35,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/guid-utils.h>
 
 #include "packet-rpc.h"
 #include "packet-gluster.h"

epan/dissectors/packet-gmr1_rach.c

@@ -31,11 +31,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 
 #include <epan/packet.h>
 
-#include "packet-csn1.h"
 
 void proto_register_gmr1_rach(void);
 void proto_reg_handoff_gmr1_rach(void);

epan/dissectors/packet-gmr1_rr.c

@@ -35,7 +35,6 @@
 #include <epan/packet.h>
 
 #include "packet-gmr1_common.h"
-#include "packet-gsm_sms.h"
 
 #include "packet-gmr1_rr.h"
 

epan/dissectors/packet-gmrp.c

@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/llcsaps.h>
 
 void proto_register_gmrp(void);
 void proto_reg_handoff_gmrp(void);

epan/dissectors/packet-gpef.c

@@ -28,7 +28,6 @@
 #include "packet-windows-common.h"
 #include <epan/asn1.h>
 #include "packet-x509af.h"
-#include "packet-x509if.h"
 
 void proto_register_gpef(void);
 

epan/dissectors/packet-gsm_a_bssmap.c

@@ -39,14 +39,11 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
 
-#include "packet-bssap.h"
 #include "packet-bssgp.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
 #include "packet-ranap.h"

epan/dissectors/packet-gsm_a_common.c

@@ -33,8 +33,6 @@
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
-#include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gmr1_common.h"
 #include "packet-e212.h"

epan/dissectors/packet-gsm_a_dtap.c

@@ -102,16 +102,13 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
-#include <epan/asn1.h>
 #include <epan/strutil.h>
 
 #include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-ber.h"
 #include "packet-q931.h"
 #include "packet-gsm_a_common.h"
 #include "packet-ppp.h"
-#include "packet-gsm_sms.h"
 #include "packet-isup.h"
 
 void proto_register_gsm_a_dtap(void);

epan/dissectors/packet-gsm_a_gm.c

@@ -74,17 +74,11 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/tap.h>
-#include <epan/asn1.h>
 #include <epan/ipproto.h>
-#include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-ber.h"
-#include "packet-q931.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
 #include "packet-ppp.h"

epan/dissectors/packet-gsm_a_rp.c

@@ -33,10 +33,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
-#include <epan/tap.h>
 
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 
 void proto_register_gsm_a_rp(void);

epan/dissectors/packet-gsm_a_rr.c

@@ -46,14 +46,9 @@
 
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/asn1.h>
 #include <epan/expert.h>
-#include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-ber.h"
-#include "packet-q931.h"
 #include "packet-gsm_a_common.h"
-#include "packet-e212.h"
 #include "packet-ppp.h"
 
 #include "packet-gsm_a_rr.h"

epan/dissectors/packet-gsm_abis_om2000.c

@@ -31,9 +31,7 @@
 #include <stdio.h>
 
 #include <epan/packet.h>
-#include <epan/lapd_sapi.h>
 
-#include "packet-gsm_a_common.h"
 
 
 void proto_register_abis_om2000(void);

epan/dissectors/packet-gsm_bssmap_le.c

@@ -30,9 +30,7 @@
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
-#include "packet-e212.h"
 
 void proto_register_gsm_bssmap_le(void);
 void proto_reg_handoff_gsm_bssmap_le(void);

epan/dissectors/packet-gsm_cbch.c

@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/reassemble.h>
-#include "packet-cell_broadcast.h"
 
 void proto_register_gsm_cbch(void);
 void proto_reg_handoff_gsm_cbch(void);

epan/dissectors/packet-gsm_ipa.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
 
 void proto_register_ipa(void);

epan/dissectors/packet-gsm_sim.c

@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/lapd_sapi.h>
 
 void proto_register_gsm_sim(void);
 void proto_reg_handoff_gsm_sim(void);

epan/dissectors/packet-gsm_sms.c

@@ -35,13 +35,11 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/to_str.h>
 #include "packet-gsm_sms.h"
 
 void proto_register_gsm_sms(void);

epan/dissectors/packet-gsm_um.c

@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <wiretap/wtap.h>
-#include <epan/circuit.h>
 
 void proto_register_gsm_um(void);
 void proto_reg_handoff_gsm_um(void);

epan/dissectors/packet-gsmtap.c

@@ -43,7 +43,6 @@
 #include <epan/packet.h>
 
 #include "packet-tetra.h"
-#include "packet-rrc.h"
 
 void proto_register_gsmtap(void);
 void proto_reg_handoff_gsmtap(void);

epan/dissectors/packet-gssapi.c

@@ -25,15 +25,11 @@
 
 #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/asn1.h>
-#include <epan/to_str.h>
 #include <epan/show_exception.h>
 
 #include "packet-ber.h"

epan/dissectors/packet-gtp.c

@@ -62,12 +62,9 @@
 #include <epan/to_str.h>
 #include "packet-ppp.h"
 #include "packet-radius.h"
-#include "packet-bssap.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_map.h"
 #include "packet-gprscdr.h"
-#include "packet-per.h"
-#include "packet-ranap.h"
 #include "packet-bssgp.h"
 #include "packet-e212.h"
 #include "packet-gtp.h"

epan/dissectors/packet-gtpv2.c

@@ -36,7 +36,6 @@
 #include "packet-e164.h"
 #include "packet-e212.h"
 #include "packet-s1ap.h"
-#include "packet-ranap.h"
 #include "packet-bssgp.h"
 #include "packet-ntp.h"
 #include "packet-gtpv2.h"

epan/dissectors/packet-gvrp.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/llcsaps.h>
 
 void proto_register_gvrp(void);
 void proto_reg_handoff_gvrp(void);

epan/dissectors/packet-h223.c

@@ -23,14 +23,12 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/circuit.h>
 #include <epan/conversation.h>
 #include <epan/exceptions.h>
 #include <epan/stream.h>
-#include <epan/reassemble.h>
 #include <epan/golay.h>
 #include <epan/iax2_codec_type.h>
 #include <epan/show_exception.h>

epan/dissectors/packet-h248_3gpp.c

@@ -33,7 +33,6 @@ void proto_register_h248_3gpp(void);
 #define PSNAME "H2483GPP"
 #define PFNAME "h248.3gpp"
 
-#include "packet-isup.h"
 #include "packet-gsm_a_common.h"
 
 /*

epan/dissectors/packet-h248_annex_c.c

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

epan/dissectors/packet-h248_annex_e.c

@@ -28,8 +28,6 @@
 
 /*****/
 #include <epan/packet.h>
-#include <epan/tvbuff-int.h>
-#include <epan/tvbparse.h>
 /*****/
 
 #include "packet-h248.h"
@@ -40,7 +38,6 @@ void proto_register_h248_annex_e(void);
 #define PSNAME "H248E"
 #define PFNAME "h248e"
 /*
-#include "packet-alcap.h"
 */
 static int proto_h248_annex_E = -1;
 

epan/dissectors/packet-h248_q1950.c

@@ -28,7 +28,6 @@
 #include "config.h"
 
 #include "packet-h248.h"
-#include "packet-isup.h"
 
 void proto_reg_handoff_q1950(void);
 void proto_register_q1950(void);

epan/dissectors/packet-h264.c

@@ -30,11 +30,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/asn1.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include "packet-h264.h"

epan/dissectors/packet-hartip.c

@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/tap.h>
 #include <epan/stats_tree.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>

epan/dissectors/packet-hci_h1.c

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

epan/dissectors/packet-hclnfsd.c

@@ -25,12 +25,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
-#include "packet-rpc.h"
 #include "packet-nfs.h"
 
-#include <epan/wmem/wmem.h>
 
 void proto_register_hclnfsd(void);
 void proto_reg_handoff_hclnfsd(void);

epan/dissectors/packet-hdcp.c

@@ -33,7 +33,6 @@
 
 #include <epan/packet.h>
 #include <epan/ptvcursor.h>
-#include <epan/expert.h>
 void proto_register_hdcp(void);
 
 static int proto_hdcp  = -1;

epan/dissectors/packet-hip.c

@@ -36,7 +36,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/addr_resolv.h>
 
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>

epan/dissectors/packet-hislip.c

@@ -30,7 +30,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-hpext.c

@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/xdlc.h>
-#include <epan/etypes.h>
 #include <epan/llcsaps.h>
 #include "packet-hpext.h"
 

epan/dissectors/packet-hpsw.c

@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 
 #include "packet-hpext.h"

epan/dissectors/packet-hsrp.c

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

epan/dissectors/packet-http.c

@@ -30,15 +30,12 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 #include <epan/stats_tree.h>
 #include <epan/to_str.h>
@@ -55,7 +52,6 @@ typedef enum _http_type {
 	HTTP_OTHERS
 } http_type_t;
 
-#include <epan/tap.h>
 
 void proto_register_http(void);
 void proto_reg_handoff_http(void);

epan/dissectors/packet-http2.c

@@ -42,9 +42,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/expert.h>
-#include <epan/conversation.h>
-#include <epan/follow.h>
 
 #include <epan/nghttp2/nghttp2.h>
 

epan/dissectors/packet-iapp.c

@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
 #include <epan/oui.h>
 
 void proto_register_iapp(void);

epan/dissectors/packet-iax2.c

@@ -30,17 +30,14 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/circuit.h>
 #include <epan/exceptions.h>
-#include <epan/to_str.h>
 #include <epan/reassemble.h>
 #include <epan/expert.h>
 #include <epan/aftypes.h>
 #include <epan/tap.h>
-#include <epan/tap-voip.h>
 
 #include "packet-iax2.h"
 #include <epan/iax2_codec_type.h>

epan/dissectors/packet-icap.c

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

epan/dissectors/packet-icmp.c

@@ -32,8 +32,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <time.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>

epan/dissectors/packet-icmpv6.c

@@ -35,10 +35,7 @@
 
 #include <epan/packet.h>
 #include <epan/in_cksum.h>
-#include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
-#include <epan/asn1.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>