Don't drag in a huge pile of headers in "packet-smb-common.h"; rely on

the files including it to include what they need.

svn path=/trunk/; revision=11588

6 files changed, 25 insertions, 12 deletions

diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index 5af4750a3c..0c899d57de 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index e38af3cf37..5869a6ba6c 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -28,6 +28,9 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <ctype.h>
+
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c
index da62cbf5ea..4199654b1a 100644
--- a/epan/dissectors/packet-smb-common.c
+++ b/epan/dissectors/packet-smb-common.c
@@ -25,6 +25,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <string.h>
+
+#include <glib.h>
+
+#include <epan/packet.h>
 #include "packet-smb-common.h"
 
 /*
diff --git a/epan/dissectors/packet-smb-common.h b/epan/dissectors/packet-smb-common.h
index 1949a11c49..cdec298464 100644
--- a/epan/dissectors/packet-smb-common.h
+++ b/epan/dissectors/packet-smb-common.h
@@ -28,18 +28,6 @@
 #ifndef __PACKET_SMB_COMMON_H__
 #define __PACKET_SMB_COMMON_H__
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-#include <ctype.h>
-#include <epan/packet.h>
-#include <epan/conversation.h>
 #include "smb.h"
 
 int dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset);
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index a1060353f0..86951f6af5 100644
--- a/epan/dissectors/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
@@ -25,6 +25,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+
+#include <epan/packet.h>
 #include "packet-smb-common.h"
 
 static int proto_smb_logon = -1;
diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 9ad7db08ed..e8aeff2932 100644
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -30,6 +30,10 @@
 #endif
 
 #include <string.h>
+
+#include <glib.h>
+
+#include <epan/packet.h>
 #include "packet-smb-common.h"
 #include "packet-smb-mailslot.h"
 #include "packet-smb-browse.h"