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

svn path=/trunk/; revision=27390

1 files changed, 6 insertions, 8 deletions

diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 0a2b20d3c0..cb4df8ad26 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -40,7 +40,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -52,7 +51,6 @@
 #include "packet-crmf.h"
 #include "packet-pkix1explicit.h"
 #include "packet-pkix1implicit.h"
-#include <epan/emem.h>
 #include "packet-tcp.h"
 #include "packet-http.h"
 #include <epan/prefs.h>
@@ -244,7 +242,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1;
 static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1;
 
 /*--- End of included file: packet-cmp-hf.c ---*/
-#line 77 "packet-cmp-template.c"
+#line 75 "packet-cmp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmp = -1;
@@ -300,7 +298,7 @@ static gint ett_cmp_PollRepContent = -1;
 static gint ett_cmp_PollRepContent_item = -1;
 
 /*--- End of included file: packet-cmp-ett.c ---*/
-#line 81 "packet-cmp-template.c"
+#line 79 "packet-cmp-template.c"
 
 static const char *object_identifier_id;
 
@@ -1468,7 +1466,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-cmp-fn.c ---*/
-#line 86 "packet-cmp-template.c"
+#line 84 "packet-cmp-template.c"
 
 static int
 dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx)
@@ -2369,7 +2367,7 @@ void proto_register_cmp(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-cmp-hfarr.c ---*/
-#line 354 "packet-cmp-template.c"
+#line 352 "packet-cmp-template.c"
 	};
 
 	/* List of subtrees */
@@ -2427,7 +2425,7 @@ void proto_register_cmp(void) {
     &ett_cmp_PollRepContent_item,
 
 /*--- End of included file: packet-cmp-ettarr.c ---*/
-#line 360 "packet-cmp-template.c"
+#line 358 "packet-cmp-template.c"
 	};
 	module_t *cmp_module;
 
@@ -2521,7 +2519,7 @@ void proto_reg_handoff_cmp(void) {
 
 
 /*--- End of included file: packet-cmp-dis-tab.c ---*/
-#line 432 "packet-cmp-template.c"
+#line 430 "packet-cmp-template.c"
 		inited = TRUE;
 	}