Deleting unneccessary #includes from dissectors.

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

Will look at cleaning up and committing script afterwards.

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

72 files changed, 0 insertions, 129 deletions

diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index ba462e6ced..7c749517f5 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -37,11 +37,9 @@
 #include "packet-isl.h"
 #include "packet-llc.h"
 #include "packet-sll.h"
-#include "packet-usb.h"
 #include "packet-juniper.h"
 #include "packet-sflow.h"
 #include <epan/crc32-tvb.h>
-#include <epan/tap.h>
 #include <wiretap/erf.h>
 
 void proto_register_eth(void);
diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c
index e4c0fea325..af28867634 100644
--- a/epan/dissectors/packet-etsi_card_app_toolkit.c
+++ b/epan/dissectors/packet-etsi_card_app_toolkit.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/lapd_sapi.h>
 
 #include "packet-e212.h"
 #include "packet-gsm_a_common.h"
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index 9601843018..6464f7ff8e 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -40,7 +40,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 
 
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c
index 6ea0881c34..fb45104d35 100644
--- a/epan/dissectors/packet-exported_pdu.c
+++ b/epan/dissectors/packet-exported_pdu.c
@@ -26,7 +26,6 @@
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 #include <epan/to_str.h>
-#include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include "packet-mtp3.h"
 #include "packet-dvbci.h"
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index 2a58213581..8ed737f190 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -140,7 +140,6 @@ These are the structures you will see most often in EDP frames.
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index ca5230a6a6..4fc32a8f5c 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -31,13 +31,11 @@
 #include <epan/to_str.h>
 #include <wiretap/wtap.h>
 #include <epan/reassemble.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 #include "packet-fcbls.h"
-#include <epan/tap.h>
 #include <epan/crc32-tvb.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index e8d7d7a50f..38e5c8fc88 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 49c30f6786..4c9981931d 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -28,8 +28,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcdns.h"
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 3d39a50663..4e015bae43 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -30,8 +30,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 #include "packet-fc.h"
 #include "packet-fcels.h"
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 54090d4d95..4c57509dfd 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -25,8 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfcs.h"
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 86e053ba1c..061ced607a 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -25,9 +25,7 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfzs.h"
diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c
index ba5985b776..01d20a8064 100644
--- a/epan/dissectors/packet-fclctl.c
+++ b/epan/dissectors/packet-fclctl.c
@@ -24,8 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
-#include "packet-fc.h"
 #include "packet-fclctl.h"
 
 const value_string fc_lctl_proto_val[] = {
diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c
index 750a544bf3..dfd7c493ab 100644
--- a/epan/dissectors/packet-fcoib.c
+++ b/epan/dissectors/packet-fcoib.c
@@ -32,7 +32,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/crc32-tvb.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
 #include "packet-infiniband.h"
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 55be8ed408..82200ce12c 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-scsi.h"
 #include "packet-fc.h"
 #include "packet-fcp.h"
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index b62a88425d..79d970e65e 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -25,8 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcsb3.h"
 
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 55c1bb0474..72487b5566 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -27,8 +27,6 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>
-#include <epan/etypes.h>
-#include "packet-fc.h"
 
 void proto_register_fcsp(void);
 
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index dafcf82939..e01b83c82c 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -26,8 +26,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
-#include <epan/etypes.h>
 #include "packet-fc.h"
 #include "packet-fcswils.h"
 #include "packet-fcct.h"
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index b51e46770e..bc79553515 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -35,7 +35,6 @@
 #include "packet-fddi.h"
 #include "packet-llc.h"
 #include "packet-sflow.h"
-#include <epan/tap.h>
 
 #include <epan/addr_resolv.h>
 
diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c
index 1871a0a501..dc5b59cfd1 100644
--- a/epan/dissectors/packet-fefd.c
+++ b/epan/dissectors/packet-fefd.c
@@ -25,10 +25,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
-#include <epan/oui.h>
-#include <epan/nlpid.h>
 
 void proto_register_fefd(void);
 void proto_reg_handoff_fefd(void);
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 5439c66013..797747a828 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -28,12 +28,10 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 
 #include "packet-tcp.h"
 #include "packet-ssl.h"
diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c
index 2ca5b08c2b..dc96496913 100644
--- a/epan/dissectors/packet-flip.c
+++ b/epan/dissectors/packet-flip.c
@@ -50,7 +50,6 @@
 #include <epan/in_cksum.h>
 
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 
 #include <epan/rtp_pt.h>
 
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 5a46474cd8..626a6d510d 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-rpc.h"
 #include "packet-fmp.h"
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c
index 7aebcd3715..e83f9f9ab5 100644
--- a/epan/dissectors/packet-fp_hint.c
+++ b/epan/dissectors/packet-fp_hint.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-fr.c b/epan/dissectors/packet-fr.c
index 51dc6821b8..4fbf7c85fd 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -52,7 +52,6 @@
 #include <epan/etypes.h>
 #include <epan/oui.h>
 #include <epan/nlpid.h>
-#include <epan/greproto.h>
 
 void proto_register_fr(void);
 void proto_reg_handoff_fr(void);
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index fc43b718bc..86118074dc 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-gdb.c b/epan/dissectors/packet-gdb.c
index b87f7e7b24..bd94e2cb41 100644
--- a/epan/dissectors/packet-gdb.c
+++ b/epan/dissectors/packet-gdb.c
@@ -35,7 +35,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/expert.h>
 #include <epan/tvbparse.h>
 
 enum {
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 4677e20858..bb3aec38b3 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -278,14 +278,12 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
index 6a01ede667..9d14bc1784 100644
--- a/epan/dissectors/packet-glusterfs.c
+++ b/epan/dissectors/packet-glusterfs.c
@@ -35,7 +35,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/guid-utils.h>
 
 #include "packet-rpc.h"
 #include "packet-gluster.h"
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c
index 20a1b32d1e..4afefdc9ab 100644
--- a/epan/dissectors/packet-gmr1_rach.c
+++ b/epan/dissectors/packet-gmr1_rach.c
@@ -31,11 +31,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 
 #include <epan/packet.h>
 
-#include "packet-csn1.h"
 
 void proto_register_gmr1_rach(void);
 void proto_reg_handoff_gmr1_rach(void);
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index b171ebe503..fbb2e770af 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -35,7 +35,6 @@
 #include <epan/packet.h>
 
 #include "packet-gmr1_common.h"
-#include "packet-gsm_sms.h"
 
 #include "packet-gmr1_rr.h"
 
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index 6d66f89a83..6058b30eb8 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/llcsaps.h>
 
 void proto_register_gmrp(void);
 void proto_reg_handoff_gmrp(void);
diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c
index 26530b0c7e..facbdec11d 100644
--- a/epan/dissectors/packet-gpef.c
+++ b/epan/dissectors/packet-gpef.c
@@ -28,7 +28,6 @@
 #include "packet-windows-common.h"
 #include <epan/asn1.h>
 #include "packet-x509af.h"
-#include "packet-x509if.h"
 
 void proto_register_gpef(void);
 
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index ce78c84f5a..3a9b074468 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -39,14 +39,11 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
 
-#include "packet-bssap.h"
 #include "packet-bssgp.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
 #include "packet-ranap.h"
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index a950939a8b..ef6819f3ae 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -33,8 +33,6 @@
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
-#include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gmr1_common.h"
 #include "packet-e212.h"
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 980526a1e6..057f57e6d8 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -102,16 +102,13 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
-#include <epan/asn1.h>
 #include <epan/strutil.h>
 
 #include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-ber.h"
 #include "packet-q931.h"
 #include "packet-gsm_a_common.h"
 #include "packet-ppp.h"
-#include "packet-gsm_sms.h"
 #include "packet-isup.h"
 
 void proto_register_gsm_a_dtap(void);
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index 6525753a2e..dd6af5ba7f 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -74,17 +74,11 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/tap.h>
-#include <epan/asn1.h>
 #include <epan/ipproto.h>
-#include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-ber.h"
-#include "packet-q931.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
 #include "packet-ppp.h"
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index eb2fde3031..f13ec364c7 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -33,10 +33,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
-#include <epan/tap.h>
 
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 
 void proto_register_gsm_a_rp(void);
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index 09ec1fd29f..6764837533 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -46,14 +46,9 @@
 
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/asn1.h>
 #include <epan/expert.h>
-#include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-ber.h"
-#include "packet-q931.h"
 #include "packet-gsm_a_common.h"
-#include "packet-e212.h"
 #include "packet-ppp.h"
 
 #include "packet-gsm_a_rr.h"
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c
index 730f1bd71c..2372aeb3f5 100644
--- a/epan/dissectors/packet-gsm_abis_om2000.c
+++ b/epan/dissectors/packet-gsm_abis_om2000.c
@@ -31,9 +31,7 @@
 #include <stdio.h>
 
 #include <epan/packet.h>
-#include <epan/lapd_sapi.h>
 
-#include "packet-gsm_a_common.h"
 
 
 void proto_register_abis_om2000(void);
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index ca4c961d93..81fcaa4a0b 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -30,9 +30,7 @@
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
-#include "packet-e212.h"
 
 void proto_register_gsm_bssmap_le(void);
 void proto_reg_handoff_gsm_bssmap_le(void);
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c
index da3bc5be80..4ba2129262 100644
--- a/epan/dissectors/packet-gsm_cbch.c
+++ b/epan/dissectors/packet-gsm_cbch.c
@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/reassemble.h>
-#include "packet-cell_broadcast.h"
 
 void proto_register_gsm_cbch(void);
 void proto_reg_handoff_gsm_cbch(void);
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index e6236bc738..6d155969dc 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
 
 void proto_register_ipa(void);
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index e88f1021a0..428c547410 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/lapd_sapi.h>
 
 void proto_register_gsm_sim(void);
 void proto_reg_handoff_gsm_sim(void);
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index c8d731844e..66021ad837 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -35,13 +35,11 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/to_str.h>
 #include "packet-gsm_sms.h"
 
 void proto_register_gsm_sms(void);
diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c
index ee27ae2116..95899bb8d7 100644
--- a/epan/dissectors/packet-gsm_um.c
+++ b/epan/dissectors/packet-gsm_um.c
@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <wiretap/wtap.h>
-#include <epan/circuit.h>
 
 void proto_register_gsm_um(void);
 void proto_reg_handoff_gsm_um(void);
diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c
index ab25514e36..19e34d9ea9 100644
--- a/epan/dissectors/packet-gsmtap.c
+++ b/epan/dissectors/packet-gsmtap.c
@@ -43,7 +43,6 @@
 #include <epan/packet.h>
 
 #include "packet-tetra.h"
-#include "packet-rrc.h"
 
 void proto_register_gsmtap(void);
 void proto_reg_handoff_gsmtap(void);
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 5c127a4586..070f6b6035 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -25,15 +25,11 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/asn1.h>
-#include <epan/to_str.h>
 #include <epan/show_exception.h>
 
 #include "packet-ber.h"
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index d3934d3745..f25f8418f6 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -62,12 +62,9 @@
 #include <epan/to_str.h>
 #include "packet-ppp.h"
 #include "packet-radius.h"
-#include "packet-bssap.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_map.h"
 #include "packet-gprscdr.h"
-#include "packet-per.h"
-#include "packet-ranap.h"
 #include "packet-bssgp.h"
 #include "packet-e212.h"
 #include "packet-gtp.h"
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 6ef575a321..193c7cb2b9 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -36,7 +36,6 @@
 #include "packet-e164.h"
 #include "packet-e212.h"
 #include "packet-s1ap.h"
-#include "packet-ranap.h"
 #include "packet-bssgp.h"
 #include "packet-ntp.h"
 #include "packet-gtpv2.h"
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index 68328fd547..7e8997d4e5 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/llcsaps.h>
 
 void proto_register_gvrp(void);
 void proto_reg_handoff_gvrp(void);
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index 55f997d064..c2fdee29d7 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -23,14 +23,12 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/circuit.h>
 #include <epan/conversation.h>
 #include <epan/exceptions.h>
 #include <epan/stream.h>
-#include <epan/reassemble.h>
 #include <epan/golay.h>
 #include <epan/iax2_codec_type.h>
 #include <epan/show_exception.h>
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index ade1cf565c..e919496e18 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -33,7 +33,6 @@ void proto_register_h248_3gpp(void);
 #define PSNAME "H2483GPP"
 #define PFNAME "h248.3gpp"
 
-#include "packet-isup.h"
 #include "packet-gsm_a_common.h"
 
 /*
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index c8170e3e68..97e61f09fe 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <epan/wmem/wmem.h>
 
 #include "packet-h248.h"
 
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index ba7618c134..e1934428ec 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -28,8 +28,6 @@
 
 /*****/
 #include <epan/packet.h>
-#include <epan/tvbuff-int.h>
-#include <epan/tvbparse.h>
 /*****/
 
 #include "packet-h248.h"
@@ -40,7 +38,6 @@ void proto_register_h248_annex_e(void);
 #define PSNAME "H248E"
 #define PFNAME "h248e"
 /*
-#include "packet-alcap.h"
 */
 static int proto_h248_annex_E = -1;
 
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 16e46399ad..2f534c2114 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -28,7 +28,6 @@
 #include "config.h"
 
 #include "packet-h248.h"
-#include "packet-isup.h"
 
 void proto_reg_handoff_q1950(void);
 void proto_register_q1950(void);
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index 5114e9e4c2..ba63e29532 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -30,11 +30,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/asn1.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include "packet-h264.h"
diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c
index e87997fd5a..c1930072c5 100644
--- a/epan/dissectors/packet-hartip.c
+++ b/epan/dissectors/packet-hartip.c
@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/tap.h>
 #include <epan/stats_tree.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c
index 2b1f9c9883..18380e597d 100644
--- a/epan/dissectors/packet-hci_h1.c
+++ b/epan/dissectors/packet-hci_h1.c
@@ -24,7 +24,6 @@
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 
diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index 73a16e15bc..0986d09233 100644
--- a/epan/dissectors/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
@@ -25,12 +25,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
-#include "packet-rpc.h"
 #include "packet-nfs.h"
 
-#include <epan/wmem/wmem.h>
 
 void proto_register_hclnfsd(void);
 void proto_reg_handoff_hclnfsd(void);
diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c
index e930c2f5a9..6b71300ad4 100644
--- a/epan/dissectors/packet-hdcp.c
+++ b/epan/dissectors/packet-hdcp.c
@@ -33,7 +33,6 @@
 
 #include <epan/packet.h>
 #include <epan/ptvcursor.h>
-#include <epan/expert.h>
 void proto_register_hdcp(void);
 
 static int proto_hdcp  = -1;
diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c
index d87c39ff1b..c6dcf43c05 100644
--- a/epan/dissectors/packet-hip.c
+++ b/epan/dissectors/packet-hip.c
@@ -36,7 +36,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/addr_resolv.h>
 
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>
diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c
index c0d67602fd..c6409528c8 100644
--- a/epan/dissectors/packet-hislip.c
+++ b/epan/dissectors/packet-hislip.c
@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 76c276a11d..fd3ed48c4a 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/xdlc.h>
-#include <epan/etypes.h>
 #include <epan/llcsaps.h>
 #include "packet-hpext.h"
 
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index e8fea341a0..f7fd0e37bc 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 
 #include "packet-hpext.h"
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index 8adf3ba6dc..b59947c5f5 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -134,7 +134,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/to_str.h>
 
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 6246efaad6..6257213f28 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -30,15 +30,12 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 #include <epan/stats_tree.h>
 #include <epan/to_str.h>
@@ -55,7 +52,6 @@ typedef enum _http_type {
 	HTTP_OTHERS
 } http_type_t;
 
-#include <epan/tap.h>
 
 void proto_register_http(void);
 void proto_reg_handoff_http(void);
diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c
index 5396acf2cb..df216d084f 100644
--- a/epan/dissectors/packet-http2.c
+++ b/epan/dissectors/packet-http2.c
@@ -42,9 +42,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/expert.h>
-#include <epan/conversation.h>
-#include <epan/follow.h>
 
 #include <epan/nghttp2/nghttp2.h>
 
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 6efb4eeb4a..1df3135f7f 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -25,7 +25,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
 #include <epan/oui.h>
 
 void proto_register_iapp(void);
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 63eee63952..31be3330af 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -30,17 +30,14 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/circuit.h>
 #include <epan/exceptions.h>
-#include <epan/to_str.h>
 #include <epan/reassemble.h>
 #include <epan/expert.h>
 #include <epan/aftypes.h>
 #include <epan/tap.h>
-#include <epan/tap-voip.h>
 
 #include "packet-iax2.h"
 #include <epan/iax2_codec_type.h>
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c
index ef034380c5..76a186763c 100644
--- a/epan/dissectors/packet-icap.c
+++ b/epan/dissectors/packet-icap.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index 8565d1c342..8047629548 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -32,8 +32,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <time.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 83d2764697..80676c6309 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -35,10 +35,7 @@
 
 #include <epan/packet.h>
 #include <epan/in_cksum.h>
-#include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
-#include <epan/asn1.h>
-#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>