diff options
116 files changed, 0 insertions, 204 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 229f90effc..413fcf4484 100644 --- a/epan/dissectors/packet-rtp.c +++ b/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 */ diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index f5c5200af5..5d515b9711 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/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> diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 53f265dad6..218068b53c 100644 --- a/epan/dissectors/packet-rtps.c +++ b/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); diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 970bff011e..014c3ed804 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/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> diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c index fb224a47a5..9bfdf7f88f 100644 --- a/epan/dissectors/packet-sametime.c +++ b/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" diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 8f91f14400..0cf5e8ee33 100644 --- a/epan/dissectors/packet-sccp.c +++ b/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); diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c index c84ac97fef..e2db6be5ee 100644 --- a/epan/dissectors/packet-scop.c +++ b/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" diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index bcef5326d9..83ec49fcfd 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/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" diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index fc235a4d68..d9c87d95d6 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/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); diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 43a6529dd9..6d42cb7c33 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/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); diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 260bf3141b..534bf751ed 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/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); diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index b113ed9115..079c3eb827 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/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" diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 997cdbba6e..1506353964 100644 --- a/epan/dissectors/packet-scsi.c +++ b/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" diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 55e3cbb7a3..5eacaa5633 100644 --- a/epan/dissectors/packet-sctp.c +++ b/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> diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index e03c0049f2..e62db324bc 100644 --- a/epan/dissectors/packet-sdp.c +++ b/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" diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index d4fbede2c8..deba4d5bb7 100644 --- a/epan/dissectors/packet-sebek.c +++ b/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: diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index b4b7176f9c..c8fbd888d3 100644 --- a/epan/dissectors/packet-selfm.c +++ b/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" diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 730850159e..b3bfc1b7e8 100644 --- a/epan/dissectors/packet-ses.c +++ b/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" diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 6c519d5cef..e3da358a8e 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/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" diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 468e4e6609..59e8b77d10 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/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> diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 97f3a44e01..549686a88f 100644 --- a/epan/dissectors/packet-sip.c +++ b/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" diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index ccd46f15ff..cc66ce5104 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -27,7 +27,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 7d3f3d82e6..df321721ef 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -27,7 +27,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 832f03d366..6b0b66603f 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -30,7 +30,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 6f8a00c36a..e23dc7d654 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/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" diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c index 0d79e7478f..204c08bfd6 100644 --- a/epan/dissectors/packet-smb-common.c +++ b/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" diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 48f218d134..81ab388b25 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/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); diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index c67152ff42..18624d5df7 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/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); diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 15dbd290aa..33a573192d 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/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" diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 6664b2958b..09f1b2a30f 100644 --- a/epan/dissectors/packet-smb.c +++ b/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" diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0e8800f807..b33e90880b 100644 --- a/epan/dissectors/packet-smb2.c +++ b/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. */ diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smcr.c index 2c745bed8c..1c6679d70c 100644 --- a/epan/dissectors/packet-smcr.c +++ b/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" diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index f21d598da7..cec2921cda 100644 --- a/epan/dissectors/packet-smpp.c +++ b/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> diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 3f2d16dcc6..e32f3f93b3 100644 --- a/epan/dissectors/packet-socks.c +++ b/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" diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index ffef35dca2..2e47558fc6 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/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" diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index cf273169d9..69050b8e7a 100644 --- a/epan/dissectors/packet-spdy.c +++ b/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> diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index 97a21f24e0..2807b03506 100644 --- a/epan/dissectors/packet-srp.c +++ b/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); diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 2b6d322b2b..80c08d4a66 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/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> diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 17bcc8c5cb..e108fbefdb 100644 --- a/epan/dissectors/packet-ssh.c +++ b/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> diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 487c00cb21..20b0bba398 100644 --- a/epan/dissectors/packet-ssl.c +++ b/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" diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 308b53e138..ae7d466500 100644 --- a/epan/dissectors/packet-starteam.c +++ b/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" diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index f7cdecdefc..406f7cbe91 100644 --- a/epan/dissectors/packet-stun.c +++ b/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); diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index c92877c5a2..6f32185951 100644 --- a/epan/dissectors/packet-sua.c +++ b/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> diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 667d9dd0ec..76bd1268e8 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -23,7 +23,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index f3567a07fd..bfe62a0ada 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/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" diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c index 3f6b4caaa0..badf60ad7b 100644 --- a/epan/dissectors/packet-sysex.c +++ b/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); diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 034e8893cf..173cfd6667 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -28,7 +28,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index abb249ac0a..aae0eefb9c 100644 --- a/epan/dissectors/packet-t30.c +++ b/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> diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c index 8619d950c2..92f5c1eb97 100644 --- a/epan/dissectors/packet-tali.c +++ b/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" diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 7c8b688517..115ac78b9e 100644 --- a/epan/dissectors/packet-tcp.c +++ b/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> diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 09cd888d55..ac0234b74a 100644 --- a/epan/dissectors/packet-tds.c +++ b/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> diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index a5cfc926ca..381047ea05 100644 --- a/epan/dissectors/packet-telnet.c +++ b/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> diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 53f4422f8c..53d7bdb6d8 100644 --- a/epan/dissectors/packet-teredo.c +++ b/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 diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index dd8cd49fdd..2455d59708 100644 --- a/epan/dissectors/packet-tftp.c +++ b/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> diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index e6ac03c4ad..fb6025bf38 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -37,7 +37,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index b25c0f837d..4f5fd9e46e 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/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" diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 3b6d760697..b377aaca7d 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/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" diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 9e237f7524..865042ab28 100644 --- a/epan/dissectors/packet-tnef.c +++ b/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> diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index ae535e04ca..0b1a43319a 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/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> diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index f2100e492d..9f49d5bc7a 100644 --- a/epan/dissectors/packet-tr.c +++ b/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); diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 258cdb6920..4206f4fd72 100644 --- a/epan/dissectors/packet-trmac.c +++ b/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> diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c index 40f4436d8b..0df357fb92 100644 --- a/epan/dissectors/packet-uasip.c +++ b/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" diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index c000973002..93da22a073 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/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" diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index ade856aa48..b2ad67506b 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/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; diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 2ff17dcbb1..100934612f 100644 --- a/epan/dissectors/packet-ucp.c +++ b/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" diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 124ed33c7a..7e6f2ea569 100644 --- a/epan/dissectors/packet-udld.c +++ b/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> /* diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 26c1f3b9a7..e6e81561f9 100644 --- a/epan/dissectors/packet-udp.c +++ b/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); diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 512fbb13a4..472cd251a0 100644 --- a/epan/dissectors/packet-uma.c +++ b/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" diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index ca7d20b789..133e87ce73 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/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" diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 2572111d63..42f8695776 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/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); diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index a228efd911..0d9673bebc 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -21,7 +21,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include "packet-usb.h" diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 8feab0eada..49b7ab81b5 100644 --- a/epan/dissectors/packet-usb.c +++ b/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> diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index 4f192de3e8..0abc27a500 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.c @@ -23,7 +23,6 @@ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index cc55d2822e..9901161ee2 100644 --- a/epan/dissectors/packet-v52.c +++ b/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); diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c index c4d8fb280c..455f029618 100644 --- a/epan/dissectors/packet-v5dl.c +++ b/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); diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c index 90e474ff30..c407fa0807 100644 --- a/epan/dissectors/packet-v5ef.c +++ b/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); diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 8bea1f04ae..95a9878d89 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/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); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index ca9816e59c..98206401d7 100644 --- a/epan/dissectors/packet-vines.c +++ b/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> diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index 3656221042..4597a74165 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/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 diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 59306c10b4..678c467dca 100644 --- a/epan/dissectors/packet-wassp.c +++ b/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); diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 8e9a19acd4..143019f1a2 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -44,7 +44,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 2e41ae4723..268554e8e3 100644 --- a/epan/dissectors/packet-wccp.c +++ b/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); diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 779c1f5f08..432943eede 100644 --- a/epan/dissectors/packet-wcp.c +++ b/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> diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index 32aa3145b2..5d62a1fe8a 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/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); diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index be8dcdeebd..99334bd0e5 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -23,7 +23,6 @@ #include "config.h" -#include <time.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c index 6ea7eebb27..cb7729d7f7 100644 --- a/epan/dissectors/packet-wifi-display.c +++ b/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); diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index a9be550717..4d19ce8367 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/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" */ diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index c7a19a2601..291943de32 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/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" diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 6edcde7d21..e8f6d3bf70 100644 --- a/epan/dissectors/packet-x11.c +++ b/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> diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index 867eb6773a..3e8c4dc733 100644 --- a/epan/dissectors/packet-x224.c +++ b/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); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 7dee4160e5..a70d2b843a 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -23,7 +23,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/ax25_pids.h> diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index f9263a19f5..9328157efa 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -28,7 +28,6 @@ #include "config.h" #include <stdlib.h> -#include <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 0cbf4e50b8..2c737723ff 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp-conference.c b/epan/dissectors/packet-xmpp-conference.c index 47b816bf88..851df32f3b 100644 --- a/epan/dissectors/packet-xmpp-conference.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 92dd573499..5466cf2884 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp-gtalk.c b/epan/dissectors/packet-xmpp-gtalk.c index 1eb9365965..a76e1db983 100644 --- a/epan/dissectors/packet-xmpp-gtalk.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp-jingle.c b/epan/dissectors/packet-xmpp-jingle.c index 6880b4f741..3ccc0ba696 100644 --- a/epan/dissectors/packet-xmpp-jingle.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index 389e99d619..8fd092b463 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 7ca4850426..68eeeda32c 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/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" diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index e323737907..f4a2122e10 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/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 diff --git a/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c index a3f5f0f733..61533043d4 100644 --- a/epan/dissectors/packet-yami.c +++ b/epan/dissectors/packet-yami.c @@ -30,7 +30,6 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/strutil.h> #include <epan/to_str.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 44647b4af2..b28393ac7f 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -25,13 +25,11 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> /* req'd for packet-zbee-security.h */ #include <epan/expert.h> #include <epan/reassemble.h> -#include <epan/to_str.h> #include "packet-zbee.h" #include "packet-zbee-nwk.h" diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 1a2b90abb9..e7db47d496 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -30,16 +30,12 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> -#include <epan/addr_resolv.h> -#include <epan/expert.h> #include <epan/uat.h> -#include "packet-ieee802154.h" #include "packet-zbee.h" #include "packet-zbee-nwk.h" #include "packet-zbee-security.h" #include "packet-zbee-aps.h" #include "packet-zbee-zcl.h" -#include <wsutil/wsgcrypt.h> void proto_register_zbee_nwk_gp(void); void proto_reg_handoff_zbee_nwk_gp(void); diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 0cdb9c909c..35eaa4d907 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -25,14 +25,12 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/expert.h> -#include "packet-ieee802154.h" #include "packet-zbee.h" #include "packet-zbee-nwk.h" #include "packet-zbee-security.h" diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 253ae74688..741dc4d865 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -25,7 +25,6 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 945a54bf38..ee3c1452cd 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -26,7 +26,6 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index eda1e3383e..5f0bbf5846 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -26,7 +26,6 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index 8774d9ba22..34b27341b1 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -26,7 +26,6 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include "packet-zbee.h" diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c index 34dc5124b9..08fd95c14b 100644 --- a/epan/dissectors/packet-zbee-zcl-misc.c +++ b/epan/dissectors/packet-zbee-zcl-misc.c @@ -26,10 +26,8 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> -#include <epan/to_str.h> #include "packet-zbee.h" #include "packet-zbee-aps.h" diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index 379f832aa7..457f1de682 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -26,7 +26,6 @@ /* Include Files */ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 1d585a95cf..70be1b51d1 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -32,7 +32,6 @@ #include "packet-zbee.h" #include "packet-zbee-nwk.h" -#include "packet-zbee-aps.h" #include "packet-zbee-zcl.h" /************************* diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 4b9df53695..cba7d4b288 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -26,7 +26,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/expert.h> #include "packet-zbee.h" #include "packet-zbee-nwk.h" diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 9a5844b565..f9e235fc37 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -24,7 +24,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 82ef9fb648..3422eb7876 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -43,7 +43,6 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index 4a85243cff..588b0efdeb 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -31,7 +31,6 @@ #include <epan/packet.h> #include <epan/expert.h> -#include <epan/conversation.h> #include "packet-ziop.h" #include "packet-giop.h" diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index 40360c7f0f..4cfe30f2e9 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -26,9 +26,7 @@ #include "config.h" -#include <string.h> #include <epan/packet.h> -#include <epan/strutil.h> #include <epan/crc32-tvb.h> #include <wsutil/crc32.h> #include "packet-rtp.h" |