From 4632632e941ad48269a4a6a5944f2cdf8e14ff5f Mon Sep 17 00:00:00 2001
From: wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Mon, 8 Aug 2011 15:41:09 +0000
Subject: Dissectors don't need to #include <gmodule.h> Also: #include
 <stdlib.h> not req'd in some cases.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38409 f5534014-38df-0310-8fa8-9805f1628bb7
---
 epan/dissectors/packet-acn.c                | 3 +--
 epan/dissectors/packet-amqp.c               | 2 +-
 epan/dissectors/packet-ansi_801.c           | 3 ++-
 epan/dissectors/packet-epl_v1.c             | 2 +-
 epan/dissectors/packet-fmp_notify.c         | 1 -
 epan/dissectors/packet-ieee802154.c         | 6 +++---
 epan/dissectors/packet-lldp.c               | 1 -
 epan/dissectors/packet-msnlb.c              | 7 +++----
 epan/dissectors/packet-paltalk.c            | 2 +-
 epan/dissectors/packet-s5066.c              | 2 +-
 epan/dissectors/packet-srp.c                | 3 +--
 epan/dissectors/packet-zbee-nwk.c           | 5 ++---
 epan/dissectors/packet-zbee-zdp-binding.c   | 3 +--
 epan/dissectors/packet-zbee-zdp-discovery.c | 2 --
 epan/dissectors/packet-zbee-zdp.c           | 3 +--
 epan/dissectors/packet-zep.c                | 4 ++--
 16 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index f3478691ac..db658f16fa 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -43,11 +43,10 @@
 #include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/packet.h>
 #include <epan/ipv6-utils.h>
 
 #include "packet-acn.h"
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 73689e25a3..d8a594ea77 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -39,7 +39,7 @@
 #ifdef HAVE_CONFIG_H
 #    include "config.h"
 #endif
-#include <gmodule.h>
+
 #include <glib.h>
 #include <epan/exceptions.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index ebe6d96ee1..c371f4b172 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -38,7 +38,8 @@
 #endif
 
 #include <stdlib.h>
-#include <gmodule.h>
+
+#include <glib.h>
 #include <math.h>
 
 #ifdef HAVE_SYS_TYPES_H
diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c
index 0096d2f316..8fc5c0ac9c 100644
--- a/epan/dissectors/packet-epl_v1.c
+++ b/epan/dissectors/packet-epl_v1.c
@@ -36,7 +36,7 @@
 #include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 52edb44f10..64a0ef05a1 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <glib.h>
-#include <gmodule.h>
 
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 61c94b73ac..5c970fa6e4 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -64,15 +64,15 @@
 #endif /* HAVEHCONFIG_H */
 
 #include <string.h>
-#include <stdlib.h>
-#include <gmodule.h>
-#include <glib.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 
 #include <sys/stat.h>
+
+#include <glib.h>
+
 #include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/crc16.h>
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index b935fcadc4..fb79860b15 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index 95a9475892..4a16f8e9e8 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -11,12 +11,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -26,9 +26,8 @@
 #include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
-#include <epan/proto.h>
 #include <epan/etypes.h>
 #include "packet-smb-common.h"
 
diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c
index 500b9f1ef9..0fc7253fc0 100644
--- a/epan/dissectors/packet-paltalk.c
+++ b/epan/dissectors/packet-paltalk.c
@@ -30,7 +30,7 @@
 
 #include <string.h>
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index 2819b6ac21..64a1156dc0 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
+#include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/dissectors/packet-tcp.h> /* For tcp_dissect_pdus() */
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c
index 8e2b8dadf3..415a3057db 100644
--- a/epan/dissectors/packet-srp.c
+++ b/epan/dissectors/packet-srp.c
@@ -27,11 +27,10 @@
 # include "config.h"
 #endif
 
-#include <gmodule.h>
 #include <glib.h>
+#include <epan/packet.h>
 #include <epan/bitswap.h>
 #include <epan/circuit.h>
-#include <epan/packet.h>
 #include <epan/stream.h>
 /* #include <epan/reassemble.h> */
 #include <epan/crc16.h>
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index f23c8ca013..926f2e7e26 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -30,10 +30,9 @@
 #endif /* HAVEHCONFIG_H */
 
 #include <string.h>
-#include <stdlib.h>
+
 #include <glib.h>
-#include <gmodule.h>
-#include <epan/proto.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c
index c047a445a4..beaa9996d1 100644
--- a/epan/dissectors/packet-zbee-zdp-binding.c
+++ b/epan/dissectors/packet-zbee-zdp-binding.c
@@ -29,9 +29,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdlib.h>
 #include <glib.h>
-#include <gmodule.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 
diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c
index a1f26cabc0..0ac1f0a06d 100644
--- a/epan/dissectors/packet-zbee-zdp-discovery.c
+++ b/epan/dissectors/packet-zbee-zdp-discovery.c
@@ -29,9 +29,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdlib.h>
 #include <glib.h>
-#include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index c1b02fa3b6..3127db8ead 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -29,9 +29,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdlib.h>
 #include <glib.h>
-#include <gmodule.h>
+
 #include <epan/packet.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index 673ed37198..05337fe3f8 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -51,10 +51,10 @@
 #include <sys/types.h>
 #endif
 #include <sys/stat.h>
+
 #include <string.h>
-#include <stdlib.h>
+
 #include <glib.h>
-#include <gmodule.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-- 
cgit v1.2.3