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>

diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 229f90effccce28441f6c0f8aafdb2acf14c601f..413fcf4484addef5196e51b5be07a1ee2ac998cc 100644 (file)
--- 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 f5c5200af53961cc9e4f52270242d535af71205e..5d515b97112a7f6b4aa13e57b6d97a2d0289840a 100644 (file)
--- 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 53f265dad6d83d50febfb9d6157f8cddb3ce14bf..218068b53cc3a48bf8462d08a797d2147980ec0d 100644 (file)
--- 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 970bff011e6944fe3df1c0b0cc3b6150ccc378d5..014c3ed8047d9e125dc77321120c3369482a1fa9 100644 (file)
--- 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 fb224a47a56c991bdd7a7305113f09dcab5bfa37..9bfdf7f88fcd77be11b1f11f5ba20bda94ddc88d 100644 (file)
--- 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 8f91f14400a4aa5c2c06f0f430cc1179f72abf04..0cf5e8ee33a1c76022f2d266dfb1f21e6fce02dd 100644 (file)
--- 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 c84ac97fef91872ea924792fc7e76c22128935f1..e2db6be5ee9a00d8a4c36b7e920051645b6b5831 100644 (file)
--- 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 bcef5326d9b6f21528d0d279bc436540bc35ab4a..83ec49fcfd4a6712c01872960239dac4ed86d62e 100644 (file)
--- 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 fc235a4d686034943ce86e43363756461c00f80f..d9c87d95d6d46840db0900b292a38bc922b20f42 100644 (file)
--- 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 43a6529dd92ba6f1f49be09c45e2d4e9ef4af40b..6d42cb7c33a56cf0c9c8525d58df78a09c9cac2b 100644 (file)
--- 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 260bf3141bc61c47f5f6ad09d1aa3cfb18533dbd..534bf751edbf9723d12669d114afaae253b74dc4 100644 (file)
--- 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 b113ed9115b2109a44afab74583624d76eaa05a7..079c3eb827297eda6ec96239aac902dbda11aebb 100644 (file)
--- 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 997cdbba6e5b95cbe1885b9c8904f7ca5504820e..15063539643b5ff4c26ca9737518a360d859d88c 100644 (file)
--- 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 55e3cbb7a366876ff5dbc9a286688b0066b3deaf..5eacaa56330bcebb7b6b39586b33d95e22136a42 100644 (file)
--- 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 e03c0049f2bd10c9a529f013aa693b03ebbcd0bf..e62db324bc4d13b77fe41b11ca5f97e184f26bda 100644 (file)
--- 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 d4fbede2c8cf2295af3af4fa3f31f6c52608c31f..deba4d5bb7664048d84430631e102ca2a5fb89c0 100644 (file)
--- 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 b4b7176f9cda2b6c30294a5c7335b4c263529961..c8fbd888d32353192694b259da2eb39a0fcde238 100644 (file)
--- 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 730850159ea4d52bc17f294b05319a63a56a8434..b3bfc1b7e83d131e04f7a98444eb4c7e4ecbe455 100644 (file)
--- 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 6c519d5cefd76bf2768c634fc6f2301c828c78ea..e3da358a8e85402ea1acf04f6e996755b357921b 100644 (file)
--- 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 468e4e66097cc67a671a309a8fe56c3f080c6643..59e8b77d106a07faaef8cd0dc86f85a11ac9d4cf 100644 (file)
--- 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 97f3a44e01208519fbc4ad70cc693b5c12d2e1f8..549686a88fe621268f88f933fb66460a8e1318cd 100644 (file)
--- 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 ccd46f15ff51f5e9785309ab14906fca7cdf37d1..cc66ce510413952dd449a94e49542dfa6969b629 100644 (file)
--- 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 7d3f3d82e6f91bd0d079298a97935bc9f332ceb8..df321721efaf663af21b548eba95f546b29570e9 100644 (file)
--- 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 832f03d3666b7d0baa52d4cec11725a993163708..6b0b66603f535f35dd7887e61f6a07fa1987af09 100644 (file)
--- 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 6f8a00c36ab479a9771a7cc16438860f5e5e69f8..e23dc7d654a3676370162697b328171af2935c5d 100644 (file)
--- 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 0d79e7478f933090ca3f38f3415b920d0d753177..204c08bfd672816b4de7515e52c8746dba6b6b16 100644 (file)
--- 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 48f218d13488a75dccf5ca351765d5d03bae35d5..81ab388b259eb348af2212826afc9623b05786f2 100644 (file)
--- 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 c67152ff427558b1d97c758fe5b59bb82ceab6cd..18624d5df701ba8227a9bd8513a0594642c1f47a 100644 (file)
--- 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 15dbd290aab1aec209d873db1b3fdee1e37fe53e..33a573192d72bbe7912bb69373a2eeff33e9679d 100644 (file)
--- 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 6664b2958b2cd0120ce9c3148c6f0fae60773dc6..09f1b2a30fd22b50f01a1c806b617b2219e2fcff 100644 (file)
--- 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 0e8800f80789eb14782298333482ef2c01cc4a31..b33e90880b532bfba550006a11697282d5be4cd1 100644 (file)
--- 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 2c745bed8cc4f605e3c97db95fd5c46acc7fcbdb..1c6679d70c486d2d70b2f85c2576fcdd2fbfb951 100644 (file)
--- 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 f21d598da7a2bca0dc86a3711f0ceb833682ee28..cec2921cdaebef19f8ed61f13a86d4295f4457a7 100644 (file)
--- 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 3f2d16dcc66cd6c2911f9a1988d1de3671d66e1e..e32f3f93b3593ca5f12577ef8757346e04dbe884 100644 (file)
--- 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 ffef35dca286093e665c5d771af4ad225c73dabf..2e47558fc658a47ecd6bdd49b0026c878c23f1f4 100644 (file)
--- 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 cf273169d972d533003824a0905799d1dcdf6ef4..69050b8e7ada3d9b0516149816f6019a72d04e9d 100644 (file)
--- 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 97a21f24e002715adf8d34436f97eac13aec17c3..2807b03506f4666ee6f475977af027331cefdb90 100644 (file)
--- 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 2b6d322b2b44f980b945eaf89568196c440f6949..80c08d4a6604eb7032ded5de1505ce5f617a480e 100644 (file)
--- 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 17bcc8c5cb77bf2d35e078d33bb0db825776962f..e108fbefdba29c4f77220303e189bd7b75fd2862 100644 (file)
--- 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 487c00cb21c47300ecff6b8e864a25e5a7835bf9..20b0bba398617907b8ff9c8471b2774f239713c6 100644 (file)
--- 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 308b53e138be82e1f23621d921183df84fbcd864..ae7d466500d20ddd54577a2275a7125ec7655807 100644 (file)
--- 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 f7cdecdefccab4e9b0933d4bb8dc6406557c7dc3..406f7cbe91b83dcaa0d660878e6755149b76212c 100644 (file)
--- 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 c92877c5a26fd59d0101cbf80305b6198486911d..6f32185951077fb79be85368649a14bcaaff4734 100644 (file)
--- 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 667d9dd0ec4468dd3d6d9f466f6c57b0c37a9a84..76bd1268e85fc0cee5796887321f0d7a0f27c178 100644 (file)
--- 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 f3567a07fdde1075e31ed8ff1f27c1037558a1e2..bfe62a0ada761939c34d1a0db03ce3c604f3b6e3 100644 (file)
--- 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 3f6b4caaa03e8d09f8b0e340c2047dca14da5505..badf60ad7b933ad2a561f670edb2f0cf6e0be442 100644 (file)
--- 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 034e8893cfad03538611321596470c3a13fd11c1..173cfd666789bd486d08a490c2d5a5da427702f3 100644 (file)
--- 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 abb249ac0ae93124481f1c6ce049ac778cada089..aae0eefb9c564d3d7f02ad16220e54644f05a5b3 100644 (file)
--- 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 8619d950c2a2246bda93374ecc759dc08dde08a5..92f5c1eb97bd930e46d8b6865ee9808c170334e8 100644 (file)
--- 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 7c8b688517ebbb66cca77bf62de81415cb62165e..115ac78b9e9401a4e14250f261fbb39121028906 100644 (file)
--- 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 09cd888d55f4951d508d36223b18c8a7eb9ad99b..ac0234b74a61e3554e587c92d2729c026cdcdeae 100644 (file)
--- 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 a5cfc926caba86eabd6fb41f0367570d0dbc0a6a..381047ea05b958dca633f718e5d2022f7b565bd2 100644 (file)
--- 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 53f4422f8c8bc72e707f71bc11cdd4913f0083c9..53d7bdb6d843b2e2e3d62a6c671af8513e77336b 100644 (file)
--- 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 dd8cd49fdde32ca2ff1086b65e8acdf1fdf238c5..2455d59708a24b0c5f8ee3c32235f5c8971d3d2f 100644 (file)
--- 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 e6ac03c4ad5c52e1ea1a8d3ee554b62e80d3215d..fb6025bf38ea96d718ee768498e3b237185026d6 100644 (file)
--- 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 b25c0f837d35f23bb209388b663637219f56ab8e..4f5fd9e46eaa09bc6a3b9633fbaddc66fa064b8b 100644 (file)
--- 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 3b6d760697716e5aec367b40f0665f89f3731d1e..b377aaca7d38b0ac0393eb0068d272fe5cc20c34 100644 (file)
--- 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 9e237f7524c3c56b74f50e2d0897e3ed186415dc..865042ab2816571a87c187208d205cacb1b5b101 100644 (file)
--- 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 ae535e04ca4910e3f6f3d3d03544e2b0b96c7966..0b1a43319ab0d2af2652c21bb176bb807f2101de 100644 (file)
--- 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 f2100e492da6ab0ca73100743ef22766810b2e9d..9f49d5bc7a770c7f06fd5221b85d182999bdafb8 100644 (file)
--- 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 258cdb6920db09d7c37807620ae455b946c907f0..4206f4fd72ccf74165802f42251bf9eff97f1d93 100644 (file)
--- 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 40f4436d8b3fb4a0882bc05e914d3d05812a3c5b..0df357fb9201f69bfc978677b2ff42564cc49c2c 100644 (file)
--- 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 c0009730027ea2a37b0924f6af585c2da3bda915..93da22a073ab1937ddbdff5800e50810bea3df82 100644 (file)
--- 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 ade856aa48a94d42bae35fc58513c8f98613dd2d..b2ad67506bf35f0c098f314c8a1d36079033f6a3 100644 (file)
--- 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 2ff17dcbb1dff9b89bde16eff9f3f028b786982c..100934612f046197bee1ef1795385d2365e4e3be 100644 (file)
--- 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 124ed33c7a91538271f2df35843804359bc337a8..7e6f2ea56927c243bae0127eeffcf7fd3030d910 100644 (file)
--- 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 26c1f3b9a7648bfcc57818e7018fae8b213bd55f..e6e81561f96beb01057d5e3cf762dbf2166c4024 100644 (file)
--- 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 512fbb13a48a4fd62781ee5eee1b01cdf8b018d6..472cd251a079d589fc064af1cfa2f95d025aa10c 100644 (file)
--- 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 ca7d20b789d147b7e64f909cd7cb6dcd8638f250..133e87ce737aa14ca7d4c3890fe1efbfd35e7fd0 100644 (file)
--- 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 2572111d63a6984d01de66afae9eaa65297a81ba..42f8695776babbc755a13fb48dfd59705f56e30e 100644 (file)
--- 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 a228efd9116996f42bd63f66205513377c1c86ed..0d9673bebc2753ce04478ce2460238ac97ee59ea 100644 (file)
--- 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 8feab0eadaff30e4dc3bd06936c9a787c22a8b8a..49b7ab81b5945809423bdbdf4da2804263042f9a 100644 (file)
--- 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 4f192de3e8f3e1e7d1fab8e8789c9844c92cca30..0abc27a50079033c3905b3fe09eee368f30dc549 100644 (file)
--- 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 cc55d2822e9e73e465043deef3e429407e79260e..9901161ee2f8f0eeebee48d08bdf821e78fff227 100644 (file)
--- 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 c4d8fb280c7222d148d32728cc3c4c328a861552..455f0296186d222e63005330bef8950d85a83fd6 100644 (file)
--- 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 90e474ff3045c7efef5b9770061fe399c9d5d8ca..c407fa0807db7d95be2fe63aa8db92a83d9d2375 100644 (file)
--- 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 8bea1f04ae37b86c5ea98670346b39063363a7c5..95a9878d89b5d75fbe45ef56f2a47e66f57d1fa7 100644 (file)
--- 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 ca9816e59c1b908c4e72612f0e0d56f6edba972a..98206401d7c818af9bef3c648854284c5a0b5ad9 100644 (file)
--- 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 365622104273716c94c916814e93072bdac8b1e7..4597a741653dff39b386494ed65a3b02a3cfdc6d 100644 (file)
--- 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 59306c10b4302d84eafd2ef9193f6e30b940bf0f..678c467dca7906059bb9016d8d7a95cfbe1a1a28 100644 (file)
--- 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 8e9a19acd40526b7c57c426b586c943242cc90fe..143019f1a2cb3fd9c352f4bc7a111ebb57c90547 100644 (file)
--- 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 2e41ae47238931ef1844db0c1879ffacad29dff2..268554e8e34e66cfbbe90be75c5c0197d7c47114 100644 (file)
--- 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 779c1f5f0889f02afc60fe91ee9111c2cd8231e9..432943eedeb84fec006b4eb2072f2c4002baa890 100644 (file)
--- 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 32aa3145b2b8648be97db7075cf768987508bcd6..5d62a1fe8a66987f40f17a7256bc2fe1ded793db 100644 (file)
--- 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 be8dcdeebd971ea101865e65c3d1d5080db564a4..99334bd0e5ac163a2604d419ad0f92548413916e 100644 (file)
--- 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 6ea7eebb27b2fde17bb695abfb1337f632795246..cb7729d7f7938a99854ac14afe811dd7d5c4e9d9 100644 (file)
--- 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 a9be55071728b414ed8a8705c42e6733cf28f402..4d19ce83679477cc94b4b39691bb6867c5b5e1a5 100644 (file)
--- 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 c7a19a2601b66c9d14093b8d946ea4f706ee35b7..291943de32eb1d672207bf451107c84ee4714621 100644 (file)
--- 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 6edcde7d216ebe387a79f78b97314aaf4c208372..e8f6d3bf707b344c1ee691bf2662c19e18480126 100644 (file)
--- 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 867eb6773a97e8d35db8b172367db7c37646abee..3e8c4dc7331bd8f3acc7ac1f83c0a616a912bfbc 100644 (file)
--- 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 7dee4160e558e868e87b5ebb248a26f55df5d4d5..a70d2b843af30b5857f07bb846276a9179d17b17 100644 (file)
--- 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 f9263a19f59c3a0bad03de98efa15b5f68df3590..9328157efaa3ee080c1e8b6f4a3fa83078923d35 100644 (file)
--- 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 0cbf4e50b85309e23c540fb9f958b5ea1016f1b6..2c737723ff4552edd6c3ce586bf4ecc6f4087310 100644 (file)
--- 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 47b816bf88701892a4a429443bef70abc973cc46..851df32f3b3aac528379a1129dfa22e59f272bf0 100644 (file)
--- 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 92dd5734998948d988386748af016b092bfd3259..5466cf28845f30e2e0de7dc982ad63cfdeb80541 100644 (file)
--- 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 1eb93659652d1ef9b0cc403795b5d9ae8af10624..a76e1db9835bcb3510988a0810bfe17eb9329cc3 100644 (file)
--- 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 6880b4f741c15b08edad402bf61fc3bcc61938e6..3ccc0ba696b6c21a9c8277d42fd375f74c79c863 100644 (file)
--- 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 389e99d61910e80304407ff53adcf6e74d87b049..8fd092b46322b5bfaa3be638ddadef0d8348c88f 100644 (file)
--- 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 7ca4850426d31c0e928e573883adcaa4ebd7cc9c..68eeeda32c99b846e2e9796de15dd4fc0fc83966 100644 (file)
--- 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 e323737907458ba74056970185003cc93aead764..f4a2122e100e2b4ee3220371e9ad1475806a7600 100644 (file)
--- 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 a3f5f0f7335a3c754316f52c9b3057f2495e9fdd..61533043d48d1bc29851ef7e46e7db0c3afc779f 100644 (file)
--- 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 44647b4af2369defd37cf47d8ee1d2c561c5e74e..b28393ac7f88806ce263e7f653482c9349120909 100644 (file)
--- 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 1a2b90abb9973020eba156023208e702facdf4a9..e7db47d496bec806cb144564615847eb3d78c9b9 100644 (file)
--- 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 0cdb9c909cb22c680f3e08d2a6e46a11109c6ec4..35eaa4d907746d5b6000e8b59761acc393b3aae9 100644 (file)
--- 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 253ae74688965428b86201c942d7990956148948..741dc4d8657d4f3ed871597357cb9da49881447a 100644 (file)
--- 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 945a54bf3876bda38152ac2dbd3ea8cb8eefeb14..ee3c1452cd3eb38be752a0ccd7acd8f30e6f6fbc 100644 (file)
--- 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 eda1e3383e2f56371880f0ae8b2be1333aa85449..5f0bbf584623f4c61904ea3e87e3343955e8e163 100644 (file)
--- 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 8774d9ba2265c8d211a14b0dbfcb64de2d7c11ac..34b27341b1ce2cee5e0ed51e34cae870962865c6 100644 (file)
--- 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 34dc5124b94d8787cc4051373e7e0c8677e4ff14..08fd95c14b9717ab77456aa9633c19eeaa7a021f 100644 (file)
--- 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 379f832aa7c3b7864f2e893a286113416a005ec6..457f1de68266b066a4622e73cf112db58f6b6282 100644 (file)
--- 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 1d585a95cfd3ed5221d9b81b88c8c8fe840ce409..70be1b51d1e8879c6d75bd8f62b6a74919216bbb 100644 (file)
--- 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 4b9df536950fc9edc2abbc4c6518a1f3a649004f..cba7d4b288af6945da3d5f1d9b04b73ffcf44525 100644 (file)
--- 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 9a5844b5659a825f6c6a632bc279c846ec5a4fc4..f9e235fc37dc483be8d9fd7756f88874a9e48756 100644 (file)
--- 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 82ef9fb648f7c48edc5c5122f0e0d1f7ac7b3289..3422eb7876f973f191da98cc4c02aecbd0dbaaeb 100644 (file)
--- 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 4a85243cff74f5ee1fb4539984fde1d182e1b0c9..588b0efdebf155f2d8f608ee032ff9f05853f862 100644 (file)
--- 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 40360c7f0fbcc6aaac4f6c1c0e4754d2749be221..4cfe30f2e9645909788cb920336a2cb96eb6969f 100644 (file)
--- 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"