asn1 generated dissectors: cleanup #include usage

Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>

99 files changed, 70 insertions, 269 deletions

diff --git a/asn1/HI2Operations/packet-HI2Operations-template.c b/asn1/HI2Operations/packet-HI2Operations-template.c
index e1d29a6f17..f9c98e9a62 100644
--- a/asn1/HI2Operations/packet-HI2Operations-template.c
+++ b/asn1/HI2Operations/packet-HI2Operations-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/oids.h>
diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index 9920feb5c2..dbcd25c674 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/oids.h>
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index 37bc5e6f06..47c3cb4f62 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -33,16 +33,12 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
-#include <string.h>
-
 #include "packet-ber.h"
 #include "packet-acse.h"
 #include "packet-ses.h"
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 709e154e11..aa7f92af62 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -84,13 +84,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/tap.h>
 #include <epan/asn1.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 #include "packet-ansi_map.h"
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index 886b9627f5..3039d5a1ab 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -25,16 +25,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
-#include <epan/wmem/wmem.h>
 #include <epan/asn1.h>
 #include <epan/strutil.h>
 
-#include <string.h>
 #include "packet-ber.h"
 #include "packet-tcap.h"
 #include "packet-ansi_tcap.h"
diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c
index 22889c64a3..4cab040f51 100644
--- a/asn1/atn-cm/packet-atn-cm-template.c
+++ b/asn1/atn-cm/packet-atn-cm-template.c
@@ -45,13 +45,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/conversation.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-per.h>
-
+#include "packet-ber.h"
+#include "packet-per.h"
 #include "packet-atn-ulcs.h"
 
 #define ATN_CM_PROTO "ICAO Doc9705 CM"
diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
index ddc09c0bba..0e274bb11a 100644
--- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
+++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c
@@ -49,16 +49,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/conversation.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-per.h>
-
-#include <stdio.h>
-#include <string.h>
-
+#include "packet-ber.h"
+#include "packet-per.h"
 #include "packet-atn-ulcs.h"
 
 #define ATN_CPDLC_PROTO "ICAO Doc9705 CPDLC"
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c
index 578f7ae240..7df449adf0 100644
--- a/asn1/atn-ulcs/packet-atn-ulcs-template.c
+++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c
@@ -113,20 +113,16 @@ which ATN standard is supported ?
 
 #include "config.h"
 
-#include <glib.h>
-#include <epan/packet.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-per.h>
-#include <epan/wmem/wmem.h>
-#include <epan/address.h>
-#include <epan/conversation.h>
-
-#include <stdio.h>
-#include <string.h>
 #ifndef _MSC_VER
 #include <stdint.h>
 #endif
 
+
+#include <epan/packet.h>
+#include <epan/address.h>
+#include <epan/conversation.h>
+#include "packet-ber.h"
+#include "packet-per.h"
 #include "packet-atn-ulcs.h"
 
 #define ATN_ACSE_PROTO "ICAO Doc9705 ULCS ACSE (ISO 8649/8650-1:1996)"
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index 07bc6598d8..3b7f62edf9 100644
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -23,23 +23,16 @@
 
 #include "config.h"
 
-#include <glib.h>
-
-#include <wsutil/eax.h>
-
+#include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
-#include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-tcp.h>
 #include <epan/uat.h>
 #include <epan/oids.h>
-
-#include <stdio.h>
-#include <string.h>
-
+#include <wsutil/eax.h>
+#include "packet-ber.h"
+#include "packet-tcp.h"
 #include "packet-c1222.h"
 
 #define PNAME  "ANSI C12.22"
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index fdaba4a4d5..8a44d3102c 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -33,7 +33,8 @@
  */
 #include "config.h"
 
-#include <glib.h>
+#include <stdlib.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
@@ -41,9 +42,6 @@
 #include <epan/asn1.h>
 #include <epan/expert.h>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "packet-ber.h"
 #include "packet-camel.h"
 #include "packet-q931.h"
diff --git a/asn1/charging_ase/packet-charging_ase-template.c b/asn1/charging_ase/packet-charging_ase-template.c
index 23a2dd24ba..ca71539206 100644
--- a/asn1/charging_ase/packet-charging_ase-template.c
+++ b/asn1/charging_ase/packet-charging_ase-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 0c6a105a97..e3da507fa5 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index 995693efe2..b7d94a942e 100644
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/oids.h>
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index 29b4ac040b..66b81ca59c 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -24,16 +24,11 @@
 
 #include "config.h"
 
-#include <glib.h>
-
-#include <wsutil/sha1.h>
-#include <wsutil/md5.h>
-
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
-
-#include <string.h>
+#include <wsutil/sha1.h>
+#include <wsutil/md5.h>
 
 #include "packet-ber.h"
 #include "packet-cms.h"
diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c
index 989e4d0d67..38d1d5e442 100644
--- a/asn1/credssp/packet-credssp-template.c
+++ b/asn1/credssp/packet-credssp-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
diff --git a/asn1/crmf/packet-crmf-template.c b/asn1/crmf/packet-crmf-template.c
index c0958e618c..e7399984cb 100644
--- a/asn1/crmf/packet-crmf-template.c
+++ b/asn1/crmf/packet-crmf-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index d2888c7edb..c5592bce1f 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 13c2245772..a8e2921706 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index 6d13570e87..99620d8f5d 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.c
@@ -23,13 +23,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index f6adf54b08..f6bd636e81 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index 5d4f8c108f..23a6854c8f 100644
--- a/asn1/ess/packet-ess-template.c
+++ b/asn1/ess/packet-ess-template.c
@@ -25,9 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 7e72f40dff..53533dff00 100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c
index 7a80be3a92..69d597e0b9 100644
--- a/asn1/goose/packet-goose-template.c
+++ b/asn1/goose/packet-goose-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/etypes.h>
diff --git a/asn1/gprscdr/packet-gprscdr-template.c b/asn1/gprscdr/packet-gprscdr-template.c
index f8636ecd9e..24d8c08ae3 100644
--- a/asn1/gprscdr/packet-gprscdr-template.c
+++ b/asn1/gprscdr/packet-gprscdr-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index 375530e42f..94517e8f17 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -44,17 +44,14 @@
 
 #include "config.h"
 
-#include <glib.h>
+#include <stdlib.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
-#include <epan/wmem/wmem.h>
 #include <epan/oids.h>
 #include <epan/expert.h>
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <epan/asn1.h>
 #include "packet-ber.h"
 #include "packet-per.h"
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index c2aa870d64..51e509dc49 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -32,22 +32,18 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/wmem/wmem.h>
-
-#include <string.h>
 
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/next_tvb.h>
 #include <epan/asn1.h>
+#include <epan/t35.h>
 #include <epan/tap.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
 #include "packet-h225.h"
-#include <epan/t35.h>
 #include <epan/h225-persistentdata.h>
 #include "packet-h235.h"
 #include "packet-h245.h"
diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index 15b3a6c1b0..c66523fdb0 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 01845a13c3..4988ead52a 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -32,21 +32,16 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/strutil.h>
-#include <wsutil/pint.h>
 #include <epan/addr_resolv.h>
-
-#include <string.h>
-
 #include <epan/prefs.h>
 #include <epan/t35.h>
-#include <epan/wmem/wmem.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
+#include <wsutil/pint.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
 #include "packet-h323.h"
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 326575ca8e..45c00c03cd 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -25,12 +25,12 @@
 
 #include "config.h"
 
-#include "packet-h248.h"
+#include <packet.h>
 #include <epan/exceptions.h>
 #include <epan/tap.h>
-#include <epan/wmem/wmem.h>
 #include "packet-tpkt.h"
 #include "packet-mtp3.h"
+#include "packet-h248.h"
 
 #define PNAME  "H.248 MEGACO"
 #define PSNAME "H248"
diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c
index f44295ee8c..45e7621e32 100644
--- a/asn1/h282/packet-h282-template.c
+++ b/asn1/h282/packet-h282-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c
index da8c39bfe3..d1ee8250bf 100644
--- a/asn1/h283/packet-h283-template.c
+++ b/asn1/h283/packet-h283-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c
index 498f922632..7c236e326d 100644
--- a/asn1/h323/packet-h323-template.c
+++ b/asn1/h323/packet-h323-template.c
@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-per.h"
 #include "packet-h225.h"
diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c
index 1c7c26c22c..afa743b7c4 100644
--- a/asn1/h450-ros/packet-h450-ros-template.c
+++ b/asn1/h450-ros/packet-h450-ros-template.c
@@ -27,7 +27,6 @@
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-per.h"
 #include "packet-h450-ros.h"
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 4516578eff..1f0f1cce20 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 
diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c
index 29e472af4e..4edca932ad 100644
--- a/asn1/h460/packet-h460-template.c
+++ b/asn1/h460/packet-h460-template.c
@@ -23,13 +23,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
-#include <string.h>
-
 #include "packet-per.h"
 #include "packet-h225.h"
 #include "packet-h235.h"
diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c
index ed5353a9c2..84a291ebbb 100644
--- a/asn1/h501/packet-h501-template.c
+++ b/asn1/h501/packet-h501-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
diff --git a/asn1/hnbap/packet-hnbap-template.c b/asn1/hnbap/packet-hnbap-template.c
index 3b8b9b8d70..b375783aa6 100644
--- a/asn1/hnbap/packet-hnbap-template.c
+++ b/asn1/hnbap/packet-hnbap-template.c
@@ -25,9 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 #include <epan/asn1.h>
diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c
index 4a04124506..425e400b91 100644
--- a/asn1/idmp/packet-idmp-template.c
+++ b/asn1/idmp/packet-idmp-template.c
@@ -23,23 +23,21 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/wmem/wmem.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/ipproto.h>
+#include <epan/strutil.h>
 
-#include <epan/dissectors/packet-tcp.h>
+#include "packet-tcp.h"
 
 #include "packet-ber.h"
 #include "packet-ros.h"
 #include "packet-x509ce.h"
 
-#include <epan/strutil.h>
 
 #define PNAME  "X.519 Internet Directly Mapped Protocol"
 #define PSNAME "IDMP"
diff --git a/asn1/ilp/packet-ilp-template.c b/asn1/ilp/packet-ilp-template.c
index c6f1ce3b9f..c0398a6996 100644
--- a/asn1/ilp/packet-ilp-template.c
+++ b/asn1/ilp/packet-ilp-template.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/asn1.h>
diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index b1651f4bb9..d4adb13069 100644
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
diff --git a/asn1/isdn-sup/packet-isdn-sup-template.c b/asn1/isdn-sup/packet-isdn-sup-template.c
index 68333e5792..000d87859f 100644
--- a/asn1/isdn-sup/packet-isdn-sup-template.c
+++ b/asn1/isdn-sup/packet-isdn-sup-template.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index c607e63419..7fc9cbf970 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -54,34 +54,29 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-
-#include <wsutil/file_util.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/strutil.h>
-
 #include <epan/conversation.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
-#include <epan/dissectors/packet-kerberos.h>
-#include <epan/dissectors/packet-netbios.h>
-#include <epan/dissectors/packet-tcp.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-pkinit.h>
-#include <epan/dissectors/packet-cms.h>
-#include <epan/dissectors/packet-windows-common.h>
+#include <wsutil/file_util.h>
+#include <wsutil/ws_diag_control.h>
+#include "packet-kerberos.h"
+#include "packet-netbios.h"
+#include "packet-tcp.h"
+#include "packet-ber.h"
+#include "packet-pkinit.h"
+#include "packet-cms.h"
+#include "packet-windows-common.h"
 
-#include <epan/dissectors/packet-dcerpc-netlogon.h>
-#include <epan/dissectors/packet-dcerpc.h>
+#include "packet-dcerpc-netlogon.h"
+#include "packet-dcerpc.h"
 
-#include <epan/dissectors/packet-gssapi.h>
-#include <epan/dissectors/packet-smb-common.h>
+#include "packet-gssapi.h"
+#include "packet-smb-common.h"
 
-#include <wsutil/ws_diag_control.h>
 
 void proto_register_kerberos(void);
 void proto_reg_handoff_kerberos(void);
diff --git a/asn1/lcsap/packet-lcsap-template.c b/asn1/lcsap/packet-lcsap-template.c
index 9bd948849a..dda8c07ac3 100644
--- a/asn1/lcsap/packet-lcsap-template.c
+++ b/asn1/lcsap/packet-lcsap-template.c
@@ -26,13 +26,9 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <epan/packet.h>
-
-#include <stdio.h>
-#include <string.h>
 #include <math.h>
 
+#include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 9c587c5381..41b3ce788b 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -82,26 +82,21 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
-#include <epan/wmem/wmem.h>
 #include <epan/oids.h>
 #include <epan/strutil.h>
 #include <epan/show_exception.h>
-#include <epan/dissectors/packet-frame.h>
-#include <epan/dissectors/packet-tcp.h>
-#include <epan/dissectors/packet-windows-common.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
+#include "packet-frame.h"
+#include "packet-tcp.h"
+#include "packet-windows-common.h"
+#include "packet-dcerpc.h"
 
 #include "packet-ldap.h"
 #include "packet-ntlmssp.h"
diff --git a/asn1/logotypecertextn/packet-logotypecertextn-template.c b/asn1/logotypecertextn/packet-logotypecertextn-template.c
index b70c7380f8..2bdc5afb91 100644
--- a/asn1/logotypecertextn/packet-logotypecertextn-template.c
+++ b/asn1/logotypecertextn/packet-logotypecertextn-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include "packet-ber.h"
diff --git a/asn1/lpp/packet-lpp-template.c b/asn1/lpp/packet-lpp-template.c
index c39ddb3410..15a8818109 100644
--- a/asn1/lpp/packet-lpp-template.c
+++ b/asn1/lpp/packet-lpp-template.c
@@ -25,9 +25,9 @@
  */
 
 #include "config.h"
+
 #include "math.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/lppa/packet-lppa-template.c b/asn1/lppa/packet-lppa-template.c
index 53ee3fc6af..32b8ce71b8 100644
--- a/asn1/lppa/packet-lppa-template.c
+++ b/asn1/lppa/packet-lppa-template.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/lppe/packet-lppe-template.c b/asn1/lppe/packet-lppe-template.c
index 0514ce4d88..f8dc6e00a3 100644
--- a/asn1/lppe/packet-lppe-template.c
+++ b/asn1/lppe/packet-lppe-template.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c
index 316fa0659e..8773cba32b 100644
--- a/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -27,15 +27,12 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <stdlib.h>
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-per.h"
 #include "packet-rrc.h"
diff --git a/asn1/m3ap/packet-m3ap-template.c b/asn1/m3ap/packet-m3ap-template.c
index e5e42ae6eb..a992df9c5b 100644
--- a/asn1/m3ap/packet-m3ap-template.c
+++ b/asn1/m3ap/packet-m3ap-template.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/strutil.h>
diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c
index 22fd240fd4..8743b699d7 100644
--- a/asn1/mms/packet-mms-template.c
+++ b/asn1/mms/packet-mms-template.c
@@ -23,9 +23,8 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/prefs.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
 
diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c
index 50c3ff5983..73f6a0af85 100644
--- a/asn1/mpeg-audio/packet-mpeg-audio-template.c
+++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index b3236543fa..e5d593063f 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
 #include <epan/asn1.h>
diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index 0571b75af8..024895959f 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.c
@@ -25,12 +25,9 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 #include <epan/asn1.h>
-#include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/asn1/novell_pkis/packet-novell_pkis-template.c b/asn1/novell_pkis/packet-novell_pkis-template.c
index 80486058d7..6840b6b1a3 100644
--- a/asn1/novell_pkis/packet-novell_pkis-template.c
+++ b/asn1/novell_pkis/packet-novell_pkis-template.c
@@ -21,18 +21,14 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <epan/expert.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/conversation.h>
 #include <epan/asn1.h>
 
-#include <stdio.h>
-#include <string.h>
-
-#include <epan/dissectors/packet-per.h>
+#include "packet-per.h"
 #include "packet-ber.h"
 
 #include "packet-novell_pkis-hf.c"
diff --git a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
index 37d7a40ccd..53ded65dfb 100644
--- a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
+++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include "packet-ber.h"
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 843cacdf5f..f122dda90b 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <asn1.h>
diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c
index b9c950ba46..8b41a55b97 100644
--- a/asn1/p1/packet-p1-template.c
+++ b/asn1/p1/packet-p1-template.c
@@ -23,13 +23,12 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/wmem/wmem.h>
+#include <epan/strutil.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"
@@ -42,7 +41,6 @@
 #include "packet-x509sat.h"
 
 #include "packet-p1.h"
-#include <epan/strutil.h>
 
 #define PNAME  "X.411 Message Transfer Service"
 #define PSNAME "P1"
diff --git a/asn1/p22/packet-p22-template.c b/asn1/p22/packet-p22-template.c
index f9204b3906..23378390f1 100644
--- a/asn1/p22/packet-p22-template.c
+++ b/asn1/p22/packet-p22-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c
index aef9627a0d..1f56222713 100644
--- a/asn1/p7/packet-p7-template.c
+++ b/asn1/p7/packet-p7-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
diff --git a/asn1/p772/packet-p772-template.c b/asn1/p772/packet-p772-template.c
index 45b517dbda..a8959c488c 100644
--- a/asn1/p772/packet-p772-template.c
+++ b/asn1/p772/packet-p772-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c
index 395213a735..9786168b93 100644
--- a/asn1/pcap/packet-pcap-template.c
+++ b/asn1/pcap/packet-pcap-template.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c
index 7a6e60be27..2965bf5830 100644
--- a/asn1/pkcs1/packet-pkcs1-template.c
+++ b/asn1/pkcs1/packet-pkcs1-template.c
@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 #include "packet-pkcs1.h"
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c
index db10a0e1bb..543a86e6db 100644
--- a/asn1/pkcs12/packet-pkcs12-template.c
+++ b/asn1/pkcs12/packet-pkcs12-template.c
@@ -27,13 +27,15 @@
 
 #include "config.h"
 
-#include <glib.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 #include "packet-pkcs12.h"
@@ -41,10 +43,6 @@
 #include "packet-x509if.h"
 #include "packet-cms.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #ifdef HAVE_LIBGCRYPT
 #include <wsutil/wsgcrypt.h>
 #endif
diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c
index 84c92f98be..42b4d95f46 100644
--- a/asn1/pkinit/packet-pkinit-template.c
+++ b/asn1/pkinit/packet-pkinit-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c
index 81c695d5eb..9be2f4aa4b 100644
--- a/asn1/pkix1explicit/packet-pkix1explicit-template.c
+++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/oids.h>
diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c
index a6f821387a..c184514bb8 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/asn1.h>
diff --git a/asn1/pkixac/packet-pkixac-template.c b/asn1/pkixac/packet-pkixac-template.c
index 52d03f8825..f48b6eec15 100644
--- a/asn1/pkixac/packet-pkixac-template.c
+++ b/asn1/pkixac/packet-pkixac-template.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/asn1.h>
diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c
index d25731adc5..6b3611f16d 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.c
+++ b/asn1/pkixproxy/packet-pkixproxy-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c
index 76b726d910..257bfb6778 100644
--- a/asn1/pkixqualified/packet-pkixqualified-template.c
+++ b/asn1/pkixqualified/packet-pkixqualified-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index 48600647b8..e8cce868c8 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/asn1.h>
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index e3a485eacb..02663841f9 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -24,17 +24,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/uat.h>
 
-#include <string.h>
-
 #include <epan/asn1.h>
 #include <epan/oids.h>
 #include "packet-ber.h"
diff --git a/asn1/q932-ros/packet-q932-ros-template.c b/asn1/q932-ros/packet-q932-ros-template.c
index d92a281580..f3af69a584 100644
--- a/asn1/q932-ros/packet-q932-ros-template.c
+++ b/asn1/q932-ros/packet-q932-ros-template.c
@@ -27,7 +27,6 @@
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/wmem/wmem.h>
 
 #include "packet-ber.h"
 
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index edfb747486..4aa0168d60 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -25,10 +25,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
-#include <epan/wmem/wmem.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 867431b3c8..1160d8f2fb 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -28,10 +28,7 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/wmem/wmem.h>
-
 #include <epan/asn1.h>
 
 #include "packet-per.h"
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 9fd53ff52f..b18fc5129f 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -23,10 +23,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/wmem/wmem.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
 
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index 6eb4d6cf2f..f27cb9359f 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -33,10 +33,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
-#include <epan/wmem/wmem.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
 
diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c
index 3e48e256ff..d8be0c49e2 100644
--- a/asn1/rrlp/packet-rrlp-template.c
+++ b/asn1/rrlp/packet-rrlp-template.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index 763339ca49..ef81ed0410 100644
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
diff --git a/asn1/rua/packet-rua-template.c b/asn1/rua/packet-rua-template.c
index 7d9cef906e..e33555e456 100644
--- a/asn1/rua/packet-rua-template.c
+++ b/asn1/rua/packet-rua-template.c
@@ -25,9 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/sctpppids.h>
 #include <epan/asn1.h>
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 04b632511a..9b73e8e764 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/strutil.h>
diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c
index d6d8bc0b3d..23d4fb79c7 100644
--- a/asn1/sabp/packet-sabp-template.c
+++ b/asn1/sabp/packet-sabp-template.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/asn1.h>
diff --git a/asn1/sbc-ap/packet-sbc-ap-template.c b/asn1/sbc-ap/packet-sbc-ap-template.c
index d36c653853..a96864a260 100644
--- a/asn1/sbc-ap/packet-sbc-ap-template.c
+++ b/asn1/sbc-ap/packet-sbc-ap-template.c
@@ -24,11 +24,7 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
-
-#include <stdio.h>
-#include <string.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/sctpppids.h>
diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index 26e465017f..b3205548f4 100644
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 40bcd312ca..4710ec15f8 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -42,35 +42,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if 0
+#include <stdio.h>
 #define D(args) do {printf args; fflush(stdout); } while(0)
+#endif
 
 #include "config.h"
 
-#include <string.h>
-
-#include <glib.h>
-
-#include <wsutil/sha1.h>
-#include <wsutil/md5.h>
-
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
-#include <epan/emem.h>
-#include <epan/wmem/wmem.h>
 #include <epan/next_tvb.h>
 #include <epan/uat.h>
 #include <epan/asn1.h>
-#include "packet-ipx.h"
-#include "packet-hpext.h"
 #include <epan/expert.h>
 #include <epan/oids.h>
-
+#include <wsutil/sha1.h>
+#include <wsutil/md5.h>
+#include "packet-ipx.h"
+#include "packet-hpext.h"
 #include "packet-ber.h"
-
 #include "packet-snmp.h"
 
 #ifdef HAVE_LIBGCRYPT
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index e8d2217e54..813014ea3a 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -31,25 +31,17 @@
 
 #include "config.h"
 
-#include <glib.h>
-
-#include <wsutil/rc4.h>
-
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
+#include <epan/conversation.h>
+#include <epan/asn1.h>
+#include <wsutil/rc4.h>
 #include "packet-dcerpc.h"
 #include "packet-gssapi.h"
 #include "packet-kerberos.h"
-#include <epan/conversation.h>
-#include <epan/wmem/wmem.h>
-#include <epan/asn1.h>
-
-#include <string.h>
-
 #include "packet-ber.h"
 
-
 #define PNAME  "Simple Protected Negotiation"
 #define PSNAME "SPNEGO"
 #define PFNAME "spnego"
diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index 877034e6ab..d58d74f790 100644
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -23,15 +23,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include "packet-ber.h"
 #include "packet-acse.h"
 
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c
index e1465e2463..149c746076 100644
--- a/asn1/t124/packet-t124-template.c
+++ b/asn1/t124/packet-t124-template.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/conversation.h>
diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c
index 209b811e95..94d4c53e18 100644
--- a/asn1/t125/packet-t125-template.c
+++ b/asn1/t125/packet-t125-template.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 11a1aa2c42..cf0e51ea44 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -44,23 +44,19 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
-
-#include <string.h>
-
-#include "packet-t38.h"
+#include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/ipproto.h>
 #include <epan/asn1.h>
+
+#include "packet-t38.h"
 #include "packet-per.h"
 #include "packet-tpkt.h"
-#include <epan/wmem/wmem.h>
-#include <epan/strutil.h>
 
 void proto_register_t38(void);
 
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index b267a2d2c3..336536128f 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
@@ -34,7 +33,6 @@
 #include <epan/strutil.h>
 #include <epan/show_exception.h>
 
-#include <string.h>
 #include "packet-ber.h"
 #include "packet-tcap.h"
 #include "packet-mtp3.h"
diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c
index bea66a601d..cf099fd293 100644
--- a/asn1/tetra/packet-tetra-template.c
+++ b/asn1/tetra/packet-tetra-template.c
@@ -28,18 +28,14 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <epan/expert.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
 #include <epan/conversation.h>
 #include <epan/asn1.h>
 
-#include <stdio.h>
-#include <string.h>
-
-#include <epan/dissectors/packet-per.h>
+#include "packet-per.h"
 #include "packet-tetra.h"
 
 #define PROTO_TAG_tetra	"TETRA"
diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c
index f62c755b42..27a6b411bf 100644
--- a/asn1/ulp/packet-ulp-template.c
+++ b/asn1/ulp/packet-ulp-template.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/asn1.h>
diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index 8d5840e8b5..9fbb68614c 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c
index d6d422d93c..9e0fe8165e 100644
--- a/asn1/x2ap/packet-x2ap-template.c
+++ b/asn1/x2ap/packet-x2ap-template.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include <epan/asn1.h>
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 561176071b..21211401ff 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c
index da8524621c..9b5d92673d 100644
--- a/asn1/x509ce/packet-x509ce-template.c
+++ b/asn1/x509ce/packet-x509ce-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index ecca0a946d..31c3d21a85 100644
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -23,18 +23,16 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
-#include <epan/wmem/wmem.h>
+#include <epan/strutil.h>
 
 #include "packet-ber.h"
 #include "packet-dap.h"
 #include "packet-x509if.h"
 #include "packet-x509sat.h"
-#include <epan/strutil.h>
-#include <epan/dissectors/packet-frame.h>
+#include "packet-frame.h"
 
 #define PNAME  "X.509 Information Framework"
 #define PSNAME "X509IF"
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index 24d3a7b769..a48d66e3ca 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>