From 09d097e7a7c675c0165da4cd10352e2ff95c4998 Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Fri, 6 Feb 2009 20:33:53 +0000
Subject: [PATCH] #include <conversation.h> not req'd ....

svn path=/trunk/; revision=27389
---
 epan/dissectors/packet-actrace.c    | 1 -
 epan/dissectors/packet-arp.c        | 1 -
 epan/dissectors/packet-csm-encaps.c | 1 -
 epan/dissectors/packet-ctdb.c       | 1 -
 epan/dissectors/packet-imf.c        | 1 -
 epan/dissectors/packet-isup_thin.c  | 1 -
 epan/dissectors/packet-kerberos4.c  | 1 -
 epan/dissectors/packet-laplink.c    | 1 -
 epan/dissectors/packet-mq-pcf.c     | 1 -
 epan/dissectors/packet-rtp-events.c | 1 -
 epan/dissectors/packet-rtps.c       | 1 -
 epan/dissectors/packet-rtps2.c      | 1 -
 epan/dissectors/packet-sdp.c        | 1 -
 epan/dissectors/packet-tnef.c       | 1 -
 epan/dissectors/packet-winsrepl.c   | 1 -
 15 files changed, 15 deletions(-)

diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index b92259dfff..bf6d12a89e 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -33,7 +33,6 @@
 #include <epan/packet.h>
 #include <epan/proto.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-actrace.h"
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index dfbf6c7da1..937139ae41 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -36,7 +36,6 @@
 #include "packet-arp.h"
 #include <epan/etypes.h>
 #include <epan/arcnet_pids.h>
-#include <epan/conversation.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index 6b26fd79df..db68037d41 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -43,7 +43,6 @@
 
 #include <epan/packet.h>
 #include <epan/reassemble.h>
-#include <epan/conversation.h>
 #include <epan/tap.h>
 
 #include <epan/proto.h>
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index ac4679fa33..ebb11e2c70 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -35,7 +35,6 @@
 
 #include <epan/packet.h>
 #include <epan/value_string.h>
-#include <epan/conversation.h>
 #include <epan/emem.h>
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 5bcbd82fca..1448a1ebb6 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -35,7 +35,6 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-isup_thin.c b/epan/dissectors/packet-isup_thin.c
index d8e73d60b3..c328c8d75c 100644
--- a/epan/dissectors/packet-isup_thin.c
+++ b/epan/dissectors/packet-isup_thin.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <epan/conversation.h>
 
 #include <epan/packet.h>
 #include "prefs.h"
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index 5ca393113d..56d03e6ec0 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -39,7 +39,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 
 static int proto_krb4 = -1;
 static int hf_krb4_version = -1;
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index da83f452b2..d073b1d0f4 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -35,7 +35,6 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/conversation.h>
 
 #include "packet-tcp.h"
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index 4de3dcd801..449898d5d0 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -39,7 +39,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include "packet-mq.h"
 
 static int proto_mqpcf = -1;
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 95a5fff8a1..d2ee744220 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -46,7 +46,6 @@
 #include <string.h>
 #include "packet-rtp-events.h"
 #include "packet-rtp.h"
-#include <epan/conversation.h>
 #include <epan/tap.h>
 
 /*  rtp_event_payload_type_value is the value used globally
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 8d2fa634b2..2ff4da4a1e 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -60,7 +60,6 @@
 #include  <glib.h>
 #include  <epan/packet.h>
 #include  <epan/addr_resolv.h>
-#include  <epan/conversation.h>
 
 
 #include "packet-rtps.h"
diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index 56b8f549e1..f64126a2f3 100644
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -55,7 +55,6 @@
 #include  <glib.h>
 #include  <epan/packet.h>
 #include  <epan/addr_resolv.h>
-#include  <epan/conversation.h>
 #include  <epan/prefs.h>
 
 
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 7b017388ab..f69df573de 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -52,7 +52,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 #include <epan/emem.h>
 #include <epan/base64.h>
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index ef15539d89..f8dfbc7c57 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -36,7 +36,6 @@
 #include <string.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index be138df5aa..04243ddd8e 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -37,7 +37,6 @@
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>