Deleting unnecessary #includes from dissectors.

Fifth batch (packet-rtp.c -> end).

Will look at cleaning up and committing script afterwards.

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

epan/dissectors/packet-rtp.c

@@ -65,9 +65,7 @@
 #include <epan/conversation.h>
 #include <epan/reassemble.h>
 #include <epan/tap.h>
-#include <epan/epan_dissect.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 
 /* un-comment the following as well as this line in conversation.c, to enable debug printing */
 /* #define DEBUG_CONVERSATION */

epan/dissectors/packet-rtpproxy.c

@@ -31,7 +31,6 @@
 #include <stdlib.h>
 
 #include <epan/packet.h>
-#include <epan/address.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>

epan/dissectors/packet-rtps.c

@@ -54,7 +54,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <epan/addr_resolv.h>
 #include "packet-rtps.h"
 
 void proto_register_rtps(void);

epan/dissectors/packet-rtsp.c

@@ -37,7 +37,6 @@
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/strutil.h>
-#include <epan/tap.h>
 #include <epan/tap-voip.h>
 #include <epan/stats_tree.h>
 #include <wsutil/str_util.h>

epan/dissectors/packet-sametime.c

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

epan/dissectors/packet-sccp.c

@@ -36,17 +36,14 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/asn1.h>
 #include <epan/uat.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
-#include <epan/address.h>
 #include <epan/to_str.h>
 #include <wiretap/wtap.h>
 #include "packet-mtp3.h"
@@ -54,7 +51,6 @@
 #include "packet-sccp.h"
 #include "packet-e164.h"
 #include "packet-e212.h"
-#include "packet-frame.h"
 
 /* function prototypes */
 void proto_register_sccp(void);

epan/dissectors/packet-scop.c

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

epan/dissectors/packet-scsi-mmc.c

@@ -26,9 +26,7 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/conversation.h>
-#include <epan/tap.h>
 #include "packet-scsi.h"
-#include "packet-fc.h"
 #include "packet-scsi-mmc.h"
 #include "packet-scsi-sbc.h"
 

epan/dissectors/packet-scsi-osd.c

@@ -28,10 +28,8 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/tap.h>
 #include <epan/expert.h>
 #include "packet-scsi.h"
-#include "packet-fc.h"
 #include "packet-scsi-osd.h"
 
 void proto_register_scsi_osd(void);

epan/dissectors/packet-scsi-sbc.c

@@ -38,9 +38,7 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/tap.h>
 #include "packet-scsi.h"
-#include "packet-fc.h"
 #include "packet-scsi-sbc.h"
 
 void proto_register_scsi_sbc(void);

epan/dissectors/packet-scsi-smc.c

@@ -29,9 +29,7 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/tap.h>
 #include "packet-scsi.h"
-#include "packet-fc.h"
 #include "packet-scsi-smc.h"
 
 void proto_register_scsi_smc(void);

epan/dissectors/packet-scsi-ssc.c

@@ -33,9 +33,7 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/tap.h>
 #include "packet-scsi.h"
-#include "packet-fc.h"
 #include "packet-scsi-ssc.h"
 #include "packet-scsi-smc.h"
 

epan/dissectors/packet-scsi.c

@@ -80,7 +80,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
@@ -88,7 +87,6 @@
 #include <epan/reassemble.h>
 #include <epan/expert.h>
 #include "packet-scsi.h"
-#include "packet-fc.h"
 #include "packet-scsi-osd.h"
 #include "packet-scsi-mmc.h"
 #include "packet-scsi-sbc.h"

epan/dissectors/packet-sctp.c

@@ -51,12 +51,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/exceptions.h>
-#include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>

epan/dissectors/packet-sdp.c

@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
@@ -49,7 +48,6 @@
 #include "packet-t38.h"
 #include "packet-msrp.h"
 #include "packet-sprt.h"
-#include "packet-per.h"
 #include "packet-h245.h"
 #include "packet-h264.h"
 #include "packet-mp4ves.h"

epan/dissectors/packet-sebek.c

@@ -27,11 +27,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <time.h>
 #include <math.h>
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 
 /*
   Sebek v2:

epan/dissectors/packet-selfm.c

@@ -63,7 +63,6 @@
 #include <epan/to_str.h>
 #include <epan/reassemble.h>
 #include <epan/expert.h>
-#include <epan/conversation.h>
 #include <epan/crc16-tvb.h>
 #include "packet-rtacser.h"
 

epan/dissectors/packet-ses.c

@@ -28,10 +28,8 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <epan/asn1.h>
 #include <epan/conversation.h>
 #include <epan/reassemble.h>
-#include <epan/show_exception.h>
 
 #include "packet-ber.h"
 #include "packet-ses.h"

epan/dissectors/packet-sgsap.c

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

epan/dissectors/packet-sigcomp.c

@@ -33,7 +33,6 @@
 #include <math.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
 #include <epan/sigcomp-udvm.h>

epan/dissectors/packet-sip.c

@@ -37,14 +37,12 @@
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/req_resp_hdrs.h>
-#include <epan/strutil.h>
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include <epan/expert.h>
 
 #include <wsutil/str_util.h>
 
-#include "packet-tcp.h"
 #include "packet-ssl.h"
 
 #include "packet-isup.h"

epan/dissectors/packet-sita.c

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

epan/dissectors/packet-slimp3.c

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

epan/dissectors/packet-slsk.c

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

epan/dissectors/packet-smb-browse.c

@@ -25,12 +25,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
 
-#include "packet-smb.h"
 #include "packet-smb-browse.h"
 #include "packet-dcerpc.h"
 

epan/dissectors/packet-smb-common.c

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

epan/dissectors/packet-smb-mailslot.c

@@ -25,13 +25,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include "packet-smb.h"
 #include "packet-smb-mailslot.h"
-#include "packet-smb-browse.h"
-#include "packet-smb-pipe.h"
 
 void proto_register_smb_mailslot(void);
 void proto_reg_handoff_smb_mailslot(void);

epan/dissectors/packet-smb-pipe.c

@@ -31,8 +31,6 @@ XXX  Fixme : shouldn't show [malformed frame] for long packets
 
 #include "config.h"
 
-#include <time.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/to_str.h>
@@ -43,7 +41,6 @@ XXX  Fixme : shouldn't show [malformed frame] for long packets
 #include "packet-smb-browse.h"
 #include "packet-smb-common.h"
 #include "packet-windows-common.h"
-#include "packet-dcerpc.h"
 
 void proto_register_pipe_lanman(void);
 void proto_register_pipe_dcerpc(void);

epan/dissectors/packet-smb-sidsnooping.c

@@ -24,12 +24,10 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/strutil.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-smb.h"

epan/dissectors/packet-smb.c

@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
@@ -44,7 +43,6 @@
 #include "packet-smb-common.h"
 #include "packet-smb-mailslot.h"
 #include "packet-smb-pipe.h"
-#include "packet-dcerpc.h"
 #include "packet-ntlmssp.h"
 #include "packet-smb2.h"
 

epan/dissectors/packet-smb2.c

@@ -30,24 +30,20 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/aftypes.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
 
 #include "packet-smb2.h"
-#include "packet-dcerpc.h"
 #include "packet-ntlmssp.h"
 #include "packet-kerberos.h"
 #include "packet-windows-common.h"
 #include "packet-smb-common.h"
-#include "packet-smb.h"
 #include "packet-dcerpc-nt.h"
 
 /* Use libgcrypt for cipher libraries. */

epan/dissectors/packet-smcr.c

@@ -30,8 +30,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
-#include <epan/conversation.h>
 
 #include "packet-tcp.h"
 

epan/dissectors/packet-smpp.c

@@ -50,12 +50,9 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <time.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/tap.h>
 #include <epan/stats_tree.h>
 
 #include <epan/prefs.h>

epan/dissectors/packet-socks.c

@@ -61,7 +61,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 
 #include "packet-tcp.h"
 #include "packet-udp.h"

epan/dissectors/packet-soupbintcp.c

@@ -57,7 +57,6 @@
 #include <stdlib.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 /* For tcp_dissect_pdus() */
 #include "packet-tcp.h"

epan/dissectors/packet-spdy.c

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

epan/dissectors/packet-srp.c

@@ -24,8 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/circuit.h>
-#include <epan/stream.h>
 #include <epan/crc16-tvb.h>
 
 void proto_register_srp(void);

epan/dissectors/packet-srvloc.c

@@ -37,10 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <string.h>
-#include <time.h>
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 #include <epan/expert.h>

epan/dissectors/packet-ssh.c

@@ -51,7 +51,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/sctpppids.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>

epan/dissectors/packet-ssl.c

@@ -84,16 +84,11 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/reassemble.h>
-#include <epan/prefs.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
-#include <epan/expert.h>
 #include <epan/uat.h>
 #include <epan/exported_pdu.h>
-#include <wsutil/filesystem.h>
-#include <wsutil/file_util.h>
 #include "packet-tcp.h"
 #include "packet-x509af.h"
 #include "packet-ocsp.h"

epan/dissectors/packet-starteam.c

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

epan/dissectors/packet-stun.c

@@ -43,10 +43,7 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/ipproto.h>
 #include "packet-tcp.h"
-#include "packet-udp.h"
 
 void proto_register_stun(void);
 void proto_reg_handoff_stun(void);

epan/dissectors/packet-sua.c

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

epan/dissectors/packet-synergy.c

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

epan/dissectors/packet-synphasor.c

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

epan/dissectors/packet-sysex.c

@@ -24,7 +24,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/reassemble.h>
 
 void proto_register_sysex(void);
 

epan/dissectors/packet-syslog.c

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

epan/dissectors/packet-t30.c

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <string.h>
 
-#include <glib/gprintf.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>

epan/dissectors/packet-tali.c

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

epan/dissectors/packet-tcp.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
@@ -33,11 +32,9 @@
 #include <epan/follow.h>
 #include <epan/prefs.h>
 #include <epan/show_exception.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <epan/color_dissector_filters.h>
 #include <epan/reassemble.h>
-#include <epan/tap.h>
 #include <epan/decode_as.h>
 #include <epan/in_cksum.h>
 

epan/dissectors/packet-tds.c

@@ -144,12 +144,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/conversation.h>
-#include <epan/strutil.h>
 #include <epan/show_exception.h>
 #include <epan/reassemble.h>
 #include <epan/prefs.h>

epan/dissectors/packet-telnet.c

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

epan/dissectors/packet-teredo.c

@@ -28,11 +28,8 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
 
-#include "packet-ip.h"
 #include <epan/tap.h>
 
 #define UDP_PORT_TEREDO 3544

epan/dissectors/packet-tftp.c

@@ -44,7 +44,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/range.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
 

epan/dissectors/packet-tivoconnect.c

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

epan/dissectors/packet-tn3270.c

@@ -45,12 +45,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/address.h>
 #include <epan/conversation.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 
 #include "packet-tn3270.h"

epan/dissectors/packet-tn5250.c

@@ -33,7 +33,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/address.h>
 #include <epan/conversation.h>
 #include "packet-tn5250.h"
 

epan/dissectors/packet-tnef.c

@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/expert.h>
 
 #include <wiretap/tnef.h>

epan/dissectors/packet-tpncp.c

@@ -28,12 +28,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/to_str.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>

epan/dissectors/packet-tr.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/exceptions.h>
@@ -34,7 +33,6 @@
 #include "packet-sflow.h"
 #include <epan/prefs.h>
 #include <wiretap/wtap.h>
-#include <epan/tap.h>
 void proto_register_tr(void);
 void proto_reg_handoff_tr(void);
 

epan/dissectors/packet-trmac.c

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

epan/dissectors/packet-uasip.c

@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include "epan/packet.h"
 #include "epan/prefs.h"
-#include "epan/tap.h"
 #include <epan/addr_resolv.h>
 
 #include "packet-uaudp.h"

epan/dissectors/packet-uaudp.c

@@ -25,7 +25,6 @@
 
 #include "epan/packet.h"
 #include "epan/prefs.h"
-#include "epan/tap.h"
 
 #include "packet-uaudp.h"
 

epan/dissectors/packet-ubertooth.c

@@ -31,7 +31,6 @@
 
 #include "packet-bluetooth.h"
 #include "packet-ubertooth.h"
-#include "packet-usb.h"
 
 static int proto_ubertooth = -1;
 

epan/dissectors/packet-ucp.c

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

epan/dissectors/packet-udld.c

@@ -24,10 +24,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/strutil.h>
 
-#include <epan/oui.h>
-#include <epan/nlpid.h>
 
 
 /*

epan/dissectors/packet-udp.c

@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
@@ -38,11 +37,9 @@
 
 #include "packet-udp.h"
 
-#include "packet-ip.h"
 #include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <epan/color_dissector_filters.h>
-#include <epan/tap.h>
 #include <epan/decode_as.h>
 
 void proto_register_udp(void);

epan/dissectors/packet-uma.c

@@ -54,12 +54,10 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/asn1.h>
 #include "packet-bssap.h"
 #include "packet-gsm_a_common.h"
-#include "packet-gsm_map.h"
 #include "packet-rtp.h"
 #include "packet-rtcp.h"
 #include "packet-e212.h"

epan/dissectors/packet-umts_fp.c

@@ -34,8 +34,6 @@
 #include <wsutil/crc16-plain.h> /* For FP Payload CRC. */
 #include <wsutil/crc11.h> /* For FP EDCH header CRC. */
 
-#include "packet-umts_mac.h"
-#include "packet-rlc.h"
 #include "packet-umts_fp.h"
 #include "packet-nbap.h"
 #include "packet-rrc.h"

epan/dissectors/packet-umts_mac.c

@@ -30,7 +30,6 @@
 #include "packet-rrc.h"
 #include "packet-umts_fp.h"
 #include "packet-umts_mac.h"
-#include "packet-rlc.h"
 #include "packet-nbap.h"
 
 void proto_register_umts_mac(void);

epan/dissectors/packet-usb-hid.c

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

epan/dissectors/packet-usb.c

@@ -26,10 +26,7 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
-#include <epan/tap.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>

epan/dissectors/packet-user_encap.c

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

epan/dissectors/packet-v52.c

@@ -33,7 +33,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/expert.h>
 
 void proto_register_v52(void);
 

epan/dissectors/packet-v5dl.c

@@ -34,7 +34,6 @@
 
 #include <epan/packet.h>
 #include <epan/xdlc.h>
-#include <epan/crc16-tvb.h>
 
 void proto_register_v5dl(void);
 

epan/dissectors/packet-v5ef.c

@@ -33,8 +33,6 @@
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
-#include <epan/xdlc.h>
-#include <epan/crc16-tvb.h>
 
 void proto_register_v5ef(void);
 

epan/dissectors/packet-v5ua.c

@@ -42,8 +42,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 #include <epan/sctpppids.h>      /* include V5UA payload protocol ID */
 
 void proto_register_v5ua(void);

epan/dissectors/packet-vines.c

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

epan/dissectors/packet-vxi11.c

@@ -28,7 +28,6 @@
 
 #include "packet-rpc.h"
 #include <epan/to_str.h>
-#include <epan/wmem/wmem.h>
 
 /*
  * For the protocol specifications, see

epan/dissectors/packet-wassp.c

@@ -44,7 +44,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/expert.h>
 #include <epan/show_exception.h>
 
 void proto_register_wassp(void);

epan/dissectors/packet-wbxml.c

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

epan/dissectors/packet-wccp.c

@@ -27,8 +27,6 @@
 #include <epan/to_str.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
-#include <epan/ipv6-utils.h>
-#include <epan/ipv4.h>
 #include "packet-wccp.h"
 
 void proto_register_wccp(void);

epan/dissectors/packet-wcp.c

@@ -96,8 +96,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>

epan/dissectors/packet-wfleet-hdlc.c

@@ -24,10 +24,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
-#include "packet-chdlc.h"
-#include "packet-ip.h"
 
 void proto_register_wfleet_hdlc(void);
 void proto_reg_handoff_wfleet_hdlc(void);

epan/dissectors/packet-who.c

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

epan/dissectors/packet-wifi-display.c

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

epan/dissectors/packet-windows-common.c

@@ -22,12 +22,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/exceptions.h>
-#include "packet-dcerpc.h"
 #include "packet-smb-sidsnooping.h"
 #include "packet-windows-common.h"
 #include "packet-smb.h"	/* for "sid_name_snooping" */

epan/dissectors/packet-winsrepl.c

@@ -26,15 +26,12 @@
 
 #include "config.h"
 
-#include <time.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #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"
 
 #include "packet-tcp.h"

epan/dissectors/packet-x11.c

@@ -48,8 +48,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>

epan/dissectors/packet-x224.c

@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 
-#include "packet-tpkt.h"
 #include <epan/conversation.h>
 void proto_register_x224(void);
 void proto_reg_handoff_x224(void);

epan/dissectors/packet-x25.c

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

epan/dissectors/packet-xcsl.c

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

epan/dissectors/packet-xmcp.c

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

epan/dissectors/packet-xmpp-conference.c

@@ -28,9 +28,7 @@
 
 #include <epan/packet.h>
 
-#include "packet-xml.h"
 #include "packet-xmpp.h"
-#include "packet-xmpp-utils.h"
 #include "packet-xmpp-conference.h"
 
 

epan/dissectors/packet-xmpp-core.c

@@ -26,12 +26,7 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/expert.h>
-#include <epan/strutil.h>
-#include <epan/tvbparse.h>
 
-#include "packet-xml.h"
-#include "packet-xmpp-utils.h"
 #include "packet-xmpp.h"
 #include "packet-xmpp-core.h"
 #include "packet-xmpp-jingle.h"

epan/dissectors/packet-xmpp-gtalk.c

@@ -28,9 +28,7 @@
 
 #include <epan/packet.h>
 
-#include "packet-xml.h"
 #include "packet-xmpp.h"
-#include "packet-xmpp-utils.h"
 #include "packet-xmpp-gtalk.h"
 #include "packet-xmpp-conference.h"
 

epan/dissectors/packet-xmpp-jingle.c

@@ -41,9 +41,7 @@
 
 #include <epan/packet.h>
 
-#include "packet-xml.h"
 #include "packet-xmpp.h"
-#include "packet-xmpp-utils.h"
 #include "packet-xmpp-jingle.h"
 #include "packet-xmpp-conference.h"
 #include "packet-xmpp-gtalk.h"

epan/dissectors/packet-xmpp-other.c

@@ -24,11 +24,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include "packet-xml.h"
-#include "packet-xmpp-utils.h"
 #include "packet-xmpp.h"
 #include "packet-xmpp-other.h"
 

epan/dissectors/packet-xmpp-utils.c

@@ -25,11 +25,8 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/expert.h>
-#include <epan/tvbparse.h>
 #include <epan/strutil.h>
 
-#include "packet-xml.h"
 #include "packet-xmpp.h"
 #include "packet-xmpp-core.h"
 #include "packet-xmpp-utils.h"

epan/dissectors/packet-xmpp.c

@@ -24,17 +24,13 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 
-#include "packet-xmpp-utils.h"
 #include "packet-xmpp.h"
 #include "packet-xmpp-core.h"
-#include "packet-xmpp-jingle.h"
-#include "packet-xml.h"
 
 #define XMPP_PORT 5222