Deleting unnecessary #includes from dissectors.

Fourth batch (packet-mac-lte.c -> packet-rtp.c).

Will look at cleaning up and committing script afterwards.

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

102 files changed, 0 insertions, 167 deletions

diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 1034eabd93..6680fa2a69 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index 598576ec15..9adb05fdc2 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -32,7 +32,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include "packet-llc.h"
 #include <epan/etypes.h>
 
 void proto_register_macctrl(void);
diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c
index ebec7290fd..ec8dd2f0d8 100644
--- a/epan/dissectors/packet-mbim.c
+++ b/epan/dissectors/packet-mbim.c
@@ -31,7 +31,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/to_str.h>
@@ -39,7 +38,6 @@
 
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_map.h"
-#include "packet-gsm_sms.h"
 #include "packet-usb.h"
 #include "packet-mbim.h"
 
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index e89ff77edb..c6e243c9b3 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -44,18 +44,11 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/addr_resolv.h>
-#include <epan/prefs.h>
-#include <epan/strutil.h>
-#include <epan/sctpppids.h>
-#include <epan/asn1.h>
 #include <epan/gcp.h>
 #include <epan/tap.h>
 #include "packet-tpkt.h"
-#include "packet-per.h"
 #include "packet-h245.h"
 #include "packet-ip.h"
-#include "packet-ber.h"
 
 void proto_register_megaco(void);
 void proto_reg_handoff_megaco(void);
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index a91b4b7ab3..cacb699061 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 1e51e2e145..abf65179cc 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -36,7 +36,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c
index 2f5071910e..d7a31a0cdf 100644
--- a/epan/dissectors/packet-mih.c
+++ b/epan/dissectors/packet-mih.c
@@ -34,7 +34,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/reassemble.h>
 #include <epan/etypes.h>
 void proto_register_mih(void);
 void proto_reg_handoff_mih(void);
diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c
index 936697af0f..3b2c65e8fd 100644
--- a/epan/dissectors/packet-mint.c
+++ b/epan/dissectors/packet-mint.c
@@ -41,7 +41,6 @@
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/etypes.h>
-#include <epan/expert.h>
 #include <epan/show_exception.h>
 
 void proto_register_mint(void);
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index ecbe386c53..69b1a39cf2 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -35,7 +35,6 @@
 #include <epan/expert.h>
 
 #include "packet-giop.h"
-#include "packet-tcp.h"
 
 void proto_register_miop(void);
 void proto_reg_handoff_miop(void);
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 897eb54c39..09bcda14c7 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -54,7 +54,6 @@
 #include <epan/ipproto.h>
 #include <epan/expert.h>
 #include <epan/ip_opts.h>
-#include <epan/expert.h>
 #include <epan/sminmpec.h>
 
 #include "packet-ntp.h"
diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c
index d77b7213c5..4bb31ce97c 100644
--- a/epan/dissectors/packet-mka.c
+++ b/epan/dissectors/packet-mka.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 
 #define BASIC_PARAM_SET_TYPE         1
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 4b7937c124..330e668ce4 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -33,7 +33,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 50e5df613f..6d09e5908c 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -24,11 +24,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/exceptions.h>
 #include <epan/to_str.h>
-#include "packet-rpc.h"
 #include "packet-mount.h"
 #include "packet-nfs.h"
 
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index 46d9ef7f76..8158c1b659 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c
index 7f664ea6bc..1374fb6f40 100644
--- a/epan/dissectors/packet-mpls-psc.c
+++ b/epan/dissectors/packet-mpls-psc.c
@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include "packet-ip.h"
 
 void proto_register_mpls_psc(void);
 void proto_reg_handoff_mpls_psc(void);
diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c
index 30e9c43f64..e3215b4446 100644
--- a/epan/dissectors/packet-mpls-y1711.c
+++ b/epan/dissectors/packet-mpls-y1711.c
@@ -38,7 +38,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/expert.h>
 
 #include "packet-mpls.h"
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index a2d83ece64..75b0c9a5da 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -57,7 +57,6 @@
 #include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/ipproto.h>
-#include <epan/addr_resolv.h>
 #include <epan/decode_as.h>
 
 #include "packet-ppp.h"
diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c
index 99451fb7df..3d2426a923 100644
--- a/epan/dissectors/packet-mplstp-oam.c
+++ b/epan/dissectors/packet-mplstp-oam.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 #include <epan/packet.h>
-#include "packet-ip.h"
 #include "packet-bfd.h"
 
 void proto_register_mplstp_lock(void);
diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index a38b511df1..a7c6078140 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -24,7 +24,6 @@
 */
 
 #include "config.h"
-#include <string.h>
 #include <epan/packet.h>
 #include "packet-mq.h"
 
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index 75f7841e52..b5a084997f 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -32,7 +32,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <math.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 88f5900b0a..4b0cd18804 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -69,19 +69,14 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/reassemble.h>
 
-#include <epan/expert.h>
-#include <epan/dissector_filters.h>
-#include <epan/show_exception.h>
 
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 
 #include "packet-windows-common.h"
 #include "packet-tcp.h"
-#include "packet-dcerpc.h"
 #include "packet-mq.h"
 
 void proto_register_mq(void);
diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c
index 59165316f0..1a7fc19022 100644
--- a/epan/dissectors/packet-mrcpv2.c
+++ b/epan/dissectors/packet-mrcpv2.c
@@ -35,9 +35,7 @@
 #include "config.h"
 
 /* Include only as needed */
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index 866af7ad22..dffa42bc89 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -37,10 +37,8 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index 3bc9010687..c6a4276392 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -41,10 +41,7 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 8c90ccdcd2..045e2be3c8 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -30,7 +30,6 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <wsutil/str_util.h>
 
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index 773ec7de5f..ba2a830c9e 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -33,10 +33,7 @@
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
-#include <epan/oui.h>
-#include <epan/llcsaps.h>
 #include <epan/expert.h>
-#include "packet-llc.h"
 #include "packet-mstp.h"
 
 void proto_register_mstp(void);
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index cc2ab94377..69debea5fd 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -37,7 +37,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index c3c10635ee..bd3a0f22cc 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -56,7 +56,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 8e9c4c025e..56277a31be 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -38,7 +38,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c
index 304fda10e5..5ff1d2ff8d 100644
--- a/epan/dissectors/packet-nasdaq-itch.c
+++ b/epan/dissectors/packet-nasdaq-itch.c
@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c
index 250114f04e..0aafd41f80 100644
--- a/epan/dissectors/packet-nasdaq-soup.c
+++ b/epan/dissectors/packet-nasdaq-soup.c
@@ -30,7 +30,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#include "packet-tcp.h"
 
 void proto_register_nasdaq_soup(void);
 void proto_reg_handoff_nasdaq_soup(void);
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index 366142ccf1..64e7ec2346 100644
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include "packet-tcp.h"
 
 void proto_register_nbd(void);
diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index b362579cf6..a28745a228 100644
--- a/epan/dissectors/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #include "packet-ipx.h"
 #include "packet-netbios.h"
 
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index 16e114453c..ce849582ab 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -24,12 +24,10 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/show_exception.h>
 #include <epan/to_str.h>
 
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index f9feaae1f3..0cb09faffc 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include "packet-ncp-int.h"
 #include "packet-ncp-sss.h"
 
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 35e481f734..c09b8faf7b 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -42,17 +42,13 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include "packet-ipx.h"
 #include "packet-tcp.h"
 #include "packet-ncp-int.h"
-#include <epan/reassemble.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
-#include <epan/tap.h>
 
 void proto_register_ncp(void);
 void proto_reg_handoff_ncp(void);
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index f108e2f1ca..485186aad6 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -30,9 +30,7 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include "packet-rpc.h"
 #include "packet-ndmp.h"
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c
index 6f708bf857..32dbd1af4a 100644
--- a/epan/dissectors/packet-ndp.c
+++ b/epan/dissectors/packet-ndp.c
@@ -33,7 +33,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/nlpid.h>
 
 void proto_register_ndp(void);
 void proto_reg_handoff_ndp(void);
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 96e3d74d87..44294606d6 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -28,7 +28,6 @@
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 744531479c..cd930c2836 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -32,10 +32,8 @@
 #include <epan/prefs.h>
 #include <epan/exceptions.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
 #include <wsutil/crc16.h>
 #include <wsutil/crc32.h>
-#include "packet-rpc.h"
 #include "packet-nfs.h"
 
 void proto_register_nfs(void);
diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
index d15956c792..c980025ebe 100644
--- a/epan/dissectors/packet-nfsacl.c
+++ b/epan/dissectors/packet-nfsacl.c
@@ -25,9 +25,7 @@
 
 #include "config.h"
 
-#include <epan/wmem/wmem.h>
 
-#include "packet-rpc.h"
 #include "packet-nfs.h"
 
 void proto_register_nfsacl(void);
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 574fbe8ae1..80f6a42eee 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 7f82f08298..1eb41cbb87 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <time.h>
 
 #include "packet-rpc.h"
 #include "packet-nisplus.h"
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 0d1e7a073f..7ea5b85768 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -31,11 +31,9 @@
 
 #include "config.h"
 
-#include "packet-rpc.h"
 #include "packet-nfs.h"
 #include "packet-nlm.h"
 #include <epan/prefs.h>
-#include <string.h>
 
 void proto_register_nlm(void);
 void proto_reg_handoff_nlm(void);
diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 9a5d0ff5bb..69b9f459bb 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 void proto_register_nntp(void);
 void proto_reg_handoff_nntp(void);
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index 2191006b0c..9fbbd1a293 100644
--- a/epan/dissectors/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h> /* this is for get_hostname and ep_udp_port_to_display */
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 0e5e185707..116bd4ae71 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -24,15 +24,11 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include "packet-null.h"
-#include <epan/atalk-utils.h>
 #include "packet-ip.h"
 #include "packet-ipv6.h"
-#include "packet-ipx.h"
-#include "packet-osi.h"
 #include "packet-ppp.h"
 #include <epan/etypes.h>
 #include <epan/aftypes.h>
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index f367bdbaf4..8133031e4c 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.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-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index ed3d4b1201..9ac66ece2b 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/expert.h>
 void proto_register_omron_fins(void);
 void proto_reg_handoff_omron_fins(void);
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index efe0c6d35f..3cd200aa78 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -38,12 +38,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/etypes.h>
-#include <epan/ipproto.h>
 #include <epan/expert.h>
 #include <epan/reassemble.h>
 #include <epan/strutil.h>
@@ -51,7 +49,6 @@
 #include <wsutil/crc8.h>
 #include <wsutil/crc16.h>
 
-#include "packet-udp.h"
 #include "packet-frame.h"
 
 /* General definitions */
diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index de0cc2f1de..0b62a989d4 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -33,7 +33,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/ipproto.h>
 #include "packet-tcp.h"
 
 void proto_register_openvpn(void);
diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c
index d4ab5de71b..a989211a66 100644
--- a/epan/dissectors/packet-openwire.c
+++ b/epan/dissectors/packet-openwire.c
@@ -41,7 +41,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c
index 304f25da4a..5654afdf0d 100644
--- a/epan/dissectors/packet-osc.c
+++ b/epan/dissectors/packet-osc.c
@@ -29,11 +29,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include <epan/exceptions.h>
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index 865b9aa9df..9c1491697d 100644
--- a/epan/dissectors/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
@@ -29,8 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/expert.h>
-#include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-osi-options.h"
 
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index d16717f240..f970b0a2f6 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -30,13 +30,10 @@
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
-#include <epan/nlpid.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
-#include <epan/strutil.h>
 #include "packet-frame.h"
 #include "packet-osi.h"
-#include "packet-osi-options.h"
 
 void proto_register_cotp(void);
 void proto_register_cltp(void);
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index b0360ad32c..157972242a 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -63,7 +63,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>
diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c
index 6bcf8e0bb6..b0ea42e572 100644
--- a/epan/dissectors/packet-ouch.c
+++ b/epan/dissectors/packet-ouch.c
@@ -49,7 +49,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "packet-tcp.h"
 
 void proto_register_ouch(void);
 void proto_reg_handoff_ouch(void);
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index e7cb83916e..34494c6430 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -35,10 +35,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c
index 87c04f8842..400c6510e3 100644
--- a/epan/dissectors/packet-packetbb.c
+++ b/epan/dissectors/packet-packetbb.c
@@ -25,12 +25,10 @@
  */
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/uat.h>
 
 void proto_reg_handoff_packetbb(void);
 void proto_register_packetbb(void);
diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c
index 7394b6b295..dc2e0a755c 100644
--- a/epan/dissectors/packet-paltalk.c
+++ b/epan/dissectors/packet-paltalk.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index 731efd9bf2..dec172f7d5 100644
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -30,9 +30,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 
 void proto_register_pcli(void);
 void proto_reg_handoff_pcli(void);
diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index 81a665cfd9..6f596dacb7 100644
--- a/epan/dissectors/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
@@ -31,11 +31,9 @@ Protocol information comes from the book
 
 #include "config.h"
 
-#include <string.h>
 
 #include "packet-rpc.h"
 #include "packet-pcnfsd.h"
-#include <epan/wmem/wmem.h>
 
 void proto_register_pcnfsd(void);
 void proto_reg_handoff_pcnfsd(void);
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 2fe5e0a11c..672e084d35 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -24,12 +24,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/addr_resolv.h>
 #include <epan/uat.h>
 
 #ifdef HAVE_LIBGCRYPT
diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c
index 02a73a7b95..a583cb6989 100644
--- a/epan/dissectors/packet-peekremote.c
+++ b/epan/dissectors/packet-peekremote.c
@@ -54,7 +54,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
-#include <wiretap/wtap.h>
 
 void proto_register_peekremote(void);
 void proto_reg_handoff_peekremote(void);
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index f36abfd139..1dc03a7d65 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -28,16 +28,13 @@ proper helper routines
 
 #include "config.h"
 
-#include <string.h>
 #include <math.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/oids.h>
 #include <epan/to_str.h>
-#include <epan/prefs.h>
 #include <epan/asn1.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include "packet-per.h"
 
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 3073aa649b..a75beb11f7 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -35,7 +35,6 @@ http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/if_pflog.h
 #include <epan/packet.h>
 
 #include <epan/aftypes.h>
-#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 75a4398128..aa93c03738 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -29,8 +29,6 @@
 #include <epan/afn.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>
-#include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/ptvcursor.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index 4f4ccf7dbb..ace10d781f 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -25,7 +25,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-pktap.c b/epan/dissectors/packet-pktap.c
index 44027a42a0..6825cdb629 100644
--- a/epan/dissectors/packet-pktap.c
+++ b/epan/dissectors/packet-pktap.c
@@ -27,7 +27,6 @@
 #include <epan/expert.h>
 #include <wsutil/pint.h>
 
-#include <wiretap/wtap.h>
 
 #include "packet-frame.h"
 #include "packet-eth.h"
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index baee3805a0..a2d9c9f3e2 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -28,7 +28,6 @@
 
 #include <stdlib.h>
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index c832846f73..6a385b5bb2 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -29,8 +29,6 @@
 #include "packet-rpc.h"
 #include "packet-portmap.h"
 #include <epan/ipproto.h>
-#include <epan/conversation.h>
-#include <epan/packet_info.h>
 
 /*
  * See:
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index ace7092ca8..54e39ee018 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -33,7 +33,6 @@
 #include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/ip_opts.h>
-#include <epan/atalk-utils.h>
 #include "packet-chdlc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"
@@ -44,7 +43,6 @@
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
 #include <epan/oui.h>
-#include "packet-usb.h"
 #include "packet-sll.h"
 #include "packet-juniper.h"
 #include "packet-sflow.h"
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index e9d9931513..a43a0f6657 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index e0c3cdda83..4d9281b2e6 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -31,7 +31,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index 1b65d028c2..ea1ffe7d09 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -36,7 +36,6 @@
 
 #include <epan/packet.h>
 
-#include "packet-mpls.h"
 
 void proto_register_pw_hdlc(void);
 void proto_reg_handoff_pw_hdlc(void);
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 6a465f5933..720d7460a1 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -25,10 +25,8 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/strutil.h>
 #include <epan/nlpid.h>
 #include "packet-q931.h"
 #include "packet-e164.h"
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index dd09c0fd13..65281350ac 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/strutil.h>
 #include <epan/nlpid.h>
 #include "packet-juniper.h"
 
diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index 9d0906bd21..f25e0cadcf 100644
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -37,7 +37,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index 94586dd6bb..f7698b5397 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -28,10 +28,8 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 void proto_register_quakeworld(void);
 
 static int proto_quakeworld = -1;
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 74de0c56e5..6d78b8928d 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -54,7 +54,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 
 #include <epan/packet.h>
@@ -65,7 +64,6 @@
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/addr_resolv.h>
-#include <epan/garrayfix.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/report_err.h>
 #include <wsutil/md5.h>
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index 7f464f58cb..2fd900af2c 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <wiretap/wtap.h>
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c
index 08310f02d2..0c970810d2 100644
--- a/epan/dissectors/packet-rdp.c
+++ b/epan/dissectors/packet-rdp.c
@@ -31,7 +31,6 @@
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/asn1.h>
-#include "packet-tpkt.h"
 #include "packet-ssl.h"
 #include "packet-t124.h"
 
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index af4d92e52a..02767db895 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -36,7 +36,6 @@
 #include <epan/expert.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include "packet-rdt.h"
 
 static dissector_handle_t rdt_handle;
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index d6469c633c..904fb7865c 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -29,7 +29,6 @@
 #include <epan/expert.h>
 #include <wiretap/wtap.h>
 
-#include "packet-ip.h"
 
 void proto_register_redback(void);
 void proto_reg_handoff_redback(void);
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 75297014fd..3d82ee907d 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 
 void proto_register_redbackli(void);
 void proto_reg_handoff_redbackli(void);
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c
index 25acb93104..66e5d67f25 100644
--- a/epan/dissectors/packet-reload-framing.c
+++ b/epan/dissectors/packet-reload-framing.c
@@ -28,7 +28,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index dbb383ddb0..8ad3826400 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -33,15 +33,11 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/expert.h>
 #include <epan/asn1.h>
 #include <epan/uat.h>
 #include <epan/to_str.h>
 #include "packet-x509af.h"
-#include "packet-tcp.h"
 #include "packet-ssl-utils.h"
 #include "packet-reload.h"
 
diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c
index 73ba1a80f6..698cc8794f 100644
--- a/epan/dissectors/packet-rfid-felica.c
+++ b/epan/dissectors/packet-rfid-felica.c
@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 void proto_register_felica(void);
 void proto_reg_handoff_felica(void);
diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c
index 71595bf244..0729b69301 100644
--- a/epan/dissectors/packet-rgmp.c
+++ b/epan/dissectors/packet-rgmp.c
@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include "packet-igmp.h"
 
 void proto_register_rgmp(void);
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index 10408ca632..4d6430d0d6 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -22,12 +22,9 @@
  */
 
 #include "config.h"
-#include <stdio.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c
index 33ed719be4..ca3b1375fa 100644
--- a/epan/dissectors/packet-rlc.c
+++ b/epan/dissectors/packet-rlc.c
@@ -23,10 +23,8 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/asn1.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <wiretap/wtap.h>
@@ -35,10 +33,8 @@
  * Optional include, for KASUMI support,
  * see header file for more information.
  * */
-#include <epan/crypt/kasumi.h>
 
 #include "packet-umts_fp.h"
-#include "packet-umts_mac.h"
 #include "packet-rlc.h"
 #include "packet-rrc.h"
 
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index 58a44ff948..0a02b39d34 100644
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -26,9 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "packet-tcp.h"
 
 #define RLOGIN_PORT 513
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c
index 851afd6b0c..5e1240060e 100644
--- a/epan/dissectors/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
@@ -23,10 +23,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-rmi.h"
 
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 028aabcc83..fde4097b4a 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 
 #include "packet-hpext.h"
 
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index 17e6ef4418..6f80689351 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -41,8 +41,6 @@
 #include <math.h>
 
 #include <epan/packet.h>
-#include <epan/params.h>
-#include <epan/strutil.h>
 
 #include "packet-rmt-common.h"
 
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index ce1f9a22d4..321639cac0 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -25,18 +25,15 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/exceptions.h>
 #include <wsutil/pint.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/tap.h>
 #include <epan/strutil.h>
-#include <epan/garrayfix.h>
 #include <epan/show_exception.h>
 
 #include "packet-rpc.h"
diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c
index b573bb1d54..138d9fb485 100644
--- a/epan/dissectors/packet-rsip.c
+++ b/epan/dissectors/packet-rsip.c
@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/ipproto.h>
 
 void proto_register_rsip(void);
 
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 5bf1ef2089..b1ff4cab67 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -26,10 +26,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 3fc1a9b189..42b33f773b 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -75,7 +75,6 @@
 
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/strutil.h>
 #include <epan/to_str.h>
 
 void proto_register_rtcp(void);
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index c7177b8e1e..bdc2504882 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -68,13 +68,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wsutil/pint.h>
 
-#include <epan/conversation.h>
-#include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/to_str.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 4803b231b4..86117ba63a 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -30,7 +30,6 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/etypes.h>
-#include <epan/strutil.h>
 
 /*
  * See
diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c
index 1e35cb8e9c..9eff59953f 100644
--- a/epan/dissectors/packet-rtp-midi.c
+++ b/epan/dissectors/packet-rtp-midi.c
@@ -51,7 +51,6 @@
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
-#include <epan/tap.h>
 
 void proto_register_rtp_midi(void);