plugins: Cleanup #includes

Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c
Mostly: remove '#include <glib/glib.h>' and certain
         other #includes already included in packet.h
Reviewed-on: https://code.wireshark.org/review/5971
Reviewed-by: Bill Meier <wmeier@newsguy.com>

75 files changed, 30 insertions, 122 deletions

diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index bf5d8a8aef..a3ab04a926 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 
 #include "packet-ams.h"
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index 96ab7999d5..b0f2e133bc 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -28,8 +28,6 @@
 
 #include <string.h>
 
-#include <glib.h>
-
 #include <epan/packet.h>
 
 #include "packet-ecatmb.h"
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c
index 74bebd4c04..e2322025d8 100644
--- a/plugins/ethercat/packet-esl.c
+++ b/plugins/ethercat/packet-esl.c
@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index ae9c0328d1..d3ef62d94f 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 
 #include "packet-ethercat-datagram.h"
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index c3a20fe4ce..17b9d3de4a 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c
index 234a15cdab..e8c4c823e3 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/ethercat/packet-ioraw.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 
 #include "packet-ioraw.h"
diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c
index c2903d7714..a897051210 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/ethercat/packet-nv.c
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 
 #include "packet-nv.h"
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index ad3be8cd38..41a971fb77 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -24,10 +24,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/dissectors/packet-tcp.h>
 #include <epan/prefs.h>
+#include <epan/dissectors/packet-tcp.h>
 #include "packet-gryphon.h"
 
 /*
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index 8eccb48e35..a4fcfd5180 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -23,10 +23,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
-
 /*
  * See
  *
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index c858566754..b9a79a3069 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -29,15 +29,13 @@
 
 #include <string.h>
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <wiretap/wtap.h>
 #include <epan/conversation.h>
-#include <epan/wmem/wmem.h>
 #include <epan/xdlc.h>
+#include <wiretap/wtap.h>
 
-#include "irda-appl.h"
 #include <epan/dissectors/packet-sll.h>
+#include "irda-appl.h"
 
 /*
  * This plugin dissects infrared data transmissions as defined by the IrDA
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c
index 503721023b..9e0a07aa2d 100644
--- a/plugins/m2m/packet-m2m.c
+++ b/plugins/m2m/packet-m2m.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/reassemble.h>
 #include <epan/etypes.h>
diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c
index 2b7f5615a8..3a5ba17a95 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/opcua/opcua.c
@@ -21,11 +21,10 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <epan/prefs.h>
 #include <epan/packet.h>
-#include <epan/dissectors/packet-tcp.h>
+#include <epan/prefs.h>
 #include <epan/reassemble.h>
+#include <epan/dissectors/packet-tcp.h>
 #include "opcua_transport_layer.h"
 #include "opcua_security_layer.h"
 #include "opcua_application_layer.h"
diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c
index 943d415639..9c397f3d11 100644
--- a/plugins/opcua/opcua_application_layer.c
+++ b/plugins/opcua/opcua_application_layer.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_simpletypes.h"
 #include "opcua_application_layer.h"
diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/opcua/opcua_complextypeparser.c
index b7cd1edf05..eb6e82bff7 100644
--- a/plugins/opcua/opcua_complextypeparser.c
+++ b/plugins/opcua/opcua_complextypeparser.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_complextypeparser.h"
 #include "opcua_enumparser.h"
diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/opcua/opcua_enumparser.c
index 54113a2ddd..783ccdb318 100644
--- a/plugins/opcua/opcua_enumparser.c
+++ b/plugins/opcua/opcua_enumparser.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include "opcua_enumparser.h"
diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/opcua/opcua_extensionobjecttable.c
index c829d8b5e0..f238caf16d 100644
--- a/plugins/opcua/opcua_extensionobjecttable.c
+++ b/plugins/opcua/opcua_extensionobjecttable.c
@@ -22,9 +22,7 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/wmem/wmem.h>
 #include "opcua_simpletypes.h"
 #include "opcua_complextypeparser.h"
 #include "opcua_extensionobjectids.h"
diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/opcua/opcua_hfindeces.c
index 4d9109cc7b..ce6075bfb3 100644
--- a/plugins/opcua/opcua_hfindeces.c
+++ b/plugins/opcua/opcua_hfindeces.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #include "opcua_hfindeces.h"
diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/opcua/opcua_security_layer.c
index a49125980c..8fd5cb492d 100644
--- a/plugins/opcua/opcua_security_layer.c
+++ b/plugins/opcua/opcua_security_layer.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_application_layer.h"
 #include "opcua_simpletypes.h"
diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/opcua/opcua_serviceparser.c
index e7799376aa..435e5d262c 100644
--- a/plugins/opcua/opcua_serviceparser.c
+++ b/plugins/opcua/opcua_serviceparser.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_complextypeparser.h"
 #include "opcua_enumparser.h"
diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/opcua/opcua_servicetable.c
index a839046dc5..024c73af4b 100644
--- a/plugins/opcua/opcua_servicetable.c
+++ b/plugins/opcua/opcua_servicetable.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_identifiers.h"
 #include "opcua_serviceparser.h"
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c
index d505d49aea..863433b08e 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/opcua/opcua_simpletypes.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/dissectors/packet-windows-common.h>
@@ -30,7 +29,6 @@
 #include "opcua_hfindeces.h"
 #include "opcua_extensionobjectids.h"
 #include "opcua_statuscode.h"
-#include <epan/wmem/wmem.h>
 
 #define DIAGNOSTICINFO_ENCODINGMASK_SYMBOLICID_FLAG           0x01
 #define DIAGNOSTICINFO_ENCODINGMASK_NAMESPACE_FLAG            0x02
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c
index f7604de046..00c6764cf5 100644
--- a/plugins/opcua/opcua_transport_layer.c
+++ b/plugins/opcua/opcua_transport_layer.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "opcua_security_layer.h"
 #include "opcua_application_layer.h"
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index ed9ecab9a3..2d8966a3b5 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -47,13 +47,11 @@
 
 #include <string.h>
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/wmem/wmem.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/expert.h>
 #include <epan/dissector_filters.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include "packet-pn.h"
 
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index 54bfb579be..dbdd771c2a 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -24,10 +24,8 @@
 
 #include <string.h>
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
-#include <epan/wmem/wmem.h>
 #include <epan/addr_resolv.h>
 #include <epan/color_dissector_filters.h>
 #include <epan/dissectors/packet-dcerpc.h>
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c
index 6f91d98433..412f61236e 100644
--- a/plugins/profinet/packet-dcom-cba.c
+++ b/plugins/profinet/packet-dcom-cba.c
@@ -22,9 +22,7 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/dissectors/packet-dcerpc.h>
 #include <epan/dissectors/packet-dcom.h>
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index 72e0a4e6a0..b17c12f415 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -25,12 +25,9 @@
 
 #include <string.h>
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/to_str.h>
-#include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c
index f03ce1413c..8a0545a016 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/profinet/packet-pn-mrp.c
@@ -23,11 +23,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/oui.h>
 #include <epan/etypes.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include "packet-pn.h"
 
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index 6cb38e3d7a..5614d62cf3 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/oui.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include "packet-pn.h"
 
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index a52a47fbe3..b8d1f50cea 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/oui.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include "packet-pn.h"
 
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index cdbb08492b..c232e2100d 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -31,8 +31,8 @@
 #include <epan/strutil.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/crc16-tvb.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include <wsutil/crc16.h>
 #include <wsutil/crc16-plain.h>
diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c
index 7f15bb6044..c89fa93f0c 100644
--- a/plugins/profinet/packet-pn.c
+++ b/plugins/profinet/packet-pn.c
@@ -25,10 +25,9 @@
 
 #include <string.h>
 
-#include <glib.h>
 #include <epan/packet.h>
-#include <epan/dissectors/packet-dcerpc.h>
 #include <epan/expert.h>
+#include <epan/dissectors/packet-dcerpc.h>
 
 #include "packet-pn.h"
 
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index 82aa8ecd9a..281746a2a8 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -24,16 +24,15 @@
 
 #include "config.h"
 
-#include <glib.h>
+#include <string.h>
+
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/wmem/wmem.h>
 #include <epan/expert.h>
 #include <epan/address.h>
 #include <epan/prefs.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
-#include <string.h>
 #include "packet-unistim.h"
 #include "defines.h"
 #include "audio.h"
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index 0b779b82ac..7d72b6c22d 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -38,7 +38,7 @@
 */
 
 #include <string.h>
-#include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/address.h>
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c
index 3613dd357c..ac55000959 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/wimax/mac_hd_type1_decoder.c
@@ -37,7 +37,6 @@
 #define DEBUG
 */
 
-#include <glib.h>
 #include <epan/packet.h>
 
 extern gint proto_mac_header_generic_decoder;
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c
index 4d8fe93a41..83ce7752f3 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/wimax/mac_hd_type2_decoder.c
@@ -37,7 +37,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 extern gint proto_mac_header_generic_decoder;
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c
index c093927cc5..12ebf8b7fd 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/wimax/mac_mgmt_msg_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c
index 2dd68c71d9..d296e11542 100644
--- a/plugins/wimax/msg_aas_beam.c
+++ b/plugins/wimax/msg_aas_beam.c
@@ -30,7 +30,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_mac.h"
 
diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/wimax/msg_aas_fbck.c
index 01ca475a1e..3810950f80 100644
--- a/plugins/wimax/msg_aas_fbck.c
+++ b/plugins/wimax/msg_aas_fbck.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_mac.h"
 
diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c
index 50d6a86dc6..41f743b3f4 100644
--- a/plugins/wimax/msg_arq.c
+++ b/plugins/wimax/msg_arq.c
@@ -30,7 +30,6 @@
 
 #include "moduleinfo.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c
index 459654cdfd..2a586362b0 100644
--- a/plugins/wimax/msg_clk_cmp.c
+++ b/plugins/wimax/msg_clk_cmp.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_mac.h"
 
diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c
index 31af9959a9..443c9d7a6e 100644
--- a/plugins/wimax/msg_dcd.c
+++ b/plugins/wimax/msg_dcd.c
@@ -32,7 +32,6 @@
 #define DEBUG
 */
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c
index 1610e262b3..d7d92476d3 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/wimax/msg_dlmap.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_mac.h"
 #include "crc.h"
diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c
index d4b2f265bf..295804eaab 100644
--- a/plugins/wimax/msg_dreg.c
+++ b/plugins/wimax/msg_dreg.c
@@ -30,7 +30,6 @@
 
 #include "moduleinfo.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c
index 4f7dc54272..05e7c6848e 100644
--- a/plugins/wimax/msg_dsa.c
+++ b/plugins/wimax/msg_dsa.c
@@ -32,7 +32,6 @@
 #define DEBUG
 */
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c
index 6551a19c42..4d7fb1b49c 100644
--- a/plugins/wimax/msg_dsc.c
+++ b/plugins/wimax/msg_dsc.c
@@ -32,7 +32,6 @@
 #define DEBUG
 */
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c
index 45cb220507..b01f45c75f 100644
--- a/plugins/wimax/msg_dsd.c
+++ b/plugins/wimax/msg_dsd.c
@@ -32,7 +32,6 @@
 #define DEBUG
 */
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/wimax/msg_dsx_rvd.c
index 7f6ac7baaf..eb65f03711 100644
--- a/plugins/wimax/msg_dsx_rvd.c
+++ b/plugins/wimax/msg_dsx_rvd.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_mac.h"
 
diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c
index a47c15edb6..78564c3b58 100644
--- a/plugins/wimax/msg_fpc.c
+++ b/plugins/wimax/msg_fpc.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_pkm.c b/plugins/wimax/msg_pkm.c
index 140fee2b01..ec47db4724 100644
--- a/plugins/wimax/msg_pkm.c
+++ b/plugins/wimax/msg_pkm.c
@@ -24,15 +24,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
-#define DEBUG	// for debug only
-*/
+#if 0
+#define DEBUG	/* for debug only */
+#endif
 
 /* Include files */
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_pmc.c b/plugins/wimax/msg_pmc.c
index afb5a29378..01906dffcd 100644
--- a/plugins/wimax/msg_pmc.c
+++ b/plugins/wimax/msg_pmc.c
@@ -30,7 +30,6 @@
 
 #include "moduleinfo.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c
index 824f4afc4d..c786e00a57 100644
--- a/plugins/wimax/msg_prc_lt_ctrl.c
+++ b/plugins/wimax/msg_prc_lt_ctrl.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c
index 0b1c949ac1..e5160e8516 100644
--- a/plugins/wimax/msg_reg_req.c
+++ b/plugins/wimax/msg_reg_req.c
@@ -30,7 +30,6 @@
 
 #define WIMAX_16E_2005
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c
index e2ac0667a2..ff758f30cd 100644
--- a/plugins/wimax/msg_reg_rsp.c
+++ b/plugins/wimax/msg_reg_rsp.c
@@ -32,7 +32,6 @@
 
 #define         FRAG_LAST                       0x1
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c
index 98f3b6b58b..fa9dc54d4e 100644
--- a/plugins/wimax/msg_rep.c
+++ b/plugins/wimax/msg_rep.c
@@ -24,14 +24,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
-#define DEBUG*/	/* for debug only*/
+#if 0
+#define DEBUG	/* for debug only*/
+#endif
 
 /* Include files */
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c
index 653ee96100..2b3a329e53 100644
--- a/plugins/wimax/msg_res_cmd.c
+++ b/plugins/wimax/msg_res_cmd.c
@@ -24,15 +24,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
-#define DEBUG	// for debug only
-*/
+#if 0
+#define DEBUG	/* for debug only */
+#endif
 
 /* Include files */
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c
index e16b51295c..ca9d7bbc56 100644
--- a/plugins/wimax/msg_rng_req.c
+++ b/plugins/wimax/msg_rng_req.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c
index a04c3e205e..aabc3d15f7 100644
--- a/plugins/wimax/msg_rng_rsp.c
+++ b/plugins/wimax/msg_rng_rsp.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c
index b26f89793f..cd61a0d9bf 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/wimax/msg_sbc.c
@@ -24,15 +24,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
-#define DEBUG	// for debug only
-*/
+#if 0
+#define DEBUG	/* for debug only */
+#endif
 
 /* Include files */
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c
index 1d4d7ccfa8..391307bb35 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/wimax/msg_ucd.c
@@ -32,7 +32,6 @@
 #define DEBUG
 */
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c
index e82d014901..289f903740 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/wimax/msg_ulmap.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c
index 7d71bb44e0..b0010405aa 100644
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/wimax/packet-wmx.c
@@ -29,11 +29,10 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/address.h>
-#include <epan/wmem/wmem.h>
 #include "wimax_tlv.h"
 
 void proto_register_wimax(void);
diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c
index f99dddb88f..76b2b8e9ad 100644
--- a/plugins/wimax/wimax_cdma_code_decoder.c
+++ b/plugins/wimax/wimax_cdma_code_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 void proto_register_wimax_cdma(void);
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
index c248fd58f4..1426665104 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_tlv.h"
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
index bef32f457a..e89da6b133 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_compact_ulmap_ie_decoder.h"
diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c
index 0617272964..afa3d19a28 100644
--- a/plugins/wimax/wimax_fch_decoder.c
+++ b/plugins/wimax/wimax_fch_decoder.c
@@ -29,7 +29,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
+
 #include <epan/packet.h>
 
 extern gint proto_wimax;
diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c
index da5c328d04..d6ecc363b6 100644
--- a/plugins/wimax/wimax_ffb_decoder.c
+++ b/plugins/wimax/wimax_ffb_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 extern gint proto_wimax;
diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c
index 11723ebcee..c90dde3f2c 100644
--- a/plugins/wimax/wimax_hack_decoder.c
+++ b/plugins/wimax/wimax_hack_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 extern gint proto_wimax;
diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c
index e28b243fee..a745d1424b 100644
--- a/plugins/wimax/wimax_harq_map_decoder.c
+++ b/plugins/wimax/wimax_harq_map_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 #include "wimax_compact_dlmap_ie_decoder.h"
diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c
index 15b1349e87..161bec7003 100644
--- a/plugins/wimax/wimax_pdu_decoder.c
+++ b/plugins/wimax/wimax_pdu_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "crc.h"
 
diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c
index 7c0f7afe03..d46aee9e28 100644
--- a/plugins/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/wimax/wimax_phy_attributes_decoder.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 
 extern gint proto_wimax;
diff --git a/plugins/wimax/wimax_tlv.h b/plugins/wimax/wimax_tlv.h
index 204daddc9d..28bc249327 100644
--- a/plugins/wimax/wimax_tlv.h
+++ b/plugins/wimax/wimax_tlv.h
@@ -26,7 +26,6 @@
 #ifndef _WIMAX_TLV_H_
 #define _WIMAX_TLV_H_
 
-#include <glib.h>
 #include <epan/packet.h>
 
 #define	WIMAX_TLV_EXTENDED_LENGTH_MASK 0x80
diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c
index d02fb18e14..7aa972087e 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/wimax/wimax_utils.c
@@ -30,7 +30,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
 #include "wimax_tlv.h"
 #include "wimax_mac.h"
diff --git a/plugins/wimax/wimax_utils.h b/plugins/wimax/wimax_utils.h
index 67902e8798..10528cf01c 100644
--- a/plugins/wimax/wimax_utils.h
+++ b/plugins/wimax/wimax_utils.h
@@ -26,7 +26,6 @@
 #ifndef WIMAX_UTILS_H
 #define WIMAX_UTILS_H
 
-#include <glib.h>
 #include <epan/packet.h>
 
 extern guint get_service_type(void);
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index dce21816ab..e4570113d1 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -31,18 +31,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <wsutil/report_err.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
-#include <wsutil/filesystem.h>
 #include <epan/eap.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/report_err.h>
 
 #include "wimaxasncp_dict.h"
 
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/wimaxmacphy/packet-wimaxmacphy.c
index 91652075b7..dd39b7016d 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.c
+++ b/plugins/wimaxmacphy/packet-wimaxmacphy.c
@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>