First batch of unincludes. Last attempt...

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

112 files changed, 0 insertions, 167 deletions

diff --git a/epan/dissectors/file-gif.c b/epan/dissectors/file-gif.c
index 8af472d43d..7a6967df07 100644
--- a/epan/dissectors/file-gif.c
+++ b/epan/dissectors/file-gif.c
@@ -37,7 +37,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c
index d59991e89a..ab16d27fba 100644
--- a/epan/dissectors/file-jpeg.c
+++ b/epan/dissectors/file-jpeg.c
@@ -36,7 +36,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c
index cdd1f90a49..bbf37fbdbe 100644
--- a/epan/dissectors/file-mp4.c
+++ b/epan/dissectors/file-mp4.c
@@ -31,7 +31,6 @@
 
 #include "config.h"
 
-#include <math.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index 046fc7f9b9..a10af1e491 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -28,10 +28,8 @@
 #include <epan/expert.h>
 #include <epan/reassemble.h>
 #include <epan/ipproto.h>
-#include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
 #include "packet-ipv6.h"
-#include "packet-ieee802154.h"
 #include "packet-6lowpan.h"
 void proto_register_6lowpan(void);
 void proto_reg_handoff_6lowpan(void);
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 88c89dbc11..361c7b90ed 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -25,12 +25,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdio.h>
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index e2f942c4a2..21cd7da3be 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/etypes.h>
 #include <epan/to_str.h>
 
diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c
index c0bd431ba4..1a2d4dde22 100644
--- a/epan/dissectors/packet-aastra-aasp.c
+++ b/epan/dissectors/packet-aastra-aasp.c
@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 /* commands id */
 #define BEGIN_BLOCK_DATA    0x80
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index ba904c49e5..95c97c5db5 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -41,7 +41,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/ipv6-utils.h>
 #include <epan/to_str.h>
 
 /* Forward declarations */
diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c
index c2525f5be8..5d2db14c5f 100644
--- a/epan/dissectors/packet-adb_service.c
+++ b/epan/dissectors/packet-adb_service.c
@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <wiretap/wtap.h>
 
 #include "packet-adb_service.h"
 
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c
index ac8029fc5f..b83cb2f7b7 100644
--- a/epan/dissectors/packet-adwin-config.c
+++ b/epan/dissectors/packet-adwin-config.c
@@ -23,10 +23,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #include "packet-tcp.h"
 
 /* Forward declarations */
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 157e64b6de..785f3ba977 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 1d5f41fbec..9e7c200561 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -32,12 +32,9 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 #include <epan/reassemble.h>
 
 #include "packet-rx.h"
diff --git a/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c
index e17a9bdb25..4d7221071b 100644
--- a/epan/dissectors/packet-aim-adverts.c
+++ b/epan/dissectors/packet-aim-adverts.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 1130de9017..4a92ed8a23 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -25,8 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
-#include "packet-tcp.h"
 #include "packet-aim.h"
 
 void proto_register_aim_chat(void);
diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c
index 764f8189ee..a041f66946 100644
--- a/epan/dissectors/packet-aim-chatnav.c
+++ b/epan/dissectors/packet-aim-chatnav.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index 648eed79a4..76d6232fd7 100644
--- a/epan/dissectors/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index 18994b3939..fc8ef83f9c 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index 975899e784..8b24bcbf2e 100644
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -26,7 +26,6 @@
 #include "config.h"
 
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index 503e969855..d5b2d6a987 100644
--- a/epan/dissectors/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.c
@@ -24,9 +24,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
-#include "packet-aim.h"
 
 void proto_register_aim_oft(void);
 void proto_reg_handoff_aim_oft(void);
diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index 392da1a802..38cb571e36 100644
--- a/epan/dissectors/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index e76aefcf79..77412b7f9e 100644
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index 55d3df826f..f41b2af4f1 100644
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 
 #include "packet-aim.h"
 
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index c659c57330..294cbfd743 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.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-ajp13.c b/epan/dissectors/packet-ajp13.c
index ffeb60a6a1..90bd989c2c 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "packet-tcp.h"
 
 void proto_register_ajp13(void);
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index e68226da86..19046523a0 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -33,7 +33,6 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
-#include <epan/prefs.h>
 
 void proto_register_amr(void);
 void proto_reg_handoff_amr(void);
diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c
index 24e756b9f5..a36b276e7c 100644
--- a/epan/dissectors/packet-ancp.c
+++ b/epan/dissectors/packet-ancp.c
@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/tap.h>
 #include <epan/stats_tree.h>
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index e446fcb58b..c62e082ddb 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -30,11 +30,9 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/to_str.h>
 
 void proto_register_ansi_683(void);
 void proto_reg_handoff_ansi_683(void);
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 0aadcd4291..830d78cc27 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -33,12 +33,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 
-#include <math.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 
 void proto_register_ansi_801(void);
 void proto_reg_handoff_ansi_801(void);
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index b323bd4eec..7cf1a4a7bf 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -39,7 +39,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
@@ -49,7 +48,6 @@
 #include <epan/expert.h>
 #include <epan/to_str.h>
 
-#include "packet-mtp3.h"
 #include "packet-rtp.h"
 #include "packet-bssap.h"
 #include "packet-ansi_a.h"
diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c
index b55a1e184e..65956033f1 100644
--- a/epan/dissectors/packet-aol.c
+++ b/epan/dissectors/packet-aol.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index ef2ee45b97..43c89b49ad 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -25,7 +25,6 @@
 #include <epan/packet.h>
 #include <wsutil/pint.h>
 #include <epan/addr_resolv.h>
-#include <epan/strutil.h>
 
 #include "packet-ap1394.h"
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index ae867f2ab7..2f067eb48e 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -39,12 +39,9 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <math.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/wmem/wmem.h>
 #include <epan/to_str.h>
 
 #define STRLEN	100
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 85a2e21b78..9df897ddb6 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -25,9 +25,7 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include <epan/arptypes.h>
 #include <epan/addr_resolv.h>
 #include "packet-arp.h"
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c
index df14f06b70..72450e9a30 100644
--- a/epan/dissectors/packet-asterix.c
+++ b/epan/dissectors/packet-asterix.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index e7f74bc709..1b030823a1 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c
index da483cc865..9630f06a76 100644
--- a/epan/dissectors/packet-ayiya.c
+++ b/epan/dissectors/packet-ayiya.c
@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include <epan/strutil.h>
 
 void proto_register_ayiya(void);
 void proto_reg_handoff_ayiya(void);
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index ff8671ca2c..8aa2682416 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -30,7 +30,6 @@
 
 #include <stdio.h>
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 26c8da7f89..398508106f 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -61,14 +61,10 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/strutil.h>
-#include <epan/to_str.h>
-#include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/oids.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
-#include <epan/asn1.h>
 #include <epan/decode_as.h>
 #include <wiretap/wtap.h>
 
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 1104f71493..483a1ad4fe 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -56,7 +56,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 3c889a49f6..a141e6cda6 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index f3b83ab324..710741f124 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/conversation_table.h>
 #include <wiretap/wtap.h>
 
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 9cb6997751..1ffb02a56b 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -107,8 +107,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c
index 7f13f7a226..6e280c7edb 100644
--- a/epan/dissectors/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 
 #include "packet-rpc.h"
 
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 7027f1ce38..d5a567a547 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/llcsaps.h>
-#include <epan/ppptypes.h>
 #include <epan/chdlctypes.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 1a300148ae..cd2b21892c 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -35,7 +35,6 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include "packet-bssap.h"
-#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
 
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index 8428027b15..1329957873 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 #include "packet-btl2cap.h"
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index 2e74ddb8f9..3626fffd74 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -39,7 +39,6 @@
 #include <epan/decode_as.h>
 
 #include "packet-bluetooth.h"
-#include "packet-sdp.h"
 
 static dissector_handle_t bthci_cmd_handle;
 static dissector_handle_t bthci_evt_handle;
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c
index a89f689cd6..9eb43fc6f1 100644
--- a/epan/dissectors/packet-bthci_sco.c
+++ b/epan/dissectors/packet-bthci_sco.c
@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c
index 5c2a626f4e..00c9142f79 100644
--- a/epan/dissectors/packet-btle.c
+++ b/epan/dissectors/packet-btle.c
@@ -32,10 +32,8 @@
 #include <epan/expert.h>
 #include <wiretap/wtap.h>
 
-#include "packet-bluetooth.h"
 #include "packet-btle.h"
 #include "packet-bthci_acl.h"
-#include "packet-ubertooth.h"
 
 static int proto_btle = -1;
 
diff --git a/epan/dissectors/packet-btle_rf.c b/epan/dissectors/packet-btle_rf.c
index f74cf9244a..6d77d80a4e 100644
--- a/epan/dissectors/packet-btle_rf.c
+++ b/epan/dissectors/packet-btle_rf.c
@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 
-#include "packet-bluetooth.h"
 #include "packet-btle.h"
 
 #define LE_DEWHITENED        0x0001
diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c
index 1d4bd430a3..cd19dc7a70 100644
--- a/epan/dissectors/packet-btmcap.c
+++ b/epan/dissectors/packet-btmcap.c
@@ -29,7 +29,6 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
-#include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 
 static int proto_btmcap = -1;
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c
index c36e3b7ec1..0c72753ead 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-btobex.c
@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/reassemble.h>
-#include <epan/tap.h>
 #include <epan/expert.h>
 #include "packet-bluetooth.h"
 #include "packet-btrfcomm.h"
diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c
index 42d54f0249..89185ca183 100644
--- a/epan/dissectors/packet-btsap.c
+++ b/epan/dissectors/packet-btsap.c
@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 
 enum {
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index b05a36e485..d6596c741d 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -34,8 +34,6 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/etypes.h>
-#include <epan/ip_opts.h>
-#include <epan/strutil.h>
 #include <epan/to_str.h>
 
 #include "packet-bluetooth.h"
diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 88804e381b..d98d75b3cb 100644
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 
 void proto_register_bvlc(void);
 void proto_reg_handoff_bvlc(void);
diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c
index 66ea9d5b16..b53c327dbb 100644
--- a/epan/dissectors/packet-bzr.c
+++ b/epan/dissectors/packet-bzr.c
@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "packet-tcp.h"
 
 void proto_register_bzr(void);
 void proto_reg_handoff_bzr(void);
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 93c99ba3f8..d860c4c468 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -28,9 +28,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
 #include <epan/addr_resolv.h>
 
 #include <wiretap/catapult_dct2000.h>
diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c
index 485adf8f84..0a58dfda30 100644
--- a/epan/dissectors/packet-cell_broadcast.c
+++ b/epan/dissectors/packet-cell_broadcast.c
@@ -33,7 +33,6 @@
 #include <epan/reassemble.h>
 
 #include "packet-gsm_map.h"
-#include "packet-gsm_sms.h"
 
 #include "packet-cell_broadcast.h"
 
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index 00bc1ba057..99735e473c 100644
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 
 #include <epan/packet.h>
-#include <epan/to_str.h>
 #define CIMD_STX   0x02 /* Start of CIMD PDU */
 #define CIMD_ETX   0x03 /* End of CIMD PDU */
 #define CIMD_COLON 0x3A /* CIMD colon */
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 0d3d373f44..8df721ff2e 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -41,7 +41,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include "packet-cip.h"
-#include "packet-enip.h"
 #include "packet-cipsafety.h"
 #include "packet-mbtcp.h"
 
diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c
index 2b62572ca4..423a0c5814 100644
--- a/epan/dissectors/packet-cipsafety.c
+++ b/epan/dissectors/packet-cipsafety.c
@@ -30,7 +30,6 @@
 #include <epan/expert.h>
 #include <wsutil/pint.h>
 #include "packet-cip.h"
-#include "packet-enip.h"
 #include "packet-cipsafety.h"
 
 
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c
index dfbec090f7..559f31288c 100644
--- a/epan/dissectors/packet-cisco-wids.c
+++ b/epan/dissectors/packet-cisco-wids.c
@@ -47,7 +47,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/etypes.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/show_exception.h>
diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c
index b4320ff9b1..0508a0ee25 100644
--- a/epan/dissectors/packet-coap.c
+++ b/epan/dissectors/packet-coap.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-collectd.c b/epan/dissectors/packet-collectd.c
index f604bbb440..5c6973aabe 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 3d3b68c1d8..b34a09d3fe 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -54,16 +54,12 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "packet-tcp.h"
 
 #include <epan/oids.h>
-#include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/asn1.h>
 #include "packet-ber.h"
 
 /* XXX - The "plain" COPS port (3288) can be overridden in the prefs.
diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c
index e114199cf7..5d91ca8ce5 100644
--- a/epan/dissectors/packet-cp2179.c
+++ b/epan/dissectors/packet-cp2179.c
@@ -52,13 +52,9 @@ F = 16-bit CRC
 
 #include "config.h"
 #include <epan/packet.h>
-#include "packet-tcp.h"
 #include "packet-rtacser.h"
-#include <epan/to_str.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
-#include <epan/reassemble.h>
-#include <epan/expert.h>
 
 void proto_reg_handoff_cp2179(void);
 void proto_register_cp2179(void);
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index cbe2e17304..d596a15e5e 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 
 void proto_register_cpha(void);
 void proto_reg_handoff_cpha(void);
diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index 9e2b0433d9..9c12bdb107 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/tap.h>
 #include <epan/etypes.h>
 
 
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index b0fb2a17dd..d6329b15ab 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -27,7 +27,6 @@
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
-#include <epan/expert.h>
 
 #include "packet-tcp.h"
 #include "packet-x509af.h"
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 707851fae2..b7f4471bc3 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -54,7 +54,6 @@
 #include <epan/in_cksum.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include "packet-ip.h"
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-dccp.h"
diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c
index 116fcacf04..d15d37bfe4 100644
--- a/epan/dissectors/packet-dcerpc-dtsprovider.c
+++ b/epan/dissectors/packet-dcerpc-dtsprovider.c
@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_dtsprovider (void);
 void proto_reg_handoff_dtsprovider (void);
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index c33841f53a..4b2e82516c 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -27,7 +27,6 @@
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-nt.h"
 
 void proto_register_epm (void);
 void proto_reg_handoff_epm (void);
diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c
index 0919c22773..b092aceb83 100644
--- a/epan/dissectors/packet-dcerpc-krb5rpc.c
+++ b/epan/dissectors/packet-dcerpc-krb5rpc.c
@@ -31,7 +31,6 @@
 #include <epan/asn1.h>
 #include "packet-dcerpc.h"
 #include "packet-kerberos.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_krb5rpc (void);
 void proto_reg_handoff_krb5rpc (void);
diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c
index 4fd1e7d09e..cbe2ab3942 100644
--- a/epan/dissectors/packet-dcerpc-llb.c
+++ b/epan/dissectors/packet-dcerpc-llb.c
@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_llb (void);
 void proto_reg_handoff_llb (void);
diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c
index 4dcac7dbc6..a2674ac47a 100644
--- a/epan/dissectors/packet-dcerpc-mgmt.c
+++ b/epan/dissectors/packet-dcerpc-mgmt.c
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 58d57d1ba1..ca919c1bf5 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <wsutil/rc4.h>
@@ -38,7 +37,6 @@
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-netlogon.h"
 #include "packet-windows-common.h"
-#include "packet-ntlmssp.h"
 #include "packet-dcerpc-lsa.h"
 /* for keytab format */
 #include <epan/asn1.h>
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index 5d952ede06..bc4b52dc54 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.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-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c
index 24e3dee386..be854950b4 100644
--- a/epan/dissectors/packet-dcerpc-rs_bind.c
+++ b/epan/dissectors/packet-dcerpc-rs_bind.c
@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_rs_bind (void);
 void proto_reg_handoff_rs_bind (void);
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 7155a5eb10..9daa4eb7f0 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c
index 0658854c09..508b1cb406 100644
--- a/epan/dissectors/packet-dcerpc-trksvr.c
+++ b/epan/dissectors/packet-dcerpc-trksvr.c
@@ -28,8 +28,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-nt.h"
-#include "packet-windows-common.h"
 
 void proto_register_dcerpc_trksvr(void);
 void proto_reg_handoff_dcerpc_trksvr(void);
diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index 7a95ebd921..570f2a8f6d 100644
--- a/epan/dissectors/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
@@ -29,7 +29,6 @@
 
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
-#include "packet-dcerpc-dce122.h"
 
 void proto_register_dce_update(void);
 void proto_reg_handoff_dce_update(void);
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index c98421019b..039a87b855 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -29,16 +29,13 @@
 
 #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/tap.h>
 #include <epan/expert.h>
-#include <epan/strutil.h>
 #include <epan/addr_resolv.h>
 #include <epan/show_exception.h>
 #include <epan/decode_as.h>
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index d0cf8a0b30..fa57050e7e 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -210,13 +210,10 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
-#include <epan/strutil.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include <epan/reassemble.h>
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index 2545905475..93471108cf 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -28,7 +28,6 @@
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
 #include "packet-dcom.h"
-#include "guid-utils.h"
 
 void proto_register_remunk(void);
 void proto_reg_handoff_remunk(void);
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index 1e25e0c2b6..5b568149e5 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 9de995564b..d313690b41 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/etypes.h>
 #include <epan/ppptypes.h>
 
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index 0dff655754..de061de3df 100644
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -36,10 +36,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #define ETHERTYPE_DECT 0x2323
 
 #define DECT_PACKET_INFO_LEN 11
diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c
index c39c04943d..1de05205b8 100644
--- a/epan/dissectors/packet-devicenet.c
+++ b/epan/dissectors/packet-devicenet.c
@@ -30,7 +30,6 @@
 #include <epan/uat.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-#include <epan/reassemble.h>
 #include "packet-cip.h"
 
 void proto_register_devicenet(void);
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 27b832afa0..5f52751df9 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -54,8 +54,6 @@
 
 #include <epan/packet.h>
 #include <epan/sminmpec.h>
-#include <epan/strutil.h>
-#include <epan/arptypes.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/to_str.h>
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index e93e73dcd6..7bcaf997f1 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -41,9 +41,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
@@ -51,7 +48,6 @@
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/expert.h>
-#include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
 #include <epan/diam_dict.h>
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 4ff934fc41..17f61ee5b9 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/asn1.h>
 
 #include "packet-diameter.h"
 #include "packet-gsm_a_common.h"
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index 25155205d7..2fdc33c296 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <time.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 5692376f97..b1ebd45cb9 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -36,12 +36,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <math.h>
 
 #include <epan/packet.h>
-#include <epan/address.h>
-#include <epan/addr_resolv.h>
 #include <epan/to_str.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index d7e1573d46..8d9e088157 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <math.h>
 
 #include <epan/packet.h>
@@ -37,7 +36,6 @@
 #include <epan/reassemble.h>
 #include "packet-tcp.h"
 #include "packet-rtacser.h"
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/to_str.h>
 #include <epan/crc16-tvb.h>
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index df921aae2f..7828282361 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -31,12 +31,9 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <memory.h>
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/conversation.h>
 #include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
 #include "packet-dns.h"
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index c95acd9589..f52e606407 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/aftypes.h>
diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c
index 1b5141c749..864d9cc6b6 100644
--- a/epan/dissectors/packet-drda.c
+++ b/epan/dissectors/packet-drda.c
@@ -48,7 +48,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-dtls.c b/epan/dissectors/packet-dtls.c
index 14dd037055..77aec8ec63 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -49,9 +49,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/expert.h>
-#include <epan/prefs.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
@@ -59,8 +56,6 @@
 #include <epan/uat.h>
 #include <epan/sctpppids.h>
 #include <epan/exported_pdu.h>
-#include <wsutil/file_util.h>
-#include "packet-x509af.h"
 #include "packet-ssl-utils.h"
 
 void proto_register_dtls(void);
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index 2e88228cf5..45406f0180 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index f003b34e79..1a276ab6b1 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -52,7 +52,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 #include <epan/prefs.h>
 #include "packet-igmp.h"
 
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index e05d29729f..a62e15b845 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/crypt/wep-wpadefs.h>
 #include <epan/etypes.h>
 #include <epan/eapol_keydes_types.h>
 
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c
index 35aed01aaf..6f2cc5bbc9 100644
--- a/epan/dissectors/packet-ecp-oui.c
+++ b/epan/dissectors/packet-ecp-oui.c
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/oui.h>
 #include <epan/addr_resolv.h>
 
 #include "packet-ieee802a.h"
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 3187aefb76..cde8cf5da8 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -33,7 +33,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c
index 9a006f85bb..59f87aef80 100644
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <epan/packet.h>
 
 #define EGD_PORT 18246 /* 0x4746 */
diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c
index 2197c34652..2e367de4a7 100644
--- a/epan/dissectors/packet-ehdlc.c
+++ b/epan/dissectors/packet-ehdlc.c
@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/ipproto.h>
 #include <epan/xdlc.h>
 
 void proto_register_ehdlc(void);
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index 5453c3a681..e51f5d7121 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -27,16 +27,13 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/guid-utils.h>
 #include <epan/addr_resolv.h>
 #include <epan/atalk-utils.h>
 #include <epan/addr_and_mask.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
-#include <epan/reassemble.h>
 
 #include "packet-ipx.h"
-#include "packet-osi.h"
 
 /**
  * EIGRP Header size in bytes
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c
index 2961eeb5a8..083b9333fa 100644
--- a/epan/dissectors/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/aftypes.h>
 #include <wsutil/pint.h>
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 3662f84834..bcd2777816 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -36,11 +36,9 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/dissector_filters.h>
 #include <epan/prefs.h>
 #include <epan/etypes.h>
-#include <epan/ipv6-utils.h>
 #include <epan/expert.h>
 #include "packet-tcp.h"
 #include "packet-cip.h"
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 81a54abda1..7715c53d66 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 /*
  * See
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index 86042c0df6..0af4b8ee3b 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -28,7 +28,6 @@
 #include "packet-erf.h"
 
 /*
-#include "wiretap/atm.h"
 */
 #include "wiretap/erf.h"
 
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index 1f4c682a7e..ea82d25caf 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -25,10 +25,8 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <epan/packet.h>
-#include <epan/strutil.h>
 #include "packet-tcp.h"
 #include "packet-epmd.h"
 
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 16dfffc571..e02f806c2d 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -27,7 +27,6 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <wsutil/pint.h>
 #include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-osi-options.h"