aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-12-21 01:41:34 -0500
committerBill Meier <wmeier@newsguy.com>2014-12-21 06:48:22 +0000
commitce211a4d61245379206874753b22a5b9cd07c4af (patch)
tree3c3589a274bded5fd8c1bb979856211eb81e25bb /epan
parentb5d7b7ab6e6b0e595d3250d7fa6553d0da79c000 (diff)
Cleanup use of #includes in a few recently committed dissectors.
Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1 Reviewed-on: https://code.wireshark.org/review/5938 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-bluetooth.c1
-rw-r--r--epan/dissectors/packet-mka.c1
-rw-r--r--epan/dissectors/packet-riemann.c4
-rw-r--r--epan/dissectors/packet-zbee-zcl-misc.c2
4 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 1eb2c28390..f3b83ab324 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/wmem/wmem.h>
#include <epan/conversation.h>
#include <epan/conversation_table.h>
#include <wiretap/wtap.h>
diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c
index 3df956b2b9..d77b7213c5 100644
--- a/epan/dissectors/packet-mka.c
+++ b/epan/dissectors/packet-mka.c
@@ -24,7 +24,6 @@
#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
#include <epan/etypes.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-riemann.c b/epan/dissectors/packet-riemann.c
index fe5ac81161..c719d95637 100644
--- a/epan/dissectors/packet-riemann.c
+++ b/epan/dissectors/packet-riemann.c
@@ -74,12 +74,10 @@
#include "config.h"
-#include <glib.h>
-
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
-#include <epan/dissectors/packet-tcp.h>
+#include "packet-tcp.h"
void proto_reg_handoff_riemann(void);
void proto_register_riemann(void);
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c
index 4a9862d4b6..34dc5124b9 100644
--- a/epan/dissectors/packet-zbee-zcl-misc.c
+++ b/epan/dissectors/packet-zbee-zcl-misc.c
@@ -27,7 +27,7 @@
#include "config.h"
#include <string.h>
-#include <glib.h>
+
#include <epan/packet.h>
#include <epan/to_str.h>