#include <epan/conversation.h> not req'd ...

svn path=/trunk/; revision=27392

5 files changed, 11 insertions, 16 deletions

diff --git a/epan/camel-persistentdata.c b/epan/camel-persistentdata.c
index 9b6db849fa..3e87a26f96 100644
--- a/epan/camel-persistentdata.c
+++ b/epan/camel-persistentdata.c
@@ -35,7 +35,6 @@
 
 #include <epan/emem.h>
 #include "epan/packet.h"
-#include "epan/conversation.h"
 #include "epan/tap.h"
 #include <epan/asn1.h>
 #include "epan/camel-persistentdata.h"
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 4df02292d1..5c46dd5e14 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -37,7 +37,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
@@ -718,7 +717,7 @@ static int hf_mms_Transitions_idle_to_active = -1;
 static int hf_mms_Transitions_any_to_deleted = -1;
 
 /*--- End of included file: packet-mms-hf.c ---*/
-#line 50 "packet-mms-template.c"
+#line 49 "packet-mms-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_mms = -1;
@@ -932,7 +931,7 @@ static gint ett_mms_DirectoryEntry = -1;
 static gint ett_mms_FileAttributes = -1;
 
 /*--- End of included file: packet-mms-ett.c ---*/
-#line 54 "packet-mms-template.c"
+#line 53 "packet-mms-template.c"
 
 
 /*--- Included file: packet-mms-fn.c ---*/
@@ -6883,7 +6882,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 
 /*--- End of included file: packet-mms-fn.c ---*/
-#line 56 "packet-mms-template.c"
+#line 55 "packet-mms-template.c"
 
 /*
 * Dissect MMS PDUs inside a PPDU.
@@ -9562,7 +9561,7 @@ void proto_register_mms(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-mms-hfarr.c ---*/
-#line 98 "packet-mms-template.c"
+#line 97 "packet-mms-template.c"
   };
 
   /* List of subtrees */
@@ -9778,7 +9777,7 @@ void proto_register_mms(void) {
     &ett_mms_FileAttributes,
 
 /*--- End of included file: packet-mms-ettarr.c ---*/
-#line 104 "packet-mms-template.c"
+#line 103 "packet-mms-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index edc6721dba..cc07aa2186 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -40,7 +40,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/strutil.h>
@@ -140,7 +139,7 @@ static int hf_tcap_AARQ_protocol_version_version1 = -1;
 static int hf_tcap_AARE_protocol_version_version1 = -1;
 
 /*--- End of included file: packet-tcap-hf.c ---*/
-#line 64 "packet-tcap-template.c"
+#line 63 "packet-tcap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_tcap = -1;
@@ -195,7 +194,7 @@ static gint ett_tcap_ABRT_user_information = -1;
 static gint ett_tcap_Associate_source_diagnostic = -1;
 
 /*--- End of included file: packet-tcap-ett.c ---*/
-#line 80 "packet-tcap-template.c"
+#line 79 "packet-tcap-template.c"
 
 #define MAX_SSN 254
 static range_t *global_ssn_range;
@@ -1419,7 +1418,7 @@ static void dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
 
 
 /*--- End of included file: packet-tcap-fn.c ---*/
-#line 143 "packet-tcap-template.c"
+#line 142 "packet-tcap-template.c"
 
 
 
@@ -1542,7 +1541,7 @@ proto_reg_handoff_tcap(void)
 
 
 /*--- End of included file: packet-tcap-dis-tab.c ---*/
-#line 258 "packet-tcap-template.c"
+#line 257 "packet-tcap-template.c"
 }
 
 static void init_tcap(void);
@@ -1873,7 +1872,7 @@ proto_register_tcap(void)
         "", HFILL }},
 
 /*--- End of included file: packet-tcap-hfarr.c ---*/
-#line 320 "packet-tcap-template.c"
+#line 319 "packet-tcap-template.c"
     };
 
 /* Setup protocol subtree array */
@@ -1922,7 +1921,7 @@ proto_register_tcap(void)
     &ett_tcap_Associate_source_diagnostic,
 
 /*--- End of included file: packet-tcap-ettarr.c ---*/
-#line 330 "packet-tcap-template.c"
+#line 329 "packet-tcap-template.c"
     };
 
     /*static enum_val_t tcap_options[] = {
diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c
index 3b540dabe6..487113b810 100644
--- a/epan/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
@@ -32,7 +32,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/emem.h>
 
 #include <stdio.h>
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index 6c5f3e2e4a..46f2dd3de3 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -35,7 +35,6 @@
 
 #include "epan/emem.h"
 #include "epan/packet.h"
-#include "epan/conversation.h"
 #include "epan/asn1.h"
 #include "epan/tcap-persistentdata.h"
 #include "epan/dissectors/packet-tcap.h"