Make all proto_* values static.

svn path=/trunk/; revision=30516

92 files changed, 96 insertions, 96 deletions

diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index fbebda0f06..0e536cabd9 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -49,7 +49,7 @@
 #define PFNAME "acp133"
 
 /* Initialize the protocol and registered fields */
-int proto_acp133 = -1;
+static int proto_acp133 = -1;
 
 
 #include "packet-acp133-hf.c"
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index e87920161c..4764c9e20a 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -61,7 +61,7 @@
 #define ACSE_APDU_OID "2.2.1.0.1"
 
 /* Initialize the protocol and registered fields */
-int proto_acse = -1;
+static int proto_acse = -1;
 #include "packet-acse-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index 2884b3efe7..cb92fa021f 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -47,7 +47,7 @@
 #define PFNAME "ansi_tcap"
 
 /* Initialize the protocol and registered fields */
-int proto_ansi_tcap = -1;
+static int proto_ansi_tcap = -1;
 
 int hf_ansi_tcapsrt_SessionId=-1;
 int hf_ansi_tcapsrt_Duplicate=-1;
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index a00111cb18..9230a5a97a 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -64,7 +64,7 @@
 #define PFNAME "camel"
 
 /* Initialize the protocol and registered fields */
-int proto_camel = -1;
+static int proto_camel = -1;
 int date_format = 1; /*assume european date format */
 int camel_tap = -1;
 /* Global variables */
diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c
index 04475d9906..cb68723f46 100644
--- a/asn1/cdt/packet-cdt-template.c
+++ b/asn1/cdt/packet-cdt-template.c
@@ -57,7 +57,7 @@ static proto_item *cdt_item = NULL;
 static guint32 content_type = 0;
 
 /* Initialize the protocol and registered fields */
-int proto_cdt = -1;
+static int proto_cdt = -1;
 #include "packet-cdt-hf.c"
 
 static dissector_handle_t data_handle = NULL;
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 30c94d1915..ea93e8c41e 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -49,7 +49,7 @@
 #include "packet-pres.h"
 
 /* Initialize the protocol and registered fields */
-int proto_cmip = -1;
+static int proto_cmip = -1;
 static int hf_cmip_actionType_OID = -1;
 static int hf_cmip_eventType_OID = -1;
 static int hf_cmip_attributeId_OID = -1;
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index 1fa3a5f922..96ed98cfbf 100644
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -62,7 +62,7 @@ static guint cmp_alternate_http_port = 0;
 static guint cmp_alternate_tcp_style_http_port = 0;
 
 /* Initialize the protocol and registered fields */
-int proto_cmp = -1;
+static int proto_cmp = -1;
 static int hf_cmp_type_oid = -1;
 static int hf_cmp_tcptrans_len = -1;
 static int hf_cmp_tcptrans_type = -1;
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index 7332d4615e..0f4f6237b3 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -49,7 +49,7 @@
 #define PFNAME "cms"
 
 /* Initialize the protocol and registered fields */
-int proto_cms = -1;
+static int proto_cms = -1;
 static int hf_cms_ci_contentType = -1;
 #include "packet-cms-hf.c"
 
diff --git a/asn1/crmf/packet-crmf-template.c b/asn1/crmf/packet-crmf-template.c
index 471729e1ac..5a5aaa047e 100644
--- a/asn1/crmf/packet-crmf-template.c
+++ b/asn1/crmf/packet-crmf-template.c
@@ -45,7 +45,7 @@
 #define PFNAME "crmf"
 
 /* Initialize the protocol and registered fields */
-int proto_crmf = -1;
+static int proto_crmf = -1;
 static int hf_crmf_type_oid = -1;
 #include "packet-crmf-hf.c"
 
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index 49eed99651..eb36573843 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -62,7 +62,7 @@ void prefs_register_dap(void); /* forward declaration for use in preferences reg
 
 
 /* Initialize the protocol and registered fields */
-int proto_dap = -1;
+static int proto_dap = -1;
 
 
 #include "packet-dap-hf.c"
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index f233cd10eb..c32953c220 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -64,7 +64,7 @@ void prefs_register_disp(void); /* forward declaration for use in preferences re
 
 
 /* Initialize the protocol and registered fields */
-int proto_disp = -1;
+static int proto_disp = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index ca572d8617..1990c8acdc 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.c
@@ -60,7 +60,7 @@ static dissector_handle_t tpkt_handle;
 void prefs_register_dop(void); /* forward declaration for use in preferences registration */
 
 /* Initialize the protocol and registered fields */
-int proto_dop = -1;
+static int proto_dop = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 static const char *binding_type = NULL; /* binding_type */
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index cc713219da..25cfdc06ba 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.c
@@ -58,7 +58,7 @@ void prefs_register_dsp(void); /* forward declaration for use in preferences reg
 
 
 /* Initialize the protocol and registered fields */
-int proto_dsp = -1;
+static int proto_dsp = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 49d3139351..e5ecd0954e 100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -49,7 +49,7 @@
 #define PFNAME "ftam"
 
 /* Initialize the protocol and registered fields */
-int proto_ftam = -1;
+static int proto_ftam = -1;
 
 static const char *object_identifier_id;
 /* Declare the function to avoid a compiler warning */
diff --git a/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c
index add0f923f8..210a7c4971 100644
--- a/asn1/gnm/packet-gnm-template.c
+++ b/asn1/gnm/packet-gnm-template.c
@@ -46,7 +46,7 @@
 #define PFNAME "gnm"
 
 /* Initialize the protocol and registered fields */
-int proto_gnm = -1;
+static int proto_gnm = -1;
 
 #include "packet-gnm-hf.c"
 
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index e87cef8146..31a83bd49c 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -77,8 +77,8 @@
 #define PFNAME "gsm_map"
 
 /* Initialize the protocol and registered fields */
-int proto_gsm_map = -1;
-int proto_gsm_map_dialogue = -1;
+static int proto_gsm_map = -1;
+static int proto_gsm_map_dialogue = -1;
 
 static int hf_gsm_map_old_Component_PDU = -1;
 static int hf_gsm_map_getPassword = -1;
diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index 609265e156..e22b9d7a70 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.c
@@ -52,7 +52,7 @@
 #define OID_SG            "0.0.8.235.0.3.71"
 
 /* Initialize the protocol and registered fields */
-int proto_h235 = -1;
+static int proto_h235 = -1;
 #include "packet-h235-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 990811d890..c29eb89115 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -369,7 +369,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
 }
 
 /* Initialize the protocol and registered fields */
-int proto_h245 = -1;
+static int proto_h245 = -1;
 #include "packet-h245-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c
index 50ef022aae..aa9f7abc11 100644
--- a/asn1/h282/packet-h282-template.c
+++ b/asn1/h282/packet-h282-template.c
@@ -42,7 +42,7 @@
 #define PFNAME "rdc"
 
 /* Initialize the protocol and registered fields */
-int proto_h282 = -1;
+static int proto_h282 = -1;
 #include "packet-h282-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c
index c353829501..73bdd5f3e8 100644
--- a/asn1/h283/packet-h283-template.c
+++ b/asn1/h283/packet-h283-template.c
@@ -42,7 +42,7 @@
 #define PFNAME "lct"
 
 /* Initialize the protocol and registered fields */
-int proto_h283 = -1;
+static int proto_h283 = -1;
 #include "packet-h283-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c
index 24256a2651..820b736e2a 100644
--- a/asn1/h323/packet-h323-template.c
+++ b/asn1/h323/packet-h323-template.c
@@ -91,7 +91,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) {
 }
 
 /* Initialize the protocol and registered fields */
-int proto_h323 = -1;
+static int proto_h323 = -1;
 #include "packet-h323-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c
index 77bbf25b13..8f0ec385a3 100644
--- a/asn1/h450-ros/packet-h450-ros-template.c
+++ b/asn1/h450-ros/packet-h450-ros-template.c
@@ -41,7 +41,7 @@
 #define PFNAME "h450.ros"
 
 /* Initialize the protocol and registered fields */
-int proto_h450_ros = -1;
+static int proto_h450_ros = -1;
 #include "packet-h450-ros-hf.c" 
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c
index 76b4f230e3..90e7110d30 100644
--- a/asn1/h460/packet-h460-template.c
+++ b/asn1/h460/packet-h460-template.c
@@ -45,7 +45,7 @@
 #define PFNAME "h460"
 
 /* Initialize the protocol and registered fields */
-int proto_h460 = -1;
+static int proto_h460 = -1;
 #include "packet-h460-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c
index b05328da92..ed089640e4 100644
--- a/asn1/h501/packet-h501-template.c
+++ b/asn1/h501/packet-h501-template.c
@@ -46,7 +46,7 @@
 #define PFNAME "h501"
 
 /* Initialize the protocol and registered fields */
-int proto_h501 = -1;
+static int proto_h501 = -1;
 #include "packet-h501-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index 2dd7dea1c9..9cafc19f6f 100644
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -51,7 +51,7 @@
 #define PFNAME "inap"
 
 /* Initialize the protocol and registered fields */
-int proto_inap = -1;
+static int proto_inap = -1;
 
 /* include constants */
 #include "packet-inap-val.h"
diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c
index 5740fb5275..4b1642a2e4 100644
--- a/asn1/mms/packet-mms-template.c
+++ b/asn1/mms/packet-mms-template.c
@@ -43,7 +43,7 @@
 #define PFNAME "mms"
 
 /* Initialize the protocol and registered fields */
-int proto_mms = -1;
+static int proto_mms = -1;
 
 #include "packet-mms-hf.c"
 
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 1ed04ecaad..7ac11260aa 100644
--- a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
+++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c
@@ -40,7 +40,7 @@
 #define PFNAME "ns_cert_exts"
 
 /* Initialize the protocol and registered fields */
-int proto_ns_cert_exts = -1;
+static int proto_ns_cert_exts = -1;
 #include "packet-ns_cert_exts-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c
index d15773c0f0..486a468c88 100644
--- a/asn1/p7/packet-p7-template.c
+++ b/asn1/p7/packet-p7-template.c
@@ -57,7 +57,7 @@ void prefs_register_p7(void); /* forward declaration for use in preferences regi
 
 
 /* Initialize the protocol and registered fields */
-int proto_p7 = -1;
+static int proto_p7 = -1;
 
 #include "packet-p7-hf.c"
 
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c
index 525bfae79e..73cf32d2a1 100644
--- a/asn1/pkcs12/packet-pkcs12-template.c
+++ b/asn1/pkcs12/packet-pkcs12-template.c
@@ -63,7 +63,7 @@
 #define PKCS12_PBE_RC2_40_SHA1_OID	"1.2.840.113549.1.12.1.6"
 
 /* Initialize the protocol and registered fields */
-int proto_pkcs12 = -1;
+static int proto_pkcs12 = -1;
 
 static int hf_pkcs12_X509Certificate_PDU = -1;
 static gint ett_decrypted_pbe = -1;
diff --git a/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c
index ab365273bb..a4c39b80f0 100644
--- a/asn1/pkixqualified/packet-pkixqualified-template.c
+++ b/asn1/pkixqualified/packet-pkixqualified-template.c
@@ -45,7 +45,7 @@
 #define PFNAME "pkixqualified"
 
 /* Initialize the protocol and registered fields */
-int proto_pkixqualified = -1;
+static int proto_pkixqualified = -1;
 #include "packet-pkixqualified-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index aecacaf203..f7cba4b951 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -52,7 +52,7 @@
 #define PFNAME "pres"
 
 /* Initialize the protocol and registered fields */
-int proto_pres = -1;
+static int proto_pres = -1;
 
 /*   type of session envelop */
 static struct SESSION_DATA_STRUCTURE* session = NULL;
diff --git a/asn1/q932-ros/packet-q932-ros-template.c b/asn1/q932-ros/packet-q932-ros-template.c
index c6f5a4cd51..ddec1cbe12 100644
--- a/asn1/q932-ros/packet-q932-ros-template.c
+++ b/asn1/q932-ros/packet-q932-ros-template.c
@@ -41,7 +41,7 @@
 #define PFNAME "q932.ros"
 
 /* Initialize the protocol and registered fields */
-int proto_q932_ros = -1;
+static int proto_q932_ros = -1;
 #include "packet-q932-ros-hf.c" 
 
 /* Initialize the subtree pointers */
diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 812a7c1806..66e8d84ca0 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -39,7 +39,7 @@
 #define PFNAME "q932"
 
 /* Initialize the protocol and registered fields */
-int proto_q932 = -1;
+static int proto_q932 = -1;
 static int hf_q932_ie_type = -1;
 static int hf_q932_ie_len = -1;
 static int hf_q932_ie_data = -1;
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index 47d977ae02..d940868ae6 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -278,7 +278,7 @@ static const value_string qsig_str_error[] = {
 };
                      
 /* Initialize the protocol and registered fields */
-int proto_qsig = -1;
+static int proto_qsig = -1;
 static int hf_qsig_operation = -1;
 static int hf_qsig_service = -1;
 static int hf_qsig_error = -1;
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 244e373f22..63cd2caa72 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -46,7 +46,7 @@
 #define PFNAME "ros"
 
 /* Initialize the protocol and registered fields */
-int proto_ros = -1;
+static int proto_ros = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index 85695ae336..9fe3791165 100644
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.c
@@ -49,7 +49,7 @@
 #define PFNAME "rtse"
 
 /* Initialize the protocol and registered fields */
-int proto_rtse = -1;
+static int proto_rtse = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c
index 96f950edcf..1345ad216e 100644
--- a/asn1/s4406/packet-s4406-template.c
+++ b/asn1/s4406/packet-s4406-template.c
@@ -47,7 +47,7 @@
 #define PFNAME "s4406"
 
 /* Initialize the protocol and registered fields */
-int proto_s4406 = -1;
+static int proto_s4406 = -1;
 
 #include "packet-s4406-hf.c"
 
diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index 3d07e4f04f..b23995f155 100644
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.c
@@ -44,7 +44,7 @@
 #define TCP_PORT_SMRSE 4321
 
 /* Initialize the protocol and registered fields */
-int proto_smrse = -1;
+static int proto_smrse = -1;
 static int hf_smrse_reserved = -1;
 static int hf_smrse_tag = -1;
 static int hf_smrse_length = -1;
diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c
index 77a5b781a9..ea70d6c906 100644
--- a/asn1/t125/packet-t125-template.c
+++ b/asn1/t125/packet-t125-template.c
@@ -43,7 +43,7 @@
 
 
 /* Initialize the protocol and registered fields */
-int proto_t125 = -1;
+static int proto_t125 = -1;
 #include "packet-t125-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index a832723cbd..4f79aae29a 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -47,7 +47,7 @@
 #define PFNAME "tcap"
 
 /* Initialize the protocol and registered fields */
-int proto_tcap = -1;
+static int proto_tcap = -1;
 static int hf_tcap_tag = -1;
 static int hf_tcap_length = -1;
 static int hf_tcap_data = -1;
diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index f6b8373247..02f97c397c 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -46,7 +46,7 @@
 #define PFNAME "wlancertextn"
 
 /* Initialize the protocol and registered fields */
-int proto_wlancertextn = -1;
+static int proto_wlancertextn = -1;
 #include "packet-wlancertextn-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index 3f70f0cd06..88eda2e2b5 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -59,8 +59,8 @@ static dissector_handle_t tpkt_handle;
 void prefs_register_x411(void); /* forward declaration for use in preferences registration */
 
 /* Initialize the protocol and registered fields */
-int proto_x411 = -1;
-int proto_p3 = -1;
+static int proto_x411 = -1;
+static int proto_p3 = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 static int extension_id = -1; /* integer extension id */
diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index a47ee9fdca..c0499b3c35 100644
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.c
@@ -52,7 +52,7 @@
 #define PFNAME "x420"
 
 /* Initialize the protocol and registered fields */
-int proto_x420 = -1;
+static int proto_x420 = -1;
 
 static const char *object_identifier_id; /* content type identifier */
 
diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c
index a3502cc739..872ea57678 100644
--- a/asn1/x509ce/packet-x509ce-template.c
+++ b/asn1/x509ce/packet-x509ce-template.c
@@ -46,7 +46,7 @@
 #define PFNAME "x509ce"
 
 /* Initialize the protocol and registered fields */
-int proto_x509ce = -1;
+static int proto_x509ce = -1;
 static int hf_x509ce_id_ce_invalidityDate = -1;
 static int hf_x509ce_id_ce_baseUpdateTime = -1;
 static int hf_x509ce_object_identifier_id = -1;
diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index 0215ed9bed..afb793aef2 100644
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -46,7 +46,7 @@
 #define PFNAME "x509if"
 
 /* Initialize the protocol and registered fields */
-int proto_x509if = -1;
+static int proto_x509if = -1;
 static int hf_x509if_object_identifier_id = -1;
 static int hf_x509if_any_string = -1;
 #include "packet-x509if-hf.c"
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index 20055ca44b..9448bbf0e3 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -45,7 +45,7 @@
 #define PFNAME "x509sat"
 
 /* Initialize the protocol and registered fields */
-int proto_x509sat = -1;
+static int proto_x509sat = -1;
 #include "packet-x509sat-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 4249d99c4c..164ff63582 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -57,7 +57,7 @@
 #define PFNAME "acp133"
 
 /* Initialize the protocol and registered fields */
-int proto_acp133 = -1;
+static int proto_acp133 = -1;
 
 
 
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 000df46c37..8d15401b4f 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -69,7 +69,7 @@
 #define ACSE_APDU_OID "2.2.1.0.1"
 
 /* Initialize the protocol and registered fields */
-int proto_acse = -1;
+static int proto_acse = -1;
 
 /*--- Included file: packet-acse-hf.c ---*/
 #line 1 "packet-acse-hf.c"
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index f0a997eb52..9f7e8790af 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -55,7 +55,7 @@
 #define PFNAME "ansi_tcap"
 
 /* Initialize the protocol and registered fields */
-int proto_ansi_tcap = -1;
+static int proto_ansi_tcap = -1;
 
 int hf_ansi_tcapsrt_SessionId=-1;
 int hf_ansi_tcapsrt_Duplicate=-1;
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index b8958d7e72..6ef0c18e50 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -72,7 +72,7 @@
 #define PFNAME "camel"
 
 /* Initialize the protocol and registered fields */
-int proto_camel = -1;
+static int proto_camel = -1;
 int date_format = 1; /*assume european date format */
 int camel_tap = -1;
 /* Global variables */
diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index e7719f5b76..79143f1196 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -65,7 +65,7 @@ static proto_item *cdt_item = NULL;
 static guint32 content_type = 0;
 
 /* Initialize the protocol and registered fields */
-int proto_cdt = -1;
+static int proto_cdt = -1;
 
 /*--- Included file: packet-cdt-hf.c ---*/
 #line 1 "packet-cdt-hf.c"
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 2d17ad3924..591691c44d 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -57,7 +57,7 @@
 #include "packet-pres.h"
 
 /* Initialize the protocol and registered fields */
-int proto_cmip = -1;
+static int proto_cmip = -1;
 static int hf_cmip_actionType_OID = -1;
 static int hf_cmip_eventType_OID = -1;
 static int hf_cmip_attributeId_OID = -1;
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index f6a198199a..de2c06e945 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -70,7 +70,7 @@ static guint cmp_alternate_http_port = 0;
 static guint cmp_alternate_tcp_style_http_port = 0;
 
 /* Initialize the protocol and registered fields */
-int proto_cmp = -1;
+static int proto_cmp = -1;
 static int hf_cmp_type_oid = -1;
 static int hf_cmp_tcptrans_len = -1;
 static int hf_cmp_tcptrans_type = -1;
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index f0619b9249..31be7f8341 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -57,7 +57,7 @@
 #define PFNAME "cms"
 
 /* Initialize the protocol and registered fields */
-int proto_cms = -1;
+static int proto_cms = -1;
 static int hf_cms_ci_contentType = -1;
 
 /*--- Included file: packet-cms-hf.c ---*/
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index f99da8296b..858e0e0f0c 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -53,7 +53,7 @@
 #define PFNAME "crmf"
 
 /* Initialize the protocol and registered fields */
-int proto_crmf = -1;
+static int proto_crmf = -1;
 static int hf_crmf_type_oid = -1;
 
 /*--- Included file: packet-crmf-hf.c ---*/
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index eebe1e320a..ef42298f9d 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -70,7 +70,7 @@ void prefs_register_dap(void); /* forward declaration for use in preferences reg
 
 
 /* Initialize the protocol and registered fields */
-int proto_dap = -1;
+static int proto_dap = -1;
 
 
 
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 0e346892da..567d91c7eb 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -72,7 +72,7 @@ void prefs_register_disp(void); /* forward declaration for use in preferences re
 
 
 /* Initialize the protocol and registered fields */
-int proto_disp = -1;
+static int proto_disp = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index b76f5c0e22..2291dfc9ce 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -68,7 +68,7 @@ static dissector_handle_t tpkt_handle;
 void prefs_register_dop(void); /* forward declaration for use in preferences registration */
 
 /* Initialize the protocol and registered fields */
-int proto_dop = -1;
+static int proto_dop = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 static const char *binding_type = NULL; /* binding_type */
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 871f52e7fa..c4a2f6c400 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -66,7 +66,7 @@ void prefs_register_dsp(void); /* forward declaration for use in preferences reg
 
 
 /* Initialize the protocol and registered fields */
-int proto_dsp = -1;
+static int proto_dsp = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 5931a6507d..bfd8f62e24 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -57,7 +57,7 @@
 #define PFNAME "ftam"
 
 /* Initialize the protocol and registered fields */
-int proto_ftam = -1;
+static int proto_ftam = -1;
 
 static const char *object_identifier_id;
 /* Declare the function to avoid a compiler warning */
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index 6b779b48a9..be6a5ae6fc 100644
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -54,7 +54,7 @@
 #define PFNAME "gnm"
 
 /* Initialize the protocol and registered fields */
-int proto_gnm = -1;
+static int proto_gnm = -1;
 
 
 /*--- Included file: packet-gnm-hf.c ---*/
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 920aaa38b9..f6a8e0041d 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -85,8 +85,8 @@
 #define PFNAME "gsm_map"
 
 /* Initialize the protocol and registered fields */
-int proto_gsm_map = -1;
-int proto_gsm_map_dialogue = -1;
+static int proto_gsm_map = -1;
+static int proto_gsm_map_dialogue = -1;
 
 static int hf_gsm_map_old_Component_PDU = -1;
 static int hf_gsm_map_getPassword = -1;
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index 0f99d3804f..13b79560f2 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -60,7 +60,7 @@
 #define OID_SG            "0.0.8.235.0.3.71"
 
 /* Initialize the protocol and registered fields */
-int proto_h235 = -1;
+static int proto_h235 = -1;
 
 /*--- Included file: packet-h235-hf.c ---*/
 #line 1 "packet-h235-hf.c"
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 8033e56392..78c22a9cc2 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -500,7 +500,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
 }
 
 /* Initialize the protocol and registered fields */
-int proto_h245 = -1;
+static int proto_h245 = -1;
 
 /*--- Included file: packet-h245-hf.c ---*/
 #line 1 "packet-h245-hf.c"
diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index 22e6a131fe..77b2a91b26 100644
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -50,7 +50,7 @@
 #define PFNAME "rdc"
 
 /* Initialize the protocol and registered fields */
-int proto_h282 = -1;
+static int proto_h282 = -1;
 
 /*--- Included file: packet-h282-hf.c ---*/
 #line 1 "packet-h282-hf.c"
diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c
index 6ff6422bb4..94407f8884 100644
--- a/epan/dissectors/packet-h283.c
+++ b/epan/dissectors/packet-h283.c
@@ -50,7 +50,7 @@
 #define PFNAME "lct"
 
 /* Initialize the protocol and registered fields */
-int proto_h283 = -1;
+static int proto_h283 = -1;
 
 /*--- Included file: packet-h283-hf.c ---*/
 #line 1 "packet-h283-hf.c"
diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c
index fde5eff8c5..b7f8265ade 100644
--- a/epan/dissectors/packet-h323.c
+++ b/epan/dissectors/packet-h323.c
@@ -99,7 +99,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) {
 }
 
 /* Initialize the protocol and registered fields */
-int proto_h323 = -1;
+static int proto_h323 = -1;
 
 /*--- Included file: packet-h323-hf.c ---*/
 #line 1 "packet-h323-hf.c"
diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c
index 5998e3280d..1496aff104 100644
--- a/epan/dissectors/packet-h450-ros.c
+++ b/epan/dissectors/packet-h450-ros.c
@@ -49,7 +49,7 @@
 #define PFNAME "h450.ros"
 
 /* Initialize the protocol and registered fields */
-int proto_h450_ros = -1;
+static int proto_h450_ros = -1;
 
 /*--- Included file: packet-h450-ros-hf.c ---*/
 #line 1 "packet-h450-ros-hf.c"
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c
index f78bace432..c4bf075663 100644
--- a/epan/dissectors/packet-h460.c
+++ b/epan/dissectors/packet-h460.c
@@ -53,7 +53,7 @@
 #define PFNAME "h460"
 
 /* Initialize the protocol and registered fields */
-int proto_h460 = -1;
+static int proto_h460 = -1;
 
 /*--- Included file: packet-h460-hf.c ---*/
 #line 1 "packet-h460-hf.c"
diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index aea58033ec..6860591958 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -54,7 +54,7 @@
 #define PFNAME "h501"
 
 /* Initialize the protocol and registered fields */
-int proto_h501 = -1;
+static int proto_h501 = -1;
 
 /*--- Included file: packet-h501-hf.c ---*/
 #line 1 "packet-h501-hf.c"
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 21b4ae16cf..98afc2fa83 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -59,7 +59,7 @@
 #define PFNAME "inap"
 
 /* Initialize the protocol and registered fields */
-int proto_inap = -1;
+static int proto_inap = -1;
 
 /* include constants */
 
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 72ae21e2a3..633ac88d3e 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -51,7 +51,7 @@
 #define PFNAME "mms"
 
 /* Initialize the protocol and registered fields */
-int proto_mms = -1;
+static int proto_mms = -1;
 
 
 /*--- Included file: packet-mms-hf.c ---*/
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index 7d0392c82a..6750f0af50 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -48,7 +48,7 @@
 #define PFNAME "ns_cert_exts"
 
 /* Initialize the protocol and registered fields */
-int proto_ns_cert_exts = -1;
+static int proto_ns_cert_exts = -1;
 
 /*--- Included file: packet-ns_cert_exts-hf.c ---*/
 #line 1 "packet-ns_cert_exts-hf.c"
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 088dd120bf..8513c959ac 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -65,7 +65,7 @@ void prefs_register_p7(void); /* forward declaration for use in preferences regi
 
 
 /* Initialize the protocol and registered fields */
-int proto_p7 = -1;
+static int proto_p7 = -1;
 
 
 /*--- Included file: packet-p7-hf.c ---*/
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index caf51dafa7..1b92bb65f8 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -71,7 +71,7 @@
 #define PKCS12_PBE_RC2_40_SHA1_OID	"1.2.840.113549.1.12.1.6"
 
 /* Initialize the protocol and registered fields */
-int proto_pkcs12 = -1;
+static int proto_pkcs12 = -1;
 
 static int hf_pkcs12_X509Certificate_PDU = -1;
 static gint ett_decrypted_pbe = -1;
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index e25b4d7565..9a518266f0 100644
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -53,7 +53,7 @@
 #define PFNAME "pkixqualified"
 
 /* Initialize the protocol and registered fields */
-int proto_pkixqualified = -1;
+static int proto_pkixqualified = -1;
 
 /*--- Included file: packet-pkixqualified-hf.c ---*/
 #line 1 "packet-pkixqualified-hf.c"
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index fe6af79751..643606211d 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -60,7 +60,7 @@
 #define PFNAME "pres"
 
 /* Initialize the protocol and registered fields */
-int proto_pres = -1;
+static int proto_pres = -1;
 
 /*   type of session envelop */
 static struct SESSION_DATA_STRUCTURE* session = NULL;
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index 166d7b6700..286f57bafc 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -49,7 +49,7 @@
 #define PFNAME "q932.ros"
 
 /* Initialize the protocol and registered fields */
-int proto_q932_ros = -1;
+static int proto_q932_ros = -1;
 
 /*--- Included file: packet-q932-ros-hf.c ---*/
 #line 1 "packet-q932-ros-hf.c"
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 4339710239..de1e2b325b 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -47,7 +47,7 @@
 #define PFNAME "q932"
 
 /* Initialize the protocol and registered fields */
-int proto_q932 = -1;
+static int proto_q932 = -1;
 static int hf_q932_ie_type = -1;
 static int hf_q932_ie_len = -1;
 static int hf_q932_ie_data = -1;
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 76015c561a..f036295ace 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -667,7 +667,7 @@ static const value_string qsig_str_error[] = {
 };
                      
 /* Initialize the protocol and registered fields */
-int proto_qsig = -1;
+static int proto_qsig = -1;
 static int hf_qsig_operation = -1;
 static int hf_qsig_service = -1;
 static int hf_qsig_error = -1;
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 4d60d1d305..9a19a39afb 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -54,7 +54,7 @@
 #define PFNAME "ros"
 
 /* Initialize the protocol and registered fields */
-int proto_ros = -1;
+static int proto_ros = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index e1013406e2..06ff20bfe2 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -57,7 +57,7 @@
 #define PFNAME "rtse"
 
 /* Initialize the protocol and registered fields */
-int proto_rtse = -1;
+static int proto_rtse = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index 1b54301c81..94729f46df 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -55,7 +55,7 @@
 #define PFNAME "s4406"
 
 /* Initialize the protocol and registered fields */
-int proto_s4406 = -1;
+static int proto_s4406 = -1;
 
 
 /*--- Included file: packet-s4406-hf.c ---*/
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index abb5a313f9..b054a666ab 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -52,7 +52,7 @@
 #define TCP_PORT_SMRSE 4321
 
 /* Initialize the protocol and registered fields */
-int proto_smrse = -1;
+static int proto_smrse = -1;
 static int hf_smrse_reserved = -1;
 static int hf_smrse_tag = -1;
 static int hf_smrse_length = -1;
diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index b1cbeccc9e..347e78a98a 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -51,7 +51,7 @@
 
 
 /* Initialize the protocol and registered fields */
-int proto_t125 = -1;
+static int proto_t125 = -1;
 
 /*--- Included file: packet-t125-hf.c ---*/
 #line 1 "packet-t125-hf.c"
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 6939f02391..b35875941b 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -55,7 +55,7 @@
 #define PFNAME "tcap"
 
 /* Initialize the protocol and registered fields */
-int proto_tcap = -1;
+static int proto_tcap = -1;
 static int hf_tcap_tag = -1;
 static int hf_tcap_length = -1;
 static int hf_tcap_data = -1;
diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index 1fa3375a85..99aef5231c 100644
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -54,7 +54,7 @@
 #define PFNAME "wlancertextn"
 
 /* Initialize the protocol and registered fields */
-int proto_wlancertextn = -1;
+static int proto_wlancertextn = -1;
 
 /*--- Included file: packet-wlancertextn-hf.c ---*/
 #line 1 "packet-wlancertextn-hf.c"
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 7b213051a0..0330ff71f7 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -67,8 +67,8 @@ static dissector_handle_t tpkt_handle;
 void prefs_register_x411(void); /* forward declaration for use in preferences registration */
 
 /* Initialize the protocol and registered fields */
-int proto_x411 = -1;
-int proto_p3 = -1;
+static int proto_x411 = -1;
+static int proto_p3 = -1;
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 static int extension_id = -1; /* integer extension id */
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 4ab5bb973f..392e3d8da4 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -60,7 +60,7 @@
 #define PFNAME "x420"
 
 /* Initialize the protocol and registered fields */
-int proto_x420 = -1;
+static int proto_x420 = -1;
 
 static const char *object_identifier_id; /* content type identifier */
 
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index ee0bf90e33..7fbf96b054 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -54,7 +54,7 @@
 #define PFNAME "x509ce"
 
 /* Initialize the protocol and registered fields */
-int proto_x509ce = -1;
+static int proto_x509ce = -1;
 static int hf_x509ce_id_ce_invalidityDate = -1;
 static int hf_x509ce_id_ce_baseUpdateTime = -1;
 static int hf_x509ce_object_identifier_id = -1;
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 644cf2ce86..d4c6fb428f 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -54,7 +54,7 @@
 #define PFNAME "x509if"
 
 /* Initialize the protocol and registered fields */
-int proto_x509if = -1;
+static int proto_x509if = -1;
 static int hf_x509if_object_identifier_id = -1;
 static int hf_x509if_any_string = -1;
 
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index d93ba18480..f96c51497d 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -53,7 +53,7 @@
 #define PFNAME "x509sat"
 
 /* Initialize the protocol and registered fields */
-int proto_x509sat = -1;
+static int proto_x509sat = -1;
 
 /*--- Included file: packet-x509sat-hf.c ---*/
 #line 1 "packet-x509sat-hf.c"