aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c1
-rw-r--r--epan/dissectors/asn1/mms/packet-mms-template.c3
-rw-r--r--epan/dissectors/asn1/z3950/packet-z3950-template.c6
-rw-r--r--epan/dissectors/packet-acdr.c1
-rw-r--r--epan/dissectors/packet-btatt.c1
-rw-r--r--epan/dissectors/packet-cemi.c2
-rw-r--r--epan/dissectors/packet-couchbase.c2
-rw-r--r--epan/dissectors/packet-dji-uav.c1
-rw-r--r--epan/dissectors/packet-dof.c2
-rw-r--r--epan/dissectors/packet-ecmp.c1
-rw-r--r--epan/dissectors/packet-epl-profile-parser.c2
-rw-r--r--epan/dissectors/packet-epl.c1
-rw-r--r--epan/dissectors/packet-f5ethtrailer.c1
-rw-r--r--epan/dissectors/packet-fc00.c2
-rw-r--r--epan/dissectors/packet-h248_10.c1
-rw-r--r--epan/dissectors/packet-isi.c1
-rw-r--r--epan/dissectors/packet-jxta.h5
-rw-r--r--epan/dissectors/packet-knxip.c14
-rw-r--r--epan/dissectors/packet-knxip.h11
-rw-r--r--epan/dissectors/packet-lat.c2
-rw-r--r--epan/dissectors/packet-lnpdqp.c11
-rw-r--r--epan/dissectors/packet-metamako.c1
-rw-r--r--epan/dissectors/packet-mle.c1
-rw-r--r--epan/dissectors/packet-mms.c13
-rw-r--r--epan/dissectors/packet-pcp.c1
-rw-r--r--epan/dissectors/packet-portmap.c6
-rw-r--r--epan/dissectors/packet-rpc.h1
-rw-r--r--epan/dissectors/packet-rtitcp.c1
-rw-r--r--epan/dissectors/packet-rtsp.c1
-rw-r--r--epan/dissectors/packet-shim6.c2
-rw-r--r--epan/dissectors/packet-smb2.c1
-rw-r--r--epan/dissectors/packet-snort-config.c1
-rw-r--r--epan/dissectors/packet-snort-config.h5
-rw-r--r--epan/dissectors/packet-someip-sd.c2
-rw-r--r--epan/dissectors/packet-someip.c3
-rw-r--r--epan/dissectors/packet-srt.c2
-rw-r--r--epan/dissectors/packet-thread.c1
-rw-r--r--epan/dissectors/packet-z3950.c18
38 files changed, 42 insertions, 89 deletions
diff --git a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c
index 3f1aafef34..60feddf6f5 100644
--- a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c
+++ b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c
@@ -8,7 +8,6 @@
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/asn1.h>
diff --git a/epan/dissectors/asn1/mms/packet-mms-template.c b/epan/dissectors/asn1/mms/packet-mms-template.c
index 879e5ae521..36b05820d3 100644
--- a/epan/dissectors/asn1/mms/packet-mms-template.c
+++ b/epan/dissectors/asn1/mms/packet-mms-template.c
@@ -11,9 +11,6 @@
#include "config.h"
-#include <glib.h>
-#include <stdio.h>
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/asn1.h>
diff --git a/epan/dissectors/asn1/z3950/packet-z3950-template.c b/epan/dissectors/asn1/z3950/packet-z3950-template.c
index 73ff59161d..682edcd01b 100644
--- a/epan/dissectors/asn1/z3950/packet-z3950-template.c
+++ b/epan/dissectors/asn1/z3950/packet-z3950-template.c
@@ -26,11 +26,8 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/exceptions.h>
@@ -39,7 +36,6 @@
#include <epan/proto_data.h>
#include <wsutil/str_util.h>
-#include <stdio.h>
#include <string.h>
#include "packet-ber.h"
diff --git a/epan/dissectors/packet-acdr.c b/epan/dissectors/packet-acdr.c
index 6c232ddf48..9c961186d8 100644
--- a/epan/dissectors/packet-acdr.c
+++ b/epan/dissectors/packet-acdr.c
@@ -14,7 +14,6 @@
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index 9ca6bfa39f..67b5dbd66b 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -14,7 +14,6 @@
#include "config.h"
-#include <glib.h>
#include <glib/gprintf.h>
#include <epan/packet.h>
diff --git a/epan/dissectors/packet-cemi.c b/epan/dissectors/packet-cemi.c
index 0a70d6ab50..4aaa7c288e 100644
--- a/epan/dissectors/packet-cemi.c
+++ b/epan/dissectors/packet-cemi.c
@@ -9,6 +9,8 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
+
+#include <epan/packet.h>
#include "packet-knxip.h"
void proto_register_cemi(void);
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c
index be45dab034..ad3534a2b8 100644
--- a/epan/dissectors/packet-couchbase.c
+++ b/epan/dissectors/packet-couchbase.c
@@ -43,9 +43,7 @@
#include "packet-tcp.h"
#include "packet-tls.h"
-#include <glib.h>
#include <math.h>
-#include <stdio.h>
#define PNAME "Couchbase Protocol"
#define PSNAME "Couchbase"
diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c
index 38c819cfd3..25033a2f36 100644
--- a/epan/dissectors/packet-dji-uav.c
+++ b/epan/dissectors/packet-dji-uav.c
@@ -17,7 +17,6 @@
*/
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
/* TCP desegmentation */
#include "packet-tcp.h"
diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c
index 1ed8f4db25..dc1143e645 100644
--- a/epan/dissectors/packet-dof.c
+++ b/epan/dissectors/packet-dof.c
@@ -178,8 +178,6 @@
#include <config.h>
#include <ctype.h>
-#include <stdio.h>
-#include <glib.h>
#include <wsutil/wsgcrypt.h>
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c
index 9c499b6785..d81b447bf0 100644
--- a/epan/dissectors/packet-ecmp.c
+++ b/epan/dissectors/packet-ecmp.c
@@ -19,7 +19,6 @@
*/
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/expert.h>
#include "packet-mbtcp.h"
diff --git a/epan/dissectors/packet-epl-profile-parser.c b/epan/dissectors/packet-epl-profile-parser.c
index 9364ee31ec..555dd7508b 100644
--- a/epan/dissectors/packet-epl-profile-parser.c
+++ b/epan/dissectors/packet-epl-profile-parser.c
@@ -24,9 +24,7 @@
#include <wsutil/ws_printf.h>
#include <epan/range.h>
-#include <glib.h>
#include <string.h>
-#include <stdlib.h>
#include <wsutil/strtoi.h>
#include <wsutil/str_util.h>
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 72c323c728..e529d67e92 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -59,7 +59,6 @@
#include <wsutil/strtoi.h>
#include <wsutil/file_util.h>
#include <wsutil/report_message.h>
-#include <glib.h>
#include <string.h>
#ifdef HAVE_LIBXML2
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c
index edae4f2c2c..8067b3fc97 100644
--- a/epan/dissectors/packet-f5ethtrailer.c
+++ b/epan/dissectors/packet-f5ethtrailer.c
@@ -186,7 +186,6 @@ Notes:
#include "config.h"
-#include <glib.h>
#include <string.h>
#include <epan/packet.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-fc00.c b/epan/dissectors/packet-fc00.c
index 1b545d1065..b9956063b0 100644
--- a/epan/dissectors/packet-fc00.c
+++ b/epan/dissectors/packet-fc00.c
@@ -15,8 +15,6 @@
#include <config.h>
-#include <glib.h>
-
#include <epan/expert.h>
#include <epan/packet.h>
#include <wsutil/base32.h>
diff --git a/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c
index 0c5d1259f5..b58c4cba33 100644
--- a/epan/dissectors/packet-h248_10.c
+++ b/epan/dissectors/packet-h248_10.c
@@ -17,7 +17,6 @@
#include "config.h"
-#include "glib.h"
#include "packet-h248.h"
void proto_register_h248_dot10(void);
diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c
index 4846582a36..9222d39dbc 100644
--- a/epan/dissectors/packet-isi.c
+++ b/epan/dissectors/packet-isi.c
@@ -12,7 +12,6 @@
#include "config.h"
-#include <glib.h>
#include <epan/prefs.h>
#include <epan/expert.h>
#include <epan/packet.h>
diff --git a/epan/dissectors/packet-jxta.h b/epan/dissectors/packet-jxta.h
index fb6c7804a4..a8d6c02d4e 100644
--- a/epan/dissectors/packet-jxta.h
+++ b/epan/dissectors/packet-jxta.h
@@ -18,9 +18,9 @@
*/
#ifndef __PACKET_JXTA_H__
#define __PACKET_JXTA_H__
-#include <glib.h>
-#include <epan/packet.h>
+#include <glib.h>
+#include <epan/address.h>
/**
* Stream Conversation data
@@ -30,4 +30,5 @@ typedef struct jxta_tap_header {
address dest_address;
guint32 size;
} jxta_tap_header;
+
#endif
diff --git a/epan/dissectors/packet-knxip.c b/epan/dissectors/packet-knxip.c
index d91f7aa8a3..1e31529408 100644
--- a/epan/dissectors/packet-knxip.c
+++ b/epan/dissectors/packet-knxip.c
@@ -17,9 +17,21 @@
*
* for the specifications.
*/
-#include "packet-knxip.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <epan/packet.h>
+#include <epan/expert.h>
+#include <epan/proto.h>
+#include <epan/ipproto.h>
+#include <epan/prefs.h>
+#include <epan/tvbuff.h>
#include <epan/strutil.h>
+#include "packet-knxip.h"
+#include "packet-knxip_decrypt.h"
+
#define ECDH_PUBLIC_VALUE_SIZE 32
/* The following service families are defined for the
diff --git a/epan/dissectors/packet-knxip.h b/epan/dissectors/packet-knxip.h
index 90e51c3208..caaf86436f 100644
--- a/epan/dissectors/packet-knxip.h
+++ b/epan/dissectors/packet-knxip.h
@@ -11,19 +11,8 @@
#ifndef PACKET_KNXIP_H
#define PACKET_KNXIP_H
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include <glib.h>
#include <epan/expert.h>
-#include <epan/packet.h>
-#include <epan/proto.h>
-#include <epan/ipproto.h>
-#include <epan/prefs.h>
-#include <epan/tvbuff.h>
-
#include "packet-knxip_decrypt.h"
#define KIP_ERROR &ei_knxip_error
diff --git a/epan/dissectors/packet-lat.c b/epan/dissectors/packet-lat.c
index b9623da7ff..07238db273 100644
--- a/epan/dissectors/packet-lat.c
+++ b/epan/dissectors/packet-lat.c
@@ -10,10 +10,8 @@
#include "config.h"
-#include <stdlib.h>
#include <string.h>
-#include <glib.h>
#include <epan/packet.h>
#include <epan/expert.h>
#include "etypes.h"
diff --git a/epan/dissectors/packet-lnpdqp.c b/epan/dissectors/packet-lnpdqp.c
index 07a96522d8..d0c5bd3a9e 100644
--- a/epan/dissectors/packet-lnpdqp.c
+++ b/epan/dissectors/packet-lnpdqp.c
@@ -16,7 +16,6 @@
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/asn1.h>
@@ -74,7 +73,7 @@ static int hf_lnpdqp_calledPartyNumber = -1; /* ServiceKey */
static int hf_lnpdqp_oli = -1; /* OriginatingStationType */
/*--- End of included file: packet-lnpdqp-hf.c ---*/
-#line 59 "./asn1/lnpdqp/packet-lnpdqp-template.c"
+#line 58 "./asn1/lnpdqp/packet-lnpdqp-template.c"
static int ett_lnpdqp = -1;
static int ett_lnpdqp_digitstype = -1;
@@ -87,7 +86,7 @@ static gint ett_lnpdqp_ProvideInstructionArg_U = -1;
static gint ett_lnpdqp_ServiceKey = -1;
/*--- End of included file: packet-lnpdqp-ett.c ---*/
-#line 64 "./asn1/lnpdqp/packet-lnpdqp-template.c"
+#line 63 "./asn1/lnpdqp/packet-lnpdqp-template.c"
/* Type of Digits (octet 1, bits A-H) */
@@ -396,7 +395,7 @@ static int dissect_ProvideInstructionArg_PDU(tvbuff_t *tvb _U_, packet_info *pin
/*--- End of included file: packet-lnpdqp-fn.c ---*/
-#line 217 "./asn1/lnpdqp/packet-lnpdqp-template.c"
+#line 216 "./asn1/lnpdqp/packet-lnpdqp-template.c"
static int
dissect_lnpdqp_cc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
@@ -523,7 +522,7 @@ void proto_register_lnpdqp(void) {
"OriginatingStationType", HFILL }},
/*--- End of included file: packet-lnpdqp-hfarr.c ---*/
-#line 315 "./asn1/lnpdqp/packet-lnpdqp-template.c"
+#line 314 "./asn1/lnpdqp/packet-lnpdqp-template.c"
};
/* List of subtrees */
@@ -540,7 +539,7 @@ void proto_register_lnpdqp(void) {
&ett_lnpdqp_ServiceKey,
/*--- End of included file: packet-lnpdqp-ettarr.c ---*/
-#line 324 "./asn1/lnpdqp/packet-lnpdqp-template.c"
+#line 323 "./asn1/lnpdqp/packet-lnpdqp-template.c"
};
/* Register protocol */
diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c
index 9b302d33f7..307cdb5e20 100644
--- a/epan/dissectors/packet-metamako.c
+++ b/epan/dissectors/packet-metamako.c
@@ -20,7 +20,6 @@
#include <epan/packet.h>
-#include <glib.h>
#include <glib/gprintf.h>
void proto_register_metamako(void);
diff --git a/epan/dissectors/packet-mle.c b/epan/dissectors/packet-mle.c
index f7c0bc9fae..988f4b0d3a 100644
--- a/epan/dissectors/packet-mle.c
+++ b/epan/dissectors/packet-mle.c
@@ -20,7 +20,6 @@
#include "config.h"
-#include <glib.h>
#include <math.h>
#include <epan/packet.h>
#include <epan/conversation.h>
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index f33c6ea1ea..d92d8626db 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -19,9 +19,6 @@
#include "config.h"
-#include <glib.h>
-#include <stdio.h>
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/asn1.h>
@@ -729,7 +726,7 @@ static int hf_mms_Transitions_idle_to_active = -1;
static int hf_mms_Transitions_any_to_deleted = -1;
/*--- End of included file: packet-mms-hf.c ---*/
-#line 38 "./asn1/mms/packet-mms-template.c"
+#line 35 "./asn1/mms/packet-mms-template.c"
/* Initialize the subtree pointers */
static gint ett_mms = -1;
@@ -953,7 +950,7 @@ static gint ett_mms_DirectoryEntry = -1;
static gint ett_mms_FileAttributes = -1;
/*--- End of included file: packet-mms-ett.c ---*/
-#line 42 "./asn1/mms/packet-mms-template.c"
+#line 39 "./asn1/mms/packet-mms-template.c"
static expert_field ei_mms_mal_timeofday_encoding = EI_INIT;
static expert_field ei_mms_mal_utctime_encoding = EI_INIT;
@@ -7351,7 +7348,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
/*--- End of included file: packet-mms-fn.c ---*/
-#line 128 "./asn1/mms/packet-mms-template.c"
+#line 125 "./asn1/mms/packet-mms-template.c"
/*
* Dissect MMS PDUs inside a PPDU.
@@ -10120,7 +10117,7 @@ void proto_register_mms(void) {
NULL, HFILL }},
/*--- End of included file: packet-mms-hfarr.c ---*/
-#line 168 "./asn1/mms/packet-mms-template.c"
+#line 165 "./asn1/mms/packet-mms-template.c"
};
/* List of subtrees */
@@ -10346,7 +10343,7 @@ void proto_register_mms(void) {
&ett_mms_FileAttributes,
/*--- End of included file: packet-mms-ettarr.c ---*/
-#line 174 "./asn1/mms/packet-mms-template.c"
+#line 171 "./asn1/mms/packet-mms-template.c"
};
static ei_register_info ei[] = {
diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c
index aeacf7184d..72cfa54d0f 100644
--- a/epan/dissectors/packet-pcp.c
+++ b/epan/dissectors/packet-pcp.c
@@ -12,7 +12,6 @@
#include <epan/packet.h>
#include <epan/expert.h>
-#include <glib.h>
#include "packet-tcp.h"
#include "packet-tls-utils.h"
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index ab8c6f0e5c..47e2e8de29 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -12,11 +12,11 @@
#include "config.h"
-
-
+#include <epan/packet.h>
+#include <epan/conversation.h>
+#include <epan/ipproto.h>
#include "packet-rpc.h"
#include "packet-portmap.h"
-#include <epan/ipproto.h>
/*
* See:
diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h
index 4b297ee086..a9a2908780 100644
--- a/epan/dissectors/packet-rpc.h
+++ b/epan/dissectors/packet-rpc.h
@@ -14,7 +14,6 @@
#include <glib.h>
#include <epan/packet.h>
-#include <epan/conversation.h>
#include "ws_symbol_export.h"
#ifdef __cplusplus
diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c
index 8b412fc8cc..f750224274 100644
--- a/epan/dissectors/packet-rtitcp.c
+++ b/epan/dissectors/packet-rtitcp.c
@@ -17,7 +17,6 @@
*/
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index 2446d10e21..0e58b78015 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -19,7 +19,6 @@
#include <stdio.h> /* for sscanf() */
-#include <glib.h>
#include <epan/packet.h>
#include <epan/req_resp_hdrs.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-shim6.c b/epan/dissectors/packet-shim6.c
index 19d39f49d0..d53089854e 100644
--- a/epan/dissectors/packet-shim6.c
+++ b/epan/dissectors/packet-shim6.c
@@ -11,8 +11,6 @@
#include "config.h"
-#include <glib.h>
-
#include <epan/packet.h>
#include <epan/expert.h>
#include <epan/proto_data.h>
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index f260036556..ae40acc182 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -19,7 +19,6 @@
#include "config.h"
-
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-snort-config.c b/epan/dissectors/packet-snort-config.c
index dfbf15b83d..595c2840f3 100644
--- a/epan/dissectors/packet-snort-config.c
+++ b/epan/dissectors/packet-snort-config.c
@@ -21,6 +21,7 @@
#include <wsutil/report_message.h>
#include "packet-snort-config.h"
+#include "ws_attributes.h"
/* Forward declaration */
static void parse_config_file(SnortConfig_t *snort_config, FILE *config_file_fd, const char *filename, const char *dirname, int recursion_level);
diff --git a/epan/dissectors/packet-snort-config.h b/epan/dissectors/packet-snort-config.h
index 6343bbe9bf..c659cbd2b7 100644
--- a/epan/dissectors/packet-snort-config.h
+++ b/epan/dissectors/packet-snort-config.h
@@ -9,13 +9,10 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-
-#include <glib.h>
-
#ifndef __PACKET_SNORT_CONFIG_H__
#define __PACKET_SNORT_CONFIG_H__
-#include "ws_attributes.h"
+#include <glib.h>
/* #define SNORT_CONFIG_DEBUG */
#ifdef SNORT_CONFIG_DEBUG
diff --git a/epan/dissectors/packet-someip-sd.c b/epan/dissectors/packet-someip-sd.c
index c32d0ef26c..ac2b7b1e29 100644
--- a/epan/dissectors/packet-someip-sd.c
+++ b/epan/dissectors/packet-someip-sd.c
@@ -13,8 +13,6 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <glib.h>
-
#include <config.h>
#include <epan/prefs.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c
index 76a714376f..43e5f073dd 100644
--- a/epan/dissectors/packet-someip.c
+++ b/epan/dissectors/packet-someip.c
@@ -12,9 +12,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <glib.h>
-
#include <config.h>
+#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
#include <epan/to_str.h>
diff --git a/epan/dissectors/packet-srt.c b/epan/dissectors/packet-srt.c
index cf520454f4..5c15b9a43e 100644
--- a/epan/dissectors/packet-srt.c
+++ b/epan/dissectors/packet-srt.c
@@ -19,9 +19,7 @@
*/
#include <config.h>
-#include <glib.h>
#include <wsutil/str_util.h>
-#include <stdio.h>
#include <epan/packet.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
index 86cc9d600f..000200a8aa 100644
--- a/epan/dissectors/packet-thread.c
+++ b/epan/dissectors/packet-thread.c
@@ -11,7 +11,6 @@
*/
#include "config.h"
-#include <glib.h>
#include <stdlib.h>
#include <math.h>
#include <epan/packet.h>
diff --git a/epan/dissectors/packet-z3950.c b/epan/dissectors/packet-z3950.c
index b2594bda97..2e4d121a60 100644
--- a/epan/dissectors/packet-z3950.c
+++ b/epan/dissectors/packet-z3950.c
@@ -34,11 +34,8 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/exceptions.h>
@@ -47,7 +44,6 @@
#include <epan/proto_data.h>
#include <wsutil/str_util.h>
-#include <stdio.h>
#include <string.h>
#include "packet-ber.h"
@@ -1514,7 +1510,7 @@ static int hf_z3950_Options_U_concurrentOperations = -1;
static int hf_z3950_Options_U_namedResultSets = -1;
/*--- End of included file: packet-z3950-hf.c ---*/
-#line 659 "./asn1/z3950/packet-z3950-template.c"
+#line 655 "./asn1/z3950/packet-z3950-template.c"
static int hf_z3950_referenceId_printable = -1;
static int hf_z3950_general_printable = -1;
@@ -1818,7 +1814,7 @@ static gint ett_z3950_QueryExpression = -1;
static gint ett_z3950_T_queryExpression_term = -1;
/*--- End of included file: packet-z3950-ett.c ---*/
-#line 667 "./asn1/z3950/packet-z3950-template.c"
+#line 663 "./asn1/z3950/packet-z3950-template.c"
/* MARC variables and forwards */
@@ -8654,7 +8650,7 @@ static int dissect_SearchInfoReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
/*--- End of included file: packet-z3950-fn.c ---*/
-#line 925 "./asn1/z3950/packet-z3950-template.c"
+#line 921 "./asn1/z3950/packet-z3950-template.c"
static int
dissect_z3950(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
@@ -12095,7 +12091,7 @@ void proto_register_z3950(void) {
NULL, HFILL }},
/*--- End of included file: packet-z3950-hfarr.c ---*/
-#line 981 "./asn1/z3950/packet-z3950-template.c"
+#line 977 "./asn1/z3950/packet-z3950-template.c"
{ &hf_z3950_referenceId_printable,
{ "referenceId", "z3950.referenceId.printable",
@@ -12548,7 +12544,7 @@ void proto_register_z3950(void) {
&ett_z3950_T_queryExpression_term,
/*--- End of included file: packet-z3950-ettarr.c ---*/
-#line 1138 "./asn1/z3950/packet-z3950-template.c"
+#line 1134 "./asn1/z3950/packet-z3950-template.c"
};
module_t *z3950_module;
@@ -12617,7 +12613,7 @@ proto_reg_handoff_z3950(void)
/*--- End of included file: packet-z3950-dis-tab.c ---*/
-#line 1189 "./asn1/z3950/packet-z3950-template.c"
+#line 1185 "./asn1/z3950/packet-z3950-template.c"
register_ber_oid_dissector(Z3950_RECORDSYNTAX_MARC21_OID, dissect_marc_record, proto_z3950, "MARC21");