- Forward declaration of register functions.

svn path=/trunk/; revision=53859

22 files changed, 124 insertions, 60 deletions

diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c
index 0d1356642f..9647eca5e6 100644
--- a/asn1/mpeg-audio/packet-mpeg-audio-template.c
+++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c
@@ -37,6 +37,9 @@
 #include "packet-mpeg-audio-ett.c"
 #include "packet-mpeg-audio-fn.c"
 
+void proto_register_mpeg_audio(void);
+void proto_reg_handoff_mpeg_audio(void);
+
 static int proto_mpeg_audio = -1;
 
 static int hf_mpeg_audio_data = -1;
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index 208e28d56b..ee2f1c5d42 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -37,6 +37,9 @@
 #include "packet-mpeg-pes-ett.c"
 #include "packet-mpeg-pes-fn.c"
 
+void proto_register_mpeg_pes(void);
+void proto_reg_handoff_mpeg_pes(void);
+
 static int proto_mpeg = -1;
 static int proto_mpeg_pes = -1;
 
diff --git a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
index 459f69bbfd..91be50bfcc 100644
--- a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
+++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
@@ -34,6 +34,9 @@
 #define PSNAME "NS_CERT_EXTS"
 #define PFNAME "ns_cert_exts"
 
+void proto_register_ns_cert_exts(void);
+void proto_reg_handoff_ns_cert_exts(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ns_cert_exts = -1;
 #include "packet-ns_cert_exts-hf.c"
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 964ac88f2a..3b62b535eb 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -41,6 +41,9 @@
 #define PSNAME "OCSP"
 #define PFNAME "ocsp"
 
+void proto_register_ocsp(void);
+void proto_reg_handoff_ocsp(void);
+
 /* Initialize the protocol and registered fields */
 int proto_ocsp = -1;
 static int hf_ocsp_responseType_id = -1;
diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c
index f02d3cf20f..048b9cd023 100644
--- a/asn1/pcap/packet-pcap-template.c
+++ b/asn1/pcap/packet-pcap-template.c
@@ -51,6 +51,10 @@
 #define PFNAME "pcap"
 
 #define MAX_SSN 254
+
+void proto_register_pcap(void);
+void proto_reg_handoff_pcap(void);
+
 static range_t *global_ssn_range;
 
 static dissector_table_t sccp_ssn_table;
diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c
index 6b54bf47ec..39c541404a 100644
--- a/asn1/pkinit/packet-pkinit-template.c
+++ b/asn1/pkinit/packet-pkinit-template.c
@@ -39,6 +39,9 @@
 #define PSNAME "PKInit"
 #define PFNAME "pkinit"
 
+void proto_register_pkinit(void);
+void proto_reg_handoff_pkinit(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkinit = -1;
 #include "packet-pkinit-hf.c"
diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c
index 1874428343..b446859366 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c
@@ -37,6 +37,9 @@
 #define PSNAME "PKIX1IMPLICIT"
 #define PFNAME "pkix1implicit"
 
+void proto_register_pkix1implicit(void);
+void proto_reg_handoff_pkix1implicit(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkix1implicit = -1;
 #include "packet-pkix1implicit-hf.c"
diff --git a/asn1/pkixac/packet-pkixac-template.c b/asn1/pkixac/packet-pkixac-template.c
index 4841f2a106..ef075299f1 100644
--- a/asn1/pkixac/packet-pkixac-template.c
+++ b/asn1/pkixac/packet-pkixac-template.c
@@ -41,6 +41,9 @@
 #define PSNAME "PKIXAC"
 #define PFNAME "pkixac"
 
+void proto_register_pkixac(void);
+void proto_reg_handoff_pkixac(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkixac = -1;
 #include "packet-pkixac-hf.c"
diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c
index d1af8a72ce..0796e87480 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.c
+++ b/asn1/pkixproxy/packet-pkixproxy-template.c
@@ -38,6 +38,7 @@
 #define PFNAME "pkixproxy"
 
 void proto_register_pkixproxy(void);
+void proto_reg_handoff_pkixproxy(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_pkixproxy = -1;
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index c2f013d70c..d0cc896e36 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -60,6 +60,9 @@
 
 #include "packet-ranap-val.h"
 
+void proto_register_ranap(void);
+void proto_reg_handoff_ranap(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ranap = -1;
 
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index dca0dffff5..ed0db5a460 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -52,6 +52,9 @@
 
 #include "packet-rnsap-val.h"
 
+void proto_register_rnsap(void);
+void proto_reg_handoff_rnsap(void);
+
 static dissector_handle_t rrc_dl_dcch_handle = NULL;
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c
index 7a910c511b..ea9b3da0f1 100644
--- a/epan/dissectors/packet-mpeg-audio.c
+++ b/epan/dissectors/packet-mpeg-audio.c
@@ -449,6 +449,9 @@ dissect_mpeg_audio_ID3v1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 /*--- End of included file: packet-mpeg-audio-fn.c ---*/
 #line 39 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c"
 
+void proto_register_mpeg_audio(void);
+void proto_reg_handoff_mpeg_audio(void);
+
 static int proto_mpeg_audio = -1;
 
 static int hf_mpeg_audio_data = -1;
@@ -653,7 +656,7 @@ proto_register_mpeg_audio(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/
-#line 152 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c"
+#line 155 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c"
 		{ &hf_mpeg_audio_data,
 			{ "Data", "mpeg-audio.data",
 				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -677,7 +680,7 @@ proto_register_mpeg_audio(void)
     &ett_mpeg_audio_ID3v1,
 
 /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/
-#line 169 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c"
+#line 172 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c"
 	};
 
 	proto_mpeg_audio = proto_register_protocol(
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index e5ec8a7ec5..187ed0b9aa 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -478,6 +478,9 @@ dissect_mpeg_pes_Picture(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 /*--- End of included file: packet-mpeg-pes-fn.c ---*/
 #line 39 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c"
 
+void proto_register_mpeg_pes(void);
+void proto_reg_handoff_mpeg_pes(void);
+
 static int proto_mpeg = -1;
 static int proto_mpeg_pes = -1;
 
@@ -1201,7 +1204,7 @@ proto_register_mpeg_pes(void)
         "BIT_STRING_SIZE_16", HFILL }},
 
 /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/
-#line 559 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c"
+#line 562 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c"
 		{ &hf_mpeg_pes_pack_header,
 			{ "Pack header", "mpeg-pes.pack",
 				FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1319,7 +1322,7 @@ proto_register_mpeg_pes(void)
     &ett_mpeg_pes_Picture,
 
 /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/
-#line 666 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c"
+#line 669 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c"
 		&ett_mpeg_pes_pack_header,
 		&ett_mpeg_pes_header_data,
 		&ett_mpeg_pes_trick_mode
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index be64098d76..b24867c379 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -42,6 +42,9 @@
 #define PSNAME "NS_CERT_EXTS"
 #define PFNAME "ns_cert_exts"
 
+void proto_register_ns_cert_exts(void);
+void proto_reg_handoff_ns_cert_exts(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ns_cert_exts = -1;
 
@@ -66,7 +69,7 @@ static int hf_ns_cert_exts_CertType_smime_ca = -1;
 static int hf_ns_cert_exts_CertType_object_signing_ca = -1;
 
 /*--- End of included file: packet-ns_cert_exts-hf.c ---*/
-#line 40 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
+#line 43 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -75,7 +78,7 @@ static int hf_ns_cert_exts_CertType_object_signing_ca = -1;
 static gint ett_ns_cert_exts_CertType = -1;
 
 /*--- End of included file: packet-ns_cert_exts-ett.c ---*/
-#line 43 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
+#line 46 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
 
 
 /*--- Included file: packet-ns_cert_exts-fn.c ---*/
@@ -224,7 +227,7 @@ static void dissect_CertType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-ns_cert_exts-fn.c ---*/
-#line 45 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
+#line 48 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
 
 
 /*--- proto_register_ns_cert_exts -------------------------------------------*/
@@ -301,7 +304,7 @@ void proto_register_ns_cert_exts(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/
-#line 53 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
+#line 56 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
   };
 
   /* List of subtrees */
@@ -312,7 +315,7 @@ void proto_register_ns_cert_exts(void) {
     &ett_ns_cert_exts_CertType,
 
 /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/
-#line 58 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
+#line 61 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
   };
 
   /* Register protocol */
@@ -341,6 +344,6 @@ void proto_reg_handoff_ns_cert_exts(void) {
 
 
 /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/
-#line 73 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
+#line 76 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c"
 }
 
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 8f78ca0807..63632deca2 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -49,6 +49,9 @@
 #define PSNAME "OCSP"
 #define PFNAME "ocsp"
 
+void proto_register_ocsp(void);
+void proto_reg_handoff_ocsp(void);
+
 /* Initialize the protocol and registered fields */
 int proto_ocsp = -1;
 static int hf_ocsp_responseType_id = -1;
@@ -109,7 +112,7 @@ static int hf_ocsp_crlNum = -1;                   /* INTEGER */
 static int hf_ocsp_crlTime = -1;                  /* GeneralizedTime */
 
 /*--- End of included file: packet-ocsp-hf.c ---*/
-#line 48 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 51 "../../asn1/ocsp/packet-ocsp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ocsp = -1;
@@ -137,7 +140,7 @@ static gint ett_ocsp_ServiceLocator = -1;
 static gint ett_ocsp_CrlID = -1;
 
 /*--- End of included file: packet-ocsp-ett.c ---*/
-#line 52 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 55 "../../asn1/ocsp/packet-ocsp-template.c"
 
 static const char *responseType_id;
 
@@ -662,7 +665,7 @@ static void dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr
 
 
 /*--- End of included file: packet-ocsp-fn.c ---*/
-#line 57 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 60 "../../asn1/ocsp/packet-ocsp-template.c"
 
 
 static int
@@ -930,7 +933,7 @@ void proto_register_ocsp(void) {
         "GeneralizedTime", HFILL }},
 
 /*--- End of included file: packet-ocsp-hfarr.c ---*/
-#line 112 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 115 "../../asn1/ocsp/packet-ocsp-template.c"
   };
 
   /* List of subtrees */
@@ -960,7 +963,7 @@ void proto_register_ocsp(void) {
     &ett_ocsp_CrlID,
 
 /*--- End of included file: packet-ocsp-ettarr.c ---*/
-#line 118 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 121 "../../asn1/ocsp/packet-ocsp-template.c"
   };
 
   /* Register protocol */
@@ -996,6 +999,6 @@ void proto_reg_handoff_ocsp(void) {
 
 
 /*--- End of included file: packet-ocsp-dis-tab.c ---*/
-#line 141 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 144 "../../asn1/ocsp/packet-ocsp-template.c"
 }
 
diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index c9578b69d5..c644cc209c 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -59,6 +59,10 @@
 #define PFNAME "pcap"
 
 #define MAX_SSN 254
+
+void proto_register_pcap(void);
+void proto_reg_handoff_pcap(void);
+
 static range_t *global_ssn_range;
 
 static dissector_table_t sccp_ssn_table;
@@ -251,7 +255,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-pcap-val.h ---*/
-#line 59 "../../asn1/pcap/packet-pcap-template.c"
+#line 63 "../../asn1/pcap/packet-pcap-template.c"
 
 static dissector_handle_t pcap_handle = NULL;
 
@@ -1404,7 +1408,7 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1;
 static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1;
 
 /*--- End of included file: packet-pcap-hf.c ---*/
-#line 66 "../../asn1/pcap/packet-pcap-template.c"
+#line 70 "../../asn1/pcap/packet-pcap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_pcap = -1;
@@ -1807,7 +1811,7 @@ static gint ett_pcap_UnsuccessfulOutcome = -1;
 static gint ett_pcap_Outcome = -1;
 
 /*--- End of included file: packet-pcap-ett.c ---*/
-#line 71 "../../asn1/pcap/packet-pcap-template.c"
+#line 75 "../../asn1/pcap/packet-pcap-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -13517,7 +13521,7 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-pcap-fn.c ---*/
-#line 95 "../../asn1/pcap/packet-pcap-template.c"
+#line 99 "../../asn1/pcap/packet-pcap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -13710,7 +13714,7 @@ proto_reg_handoff_pcap(void)
 
 
 /*--- End of included file: packet-pcap-dis-tab.c ---*/
-#line 154 "../../asn1/pcap/packet-pcap-template.c"
+#line 158 "../../asn1/pcap/packet-pcap-template.c"
     } else {
         dissector_delete_uint_range("sccp.ssn", ssn_range, pcap_handle);
         g_free(ssn_range);
@@ -18291,7 +18295,7 @@ void proto_register_pcap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-pcap-hfarr.c ---*/
-#line 170 "../../asn1/pcap/packet-pcap-template.c"
+#line 174 "../../asn1/pcap/packet-pcap-template.c"
   };
 
   /* List of subtrees */
@@ -18695,7 +18699,7 @@ void proto_register_pcap(void) {
     &ett_pcap_Outcome,
 
 /*--- End of included file: packet-pcap-ettarr.c ---*/
-#line 176 "../../asn1/pcap/packet-pcap-template.c"
+#line 180 "../../asn1/pcap/packet-pcap-template.c"
   };
 
   module_t *pcap_module;
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index 8dae56b1e3..c0dd1dddc7 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -47,6 +47,9 @@
 #define PSNAME "PKInit"
 #define PFNAME "pkinit"
 
+void proto_register_pkinit(void);
+void proto_reg_handoff_pkinit(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkinit = -1;
 
@@ -78,7 +81,7 @@ static int hf_pkinit_dhNonce = -1;                /* INTEGER */
 static int hf_pkinit_dhKeyExpiration = -1;        /* KerberosTime */
 
 /*--- End of included file: packet-pkinit-hf.c ---*/
-#line 45 "../../asn1/pkinit/packet-pkinit-template.c"
+#line 48 "../../asn1/pkinit/packet-pkinit-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -95,7 +98,7 @@ static gint ett_pkinit_PaPkAsRep = -1;
 static gint ett_pkinit_KDCDHKeyInfo = -1;
 
 /*--- End of included file: packet-pkinit-ett.c ---*/
-#line 48 "../../asn1/pkinit/packet-pkinit-template.c"
+#line 51 "../../asn1/pkinit/packet-pkinit-template.c"
 
 static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,  asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_);
 static int dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,  asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_);
@@ -306,7 +309,7 @@ static void dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-pkinit-fn.c ---*/
-#line 55 "../../asn1/pkinit/packet-pkinit-template.c"
+#line 58 "../../asn1/pkinit/packet-pkinit-template.c"
 
 int
 dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) {
@@ -451,7 +454,7 @@ void proto_register_pkinit(void) {
         "KerberosTime", HFILL }},
 
 /*--- End of included file: packet-pkinit-hfarr.c ---*/
-#line 99 "../../asn1/pkinit/packet-pkinit-template.c"
+#line 102 "../../asn1/pkinit/packet-pkinit-template.c"
   };
 
   /* List of subtrees */
@@ -470,7 +473,7 @@ void proto_register_pkinit(void) {
     &ett_pkinit_KDCDHKeyInfo,
 
 /*--- End of included file: packet-pkinit-ettarr.c ---*/
-#line 104 "../../asn1/pkinit/packet-pkinit-template.c"
+#line 107 "../../asn1/pkinit/packet-pkinit-template.c"
   };
 
   /* Register protocol */
@@ -494,6 +497,6 @@ void proto_reg_handoff_pkinit(void) {
 
 
 /*--- End of included file: packet-pkinit-dis-tab.c ---*/
-#line 119 "../../asn1/pkinit/packet-pkinit-template.c"
+#line 122 "../../asn1/pkinit/packet-pkinit-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index 1dcfef7a34..91d708d957 100644
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -45,6 +45,9 @@
 #define PSNAME "PKIX1IMPLICIT"
 #define PFNAME "pkix1implicit"
 
+void proto_register_pkix1implicit(void);
+void proto_reg_handoff_pkix1implicit(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkix1implicit = -1;
 
@@ -67,7 +70,7 @@ static int hf_pkix1implicit_bmpString = -1;       /* BMPString */
 static int hf_pkix1implicit_utf8String = -1;      /* UTF8String */
 
 /*--- End of included file: packet-pkix1implicit-hf.c ---*/
-#line 43 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
+#line 46 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -81,7 +84,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1;
 static gint ett_pkix1implicit_DisplayText = -1;
 
 /*--- End of included file: packet-pkix1implicit-ett.c ---*/
-#line 46 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
+#line 49 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
 
 
 int
@@ -299,7 +302,7 @@ static void dissect_UserNotice_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-pkix1implicit-fn.c ---*/
-#line 62 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
+#line 65 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
 
 
 /*--- proto_register_pkix1implicit ----------------------------------------------*/
@@ -372,7 +375,7 @@ void proto_register_pkix1implicit(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/
-#line 70 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
+#line 73 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
   };
 
   /* List of subtrees */
@@ -388,7 +391,7 @@ void proto_register_pkix1implicit(void) {
     &ett_pkix1implicit_DisplayText,
 
 /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/
-#line 75 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
+#line 78 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
   };
 
   /* Register protocol */
@@ -444,6 +447,6 @@ void proto_reg_handoff_pkix1implicit(void) {
 
 
 /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/
-#line 90 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
+#line 93 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c
index de0956fae3..8e18178fec 100644
--- a/epan/dissectors/packet-pkixac.c
+++ b/epan/dissectors/packet-pkixac.c
@@ -49,6 +49,9 @@
 #define PSNAME "PKIXAC"
 #define PFNAME "pkixac"
 
+void proto_register_pkixac(void);
+void proto_reg_handoff_pkixac(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkixac = -1;
 
@@ -107,7 +110,7 @@ static int hf_pkixac_ClassList_secret = -1;
 static int hf_pkixac_ClassList_topSecret = -1;
 
 /*--- End of included file: packet-pkixac-hf.c ---*/
-#line 47 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 50 "../../asn1/pkixac/packet-pkixac-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_pkixac = -1;
@@ -134,7 +137,7 @@ static gint ett_pkixac_AttrSpec = -1;
 static gint ett_pkixac_ProxyInfo = -1;
 
 /*--- End of included file: packet-pkixac-ett.c ---*/
-#line 51 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 54 "../../asn1/pkixac/packet-pkixac-template.c"
 
 static const char *object_identifier_id;
 
@@ -582,7 +585,7 @@ static void dissect_ProxyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
 
 
 /*--- End of included file: packet-pkixac-fn.c ---*/
-#line 55 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 58 "../../asn1/pkixac/packet-pkixac-template.c"
 
 /*--- proto_register_pkixac ----------------------------------------------*/
 void proto_register_pkixac(void) {
@@ -794,7 +797,7 @@ void proto_register_pkixac(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-pkixac-hfarr.c ---*/
-#line 62 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 65 "../../asn1/pkixac/packet-pkixac-template.c"
   };
 
   /* List of subtrees */
@@ -823,7 +826,7 @@ void proto_register_pkixac(void) {
     &ett_pkixac_ProxyInfo,
 
 /*--- End of included file: packet-pkixac-ettarr.c ---*/
-#line 68 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 71 "../../asn1/pkixac/packet-pkixac-template.c"
   };
 
   /* Register protocol */
@@ -841,7 +844,7 @@ void proto_register_pkixac(void) {
   register_ber_syntax_dissector("RFC3281Clearance", proto_pkixac, dissect_RFC3281Clearance_PDU);
 
 /*--- End of included file: packet-pkixac-syn-reg.c ---*/
-#line 78 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 81 "../../asn1/pkixac/packet-pkixac-template.c"
 
 }
 
@@ -864,6 +867,6 @@ void proto_reg_handoff_pkixac(void) {
 
 
 /*--- End of included file: packet-pkixac-dis-tab.c ---*/
-#line 85 "../../asn1/pkixac/packet-pkixac-template.c"
+#line 88 "../../asn1/pkixac/packet-pkixac-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index 770cbcd2cd..76db818493 100644
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -46,6 +46,7 @@
 #define PFNAME "pkixproxy"
 
 void proto_register_pkixproxy(void);
+void proto_reg_handoff_pkixproxy(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_pkixproxy = -1;
@@ -59,7 +60,7 @@ static int hf_pkixproxy_policyLanguage = -1;      /* OBJECT_IDENTIFIER */
 static int hf_pkixproxy_policy = -1;              /* OCTET_STRING */
 
 /*--- End of included file: packet-pkixproxy-hf.c ---*/
-#line 45 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
+#line 46 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -69,7 +70,7 @@ static gint ett_pkixproxy_ProxyCertInfoExtension = -1;
 static gint ett_pkixproxy_ProxyPolicy = -1;
 
 /*--- End of included file: packet-pkixproxy-ett.c ---*/
-#line 48 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
+#line 49 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
 
 
 /*--- Included file: packet-pkixproxy-fn.c ---*/
@@ -143,7 +144,7 @@ static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *p
 
 
 /*--- End of included file: packet-pkixproxy-fn.c ---*/
-#line 50 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
+#line 51 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
 
 
 /*--- proto_register_pkixproxy ----------------------------------------------*/
@@ -176,7 +177,7 @@ void proto_register_pkixproxy(void) {
         "OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-pkixproxy-hfarr.c ---*/
-#line 58 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
+#line 59 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
   };
 
   /* List of subtrees */
@@ -188,7 +189,7 @@ void proto_register_pkixproxy(void) {
     &ett_pkixproxy_ProxyPolicy,
 
 /*--- End of included file: packet-pkixproxy-ettarr.c ---*/
-#line 63 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
+#line 64 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
   };
 
   /* Register protocol */
@@ -210,7 +211,7 @@ void proto_reg_handoff_pkixproxy(void) {
 
 
 /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/
-#line 78 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
+#line 79 "../../asn1/pkixproxy/packet-pkixproxy-template.c"
   oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0");
   oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1");
   oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2");
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 8f1786ccc2..9e9cc59198 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -413,6 +413,9 @@ typedef enum _ProtocolIE_ID_enum {
 /*--- End of included file: packet-ranap-val.h ---*/
 #line 62 "../../asn1/ranap/packet-ranap-template.c"
 
+void proto_register_ranap(void);
+void proto_reg_handoff_ranap(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ranap = -1;
 
@@ -1147,7 +1150,7 @@ static int hf_ranap_unsuccessfulOutcome_value = -1;  /* UnsuccessfulOutcome_valu
 static int hf_ranap_value = -1;                   /* T_value */
 
 /*--- End of included file: packet-ranap-hf.c ---*/
-#line 77 "../../asn1/ranap/packet-ranap-template.c"
+#line 80 "../../asn1/ranap/packet-ranap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_ranap = -1;
@@ -1483,7 +1486,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1;
 static gint ett_ranap_Outcome = -1;
 
 /*--- End of included file: packet-ranap-ett.c ---*/
-#line 84 "../../asn1/ranap/packet-ranap-template.c"
+#line 87 "../../asn1/ranap/packet-ranap-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -13069,7 +13072,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-ranap-fn.c ---*/
-#line 144 "../../asn1/ranap/packet-ranap-template.c"
+#line 147 "../../asn1/ranap/packet-ranap-template.c"
 
 static int
 dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
@@ -16113,7 +16116,7 @@ void proto_register_ranap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ranap-hfarr.c ---*/
-#line 319 "../../asn1/ranap/packet-ranap-template.c"
+#line 322 "../../asn1/ranap/packet-ranap-template.c"
   };
 
   /* List of subtrees */
@@ -16450,7 +16453,7 @@ void proto_register_ranap(void) {
     &ett_ranap_Outcome,
 
 /*--- End of included file: packet-ranap-ettarr.c ---*/
-#line 327 "../../asn1/ranap/packet-ranap-template.c"
+#line 330 "../../asn1/ranap/packet-ranap-template.c"
   };
 
 
@@ -16833,7 +16836,7 @@ proto_reg_handoff_ranap(void)
 
 
 /*--- End of included file: packet-ranap-dis-tab.c ---*/
-#line 377 "../../asn1/ranap/packet-ranap-template.c"
+#line 380 "../../asn1/ranap/packet-ranap-template.c"
 	} else {
 		dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
 	}
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index c392503af8..de37cfca40 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -1135,6 +1135,9 @@ typedef enum _ProtocolIE_ID_enum {
 /*--- End of included file: packet-rnsap-val.h ---*/
 #line 54 "../../asn1/rnsap/packet-rnsap-template.c"
 
+void proto_register_rnsap(void);
+void proto_reg_handoff_rnsap(void);
+
 static dissector_handle_t rrc_dl_dcch_handle = NULL;
 
 /* Initialize the protocol and registered fields */
@@ -3870,7 +3873,7 @@ static int hf_rnsap_value_04 = -1;                /* UnsuccessfulOutcome_value *
 static int hf_rnsap_value_05 = -1;                /* Outcome_value */
 
 /*--- End of included file: packet-rnsap-hf.c ---*/
-#line 61 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 64 "../../asn1/rnsap/packet-rnsap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_rnsap = -1;
@@ -5157,7 +5160,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1;
 static gint ett_rnsap_Outcome = -1;
 
 /*--- End of included file: packet-rnsap-ett.c ---*/
-#line 66 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 69 "../../asn1/rnsap/packet-rnsap-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -43146,7 +43149,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 
 /*--- End of included file: packet-rnsap-fn.c ---*/
-#line 90 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 93 "../../asn1/rnsap/packet-rnsap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -54108,7 +54111,7 @@ void proto_register_rnsap(void) {
         "Outcome_value", HFILL }},
 
 /*--- End of included file: packet-rnsap-hfarr.c ---*/
-#line 147 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 150 "../../asn1/rnsap/packet-rnsap-template.c"
   };
 
   /* List of subtrees */
@@ -55396,7 +55399,7 @@ void proto_register_rnsap(void) {
     &ett_rnsap_Outcome,
 
 /*--- End of included file: packet-rnsap-ettarr.c ---*/
-#line 153 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 156 "../../asn1/rnsap/packet-rnsap-template.c"
   };
 
 
@@ -56232,7 +56235,7 @@ proto_reg_handoff_rnsap(void)
 
 
 /*--- End of included file: packet-rnsap-dis-tab.c ---*/
-#line 192 "../../asn1/rnsap/packet-rnsap-template.c"
+#line 195 "../../asn1/rnsap/packet-rnsap-template.c"
 }