plugins: Initialize static proto values to 0

Update plugins to not initialize static proto values to -1.

40 files changed, 2512 insertions, 2512 deletions

diff --git a/plugins/epan/wimax/mac_hd_generic_decoder.c b/plugins/epan/wimax/mac_hd_generic_decoder.c
index d083103a60..220d92ad4e 100644
--- a/plugins/epan/wimax/mac_hd_generic_decoder.c
+++ b/plugins/epan/wimax/mac_hd_generic_decoder.c
@@ -76,19 +76,19 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
 static reassembly_table payload_reassembly_table;
 
 gint proto_mac_header_generic_decoder = -1;
-static gint ett_mac_header_generic_decoder = -1;
-/* static gint ett_mac_subheader_decoder = -1; */
-static gint ett_mac_mesh_subheader_decoder = -1;
-static gint ett_mac_frag_subheader_decoder = -1;
-static gint ett_mac_grant_mgmt_subheader_decoder = -1;
-static gint ett_mac_pkt_subheader_decoder = -1;
-static gint ett_mac_fast_fb_subheader_decoder = -1;
-static gint ett_mac_ext_subheader_decoder = -1;
-static gint ett_mac_ext_subheader_dl_decoder = -1;
-static gint ett_mac_ext_subheader_ul_decoder = -1;
-static gint ett_mac_arq_fb_payload_decoder = -1;
-static gint ett_mac_data_pdu_decoder = -1;
-static gint hf_mac_header_generic_value_bytes = -1;
+static gint ett_mac_header_generic_decoder;
+/* static gint ett_mac_subheader_decoder; */
+static gint ett_mac_mesh_subheader_decoder;
+static gint ett_mac_frag_subheader_decoder;
+static gint ett_mac_grant_mgmt_subheader_decoder;
+static gint ett_mac_pkt_subheader_decoder;
+static gint ett_mac_fast_fb_subheader_decoder;
+static gint ett_mac_ext_subheader_decoder;
+static gint ett_mac_ext_subheader_dl_decoder;
+static gint ett_mac_ext_subheader_ul_decoder;
+static gint ett_mac_arq_fb_payload_decoder;
+static gint ett_mac_data_pdu_decoder;
+static gint hf_mac_header_generic_value_bytes;
 
 static guint frag_type, frag_len;
 static guint extended_type, arq_fb_payload, seq_number;
@@ -142,23 +142,23 @@ static address save_dst;
 #define WIMAX_MAC_HEADER_GENERIC_EKS_MASK    0x30
 #define WIMAX_MAC_HEADER_GENERIC_LEN_MASK    0x07
 
-static int hf_mac_header_generic_ht = -1;
-static int hf_mac_header_generic_ec = -1;
-static int hf_mac_header_generic_type_0 = -1;
-static int hf_mac_header_generic_type_1 = -1;
-static int hf_mac_header_generic_type_2 = -1;
-static int hf_mac_header_generic_type_3 = -1;
-static int hf_mac_header_generic_type_4 = -1;
-static int hf_mac_header_generic_type_5 = -1;
-static int hf_mac_header_generic_esf = -1;
-static int hf_mac_header_generic_ci = -1;
-static int hf_mac_header_generic_eks = -1;
-static int hf_mac_header_generic_rsv = -1;
-static int hf_mac_header_generic_len = -1;
-static int hf_mac_header_generic_cid = -1;
-static int hf_mac_header_generic_hcs = -1;
-static int hf_mac_header_generic_crc = -1;
-static int hf_mac_header_generic_crc_status = -1;
+static int hf_mac_header_generic_ht;
+static int hf_mac_header_generic_ec;
+static int hf_mac_header_generic_type_0;
+static int hf_mac_header_generic_type_1;
+static int hf_mac_header_generic_type_2;
+static int hf_mac_header_generic_type_3;
+static int hf_mac_header_generic_type_4;
+static int hf_mac_header_generic_type_5;
+static int hf_mac_header_generic_esf;
+static int hf_mac_header_generic_ci;
+static int hf_mac_header_generic_eks;
+static int hf_mac_header_generic_rsv;
+static int hf_mac_header_generic_len;
+static int hf_mac_header_generic_cid;
+static int hf_mac_header_generic_hcs;
+static int hf_mac_header_generic_crc;
+static int hf_mac_header_generic_crc_status;
 
 /* MAC Header types */
 static const value_string ht_msgs[] =
@@ -369,21 +369,21 @@ static const value_string fb_types[] =
 };
 
 /* common fields */
-static gint hf_mac_header_generic_ext_subheader_rsv = -1;
+static gint hf_mac_header_generic_ext_subheader_rsv;
 /* DL sub-header */
-static gint hf_mac_header_generic_ext_subheader_type_dl = -1;
-static gint hf_mac_header_generic_ext_subheader_sdu_sn = -1;
-static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid = -1;
-static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_op = -1;
-static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe = -1;
-static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb = -1;
-static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv = -1;
-static gint hf_mac_header_generic_ext_subheader_fb_req_uiuc = -1;
-static gint hf_mac_header_generic_ext_subheader_fb_req_fb_type = -1;
-static gint hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset = -1;
-static gint hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset = -1;
-static gint hf_mac_header_generic_ext_subheader_fb_req_slots = -1;
-static gint hf_mac_header_generic_ext_subheader_fb_req_frame_offset = -1;
+static gint hf_mac_header_generic_ext_subheader_type_dl;
+static gint hf_mac_header_generic_ext_subheader_sdu_sn;
+static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid;
+static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_op;
+static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe;
+static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb;
+static gint hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv;
+static gint hf_mac_header_generic_ext_subheader_fb_req_uiuc;
+static gint hf_mac_header_generic_ext_subheader_fb_req_fb_type;
+static gint hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset;
+static gint hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset;
+static gint hf_mac_header_generic_ext_subheader_fb_req_slots;
+static gint hf_mac_header_generic_ext_subheader_fb_req_frame_offset;
 
 /* DL Sleep Control Operations */
 static const value_string dl_sleep_control_ops[] =
@@ -394,24 +394,24 @@ static const value_string dl_sleep_control_ops[] =
 };
 
 /* UL sub-header */
-static gint hf_mac_header_generic_ext_subheader_type_ul = -1;
-static gint hf_mac_header_generic_ext_subheader_mimo_mode_fb_type = -1;
-static gint hf_mac_header_generic_ext_subheader_mimo_fb_content = -1;
-static gint hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep = -1;
-static gint hf_mac_header_generic_ext_subheader_mini_fb_type = -1;
-static gint hf_mac_header_generic_ext_subheader_mini_fb_content = -1;
+static gint hf_mac_header_generic_ext_subheader_type_ul;
+static gint hf_mac_header_generic_ext_subheader_mimo_mode_fb_type;
+static gint hf_mac_header_generic_ext_subheader_mimo_fb_content;
+static gint hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep;
+static gint hf_mac_header_generic_ext_subheader_mini_fb_type;
+static gint hf_mac_header_generic_ext_subheader_mini_fb_content;
 /* common fields */
-static gint hf_mac_header_generic_ext_subheader_pdu_sn_short = -1;
-static gint hf_mac_header_generic_ext_subheader_pdu_sn_long = -1;
+static gint hf_mac_header_generic_ext_subheader_pdu_sn_short;
+static gint hf_mac_header_generic_ext_subheader_pdu_sn_long;
 
 /* SN Request subheader */
 #define SN_REQUEST_SUBHEADER_SN_REPORT_INDICATION_1_MASK 0x01
 #define SN_REQUEST_SUBHEADER_SN_REPORT_INDICATION_2_MASK 0x02
 #define SN_REQUEST_SUBHEADER_RESERVED_MASK               0xFC
 
-static gint hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1 = -1;
-static gint hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2 = -1;
-static gint hf_mac_header_generic_ext_subheader_sn_req_rsv = -1;
+static gint hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1;
+static gint hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2;
+static gint hf_mac_header_generic_ext_subheader_sn_req_rsv;
 /* SN Report Indication message */
 static const value_string sn_rep_msg[] =
 {
@@ -421,7 +421,7 @@ static const value_string sn_rep_msg[] =
 };
 
 /* Mesh Subheader */
-static gint hf_mac_header_generic_mesh_subheader = -1;
+static gint hf_mac_header_generic_mesh_subheader;
 
 /* Fragmentation Subheader (table 8) */
 #define FRAGMENTATION_SUBHEADER_FC_MASK         0xC000	/*0x0003*/
@@ -438,13 +438,13 @@ static gint hf_mac_header_generic_mesh_subheader = -1;
 #define FIRST_FRAG  2
 #define MIDDLE_FRAG 3
 
-static gint hf_mac_header_generic_frag_subhd_fc = -1;
-static gint hf_mac_header_generic_frag_subhd_fc_ext = -1;
-static gint hf_mac_header_generic_frag_subhd_bsn = -1;
-static gint hf_mac_header_generic_frag_subhd_fsn = -1;
-static gint hf_mac_header_generic_frag_subhd_fsn_ext = -1;
-static gint hf_mac_header_generic_frag_subhd_rsv = -1;
-static gint hf_mac_header_generic_frag_subhd_rsv_ext = -1;
+static gint hf_mac_header_generic_frag_subhd_fc;
+static gint hf_mac_header_generic_frag_subhd_fc_ext;
+static gint hf_mac_header_generic_frag_subhd_bsn;
+static gint hf_mac_header_generic_frag_subhd_fsn;
+static gint hf_mac_header_generic_frag_subhd_fsn_ext;
+static gint hf_mac_header_generic_frag_subhd_rsv;
+static gint hf_mac_header_generic_frag_subhd_rsv_ext;
 
 /* Fragment Types */
 static const value_string frag_types[] =
@@ -465,20 +465,20 @@ static const value_string frag_types[] =
 
 #define FRAG_LENGTH_MASK    0x0007FF00
 
-static gint hf_mac_header_generic_packing_subhd_fc = -1;
-static gint hf_mac_header_generic_packing_subhd_fc_ext = -1;
-static gint hf_mac_header_generic_packing_subhd_bsn = -1;
-static gint hf_mac_header_generic_packing_subhd_fsn = -1;
-static gint hf_mac_header_generic_packing_subhd_fsn_ext = -1;
-static gint hf_mac_header_generic_packing_subhd_len = -1;
-static gint hf_mac_header_generic_packing_subhd_len_ext = -1;
+static gint hf_mac_header_generic_packing_subhd_fc;
+static gint hf_mac_header_generic_packing_subhd_fc_ext;
+static gint hf_mac_header_generic_packing_subhd_bsn;
+static gint hf_mac_header_generic_packing_subhd_fsn;
+static gint hf_mac_header_generic_packing_subhd_fsn_ext;
+static gint hf_mac_header_generic_packing_subhd_len;
+static gint hf_mac_header_generic_packing_subhd_len_ext;
 
 /* Fast-feedback Allocation Subheader (table 13) */
 #define FAST_FEEDBACK_ALLOCATION_OFFSET_MASK 0xFC	/*0x3F*/
 #define FAST_FEEDBACK_FEEDBACK_TYPE_MASK     0x03	/*0xC0*/
 
-static gint hf_mac_header_generic_fast_fb_subhd_alloc_offset = -1;
-static gint hf_mac_header_generic_fast_fb_subhd_fb_type = -1;
+static gint hf_mac_header_generic_fast_fb_subhd_alloc_offset;
+static gint hf_mac_header_generic_fast_fb_subhd_fb_type;
 
 /* Grant Management Subheader (table 9 & 10) */
 #define GRANT_MGMT_SUBHEADER_UGS_SI_MASK          0x8000	/*0x0001*/
@@ -501,18 +501,18 @@ typedef enum
 	SCHEDULE_SERVICE_TYPE_UGS
 } SCHEDULE_SERVICE_TYPE_e;
 
-static gint hf_mac_header_generic_grant_mgmt_ugs_tree 		= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_si 	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_pm	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_fli	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_fl	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv	= -1;
-static gint hf_mac_header_generic_grant_mgmt_ext_rtps_tree	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ext_pbr	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ext_fli	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_ext_fl	= -1;
-static gint hf_mac_header_generic_grant_mgmt_ext_pbr_tree	= -1;
-static gint hf_mac_header_generic_grant_mgmt_subhd_pbr		= -1;
+static gint hf_mac_header_generic_grant_mgmt_ugs_tree;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_si;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_pm;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_fli;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_fl;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv;
+static gint hf_mac_header_generic_grant_mgmt_ext_rtps_tree;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ext_pbr;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ext_fli;
+static gint hf_mac_header_generic_grant_mgmt_subhd_ext_fl;
+static gint hf_mac_header_generic_grant_mgmt_ext_pbr_tree;
+static gint hf_mac_header_generic_grant_mgmt_subhd_pbr;
 
 /* Slip Indicators */
 static const value_string si_msgs[] =
@@ -555,27 +555,27 @@ static const value_string fli_msgs[] =
 #define ARQ_FB_IE_SEQ2_LENGTH_6_MASK 0x007E	/*0x7E00*/
 #define ARQ_FB_IE_RSV_MASK           0x0001	/*0x8000*/
 
-static gint hf_mac_header_generic_arq_fb_ie_cid = -1;
-static gint hf_mac_header_generic_arq_fb_ie_last = -1;
-static gint hf_mac_header_generic_arq_fb_ie_ack_type = -1;
-static gint hf_mac_header_generic_arq_fb_ie_bsn = -1;
-static gint hf_mac_header_generic_arq_fb_ie_num_maps = -1;
-static gint hf_ack_type_reserved = -1;
-static gint hf_mac_header_generic_arq_fb_ie_sel_ack_map = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq_format = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq1_length = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq2_length = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq3_length = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map_2 = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq1_length_6 = -1;
-static gint hf_mac_header_generic_arq_fb_ie_seq2_length_6 = -1;
-static gint hf_mac_header_generic_arq_fb_ie_rsv = -1;
-static gint hf_mac_header_payload_fragment = -1;
-
-static expert_field ei_mac_crc_malformed = EI_INIT;
-static expert_field ei_mac_crc_missing = EI_INIT;
-static expert_field ei_mac_header_generic_crc = EI_INIT;
+static gint hf_mac_header_generic_arq_fb_ie_cid;
+static gint hf_mac_header_generic_arq_fb_ie_last;
+static gint hf_mac_header_generic_arq_fb_ie_ack_type;
+static gint hf_mac_header_generic_arq_fb_ie_bsn;
+static gint hf_mac_header_generic_arq_fb_ie_num_maps;
+static gint hf_ack_type_reserved;
+static gint hf_mac_header_generic_arq_fb_ie_sel_ack_map;
+static gint hf_mac_header_generic_arq_fb_ie_seq_format;
+static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map;
+static gint hf_mac_header_generic_arq_fb_ie_seq1_length;
+static gint hf_mac_header_generic_arq_fb_ie_seq2_length;
+static gint hf_mac_header_generic_arq_fb_ie_seq3_length;
+static gint hf_mac_header_generic_arq_fb_ie_seq_ack_map_2;
+static gint hf_mac_header_generic_arq_fb_ie_seq1_length_6;
+static gint hf_mac_header_generic_arq_fb_ie_seq2_length_6;
+static gint hf_mac_header_generic_arq_fb_ie_rsv;
+static gint hf_mac_header_payload_fragment;
+
+static expert_field ei_mac_crc_malformed;
+static expert_field ei_mac_crc_missing;
+static expert_field ei_mac_header_generic_crc;
 
 /* Last IE Indicators */
 static const value_string last_ie_msgs[] =
diff --git a/plugins/epan/wimax/mac_hd_type1_decoder.c b/plugins/epan/wimax/mac_hd_type1_decoder.c
index 6713e920d7..d26b496b29 100644
--- a/plugins/epan/wimax/mac_hd_type1_decoder.c
+++ b/plugins/epan/wimax/mac_hd_type1_decoder.c
@@ -30,9 +30,9 @@
 
 extern gint proto_mac_header_generic_decoder;
 
-static gint proto_mac_header_type_1_decoder = -1;
-static gint ett_mac_header_type_1_decoder = -1;
-static gint hf_mac_header_type_1_value_bytes = -1;
+static gint proto_mac_header_type_1_decoder;
+static gint ett_mac_header_type_1_decoder;
+static gint hf_mac_header_type_1_value_bytes;
 
 #define WIMAX_MAC_HEADER_SIZE  6
 
@@ -106,40 +106,40 @@ static const char *type1_subtype_abbrv[TYPE_I_SUBTYPE_MAX] =
  *#define WIMAX_MAC_HEADER_TYPE_1_HCS          0xFF
  */
 /* Common Fields */
-static int hf_mac_header_type_1_ht = -1;
-static int hf_mac_header_type_1_ec = -1;
-static int hf_mac_header_type_1_type = -1;
+static int hf_mac_header_type_1_ht;
+static int hf_mac_header_type_1_ec;
+static int hf_mac_header_type_1_type;
 /* type 0 & type 1 only */
-static int hf_mac_header_type_1_br = -1;
+static int hf_mac_header_type_1_br;
 /* type 3, type 4, & type 5 only */
-static int hf_mac_header_type_1_br_3 = -1;
+static int hf_mac_header_type_1_br_3;
 /* type 2 only */
-static int hf_mac_header_type_1_diuc = -1;
-static int hf_mac_header_type_1_ultxpwr = -1;
-static int hf_mac_header_type_1_ulhdrm = -1;
-static int hf_mac_header_type_1_rsv_2 = -1;
+static int hf_mac_header_type_1_diuc;
+static int hf_mac_header_type_1_ultxpwr;
+static int hf_mac_header_type_1_ulhdrm;
+static int hf_mac_header_type_1_rsv_2;
 /* type 3 only */
-static int hf_mac_header_type_1_ultxpwr_3 = -1;
+static int hf_mac_header_type_1_ultxpwr_3;
 /* type 4 only */
-static int hf_mac_header_type_1_cinr = -1;
-static int hf_mac_header_type_1_dci = -1;
+static int hf_mac_header_type_1_cinr;
+static int hf_mac_header_type_1_dci;
 /* type 5 only */
-static int hf_mac_header_type_1_pscid = -1;
-static int hf_mac_header_type_1_op = -1;
-static int hf_mac_header_type_1_rsv_5 = -1;
+static int hf_mac_header_type_1_pscid;
+static int hf_mac_header_type_1_op;
+static int hf_mac_header_type_1_rsv_5;
 /* type 6 only */
-static int hf_mac_header_type_1_last = -1;
-static int hf_mac_header_type_1_sdu_sn1 = -1;
-static int hf_mac_header_type_1_sdu_sn2 = -1;
-static int hf_mac_header_type_1_sdu_sn3 = -1;
+static int hf_mac_header_type_1_last;
+static int hf_mac_header_type_1_sdu_sn1;
+static int hf_mac_header_type_1_sdu_sn2;
+static int hf_mac_header_type_1_sdu_sn3;
 /* type 7 only */
-static int hf_mac_header_type_1_fb_type = -1;
-static int hf_mac_header_type_1_fbssi = -1;
-static int hf_mac_header_type_1_period = -1;
-static int hf_mac_header_type_1_rsv_7 = -1;
+static int hf_mac_header_type_1_fb_type;
+static int hf_mac_header_type_1_fbssi;
+static int hf_mac_header_type_1_period;
+static int hf_mac_header_type_1_rsv_7;
 /* Common Fields */
-static int hf_mac_header_type_1_cid = -1;
-static int hf_mac_header_type_1_hcs = -1;
+static int hf_mac_header_type_1_cid;
+static int hf_mac_header_type_1_hcs;
 
 /* MAC Header Type I Sub-Types */
 static const value_string sub_types[] =
diff --git a/plugins/epan/wimax/mac_hd_type2_decoder.c b/plugins/epan/wimax/mac_hd_type2_decoder.c
index 466b4b2024..c9197a3550 100644
--- a/plugins/epan/wimax/mac_hd_type2_decoder.c
+++ b/plugins/epan/wimax/mac_hd_type2_decoder.c
@@ -30,9 +30,9 @@
 
 extern gint proto_mac_header_generic_decoder;
 
-static gint proto_mac_header_type_2_decoder = -1;
-static gint ett_mac_header_type_2_decoder = -1;
-static gint hf_mac_header_type_2_value_bytes = -1;
+static gint proto_mac_header_type_2_decoder;
+static gint ett_mac_header_type_2_decoder;
+static gint hf_mac_header_type_2_value_bytes;
 
 #define WIMAX_MAC_HEADER_SIZE  6
 
@@ -81,23 +81,23 @@ static const char *type2_fb_type_abbrv[TYPE_II_FB_TYPE_MAX] =
 #define WIMAX_MAC_HEADER_TYPE_2_TYPE         0x20
 #define WIMAX_MAC_HEADER_TYPE_2_CII          0x10
 #define WIMAX_MAC_HEADER_TYPE_2_FB_TYPE      0x0F
-static int hf_mac_header_type_2_ht = -1;
-static int hf_mac_header_type_2_ec = -1;
-static int hf_mac_header_type_2_type = -1;
-static int hf_mac_header_type_2_cii = -1;
-static int hf_mac_header_type_2_fb_type = -1;
+static int hf_mac_header_type_2_ht;
+static int hf_mac_header_type_2_ec;
+static int hf_mac_header_type_2_type;
+static int hf_mac_header_type_2_cii;
+static int hf_mac_header_type_2_fb_type;
 
 /* 2nd to 5th bytes (varies by different fb types) */
-static int hf_mac_header_type_2_cid = -1;
-static int hf_mac_header_type_2_no_cid = -1;
+static int hf_mac_header_type_2_cid;
+static int hf_mac_header_type_2_no_cid;
 /* CQI and MIMO Feedback */
 /* 2nd & 3rd bytes */
 #define WIMAX_MAC_HEADER_TYPE_2_CQI_FB_TYPE  0xE000
 #define WIMAX_MAC_HEADER_TYPE_2_CQI_PAYLOAD  0x1F80
 #define WIMAX_MAC_HEADER_TYPE_2_CQI_RSV      0x007F
-static int hf_mac_header_type_2_cqi_fb_type = -1;
-static int hf_mac_header_type_2_cqi_payload = -1;
-static int hf_mac_header_type_2_cqi_rsv = -1;
+static int hf_mac_header_type_2_cqi_fb_type;
+static int hf_mac_header_type_2_cqi_payload;
+static int hf_mac_header_type_2_cqi_rsv;
 /* 4th & 5th without CID */
 /*#define WIMAX_MAC_HEADER_TYPE_2_NO_CID       0xFFFF*/
 
@@ -105,8 +105,8 @@ static int hf_mac_header_type_2_cqi_rsv = -1;
 /* 2nd byte */
 #define WIMAX_MAC_HEADER_TYPE_2_DL_AVE_CINR  0xF800
 #define WIMAX_MAC_HEADER_TYPE_2_DL_AVE_RSV   0x07FF
-static int hf_mac_header_type_2_dl_ave_cinr = -1;
-static int hf_mac_header_type_2_dl_ave_rsv = -1;
+static int hf_mac_header_type_2_dl_ave_cinr;
+static int hf_mac_header_type_2_dl_ave_rsv;
 
 /* MIMO Coefficients Feedback */
 /* 2nd & 3rd bytes */
@@ -114,26 +114,26 @@ static int hf_mac_header_type_2_dl_ave_rsv = -1;
 #define WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_AI   0x3000
 #define WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF      0x0F80
 #define WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_RSV  0x007F
-static int hf_mac_header_type_2_mimo_coef_ni = -1;
-static int hf_mac_header_type_2_mimo_coef_ai = -1;
-static int hf_mac_header_type_2_mimo_coef = -1;
-static int hf_mac_header_type_2_mimo_coef_rsv = -1;
+static int hf_mac_header_type_2_mimo_coef_ni;
+static int hf_mac_header_type_2_mimo_coef_ai;
+static int hf_mac_header_type_2_mimo_coef;
+static int hf_mac_header_type_2_mimo_coef_rsv;
 
 /* Preferred DL Channel DIUC Feedback */
 /* 2nd byte */
 #define WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DIUC  0xF000
 #define WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DCD   0x0F00
 #define WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_RSV   0x00FF
-static int hf_mac_header_type_2_dl_chan_diuc = -1;
-static int hf_mac_header_type_2_dl_chan_dcd = -1;
-static int hf_mac_header_type_2_dl_chan_rsv = -1;
+static int hf_mac_header_type_2_dl_chan_diuc;
+static int hf_mac_header_type_2_dl_chan_dcd;
+static int hf_mac_header_type_2_dl_chan_rsv;
 
 /* UL Transmission Power */
 /* 2nd byte */
 #define WIMAX_MAC_HEADER_TYPE_2_UL_TX_PWR     0xFF00
 #define WIMAX_MAC_HEADER_TYPE_2_UL_TX_PWR_RSV 0x00FF
-static int hf_mac_header_type_2_ul_tx_pwr = -1;
-static int hf_mac_header_type_2_ul_tx_pwr_rsv = -1;
+static int hf_mac_header_type_2_ul_tx_pwr;
+static int hf_mac_header_type_2_ul_tx_pwr_rsv;
 
 /* PHY Channel Feedback */
 /* 2nd to 4th bytes */
@@ -141,10 +141,10 @@ static int hf_mac_header_type_2_ul_tx_pwr_rsv = -1;
 #define WIMAX_MAC_HEADER_TYPE_2_PHY_UL_TX_PWR 0x0FF000
 #define WIMAX_MAC_HEADER_TYPE_2_PHY_UL_HDRM   0x000FC0
 #define WIMAX_MAC_HEADER_TYPE_2_PHY_RSV       0x00003F
-static int hf_mac_header_type_2_phy_diuc = -1;
-static int hf_mac_header_type_2_phy_ul_tx_pwr = -1;
-static int hf_mac_header_type_2_phy_ul_hdrm = -1;
-static int hf_mac_header_type_2_phy_rsv = -1;
+static int hf_mac_header_type_2_phy_diuc;
+static int hf_mac_header_type_2_phy_ul_tx_pwr;
+static int hf_mac_header_type_2_phy_ul_hdrm;
+static int hf_mac_header_type_2_phy_rsv;
 
 /* AMC Band Indication Bitmap */
 /* 2nd to 5th bytes */
@@ -153,27 +153,27 @@ static int hf_mac_header_type_2_phy_rsv = -1;
 #define WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_2    0x00007C00
 #define WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_3    0x000003E0
 #define WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_4    0x0000001F
-static int hf_mac_header_type_2_amc_bitmap = -1;
-static int hf_mac_header_type_2_amc_cqi_1 = -1;
-static int hf_mac_header_type_2_amc_cqi_2 = -1;
-static int hf_mac_header_type_2_amc_cqi_3 = -1;
-static int hf_mac_header_type_2_amc_cqi_4 = -1;
+static int hf_mac_header_type_2_amc_bitmap;
+static int hf_mac_header_type_2_amc_cqi_1;
+static int hf_mac_header_type_2_amc_cqi_2;
+static int hf_mac_header_type_2_amc_cqi_3;
+static int hf_mac_header_type_2_amc_cqi_4;
 
 /* Life Span of Short-term Precoding Feedback */
 /* 2nd byte */
 #define WIMAX_MAC_HEADER_TYPE_2_LIFE_SPAN  0xF000
 #define WIMAX_MAC_HEADER_TYPE_2_LIFE_SPAN_RSV 0x0FFF
-static int hf_mac_header_type_2_life_span = -1;
-static int hf_mac_header_type_2_life_span_rsv = -1;
+static int hf_mac_header_type_2_life_span;
+static int hf_mac_header_type_2_life_span_rsv;
 
 /* Multiple Types of Feedback */
 /* 2nd to 5th bytes ??? */
 #define WIMAX_MAC_HEADER_TYPE_2_MT_NUM_FB_TYPES 0xC0000000
 #define WIMAX_MAC_HEADER_TYPE_2_MT_OCCU_FB_TYPE 0x3C000000
 #define WIMAX_MAC_HEADER_TYPE_2_MT_FB_CONTENTS  0x03FFFFFF
-static int hf_mac_header_type_2_mt_num_fb_types = -1;
-static int hf_mac_header_type_2_mt_occu_fb_type = -1;
-static int hf_mac_header_type_2_mt_fb_contents = -1;
+static int hf_mac_header_type_2_mt_num_fb_types;
+static int hf_mac_header_type_2_mt_occu_fb_type;
+static int hf_mac_header_type_2_mt_fb_contents;
 
 /* Long-term Precoding Feedback */
 /* 2nd & 3rd bytes */
@@ -181,17 +181,17 @@ static int hf_mac_header_type_2_mt_fb_contents = -1;
 #define WIMAX_MAC_HEADER_TYPE_2_LT_RANK      0x0300
 #define WIMAX_MAC_HEADER_TYPE_2_LT_FEC_QAM   0x00FC
 #define WIMAX_MAC_HEADER_TYPE_2_LT_RSV       0x0003
-static int hf_mac_header_type_2_lt_id_fb = -1;
-static int hf_mac_header_type_2_lt_rank = -1;
-static int hf_mac_header_type_2_lt_fec_qam = -1;
-static int hf_mac_header_type_2_lt_rsv = -1;
+static int hf_mac_header_type_2_lt_id_fb;
+static int hf_mac_header_type_2_lt_rank;
+static int hf_mac_header_type_2_lt_fec_qam;
+static int hf_mac_header_type_2_lt_rsv;
 
 /* Combined DL Average CINR of Active BSs */
 /* 2nd & 3rd bytes */
 #define WIMAX_MAC_HEADER_TYPE_2_COMB_DL_AVE  0xF800
 #define WIMAX_MAC_HEADER_TYPE_2_COMB_DL_RSV  0x0EFF
-static int hf_mac_header_type_2_comb_dl_ave = -1;
-static int hf_mac_header_type_2_comb_dl_rsv = -1;
+static int hf_mac_header_type_2_comb_dl_ave;
+static int hf_mac_header_type_2_comb_dl_rsv;
 
 /* MIMO Channel Feedback */
 /* 2nd byte */
@@ -211,28 +211,28 @@ static int hf_mac_header_type_2_comb_dl_rsv = -1;
 #define WIMAX_MAC_HEADER_TYPE_2_MI           0x0000C0
 #define WIMAX_MAC_HEADER_TYPE_2_CT           0x000020
 #define WIMAX_MAC_HEADER_TYPE_2_CQI          0x00001F
-static int hf_mac_header_type_2_mimo_diuc = -1;
-static int hf_mac_header_type_2_mimo_pbwi = -1;
-static int hf_mac_header_type_2_mimo_slpb = -1;
-static int hf_mac_header_type_2_mimo_bpri = -1;
-static int hf_mac_header_type_2_mimo_bpri_cid = -1;
-static int hf_mac_header_type_2_mimo_cid = -1;
-static int hf_mac_header_type_2_mimo_cti = -1;
-static int hf_mac_header_type_2_mimo_ai_0 = -1;
-static int hf_mac_header_type_2_mimo_ai_1 = -1;
-static int hf_mac_header_type_2_mimo_ai_2 = -1;
-static int hf_mac_header_type_2_mimo_ai_3 = -1;
-static int hf_mac_header_type_2_mimo_mi = -1;
-static int hf_mac_header_type_2_mimo_ct = -1;
-static int hf_mac_header_type_2_mimo_cqi = -1;
+static int hf_mac_header_type_2_mimo_diuc;
+static int hf_mac_header_type_2_mimo_pbwi;
+static int hf_mac_header_type_2_mimo_slpb;
+static int hf_mac_header_type_2_mimo_bpri;
+static int hf_mac_header_type_2_mimo_bpri_cid;
+static int hf_mac_header_type_2_mimo_cid;
+static int hf_mac_header_type_2_mimo_cti;
+static int hf_mac_header_type_2_mimo_ai_0;
+static int hf_mac_header_type_2_mimo_ai_1;
+static int hf_mac_header_type_2_mimo_ai_2;
+static int hf_mac_header_type_2_mimo_ai_3;
+static int hf_mac_header_type_2_mimo_mi;
+static int hf_mac_header_type_2_mimo_ct;
+static int hf_mac_header_type_2_mimo_cqi;
 
 /* CINR Feedback */
 /* 2nd byte */
 /*#define WIMAX_MAC_HEADER_TYPE_2_CINR_MEAN    0xFF*/
 /* 3rd byte */
 /*#define WIMAX_MAC_HEADER_TYPE_2_CINR_DEVI    0xFF*/
-static int hf_mac_header_type_2_cinr_mean = -1;
-static int hf_mac_header_type_2_cinr_devi = -1;
+static int hf_mac_header_type_2_cinr_mean;
+static int hf_mac_header_type_2_cinr_devi;
 
 /* Close-loop MIMO Feedback */
 /* 2nd & 3rd bytes */
@@ -247,21 +247,21 @@ static int hf_mac_header_type_2_cinr_devi = -1;
 #define WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CODEBOOK_ID 0x3F00
 #define WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CQI_2       0x00F8
 #define WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_RSV_2       0x000E
-static int hf_mac_header_type_2_cl_mimo_type = -1;
-static int hf_mac_header_type_2_cl_mimo_ant_id = -1;
-static int hf_mac_header_type_2_cl_mimo_cqi = -1;
-static int hf_mac_header_type_2_cl_mimo_cqi_1 = -1;
-static int hf_mac_header_type_2_cl_mimo_cqi_2 = -1;
-static int hf_mac_header_type_2_cl_mimo_rsv = -1;
-static int hf_mac_header_type_2_cl_mimo_rsv_1 = -1;
-static int hf_mac_header_type_2_cl_mimo_rsv_2 = -1;
-static int hf_mac_header_type_2_cl_mimo_streams = -1;
-static int hf_mac_header_type_2_cl_mimo_ant_sel = -1;
-static int hf_mac_header_type_2_cl_mimo_codebook_id = -1;
+static int hf_mac_header_type_2_cl_mimo_type;
+static int hf_mac_header_type_2_cl_mimo_ant_id;
+static int hf_mac_header_type_2_cl_mimo_cqi;
+static int hf_mac_header_type_2_cl_mimo_cqi_1;
+static int hf_mac_header_type_2_cl_mimo_cqi_2;
+static int hf_mac_header_type_2_cl_mimo_rsv;
+static int hf_mac_header_type_2_cl_mimo_rsv_1;
+static int hf_mac_header_type_2_cl_mimo_rsv_2;
+static int hf_mac_header_type_2_cl_mimo_streams;
+static int hf_mac_header_type_2_cl_mimo_ant_sel;
+static int hf_mac_header_type_2_cl_mimo_codebook_id;
 
 /* last byte */
 /*#define WIMAX_MAC_HEADER_TYPE_2_HCS          0xFF*/
-static int hf_mac_header_type_2_hcs = -1;
+static int hf_mac_header_type_2_hcs;
 
 /* CID Inclusion Indication messages */
 static const value_string cii_msgs[] =
diff --git a/plugins/epan/wimax/mac_mgmt_msg_decoder.c b/plugins/epan/wimax/mac_mgmt_msg_decoder.c
index 57c039777a..767dc342ce 100644
--- a/plugins/epan/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/epan/wimax/mac_mgmt_msg_decoder.c
@@ -23,13 +23,13 @@
 void proto_register_mac_mgmt_msg(void);
 void proto_reg_handoff_mac_mgmt_msg(void);
 
-static gint proto_mac_mgmt_msg_decoder = -1;
-static gint ett_mac_mgmt_msg_decoder = -1;
+static gint proto_mac_mgmt_msg_decoder;
+static gint ett_mac_mgmt_msg_decoder;
 
-static gint hf_mac_mgmt_msg_type = -1;
-static gint hf_mac_mgmt_msg_values = -1;
+static gint hf_mac_mgmt_msg_type;
+static gint hf_mac_mgmt_msg_values;
 
-static expert_field ei_empty_payload = EI_INIT;
+static expert_field ei_empty_payload;
 
 static dissector_table_t  subdissector_message_table;
 
diff --git a/plugins/epan/wimax/msg_aas_beam.c b/plugins/epan/wimax/msg_aas_beam.c
index 1e6166fd84..68d14900c6 100644
--- a/plugins/epan/wimax/msg_aas_beam.c
+++ b/plugins/epan/wimax/msg_aas_beam.c
@@ -37,10 +37,10 @@ void proto_reg_handoff_mac_mgmt_msg_aas_beam(void);
 
 static dissector_handle_t aas_handle;
 
-static gint proto_mac_mgmt_msg_aas_beam_decoder = -1;
-static gint ett_mac_mgmt_msg_aas_beam_select_decoder = -1;
-static gint ett_mac_mgmt_msg_aas_beam_req_decoder = -1;
-static gint ett_mac_mgmt_msg_aas_beam_rsp_decoder = -1;
+static gint proto_mac_mgmt_msg_aas_beam_decoder;
+static gint ett_mac_mgmt_msg_aas_beam_select_decoder;
+static gint ett_mac_mgmt_msg_aas_beam_req_decoder;
+static gint ett_mac_mgmt_msg_aas_beam_rsp_decoder;
 
 #ifdef OFDM
 static const value_string vals_report_types[] =
@@ -61,19 +61,19 @@ static const value_string vals_resolution_parameter[] =
 #endif
 
 /* fix fields */
-/* static gint hf_aas_beam_unknown_type = -1; */
-static gint hf_aas_beam_select_index = -1;
-static gint hf_aas_beam_select_reserved = -1;
+/* static gint hf_aas_beam_unknown_type; */
+static gint hf_aas_beam_select_index;
+static gint hf_aas_beam_select_reserved;
 #ifdef OFDM
-static gint hf_aas_beam_frame_number = -1;
-static gint hf_aas_beam_feedback_request_number = -1;
-static gint hf_aas_beam_measurement_report_type = -1;
-static gint hf_aas_beam_resolution_parameter = -1;
-static gint hf_aas_beam_beam_bit_mask = -1;
-static int hf_aas_beam_freq_value_re = -1;
-static int hf_aas_beam_freq_value_im = -1;
-static int hf_aas_beam_rssi_value = -1;
-static int hf_aas_beam_cinr_value = -1;
+static gint hf_aas_beam_frame_number;
+static gint hf_aas_beam_feedback_request_number;
+static gint hf_aas_beam_measurement_report_type;
+static gint hf_aas_beam_resolution_parameter;
+static gint hf_aas_beam_beam_bit_mask;
+static int hf_aas_beam_freq_value_re;
+static int hf_aas_beam_freq_value_im;
+static int hf_aas_beam_rssi_value;
+static int hf_aas_beam_cinr_value;
 #endif
 
 
diff --git a/plugins/epan/wimax/msg_aas_fbck.c b/plugins/epan/wimax/msg_aas_fbck.c
index 31162822bb..2d0df5c47d 100644
--- a/plugins/epan/wimax/msg_aas_fbck.c
+++ b/plugins/epan/wimax/msg_aas_fbck.c
@@ -36,9 +36,9 @@ void proto_reg_handoff_mac_mgmt_msg_aas(void);
 static dissector_handle_t aas_req_handle;
 static dissector_handle_t aas_rsp_handle;
 
-static gint proto_mac_mgmt_msg_aas_fbck_decoder = -1;
-static gint ett_mac_mgmt_msg_aas_fbck_req_decoder = -1;
-static gint ett_mac_mgmt_msg_aas_fbck_rsp_decoder = -1;
+static gint proto_mac_mgmt_msg_aas_fbck_decoder;
+static gint ett_mac_mgmt_msg_aas_fbck_req_decoder;
+static gint ett_mac_mgmt_msg_aas_fbck_rsp_decoder;
 
 static const value_string vals_data_types[] =
 {
@@ -66,23 +66,23 @@ static const value_string vals_resolutions_1[] =
 };
 
 /* fix fields */
-/* static int hf_aas_fbck_unknown_type = -1; */
-static int hf_aas_fbck_frame_number = -1;
-static int hf_aas_fbck_number_of_frames = -1;
-static int hf_aas_fbck_req_data_type = -1;
-static int hf_aas_fbck_rsp_data_type = -1;
-static int hf_aas_fbck_req_counter = -1;
-static int hf_aas_fbck_rsp_counter = -1;
-static int hf_aas_fbck_req_resolution_0 = -1;
-static int hf_aas_fbck_rsp_resolution_0 = -1;
-static int hf_aas_fbck_req_resolution_1 = -1;
-static int hf_aas_fbck_rsp_resolution_1 = -1;
-static int hf_aas_fbck_req_reserved = -1;
-static int hf_aas_fbck_rsp_reserved = -1;
-static int hf_aas_fbck_freq_value_re = -1;
-static int hf_aas_fbck_freq_value_im = -1;
-static int hf_aas_fbck_rssi_value = -1;
-static int hf_aas_fbck_cinr_value = -1;
+/* static int hf_aas_fbck_unknown_type; */
+static int hf_aas_fbck_frame_number;
+static int hf_aas_fbck_number_of_frames;
+static int hf_aas_fbck_req_data_type;
+static int hf_aas_fbck_rsp_data_type;
+static int hf_aas_fbck_req_counter;
+static int hf_aas_fbck_rsp_counter;
+static int hf_aas_fbck_req_resolution_0;
+static int hf_aas_fbck_rsp_resolution_0;
+static int hf_aas_fbck_req_resolution_1;
+static int hf_aas_fbck_rsp_resolution_1;
+static int hf_aas_fbck_req_reserved;
+static int hf_aas_fbck_rsp_reserved;
+static int hf_aas_fbck_freq_value_re;
+static int hf_aas_fbck_freq_value_im;
+static int hf_aas_fbck_rssi_value;
+static int hf_aas_fbck_cinr_value;
 
 
 static int dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
diff --git a/plugins/epan/wimax/msg_arq.c b/plugins/epan/wimax/msg_arq.c
index c99a66a211..9753f8bdc5 100644
--- a/plugins/epan/wimax/msg_arq.c
+++ b/plugins/epan/wimax/msg_arq.c
@@ -30,9 +30,9 @@ static dissector_handle_t arq_feedback_handle;
 static dissector_handle_t arq_discard_handle;
 static dissector_handle_t arq_reset_handle;
 
-static gint proto_mac_mgmt_msg_arq_decoder = -1;
+static gint proto_mac_mgmt_msg_arq_decoder;
 
-static gint ett_mac_mgmt_msg_arq_decoder = -1;
+static gint ett_mac_mgmt_msg_arq_decoder;
 
 /* Setup protocol subtree array */
 static gint *ett[] =
@@ -42,31 +42,31 @@ static gint *ett[] =
 
 
 /* ARQ fields */
-static gint hf_arq_cid			= -1;
-static gint hf_arq_last			= -1;
-static gint hf_arq_ack_type		= -1;
-static gint hf_ack_type_reserved	= -1;
-static gint hf_arq_bsn			= -1;
-static gint hf_arq_num_ack_maps		= -1;
-static gint hf_arq_selective_map	= -1;
-static gint hf_arq_seq_format		= -1;
-static gint hf_arq_0seq_ack_map		= -1;
-static gint hf_arq_0seq1_len		= -1;
-static gint hf_arq_0seq2_len		= -1;
-static gint hf_arq_1seq_ack_map		= -1;
-static gint hf_arq_1seq1_len		= -1;
-static gint hf_arq_1seq2_len		= -1;
-static gint hf_arq_1seq3_len		= -1;
-static gint hf_arq_reserved		= -1;
-
-static gint hf_arq_discard_cid		= -1;
-static gint hf_arq_discard_reserved	= -1;
-static gint hf_arq_discard_bsn		= -1;
-
-static gint hf_arq_reset_cid		= -1;
-static gint hf_arq_reset_type		= -1;
-static gint hf_arq_reset_direction	= -1;
-static gint hf_arq_reset_reserved	= -1;
+static gint hf_arq_cid;
+static gint hf_arq_last;
+static gint hf_arq_ack_type;
+static gint hf_ack_type_reserved;
+static gint hf_arq_bsn;
+static gint hf_arq_num_ack_maps;
+static gint hf_arq_selective_map;
+static gint hf_arq_seq_format;
+static gint hf_arq_0seq_ack_map;
+static gint hf_arq_0seq1_len;
+static gint hf_arq_0seq2_len;
+static gint hf_arq_1seq_ack_map;
+static gint hf_arq_1seq1_len;
+static gint hf_arq_1seq2_len;
+static gint hf_arq_1seq3_len;
+static gint hf_arq_reserved;
+
+static gint hf_arq_discard_cid;
+static gint hf_arq_discard_reserved;
+static gint hf_arq_discard_bsn;
+
+static gint hf_arq_reset_cid;
+static gint hf_arq_reset_type;
+static gint hf_arq_reset_direction;
+static gint hf_arq_reset_reserved;
 
 /* STRING RESOURCES */
 
diff --git a/plugins/epan/wimax/msg_clk_cmp.c b/plugins/epan/wimax/msg_clk_cmp.c
index 3fac08dbce..b57e13e8b1 100644
--- a/plugins/epan/wimax/msg_clk_cmp.c
+++ b/plugins/epan/wimax/msg_clk_cmp.c
@@ -24,16 +24,16 @@ void proto_reg_handoff_mac_mgmt_msg_clk_cmp(void);
 
 static dissector_handle_t clk_cmp_handle;
 
-static gint proto_mac_mgmt_msg_clk_cmp_decoder = -1;
+static gint proto_mac_mgmt_msg_clk_cmp_decoder;
 
-static gint ett_mac_mgmt_msg_clk_cmp_decoder = -1;
+static gint ett_mac_mgmt_msg_clk_cmp_decoder;
 
 /* CLK_CMP fields */
-static gint hf_clk_cmp_clock_count = -1;
-static gint hf_clk_cmp_clock_id = -1;
-static gint hf_clk_cmp_seq_number = -1;
-static gint hf_clk_cmp_comparison_value = -1;
-/* static gint hf_clk_cmp_invalid_tlv = -1; */
+static gint hf_clk_cmp_clock_count;
+static gint hf_clk_cmp_clock_id;
+static gint hf_clk_cmp_seq_number;
+static gint hf_clk_cmp_comparison_value;
+/* static gint hf_clk_cmp_invalid_tlv; */
 
 
 /* Decode CLK_CMP messages. */
diff --git a/plugins/epan/wimax/msg_dcd.c b/plugins/epan/wimax/msg_dcd.c
index 167e074285..91c62751ae 100644
--- a/plugins/epan/wimax/msg_dcd.c
+++ b/plugins/epan/wimax/msg_dcd.c
@@ -33,90 +33,90 @@ void proto_reg_handoff_mac_mgmt_msg_dcd(void);
 
 static dissector_handle_t dcd_handle;
 
-static gint proto_mac_mgmt_msg_dcd_decoder = -1;
-static gint ett_mac_mgmt_msg_dcd_decoder = -1;
+static gint proto_mac_mgmt_msg_dcd_decoder;
+static gint ett_mac_mgmt_msg_dcd_decoder;
 
 /* fix fields */
-static gint hf_dcd_downlink_channel_id = -1;
-static gint hf_dcd_config_change_count = -1;
-static gint hf_dcd_dl_burst_profile_rsv = -1;
-static gint hf_dcd_dl_burst_profile_diuc = -1;
+static gint hf_dcd_downlink_channel_id;
+static gint hf_dcd_config_change_count;
+static gint hf_dcd_dl_burst_profile_rsv;
+static gint hf_dcd_dl_burst_profile_diuc;
 
-static gint hf_dcd_bs_eirp = -1;
-static gint hf_dcd_frame_duration = -1;
-static gint hf_dcd_phy_type = -1;
-static gint hf_dcd_power_adjustment = -1;
-static gint hf_dcd_channel_nr = -1;
-static gint hf_dcd_ttg = -1;
-static gint hf_dcd_rtg = -1;
+static gint hf_dcd_bs_eirp;
+static gint hf_dcd_frame_duration;
+static gint hf_dcd_phy_type;
+static gint hf_dcd_power_adjustment;
+static gint hf_dcd_channel_nr;
+static gint hf_dcd_ttg;
+static gint hf_dcd_rtg;
 #ifdef	WIMAX_16D_2004
-static gint hf_dcd_rss = -1;
+static gint hf_dcd_rss;
 #endif
-static gint hf_dcd_channel_switch_frame_nr = -1;
-static gint hf_dcd_frequency = -1;
-static gint hf_dcd_bs_id = -1;
-static gint hf_dcd_frame_duration_code = -1;
-static gint hf_dcd_frame_nr = -1;
+static gint hf_dcd_channel_switch_frame_nr;
+static gint hf_dcd_frequency;
+static gint hf_dcd_bs_id;
+static gint hf_dcd_frame_duration_code;
+static gint hf_dcd_frame_nr;
 #ifdef  WIMAX_16D_2004
-static gint hf_dcd_size_cqich_id = -1;
-static gint hf_dcd_h_arq_ack_delay_dl = -1;
+static gint hf_dcd_size_cqich_id;
+static gint hf_dcd_h_arq_ack_delay_dl;
 #else
-static gint hf_dcd_h_arq_ack_delay_ul = -1;
+static gint hf_dcd_h_arq_ack_delay_ul;
 #endif
-static gint hf_dcd_mac_version = -1;
-static gint hf_dcd_restart_count = -1;
+static gint hf_dcd_mac_version;
+static gint hf_dcd_restart_count;
 
-/* static gint hf_dl_burst_reserved = -1; */
-/* static gint hf_dl_burst_diuc = -1; */
-static gint hf_dcd_burst_freq = -1;
-static gint hf_dcd_burst_fec = -1;
-static gint hf_dcd_burst_diuc_exit_threshold = -1;
-static gint hf_dcd_burst_diuc_entry_threshold = -1;
-static gint hf_dcd_burst_tcs = -1;
-static gint hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone = -1;
-static gint hf_dcd_tlv_t_20_maximum_retransmission = -1;
-static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter = -1;
-static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements = -1;
-static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements = -1;
-static gint hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap = -1;
+/* static gint hf_dl_burst_reserved; */
+/* static gint hf_dl_burst_diuc; */
+static gint hf_dcd_burst_freq;
+static gint hf_dcd_burst_fec;
+static gint hf_dcd_burst_diuc_exit_threshold;
+static gint hf_dcd_burst_diuc_entry_threshold;
+static gint hf_dcd_burst_tcs;
+static gint hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone;
+static gint hf_dcd_tlv_t_20_maximum_retransmission;
+static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter;
+static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements;
+static gint hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements;
+static gint hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap;
 
-static gint hf_dcd_tlv_t_34_dl_region_definition = -1;
-static gint hf_dcd_tlv_t_34_dl_region_definition_num_region = -1;
-static gint hf_dcd_tlv_t_34_dl_region_definition_reserved = -1;
-static gint hf_dcd_tlv_t_34_dl_region_definition_symbol_offset = -1;
-static gint hf_dcd_eirxp = -1;
-static gint hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset = -1;
-static gint hf_dcd_tlv_t_34_dl_region_definition_num_symbols = -1;
-static gint hf_dcd_tlv_t_34_dl_region_definition_num_subchannels = -1;
-static gint hf_dcd_tlv_t_50_ho_type_support = -1;
-static gint hf_dcd_tlv_t_50_ho_type_support_ho = -1;
-static gint hf_dcd_tlv_t_50_ho_type_support_mdho = -1;
-static gint hf_dcd_tlv_t_50_ho_type_support_fbss_ho = -1;
-static gint hf_dcd_tlv_t_50_ho_type_support_reserved = -1;
-static gint hf_dcd_tlv_t_31_h_add_threshold = -1;
-static gint hf_dcd_tlv_t_45_paging_interval_length = -1;
-static gint hf_dcd_tlv_t_45_paging_interval_reserved = -1;
-static gint hf_dcd_tlv_t_32_h_delete_threshold = -1;
-static gint hf_dcd_tlv_t_33_asr = -1;
-static gint hf_dcd_tlv_t_33_asr_m = -1;
-static gint hf_dcd_tlv_t_33_asr_l = -1;
-static gint hf_dcd_tlv_t_35_paging_group_id = -1;
-static gint hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap = -1;
-static gint hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap = -1;
-static gint hf_dcd_tlv_t_51_hysteresis_margin = -1;
-static gint hf_dcd_tlv_t_52_time_to_trigger_duration = -1;
-static gint hf_dcd_tlv_t_60_noise_interference = -1;
-static gint hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types = -1;
+static gint hf_dcd_tlv_t_34_dl_region_definition;
+static gint hf_dcd_tlv_t_34_dl_region_definition_num_region;
+static gint hf_dcd_tlv_t_34_dl_region_definition_reserved;
+static gint hf_dcd_tlv_t_34_dl_region_definition_symbol_offset;
+static gint hf_dcd_eirxp;
+static gint hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset;
+static gint hf_dcd_tlv_t_34_dl_region_definition_num_symbols;
+static gint hf_dcd_tlv_t_34_dl_region_definition_num_subchannels;
+static gint hf_dcd_tlv_t_50_ho_type_support;
+static gint hf_dcd_tlv_t_50_ho_type_support_ho;
+static gint hf_dcd_tlv_t_50_ho_type_support_mdho;
+static gint hf_dcd_tlv_t_50_ho_type_support_fbss_ho;
+static gint hf_dcd_tlv_t_50_ho_type_support_reserved;
+static gint hf_dcd_tlv_t_31_h_add_threshold;
+static gint hf_dcd_tlv_t_45_paging_interval_length;
+static gint hf_dcd_tlv_t_45_paging_interval_reserved;
+static gint hf_dcd_tlv_t_32_h_delete_threshold;
+static gint hf_dcd_tlv_t_33_asr;
+static gint hf_dcd_tlv_t_33_asr_m;
+static gint hf_dcd_tlv_t_33_asr_l;
+static gint hf_dcd_tlv_t_35_paging_group_id;
+static gint hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap;
+static gint hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap;
+static gint hf_dcd_tlv_t_51_hysteresis_margin;
+static gint hf_dcd_tlv_t_52_time_to_trigger_duration;
+static gint hf_dcd_tlv_t_60_noise_interference;
+static gint hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types;
 
-static gint hf_dcd_tlv_t_541_type_function_action       = -1;
-static gint hf_dcd_tlv_t_541_type = -1;
-static gint hf_dcd_tlv_t_541_function = -1;
-static gint hf_dcd_tlv_t_541_action = -1;
-static gint hf_dcd_tlv_t_542_trigger_value = -1;
-static gint hf_dcd_tlv_t_543_trigger_averaging_duration = -1;
+static gint hf_dcd_tlv_t_541_type_function_action;
+static gint hf_dcd_tlv_t_541_type;
+static gint hf_dcd_tlv_t_541_function;
+static gint hf_dcd_tlv_t_541_action;
+static gint hf_dcd_tlv_t_542_trigger_value;
+static gint hf_dcd_tlv_t_543_trigger_averaging_duration;
 
-static gint hf_dcd_unknown_type = -1;
-static gint hf_dcd_invalid_tlv = -1;
+static gint hf_dcd_unknown_type;
+static gint hf_dcd_invalid_tlv;
 
 /* DCD DIUC messages (table 143) */
 static const value_string diuc_msgs[] =
diff --git a/plugins/epan/wimax/msg_dlmap.c b/plugins/epan/wimax/msg_dlmap.c
index 4df5f213d2..420ca1fc24 100644
--- a/plugins/epan/wimax/msg_dlmap.c
+++ b/plugins/epan/wimax/msg_dlmap.c
@@ -67,56 +67,56 @@ gint STC_Zone_Matrix = 0;
 gint INC_CID = 0;
 gint sub_dl_ul_map = 0;
 
-static gint proto_mac_mgmt_msg_dlmap_decoder = -1;
-
-static gint ett_dlmap = -1;
-static gint ett_dlmap_ie = -1;
-/* static gint ett_dlmap_c_ie = -1; */
-static gint ett_109x = -1; /* SUB-DL-UL-MAP */
-static gint ett_109x_dl = -1;
-static gint ett_109x_ul = -1;
-static gint ett_275_phy = -1;
-static gint ett_275_1 = -1;
-static gint ett_277 = -1;
-static gint ett_277b = -1;
-static gint ett_278 = -1;
-static gint ett_279 = -1;
-static gint ett_280 = -1;
-static gint ett_281 = -1;
-static gint ett_282 = -1;
-static gint ett_283 = -1;
-static gint ett_284 = -1;
-static gint ett_285 = -1;
-static gint ett_286 = -1;
-static gint ett_286a = -1;
-static gint ett_286b = -1;
-static gint ett_286c = -1;
-static gint ett_286d = -1;
-static gint ett_286e = -1;
-static gint ett_286f = -1;
-static gint ett_286g = -1;
-static gint ett_286h = -1;
-static gint ett_286i = -1;
-static gint ett_286j = -1;
-static gint ett_286k = -1;
-static gint ett_286l = -1;
-static gint ett_286m = -1;
-static gint ett_286n = -1;
-static gint ett_286o = -1;
-static gint ett_286p = -1;
-static gint ett_286q = -1;
-static gint ett_286r = -1;
-static gint ett_286s = -1;
-static gint ett_286t = -1;
-static gint ett_286u = -1;
-static gint ett_286v = -1;
-static gint ett_286w = -1;
-static gint ett_286x = -1;
-static gint ett_286y = -1;
-static gint ett_286z = -1;
-static gint ett_305  = -1;
-/* static gint ett_305_dl = -1; */
-static gint ett_308a = -1;
+static gint proto_mac_mgmt_msg_dlmap_decoder;
+
+static gint ett_dlmap;
+static gint ett_dlmap_ie;
+/* static gint ett_dlmap_c_ie; */
+static gint ett_109x; /* SUB-DL-UL-MAP */
+static gint ett_109x_dl;
+static gint ett_109x_ul;
+static gint ett_275_phy;
+static gint ett_275_1;
+static gint ett_277;
+static gint ett_277b;
+static gint ett_278;
+static gint ett_279;
+static gint ett_280;
+static gint ett_281;
+static gint ett_282;
+static gint ett_283;
+static gint ett_284;
+static gint ett_285;
+static gint ett_286;
+static gint ett_286a;
+static gint ett_286b;
+static gint ett_286c;
+static gint ett_286d;
+static gint ett_286e;
+static gint ett_286f;
+static gint ett_286g;
+static gint ett_286h;
+static gint ett_286i;
+static gint ett_286j;
+static gint ett_286k;
+static gint ett_286l;
+static gint ett_286m;
+static gint ett_286n;
+static gint ett_286o;
+static gint ett_286p;
+static gint ett_286q;
+static gint ett_286r;
+static gint ett_286s;
+static gint ett_286t;
+static gint ett_286u;
+static gint ett_286v;
+static gint ett_286w;
+static gint ett_286x;
+static gint ett_286y;
+static gint ett_286z;
+static gint ett_305;
+/* static gint ett_305_dl; */
+static gint ett_308a;
 
 #define DCD_DOWNLINK_BURST_PROFILE	  1
 #define DCD_BS_EIRP			  2
@@ -234,368 +234,368 @@ static const value_string frames_per_second[] =
 };
 
 /* dl-map fields */
-static gint hf_dlmap_phy_fdur = -1;
-static gint hf_dlmap_phy_fdur_ms = -1;
-static gint hf_dlmap_phy_fdur_per_sec = -1;
-static gint hf_dlmap_phy_fnum = -1;
-/* static gint hf_dlmap_fch_expected = -1; */
-static gint hf_dlmap_dcd = -1;
-static gint hf_dlmap_bsid = -1;
-static gint hf_dlmap_ofdma_sym = -1;
-/* static gint hf_dlmap_ie = -1; */
-static gint hf_dlmap_ie_diuc = -1;
-static gint hf_dlmap_ie_reserved_extended2_duic = -1;
-static gint hf_dlmap_ie_reserved_extended_duic = -1;
-static gint hf_dlmap_ie_diuc_ext = -1;
-static gint hf_dlmap_ie_diuc_ext2 = -1;
-static gint hf_dlmap_ie_length = -1;
-static gint hf_dlmap_ie_bitmap = -1;
-static gint hf_dlmap_ie_bitmap_cqi = -1;
-static gint hf_dlmap_ie_bitmap_pusc = -1;
-static gint hf_dlmap_ie_bitmap_opt_pusc = -1;
-static gint hf_dlmap_ie_bitmap_amc = -1;
-static gint hf_dlmap_ie_bitmap_aas = -1;
-static gint hf_dlmap_ie_bitmap_periodic_ranging = -1;
-static gint hf_dlmap_ie_bitmap_sounding = -1;
-static gint hf_dlmap_ie_bitmap_mimo = -1;
-static gint hf_dlmap_ie_ncid = -1;
-static gint hf_dlmap_ie_cid = -1;
-static gint hf_dlmap_ie_offsym = -1;
-static gint hf_dlmap_ie_offsub = -1;
-static gint hf_dlmap_ie_boosting = -1;
-static gint hf_dlmap_ie_numsym = -1;
-static gint hf_dlmap_ie_numsub = -1;
-static gint hf_dlmap_ie_rep = -1;
-static gint hf_dlmap_ie_offsym2 = -1;
-static gint hf_dlmap_ie_offsub2 = -1;
-static gint hf_dlmap_ie_boosting2 = -1;
-static gint hf_dlmap_ie_numsym2 = -1;
-static gint hf_dlmap_ie_numsub2 = -1;
-static gint hf_dlmap_ie_rep2 = -1;
-
-/* static gint hf_dlmap_xie_diuc = -1; */
-/* static gint hf_dlmap_xie_len = -1; */
-
-static gint hf_dlmapc_compr = -1;
-static gint hf_dlmapc_ulmap = -1;
-static gint hf_dlmapc_rsv = -1;
-static gint hf_dlmapc_len = -1;
-/* static gint hf_dlmapc_sync = -1; */
-static gint hf_dlmapc_opid = -1;
-static gint hf_dlmapc_secid = -1;
-static gint hf_dlmapc_count = -1;
+static gint hf_dlmap_phy_fdur;
+static gint hf_dlmap_phy_fdur_ms;
+static gint hf_dlmap_phy_fdur_per_sec;
+static gint hf_dlmap_phy_fnum;
+/* static gint hf_dlmap_fch_expected; */
+static gint hf_dlmap_dcd;
+static gint hf_dlmap_bsid;
+static gint hf_dlmap_ofdma_sym;
+/* static gint hf_dlmap_ie; */
+static gint hf_dlmap_ie_diuc;
+static gint hf_dlmap_ie_reserved_extended2_duic;
+static gint hf_dlmap_ie_reserved_extended_duic;
+static gint hf_dlmap_ie_diuc_ext;
+static gint hf_dlmap_ie_diuc_ext2;
+static gint hf_dlmap_ie_length;
+static gint hf_dlmap_ie_bitmap;
+static gint hf_dlmap_ie_bitmap_cqi;
+static gint hf_dlmap_ie_bitmap_pusc;
+static gint hf_dlmap_ie_bitmap_opt_pusc;
+static gint hf_dlmap_ie_bitmap_amc;
+static gint hf_dlmap_ie_bitmap_aas;
+static gint hf_dlmap_ie_bitmap_periodic_ranging;
+static gint hf_dlmap_ie_bitmap_sounding;
+static gint hf_dlmap_ie_bitmap_mimo;
+static gint hf_dlmap_ie_ncid;
+static gint hf_dlmap_ie_cid;
+static gint hf_dlmap_ie_offsym;
+static gint hf_dlmap_ie_offsub;
+static gint hf_dlmap_ie_boosting;
+static gint hf_dlmap_ie_numsym;
+static gint hf_dlmap_ie_numsub;
+static gint hf_dlmap_ie_rep;
+static gint hf_dlmap_ie_offsym2;
+static gint hf_dlmap_ie_offsub2;
+static gint hf_dlmap_ie_boosting2;
+static gint hf_dlmap_ie_numsym2;
+static gint hf_dlmap_ie_numsub2;
+static gint hf_dlmap_ie_rep2;
+
+/* static gint hf_dlmap_xie_diuc; */
+/* static gint hf_dlmap_xie_len; */
+
+static gint hf_dlmapc_compr;
+static gint hf_dlmapc_ulmap;
+static gint hf_dlmapc_rsv;
+static gint hf_dlmapc_len;
+/* static gint hf_dlmapc_sync; */
+static gint hf_dlmapc_opid;
+static gint hf_dlmapc_secid;
+static gint hf_dlmapc_count;
 
 #if 0
-static gint hf_109x_cmi = -1;
-static gint hf_109x_len = -1;
-static gint hf_109x_rcid = -1;
-static gint hf_109x_haoi = -1;
-static gint hf_109x_dl = -1;
-static gint hf_109x_ul = -1;
-static gint hf_109x_dlie = -1;
-static gint hf_109x_symofs = -1;
-static gint hf_109x_subofs = -1;
-static gint hf_109x_rsv = -1;
+static gint hf_109x_cmi;
+static gint hf_109x_len;
+static gint hf_109x_rcid;
+static gint hf_109x_haoi;
+static gint hf_109x_dl;
+static gint hf_109x_ul;
+static gint hf_109x_dlie;
+static gint hf_109x_symofs;
+static gint hf_109x_subofs;
+static gint hf_109x_rsv;
 #endif
 
-static gint hf_308a_cmi = -1;
-static gint hf_308a_ulmap = -1;
-static gint hf_308a_type = -1;
-static gint hf_308a_mult = -1;
-static gint hf_308a_rsv = -1;
-static gint hf_mac_header_compress_dlmap_crc = -1;
-static gint hf_mac_header_compress_dlmap_crc_status = -1;
-static gint hf_crc16 = -1;
-static gint hf_crc16_status = -1;
-static gint hf_padding = -1;
-static gint hf_cid_mask = -1;
-static gint hf_reserved = -1;
+static gint hf_308a_cmi;
+static gint hf_308a_ulmap;
+static gint hf_308a_type;
+static gint hf_308a_mult;
+static gint hf_308a_rsv;
+static gint hf_mac_header_compress_dlmap_crc;
+static gint hf_mac_header_compress_dlmap_crc_status;
+static gint hf_crc16;
+static gint hf_crc16_status;
+static gint hf_padding;
+static gint hf_cid_mask;
+static gint hf_reserved;
 
 /* Generated via "one time" script to help create filterable fields */
-static int hf_dlmap_rcid_ie_cid = -1;
-static int hf_dlmap_rcid_ie_prefix = -1;
-static int hf_dlmap_rcid_ie_cid11 = -1;
-static int hf_dlmap_rcid_ie_cid7 = -1;
-static int hf_dlmap_rcid_ie_cid3 = -1;
-static int hf_dlmap_dedicated_dl_control_length = -1;
-static int hf_dlmap_dedicated_dl_control_control_header = -1;
-static int hf_dlmap_dedicated_dl_control_num_sdma_layers = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_length = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_n_layer = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_matrix = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_period = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_frame_offset = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_duration = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_allocation_index = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_cqich_num = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_feedback_type = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_num_stream = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index = -1;
-static int hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index = -1;
-static int hf_dlmap_n_sub_burst_isi = -1;
-static int hf_dlmap_harq_chase_n_ack_channel = -1;
-static int hf_dlmap_harq_chase_duration = -1;
-static int hf_dlmap_harq_chase_sub_burst_diuc_indicator = -1;
-static int hf_dlmap_reserved_uint = -1;
-static int hf_dlmap_harq_chase_diuc = -1;
-static int hf_dlmap_harq_chase_repetition_coding_indication = -1;
-static int hf_dlmap_harq_chase_acid = -1;
-static int hf_dlmap_harq_chase_ai_sn = -1;
-static int hf_dlmap_harq_chase_ack_disable = -1;
-static int hf_dlmap_harq_chase_dedicated_dl_control_indicator = -1;
-static int hf_dlmap_harq_chase_allocation_index = -1;
-static int hf_dlmap_harq_chase_period = -1;
-static int hf_dlmap_harq_chase_frame_offset = -1;
-static int hf_dlmap_harq_ir_ctc_n_ack_channel = -1;
-static int hf_dlmap_harq_ir_ctc_nep = -1;
-static int hf_dlmap_harq_ir_ctc_nsch = -1;
-static int hf_dlmap_harq_ir_ctc_spid = -1;
-static int hf_dlmap_harq_ir_ctc_acid = -1;
-static int hf_dlmap_harq_ir_ctc_ai_sn = -1;
-static int hf_dlmap_harq_ir_ctc_ack_disable = -1;
-static int hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator = -1;
-static int hf_dlmap_harq_ir_ctc_duration = -1;
-static int hf_dlmap_harq_ir_ctc_allocation_index = -1;
-static int hf_dlmap_harq_ir_ctc_period = -1;
-static int hf_dlmap_harq_ir_ctc_frame_offset = -1;
-static int hf_dlmap_harq_ir_cc_n_ack_channel = -1;
-static int hf_dlmap_harq_ir_cc_duration = -1;
-static int hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator = -1;
-static int hf_dlmap_harq_ir_cc_diuc = -1;
-static int hf_dlmap_harq_ir_cc_repetition_coding_indication = -1;
-static int hf_dlmap_harq_ir_cc_acid = -1;
-static int hf_dlmap_harq_ir_cc_ai_sn = -1;
-static int hf_dlmap_harq_ir_cc_spid = -1;
-static int hf_dlmap_harq_ir_cc_ack_disable = -1;
-static int hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator = -1;
-static int hf_dlmap_harq_ir_cc_allocation_index = -1;
-static int hf_dlmap_harq_ir_cc_period = -1;
-static int hf_dlmap_harq_ir_cc_frame_offset = -1;
-static int hf_dlmap_mimo_dl_chase_harq_n_ack_channel = -1;
-static int hf_dlmap_mimo_dl_chase_harq_mu_indicator = -1;
-static int hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator = -1;
-static int hf_dlmap_mimo_dl_chase_harq_ack_disable = -1;
-static int hf_dlmap_mimo_dl_chase_harq_duration = -1;
-static int hf_dlmap_mimo_dl_chase_harq_diuc = -1;
-static int hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication = -1;
-static int hf_dlmap_mimo_dl_chase_harq_acid = -1;
-static int hf_dlmap_mimo_dl_chase_harq_ai_sn = -1;
-static int hf_dlmap_mimo_dl_ir_harq_n_ack_channel = -1;
-static int hf_dlmap_mimo_dl_ir_harq_mu_indicator = -1;
-static int hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator = -1;
-static int hf_dlmap_mimo_dl_ir_harq_ack_disable = -1;
-static int hf_dlmap_mimo_dl_ir_harq_nsch = -1;
-static int hf_dlmap_mimo_dl_ir_harq_nep = -1;
-static int hf_dlmap_mimo_dl_ir_harq_spid = -1;
-static int hf_dlmap_mimo_dl_ir_harq_acid = -1;
-static int hf_dlmap_mimo_dl_ir_harq_ai_sn = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_ack_disable = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_duration = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_diuc = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_acid = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_ai_sn = -1;
-static int hf_dlmap_mimo_dl_ir_harq_cc_spid = -1;
-static int hf_dlmap_mimo_dl_stc_harq_n_ack_channel = -1;
-static int hf_dlmap_mimo_dl_stc_harq_tx_count = -1;
-static int hf_dlmap_mimo_dl_stc_harq_duration = -1;
-static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication = -1;
-static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset = -1;
-static int hf_dlmap_mimo_dl_stc_harq_ack_disable = -1;
-static int hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator = -1;
-static int hf_dlmap_mimo_dl_stc_harq_diuc = -1;
-static int hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication = -1;
-static int hf_dlmap_mimo_dl_stc_harq_acid = -1;
-static int hf_dlmap_mbs_map_extended_2_diuc = -1;
-static int hf_dlmap_mbs_map_mbs_zone_identifier = -1;
-static int hf_dlmap_mbs_map_macro_diversity_enhanced = -1;
-static int hf_dlmap_mbs_map_permutation = -1;
-static int hf_dlmap_mbs_map_dl_permbase = -1;
-static int hf_dlmap_mbs_map_prbs_id = -1;
-static int hf_dlmap_mbs_map_ofdma_symbol_offset = -1;
-static int hf_dlmap_mbs_map_diuc_change_indication = -1;
-static int hf_dlmap_mbs_map_boosting = -1;
-static int hf_dlmap_mbs_map_diuc = -1;
-static int hf_dlmap_mbs_map_num_subchannels = -1;
-static int hf_dlmap_mbs_map_num_ofdma_symbols = -1;
-static int hf_dlmap_mbs_map_repetition_coding_indication = -1;
-static int hf_dlmap_mbs_map_cid = -1;
-static int hf_dlmap_mbs_map_ofdma_symbols_offset = -1;
-static int hf_dlmap_mbs_map_subchannel_offset = -1;
-static int hf_dlmap_mbs_map_slc_3_indication = -1;
-static int hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset = -1;
-static int hf_dlmap_skip_extended_2_diuc = -1;
-static int hf_dlmap_skip_mode = -1;
-static int hf_dlmap_harq_dl_map_extended_2_diuc = -1;
-static int hf_dlmap_harq_dl_map_rcid_type = -1;
-static int hf_dlmap_harq_dl_map_boosting = -1;
-static int hf_dlmap_harq_dl_map_region_id_use_indicator = -1;
-static int hf_dlmap_harq_dl_map_ofdma_symbol_offset = -1;
-static int hf_dlmap_harq_dl_map_subchannel_offset = -1;
-static int hf_dlmap_harq_dl_map_number_of_ofdma_symbols = -1;
-static int hf_dlmap_harq_dl_map_number_of_subchannels = -1;
-static int hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator = -1;
-static int hf_dlmap_harq_dl_map_region_id = -1;
-static int hf_dlmap_harq_dl_map_mode = -1;
-static int hf_dlmap_harq_dl_map_sub_burst_ie_length = -1;
-static int hf_dlmap_harq_dl_map_reserved_mode = -1;
-static int hf_dlmap_harq_ack_bitmap_data = -1;
-static int hf_dlmap_enhanced_dl_map_extended_2_diuc = -1;
-static int hf_dlmap_enhanced_dl_map_num_assignment = -1;
-static int hf_dlmap_enhanced_dl_map_n_cid = -1;
-static int hf_dlmap_enhanced_dl_map_cid = -1;
-static int hf_dlmap_enhanced_dl_map_diuc = -1;
-static int hf_dlmap_enhanced_dl_map_boosting = -1;
-static int hf_dlmap_enhanced_dl_map_repetition_coding_indication = -1;
-static int hf_dlmap_enhanced_dl_map_region_id = -1;
-static int hf_dlmap_aas_sdma_dl_extended_2_diuc = -1;
-static int hf_dlmap_aas_sdma_dl_rcid_type = -1;
-static int hf_dlmap_aas_sdma_dl_num_burst_region = -1;
-static int hf_dlmap_aas_sdma_dl_ofdma_symbol_offset = -1;
-static int hf_dlmap_aas_sdma_dl_subchannel_offset = -1;
-static int hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols = -1;
-static int hf_dlmap_aas_sdma_dl_num_subchannels = -1;
-static int hf_dlmap_aas_sdma_dl_number_of_users = -1;
-static int hf_dlmap_aas_sdma_dl_encoding_mode = -1;
-static int hf_dlmap_aas_sdma_dl_cqich_allocation = -1;
-static int hf_dlmap_aas_sdma_dl_ackch_allocation = -1;
-static int hf_dlmap_aas_sdma_dl_pilot_pattern_modifier = -1;
-static int hf_dlmap_aas_sdma_dl_preamble_modifier_index = -1;
-static int hf_dlmap_aas_sdma_dl_pilot_pattern = -1;
-static int hf_dlmap_aas_sdma_dl_diuc = -1;
-static int hf_dlmap_aas_sdma_dl_repetition_coding_indication = -1;
-static int hf_dlmap_aas_sdma_dl_ack_ch_index = -1;
-static int hf_dlmap_aas_sdma_dl_acid = -1;
-static int hf_dlmap_aas_sdma_dl_ai_sn = -1;
-static int hf_dlmap_aas_sdma_dl_nep = -1;
-static int hf_dlmap_aas_sdma_dl_nsch = -1;
-static int hf_dlmap_aas_sdma_dl_spid = -1;
-static int hf_dlmap_aas_sdma_dl_allocation_index = -1;
-static int hf_dlmap_aas_sdma_dl_period = -1;
-static int hf_dlmap_aas_sdma_dl_frame_offset = -1;
-static int hf_dlmap_aas_sdma_dl_duration = -1;
-static int hf_dlmap_channel_measurement_channel_nr = -1;
-static int hf_dlmap_channel_measurement_ofdma_symbol_offset = -1;
-static int hf_dlmap_channel_measurement_cid = -1;
-static int hf_dlmap_stc_zone_ofdma_symbol_offset = -1;
-static int hf_dlmap_stc_zone_permutations = -1;
-static int hf_dlmap_stc_zone_use_all_sc_indicator = -1;
-static int hf_dlmap_stc_zone_stc = -1;
-static int hf_dlmap_stc_zone_matrix_indicator = -1;
-static int hf_dlmap_stc_zone_dl_permbase = -1;
-static int hf_dlmap_stc_zone_prbs_id = -1;
-static int hf_dlmap_stc_zone_amc_type = -1;
-static int hf_dlmap_stc_zone_midamble_presence = -1;
-static int hf_dlmap_stc_zone_midamble_boosting = -1;
-static int hf_dlmap_stc_zone_2_3_antenna_select = -1;
-static int hf_dlmap_stc_zone_dedicated_pilots = -1;
-static int hf_dlmap_aas_dl_ofdma_symbol_offset = -1;
-static int hf_dlmap_aas_dl_permutation = -1;
-static int hf_dlmap_aas_dl_dl_permbase = -1;
-static int hf_dlmap_aas_dl_downlink_preamble_config = -1;
-static int hf_dlmap_aas_dl_preamble_type = -1;
-static int hf_dlmap_aas_dl_prbs_id = -1;
-static int hf_dlmap_aas_dl_diversity_map = -1;
-static int hf_dlmap_data_location_another_bs_segment = -1;
-static int hf_dlmap_data_location_another_bs_used_subchannels = -1;
-static int hf_dlmap_data_location_another_bs_diuc = -1;
-static int hf_dlmap_data_location_another_bs_frame_advance = -1;
-static int hf_dlmap_data_location_another_bs_ofdma_symbol_offset = -1;
-static int hf_dlmap_data_location_another_bs_subchannel_offset = -1;
-static int hf_dlmap_data_location_another_bs_boosting = -1;
-static int hf_dlmap_data_location_another_bs_preamble_index = -1;
-static int hf_dlmap_data_location_another_bs_num_ofdma_symbols = -1;
-static int hf_dlmap_data_location_another_bs_num_subchannels = -1;
-static int hf_dlmap_data_location_another_bs_repetition_coding_indication = -1;
-static int hf_dlmap_data_location_another_bs_cid = -1;
-static int hf_dlmap_harq_map_pointer_diuc = -1;
-static int hf_dlmap_harq_map_pointer_num_slots = -1;
-static int hf_dlmap_harq_map_pointer_repetition_coding_indication = -1;
-static int hf_dlmap_harq_map_pointer_map_version = -1;
-static int hf_dlmap_harq_map_pointer_idle_users = -1;
-static int hf_dlmap_harq_map_pointer_sleep_users = -1;
-static int hf_dlmap_harq_map_pointer_cid_mask_length = -1;
-static int hf_dlmap_phymod_dl_preamble_modifier_type = -1;
-static int hf_dlmap_phymod_dl_preamble_frequency_shift_index = -1;
-static int hf_dlmap_phymod_dl_preamble_time_shift_index = -1;
-static int hf_dlmap_phymod_dl_pilot_pattern_modifier = -1;
-static int hf_dlmap_phymod_dl_pilot_pattern_index = -1;
-static int hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame = -1;
-static int hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update = -1;
-static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type = -1;
-static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_cid = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_diuc = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_segment = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_boosting = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_idcell = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_dl_permbase = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_prbs_id = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_used_subchannels = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_subchannel_offset = -1;
-static int hf_dlmap_dl_pusc_burst_allocation_num_subchannels = -1;
-static int hf_dlmap_pusc_asca_alloc_diuc = -1;
-static int hf_dlmap_pusc_asca_alloc_short_basic_cid = -1;
-static int hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset = -1;
-static int hf_dlmap_pusc_asca_alloc_subchannel_offset = -1;
-static int hf_dlmap_pusc_asca_alloc_num_ofdma_symbols = -1;
-static int hf_dlmap_pusc_asca_alloc_num_symbols = -1;
-static int hf_dlmap_pusc_asca_alloc_repetition_coding_information = -1;
-static int hf_dlmap_pusc_asca_alloc_permutation_id = -1;
-static int hf_dlmap_reduced_aas_num_ie = -1;
-static int hf_dlmap_reduced_aas_periodicity = -1;
-static int hf_dlmap_reduced_aas_cid_included = -1;
-static int hf_dlmap_reduced_aas_dcd_count_included = -1;
-static int hf_dlmap_reduced_aas_phy_modification_included = -1;
-static int hf_dlmap_reduced_aas_cqich_control_indicator = -1;
-static int hf_dlmap_reduced_aas_encoding_mode = -1;
-static int hf_dlmap_reduced_aas_separate_mcs_enabled = -1;
-static int hf_dlmap_reduced_aas_duration = -1;
-static int hf_dlmap_reduced_aas_diuc = -1;
-static int hf_dlmap_reduced_aas_repetition_coding_indication = -1;
-static int hf_dlmap_reduced_aas_cid = -1;
-static int hf_dlmap_reduced_aas_allocation_index = -1;
-static int hf_dlmap_reduced_aas_report_period = -1;
-static int hf_dlmap_reduced_aas_frame_offset = -1;
-static int hf_dlmap_reduced_aas_report_duration = -1;
-static int hf_dlmap_reduced_aas_cqi_measurement_type = -1;
-static int hf_dlmap_reduced_aas_dcd_count = -1;
-static int hf_dlmap_reduced_aas_preamble_select = -1;
-static int hf_dlmap_reduced_aas_preamble_shift_index = -1;
-static int hf_dlmap_reduced_aas_pilot_pattern_modifier = -1;
-static int hf_dlmap_reduced_aas_pilot_pattern_index = -1;
-static int hf_dlmap_reduced_aas_dl_frame_offset = -1;
-static int hf_dlmap_reduced_aas_zone_symbol_offset = -1;
-static int hf_dlmap_reduced_aas_ofdma_symbol_offset = -1;
-static int hf_dlmap_reduced_aas_subchannel_offset = -1;
-static int hf_dlmap_reduced_aas_num_ofdma_triple_symbol = -1;
-static int hf_dlmap_reduced_aas_num_subchannels = -1;
-static int hf_dlmap_reduced_aas_num_ofdma_symbols = -1;
-static int hf_dlmap_reduced_aas_diuc_nep = -1;
-static int hf_dlmap_reduced_aas_dl_harq_ack_bitmap = -1;
-static int hf_dlmap_reduced_aas_ack_allocation_index = -1;
-static int hf_dlmap_reduced_aas_acid = -1;
-static int hf_dlmap_reduced_aas_ai_sn = -1;
-static int hf_dlmap_reduced_aas_nsch = -1;
-static int hf_dlmap_reduced_aas_spid = -1;
-
-
-
-static expert_field ei_dlmap_not_implemented = EI_INIT;
-static expert_field ei_crc16 = EI_INIT;
-static expert_field ei_mac_header_compress_dlmap_crc = EI_INIT;
-static expert_field ei_mac_header_invalid_length = EI_INIT;
+static int hf_dlmap_rcid_ie_cid;
+static int hf_dlmap_rcid_ie_prefix;
+static int hf_dlmap_rcid_ie_cid11;
+static int hf_dlmap_rcid_ie_cid7;
+static int hf_dlmap_rcid_ie_cid3;
+static int hf_dlmap_dedicated_dl_control_length;
+static int hf_dlmap_dedicated_dl_control_control_header;
+static int hf_dlmap_dedicated_dl_control_num_sdma_layers;
+static int hf_dlmap_dedicated_mimo_dl_control_length;
+static int hf_dlmap_dedicated_mimo_dl_control_control_header_mimo_control_info;
+static int hf_dlmap_dedicated_mimo_dl_control_control_header_cqi_control_info;
+static int hf_dlmap_dedicated_mimo_dl_control_control_header_closed_mimo_control_info;
+static int hf_dlmap_dedicated_mimo_dl_control_n_layer;
+static int hf_dlmap_dedicated_mimo_dl_control_matrix;
+static int hf_dlmap_dedicated_mimo_dl_control_num_beamformed_streams;
+static int hf_dlmap_dedicated_mimo_dl_control_period;
+static int hf_dlmap_dedicated_mimo_dl_control_frame_offset;
+static int hf_dlmap_dedicated_mimo_dl_control_duration;
+static int hf_dlmap_dedicated_mimo_dl_control_allocation_index;
+static int hf_dlmap_dedicated_mimo_dl_control_cqich_num;
+static int hf_dlmap_dedicated_mimo_dl_control_feedback_type;
+static int hf_dlmap_dedicated_mimo_dl_control_antenna_grouping_index;
+static int hf_dlmap_dedicated_mimo_dl_control_num_stream;
+static int hf_dlmap_dedicated_mimo_dl_control_antenna_selection_index;
+static int hf_dlmap_dedicated_mimo_dl_control_codebook_precoding_index;
+static int hf_dlmap_n_sub_burst_isi;
+static int hf_dlmap_harq_chase_n_ack_channel;
+static int hf_dlmap_harq_chase_duration;
+static int hf_dlmap_harq_chase_sub_burst_diuc_indicator;
+static int hf_dlmap_reserved_uint;
+static int hf_dlmap_harq_chase_diuc;
+static int hf_dlmap_harq_chase_repetition_coding_indication;
+static int hf_dlmap_harq_chase_acid;
+static int hf_dlmap_harq_chase_ai_sn;
+static int hf_dlmap_harq_chase_ack_disable;
+static int hf_dlmap_harq_chase_dedicated_dl_control_indicator;
+static int hf_dlmap_harq_chase_allocation_index;
+static int hf_dlmap_harq_chase_period;
+static int hf_dlmap_harq_chase_frame_offset;
+static int hf_dlmap_harq_ir_ctc_n_ack_channel;
+static int hf_dlmap_harq_ir_ctc_nep;
+static int hf_dlmap_harq_ir_ctc_nsch;
+static int hf_dlmap_harq_ir_ctc_spid;
+static int hf_dlmap_harq_ir_ctc_acid;
+static int hf_dlmap_harq_ir_ctc_ai_sn;
+static int hf_dlmap_harq_ir_ctc_ack_disable;
+static int hf_dlmap_harq_ir_ctc_dedicated_dl_control_indicator;
+static int hf_dlmap_harq_ir_ctc_duration;
+static int hf_dlmap_harq_ir_ctc_allocation_index;
+static int hf_dlmap_harq_ir_ctc_period;
+static int hf_dlmap_harq_ir_ctc_frame_offset;
+static int hf_dlmap_harq_ir_cc_n_ack_channel;
+static int hf_dlmap_harq_ir_cc_duration;
+static int hf_dlmap_harq_ir_cc_sub_burst_diuc_indicator;
+static int hf_dlmap_harq_ir_cc_diuc;
+static int hf_dlmap_harq_ir_cc_repetition_coding_indication;
+static int hf_dlmap_harq_ir_cc_acid;
+static int hf_dlmap_harq_ir_cc_ai_sn;
+static int hf_dlmap_harq_ir_cc_spid;
+static int hf_dlmap_harq_ir_cc_ack_disable;
+static int hf_dlmap_harq_ir_cc_dedicated_dl_control_indicator;
+static int hf_dlmap_harq_ir_cc_allocation_index;
+static int hf_dlmap_harq_ir_cc_period;
+static int hf_dlmap_harq_ir_cc_frame_offset;
+static int hf_dlmap_mimo_dl_chase_harq_n_ack_channel;
+static int hf_dlmap_mimo_dl_chase_harq_mu_indicator;
+static int hf_dlmap_mimo_dl_chase_harq_dedicated_mimo_dl_control_indicator;
+static int hf_dlmap_mimo_dl_chase_harq_ack_disable;
+static int hf_dlmap_mimo_dl_chase_harq_duration;
+static int hf_dlmap_mimo_dl_chase_harq_diuc;
+static int hf_dlmap_mimo_dl_chase_harq_repetition_coding_indication;
+static int hf_dlmap_mimo_dl_chase_harq_acid;
+static int hf_dlmap_mimo_dl_chase_harq_ai_sn;
+static int hf_dlmap_mimo_dl_ir_harq_n_ack_channel;
+static int hf_dlmap_mimo_dl_ir_harq_mu_indicator;
+static int hf_dlmap_mimo_dl_ir_harq_dedicated_mimo_dl_control_indicator;
+static int hf_dlmap_mimo_dl_ir_harq_ack_disable;
+static int hf_dlmap_mimo_dl_ir_harq_nsch;
+static int hf_dlmap_mimo_dl_ir_harq_nep;
+static int hf_dlmap_mimo_dl_ir_harq_spid;
+static int hf_dlmap_mimo_dl_ir_harq_acid;
+static int hf_dlmap_mimo_dl_ir_harq_ai_sn;
+static int hf_dlmap_mimo_dl_ir_harq_cc_n_ack_channel;
+static int hf_dlmap_mimo_dl_ir_harq_cc_mu_indicator;
+static int hf_dlmap_mimo_dl_ir_harq_cc_dedicated_mimo_dl_control_indicator;
+static int hf_dlmap_mimo_dl_ir_harq_cc_ack_disable;
+static int hf_dlmap_mimo_dl_ir_harq_cc_duration;
+static int hf_dlmap_mimo_dl_ir_harq_cc_diuc;
+static int hf_dlmap_mimo_dl_ir_harq_cc_repetition_coding_indication;
+static int hf_dlmap_mimo_dl_ir_harq_cc_acid;
+static int hf_dlmap_mimo_dl_ir_harq_cc_ai_sn;
+static int hf_dlmap_mimo_dl_ir_harq_cc_spid;
+static int hf_dlmap_mimo_dl_stc_harq_n_ack_channel;
+static int hf_dlmap_mimo_dl_stc_harq_tx_count;
+static int hf_dlmap_mimo_dl_stc_harq_duration;
+static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset_indication;
+static int hf_dlmap_mimo_dl_stc_harq_sub_burst_offset;
+static int hf_dlmap_mimo_dl_stc_harq_ack_disable;
+static int hf_dlmap_mimo_dl_stc_harq_dedicated_mimo_dl_control_indicator;
+static int hf_dlmap_mimo_dl_stc_harq_diuc;
+static int hf_dlmap_mimo_dl_stc_harq_repetition_coding_indication;
+static int hf_dlmap_mimo_dl_stc_harq_acid;
+static int hf_dlmap_mbs_map_extended_2_diuc;
+static int hf_dlmap_mbs_map_mbs_zone_identifier;
+static int hf_dlmap_mbs_map_macro_diversity_enhanced;
+static int hf_dlmap_mbs_map_permutation;
+static int hf_dlmap_mbs_map_dl_permbase;
+static int hf_dlmap_mbs_map_prbs_id;
+static int hf_dlmap_mbs_map_ofdma_symbol_offset;
+static int hf_dlmap_mbs_map_diuc_change_indication;
+static int hf_dlmap_mbs_map_boosting;
+static int hf_dlmap_mbs_map_diuc;
+static int hf_dlmap_mbs_map_num_subchannels;
+static int hf_dlmap_mbs_map_num_ofdma_symbols;
+static int hf_dlmap_mbs_map_repetition_coding_indication;
+static int hf_dlmap_mbs_map_cid;
+static int hf_dlmap_mbs_map_ofdma_symbols_offset;
+static int hf_dlmap_mbs_map_subchannel_offset;
+static int hf_dlmap_mbs_map_slc_3_indication;
+static int hf_dlmap_mbs_map_next_mbs_map_ie_frame_offset;
+static int hf_dlmap_skip_extended_2_diuc;
+static int hf_dlmap_skip_mode;
+static int hf_dlmap_harq_dl_map_extended_2_diuc;
+static int hf_dlmap_harq_dl_map_rcid_type;
+static int hf_dlmap_harq_dl_map_boosting;
+static int hf_dlmap_harq_dl_map_region_id_use_indicator;
+static int hf_dlmap_harq_dl_map_ofdma_symbol_offset;
+static int hf_dlmap_harq_dl_map_subchannel_offset;
+static int hf_dlmap_harq_dl_map_number_of_ofdma_symbols;
+static int hf_dlmap_harq_dl_map_number_of_subchannels;
+static int hf_dlmap_harq_dl_map_rectangular_sub_burst_indicator;
+static int hf_dlmap_harq_dl_map_region_id;
+static int hf_dlmap_harq_dl_map_mode;
+static int hf_dlmap_harq_dl_map_sub_burst_ie_length;
+static int hf_dlmap_harq_dl_map_reserved_mode;
+static int hf_dlmap_harq_ack_bitmap_data;
+static int hf_dlmap_enhanced_dl_map_extended_2_diuc;
+static int hf_dlmap_enhanced_dl_map_num_assignment;
+static int hf_dlmap_enhanced_dl_map_n_cid;
+static int hf_dlmap_enhanced_dl_map_cid;
+static int hf_dlmap_enhanced_dl_map_diuc;
+static int hf_dlmap_enhanced_dl_map_boosting;
+static int hf_dlmap_enhanced_dl_map_repetition_coding_indication;
+static int hf_dlmap_enhanced_dl_map_region_id;
+static int hf_dlmap_aas_sdma_dl_extended_2_diuc;
+static int hf_dlmap_aas_sdma_dl_rcid_type;
+static int hf_dlmap_aas_sdma_dl_num_burst_region;
+static int hf_dlmap_aas_sdma_dl_ofdma_symbol_offset;
+static int hf_dlmap_aas_sdma_dl_subchannel_offset;
+static int hf_dlmap_aas_sdma_dl_num_ofdma_triple_symbols;
+static int hf_dlmap_aas_sdma_dl_num_subchannels;
+static int hf_dlmap_aas_sdma_dl_number_of_users;
+static int hf_dlmap_aas_sdma_dl_encoding_mode;
+static int hf_dlmap_aas_sdma_dl_cqich_allocation;
+static int hf_dlmap_aas_sdma_dl_ackch_allocation;
+static int hf_dlmap_aas_sdma_dl_pilot_pattern_modifier;
+static int hf_dlmap_aas_sdma_dl_preamble_modifier_index;
+static int hf_dlmap_aas_sdma_dl_pilot_pattern;
+static int hf_dlmap_aas_sdma_dl_diuc;
+static int hf_dlmap_aas_sdma_dl_repetition_coding_indication;
+static int hf_dlmap_aas_sdma_dl_ack_ch_index;
+static int hf_dlmap_aas_sdma_dl_acid;
+static int hf_dlmap_aas_sdma_dl_ai_sn;
+static int hf_dlmap_aas_sdma_dl_nep;
+static int hf_dlmap_aas_sdma_dl_nsch;
+static int hf_dlmap_aas_sdma_dl_spid;
+static int hf_dlmap_aas_sdma_dl_allocation_index;
+static int hf_dlmap_aas_sdma_dl_period;
+static int hf_dlmap_aas_sdma_dl_frame_offset;
+static int hf_dlmap_aas_sdma_dl_duration;
+static int hf_dlmap_channel_measurement_channel_nr;
+static int hf_dlmap_channel_measurement_ofdma_symbol_offset;
+static int hf_dlmap_channel_measurement_cid;
+static int hf_dlmap_stc_zone_ofdma_symbol_offset;
+static int hf_dlmap_stc_zone_permutations;
+static int hf_dlmap_stc_zone_use_all_sc_indicator;
+static int hf_dlmap_stc_zone_stc;
+static int hf_dlmap_stc_zone_matrix_indicator;
+static int hf_dlmap_stc_zone_dl_permbase;
+static int hf_dlmap_stc_zone_prbs_id;
+static int hf_dlmap_stc_zone_amc_type;
+static int hf_dlmap_stc_zone_midamble_presence;
+static int hf_dlmap_stc_zone_midamble_boosting;
+static int hf_dlmap_stc_zone_2_3_antenna_select;
+static int hf_dlmap_stc_zone_dedicated_pilots;
+static int hf_dlmap_aas_dl_ofdma_symbol_offset;
+static int hf_dlmap_aas_dl_permutation;
+static int hf_dlmap_aas_dl_dl_permbase;
+static int hf_dlmap_aas_dl_downlink_preamble_config;
+static int hf_dlmap_aas_dl_preamble_type;
+static int hf_dlmap_aas_dl_prbs_id;
+static int hf_dlmap_aas_dl_diversity_map;
+static int hf_dlmap_data_location_another_bs_segment;
+static int hf_dlmap_data_location_another_bs_used_subchannels;
+static int hf_dlmap_data_location_another_bs_diuc;
+static int hf_dlmap_data_location_another_bs_frame_advance;
+static int hf_dlmap_data_location_another_bs_ofdma_symbol_offset;
+static int hf_dlmap_data_location_another_bs_subchannel_offset;
+static int hf_dlmap_data_location_another_bs_boosting;
+static int hf_dlmap_data_location_another_bs_preamble_index;
+static int hf_dlmap_data_location_another_bs_num_ofdma_symbols;
+static int hf_dlmap_data_location_another_bs_num_subchannels;
+static int hf_dlmap_data_location_another_bs_repetition_coding_indication;
+static int hf_dlmap_data_location_another_bs_cid;
+static int hf_dlmap_harq_map_pointer_diuc;
+static int hf_dlmap_harq_map_pointer_num_slots;
+static int hf_dlmap_harq_map_pointer_repetition_coding_indication;
+static int hf_dlmap_harq_map_pointer_map_version;
+static int hf_dlmap_harq_map_pointer_idle_users;
+static int hf_dlmap_harq_map_pointer_sleep_users;
+static int hf_dlmap_harq_map_pointer_cid_mask_length;
+static int hf_dlmap_phymod_dl_preamble_modifier_type;
+static int hf_dlmap_phymod_dl_preamble_frequency_shift_index;
+static int hf_dlmap_phymod_dl_preamble_time_shift_index;
+static int hf_dlmap_phymod_dl_pilot_pattern_modifier;
+static int hf_dlmap_phymod_dl_pilot_pattern_index;
+static int hf_dlmap_broadcast_ctrl_ptr_dcd_ucd_transmission_frame;
+static int hf_dlmap_broadcast_ctrl_ptr_skip_broadcast_system_update;
+static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_type;
+static int hf_dlmap_broadcast_ctrl_ptr_broadcast_system_update_transmission_frame;
+static int hf_dlmap_dl_pusc_burst_allocation_cid;
+static int hf_dlmap_dl_pusc_burst_allocation_diuc;
+static int hf_dlmap_dl_pusc_burst_allocation_segment;
+static int hf_dlmap_dl_pusc_burst_allocation_boosting;
+static int hf_dlmap_dl_pusc_burst_allocation_idcell;
+static int hf_dlmap_dl_pusc_burst_allocation_dl_permbase;
+static int hf_dlmap_dl_pusc_burst_allocation_prbs_id;
+static int hf_dlmap_dl_pusc_burst_allocation_repetition_coding_indication;
+static int hf_dlmap_dl_pusc_burst_allocation_used_subchannels;
+static int hf_dlmap_dl_pusc_burst_allocation_ofdma_symbol_offset;
+static int hf_dlmap_dl_pusc_burst_allocation_num_ofdma_symbols;
+static int hf_dlmap_dl_pusc_burst_allocation_subchannel_offset;
+static int hf_dlmap_dl_pusc_burst_allocation_num_subchannels;
+static int hf_dlmap_pusc_asca_alloc_diuc;
+static int hf_dlmap_pusc_asca_alloc_short_basic_cid;
+static int hf_dlmap_pusc_asca_alloc_ofdma_symbol_offset;
+static int hf_dlmap_pusc_asca_alloc_subchannel_offset;
+static int hf_dlmap_pusc_asca_alloc_num_ofdma_symbols;
+static int hf_dlmap_pusc_asca_alloc_num_symbols;
+static int hf_dlmap_pusc_asca_alloc_repetition_coding_information;
+static int hf_dlmap_pusc_asca_alloc_permutation_id;
+static int hf_dlmap_reduced_aas_num_ie;
+static int hf_dlmap_reduced_aas_periodicity;
+static int hf_dlmap_reduced_aas_cid_included;
+static int hf_dlmap_reduced_aas_dcd_count_included;
+static int hf_dlmap_reduced_aas_phy_modification_included;
+static int hf_dlmap_reduced_aas_cqich_control_indicator;
+static int hf_dlmap_reduced_aas_encoding_mode;
+static int hf_dlmap_reduced_aas_separate_mcs_enabled;
+static int hf_dlmap_reduced_aas_duration;
+static int hf_dlmap_reduced_aas_diuc;
+static int hf_dlmap_reduced_aas_repetition_coding_indication;
+static int hf_dlmap_reduced_aas_cid;
+static int hf_dlmap_reduced_aas_allocation_index;
+static int hf_dlmap_reduced_aas_report_period;
+static int hf_dlmap_reduced_aas_frame_offset;
+static int hf_dlmap_reduced_aas_report_duration;
+static int hf_dlmap_reduced_aas_cqi_measurement_type;
+static int hf_dlmap_reduced_aas_dcd_count;
+static int hf_dlmap_reduced_aas_preamble_select;
+static int hf_dlmap_reduced_aas_preamble_shift_index;
+static int hf_dlmap_reduced_aas_pilot_pattern_modifier;
+static int hf_dlmap_reduced_aas_pilot_pattern_index;
+static int hf_dlmap_reduced_aas_dl_frame_offset;
+static int hf_dlmap_reduced_aas_zone_symbol_offset;
+static int hf_dlmap_reduced_aas_ofdma_symbol_offset;
+static int hf_dlmap_reduced_aas_subchannel_offset;
+static int hf_dlmap_reduced_aas_num_ofdma_triple_symbol;
+static int hf_dlmap_reduced_aas_num_subchannels;
+static int hf_dlmap_reduced_aas_num_ofdma_symbols;
+static int hf_dlmap_reduced_aas_diuc_nep;
+static int hf_dlmap_reduced_aas_dl_harq_ack_bitmap;
+static int hf_dlmap_reduced_aas_ack_allocation_index;
+static int hf_dlmap_reduced_aas_acid;
+static int hf_dlmap_reduced_aas_ai_sn;
+static int hf_dlmap_reduced_aas_nsch;
+static int hf_dlmap_reduced_aas_spid;
+
+
+
+static expert_field ei_dlmap_not_implemented;
+static expert_field ei_crc16;
+static expert_field ei_mac_header_compress_dlmap_crc;
+static expert_field ei_mac_header_invalid_length;
 
 /* Copied and renamed from proto.c because global value_strings don't work for plugins */
 static const value_string plugin_proto_checksum_vals[] = {
diff --git a/plugins/epan/wimax/msg_dreg.c b/plugins/epan/wimax/msg_dreg.c
index 8c0cd650cf..71f9316f1d 100644
--- a/plugins/epan/wimax/msg_dreg.c
+++ b/plugins/epan/wimax/msg_dreg.c
@@ -36,10 +36,10 @@ static void dissect_dreg_tlv(proto_tree *dreg_tree, gint tlv_type, tvbuff_t *tvb
 static int dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
 static int dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
 
-static gint proto_mac_mgmt_msg_dreg_req_decoder = -1;
-static gint proto_mac_mgmt_msg_dreg_cmd_decoder = -1;
+static gint proto_mac_mgmt_msg_dreg_req_decoder;
+static gint proto_mac_mgmt_msg_dreg_cmd_decoder;
 
-static gint ett_mac_mgmt_msg_dreg_decoder = -1;
+static gint ett_mac_mgmt_msg_dreg_decoder;
 
 /* Setup protocol subtree array */
 static gint *ett[] =
@@ -48,29 +48,29 @@ static gint *ett[] =
 };
 
 /* DREG fields */
-/* static gint hf_ack_type_reserved = -1; */
-static gint hf_dreg_cmd_action = -1;
-static gint hf_dreg_cmd_action_cor2 = -1;
-static gint hf_dreg_cmd_reserved = -1;
-static gint hf_dreg_paging_cycle = -1;
-static gint hf_dreg_paging_offset = -1;
-static gint hf_dreg_paging_group_id = -1;
-static gint hf_dreg_req_duration = -1;
-static gint hf_paging_controller_id = -1;
-static gint hf_mac_hash_skip_threshold = -1;
-static gint hf_dreg_paging_cycle_request = -1;
-static gint hf_dreg_retain_ms_service_sbc = -1;
-static gint hf_dreg_retain_ms_service_pkm = -1;
-static gint hf_dreg_retain_ms_service_reg = -1;
-static gint hf_dreg_retain_ms_service_network_address = -1;
-static gint hf_dreg_retain_ms_service_tod = -1;
-static gint hf_dreg_retain_ms_service_tftp = -1;
-static gint hf_dreg_retain_ms_service_full_service = -1;
-static gint hf_dreg_consider_paging_pref = -1;
-static gint hf_tlv_value = -1;
-static gint hf_dreg_req_action = -1;
-static gint hf_dreg_req_reserved = -1;
-static gint hf_dreg_invalid_tlv = -1;
+/* static gint hf_ack_type_reserved; */
+static gint hf_dreg_cmd_action;
+static gint hf_dreg_cmd_action_cor2;
+static gint hf_dreg_cmd_reserved;
+static gint hf_dreg_paging_cycle;
+static gint hf_dreg_paging_offset;
+static gint hf_dreg_paging_group_id;
+static gint hf_dreg_req_duration;
+static gint hf_paging_controller_id;
+static gint hf_mac_hash_skip_threshold;
+static gint hf_dreg_paging_cycle_request;
+static gint hf_dreg_retain_ms_service_sbc;
+static gint hf_dreg_retain_ms_service_pkm;
+static gint hf_dreg_retain_ms_service_reg;
+static gint hf_dreg_retain_ms_service_network_address;
+static gint hf_dreg_retain_ms_service_tod;
+static gint hf_dreg_retain_ms_service_tftp;
+static gint hf_dreg_retain_ms_service_full_service;
+static gint hf_dreg_consider_paging_pref;
+static gint hf_tlv_value;
+static gint hf_dreg_req_action;
+static gint hf_dreg_req_reserved;
+static gint hf_dreg_invalid_tlv;
 
 /* STRING RESOURCES */
 static const value_string vals_dreg_req_code[] = {
diff --git a/plugins/epan/wimax/msg_dsa.c b/plugins/epan/wimax/msg_dsa.c
index 72280baac9..4f8c650e2c 100644
--- a/plugins/epan/wimax/msg_dsa.c
+++ b/plugins/epan/wimax/msg_dsa.c
@@ -31,14 +31,14 @@ static dissector_handle_t dsa_req_handle;
 static dissector_handle_t dsa_rsp_handle;
 static dissector_handle_t dsa_ack_handle;
 
-static gint proto_mac_mgmt_msg_dsa_decoder = -1;
-static gint ett_mac_mgmt_msg_dsa_req_decoder = -1;
-static gint ett_mac_mgmt_msg_dsa_rsp_decoder = -1;
-static gint ett_mac_mgmt_msg_dsa_ack_decoder = -1;
+static gint proto_mac_mgmt_msg_dsa_decoder;
+static gint ett_mac_mgmt_msg_dsa_req_decoder;
+static gint ett_mac_mgmt_msg_dsa_rsp_decoder;
+static gint ett_mac_mgmt_msg_dsa_ack_decoder;
 
 /* fix fields */
-static gint hf_dsa_transaction_id = -1;
-static gint hf_dsa_confirmation_code = -1;
+static gint hf_dsa_transaction_id;
+static gint hf_dsa_confirmation_code;
 
 static int dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/plugins/epan/wimax/msg_dsc.c b/plugins/epan/wimax/msg_dsc.c
index 8f681965fe..e196621d8d 100644
--- a/plugins/epan/wimax/msg_dsc.c
+++ b/plugins/epan/wimax/msg_dsc.c
@@ -31,14 +31,14 @@ static dissector_handle_t dsc_req_handle;
 static dissector_handle_t dsc_rsp_handle;
 static dissector_handle_t dsc_ack_handle;
 
-static gint proto_mac_mgmt_msg_dsc_decoder = -1;
-static gint ett_mac_mgmt_msg_dsc_req_decoder = -1;
-static gint ett_mac_mgmt_msg_dsc_rsp_decoder = -1;
-static gint ett_mac_mgmt_msg_dsc_ack_decoder = -1;
+static gint proto_mac_mgmt_msg_dsc_decoder;
+static gint ett_mac_mgmt_msg_dsc_req_decoder;
+static gint ett_mac_mgmt_msg_dsc_rsp_decoder;
+static gint ett_mac_mgmt_msg_dsc_ack_decoder;
 
 /* fix fields */
-static gint hf_dsc_transaction_id = -1;
-static gint hf_dsc_confirmation_code = -1;
+static gint hf_dsc_transaction_id;
+static gint hf_dsc_confirmation_code;
 
 
 static int dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/plugins/epan/wimax/msg_dsd.c b/plugins/epan/wimax/msg_dsd.c
index 6f7c4c072a..6433336caa 100644
--- a/plugins/epan/wimax/msg_dsd.c
+++ b/plugins/epan/wimax/msg_dsd.c
@@ -31,20 +31,20 @@ void proto_reg_handoff_mac_mgmt_msg_dsd(void);
 static dissector_handle_t dsd_req_handle;
 static dissector_handle_t dsd_rsp_handle;
 
-static gint proto_mac_mgmt_msg_dsd_decoder = -1;
-static gint ett_mac_mgmt_msg_dsd_req_decoder = -1;
-static gint ett_mac_mgmt_msg_dsd_rsp_decoder = -1;
-/* static gint ett_dsd_ul_sfe_decoder = -1; */
-/* static gint ett_dsd_dl_sfe_decoder = -1; */
-/* static gint ett_dsd_hmac_tuple = -1;     */
-/* static gint ett_dsd_cmac_tuple = -1;     */
+static gint proto_mac_mgmt_msg_dsd_decoder;
+static gint ett_mac_mgmt_msg_dsd_req_decoder;
+static gint ett_mac_mgmt_msg_dsd_rsp_decoder;
+/* static gint ett_dsd_ul_sfe_decoder; */
+/* static gint ett_dsd_dl_sfe_decoder; */
+/* static gint ett_dsd_hmac_tuple;     */
+/* static gint ett_dsd_cmac_tuple;     */
 
 /* fix fields */
-static gint hf_dsd_transaction_id = -1;
-static gint hf_dsd_service_flow_id = -1;
-static gint hf_dsd_confirmation_code = -1;
-static gint hf_dsd_invalid_tlv = -1;
-static gint hf_dsd_unknown_type = -1;
+static gint hf_dsd_transaction_id;
+static gint hf_dsd_service_flow_id;
+static gint hf_dsd_confirmation_code;
+static gint hf_dsd_invalid_tlv;
+static gint hf_dsd_unknown_type;
 
 
 static int dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/plugins/epan/wimax/msg_dsx_rvd.c b/plugins/epan/wimax/msg_dsx_rvd.c
index 4362a9efa7..3ae81b4dbe 100644
--- a/plugins/epan/wimax/msg_dsx_rvd.c
+++ b/plugins/epan/wimax/msg_dsx_rvd.c
@@ -24,12 +24,12 @@ void proto_reg_handoff_mac_mgmt_msg_dsx_rvd(void);
 
 static dissector_handle_t dsx_rvd_handle;
 
-static gint proto_mac_mgmt_msg_dsx_rvd_decoder = -1;
-static gint ett_mac_mgmt_msg_dsx_rvd_decoder = -1;
+static gint proto_mac_mgmt_msg_dsx_rvd_decoder;
+static gint ett_mac_mgmt_msg_dsx_rvd_decoder;
 
 /* fix fields */
-static gint hf_dsx_rvd_transaction_id = -1;
-static gint hf_dsx_rvd_confirmation_code = -1;
+static gint hf_dsx_rvd_transaction_id;
+static gint hf_dsx_rvd_confirmation_code;
 
 
 /* Decode DSX-RVD messages. */
diff --git a/plugins/epan/wimax/msg_fpc.c b/plugins/epan/wimax/msg_fpc.c
index 42b50141c5..e1e2bfa999 100644
--- a/plugins/epan/wimax/msg_fpc.c
+++ b/plugins/epan/wimax/msg_fpc.c
@@ -25,16 +25,16 @@ void proto_reg_handoff_mac_mgmt_msg_fpc(void);
 
 static dissector_handle_t fpc_handle;
 
-static gint proto_mac_mgmt_msg_fpc_decoder = -1;
+static gint proto_mac_mgmt_msg_fpc_decoder;
 
-static gint ett_mac_mgmt_msg_fpc_decoder = -1;
+static gint ett_mac_mgmt_msg_fpc_decoder;
 
 /* FPC fields */
-static gint hf_fpc_number_of_stations = -1;
-static gint hf_fpc_basic_cid = -1;
-static gint hf_fpc_power_adjust = -1;
-static gint hf_fpc_power_measurement_frame = -1;
-/* static gint hf_fpc_invalid_tlv = -1; */
+static gint hf_fpc_number_of_stations;
+static gint hf_fpc_basic_cid;
+static gint hf_fpc_power_adjust;
+static gint hf_fpc_power_measurement_frame;
+/* static gint hf_fpc_invalid_tlv; */
 
 
 /* Decode FPC messages. */
diff --git a/plugins/epan/wimax/msg_pkm.c b/plugins/epan/wimax/msg_pkm.c
index b91f2601a6..37e61d372b 100644
--- a/plugins/epan/wimax/msg_pkm.c
+++ b/plugins/epan/wimax/msg_pkm.c
@@ -32,9 +32,9 @@ static dissector_handle_t mac_mgmt_msg_pkm_req_handle;
 static dissector_handle_t mac_mgmt_msg_pkm_rsp_handle;
 
 
-static gint proto_mac_mgmt_msg_pkm_decoder = -1;
-static gint ett_mac_mgmt_msg_pkm_req_decoder = -1;
-static gint ett_mac_mgmt_msg_pkm_rsp_decoder = -1;
+static gint proto_mac_mgmt_msg_pkm_decoder;
+static gint ett_mac_mgmt_msg_pkm_req_decoder;
+static gint ett_mac_mgmt_msg_pkm_rsp_decoder;
 
 static const value_string vals_pkm_msg_code[] =
 {
@@ -70,8 +70,8 @@ static const value_string vals_pkm_msg_code[] =
 };
 
 /* fix fields */
-static gint hf_pkm_msg_code = -1;
-static gint hf_pkm_msg_pkm_id = -1;
+static gint hf_pkm_msg_code;
+static gint hf_pkm_msg_pkm_id;
 
 
 /* Wimax Mac PKM-REQ Message Dissector */
diff --git a/plugins/epan/wimax/msg_pmc.c b/plugins/epan/wimax/msg_pmc.c
index 7fe16e041e..c11c709a07 100644
--- a/plugins/epan/wimax/msg_pmc.c
+++ b/plugins/epan/wimax/msg_pmc.c
@@ -31,10 +31,10 @@ static int dissect_mac_mgmt_msg_pmc_rsp_decoder(tvbuff_t *tvb, packet_info *pinf
 static dissector_handle_t pmc_req_handle;
 static dissector_handle_t pmc_rsp_handle;
 
-static gint proto_mac_mgmt_msg_pmc_req_decoder = -1;
-static gint proto_mac_mgmt_msg_pmc_rsp_decoder = -1;
+static gint proto_mac_mgmt_msg_pmc_req_decoder;
+static gint proto_mac_mgmt_msg_pmc_rsp_decoder;
 
-static gint ett_mac_mgmt_msg_pmc_decoder = -1;
+static gint ett_mac_mgmt_msg_pmc_decoder;
 
 /* Setup protocol subtree array */
 static gint *ett[] =
@@ -43,14 +43,14 @@ static gint *ett[] =
 };
 
 /* PMC fields */
-static gint hf_pmc_req_pwr_control_mode_change = -1;
-static gint hf_pmc_req_pwr_control_mode_change_cor2 = -1;
-static gint hf_pmc_req_tx_power_level = -1;
-static gint hf_pmc_req_confirmation = -1;
-static gint hf_pmc_req_reserved = -1;
-static gint hf_pmc_rsp_start_frame = -1;
-static gint hf_pmc_rsp_power_adjust = -1;
-static gint hf_pmc_rsp_offset_BS_per_MS = -1;
+static gint hf_pmc_req_pwr_control_mode_change;
+static gint hf_pmc_req_pwr_control_mode_change_cor2;
+static gint hf_pmc_req_tx_power_level;
+static gint hf_pmc_req_confirmation;
+static gint hf_pmc_req_reserved;
+static gint hf_pmc_rsp_start_frame;
+static gint hf_pmc_rsp_power_adjust;
+static gint hf_pmc_rsp_offset_BS_per_MS;
 
 /* STRING RESOURCES */
 static const value_string vals_pmc_req_pwr[] = {
diff --git a/plugins/epan/wimax/msg_prc_lt_ctrl.c b/plugins/epan/wimax/msg_prc_lt_ctrl.c
index f8b5b97f85..084d5ba0c3 100644
--- a/plugins/epan/wimax/msg_prc_lt_ctrl.c
+++ b/plugins/epan/wimax/msg_prc_lt_ctrl.c
@@ -25,14 +25,14 @@ void proto_reg_handoff_mac_mgmt_msg_prc_lt_ctrl(void);
 
 static dissector_handle_t prc_handle;
 
-static gint proto_mac_mgmt_msg_prc_lt_ctrl_decoder = -1;
+static gint proto_mac_mgmt_msg_prc_lt_ctrl_decoder;
 
-static gint ett_mac_mgmt_msg_prc_lt_ctrl_decoder = -1;
+static gint ett_mac_mgmt_msg_prc_lt_ctrl_decoder;
 
 /* PRC-LT-CTRL fields */
-static gint hf_prc_lt_ctrl_precoding = -1;
-static gint hf_prc_lt_ctrl_precoding_delay = -1;
-/* static gint hf_prc_lt_ctrl_invalid_tlv = -1; */
+static gint hf_prc_lt_ctrl_precoding;
+static gint hf_prc_lt_ctrl_precoding_delay;
+/* static gint hf_prc_lt_ctrl_invalid_tlv; */
 
 static const value_string vals_turn_on[] = {
 	{0, "Turn off"},
diff --git a/plugins/epan/wimax/msg_reg_req.c b/plugins/epan/wimax/msg_reg_req.c
index f0ba1a5f67..3387776498 100644
--- a/plugins/epan/wimax/msg_reg_req.c
+++ b/plugins/epan/wimax/msg_reg_req.c
@@ -30,121 +30,121 @@ void proto_reg_handoff_mac_mgmt_msg_reg_req(void);
 
 static dissector_handle_t reg_req_handle;
 
-static gint proto_mac_mgmt_msg_reg_req_decoder = -1;
-static gint ett_mac_mgmt_msg_reg_req_decoder = -1;
+static gint proto_mac_mgmt_msg_reg_req_decoder;
+static gint ett_mac_mgmt_msg_reg_req_decoder;
 
 /* REG-REQ fields */
-static gint hf_reg_ss_mgmt_support                   = -1;
-static gint hf_reg_ip_mgmt_mode                      = -1;
-static gint hf_reg_ip_version                        = -1;
-static gint hf_reg_req_secondary_mgmt_cid            = -1;
-static gint hf_reg_ul_cids                           = -1;
-static gint hf_reg_max_classifiers                   = -1;
-static gint hf_reg_phs                               = -1;
-static gint hf_reg_arq                               = -1;
-static gint hf_reg_dsx_flow_control                  = -1;
-static gint hf_reg_mac_crc_support                   = -1;
-static gint hf_reg_mca_flow_control                  = -1;
-static gint hf_reg_mcast_polling_cids                = -1;
-static gint hf_reg_num_dl_trans_cid		     = -1;
-static gint hf_reg_mac_address                       = -1;
-static gint hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame      = -1;
-static gint hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame      = -1;
-static gint hf_reg_tlv_t_21_packing_support                        = -1;
-static gint hf_reg_tlv_t_22_mac_extended_rtps_support	           = -1;
-static gint hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms = -1;
-static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcp     = -1;
-static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_mobile_ipv4 = -1;
-static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcpv6   = -1;
-static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_ipv6     = -1;
-static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd     = -1;
-static gint hf_reg_tlv_t_27_handover_fbss_mdho_ho_disable          = -1;
-static gint hf_reg_tlv_t_27_handover_fbss_mdho_dl_rf_monitoring_maps = -1;
-static gint hf_reg_tlv_t_27_handover_mdho_dl_monitoring_single_map = -1;
-static gint hf_reg_tlv_t_27_handover_mdho_dl_monitoring_maps       = -1;
-static gint hf_reg_tlv_t_27_handover_mdho_ul_multiple              = -1;
-static gint hf_reg_tlv_t_27_handover_reserved                      = -1;
-static gint hf_reg_tlv_t_29_ho_process_opt_ms_timer                = -1;
-static gint hf_reg_tlv_t_31_mobility_handover                      = -1;
-static gint hf_reg_tlv_t_31_mobility_sleep_mode                    = -1;
-static gint hf_reg_tlv_t_31_mobility_idle_mode                     = -1;
-static gint hf_reg_req_tlv_t_32_sleep_mode_recovery_time           = -1;
-static gint hf_ms_previous_ip_address_v4                           = -1;
-static gint hf_ms_previous_ip_address_v6                           = -1;
-static gint hf_idle_mode_timeout				   = -1;
-static gint hf_reg_req_tlv_t_45_ms_periodic_ranging_timer          = -1;
-static gint hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry = -1;
-static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry = -1;
-static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry = -1;
-static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack = -1;
-static gint hf_reg_tlv_t_40_arq_ack_type_reserved                  = -1;
-static gint hf_reg_tlv_t_41_ho_connections_param_processing_time   = -1;
-static gint hf_reg_tlv_t_42_ho_tek_processing_time                 = -1;
-static gint hf_reg_tlv_t_43_bandwidth_request_ul_tx_power_report_header_support = -1;
-static gint hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support = -1;
-static gint hf_reg_tlv_t_43_cqich_allocation_request_header_support = -1;
-static gint hf_reg_tlv_t_43_phy_channel_report_header_support      = -1;
-static gint hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support = -1;
-static gint hf_reg_tlv_t_43_sn_report_header_support               = -1;
-static gint hf_reg_tlv_t_43_feedback_header_support                = -1;
-static gint hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter = -1;
-static gint hf_reg_tlv_t_43_sdu_sn_parameter                       = -1;
-static gint hf_reg_tlv_t_43_dl_sleep_control_extended_subheader    = -1;
-static gint hf_reg_tlv_t_43_feedback_request_extended_subheader    = -1;
-static gint hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader  = -1;
-static gint hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader  = -1;
-static gint hf_reg_tlv_t_43_mini_feedback_extended_subheader       = -1;
-static gint hf_reg_tlv_t_43_sn_request_extended_subheader          = -1;
-static gint hf_reg_tlv_t_43_pdu_sn_short_extended_subheader        = -1;
-static gint hf_reg_tlv_t_43_pdu_sn_long_extended_subheader         = -1;
-static gint hf_reg_tlv_t_43_reserved                               = -1;
-static gint hf_reg_tlv_t_46_handover_indication_readiness_timer    = -1;
-static gint hf_reg_req_min_time_for_intra_fa			   = -1;
-static gint hf_reg_req_min_time_for_inter_fa			   = -1;
-static gint hf_reg_encap_atm_4                                     = -1;
-static gint hf_reg_encap_ipv4_4                                      = -1;
-static gint hf_reg_encap_ipv6_4                                      = -1;
-static gint hf_reg_encap_802_3_4                                     = -1;
-static gint hf_reg_encap_802_1q_4                                    = -1;
-static gint hf_reg_encap_ipv4_802_3_4                                = -1;
-static gint hf_reg_encap_ipv6_802_3_4                                = -1;
-static gint hf_reg_encap_ipv4_802_1q_4                               = -1;
-static gint hf_reg_encap_ipv6_802_1q_4                               = -1;
-static gint hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_4  = -1;
-static gint hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_4 = -1;
-static gint hf_reg_encap_packet_ip_rohc_header_compression_4         = -1;
-static gint hf_reg_encap_packet_ip_ecrtp_header_compression_4        = -1;
-static gint hf_reg_encap_rsvd_4                                     = -1;
-static gint hf_reg_encap_atm_2                                     = -1;
-static gint hf_reg_encap_ipv4_2                                      = -1;
-static gint hf_reg_encap_ipv6_2                                      = -1;
-static gint hf_reg_encap_802_3_2                                     = -1;
-static gint hf_reg_encap_802_1q_2                                    = -1;
-static gint hf_reg_encap_ipv4_802_3_2                                = -1;
-static gint hf_reg_encap_ipv6_802_3_2                                = -1;
-static gint hf_reg_encap_ipv4_802_1q_2                               = -1;
-static gint hf_reg_encap_ipv6_802_1q_2                               = -1;
-static gint hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_2  = -1;
-static gint hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_2 = -1;
-static gint hf_reg_encap_packet_ip_rohc_header_compression_2         = -1;
-static gint hf_reg_encap_packet_ip_ecrtp_header_compression_2        = -1;
-static gint hf_reg_encap_rsvd_2                                     = -1;
-static gint hf_tlv_type                                            = -1;
-static gint hf_reg_invalid_tlv                                     = -1;
-static gint hf_reg_power_saving_class_type_i                       = -1;
-static gint hf_reg_power_saving_class_type_ii                      = -1;
-static gint hf_reg_power_saving_class_type_iii                     = -1;
-static gint hf_reg_multi_active_power_saving_classes               = -1;
-static gint hf_reg_total_power_saving_class_instances              = -1;
-static gint hf_reg_power_saving_class_reserved                     = -1;
-static gint hf_reg_power_saving_class_capability                   = -1;
-static gint hf_reg_ip_phs_sdu_encap                                = -1;
-static gint hf_reg_tlv_t_26_method_alloc_ip_addr_secondary_mgmnt_conn = -1;
-static gint hf_reg_tlv_t_27_handover_supported                     = -1;
-static gint hf_reg_tlv_t_31_mobility_features_supported            = -1;
-static gint hf_reg_tlv_t_40_arq_ack_type                           = -1;
-static gint hf_reg_tlv_t_43_mac_header_ext_header_support          = -1;
-static gint hf_reg_req_bs_switching_timer                          = -1;
+static gint hf_reg_ss_mgmt_support;
+static gint hf_reg_ip_mgmt_mode;
+static gint hf_reg_ip_version;
+static gint hf_reg_req_secondary_mgmt_cid;
+static gint hf_reg_ul_cids;
+static gint hf_reg_max_classifiers;
+static gint hf_reg_phs;
+static gint hf_reg_arq;
+static gint hf_reg_dsx_flow_control;
+static gint hf_reg_mac_crc_support;
+static gint hf_reg_mca_flow_control;
+static gint hf_reg_mcast_polling_cids;
+static gint hf_reg_num_dl_trans_cid;
+static gint hf_reg_mac_address;
+static gint hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame;
+static gint hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame;
+static gint hf_reg_tlv_t_21_packing_support;
+static gint hf_reg_tlv_t_22_mac_extended_rtps_support;
+static gint hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms;
+static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcp;
+static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_mobile_ipv4;
+static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcpv6;
+static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_ipv6;
+static gint hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd;
+static gint hf_reg_tlv_t_27_handover_fbss_mdho_ho_disable;
+static gint hf_reg_tlv_t_27_handover_fbss_mdho_dl_rf_monitoring_maps;
+static gint hf_reg_tlv_t_27_handover_mdho_dl_monitoring_single_map;
+static gint hf_reg_tlv_t_27_handover_mdho_dl_monitoring_maps;
+static gint hf_reg_tlv_t_27_handover_mdho_ul_multiple;
+static gint hf_reg_tlv_t_27_handover_reserved;
+static gint hf_reg_tlv_t_29_ho_process_opt_ms_timer;
+static gint hf_reg_tlv_t_31_mobility_handover;
+static gint hf_reg_tlv_t_31_mobility_sleep_mode;
+static gint hf_reg_tlv_t_31_mobility_idle_mode;
+static gint hf_reg_req_tlv_t_32_sleep_mode_recovery_time;
+static gint hf_ms_previous_ip_address_v4;
+static gint hf_ms_previous_ip_address_v6;
+static gint hf_idle_mode_timeout;
+static gint hf_reg_req_tlv_t_45_ms_periodic_ranging_timer;
+static gint hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry;
+static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry;
+static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry;
+static gint hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack;
+static gint hf_reg_tlv_t_40_arq_ack_type_reserved;
+static gint hf_reg_tlv_t_41_ho_connections_param_processing_time;
+static gint hf_reg_tlv_t_42_ho_tek_processing_time;
+static gint hf_reg_tlv_t_43_bandwidth_request_ul_tx_power_report_header_support;
+static gint hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support;
+static gint hf_reg_tlv_t_43_cqich_allocation_request_header_support;
+static gint hf_reg_tlv_t_43_phy_channel_report_header_support;
+static gint hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support;
+static gint hf_reg_tlv_t_43_sn_report_header_support;
+static gint hf_reg_tlv_t_43_feedback_header_support;
+static gint hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter;
+static gint hf_reg_tlv_t_43_sdu_sn_parameter;
+static gint hf_reg_tlv_t_43_dl_sleep_control_extended_subheader;
+static gint hf_reg_tlv_t_43_feedback_request_extended_subheader;
+static gint hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader;
+static gint hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader;
+static gint hf_reg_tlv_t_43_mini_feedback_extended_subheader;
+static gint hf_reg_tlv_t_43_sn_request_extended_subheader;
+static gint hf_reg_tlv_t_43_pdu_sn_short_extended_subheader;
+static gint hf_reg_tlv_t_43_pdu_sn_long_extended_subheader;
+static gint hf_reg_tlv_t_43_reserved;
+static gint hf_reg_tlv_t_46_handover_indication_readiness_timer;
+static gint hf_reg_req_min_time_for_intra_fa;
+static gint hf_reg_req_min_time_for_inter_fa;
+static gint hf_reg_encap_atm_4;
+static gint hf_reg_encap_ipv4_4;
+static gint hf_reg_encap_ipv6_4;
+static gint hf_reg_encap_802_3_4;
+static gint hf_reg_encap_802_1q_4;
+static gint hf_reg_encap_ipv4_802_3_4;
+static gint hf_reg_encap_ipv6_802_3_4;
+static gint hf_reg_encap_ipv4_802_1q_4;
+static gint hf_reg_encap_ipv6_802_1q_4;
+static gint hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_4;
+static gint hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_4;
+static gint hf_reg_encap_packet_ip_rohc_header_compression_4;
+static gint hf_reg_encap_packet_ip_ecrtp_header_compression_4;
+static gint hf_reg_encap_rsvd_4;
+static gint hf_reg_encap_atm_2;
+static gint hf_reg_encap_ipv4_2;
+static gint hf_reg_encap_ipv6_2;
+static gint hf_reg_encap_802_3_2;
+static gint hf_reg_encap_802_1q_2;
+static gint hf_reg_encap_ipv4_802_3_2;
+static gint hf_reg_encap_ipv6_802_3_2;
+static gint hf_reg_encap_ipv4_802_1q_2;
+static gint hf_reg_encap_ipv6_802_1q_2;
+static gint hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_2;
+static gint hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_2;
+static gint hf_reg_encap_packet_ip_rohc_header_compression_2;
+static gint hf_reg_encap_packet_ip_ecrtp_header_compression_2;
+static gint hf_reg_encap_rsvd_2;
+static gint hf_tlv_type;
+static gint hf_reg_invalid_tlv;
+static gint hf_reg_power_saving_class_type_i;
+static gint hf_reg_power_saving_class_type_ii;
+static gint hf_reg_power_saving_class_type_iii;
+static gint hf_reg_multi_active_power_saving_classes;
+static gint hf_reg_total_power_saving_class_instances;
+static gint hf_reg_power_saving_class_reserved;
+static gint hf_reg_power_saving_class_capability;
+static gint hf_reg_ip_phs_sdu_encap;
+static gint hf_reg_tlv_t_26_method_alloc_ip_addr_secondary_mgmnt_conn;
+static gint hf_reg_tlv_t_27_handover_supported;
+static gint hf_reg_tlv_t_31_mobility_features_supported;
+static gint hf_reg_tlv_t_40_arq_ack_type;
+static gint hf_reg_tlv_t_43_mac_header_ext_header_support;
+static gint hf_reg_req_bs_switching_timer;
 
 /* STRING RESOURCES */
 
diff --git a/plugins/epan/wimax/msg_reg_rsp.c b/plugins/epan/wimax/msg_reg_rsp.c
index a5f23650e7..1f4efd1577 100644
--- a/plugins/epan/wimax/msg_reg_rsp.c
+++ b/plugins/epan/wimax/msg_reg_rsp.c
@@ -34,22 +34,22 @@ extern gboolean include_cor2_changes;
 
 static dissector_handle_t dsc_rsp_handle = NULL;
 
-static gint proto_mac_mgmt_msg_reg_rsp_decoder = -1;
-static gint ett_mac_mgmt_msg_reg_rsp_decoder   = -1;
-static gint ett_reg_rsp_message_tree           = -1;
+static gint proto_mac_mgmt_msg_reg_rsp_decoder;
+static gint ett_mac_mgmt_msg_reg_rsp_decoder;
+static gint ett_reg_rsp_message_tree;
 
 /* NCT messages */
 
 /* REG-RSP fields */
-static gint hf_reg_rsp_status                            = -1;
-static gint hf_tlv_type                                  = -1;
-/* static gint hf_tlv_value                                 = -1; */
-static gint hf_reg_rsp_secondary_mgmt_cid		 = -1;
-static gint hf_reg_invalid_tlv                           = -1;
-static gint hf_reg_rsp_new_cid_after_ho                  = -1;
-static gint hf_reg_rsp_service_flow_id                   = -1;
-static gint hf_reg_rsp_system_resource_retain_time	 = -1;
-static gint hf_reg_total_provisioned_sf			 = -1;
+static gint hf_reg_rsp_status;
+static gint hf_tlv_type;
+/* static gint hf_tlv_value; */
+static gint hf_reg_rsp_secondary_mgmt_cid;
+static gint hf_reg_invalid_tlv;
+static gint hf_reg_rsp_new_cid_after_ho;
+static gint hf_reg_rsp_service_flow_id;
+static gint hf_reg_rsp_system_resource_retain_time;
+static gint hf_reg_total_provisioned_sf;
 
 /* STRING RESOURCES */
 
diff --git a/plugins/epan/wimax/msg_rep.c b/plugins/epan/wimax/msg_rep.c
index 952e8f5f82..7f4b582514 100644
--- a/plugins/epan/wimax/msg_rep.c
+++ b/plugins/epan/wimax/msg_rep.c
@@ -31,9 +31,9 @@ void proto_reg_handoff_mac_mgmt_msg_rep(void);
 static dissector_handle_t rep_req_handle;
 static dissector_handle_t rep_rsp_handle;
 
-static gint proto_mac_mgmt_msg_rep_decoder = -1;
-static gint ett_mac_mgmt_msg_rep_req_decoder = -1;
-static gint ett_mac_mgmt_msg_rep_rsp_decoder = -1;
+static gint proto_mac_mgmt_msg_rep_decoder;
+static gint ett_mac_mgmt_msg_rep_req_decoder;
+static gint ett_mac_mgmt_msg_rep_rsp_decoder;
 
 static const value_string vals_channel_types[] =
 {
@@ -81,112 +81,112 @@ static const value_string vals_type_of_measurements[] =
 };
 
 /* fix fields */
-static gint hf_rep_unknown_type = -1;
-static gint hf_rep_invalid_tlv = -1;
+static gint hf_rep_unknown_type;
+static gint hf_rep_invalid_tlv;
 
-static gint hf_rep_req_report_request = -1;
-static gint hf_rep_req_report_type = -1;
-static gint hf_rep_req_rep_type_bit0 = -1;
-static gint hf_rep_req_rep_type_bit1 = -1;
-static gint hf_rep_req_rep_type_bit2 = -1;
-static gint hf_rep_req_rep_type_bit3_6 = -1;
-static gint hf_rep_req_rep_type_bit7 = -1;
-static gint hf_rep_req_channel_number = -1;
-static gint hf_rep_req_channel_type = -1;
-static gint hf_rep_req_channel_type_request = -1;
-static gint hf_rep_req_channel_type_reserved = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_request = -1;
-static gint hf_rep_req_preamble_phy_cinr_request = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_request = -1;
-static gint hf_rep_req_preamble_effective_cinr_request = -1;
-static gint hf_rep_req_channel_selectivity_report = -1;
+static gint hf_rep_req_report_request;
+static gint hf_rep_req_report_type;
+static gint hf_rep_req_rep_type_bit0;
+static gint hf_rep_req_rep_type_bit1;
+static gint hf_rep_req_rep_type_bit2;
+static gint hf_rep_req_rep_type_bit3_6;
+static gint hf_rep_req_rep_type_bit7;
+static gint hf_rep_req_channel_number;
+static gint hf_rep_req_channel_type;
+static gint hf_rep_req_channel_type_request;
+static gint hf_rep_req_channel_type_reserved;
+static gint hf_rep_req_zone_spec_phy_cinr_request;
+static gint hf_rep_req_preamble_phy_cinr_request;
+static gint hf_rep_req_zone_spec_effective_cinr_request;
+static gint hf_rep_req_preamble_effective_cinr_request;
+static gint hf_rep_req_channel_selectivity_report;
 
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit0_2 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit3 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit4 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit5_6 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit7 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit8_13 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit14_17 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit18 = -1;
-static gint hf_rep_req_zone_spec_phy_cinr_req_bit19_23 = -1;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit0_2;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit3;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit4;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit5_6;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit7;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit8_13;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit14_17;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit18;
+static gint hf_rep_req_zone_spec_phy_cinr_req_bit19_23;
 
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit0_2 = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit3 = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit4 = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit5_6 = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit7 = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit8_13 = -1;
-static gint hf_rep_req_zone_spec_effective_cinr_req_bit14_15 = -1;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit0_2;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit3;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit4;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit5_6;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit7;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit8_13;
+static gint hf_rep_req_zone_spec_effective_cinr_req_bit14_15;
 
-static gint hf_rep_req_preamble_phy_cinr_req_bit0_1 = -1;
-static gint hf_rep_req_preamble_phy_cinr_req_bit2_5 = -1;
-static gint hf_rep_req_preamble_phy_cinr_req_bit6 = -1;
-static gint hf_rep_req_preamble_phy_cinr_req_bit7 = -1;
+static gint hf_rep_req_preamble_phy_cinr_req_bit0_1;
+static gint hf_rep_req_preamble_phy_cinr_req_bit2_5;
+static gint hf_rep_req_preamble_phy_cinr_req_bit6;
+static gint hf_rep_req_preamble_phy_cinr_req_bit7;
 
-static gint hf_rep_req_preamble_effective_cinr_req_bit0_1 = -1;
-static gint hf_rep_req_preamble_effective_cinr_req_bit2_7 = -1;
+static gint hf_rep_req_preamble_effective_cinr_req_bit0_1;
+static gint hf_rep_req_preamble_effective_cinr_req_bit2_7;
 
-static gint hf_rep_req_channel_selectivity_rep_bit0 = -1;
-static gint hf_rep_req_channel_selectivity_rep_bit1_7 = -1;
+static gint hf_rep_req_channel_selectivity_rep_bit0;
+static gint hf_rep_req_channel_selectivity_rep_bit1_7;
 
-static gint hf_rep_rsp_report_type = -1;
-static gint hf_rep_rsp_report_type_channel_number = -1;
-static gint hf_rep_rsp_report_type_frame_number = -1;
-static gint hf_rep_rsp_report_type_duration = -1;
-static gint hf_rep_rsp_report_type_basic_report = -1;
-static gint hf_rep_rsp_report_type_basic_report_bit0 = -1;
-static gint hf_rep_rsp_report_type_basic_report_bit1 = -1;
-static gint hf_rep_rsp_report_type_basic_report_bit2 = -1;
-static gint hf_rep_rsp_report_type_basic_report_bit3 = -1;
-static gint hf_rep_rsp_report_type_basic_report_reserved = -1;
-static gint hf_rep_rsp_report_type_cinr_report = -1;
-static gint hf_rep_rsp_report_type_cinr_report_mean = -1;
-static gint hf_rep_rsp_report_type_cinr_report_deviation = -1;
-static gint hf_rep_rsp_report_type_rssi_report = -1;
-static gint hf_rep_rsp_report_type_rssi_report_mean = -1;
-static gint hf_rep_rsp_report_type_rssi_report_deviation = -1;
-static gint hf_rep_rsp_current_transmitted_power = -1;
-static gint hf_rep_rsp_channel_type_report = -1;
-static gint hf_rep_rsp_channel_type_subchannel = -1;
-static gint hf_rep_rsp_channel_type_band_amc = -1;
-static gint hf_rep_rsp_channel_type_safety_channel = -1;
-static gint hf_rep_rsp_channel_type_enhanced_band_amc = -1;
-static gint hf_rep_rsp_channel_type_sounding = -1;
+static gint hf_rep_rsp_report_type;
+static gint hf_rep_rsp_report_type_channel_number;
+static gint hf_rep_rsp_report_type_frame_number;
+static gint hf_rep_rsp_report_type_duration;
+static gint hf_rep_rsp_report_type_basic_report;
+static gint hf_rep_rsp_report_type_basic_report_bit0;
+static gint hf_rep_rsp_report_type_basic_report_bit1;
+static gint hf_rep_rsp_report_type_basic_report_bit2;
+static gint hf_rep_rsp_report_type_basic_report_bit3;
+static gint hf_rep_rsp_report_type_basic_report_reserved;
+static gint hf_rep_rsp_report_type_cinr_report;
+static gint hf_rep_rsp_report_type_cinr_report_mean;
+static gint hf_rep_rsp_report_type_cinr_report_deviation;
+static gint hf_rep_rsp_report_type_rssi_report;
+static gint hf_rep_rsp_report_type_rssi_report_mean;
+static gint hf_rep_rsp_report_type_rssi_report_deviation;
+static gint hf_rep_rsp_current_transmitted_power;
+static gint hf_rep_rsp_channel_type_report;
+static gint hf_rep_rsp_channel_type_subchannel;
+static gint hf_rep_rsp_channel_type_band_amc;
+static gint hf_rep_rsp_channel_type_safety_channel;
+static gint hf_rep_rsp_channel_type_enhanced_band_amc;
+static gint hf_rep_rsp_channel_type_sounding;
 
-static gint hf_rep_rsp_zone_spec_phy_cinr_report = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_mean = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_report_type = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1 = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_deviation = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2 = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0 = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1 = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_fusc = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_safety_channel = -1;
-static gint hf_rep_rsp_zone_spec_phy_cinr_rep_amc = -1;
-static gint hf_rep_rsp_preamble_phy_cinr_report = -1;
-static gint hf_rep_rsp_preamble_phy_cinr_rep_configuration_1 = -1;
-static gint hf_rep_rsp_preamble_phy_cinr_rep_configuration_3 = -1;
-static gint hf_rep_rsp_preamble_phy_cinr_rep_band_amc_zone = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_report = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_report_type = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id = -1;
-static gint hf_rep_rsp_preamble_effective_cinr_report = -1;
-static gint hf_rep_rsp_preamble_effective_cinr_rep_cqich_id = -1;
-static gint hf_rep_rsp_channel_selectivity_report = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0 = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1 = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_fusc = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc = -1;
-static gint hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas = -1;
-static gint hf_rep_rsp_preamble_effective_cinr_rep_configuration_1 = -1;
-static gint hf_rep_rsp_preamble_effective_cinr_rep_configuration_3 = -1;
-static gint hf_rep_rsp_channel_selectivity_rep_frequency_a = -1;
-static gint hf_rep_rsp_channel_selectivity_rep_frequency_b = -1;
-static gint hf_rep_rsp_channel_selectivity_rep_frequency_c = -1;
+static gint hf_rep_rsp_zone_spec_phy_cinr_report;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_mean;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_report_type;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_deviation;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_fusc;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_safety_channel;
+static gint hf_rep_rsp_zone_spec_phy_cinr_rep_amc;
+static gint hf_rep_rsp_preamble_phy_cinr_report;
+static gint hf_rep_rsp_preamble_phy_cinr_rep_configuration_1;
+static gint hf_rep_rsp_preamble_phy_cinr_rep_configuration_3;
+static gint hf_rep_rsp_preamble_phy_cinr_rep_band_amc_zone;
+static gint hf_rep_rsp_zone_spec_effective_cinr_report;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_report_type;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id;
+static gint hf_rep_rsp_preamble_effective_cinr_report;
+static gint hf_rep_rsp_preamble_effective_cinr_rep_cqich_id;
+static gint hf_rep_rsp_channel_selectivity_report;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_fusc;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc;
+static gint hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas;
+static gint hf_rep_rsp_preamble_effective_cinr_rep_configuration_1;
+static gint hf_rep_rsp_preamble_effective_cinr_rep_configuration_3;
+static gint hf_rep_rsp_channel_selectivity_rep_frequency_a;
+static gint hf_rep_rsp_channel_selectivity_rep_frequency_b;
+static gint hf_rep_rsp_channel_selectivity_rep_frequency_c;
 
 /* bit masks */
 #define REP_REQ_REPORT_TYPE_BIT0	          0x01
diff --git a/plugins/epan/wimax/msg_res_cmd.c b/plugins/epan/wimax/msg_res_cmd.c
index 67d321dacb..50212474f2 100644
--- a/plugins/epan/wimax/msg_res_cmd.c
+++ b/plugins/epan/wimax/msg_res_cmd.c
@@ -30,12 +30,12 @@ void proto_reg_handoff_mac_mgmt_msg_res_cmd(void);
 
 static dissector_handle_t res_cmd_handle;
 
-static gint proto_mac_mgmt_msg_res_cmd_decoder = -1;
-static gint ett_mac_mgmt_msg_res_cmd_decoder = -1;
+static gint proto_mac_mgmt_msg_res_cmd_decoder;
+static gint ett_mac_mgmt_msg_res_cmd_decoder;
 
 /* fix fields */
-static gint hf_res_cmd_unknown_type = -1;
-static gint hf_res_cmd_invalid_tlv = -1;
+static gint hf_res_cmd_unknown_type;
+static gint hf_res_cmd_invalid_tlv;
 
 
 /* Wimax Mac RES-CMD Message Dissector */
diff --git a/plugins/epan/wimax/msg_rng_req.c b/plugins/epan/wimax/msg_rng_req.c
index 68f9569b07..0d14cd672f 100644
--- a/plugins/epan/wimax/msg_rng_req.c
+++ b/plugins/epan/wimax/msg_rng_req.c
@@ -28,48 +28,48 @@ static dissector_handle_t rng_req_handle;
 
 extern gboolean include_cor2_changes;
 
-static gint proto_mac_mgmt_msg_rng_req_decoder = -1;
-static gint ett_mac_mgmt_msg_rng_req_decoder = -1;
+static gint proto_mac_mgmt_msg_rng_req_decoder;
+static gint ett_mac_mgmt_msg_rng_req_decoder;
 
 /* RNG-REQ fields */
-static gint hf_rng_req_reserved                              = -1;
-static gint hf_rng_req_dl_burst_profile_diuc                 = -1;
-static gint hf_rng_req_dl_burst_profile_lsb_ccc              = -1;
-static gint hf_rng_req_ss_mac_address                        = -1;
-static gint hf_rng_req_ranging_anomalies_max_power           = -1;
-static gint hf_rng_req_ranging_anomalies_min_power           = -1;
-static gint hf_rng_req_ranging_anomalies_timing_adj          = -1;
-static gint hf_rng_req_aas_broadcast                         = -1;
-static gint hf_rng_req_serving_bs_id                         = -1;
-static gint hf_rng_req_ranging_purpose_ho_indication         = -1;
-static gint hf_rng_req_ranging_purpose_location_update_request = -1;
-static gint hf_rng_req_ranging_purpose_reserved              = -1;
-static gint hf_rng_req_ho_id                                 = -1;
-static gint hf_rng_req_power_down_indicator                  = -1;
-static gint hf_rng_req_repetition_coding_level               = -1;
-static gint hf_rng_req_requested_downlink_repetition_coding_level_reserved     = -1;
-static gint hf_rng_req_cmac_key_count                        = -1;
-static gint hf_rng_definition_of_power_saving_class_present  = -1;
-static gint hf_rng_activation_of_power_saving_class          = -1;
-static gint hf_rng_trf_ind_required                          = -1;
-static gint hf_rng_power_saving_class_reserved               = -1;
-static gint hf_rng_power_saving_class_id                     = -1;
-static gint hf_rng_power_saving_class_type                   = -1;
-static gint hf_rng_power_saving_first_sleep_window_frame     = -1;
-static gint hf_rng_power_saving_initial_sleep_window         = -1;
-static gint hf_rng_power_saving_listening_window             = -1;
-static gint hf_rng_power_saving_final_sleep_window_base      = -1;
-static gint hf_rng_power_saving_final_sleep_window_exp       = -1;
-static gint hf_rng_power_saving_slpid                        = -1;
-static gint hf_rng_power_saving_included_cid                 = -1;
-static gint hf_rng_power_saving_mgmt_connection_direction    = -1;
-static gint hf_tlv_type                                      = -1;
-static gint hf_rng_invalid_tlv                               = -1;
-static gint hf_rng_power_saving_class_flags                  = -1;
-static gint hf_rng_req_dl_burst_profile                      = -1;
-static gint hf_rng_req_ranging_anomalies                     = -1;
-static gint hf_rng_req_ranging_purpose_indication            = -1;
-static gint hf_rng_req_requested_rep_coding_level            = -1;
+static gint hf_rng_req_reserved;
+static gint hf_rng_req_dl_burst_profile_diuc;
+static gint hf_rng_req_dl_burst_profile_lsb_ccc;
+static gint hf_rng_req_ss_mac_address;
+static gint hf_rng_req_ranging_anomalies_max_power;
+static gint hf_rng_req_ranging_anomalies_min_power;
+static gint hf_rng_req_ranging_anomalies_timing_adj;
+static gint hf_rng_req_aas_broadcast;
+static gint hf_rng_req_serving_bs_id;
+static gint hf_rng_req_ranging_purpose_ho_indication;
+static gint hf_rng_req_ranging_purpose_location_update_request;
+static gint hf_rng_req_ranging_purpose_reserved;
+static gint hf_rng_req_ho_id;
+static gint hf_rng_req_power_down_indicator;
+static gint hf_rng_req_repetition_coding_level;
+static gint hf_rng_req_requested_downlink_repetition_coding_level_reserved;
+static gint hf_rng_req_cmac_key_count;
+static gint hf_rng_definition_of_power_saving_class_present;
+static gint hf_rng_activation_of_power_saving_class;
+static gint hf_rng_trf_ind_required;
+static gint hf_rng_power_saving_class_reserved;
+static gint hf_rng_power_saving_class_id;
+static gint hf_rng_power_saving_class_type;
+static gint hf_rng_power_saving_first_sleep_window_frame;
+static gint hf_rng_power_saving_initial_sleep_window;
+static gint hf_rng_power_saving_listening_window;
+static gint hf_rng_power_saving_final_sleep_window_base;
+static gint hf_rng_power_saving_final_sleep_window_exp;
+static gint hf_rng_power_saving_slpid;
+static gint hf_rng_power_saving_included_cid;
+static gint hf_rng_power_saving_mgmt_connection_direction;
+static gint hf_tlv_type;
+static gint hf_rng_invalid_tlv;
+static gint hf_rng_power_saving_class_flags;
+static gint hf_rng_req_dl_burst_profile;
+static gint hf_rng_req_ranging_anomalies;
+static gint hf_rng_req_ranging_purpose_indication;
+static gint hf_rng_req_requested_rep_coding_level;
 
 /* STRING RESOURCES */
 
diff --git a/plugins/epan/wimax/msg_rng_rsp.c b/plugins/epan/wimax/msg_rng_rsp.c
index f1587ebc4e..b1d859b62a 100644
--- a/plugins/epan/wimax/msg_rng_rsp.c
+++ b/plugins/epan/wimax/msg_rng_rsp.c
@@ -31,69 +31,69 @@ static dissector_handle_t rng_rsp_handle = NULL;
 static dissector_handle_t sbc_rsp_handle = NULL;
 static dissector_handle_t reg_rsp_handle = NULL;
 
-static gint proto_mac_mgmt_msg_rng_rsp_decoder = -1;
-static gint ett_mac_mgmt_msg_rng_rsp_decoder   = -1;
-static gint ett_rng_rsp_message_tree           = -1;
+static gint proto_mac_mgmt_msg_rng_rsp_decoder;
+static gint ett_mac_mgmt_msg_rng_rsp_decoder;
+static gint ett_rng_rsp_message_tree;
 
 /* RNG-RSP fields */
-static gint hf_rng_req_reserved					= -1;
-/* static gint hf_rng_rsp_ul_channel_id				= -1; */
-static gint hf_rng_rsp_timing_adjust				= -1;
-static gint hf_rng_rsp_power_level_adjust			= -1;
-static gint hf_rng_rsp_offset_freq_adjust			= -1;
-static gint hf_rng_rsp_ranging_status				= -1;
-static gint hf_rng_rsp_dl_freq_override				= -1;
-static gint hf_rng_rsp_ul_chan_id_override			= -1;
-static gint hf_rng_rsp_dl_operational_burst_profile		= -1;
-static gint hf_rng_rsp_dl_operational_burst_profile_diuc	= -1;
-static gint hf_rng_rsp_dl_operational_burst_profile_ccc		= -1;
-static gint hf_rng_rsp_ss_mac_address				= -1;
-static gint hf_rng_rsp_basic_cid				= -1;
-static gint hf_rng_rsp_primary_mgmt_cid				= -1;
-static gint hf_rng_rsp_broadcast				= -1;
-static gint hf_rng_rsp_frame_number				= -1;
-static gint hf_rng_rsp_opportunity_number			= -1;
-static gint hf_rng_rsp_service_level_prediction			= -1;
-static gint hf_rng_rsp_resource_retain_flag			= -1;
-static gint hf_rng_rsp_ho_process_optimization			= -1;
-static gint hf_rng_rsp_ho_process_optimization_0		= -1;
-static gint hf_rng_rsp_ho_process_optimization_1_2		= -1;
-static gint hf_rng_rsp_ho_process_optimization_3		= -1;
-static gint hf_rng_rsp_ho_process_optimization_4		= -1;
-static gint hf_rng_rsp_ho_process_optimization_5		= -1;
-static gint hf_rng_rsp_ho_process_optimization_6		= -1;
-static gint hf_rng_rsp_ho_process_optimization_7		= -1;
-static gint hf_rng_rsp_ho_process_optimization_8		= -1;
-static gint hf_rng_rsp_ho_process_optimization_9		= -1;
-static gint hf_rng_rsp_ho_process_optimization_10		= -1;
-static gint hf_rng_rsp_ho_process_optimization_11		= -1;
-static gint hf_rng_rsp_ho_process_optimization_12		= -1;
-static gint hf_rng_rsp_ho_process_optimization_13		= -1;
-static gint hf_rng_rsp_ho_process_optimization_14		= -1;
-static gint hf_rng_rsp_ho_process_optimization_15		= -1;
+static gint hf_rng_req_reserved;
+/* static gint hf_rng_rsp_ul_channel_id; */
+static gint hf_rng_rsp_timing_adjust;
+static gint hf_rng_rsp_power_level_adjust;
+static gint hf_rng_rsp_offset_freq_adjust;
+static gint hf_rng_rsp_ranging_status;
+static gint hf_rng_rsp_dl_freq_override;
+static gint hf_rng_rsp_ul_chan_id_override;
+static gint hf_rng_rsp_dl_operational_burst_profile;
+static gint hf_rng_rsp_dl_operational_burst_profile_diuc;
+static gint hf_rng_rsp_dl_operational_burst_profile_ccc;
+static gint hf_rng_rsp_ss_mac_address;
+static gint hf_rng_rsp_basic_cid;
+static gint hf_rng_rsp_primary_mgmt_cid;
+static gint hf_rng_rsp_broadcast;
+static gint hf_rng_rsp_frame_number;
+static gint hf_rng_rsp_opportunity_number;
+static gint hf_rng_rsp_service_level_prediction;
+static gint hf_rng_rsp_resource_retain_flag;
+static gint hf_rng_rsp_ho_process_optimization;
+static gint hf_rng_rsp_ho_process_optimization_0;
+static gint hf_rng_rsp_ho_process_optimization_1_2;
+static gint hf_rng_rsp_ho_process_optimization_3;
+static gint hf_rng_rsp_ho_process_optimization_4;
+static gint hf_rng_rsp_ho_process_optimization_5;
+static gint hf_rng_rsp_ho_process_optimization_6;
+static gint hf_rng_rsp_ho_process_optimization_7;
+static gint hf_rng_rsp_ho_process_optimization_8;
+static gint hf_rng_rsp_ho_process_optimization_9;
+static gint hf_rng_rsp_ho_process_optimization_10;
+static gint hf_rng_rsp_ho_process_optimization_11;
+static gint hf_rng_rsp_ho_process_optimization_12;
+static gint hf_rng_rsp_ho_process_optimization_13;
+static gint hf_rng_rsp_ho_process_optimization_14;
+static gint hf_rng_rsp_ho_process_optimization_15;
 /* Added the following to help implement RNG-RSP message encoding 33 (Table 367 in IEEE 802.16e-2007) */
-static gint hf_rng_rsp_dl_op_burst_profile_ofdma		= -1;
-static gint hf_rng_rsp_least_robust_diuc			= -1;
-static gint hf_rng_rsp_repetition_coding_indication		= -1;
-static gint hf_rng_rsp_config_change_count_of_dcd		= -1;
+static gint hf_rng_rsp_dl_op_burst_profile_ofdma;
+static gint hf_rng_rsp_least_robust_diuc;
+static gint hf_rng_rsp_repetition_coding_indication;
+static gint hf_rng_rsp_config_change_count_of_dcd;
 /* Added the following to help implement RNG-RSP message encoding 22 (Table 367 in IEEE 802.16e-2007) */
-static gint hf_rng_rsp_ho_id					= -1;
-static gint hf_rng_rsp_location_update_response			= -1;
+static gint hf_rng_rsp_ho_id;
+static gint hf_rng_rsp_location_update_response;
 /* Added the following to help implement RNG-RSP message encoding 24 (Table 367 in IEEE 802.16e-2007) */
-static gint hf_rng_rsp_paging_information			= -1;
-static gint hf_rng_rsp_paging_cycle				= -1;
-static gint hf_rng_rsp_paging_offset				= -1;
-static gint hf_rng_rsp_paging_group_id				= -1;
-static gint hf_rng_rsp_bs_random				= -1;
-static gint hf_rng_rsp_akid					= -1;
-static gint hf_rng_rsp_ranging_subchan				= -1;
-static gint hf_rng_rsp_time_symbol_reference			= -1;
-static gint hf_rng_rsp_subchannel_reference			= -1;
-static gint hf_rng_rsp_ranging_code_index			= -1;
-static gint hf_rng_rsp_frame_number2				= -1;
-static gint hf_tlv_type						= -1;
-/* static gint hf_tlv_value					= -1; */
-static gint hf_rng_invalid_tlv					= -1;
+static gint hf_rng_rsp_paging_information;
+static gint hf_rng_rsp_paging_cycle;
+static gint hf_rng_rsp_paging_offset;
+static gint hf_rng_rsp_paging_group_id;
+static gint hf_rng_rsp_bs_random;
+static gint hf_rng_rsp_akid;
+static gint hf_rng_rsp_ranging_subchan;
+static gint hf_rng_rsp_time_symbol_reference;
+static gint hf_rng_rsp_subchannel_reference;
+static gint hf_rng_rsp_ranging_code_index;
+static gint hf_rng_rsp_frame_number2;
+static gint hf_tlv_type;
+/* static gint hf_tlv_value; */
+static gint hf_rng_invalid_tlv;
 
 /* STRING RESOURCES */
 
diff --git a/plugins/epan/wimax/msg_sbc.c b/plugins/epan/wimax/msg_sbc.c
index cfdc23936b..a605756f62 100644
--- a/plugins/epan/wimax/msg_sbc.c
+++ b/plugins/epan/wimax/msg_sbc.c
@@ -36,256 +36,256 @@ static dissector_handle_t sbc_rsp_handle;
  *    or not cor2 changes are included */
 extern gboolean include_cor2_changes;
 
-static gint proto_mac_mgmt_msg_sbc_decoder = -1;
-static gint ett_mac_mgmt_msg_sbc_decoder = -1;
-static gint ett_sbc_req_tlv_subtree = -1;
-static gint ett_sbc_rsp_tlv_subtree = -1;
+static gint proto_mac_mgmt_msg_sbc_decoder;
+static gint ett_mac_mgmt_msg_sbc_decoder;
+static gint ett_sbc_req_tlv_subtree;
+static gint ett_sbc_rsp_tlv_subtree;
 
 /* fix fields */
-static gint hf_sbc_unknown_type = -1;
+static gint hf_sbc_unknown_type;
 
-static gint hf_sbc_bw_alloc_support = -1;
-static gint hf_sbc_bw_alloc_support_rsvd0 = -1;
-static gint hf_sbc_bw_alloc_support_duplex = -1;
-static gint hf_sbc_bw_alloc_support_rsvd1 = -1;
-static gint hf_sbc_curr_transmit_power = -1;
-static gint hf_sbc_transition_gaps = -1;
-static gint hf_sbc_ssttg = -1;
-static gint hf_sbc_ssrtg = -1;
-static gint hf_sbc_mac_pdu = -1;
-static gint hf_sbc_mac_pdu_piggybacked = -1;
-static gint hf_sbc_mac_pdu_fsn = -1;
-static gint hf_sbc_mac_pdu_rsvd = -1;
-static gint hf_sbc_max_transmit_power = -1;
-static gint hf_sbc_bpsk = -1;
-static gint hf_sbc_qpsk = -1;
-static gint hf_sbc_qam16 = -1;
-static gint hf_sbc_qam64 = -1;
-static gint hf_sbc_current_transmitted_power = -1;
-static gint hf_sbc_ss_fft_sizes = -1;
-static gint hf_sbc_ss_fft_256 = -1;
-static gint hf_sbc_ss_fft_2048 = -1;
-static gint hf_sbc_ss_fft_128 = -1;
-static gint hf_sbc_ss_fft_512 = -1;
-static gint hf_sbc_ss_fft_1024 = -1;
-static gint hf_sbc_ss_cinr_measure_capability = -1;
-static gint hf_sbc_ss_phy_cinr_measurement_preamble = -1;
-static gint hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_pilot_subcarriers = -1;
-static gint hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_data_subcarriers = -1;
-static gint hf_sbc_ss_effective_cinr_measurement_preamble = -1;
-static gint hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_pilot_subcarriers = -1;
-static gint hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_data_subcarriers = -1;
-static gint hf_sbc_ss_support_2_concurrent_cqi_channels = -1;
-static gint hf_sbc_ss_frequency_selectivity_characterization_report = -1;
+static gint hf_sbc_bw_alloc_support;
+static gint hf_sbc_bw_alloc_support_rsvd0;
+static gint hf_sbc_bw_alloc_support_duplex;
+static gint hf_sbc_bw_alloc_support_rsvd1;
+static gint hf_sbc_curr_transmit_power;
+static gint hf_sbc_transition_gaps;
+static gint hf_sbc_ssttg;
+static gint hf_sbc_ssrtg;
+static gint hf_sbc_mac_pdu;
+static gint hf_sbc_mac_pdu_piggybacked;
+static gint hf_sbc_mac_pdu_fsn;
+static gint hf_sbc_mac_pdu_rsvd;
+static gint hf_sbc_max_transmit_power;
+static gint hf_sbc_bpsk;
+static gint hf_sbc_qpsk;
+static gint hf_sbc_qam16;
+static gint hf_sbc_qam64;
+static gint hf_sbc_current_transmitted_power;
+static gint hf_sbc_ss_fft_sizes;
+static gint hf_sbc_ss_fft_256;
+static gint hf_sbc_ss_fft_2048;
+static gint hf_sbc_ss_fft_128;
+static gint hf_sbc_ss_fft_512;
+static gint hf_sbc_ss_fft_1024;
+static gint hf_sbc_ss_cinr_measure_capability;
+static gint hf_sbc_ss_phy_cinr_measurement_preamble;
+static gint hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_pilot_subcarriers;
+static gint hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_data_subcarriers;
+static gint hf_sbc_ss_effective_cinr_measurement_preamble;
+static gint hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_pilot_subcarriers;
+static gint hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_data_subcarriers;
+static gint hf_sbc_ss_support_2_concurrent_cqi_channels;
+static gint hf_sbc_ss_frequency_selectivity_characterization_report;
 
-static gint hf_sbc_ss_fft_rsvd1 = -1;
-static gint hf_sbc_ss_fft_rsvd2 = -1;
-static gint hf_sbc_ss_demodulator = -1;
-static gint hf_sbc_ss_demodulator_64qam = -1;
-static gint hf_sbc_ss_demodulator_btc = -1;
-static gint hf_sbc_ss_demodulator_ctc = -1;
-static gint hf_sbc_ss_demodulator_stc = -1;
-static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver = -1;
-static gint hf_sbc_ss_demodulator_harq_chase = -1;
-static gint hf_sbc_ss_demodulator_harq_ctc_ir = -1;
-static gint hf_sbc_ss_demodulator_reserved = -1;
-/* static gint hf_sbc_ss_demodulator_reserved1 = -1; */
-static gint hf_sbc_ss_demodulator_64qam_2 = -1;
-static gint hf_sbc_ss_demodulator_btc_2 = -1;
-static gint hf_sbc_ss_demodulator_ctc_2 = -1;
-static gint hf_sbc_ss_demodulator_stc_2 = -1;
-static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver_2 = -1;
-static gint hf_sbc_ss_demodulator_harq_chase_2 = -1;
-static gint hf_sbc_ss_demodulator_harq_ctc_ir_2 = -1;
-static gint hf_sbc_ss_demodulator_reserved_2 = -1;
-static gint hf_sbc_ss_demodulator_harq_cc_ir_2 = -1;
-static gint hf_sbc_ss_demodulator_ldpc_2 = -1;
-static gint hf_sbc_ss_demodulator_dedicated_pilots_2 = -1;
-static gint hf_sbc_ss_demodulator_reserved1_2 = -1;
+static gint hf_sbc_ss_fft_rsvd1;
+static gint hf_sbc_ss_fft_rsvd2;
+static gint hf_sbc_ss_demodulator;
+static gint hf_sbc_ss_demodulator_64qam;
+static gint hf_sbc_ss_demodulator_btc;
+static gint hf_sbc_ss_demodulator_ctc;
+static gint hf_sbc_ss_demodulator_stc;
+static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver;
+static gint hf_sbc_ss_demodulator_harq_chase;
+static gint hf_sbc_ss_demodulator_harq_ctc_ir;
+static gint hf_sbc_ss_demodulator_reserved;
+/* static gint hf_sbc_ss_demodulator_reserved1; */
+static gint hf_sbc_ss_demodulator_64qam_2;
+static gint hf_sbc_ss_demodulator_btc_2;
+static gint hf_sbc_ss_demodulator_ctc_2;
+static gint hf_sbc_ss_demodulator_stc_2;
+static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver_2;
+static gint hf_sbc_ss_demodulator_harq_chase_2;
+static gint hf_sbc_ss_demodulator_harq_ctc_ir_2;
+static gint hf_sbc_ss_demodulator_reserved_2;
+static gint hf_sbc_ss_demodulator_harq_cc_ir_2;
+static gint hf_sbc_ss_demodulator_ldpc_2;
+static gint hf_sbc_ss_demodulator_dedicated_pilots_2;
+static gint hf_sbc_ss_demodulator_reserved1_2;
 
-static gint hf_sbc_ss_modulator = -1;
-static gint hf_sbc_ss_modulator_64qam = -1;
-static gint hf_sbc_ss_modulator_btc = -1;
-static gint hf_sbc_ss_modulator_ctc = -1;
-static gint hf_sbc_ss_modulator_stc = -1;
-static gint hf_sbc_ss_modulator_harq_chase = -1;
-static gint hf_sbc_ss_modulator_ctc_ir = -1;
-static gint hf_sbc_ss_modulator_cc_ir = -1;
-static gint hf_sbc_ss_modulator_ldpc = -1;
+static gint hf_sbc_ss_modulator;
+static gint hf_sbc_ss_modulator_64qam;
+static gint hf_sbc_ss_modulator_btc;
+static gint hf_sbc_ss_modulator_ctc;
+static gint hf_sbc_ss_modulator_stc;
+static gint hf_sbc_ss_modulator_harq_chase;
+static gint hf_sbc_ss_modulator_ctc_ir;
+static gint hf_sbc_ss_modulator_cc_ir;
+static gint hf_sbc_ss_modulator_ldpc;
 
-static gint hf_sbc_number_ul_arq_ack_channel = -1;
-static gint hf_sbc_number_dl_arq_ack_channel = -1;
-static gint hf_sbc_ss_permutation_support = -1;
-static gint hf_sbc_ss_optimal_pusc = -1;
-static gint hf_sbc_ss_optimal_fusc = -1;
-static gint hf_sbc_ss_amc_1x6 = -1;
-static gint hf_sbc_ss_amc_2x3 = -1;
-static gint hf_sbc_ss_amc_3x2 = -1;
-static gint hf_sbc_ss_amc_with_harq_map = -1;
-static gint hf_sbc_ss_tusc1_support = -1;
-static gint hf_sbc_ss_tusc2_support = -1;
-static gint hf_sbc_ss_ofdma_aas_private = -1;
-static gint hf_sbc_ofdma_aas_harq_map_capability = -1;
-static gint hf_sbc_ofdma_aas_private_map_support = -1;
-static gint hf_sbc_ofdma_aas_reduced_private_map_support = -1;
-static gint hf_sbc_ofdma_aas_private_chain_enable = -1;
-static gint hf_sbc_ofdma_aas_private_map_dl_frame_offset = -1;
-static gint hf_sbc_ofdma_aas_private_ul_frame_offset = -1;
-static gint hf_sbc_ofdma_aas_private_map_concurrency = -1;
-static gint hf_sbc_ofdma_aas_capabilities = -1;
-static gint hf_sbc_ss_ofdma_aas_zone = -1;
-static gint hf_sbc_ss_ofdma_aas_diversity_map_scan = -1;
-static gint hf_sbc_ss_ofdma_aas_fbck_rsp_support = -1;
-static gint hf_sbc_ss_ofdma_downlink_aas_preamble = -1;
-static gint hf_sbc_ss_ofdma_uplink_aas_preamble = -1;
-static gint hf_sbc_ss_ofdma_aas_capabilities_rsvd = -1;
+static gint hf_sbc_number_ul_arq_ack_channel;
+static gint hf_sbc_number_dl_arq_ack_channel;
+static gint hf_sbc_ss_permutation_support;
+static gint hf_sbc_ss_optimal_pusc;
+static gint hf_sbc_ss_optimal_fusc;
+static gint hf_sbc_ss_amc_1x6;
+static gint hf_sbc_ss_amc_2x3;
+static gint hf_sbc_ss_amc_3x2;
+static gint hf_sbc_ss_amc_with_harq_map;
+static gint hf_sbc_ss_tusc1_support;
+static gint hf_sbc_ss_tusc2_support;
+static gint hf_sbc_ss_ofdma_aas_private;
+static gint hf_sbc_ofdma_aas_harq_map_capability;
+static gint hf_sbc_ofdma_aas_private_map_support;
+static gint hf_sbc_ofdma_aas_reduced_private_map_support;
+static gint hf_sbc_ofdma_aas_private_chain_enable;
+static gint hf_sbc_ofdma_aas_private_map_dl_frame_offset;
+static gint hf_sbc_ofdma_aas_private_ul_frame_offset;
+static gint hf_sbc_ofdma_aas_private_map_concurrency;
+static gint hf_sbc_ofdma_aas_capabilities;
+static gint hf_sbc_ss_ofdma_aas_zone;
+static gint hf_sbc_ss_ofdma_aas_diversity_map_scan;
+static gint hf_sbc_ss_ofdma_aas_fbck_rsp_support;
+static gint hf_sbc_ss_ofdma_downlink_aas_preamble;
+static gint hf_sbc_ss_ofdma_uplink_aas_preamble;
+static gint hf_sbc_ss_ofdma_aas_capabilities_rsvd;
 
-static gint hf_sbc_tlv_t_167_association_type_support = -1;
-static gint hf_sbc_tlv_t_167_association_type_support_bit0 = -1;
-static gint hf_sbc_tlv_t_167_association_type_support_bit1 = -1;
-static gint hf_sbc_tlv_t_167_association_type_support_bit2 = -1;
-static gint hf_sbc_tlv_t_167_association_type_support_bit3  = -1;
-static gint hf_sbc_tlv_t_167_association_type_support_bit4 = -1;
-static gint hf_sbc_tlv_t_167_association_type_support_reserved = -1;
-static gint hf_sbc_ofdma_ss_uplink_power_control_support = -1;
-static gint hf_sbc_ofdma_ss_uplink_power_control_support_open_loop = -1;
-static gint hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble = -1;
-static gint hf_sbc_ofdma_ss_uplink_power_control_support_rsvd = -1;
-/* static gint hf_sbc_ofdm_ss_minimum_num_of_frames = -1; */
-static gint hf_sbc_tlv_t_27_extension_capability = -1;
-static gint hf_sbc_tlv_t_27_extension_capability_bit0 = -1;
-static gint hf_sbc_tlv_t_27_extension_capability_reserved = -1;
-static gint hf_sbc_tlv_t_28_ho_trigger_metric_support = -1;
-static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit0 = -1;
-static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1 = -1;
-static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2 = -1;
-static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3 = -1;
-static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved = -1;
-static gint hf_sbc_tlv_t_171_minimum_num_of_frames = -1;
-static gint hf_sbc_tlv_t_172_harq_map_capability = -1;
-static gint hf_sbc_tlv_t_172_extended_harq_ie_capability = -1;
-static gint hf_sbc_tlv_t_172_sub_map_capability_first_zone = -1;
-static gint hf_sbc_tlv_t_172_sub_map_capability_other_zones = -1;
-static gint hf_sbc_tlv_t_172_dl_region_definition_support = -1;
-static gint hf_sbc_tlv_t_172_reserved = -1;
-static gint hf_sbc_tlv_t_172 = -1;
-static gint hf_sbc_tlv_t_173_ul_ctl_channel_support = -1;
-static gint hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback = -1;
-static gint hf_sbc_tlv_t_173_enhanced_fast_feedback = -1;
-static gint hf_sbc_tlv_t_173_ul_ack = -1;
-static gint hf_sbc_tlv_t_173_reserved = -1;
-static gint hf_sbc_tlv_t_173_uep_fast_feedback = -1;
-static gint hf_sbc_tlv_t_173_measurement_report = -1;
-static gint hf_sbc_tlv_t_173_primary_secondary_fast_feedback = -1;
-static gint hf_sbc_tlv_t_173_diuc_cqi_fast_feedback = -1;
-static gint hf_sbc_tlv_t_174_ofdma_ms_csit_capability = -1;
-static gint hf_sbc_tlv_t_174_csit_compatibility_type_a = -1;
-static gint hf_sbc_tlv_t_174_csit_compatibility_type_b = -1;
-static gint hf_sbc_tlv_t_174_power_assignment_capability = -1;
-static gint hf_sbc_tlv_t_174_sounding_rsp_time_capability = -1;
-static gint hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions = -1;
-static gint hf_sbc_tlv_t_174_ss_csit_type_a_support  = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b = -1;
-static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved = -1;
-static gint hf_sbc_tlv_t_174_ss_csit_reserved  = -1;
-static gint hf_sbc_tlv_t_175_max_num_bst_per_frm_capability_harq = -1;
-static gint hf_sbc_tlv_t_175_max_num_ul_harq_bst = -1;
-static gint hf_sbc_tlv_t_175_max_num_ul_harq_per_frm_include_one_non_harq_bst = -1;
-static gint hf_sbc_tlv_t_175_max_num_dl_harq_bst_per_harq_per_frm = -1;
-static gint hf_sbc_tlv_t_176 = -1;
-static gint hf_sbc_tlv_t_176_bit0 = -1;
-static gint hf_sbc_tlv_t_176_bit1 = -1;
-static gint hf_sbc_tlv_t_176_bit2 = -1;
-/* static gint hf_sbc_tlv_t_176_bit2_cor2 = -1; */
-static gint hf_sbc_tlv_t_176_bit3 = -1;
-static gint hf_sbc_tlv_t_176_bit4 = -1;
-static gint hf_sbc_tlv_t_176_bit5 = -1;
-static gint hf_sbc_tlv_t_176_bit6 = -1;
-static gint hf_sbc_tlv_t_176_bit7 = -1;
-static gint hf_sbc_tlv_t_176_bit8 = -1;
-static gint hf_sbc_tlv_t_176_bit9 = -1;
-static gint hf_sbc_tlv_t_176_bit10 = -1;
-static gint hf_sbc_tlv_t_176_bit11 = -1;
-static gint hf_sbc_tlv_t_176_bit12 = -1;
-static gint hf_sbc_tlv_t_176_bit13 = -1;
-static gint hf_sbc_tlv_t_176_bit14 = -1;
-static gint hf_sbc_tlv_t_176_bit15 = -1;
-static gint hf_sbc_tlv_t_176_bit16 = -1;
-static gint hf_sbc_tlv_t_176_bit17 = -1;
-static gint hf_sbc_tlv_t_176_bit18 = -1;
-static gint hf_sbc_tlv_t_176_bit19 = -1;
-static gint hf_sbc_tlv_t_176_reserved = -1;
-static gint hf_sbc_tlv_t_177_ofdma_ss_modulator_for_mimo_support = -1;
-static gint hf_sbc_tlv_t_177_stc_matrix_a = -1;
-static gint hf_sbc_tlv_t_177_stc_matrix_b_vertical = -1;
-static gint hf_sbc_tlv_t_177_stc_matrix_b_horizontal = -1;
-static gint hf_sbc_tlv_t_177_two_transmit_antennas = -1;
-static gint hf_sbc_tlv_t_177_capable_of_transmit_diversity = -1;
-static gint hf_sbc_tlv_t_177_capable_of_spacial_multiplexing = -1;
-static gint hf_sbc_tlv_t_177_beamforming = -1;
-static gint hf_sbc_tlv_t_177_adaptive_rate_ctl = -1;
-static gint hf_sbc_tlv_t_177_single_antenna = -1;
-static gint hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna = -1;
-static gint hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas = -1;
-static gint hf_sbc_tlv_t_177_capable_of_two_antenna = -1;
-static gint hf_sbc_tlv_t_177_rsvd = -1;
-static gint hf_sbc_tlv_t_178_sdma_pilot_capability = -1;
-static gint hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone = -1;
-static gint hf_sbc_tlv_t_178_reserved = -1;
-static gint hf_sbc_tlv_t_179_ofdma_multiple_dl_burst_profile_support = -1;
-static gint hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec = -1;
-static gint hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec = -1;
-static gint hf_sbc_tlv_t_179_reserved = -1;
-static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability = -1;
-static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP = -1;
-static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl = -1;
-static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul = -1;
-static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1 = -1;
-static gint hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP = -1;
-static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2 = -1;
-static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability = -1;
-static gint hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining = -1;
-static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl = -1;
-static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1 = -1;
-static gint hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining = -1;
-static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul = -1;
-static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2 = -1;
+static gint hf_sbc_tlv_t_167_association_type_support;
+static gint hf_sbc_tlv_t_167_association_type_support_bit0;
+static gint hf_sbc_tlv_t_167_association_type_support_bit1;
+static gint hf_sbc_tlv_t_167_association_type_support_bit2;
+static gint hf_sbc_tlv_t_167_association_type_support_bit3;
+static gint hf_sbc_tlv_t_167_association_type_support_bit4;
+static gint hf_sbc_tlv_t_167_association_type_support_reserved;
+static gint hf_sbc_ofdma_ss_uplink_power_control_support;
+static gint hf_sbc_ofdma_ss_uplink_power_control_support_open_loop;
+static gint hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble;
+static gint hf_sbc_ofdma_ss_uplink_power_control_support_rsvd;
+/* static gint hf_sbc_ofdm_ss_minimum_num_of_frames; */
+static gint hf_sbc_tlv_t_27_extension_capability;
+static gint hf_sbc_tlv_t_27_extension_capability_bit0;
+static gint hf_sbc_tlv_t_27_extension_capability_reserved;
+static gint hf_sbc_tlv_t_28_ho_trigger_metric_support;
+static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit0;
+static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1;
+static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2;
+static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3;
+static gint hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved;
+static gint hf_sbc_tlv_t_171_minimum_num_of_frames;
+static gint hf_sbc_tlv_t_172_harq_map_capability;
+static gint hf_sbc_tlv_t_172_extended_harq_ie_capability;
+static gint hf_sbc_tlv_t_172_sub_map_capability_first_zone;
+static gint hf_sbc_tlv_t_172_sub_map_capability_other_zones;
+static gint hf_sbc_tlv_t_172_dl_region_definition_support;
+static gint hf_sbc_tlv_t_172_reserved;
+static gint hf_sbc_tlv_t_172;
+static gint hf_sbc_tlv_t_173_ul_ctl_channel_support;
+static gint hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback;
+static gint hf_sbc_tlv_t_173_enhanced_fast_feedback;
+static gint hf_sbc_tlv_t_173_ul_ack;
+static gint hf_sbc_tlv_t_173_reserved;
+static gint hf_sbc_tlv_t_173_uep_fast_feedback;
+static gint hf_sbc_tlv_t_173_measurement_report;
+static gint hf_sbc_tlv_t_173_primary_secondary_fast_feedback;
+static gint hf_sbc_tlv_t_173_diuc_cqi_fast_feedback;
+static gint hf_sbc_tlv_t_174_ofdma_ms_csit_capability;
+static gint hf_sbc_tlv_t_174_csit_compatibility_type_a;
+static gint hf_sbc_tlv_t_174_csit_compatibility_type_b;
+static gint hf_sbc_tlv_t_174_power_assignment_capability;
+static gint hf_sbc_tlv_t_174_sounding_rsp_time_capability;
+static gint hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions;
+static gint hf_sbc_tlv_t_174_ss_csit_type_a_support;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b;
+static gint hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved;
+static gint hf_sbc_tlv_t_174_ss_csit_reserved;
+static gint hf_sbc_tlv_t_175_max_num_bst_per_frm_capability_harq;
+static gint hf_sbc_tlv_t_175_max_num_ul_harq_bst;
+static gint hf_sbc_tlv_t_175_max_num_ul_harq_per_frm_include_one_non_harq_bst;
+static gint hf_sbc_tlv_t_175_max_num_dl_harq_bst_per_harq_per_frm;
+static gint hf_sbc_tlv_t_176;
+static gint hf_sbc_tlv_t_176_bit0;
+static gint hf_sbc_tlv_t_176_bit1;
+static gint hf_sbc_tlv_t_176_bit2;
+/* static gint hf_sbc_tlv_t_176_bit2_cor2; */
+static gint hf_sbc_tlv_t_176_bit3;
+static gint hf_sbc_tlv_t_176_bit4;
+static gint hf_sbc_tlv_t_176_bit5;
+static gint hf_sbc_tlv_t_176_bit6;
+static gint hf_sbc_tlv_t_176_bit7;
+static gint hf_sbc_tlv_t_176_bit8;
+static gint hf_sbc_tlv_t_176_bit9;
+static gint hf_sbc_tlv_t_176_bit10;
+static gint hf_sbc_tlv_t_176_bit11;
+static gint hf_sbc_tlv_t_176_bit12;
+static gint hf_sbc_tlv_t_176_bit13;
+static gint hf_sbc_tlv_t_176_bit14;
+static gint hf_sbc_tlv_t_176_bit15;
+static gint hf_sbc_tlv_t_176_bit16;
+static gint hf_sbc_tlv_t_176_bit17;
+static gint hf_sbc_tlv_t_176_bit18;
+static gint hf_sbc_tlv_t_176_bit19;
+static gint hf_sbc_tlv_t_176_reserved;
+static gint hf_sbc_tlv_t_177_ofdma_ss_modulator_for_mimo_support;
+static gint hf_sbc_tlv_t_177_stc_matrix_a;
+static gint hf_sbc_tlv_t_177_stc_matrix_b_vertical;
+static gint hf_sbc_tlv_t_177_stc_matrix_b_horizontal;
+static gint hf_sbc_tlv_t_177_two_transmit_antennas;
+static gint hf_sbc_tlv_t_177_capable_of_transmit_diversity;
+static gint hf_sbc_tlv_t_177_capable_of_spacial_multiplexing;
+static gint hf_sbc_tlv_t_177_beamforming;
+static gint hf_sbc_tlv_t_177_adaptive_rate_ctl;
+static gint hf_sbc_tlv_t_177_single_antenna;
+static gint hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna;
+static gint hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas;
+static gint hf_sbc_tlv_t_177_capable_of_two_antenna;
+static gint hf_sbc_tlv_t_177_rsvd;
+static gint hf_sbc_tlv_t_178_sdma_pilot_capability;
+static gint hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone;
+static gint hf_sbc_tlv_t_178_reserved;
+static gint hf_sbc_tlv_t_179_ofdma_multiple_dl_burst_profile_support;
+static gint hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec;
+static gint hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec;
+static gint hf_sbc_tlv_t_179_reserved;
+static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability;
+static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP;
+static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl;
+static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul;
+static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1;
+static gint hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP;
+static gint hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2;
+static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability;
+static gint hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining;
+static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl;
+static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1;
+static gint hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining;
+static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul;
+static gint hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2;
 
-static gint hf_sbc_ss_demodulator_mimo_support = -1;
-static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_a = -1;
-static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_vertical = -1;
-static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_horizontal = -1;
-static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_a = -1;
-static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_vertical = -1;
-static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal = -1;
-static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical = -1;
-static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal = -1;
-static gint hf_sbc_ss_demodulator_mimo_rsvd = -1;
-static gint hf_sbc_ss_mimo_uplink_support = -1;
-static gint hf_sbc_ss_mimo_uplink_support_2_ann_sttd = -1;
-static gint hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical = -1;
-static gint hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm = -1;
-static gint hf_sbc_ss_mimo_uplink_support_rsvd = -1;
+static gint hf_sbc_ss_demodulator_mimo_support;
+static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_a;
+static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_vertical;
+static gint hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_horizontal;
+static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_a;
+static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_vertical;
+static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal;
+static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical;
+static gint hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal;
+static gint hf_sbc_ss_demodulator_mimo_rsvd;
+static gint hf_sbc_ss_mimo_uplink_support;
+static gint hf_sbc_ss_mimo_uplink_support_2_ann_sttd;
+static gint hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical;
+static gint hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm;
+static gint hf_sbc_ss_mimo_uplink_support_rsvd;
 
-static gint hf_sbc_power_save_class_types_capability = -1;
-static gint hf_sbc_power_save_class_types_capability_bit0 = -1;
-static gint hf_sbc_power_save_class_types_capability_bit1 = -1;
-static gint hf_sbc_power_save_class_types_capability_bit2 = -1;
-static gint hf_sbc_power_save_class_types_capability_bits34 = -1;
-static gint hf_sbc_power_save_class_types_capability_bits567 = -1;
+static gint hf_sbc_power_save_class_types_capability;
+static gint hf_sbc_power_save_class_types_capability_bit0;
+static gint hf_sbc_power_save_class_types_capability_bit1;
+static gint hf_sbc_power_save_class_types_capability_bit2;
+static gint hf_sbc_power_save_class_types_capability_bits34;
+static gint hf_sbc_power_save_class_types_capability_bits567;
 
-static gint hf_sbc_pkm_flow_control = -1;
-static gint hf_sbc_auth_policy = -1;
-static gint hf_sbc_privacy_802_16 = -1;
-static gint hf_sbc_privacy_rsvd = -1;
-static gint hf_sbc_max_security_associations = -1;
+static gint hf_sbc_pkm_flow_control;
+static gint hf_sbc_auth_policy;
+static gint hf_sbc_privacy_802_16;
+static gint hf_sbc_privacy_rsvd;
+static gint hf_sbc_max_security_associations;
 
-static gint hf_sbc_invalid_tlv = -1;
+static gint hf_sbc_invalid_tlv;
 
 static const true_false_string tfs_sbc_bw_alloc_support_duplex =
 {
diff --git a/plugins/epan/wimax/msg_ucd.c b/plugins/epan/wimax/msg_ucd.c
index ab6d811d75..5ad333cf77 100644
--- a/plugins/epan/wimax/msg_ucd.c
+++ b/plugins/epan/wimax/msg_ucd.c
@@ -34,90 +34,90 @@ extern gboolean include_cor2_changes;
 
 guint cqich_id_size;		/* Set for CQICH_Alloc_IE */
 
-static gint proto_mac_mgmt_msg_ucd_decoder = -1;
-static gint ett_mac_mgmt_msg_ucd_decoder = -1;
+static gint proto_mac_mgmt_msg_ucd_decoder;
+static gint ett_mac_mgmt_msg_ucd_decoder;
 
 /* fix fields */
-static gint hf_ucd_res_timeout = -1;
-static gint hf_ucd_bw_req_size = -1;
-static gint hf_ucd_ranging_req_size = -1;
-static gint hf_ucd_freq = -1;
-/* static gint hf_ucd_subchan_params_num_chan = -1; */
-static gint hf_ucd_ul_allocated_subchannles_bitmap = -1;
-/* static gint hf_ucd_subchan_params_num_sym = -1; */
-/* static gint hf_ucd_subchan_codes = -1; */
+static gint hf_ucd_res_timeout;
+static gint hf_ucd_bw_req_size;
+static gint hf_ucd_ranging_req_size;
+static gint hf_ucd_freq;
+/* static gint hf_ucd_subchan_params_num_chan; */
+static gint hf_ucd_ul_allocated_subchannles_bitmap;
+/* static gint hf_ucd_subchan_params_num_sym; */
+/* static gint hf_ucd_subchan_codes; */
 
-static gint hf_ucd_ul_burst_reserved = -1;
-static gint hf_ucd_ul_burst_uiuc = -1;
-static gint hf_ucd_burst_fec = -1;
-static gint hf_ucd_burst_ranging_data_ratio = -1;
-/*static gint hf_ucd_burst_power_boost = -1;
-*static gint hf_ucd_burst_tcs_enable = -1;
+static gint hf_ucd_ul_burst_reserved;
+static gint hf_ucd_ul_burst_uiuc;
+static gint hf_ucd_burst_fec;
+static gint hf_ucd_burst_ranging_data_ratio;
+/*static gint hf_ucd_burst_power_boost;
+*static gint hf_ucd_burst_tcs_enable;
 */
 
-static gint hf_ucd_tlv_t_159_band_amc_allocation_threshold = -1;
-static gint hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap = -1;
-static gint hf_ucd_tlv_t_160_band_amc_release_threshold = -1;
-static gint hf_ucd_tlv_t_161_band_amc_allocation_timer = -1;
-static gint hf_ucd_tlv_t_162_band_amc_release_timer = -1;
-static gint hf_ucd_tlv_t_163_band_status_report_max_period = -1;
-static gint hf_ucd_tlv_t_164_band_amc_retry_timer = -1;
-static gint hf_ucd_tlv_t_171_harq_ack_delay_dl_burst = -1;
-static gint hf_ucd_tlv_t_170_safety_channel_retry_timer = -1;
-static gint hf_ucd_tlv_t_172_cqich_band_amc_transition_delay = -1;
-static gint hf_ucd_tlv_t_174_maximum_retransmission = -1;
-static gint hf_ucd_tlv_t_177_normalized_cn_override2 = -1;
-static gint hf_ucd_tlv_t_177_normalized_cn_override2_first_line = -1;
-static gint hf_ucd_tlv_t_177_normalized_cn_override2_list = -1;
-static gint hf_ucd_tlv_t_176_size_of_cqich_id_field  = -1;
-static gint hf_ucd_tlv_t_186_upper_bound_aas_preamble = -1;
-static gint hf_ucd_tlv_t_187_lower_bound_aas_preamble = -1;
-static gint hf_ucd_tlv_t_188_allow_aas_beam_select_message = -1;
-static gint hf_ucd_tlv_t_189_use_cqich_indication_flag = -1;
-static gint hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step = -1;
-static gint hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step = -1;
-static gint hf_ucd_tlv_t_192_min_level_power_offset_adjustment = -1;
-static gint hf_ucd_tlv_t_193_max_level_power_offset_adjustment = -1;
-static gint hf_ucd_tlv_t_194_handover_ranging_codes = -1;
-static gint hf_ucd_tlv_t_195_initial_ranging_interval = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report_threshold = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report_interval = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report_threshold_icqch = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report_interval_icqch = -1;
-static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch = -1;
-/* static gint hf_ucd_tlv_t_197_normalized_cn_channel_sounding = -1; */
-static gint hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types = -1;
-static gint hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation = -1;
-static gint hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst = -1;
-static gint hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg = -1;
-static gint hf_ucd_tlv_t_207_ul_initial_transmit_timing = -1;
-static gint hf_ucd_tlv_t_210_fast_feedback_region = -1;
-static gint hf_ucd_tlv_t_211_harq_ack_region = -1;
-static gint hf_ucd_tlv_t_212_ranging_region = -1;
-static gint hf_ucd_tlv_t_213_sounding_region = -1;
-static gint hf_ucd_tlv_t_150_initial_ranging_codes = -1;
-static gint hf_ucd_tlv_t_151_periodic_ranging_codes = -1;
-static gint hf_ucd_tlv_t_152_bandwidth_request_codes = -1;
-static gint hf_ucd_tlv_t_155_start_of_ranging_codes_group = -1;
-static gint hf_ucd_tlv_t_156_permutation_base = -1;
-static gint hf_ucd_ho_ranging_start = -1;
-static gint hf_ucd_ho_ranging_end = -1;
-static gint hf_ucd_initial_range_backoff_start = -1;
-static gint hf_ucd_initial_range_backoff_end = -1;
-static gint hf_ucd_bandwidth_backoff_start = -1;
-static gint hf_ucd_bandwidth_backoff_end = -1;
-static gint hf_ucd_periodic_ranging_backoff_start = -1;
-static gint hf_ucd_periodic_ranging_backoff_end = -1;
-static gint hf_ucd_config_change_count = -1;
-static gint hf_ucd_ranging_backoff_start = -1;
-static gint hf_ucd_ranging_backoff_end = -1;
-static gint hf_ucd_request_backoff_start = -1;
-static gint hf_ucd_request_backoff_end = -1;
+static gint hf_ucd_tlv_t_159_band_amc_allocation_threshold;
+static gint hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap;
+static gint hf_ucd_tlv_t_160_band_amc_release_threshold;
+static gint hf_ucd_tlv_t_161_band_amc_allocation_timer;
+static gint hf_ucd_tlv_t_162_band_amc_release_timer;
+static gint hf_ucd_tlv_t_163_band_status_report_max_period;
+static gint hf_ucd_tlv_t_164_band_amc_retry_timer;
+static gint hf_ucd_tlv_t_171_harq_ack_delay_dl_burst;
+static gint hf_ucd_tlv_t_170_safety_channel_retry_timer;
+static gint hf_ucd_tlv_t_172_cqich_band_amc_transition_delay;
+static gint hf_ucd_tlv_t_174_maximum_retransmission;
+static gint hf_ucd_tlv_t_177_normalized_cn_override2;
+static gint hf_ucd_tlv_t_177_normalized_cn_override2_first_line;
+static gint hf_ucd_tlv_t_177_normalized_cn_override2_list;
+static gint hf_ucd_tlv_t_176_size_of_cqich_id_field;
+static gint hf_ucd_tlv_t_186_upper_bound_aas_preamble;
+static gint hf_ucd_tlv_t_187_lower_bound_aas_preamble;
+static gint hf_ucd_tlv_t_188_allow_aas_beam_select_message;
+static gint hf_ucd_tlv_t_189_use_cqich_indication_flag;
+static gint hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step;
+static gint hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step;
+static gint hf_ucd_tlv_t_192_min_level_power_offset_adjustment;
+static gint hf_ucd_tlv_t_193_max_level_power_offset_adjustment;
+static gint hf_ucd_tlv_t_194_handover_ranging_codes;
+static gint hf_ucd_tlv_t_195_initial_ranging_interval;
+static gint hf_ucd_tlv_t_196_tx_power_report;
+static gint hf_ucd_tlv_t_196_tx_power_report_threshold;
+static gint hf_ucd_tlv_t_196_tx_power_report_interval;
+static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg;
+static gint hf_ucd_tlv_t_196_tx_power_report_threshold_icqch;
+static gint hf_ucd_tlv_t_196_tx_power_report_interval_icqch;
+static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch;
+/* static gint hf_ucd_tlv_t_197_normalized_cn_channel_sounding; */
+static gint hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types;
+static gint hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation;
+static gint hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst;
+static gint hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg;
+static gint hf_ucd_tlv_t_207_ul_initial_transmit_timing;
+static gint hf_ucd_tlv_t_210_fast_feedback_region;
+static gint hf_ucd_tlv_t_211_harq_ack_region;
+static gint hf_ucd_tlv_t_212_ranging_region;
+static gint hf_ucd_tlv_t_213_sounding_region;
+static gint hf_ucd_tlv_t_150_initial_ranging_codes;
+static gint hf_ucd_tlv_t_151_periodic_ranging_codes;
+static gint hf_ucd_tlv_t_152_bandwidth_request_codes;
+static gint hf_ucd_tlv_t_155_start_of_ranging_codes_group;
+static gint hf_ucd_tlv_t_156_permutation_base;
+static gint hf_ucd_ho_ranging_start;
+static gint hf_ucd_ho_ranging_end;
+static gint hf_ucd_initial_range_backoff_start;
+static gint hf_ucd_initial_range_backoff_end;
+static gint hf_ucd_bandwidth_backoff_start;
+static gint hf_ucd_bandwidth_backoff_end;
+static gint hf_ucd_periodic_ranging_backoff_start;
+static gint hf_ucd_periodic_ranging_backoff_end;
+static gint hf_ucd_config_change_count;
+static gint hf_ucd_ranging_backoff_start;
+static gint hf_ucd_ranging_backoff_end;
+static gint hf_ucd_request_backoff_start;
+static gint hf_ucd_request_backoff_end;
 
-/* static gint hf_ucd_unknown_type = -1; */
-static gint hf_ucd_invalid_tlv = -1;
+/* static gint hf_ucd_unknown_type; */
+static gint hf_ucd_invalid_tlv;
 
 #if 0
 static const value_string vals_dcd_burst_tcs[] =
diff --git a/plugins/epan/wimax/msg_ulmap.c b/plugins/epan/wimax/msg_ulmap.c
index b4909cc5df..cdb0066c50 100644
--- a/plugins/epan/wimax/msg_ulmap.c
+++ b/plugins/epan/wimax/msg_ulmap.c
@@ -57,54 +57,54 @@ extern gint ir_type;
 extern gint N_layer;
 extern gint RCID_Type;
 
-static gint proto_mac_mgmt_msg_ulmap_decoder = -1;
-
-static gint ett_ulmap = -1;
-static gint ett_ulmap_ie = -1;
-static gint ett_ulmap_ffb = -1;
-/* static gint ett_ulmap_c = -1;    */
-/* static gint ett_ulmap_c_ie = -1; */
-/* static gint ett_ulmap_s = -1;    */
-/* static gint ett_ulmap_s_ie = -1; */
-static gint ett_287_1 = -1;
-static gint ett_287_2 = -1;
-static gint ett_289 = -1;
-static gint ett_290 = -1;
-static gint ett_290b = -1;
-static gint ett_291 = -1;
-static gint ett_292 = -1;
-static gint ett_293 = -1;
-static gint ett_294 = -1;
-static gint ett_295 = -1;
-static gint ett_299 = -1;
-static gint ett_300 = -1;
-static gint ett_302 = -1;
-static gint ett_302a = -1;
-static gint ett_302b = -1;
-static gint ett_302c = -1;
-static gint ett_302d = -1;
-static gint ett_302e = -1;
-static gint ett_302f = -1;
-static gint ett_302g = -1;
-static gint ett_302h = -1;
-static gint ett_302i = -1;
-static gint ett_302j = -1;
-static gint ett_302k = -1;
-static gint ett_302l = -1;
-static gint ett_302m = -1;
-static gint ett_302n = -1;
-static gint ett_302o = -1;
-static gint ett_302p = -1;
-static gint ett_302q = -1;
-static gint ett_302r = -1;
-static gint ett_302s = -1;
-static gint ett_302t = -1;
-static gint ett_302u = -1;
-static gint ett_302v = -1;
-static gint ett_306 = -1;
-static gint ett_306_ul = -1;
-static gint ett_308b = -1;
-static gint ett_315d = -1;
+static gint proto_mac_mgmt_msg_ulmap_decoder;
+
+static gint ett_ulmap;
+static gint ett_ulmap_ie;
+static gint ett_ulmap_ffb;
+/* static gint ett_ulmap_c;    */
+/* static gint ett_ulmap_c_ie; */
+/* static gint ett_ulmap_s;    */
+/* static gint ett_ulmap_s_ie; */
+static gint ett_287_1;
+static gint ett_287_2;
+static gint ett_289;
+static gint ett_290;
+static gint ett_290b;
+static gint ett_291;
+static gint ett_292;
+static gint ett_293;
+static gint ett_294;
+static gint ett_295;
+static gint ett_299;
+static gint ett_300;
+static gint ett_302;
+static gint ett_302a;
+static gint ett_302b;
+static gint ett_302c;
+static gint ett_302d;
+static gint ett_302e;
+static gint ett_302f;
+static gint ett_302g;
+static gint ett_302h;
+static gint ett_302i;
+static gint ett_302j;
+static gint ett_302k;
+static gint ett_302l;
+static gint ett_302m;
+static gint ett_302n;
+static gint ett_302o;
+static gint ett_302p;
+static gint ett_302q;
+static gint ett_302r;
+static gint ett_302s;
+static gint ett_302t;
+static gint ett_302u;
+static gint ett_302v;
+static gint ett_306;
+static gint ett_306_ul;
+static gint ett_308b;
+static gint ett_315d;
 
 #define DCD_DOWNLINK_BURST_PROFILE        1
 #define DCD_BS_EIRP                       2
@@ -196,348 +196,348 @@ static const value_string boost_msgs[] =
 #endif
 
 /* ul-map fields */
-static gint hf_ulmap_reserved = -1;
-static gint hf_ulmap_ucd_count = -1;
-static gint hf_ulmap_alloc_start_time = -1;
-static gint hf_ulmap_ofdma_sym = -1;
-static gint hf_ulmap_ie_diuc_ext = -1;
-static gint hf_ulmap_ie_diuc_ext2 = -1;
-static gint hf_ulmap_ie_length = -1;
-static gint hf_ulmap_ie_reserved_extended2_duic = -1;
-static gint hf_ulmap_ie_reserved_extended_duic = -1;
-/* static gint hf_ulmap_fch_expected = -1; */
-
-/* static gint hf_ulmap_ie = -1; */
-
-static gint hf_ulmap_ie_cid      = -1;
-static gint hf_ulmap_ie_uiuc     = -1;
-static gint hf_ulmap_uiuc12_symofs = -1;
-static gint hf_ulmap_uiuc12_subofs = -1;
-static gint hf_ulmap_uiuc12_numsym = -1;
-static gint hf_ulmap_uiuc12_numsub = -1;
-static gint hf_ulmap_uiuc12_method = -1;
-static gint hf_ulmap_uiuc12_dri    = -1;
-static gint hf_ulmap_uiuc10_dur    = -1;
-static gint hf_ulmap_uiuc10_rep    = -1;
-static gint hf_ulmap_uiuc10_slot_offset = -1;
-
-static gint hf_ulmap_uiuc14_dur  = -1;
-static gint hf_ulmap_uiuc14_uiuc = -1;
-static gint hf_ulmap_uiuc14_rep  = -1;
-static gint hf_ulmap_uiuc14_idx  = -1;
-static gint hf_ulmap_uiuc14_code = -1;
-static gint hf_ulmap_uiuc14_sym  = -1;
-static gint hf_ulmap_uiuc14_sub  = -1;
-static gint hf_ulmap_uiuc14_bwr  = -1;
-
-/* static gint hf_ulmap_uiuc11_ext = -1; */
-/* static gint hf_ulmap_uiuc11_len = -1; */
-/* static gint hf_ulmap_uiuc11_data = -1; */
-/* static gint hf_ulmap_uiuc15_ext = -1; */
-/* static gint hf_ulmap_uiuc15_len = -1; */
-/* static gint hf_ulmap_uiuc15_data = -1; */
-
-static gint hf_ulmap_uiuc0_symofs = -1;
-static gint hf_ulmap_uiuc0_subofs = -1;
-static gint hf_ulmap_uiuc0_numsym = -1;
-static gint hf_ulmap_uiuc0_numsub = -1;
-static gint hf_ulmap_uiuc0_rsv    = -1;
-
-static gint hf_ulmap_uiuc13_symofs = -1;
-static gint hf_ulmap_uiuc13_subofs = -1;
-static gint hf_ulmap_uiuc13_numsym = -1;
-static gint hf_ulmap_uiuc13_numsub = -1;
-static gint hf_ulmap_uiuc13_papr   = -1;
-static gint hf_ulmap_uiuc13_zone   = -1;
-static gint hf_ulmap_uiuc13_rsv    = -1;
-/* static gint hf_ulmap_crc16         = -1; */
-/* static gint hf_ulmap_crc16_status = -1; */
-static gint hf_ulmap_padding       = -1;
+static gint hf_ulmap_reserved;
+static gint hf_ulmap_ucd_count;
+static gint hf_ulmap_alloc_start_time;
+static gint hf_ulmap_ofdma_sym;
+static gint hf_ulmap_ie_diuc_ext;
+static gint hf_ulmap_ie_diuc_ext2;
+static gint hf_ulmap_ie_length;
+static gint hf_ulmap_ie_reserved_extended2_duic;
+static gint hf_ulmap_ie_reserved_extended_duic;
+/* static gint hf_ulmap_fch_expected; */
+
+/* static gint hf_ulmap_ie; */
+
+static gint hf_ulmap_ie_cid;
+static gint hf_ulmap_ie_uiuc;
+static gint hf_ulmap_uiuc12_symofs;
+static gint hf_ulmap_uiuc12_subofs;
+static gint hf_ulmap_uiuc12_numsym;
+static gint hf_ulmap_uiuc12_numsub;
+static gint hf_ulmap_uiuc12_method;
+static gint hf_ulmap_uiuc12_dri;
+static gint hf_ulmap_uiuc10_dur;
+static gint hf_ulmap_uiuc10_rep;
+static gint hf_ulmap_uiuc10_slot_offset;
+
+static gint hf_ulmap_uiuc14_dur;
+static gint hf_ulmap_uiuc14_uiuc;
+static gint hf_ulmap_uiuc14_rep;
+static gint hf_ulmap_uiuc14_idx;
+static gint hf_ulmap_uiuc14_code;
+static gint hf_ulmap_uiuc14_sym;
+static gint hf_ulmap_uiuc14_sub;
+static gint hf_ulmap_uiuc14_bwr;
+
+/* static gint hf_ulmap_uiuc11_ext; */
+/* static gint hf_ulmap_uiuc11_len; */
+/* static gint hf_ulmap_uiuc11_data; */
+/* static gint hf_ulmap_uiuc15_ext; */
+/* static gint hf_ulmap_uiuc15_len; */
+/* static gint hf_ulmap_uiuc15_data; */
+
+static gint hf_ulmap_uiuc0_symofs;
+static gint hf_ulmap_uiuc0_subofs;
+static gint hf_ulmap_uiuc0_numsym;
+static gint hf_ulmap_uiuc0_numsub;
+static gint hf_ulmap_uiuc0_rsv;
+
+static gint hf_ulmap_uiuc13_symofs;
+static gint hf_ulmap_uiuc13_subofs;
+static gint hf_ulmap_uiuc13_numsym;
+static gint hf_ulmap_uiuc13_numsub;
+static gint hf_ulmap_uiuc13_papr;
+static gint hf_ulmap_uiuc13_zone;
+static gint hf_ulmap_uiuc13_rsv;
+/* static gint hf_ulmap_crc16; */
+/* static gint hf_ulmap_crc16_status; */
+static gint hf_ulmap_padding;
 
 /* Generated via "one time" script to help create filterable fields */
-static int hf_ulmap_dedicated_ul_control_length = -1;
-static int hf_ulmap_dedicated_ul_control_control_header = -1;
-static int hf_ulmap_dedicated_ul_control_num_sdma_layers = -1;
-static int hf_ulmap_dedicated_ul_control_pilot_pattern = -1;
-static int hf_ulmap_dedicated_mimo_ul_control_matrix = -1;
-static int hf_ulmap_dedicated_mimo_ul_control_n_layer = -1;
-static int hf_ulmap_harq_chase_dedicated_ul_control_indicator = -1;
-static int hf_ulmap_harq_chase_uiuc = -1;
-static int hf_ulmap_harq_chase_repetition_coding_indication = -1;
-static int hf_ulmap_harq_chase_duration = -1;
-static int hf_ulmap_harq_chase_acid = -1;
-static int hf_ulmap_harq_chase_ai_sn = -1;
-static int hf_ulmap_harq_chase_ack_disable = -1;
-static int hf_ulmap_reserved_uint = -1;
-static int hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator = -1;
-static int hf_ulmap_harq_ir_ctc_nep = -1;
-static int hf_ulmap_harq_ir_ctc_nsch = -1;
-static int hf_ulmap_harq_ir_ctc_spid = -1;
-static int hf_ulmap_harq_ir_ctc_acin = -1;
-static int hf_ulmap_harq_ir_ctc_ai_sn = -1;
-static int hf_ulmap_harq_ir_ctc_ack_disable = -1;
-static int hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator = -1;
-static int hf_ulmap_harq_ir_cc_uiuc = -1;
-static int hf_ulmap_harq_ir_cc_repetition_coding_indication = -1;
-static int hf_ulmap_harq_ir_cc_duration = -1;
-static int hf_ulmap_harq_ir_cc_spid = -1;
-static int hf_ulmap_harq_ir_cc_acid = -1;
-static int hf_ulmap_harq_ir_cc_ai_sn = -1;
-static int hf_ulmap_harq_ir_cc_ack_disable = -1;
-static int hf_ulmap_mimo_ul_chase_harq_mu_indicator = -1;
-static int hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator = -1;
-static int hf_ulmap_mimo_ul_chase_harq_ack_disable = -1;
-static int hf_ulmap_mimo_ul_chase_harq_matrix = -1;
-static int hf_ulmap_mimo_ul_chase_harq_duration = -1;
-static int hf_ulmap_mimo_ul_chase_harq_uiuc = -1;
-static int hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication = -1;
-static int hf_ulmap_mimo_ul_chase_harq_acid = -1;
-static int hf_ulmap_mimo_ul_chase_harq_ai_sn = -1;
-static int hf_ulmap_mimo_ul_ir_harq_mu_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_ack_disable = -1;
-static int hf_ulmap_mimo_ul_ir_harq_matrix = -1;
-static int hf_ulmap_mimo_ul_ir_harq_nsch = -1;
-static int hf_ulmap_mimo_ul_ir_harq_nep = -1;
-static int hf_ulmap_mimo_ul_ir_harq_spid = -1;
-static int hf_ulmap_mimo_ul_ir_harq_acid = -1;
-static int hf_ulmap_mimo_ul_ir_harq_ai_sn = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_ack_disable = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_matrix = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_duration = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_uiuc = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_acid = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_ai_sn = -1;
-static int hf_ulmap_mimo_ul_ir_harq_cc_spid = -1;
-static int hf_ulmap_mimo_ul_stc_harq_tx_count = -1;
-static int hf_ulmap_mimo_ul_stc_harq_duration = -1;
-static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication = -1;
-static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset = -1;
-static int hf_ulmap_mimo_ul_stc_harq_ack_disable = -1;
-static int hf_ulmap_mimo_ul_stc_harq_uiuc = -1;
-static int hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication = -1;
-static int hf_ulmap_mimo_ul_stc_harq_acid = -1;
-static int hf_ulmap_power_control = -1;
-static int hf_ulmap_power_measurement_frame = -1;
-static int hf_ulmap_mini_subcha_alloc_extended_2_uiuc = -1;
-static int hf_ulmap_mini_subcha_alloc_length = -1;
-static int hf_ulmap_mini_subcha_alloc_ctype = -1;
-static int hf_ulmap_mini_subcha_alloc_duration = -1;
-static int hf_ulmap_mini_subcha_alloc_cid = -1;
-static int hf_ulmap_mini_subcha_alloc_uiuc = -1;
-static int hf_ulmap_mini_subcha_alloc_repetition = -1;
-static int hf_ulmap_mini_subcha_alloc_padding = -1;
-static int hf_ulmap_aas_ul_extended_uiuc = -1;
-static int hf_ulmap_aas_ul_length = -1;
-static int hf_ulmap_aas_ul_permutation = -1;
-static int hf_ulmap_aas_ul_ul_permbase = -1;
-static int hf_ulmap_aas_ul_ofdma_symbol_offset = -1;
-static int hf_ulmap_aas_ul_aas_zone_length = -1;
-static int hf_ulmap_aas_ul_uplink_preamble_config = -1;
-static int hf_ulmap_aas_ul_preamble_type = -1;
-static int hf_ulmap_cqich_alloc_extended_uiuc = -1;
-static int hf_ulmap_cqich_alloc_length = -1;
-static int hf_ulmap_cqich_alloc_cqich_id = -1;
-static int hf_ulmap_cqich_alloc_allocation_offset = -1;
-static int hf_ulmap_cqich_alloc_period = -1;
-static int hf_ulmap_cqich_alloc_frame_offset = -1;
-static int hf_ulmap_cqich_alloc_duration = -1;
-static int hf_ulmap_cqich_alloc_report_configuration_included = -1;
-static int hf_ulmap_cqich_alloc_feedback_type = -1;
-static int hf_ulmap_cqich_alloc_report_type = -1;
-static int hf_ulmap_cqich_alloc_cinr_preamble_report_type = -1;
-static int hf_ulmap_cqich_alloc_zone_permutation = -1;
-static int hf_ulmap_cqich_alloc_zone_type = -1;
-static int hf_ulmap_cqich_alloc_zone_prbs_id = -1;
-static int hf_ulmap_cqich_alloc_major_group_indication = -1;
-static int hf_ulmap_cqich_alloc_pusc_major_group_bitmap = -1;
-static int hf_ulmap_cqich_alloc_cinr_zone_measurement_type = -1;
-static int hf_ulmap_cqich_alloc_averaging_parameter_included = -1;
-static int hf_ulmap_cqich_alloc_averaging_parameter = -1;
-static int hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle = -1;
-static int hf_ulmap_zone_extended_uiuc = -1;
-static int hf_ulmap_zone_length = -1;
-static int hf_ulmap_zone_ofdma_symbol_offset = -1;
-static int hf_ulmap_zone_permutation = -1;
-static int hf_ulmap_zone_ul_permbase = -1;
-static int hf_ulmap_zone_amc_type = -1;
-static int hf_ulmap_zone_use_all_sc_indicator = -1;
-static int hf_ulmap_zone_disable_subchannel_rotation = -1;
-static int hf_ulmap_phymod_ul_extended_uiuc = -1;
-static int hf_ulmap_phymod_ul_length = -1;
-static int hf_ulmap_phymod_ul_preamble_modifier_type = -1;
-static int hf_ulmap_phymod_ul_preamble_frequency_shift_index = -1;
-static int hf_ulmap_phymod_ul_preamble_time_shift_index = -1;
-static int hf_ulmap_phymod_ul_pilot_pattern_modifier = -1;
-static int hf_ulmap_phymod_ul_pilot_pattern_index = -1;
-static int hf_ulmap_fast_tracking_extended_uiuc = -1;
-static int hf_ulmap_fast_tracking_length = -1;
-static int hf_ulmap_fast_tracking_map_index = -1;
-static int hf_ulmap_fast_tracking_power_correction = -1;
-static int hf_ulmap_fast_tracking_frequency_correction = -1;
-static int hf_ulmap_fast_tracking_time_correction = -1;
-static int hf_ulmap_pusc_burst_allocation_extended_uiuc = -1;
-static int hf_ulmap_pusc_burst_allocation_length = -1;
-static int hf_ulmap_pusc_burst_allocation_uiuc = -1;
-static int hf_ulmap_pusc_burst_allocation_segment = -1;
-static int hf_ulmap_pusc_burst_allocation_ul_permbase = -1;
-static int hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset = -1;
-static int hf_ulmap_pusc_burst_allocation_subchannel_offset = -1;
-static int hf_ulmap_pusc_burst_allocation_duration = -1;
-static int hf_ulmap_pusc_burst_allocation_repetition_coding_indication = -1;
-static int hf_ulmap_fast_ranging_extended_uiuc = -1;
-static int hf_ulmap_fast_ranging_length = -1;
-static int hf_ulmap_fast_ranging_ho_id_indicator = -1;
-static int hf_ulmap_fast_ranging_ho_id = -1;
-static int hf_ulmap_fast_ranging_mac_address = -1;
-static int hf_ulmap_fast_ranging_uiuc = -1;
-static int hf_ulmap_fast_ranging_duration = -1;
-static int hf_ulmap_fast_ranging_repetition_coding_indication = -1;
-static int hf_ulmap_allocation_start_extended_uiuc = -1;
-static int hf_ulmap_allocation_start_length = -1;
-static int hf_ulmap_allocation_start_ofdma_symbol_offset = -1;
-static int hf_ulmap_allocation_start_subchannel_offset = -1;
-static int hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc = -1;
-static int hf_ulmap_cqich_enhanced_alloc_length = -1;
-static int hf_ulmap_cqich_enhanced_alloc_cqich_id = -1;
-static int hf_ulmap_cqich_enhanced_alloc_period = -1;
-static int hf_ulmap_cqich_enhanced_alloc_frame_offset = -1;
-static int hf_ulmap_cqich_enhanced_alloc_duration = -1;
-static int hf_ulmap_cqich_enhanced_alloc_cqich_num = -1;
-static int hf_ulmap_cqich_enhanced_alloc_feedback_type = -1;
-static int hf_ulmap_cqich_enhanced_alloc_allocation_index = -1;
-static int hf_ulmap_cqich_enhanced_alloc_cqich_type = -1;
-static int hf_ulmap_cqich_enhanced_alloc_sttd_indication = -1;
-static int hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode = -1;
-static int hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback = -1;
-static int hf_ulmap_anchor_bs_switch_extended_2_uiuc = -1;
-static int hf_ulmap_anchor_bs_switch_length = -1;
-static int hf_ulmap_anchor_bs_switch_n_anchor_bs_switch = -1;
-static int hf_ulmap_anchor_bs_switch_reduced_cid = -1;
-static int hf_ulmap_anchor_bs_switch_action_code = -1;
-static int hf_ulmap_anchor_bs_switch_action_time = -1;
-static int hf_ulmap_anchor_bs_switch_temp_bs_id = -1;
-static int hf_ulmap_anchor_bs_switch_ak_change_indicator = -1;
-static int hf_ulmap_anchor_bs_switch_cqich_allocation_indicator = -1;
-static int hf_ulmap_anchor_bs_switch_cqich_id = -1;
-static int hf_ulmap_anchor_bs_switch_feedback_channel_offset = -1;
-static int hf_ulmap_anchor_bs_switch_period = -1;
-static int hf_ulmap_anchor_bs_switch_frame_offset = -1;
-static int hf_ulmap_anchor_bs_switch_duration = -1;
-static int hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code = -1;
-static int hf_ulmap_sounding_command_extended_2_uiuc = -1;
-static int hf_ulmap_sounding_command_length = -1;
-static int hf_ulmap_sounding_command_type = -1;
-static int hf_ulmap_sounding_command_send_sounding_report_flag = -1;
-static int hf_ulmap_sounding_command_relevance_flag = -1;
-static int hf_ulmap_sounding_command_relevance = -1;
-static int hf_ulmap_sounding_command_include_additional_feedback = -1;
-static int hf_ulmap_sounding_command_num_sounding_symbols = -1;
-static int hf_ulmap_sounding_command_separability_type = -1;
-static int hf_ulmap_sounding_command_max_cyclic_shift_index_p = -1;
-static int hf_ulmap_sounding_command_decimation_value = -1;
-static int hf_ulmap_sounding_command_decimation_offset_randomization = -1;
-static int hf_ulmap_sounding_command_symbol_index = -1;
-static int hf_ulmap_sounding_command_number_of_cids = -1;
-static int hf_ulmap_sounding_command_shorted_basic_cid = -1;
-static int hf_ulmap_sounding_command_power_assignment_method = -1;
-static int hf_ulmap_sounding_command_power_boost = -1;
-static int hf_ulmap_sounding_command_multi_antenna_flag = -1;
-static int hf_ulmap_sounding_command_allocation_mode = -1;
-static int hf_ulmap_sounding_command_band_bit_map = -1;
-static int hf_ulmap_sounding_command_starting_frequency_band = -1;
-static int hf_ulmap_sounding_command_number_of_frequency_bands = -1;
-static int hf_ulmap_sounding_command_cyclic_time_shift_index = -1;
-static int hf_ulmap_sounding_command_decimation_offset = -1;
-static int hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback = -1;
-static int hf_ulmap_sounding_command_periodicity = -1;
-static int hf_ulmap_sounding_command_permutation = -1;
-static int hf_ulmap_sounding_command_dl_permbase = -1;
-static int hf_ulmap_sounding_command_shortened_basic_cid = -1;
-static int hf_ulmap_sounding_command_subchannel_offset = -1;
-static int hf_ulmap_sounding_command_number_of_subchannels = -1;
-static int hf_ulmap_harq_ulmap_extended_2_uiuc = -1;
-static int hf_ulmap_harq_ulmap_length = -1;
-static int hf_ulmap_harq_ulmap_rcid_type = -1;
-static int hf_ulmap_harq_ulmap_mode = -1;
-static int hf_ulmap_harq_ulmap_allocation_start_indication = -1;
-static int hf_ulmap_harq_ulmap_ofdma_symbol_offset = -1;
-static int hf_ulmap_harq_ulmap_subchannel_offset = -1;
-static int hf_ulmap_harq_ulmap_n_sub_burst = -1;
-static int hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc = -1;
-static int hf_ulmap_harq_ackch_region_alloc_length = -1;
-static int hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset = -1;
-static int hf_ulmap_harq_ackch_region_alloc_subchannel_offset = -1;
-static int hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols = -1;
-static int hf_ulmap_harq_ackch_region_alloc_num_subchannels = -1;
-static int hf_ulmap_aas_sdma_extended_2_uiuc = -1;
-static int hf_ulmap_aas_sdma_length = -1;
-static int hf_ulmap_aas_sdma_rcid_type = -1;
-static int hf_ulmap_aas_sdma_num_burst_region = -1;
-static int hf_ulmap_aas_sdma_slot_offset = -1;
-static int hf_ulmap_aas_sdma_slot_duration = -1;
-static int hf_ulmap_aas_sdma_number_of_users = -1;
-static int hf_ulmap_aas_sdma_encoding_mode = -1;
-static int hf_ulmap_aas_sdma_power_adjust = -1;
-static int hf_ulmap_aas_sdma_pilot_pattern_modifier = -1;
-static int hf_ulmap_aas_sdma_preamble_modifier_index = -1;
-static int hf_ulmap_aas_sdma_pilot_pattern = -1;
-static int hf_ulmap_aas_sdma_diuc = -1;
-static int hf_ulmap_aas_sdma_repetition_coding_indication = -1;
-static int hf_ulmap_aas_sdma_acid = -1;
-static int hf_ulmap_aas_sdma_ai_sn = -1;
-static int hf_ulmap_aas_sdma_nep = -1;
-static int hf_ulmap_aas_sdma_nsch = -1;
-static int hf_ulmap_aas_sdma_spid = -1;
-static int hf_ulmap_aas_sdma_power_adjustment = -1;
-static int hf_ulmap_feedback_polling_extended_2_uiuc = -1;
-static int hf_ulmap_feedback_polling_length = -1;
-static int hf_ulmap_feedback_polling_num_allocation = -1;
-static int hf_ulmap_feedback_polling_dedicated_ul_allocation_included = -1;
-static int hf_ulmap_feedback_polling_basic_cid = -1;
-static int hf_ulmap_feedback_polling_allocation_duration = -1;
-static int hf_ulmap_feedback_polling_type = -1;
-static int hf_ulmap_feedback_polling_frame_offset = -1;
-static int hf_ulmap_feedback_polling_period = -1;
-static int hf_ulmap_feedback_polling_uiuc = -1;
-static int hf_ulmap_feedback_polling_ofdma_symbol_offset = -1;
-static int hf_ulmap_feedback_polling_subchannel_offset = -1;
-static int hf_ulmap_feedback_polling_duration = -1;
-static int hf_ulmap_feedback_polling_repetition_coding_indication = -1;
-static int hf_ulmap_reduced_aas_aas_zone_configuration_included = -1;
-static int hf_ulmap_reduced_aas_aas_zone_position_included = -1;
-static int hf_ulmap_reduced_aas_ul_map_information_included = -1;
-static int hf_ulmap_reduced_aas_phy_modification_included = -1;
-static int hf_ulmap_reduced_aas_power_control_included = -1;
-static int hf_ulmap_reduced_aas_include_feedback_header = -1;
-static int hf_ulmap_reduced_aas_encoding_mode = -1;
-static int hf_ulmap_reduced_aas_permutation = -1;
-static int hf_ulmap_reduced_aas_ul_permbase = -1;
-static int hf_ulmap_reduced_aas_preamble_indication = -1;
-static int hf_ulmap_reduced_aas_padding = -1;
-static int hf_ulmap_reduced_aas_zone_symbol_offset = -1;
-static int hf_ulmap_reduced_aas_zone_length = -1;
-static int hf_ulmap_reduced_aas_ucd_count = -1;
-static int hf_ulmap_reduced_aas_private_map_alloc_start_time = -1;
-static int hf_ulmap_reduced_aas_pilot_pattern_index = -1;
-static int hf_ulmap_reduced_aas_preamble_select = -1;
-static int hf_ulmap_reduced_aas_preamble_shift_index = -1;
-static int hf_ulmap_reduced_aas_pilot_pattern_modifier = -1;
-static int hf_ulmap_reduced_aas_power_control = -1;
-static int hf_ulmap_reduced_aas_ul_frame_offset = -1;
-static int hf_ulmap_reduced_aas_slot_offset = -1;
-static int hf_ulmap_reduced_aas_slot_duration = -1;
-static int hf_ulmap_reduced_aas_uiuc_nep = -1;
-static int hf_ulmap_reduced_aas_acid = -1;
-static int hf_ulmap_reduced_aas_ai_sn = -1;
-static int hf_ulmap_reduced_aas_nsch = -1;
-static int hf_ulmap_reduced_aas_spid = -1;
-static int hf_ulmap_reduced_aas_repetition_coding_indication = -1;
-
-static expert_field ei_ulmap_not_implemented = EI_INIT;
+static int hf_ulmap_dedicated_ul_control_length;
+static int hf_ulmap_dedicated_ul_control_control_header;
+static int hf_ulmap_dedicated_ul_control_num_sdma_layers;
+static int hf_ulmap_dedicated_ul_control_pilot_pattern;
+static int hf_ulmap_dedicated_mimo_ul_control_matrix;
+static int hf_ulmap_dedicated_mimo_ul_control_n_layer;
+static int hf_ulmap_harq_chase_dedicated_ul_control_indicator;
+static int hf_ulmap_harq_chase_uiuc;
+static int hf_ulmap_harq_chase_repetition_coding_indication;
+static int hf_ulmap_harq_chase_duration;
+static int hf_ulmap_harq_chase_acid;
+static int hf_ulmap_harq_chase_ai_sn;
+static int hf_ulmap_harq_chase_ack_disable;
+static int hf_ulmap_reserved_uint;
+static int hf_ulmap_harq_ir_ctc_dedicated_ul_control_indicator;
+static int hf_ulmap_harq_ir_ctc_nep;
+static int hf_ulmap_harq_ir_ctc_nsch;
+static int hf_ulmap_harq_ir_ctc_spid;
+static int hf_ulmap_harq_ir_ctc_acin;
+static int hf_ulmap_harq_ir_ctc_ai_sn;
+static int hf_ulmap_harq_ir_ctc_ack_disable;
+static int hf_ulmap_harq_ir_cc_dedicated_ul_control_indicator;
+static int hf_ulmap_harq_ir_cc_uiuc;
+static int hf_ulmap_harq_ir_cc_repetition_coding_indication;
+static int hf_ulmap_harq_ir_cc_duration;
+static int hf_ulmap_harq_ir_cc_spid;
+static int hf_ulmap_harq_ir_cc_acid;
+static int hf_ulmap_harq_ir_cc_ai_sn;
+static int hf_ulmap_harq_ir_cc_ack_disable;
+static int hf_ulmap_mimo_ul_chase_harq_mu_indicator;
+static int hf_ulmap_mimo_ul_chase_harq_dedicated_mimo_ulcontrol_indicator;
+static int hf_ulmap_mimo_ul_chase_harq_ack_disable;
+static int hf_ulmap_mimo_ul_chase_harq_matrix;
+static int hf_ulmap_mimo_ul_chase_harq_duration;
+static int hf_ulmap_mimo_ul_chase_harq_uiuc;
+static int hf_ulmap_mimo_ul_chase_harq_repetition_coding_indication;
+static int hf_ulmap_mimo_ul_chase_harq_acid;
+static int hf_ulmap_mimo_ul_chase_harq_ai_sn;
+static int hf_ulmap_mimo_ul_ir_harq_mu_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_dedicated_mimo_ul_control_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_ack_disable;
+static int hf_ulmap_mimo_ul_ir_harq_matrix;
+static int hf_ulmap_mimo_ul_ir_harq_nsch;
+static int hf_ulmap_mimo_ul_ir_harq_nep;
+static int hf_ulmap_mimo_ul_ir_harq_spid;
+static int hf_ulmap_mimo_ul_ir_harq_acid;
+static int hf_ulmap_mimo_ul_ir_harq_ai_sn;
+static int hf_ulmap_mimo_ul_ir_harq_cc_mu_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_cc_dedicated_mimo_ul_control_indicator;
+static int hf_ulmap_mimo_ul_ir_harq_cc_ack_disable;
+static int hf_ulmap_mimo_ul_ir_harq_cc_matrix;
+static int hf_ulmap_mimo_ul_ir_harq_cc_duration;
+static int hf_ulmap_mimo_ul_ir_harq_cc_uiuc;
+static int hf_ulmap_mimo_ul_ir_harq_cc_repetition_coding_indication;
+static int hf_ulmap_mimo_ul_ir_harq_cc_acid;
+static int hf_ulmap_mimo_ul_ir_harq_cc_ai_sn;
+static int hf_ulmap_mimo_ul_ir_harq_cc_spid;
+static int hf_ulmap_mimo_ul_stc_harq_tx_count;
+static int hf_ulmap_mimo_ul_stc_harq_duration;
+static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset_indication;
+static int hf_ulmap_mimo_ul_stc_harq_sub_burst_offset;
+static int hf_ulmap_mimo_ul_stc_harq_ack_disable;
+static int hf_ulmap_mimo_ul_stc_harq_uiuc;
+static int hf_ulmap_mimo_ul_stc_harq_repetition_coding_indication;
+static int hf_ulmap_mimo_ul_stc_harq_acid;
+static int hf_ulmap_power_control;
+static int hf_ulmap_power_measurement_frame;
+static int hf_ulmap_mini_subcha_alloc_extended_2_uiuc;
+static int hf_ulmap_mini_subcha_alloc_length;
+static int hf_ulmap_mini_subcha_alloc_ctype;
+static int hf_ulmap_mini_subcha_alloc_duration;
+static int hf_ulmap_mini_subcha_alloc_cid;
+static int hf_ulmap_mini_subcha_alloc_uiuc;
+static int hf_ulmap_mini_subcha_alloc_repetition;
+static int hf_ulmap_mini_subcha_alloc_padding;
+static int hf_ulmap_aas_ul_extended_uiuc;
+static int hf_ulmap_aas_ul_length;
+static int hf_ulmap_aas_ul_permutation;
+static int hf_ulmap_aas_ul_ul_permbase;
+static int hf_ulmap_aas_ul_ofdma_symbol_offset;
+static int hf_ulmap_aas_ul_aas_zone_length;
+static int hf_ulmap_aas_ul_uplink_preamble_config;
+static int hf_ulmap_aas_ul_preamble_type;
+static int hf_ulmap_cqich_alloc_extended_uiuc;
+static int hf_ulmap_cqich_alloc_length;
+static int hf_ulmap_cqich_alloc_cqich_id;
+static int hf_ulmap_cqich_alloc_allocation_offset;
+static int hf_ulmap_cqich_alloc_period;
+static int hf_ulmap_cqich_alloc_frame_offset;
+static int hf_ulmap_cqich_alloc_duration;
+static int hf_ulmap_cqich_alloc_report_configuration_included;
+static int hf_ulmap_cqich_alloc_feedback_type;
+static int hf_ulmap_cqich_alloc_report_type;
+static int hf_ulmap_cqich_alloc_cinr_preamble_report_type;
+static int hf_ulmap_cqich_alloc_zone_permutation;
+static int hf_ulmap_cqich_alloc_zone_type;
+static int hf_ulmap_cqich_alloc_zone_prbs_id;
+static int hf_ulmap_cqich_alloc_major_group_indication;
+static int hf_ulmap_cqich_alloc_pusc_major_group_bitmap;
+static int hf_ulmap_cqich_alloc_cinr_zone_measurement_type;
+static int hf_ulmap_cqich_alloc_averaging_parameter_included;
+static int hf_ulmap_cqich_alloc_averaging_parameter;
+static int hf_ulmap_cqich_alloc_mimo_permutation_feedback_cycle;
+static int hf_ulmap_zone_extended_uiuc;
+static int hf_ulmap_zone_length;
+static int hf_ulmap_zone_ofdma_symbol_offset;
+static int hf_ulmap_zone_permutation;
+static int hf_ulmap_zone_ul_permbase;
+static int hf_ulmap_zone_amc_type;
+static int hf_ulmap_zone_use_all_sc_indicator;
+static int hf_ulmap_zone_disable_subchannel_rotation;
+static int hf_ulmap_phymod_ul_extended_uiuc;
+static int hf_ulmap_phymod_ul_length;
+static int hf_ulmap_phymod_ul_preamble_modifier_type;
+static int hf_ulmap_phymod_ul_preamble_frequency_shift_index;
+static int hf_ulmap_phymod_ul_preamble_time_shift_index;
+static int hf_ulmap_phymod_ul_pilot_pattern_modifier;
+static int hf_ulmap_phymod_ul_pilot_pattern_index;
+static int hf_ulmap_fast_tracking_extended_uiuc;
+static int hf_ulmap_fast_tracking_length;
+static int hf_ulmap_fast_tracking_map_index;
+static int hf_ulmap_fast_tracking_power_correction;
+static int hf_ulmap_fast_tracking_frequency_correction;
+static int hf_ulmap_fast_tracking_time_correction;
+static int hf_ulmap_pusc_burst_allocation_extended_uiuc;
+static int hf_ulmap_pusc_burst_allocation_length;
+static int hf_ulmap_pusc_burst_allocation_uiuc;
+static int hf_ulmap_pusc_burst_allocation_segment;
+static int hf_ulmap_pusc_burst_allocation_ul_permbase;
+static int hf_ulmap_pusc_burst_allocation_ofdma_symbol_offset;
+static int hf_ulmap_pusc_burst_allocation_subchannel_offset;
+static int hf_ulmap_pusc_burst_allocation_duration;
+static int hf_ulmap_pusc_burst_allocation_repetition_coding_indication;
+static int hf_ulmap_fast_ranging_extended_uiuc;
+static int hf_ulmap_fast_ranging_length;
+static int hf_ulmap_fast_ranging_ho_id_indicator;
+static int hf_ulmap_fast_ranging_ho_id;
+static int hf_ulmap_fast_ranging_mac_address;
+static int hf_ulmap_fast_ranging_uiuc;
+static int hf_ulmap_fast_ranging_duration;
+static int hf_ulmap_fast_ranging_repetition_coding_indication;
+static int hf_ulmap_allocation_start_extended_uiuc;
+static int hf_ulmap_allocation_start_length;
+static int hf_ulmap_allocation_start_ofdma_symbol_offset;
+static int hf_ulmap_allocation_start_subchannel_offset;
+static int hf_ulmap_cqich_enhanced_alloc_extended_2_uiuc;
+static int hf_ulmap_cqich_enhanced_alloc_length;
+static int hf_ulmap_cqich_enhanced_alloc_cqich_id;
+static int hf_ulmap_cqich_enhanced_alloc_period;
+static int hf_ulmap_cqich_enhanced_alloc_frame_offset;
+static int hf_ulmap_cqich_enhanced_alloc_duration;
+static int hf_ulmap_cqich_enhanced_alloc_cqich_num;
+static int hf_ulmap_cqich_enhanced_alloc_feedback_type;
+static int hf_ulmap_cqich_enhanced_alloc_allocation_index;
+static int hf_ulmap_cqich_enhanced_alloc_cqich_type;
+static int hf_ulmap_cqich_enhanced_alloc_sttd_indication;
+static int hf_ulmap_cqich_enhanced_alloc_band_amc_precoding_mode;
+static int hf_ulmap_cqich_enhanced_alloc_nr_precoders_feedback;
+static int hf_ulmap_anchor_bs_switch_extended_2_uiuc;
+static int hf_ulmap_anchor_bs_switch_length;
+static int hf_ulmap_anchor_bs_switch_n_anchor_bs_switch;
+static int hf_ulmap_anchor_bs_switch_reduced_cid;
+static int hf_ulmap_anchor_bs_switch_action_code;
+static int hf_ulmap_anchor_bs_switch_action_time;
+static int hf_ulmap_anchor_bs_switch_temp_bs_id;
+static int hf_ulmap_anchor_bs_switch_ak_change_indicator;
+static int hf_ulmap_anchor_bs_switch_cqich_allocation_indicator;
+static int hf_ulmap_anchor_bs_switch_cqich_id;
+static int hf_ulmap_anchor_bs_switch_feedback_channel_offset;
+static int hf_ulmap_anchor_bs_switch_period;
+static int hf_ulmap_anchor_bs_switch_frame_offset;
+static int hf_ulmap_anchor_bs_switch_duration;
+static int hf_ulmap_anchor_bs_switch_mimo_permutation_feedback_code;
+static int hf_ulmap_sounding_command_extended_2_uiuc;
+static int hf_ulmap_sounding_command_length;
+static int hf_ulmap_sounding_command_type;
+static int hf_ulmap_sounding_command_send_sounding_report_flag;
+static int hf_ulmap_sounding_command_relevance_flag;
+static int hf_ulmap_sounding_command_relevance;
+static int hf_ulmap_sounding_command_include_additional_feedback;
+static int hf_ulmap_sounding_command_num_sounding_symbols;
+static int hf_ulmap_sounding_command_separability_type;
+static int hf_ulmap_sounding_command_max_cyclic_shift_index_p;
+static int hf_ulmap_sounding_command_decimation_value;
+static int hf_ulmap_sounding_command_decimation_offset_randomization;
+static int hf_ulmap_sounding_command_symbol_index;
+static int hf_ulmap_sounding_command_number_of_cids;
+static int hf_ulmap_sounding_command_shorted_basic_cid;
+static int hf_ulmap_sounding_command_power_assignment_method;
+static int hf_ulmap_sounding_command_power_boost;
+static int hf_ulmap_sounding_command_multi_antenna_flag;
+static int hf_ulmap_sounding_command_allocation_mode;
+static int hf_ulmap_sounding_command_band_bit_map;
+static int hf_ulmap_sounding_command_starting_frequency_band;
+static int hf_ulmap_sounding_command_number_of_frequency_bands;
+static int hf_ulmap_sounding_command_cyclic_time_shift_index;
+static int hf_ulmap_sounding_command_decimation_offset;
+static int hf_ulmap_sounding_command_use_same_symbol_for_additional_feedback;
+static int hf_ulmap_sounding_command_periodicity;
+static int hf_ulmap_sounding_command_permutation;
+static int hf_ulmap_sounding_command_dl_permbase;
+static int hf_ulmap_sounding_command_shortened_basic_cid;
+static int hf_ulmap_sounding_command_subchannel_offset;
+static int hf_ulmap_sounding_command_number_of_subchannels;
+static int hf_ulmap_harq_ulmap_extended_2_uiuc;
+static int hf_ulmap_harq_ulmap_length;
+static int hf_ulmap_harq_ulmap_rcid_type;
+static int hf_ulmap_harq_ulmap_mode;
+static int hf_ulmap_harq_ulmap_allocation_start_indication;
+static int hf_ulmap_harq_ulmap_ofdma_symbol_offset;
+static int hf_ulmap_harq_ulmap_subchannel_offset;
+static int hf_ulmap_harq_ulmap_n_sub_burst;
+static int hf_ulmap_harq_ackch_region_alloc_extended_2_uiuc;
+static int hf_ulmap_harq_ackch_region_alloc_length;
+static int hf_ulmap_harq_ackch_region_alloc_ofdma_symbol_offset;
+static int hf_ulmap_harq_ackch_region_alloc_subchannel_offset;
+static int hf_ulmap_harq_ackch_region_alloc_num_ofdma_symbols;
+static int hf_ulmap_harq_ackch_region_alloc_num_subchannels;
+static int hf_ulmap_aas_sdma_extended_2_uiuc;
+static int hf_ulmap_aas_sdma_length;
+static int hf_ulmap_aas_sdma_rcid_type;
+static int hf_ulmap_aas_sdma_num_burst_region;
+static int hf_ulmap_aas_sdma_slot_offset;
+static int hf_ulmap_aas_sdma_slot_duration;
+static int hf_ulmap_aas_sdma_number_of_users;
+static int hf_ulmap_aas_sdma_encoding_mode;
+static int hf_ulmap_aas_sdma_power_adjust;
+static int hf_ulmap_aas_sdma_pilot_pattern_modifier;
+static int hf_ulmap_aas_sdma_preamble_modifier_index;
+static int hf_ulmap_aas_sdma_pilot_pattern;
+static int hf_ulmap_aas_sdma_diuc;
+static int hf_ulmap_aas_sdma_repetition_coding_indication;
+static int hf_ulmap_aas_sdma_acid;
+static int hf_ulmap_aas_sdma_ai_sn;
+static int hf_ulmap_aas_sdma_nep;
+static int hf_ulmap_aas_sdma_nsch;
+static int hf_ulmap_aas_sdma_spid;
+static int hf_ulmap_aas_sdma_power_adjustment;
+static int hf_ulmap_feedback_polling_extended_2_uiuc;
+static int hf_ulmap_feedback_polling_length;
+static int hf_ulmap_feedback_polling_num_allocation;
+static int hf_ulmap_feedback_polling_dedicated_ul_allocation_included;
+static int hf_ulmap_feedback_polling_basic_cid;
+static int hf_ulmap_feedback_polling_allocation_duration;
+static int hf_ulmap_feedback_polling_type;
+static int hf_ulmap_feedback_polling_frame_offset;
+static int hf_ulmap_feedback_polling_period;
+static int hf_ulmap_feedback_polling_uiuc;
+static int hf_ulmap_feedback_polling_ofdma_symbol_offset;
+static int hf_ulmap_feedback_polling_subchannel_offset;
+static int hf_ulmap_feedback_polling_duration;
+static int hf_ulmap_feedback_polling_repetition_coding_indication;
+static int hf_ulmap_reduced_aas_aas_zone_configuration_included;
+static int hf_ulmap_reduced_aas_aas_zone_position_included;
+static int hf_ulmap_reduced_aas_ul_map_information_included;
+static int hf_ulmap_reduced_aas_phy_modification_included;
+static int hf_ulmap_reduced_aas_power_control_included;
+static int hf_ulmap_reduced_aas_include_feedback_header;
+static int hf_ulmap_reduced_aas_encoding_mode;
+static int hf_ulmap_reduced_aas_permutation;
+static int hf_ulmap_reduced_aas_ul_permbase;
+static int hf_ulmap_reduced_aas_preamble_indication;
+static int hf_ulmap_reduced_aas_padding;
+static int hf_ulmap_reduced_aas_zone_symbol_offset;
+static int hf_ulmap_reduced_aas_zone_length;
+static int hf_ulmap_reduced_aas_ucd_count;
+static int hf_ulmap_reduced_aas_private_map_alloc_start_time;
+static int hf_ulmap_reduced_aas_pilot_pattern_index;
+static int hf_ulmap_reduced_aas_preamble_select;
+static int hf_ulmap_reduced_aas_preamble_shift_index;
+static int hf_ulmap_reduced_aas_pilot_pattern_modifier;
+static int hf_ulmap_reduced_aas_power_control;
+static int hf_ulmap_reduced_aas_ul_frame_offset;
+static int hf_ulmap_reduced_aas_slot_offset;
+static int hf_ulmap_reduced_aas_slot_duration;
+static int hf_ulmap_reduced_aas_uiuc_nep;
+static int hf_ulmap_reduced_aas_acid;
+static int hf_ulmap_reduced_aas_ai_sn;
+static int hf_ulmap_reduced_aas_nsch;
+static int hf_ulmap_reduced_aas_spid;
+static int hf_ulmap_reduced_aas_repetition_coding_indication;
+
+static expert_field ei_ulmap_not_implemented;
 
 /*  This gets called each time a capture file is loaded. */
 void init_wimax_globals(void)
diff --git a/plugins/epan/wimax/packet-m2m.c b/plugins/epan/wimax/packet-m2m.c
index bd08ebb122..c536b309f5 100644
--- a/plugins/epan/wimax/packet-m2m.c
+++ b/plugins/epan/wimax/packet-m2m.c
@@ -45,13 +45,13 @@ static dissector_handle_t wimax_phy_attributes_burst_handle;
 
 static reassembly_table pdu_reassembly_table;
 
-static gint proto_m2m    = -1;
+static gint proto_m2m;
 
-static gint ett_m2m      = -1;
-static gint ett_m2m_tlv  = -1;
-static gint ett_m2m_fch  = -1;
-static gint ett_m2m_cdma = -1;
-static gint ett_m2m_ffb  = -1;
+static gint ett_m2m;
+static gint ett_m2m_tlv;
+static gint ett_m2m_fch;
+static gint ett_m2m_cdma;
+static gint ett_m2m_ffb;
 
 /* TLV types (rev:0.2) */
 #define TLV_PROTO_VER		 1
@@ -118,31 +118,31 @@ static const value_string tlv_crc16_status[] =
 	{ 0, NULL }
 };
 
-static gint hf_m2m_sequence_number = -1;
-static gint hf_m2m_frame_number = -1;
-static gint hf_m2m_tlv_count = -1;
-
-static gint hf_m2m_type = -1;
-static gint hf_m2m_len = -1;
-static gint hf_m2m_len_size = -1;
-/* static gint hf_m2m_value_bytes = -1; */
-static gint hf_wimax_invalid_tlv = -1;
-static gint hf_m2m_value_protocol_vers_uint8 = -1;
-static gint hf_m2m_value_burst_num_uint8 = -1;
-static gint hf_m2m_value_frag_type_uint8 = -1;
-static gint hf_m2m_value_frag_num_uint8 = -1;
-static gint hf_m2m_value_pdu_burst = -1;
-static gint hf_m2m_value_fast_fb = -1;
-static gint hf_m2m_value_fch_burst_uint24 = -1;
-static gint hf_m2m_value_cdma_code_uint24 = -1;
-static gint hf_m2m_value_crc16_status_uint8 = -1;
-static gint hf_m2m_value_burst_power_uint16 = -1;
-static gint hf_m2m_value_burst_cinr_uint16 = -1;
-static gint hf_m2m_value_preamble_uint16 = -1;
-static gint hf_m2m_value_harq_ack_burst_bytes = -1;
-static gint hf_m2m_phy_attributes = -1;
-
-static expert_field ei_m2m_unexpected_length = EI_INIT;
+static gint hf_m2m_sequence_number;
+static gint hf_m2m_frame_number;
+static gint hf_m2m_tlv_count;
+
+static gint hf_m2m_type;
+static gint hf_m2m_len;
+static gint hf_m2m_len_size;
+/* static gint hf_m2m_value_bytes; */
+static gint hf_wimax_invalid_tlv;
+static gint hf_m2m_value_protocol_vers_uint8;
+static gint hf_m2m_value_burst_num_uint8;
+static gint hf_m2m_value_frag_type_uint8;
+static gint hf_m2m_value_frag_num_uint8;
+static gint hf_m2m_value_pdu_burst;
+static gint hf_m2m_value_fast_fb;
+static gint hf_m2m_value_fch_burst_uint24;
+static gint hf_m2m_value_cdma_code_uint24;
+static gint hf_m2m_value_crc16_status_uint8;
+static gint hf_m2m_value_burst_power_uint16;
+static gint hf_m2m_value_burst_cinr_uint16;
+static gint hf_m2m_value_preamble_uint16;
+static gint hf_m2m_value_harq_ack_burst_bytes;
+static gint hf_m2m_phy_attributes;
+
+static expert_field ei_m2m_unexpected_length;
 
 
 /* WiMax MAC to MAC protocol dissector */
diff --git a/plugins/epan/wimax/packet-wmx.c b/plugins/epan/wimax/packet-wmx.c
index 5a38b111ad..1492d6d20f 100644
--- a/plugins/epan/wimax/packet-wmx.c
+++ b/plugins/epan/wimax/packet-wmx.c
@@ -38,9 +38,9 @@ extern	gboolean include_cor2_changes;
 address bs_address = ADDRESS_INIT_NONE;
 
 
-static int hf_tlv_type = -1;
-static int hf_tlv_length = -1;
-static int hf_tlv_length_size = -1;
+static int hf_tlv_type;
+static int hf_tlv_length;
+static int hf_tlv_length_size;
 
 #define MAX_NUM_TLVS	256
 /* Global TLV array to retrieve unique subtree identifiers */
diff --git a/plugins/epan/wimax/wimax_cdma_code_decoder.c b/plugins/epan/wimax/wimax_cdma_code_decoder.c
index 65b52109dc..d926078f3b 100644
--- a/plugins/epan/wimax/wimax_cdma_code_decoder.c
+++ b/plugins/epan/wimax/wimax_cdma_code_decoder.c
@@ -19,12 +19,12 @@
 #include <epan/packet.h>
 #include "wimax-int.h"
 
-static int proto_wimax_cdma_code_decoder = -1;
-static gint ett_wimax_cdma_code_decoder = -1;
+static int proto_wimax_cdma_code_decoder;
+static gint ett_wimax_cdma_code_decoder;
 
-static int hf_wimax_ranging_code = -1;
-static int hf_wimax_ranging_symbol_offset = -1;
-static int hf_wimax_ranging_subchannel_offset = -1;
+static int hf_wimax_ranging_code;
+static int hf_wimax_ranging_symbol_offset;
+static int hf_wimax_ranging_subchannel_offset;
 
 static int dissect_wimax_cdma_code_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
index c69bd68752..2f4efafa90 100644
--- a/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
+++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
@@ -49,16 +49,16 @@ static guint wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, pack
 static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
 guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
 
-static gint proto_wimax_compact_dlmap_ie_decoder = -1;
+static gint proto_wimax_compact_dlmap_ie_decoder;
 
 #if 0 /* not used ?? */
-static gint ett_wimax_compact_dlmap_ie_decoder = -1;
-static gint ett_wimax_format_configuration_ie_decoder = -1;
-static gint ett_wimax_rcid_ie_decoder = -1;
-static gint ett_wimax_harq_control_ie_decoder = -1;
-static gint ett_wimax_extended_diuc_dependent_ie_decoder = -1;
-static gint ett_wimax_cqich_control_ie_decoder = -1;
-static gint ett_wimax_extension_type_ie_decoder = -1;
+static gint ett_wimax_compact_dlmap_ie_decoder;
+static gint ett_wimax_format_configuration_ie_decoder;
+static gint ett_wimax_rcid_ie_decoder;
+static gint ett_wimax_harq_control_ie_decoder;
+static gint ett_wimax_extended_diuc_dependent_ie_decoder;
+static gint ett_wimax_cqich_control_ie_decoder;
+static gint ett_wimax_extension_type_ie_decoder;
 #endif
 
 /* New Format Indications */
@@ -143,78 +143,78 @@ static const value_string vals_allocation_modes[] =
 #define COMPANDED_SC_MASK_1   0x01F0
 
 /* display indexies */
-static gint hf_cdlmap_dl_map_type = -1;
-static gint hf_cdlmap_ul_map_append = -1;
-static gint hf_cdlmap_reserved = -1;
-static gint hf_cdlmap_nep_code = -1;
-static gint hf_cdlmap_nsch_code = -1;
-static gint hf_cdlmap_num_bands = -1;
-static gint hf_cdlmap_band_index = -1;
-static gint hf_cdlmap_nb_bitmap = -1;
-static gint hf_cdlmap_dl_map_type_1 = -1;
-static gint hf_cdlmap_ul_map_append_1 = -1;
-static gint hf_cdlmap_reserved_1 = -1;
-static gint hf_cdlmap_nep_code_1 = -1;
-static gint hf_cdlmap_nsch_code_1 = -1;
-static gint hf_cdlmap_num_bands_1 = -1;
-/*static gint hf_cdlmap_band_index_1 = -1;*/
-static gint hf_cdlmap_nb_bitmap_1 = -1;
-
-static gint hf_cdlmap_shortened_diuc = -1;
-static gint hf_cdlmap_companded_sc = -1;
-static gint hf_cdlmap_shortened_uiuc = -1;
-static gint hf_cdlmap_shortened_diuc_1 = -1;
-static gint hf_cdlmap_companded_sc_1 = -1;
-static gint hf_cdlmap_shortened_uiuc_1 = -1;
-
-static gint hf_cdlmap_bin_offset = -1;
-static gint hf_cdlmap_bin_offset_1 = -1;
-
-static gint hf_cdlmap_diuc_num_of_subchannels = -1;
-static gint hf_cdlmap_diuc_num_of_subchannels_1 = -1;
-static gint hf_cdlmap_diuc_repetition_coding_indication = -1;
-static gint hf_cdlmap_diuc_repetition_coding_indication_1 = -1;
-static gint hf_cdlmap_diuc_reserved = -1;
-static gint hf_cdlmap_diuc_reserved_1 = -1;
-
-static gint hf_cdlmap_bit_map_length = -1;
-static gint hf_cdlmap_bit_map_length_1 = -1;
-static gint hf_cdlmap_bit_map = -1;
-
-static gint hf_cdlmap_diuc = -1;
-static gint hf_cdlmap_diuc_1 = -1;
-
-static gint hf_cdlmap_allocation_mode = -1;
-static gint hf_cdlmap_allocation_mode_rsvd = -1;
-static gint hf_cdlmap_num_subchannels = -1;
-static gint hf_cdlmap_allocation_mode_1 = -1;
-static gint hf_cdlmap_allocation_mode_rsvd_1 = -1;
-static gint hf_cdlmap_num_subchannels_1 = -1;
-
-/* static gint hf_cdlmap_reserved_type = -1; */
-static gint hf_cdlmap_reserved_type_1 = -1;
+static gint hf_cdlmap_dl_map_type;
+static gint hf_cdlmap_ul_map_append;
+static gint hf_cdlmap_reserved;
+static gint hf_cdlmap_nep_code;
+static gint hf_cdlmap_nsch_code;
+static gint hf_cdlmap_num_bands;
+static gint hf_cdlmap_band_index;
+static gint hf_cdlmap_nb_bitmap;
+static gint hf_cdlmap_dl_map_type_1;
+static gint hf_cdlmap_ul_map_append_1;
+static gint hf_cdlmap_reserved_1;
+static gint hf_cdlmap_nep_code_1;
+static gint hf_cdlmap_nsch_code_1;
+static gint hf_cdlmap_num_bands_1;
+/*static gint hf_cdlmap_band_index_1;*/
+static gint hf_cdlmap_nb_bitmap_1;
+
+static gint hf_cdlmap_shortened_diuc;
+static gint hf_cdlmap_companded_sc;
+static gint hf_cdlmap_shortened_uiuc;
+static gint hf_cdlmap_shortened_diuc_1;
+static gint hf_cdlmap_companded_sc_1;
+static gint hf_cdlmap_shortened_uiuc_1;
+
+static gint hf_cdlmap_bin_offset;
+static gint hf_cdlmap_bin_offset_1;
+
+static gint hf_cdlmap_diuc_num_of_subchannels;
+static gint hf_cdlmap_diuc_num_of_subchannels_1;
+static gint hf_cdlmap_diuc_repetition_coding_indication;
+static gint hf_cdlmap_diuc_repetition_coding_indication_1;
+static gint hf_cdlmap_diuc_reserved;
+static gint hf_cdlmap_diuc_reserved_1;
+
+static gint hf_cdlmap_bit_map_length;
+static gint hf_cdlmap_bit_map_length_1;
+static gint hf_cdlmap_bit_map;
+
+static gint hf_cdlmap_diuc;
+static gint hf_cdlmap_diuc_1;
+
+static gint hf_cdlmap_allocation_mode;
+static gint hf_cdlmap_allocation_mode_rsvd;
+static gint hf_cdlmap_num_subchannels;
+static gint hf_cdlmap_allocation_mode_1;
+static gint hf_cdlmap_allocation_mode_rsvd_1;
+static gint hf_cdlmap_num_subchannels_1;
+
+/* static gint hf_cdlmap_reserved_type; */
+static gint hf_cdlmap_reserved_type_1;
 
 /* display indexies */
-static gint hf_format_config_ie_dl_map_type = -1;
-static gint hf_format_config_ie_dl_map_type_1 = -1;
-static gint hf_format_config_ie_dl_map_type_32 = -1;
-static gint hf_format_config_ie_new_format_indication = -1;
-static gint hf_format_config_ie_new_format_indication_1 = -1;
-static gint hf_format_config_ie_new_format_indication_32 = -1;
-static gint hf_format_config_ie_cid_type = -1;
-static gint hf_format_config_ie_cid_type_1 = -1;
-static gint hf_format_config_ie_safety_pattern = -1;
-static gint hf_format_config_ie_safety_pattern_1 = -1;
-static gint hf_format_config_ie_subchannel_type = -1;
-static gint hf_format_config_ie_subchannel_type_1 = -1;
-static gint hf_format_config_ie_max_logical_bands = -1;
-static gint hf_format_config_ie_max_logical_bands_1 = -1;
-static gint hf_format_config_ie_num_of_broadcast_symbol = -1;
-static gint hf_format_config_ie_num_of_broadcast_symbol_1 = -1;
-static gint hf_format_config_ie_num_of_dl_band_amc_symbol = -1;
-static gint hf_format_config_ie_num_of_dl_band_amc_symbol_1 = -1;
-static gint hf_format_config_ie_num_of_ul_band_amc_symbol = -1;
-static gint hf_format_config_ie_num_of_ul_band_amc_symbol_1 = -1;
+static gint hf_format_config_ie_dl_map_type;
+static gint hf_format_config_ie_dl_map_type_1;
+static gint hf_format_config_ie_dl_map_type_32;
+static gint hf_format_config_ie_new_format_indication;
+static gint hf_format_config_ie_new_format_indication_1;
+static gint hf_format_config_ie_new_format_indication_32;
+static gint hf_format_config_ie_cid_type;
+static gint hf_format_config_ie_cid_type_1;
+static gint hf_format_config_ie_safety_pattern;
+static gint hf_format_config_ie_safety_pattern_1;
+static gint hf_format_config_ie_subchannel_type;
+static gint hf_format_config_ie_subchannel_type_1;
+static gint hf_format_config_ie_max_logical_bands;
+static gint hf_format_config_ie_max_logical_bands_1;
+static gint hf_format_config_ie_num_of_broadcast_symbol;
+static gint hf_format_config_ie_num_of_broadcast_symbol_1;
+static gint hf_format_config_ie_num_of_dl_band_amc_symbol;
+static gint hf_format_config_ie_num_of_dl_band_amc_symbol_1;
+static gint hf_format_config_ie_num_of_ul_band_amc_symbol;
+static gint hf_format_config_ie_num_of_ul_band_amc_symbol_1;
 
 /* Format Configuration IE Masks */
 #define FORMAT_CONFIG_IE_DL_MAP_TYPE_MASK    0xE0000000
@@ -235,18 +235,18 @@ static gint hf_format_config_ie_num_of_ul_band_amc_symbol_1 = -1;
 #define NUM_UL_AMC_SYMBOLS_MASK              0x000003F0
 
 /* display indexies */
-static gint hf_harq_rcid_ie_prefix = -1;
-static gint hf_harq_rcid_ie_prefix_1 = -1;
-static gint hf_harq_rcid_ie_normal_cid = -1;
-static gint hf_harq_rcid_ie_normal_cid_1 = -1;
-static gint hf_harq_rcid_ie_cid3 = -1;
-static gint hf_harq_rcid_ie_cid3_1 = -1;
-static gint hf_harq_rcid_ie_cid7 = -1;
-static gint hf_harq_rcid_ie_cid7_1 = -1;
-static gint hf_harq_rcid_ie_cid11 = -1;
-static gint hf_harq_rcid_ie_cid11_1 = -1;
-static gint hf_harq_rcid_ie_cid11_2 = -1;
-static gint hf_harq_rcid_ie_cid11_3 = -1;
+static gint hf_harq_rcid_ie_prefix;
+static gint hf_harq_rcid_ie_prefix_1;
+static gint hf_harq_rcid_ie_normal_cid;
+static gint hf_harq_rcid_ie_normal_cid_1;
+static gint hf_harq_rcid_ie_cid3;
+static gint hf_harq_rcid_ie_cid3_1;
+static gint hf_harq_rcid_ie_cid7;
+static gint hf_harq_rcid_ie_cid7_1;
+static gint hf_harq_rcid_ie_cid11;
+static gint hf_harq_rcid_ie_cid11_1;
+static gint hf_harq_rcid_ie_cid11_2;
+static gint hf_harq_rcid_ie_cid11_3;
 
 /* Masks */
 #define WIMAX_RCID_IE_NORMAL_CID_MASK_1      0x0FFFF0
@@ -260,16 +260,16 @@ static gint hf_harq_rcid_ie_cid11_3 = -1;
 #define WIMAX_RCID_IE_CID11_MASK_1           0x07FF
 
 /* HARQ MAP HARQ Control IE display indexies */
-static gint hf_harq_control_ie_prefix = -1;
-static gint hf_harq_control_ie_ai_sn = -1;
-static gint hf_harq_control_ie_spid = -1;
-static gint hf_harq_control_ie_acid = -1;
-static gint hf_harq_control_ie_reserved = -1;
-static gint hf_harq_control_ie_prefix_1 = -1;
-static gint hf_harq_control_ie_ai_sn_1 = -1;
-static gint hf_harq_control_ie_spid_1 = -1;
-static gint hf_harq_control_ie_acid_1 = -1;
-static gint hf_harq_control_ie_reserved_1 = -1;
+static gint hf_harq_control_ie_prefix;
+static gint hf_harq_control_ie_ai_sn;
+static gint hf_harq_control_ie_spid;
+static gint hf_harq_control_ie_acid;
+static gint hf_harq_control_ie_reserved;
+static gint hf_harq_control_ie_prefix_1;
+static gint hf_harq_control_ie_ai_sn_1;
+static gint hf_harq_control_ie_spid_1;
+static gint hf_harq_control_ie_acid_1;
+static gint hf_harq_control_ie_reserved_1;
 
 /* Masks */
 #define WIMAX_HARQ_CONTROL_IE_PREFIX_MASK      0x80
@@ -284,18 +284,18 @@ static gint hf_harq_control_ie_reserved_1 = -1;
 #define WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1  0x0700
 
 /* HARQ MAP CQICH Control IE display indexies */
-static gint hf_cqich_control_ie_indicator = -1;
-static gint hf_cqich_control_ie_alloc_id = -1;
-static gint hf_cqich_control_ie_period = -1;
-static gint hf_cqich_control_ie_frame_offset = -1;
-static gint hf_cqich_control_ie_duration = -1;
-static gint hf_cqich_control_ie_cqi_rep_threshold = -1;
-static gint hf_cqich_control_ie_indicator_1 = -1;
-static gint hf_cqich_control_ie_alloc_id_1 = -1;
-static gint hf_cqich_control_ie_period_1 = -1;
-static gint hf_cqich_control_ie_frame_offset_1 = -1;
-static gint hf_cqich_control_ie_duration_1 = -1;
-static gint hf_cqich_control_ie_cqi_rep_threshold_1 = -1;
+static gint hf_cqich_control_ie_indicator;
+static gint hf_cqich_control_ie_alloc_id;
+static gint hf_cqich_control_ie_period;
+static gint hf_cqich_control_ie_frame_offset;
+static gint hf_cqich_control_ie_duration;
+static gint hf_cqich_control_ie_cqi_rep_threshold;
+static gint hf_cqich_control_ie_indicator_1;
+static gint hf_cqich_control_ie_alloc_id_1;
+static gint hf_cqich_control_ie_period_1;
+static gint hf_cqich_control_ie_frame_offset_1;
+static gint hf_cqich_control_ie_duration_1;
+static gint hf_cqich_control_ie_cqi_rep_threshold_1;
 
 /* Masks */
 #define WIMAX_CQICH_CONTROL_IE_INDICATOR_MASK           0x8000
@@ -319,37 +319,37 @@ static gint hf_cqich_control_ie_cqi_rep_threshold_1 = -1;
 #define EXTENSION_LENGTH_MASK       0x00F0
 #define EXTENSION_LENGTH_MASK_1     0x000F
 
-static gint hf_cdlmap_extension_type = -1;
-static gint hf_cdlmap_extension_subtype = -1;
-static gint hf_cdlmap_extension_length = -1;
-static gint hf_cdlmap_extension_type_1 = -1;
-static gint hf_cdlmap_extension_subtype_1 = -1;
-static gint hf_cdlmap_extension_length_1 = -1;
+static gint hf_cdlmap_extension_type;
+static gint hf_cdlmap_extension_subtype;
+static gint hf_cdlmap_extension_length;
+static gint hf_cdlmap_extension_type_1;
+static gint hf_cdlmap_extension_subtype_1;
+static gint hf_cdlmap_extension_length_1;
 
-static gint hf_cdlmap_extension_time_diversity_mbs = -1;
-static gint hf_cdlmap_extension_harq_mode = -1;
-static gint hf_cdlmap_extension_unknown_sub_type = -1;
-static gint hf_cdlmap_extension_time_diversity_mbs_1 = -1;
-static gint hf_cdlmap_extension_harq_mode_1 = -1;
-static gint hf_cdlmap_extension_unknown_sub_type_1 = -1;
+static gint hf_cdlmap_extension_time_diversity_mbs;
+static gint hf_cdlmap_extension_harq_mode;
+static gint hf_cdlmap_extension_unknown_sub_type;
+static gint hf_cdlmap_extension_time_diversity_mbs_1;
+static gint hf_cdlmap_extension_harq_mode_1;
+static gint hf_cdlmap_extension_unknown_sub_type_1;
 
 /* Extended DIUC dependent IE display indexies */
-static gint hf_extended_diuc_dependent_ie_diuc = -1;
-static gint hf_extended_diuc_dependent_ie_diuc_1 = -1;
-static gint hf_extended_diuc_dependent_ie_length = -1;
-static gint hf_extended_diuc_dependent_ie_length_1 = -1;
-static gint hf_extended_diuc_dependent_ie_channel_measurement = -1;
-static gint hf_extended_diuc_dependent_ie_stc_zone = -1;
-static gint hf_extended_diuc_dependent_ie_aas_dl = -1;
-static gint hf_extended_diuc_dependent_ie_data_location = -1;
-static gint hf_extended_diuc_dependent_ie_cid_switch = -1;
-static gint hf_extended_diuc_dependent_ie_mimo_dl_basic = -1;
-static gint hf_extended_diuc_dependent_ie_mimo_dl_enhanced = -1;
-static gint hf_extended_diuc_dependent_ie_harq_map_pointer = -1;
-static gint hf_extended_diuc_dependent_ie_phymod_dl = -1;
-static gint hf_extended_diuc_dependent_ie_dl_pusc_burst_allocation = -1;
-static gint hf_extended_diuc_dependent_ie_ul_interference_and_noise_level = -1;
-static gint hf_extended_diuc_dependent_ie_unknown_diuc = -1;
+static gint hf_extended_diuc_dependent_ie_diuc;
+static gint hf_extended_diuc_dependent_ie_diuc_1;
+static gint hf_extended_diuc_dependent_ie_length;
+static gint hf_extended_diuc_dependent_ie_length_1;
+static gint hf_extended_diuc_dependent_ie_channel_measurement;
+static gint hf_extended_diuc_dependent_ie_stc_zone;
+static gint hf_extended_diuc_dependent_ie_aas_dl;
+static gint hf_extended_diuc_dependent_ie_data_location;
+static gint hf_extended_diuc_dependent_ie_cid_switch;
+static gint hf_extended_diuc_dependent_ie_mimo_dl_basic;
+static gint hf_extended_diuc_dependent_ie_mimo_dl_enhanced;
+static gint hf_extended_diuc_dependent_ie_harq_map_pointer;
+static gint hf_extended_diuc_dependent_ie_phymod_dl;
+static gint hf_extended_diuc_dependent_ie_dl_pusc_burst_allocation;
+static gint hf_extended_diuc_dependent_ie_ul_interference_and_noise_level;
+static gint hf_extended_diuc_dependent_ie_unknown_diuc;
 
 
 /* Compact DL-MAP IE Types (table 89) */
diff --git a/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
index efa90abd9e..0968a3be51 100644
--- a/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
@@ -46,14 +46,14 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info *
 static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
 static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint offset, guint nibble_offset);
 
-static gint proto_wimax_compact_ulmap_ie_decoder = -1;
+static gint proto_wimax_compact_ulmap_ie_decoder;
 
 #if 0 /* not used ?? */
-static gint ett_wimax_compact_ulmap_ie_decoder = -1;
-static gint ett_wimax_rcid_ie_decoder = -1;
-static gint ett_wimax_harq_control_ie_decoder = -1;
-static gint ett_wimax_extended_uiuc_dependent_ie_decoder = -1;
-static gint ett_wimax_extension_type_ie_decoder = -1;
+static gint ett_wimax_compact_ulmap_ie_decoder;
+static gint ett_wimax_rcid_ie_decoder;
+static gint ett_wimax_harq_control_ie_decoder;
+static gint ett_wimax_extended_uiuc_dependent_ie_decoder;
+static gint ett_wimax_extension_type_ie_decoder;
 #endif
 
 /* Prefixes */
@@ -122,83 +122,83 @@ static const value_string vals_ctypes[] =
 #define ALLOCATION_MODE_MASK_1 0x0C
 
 /* display indexies */
-static gint hf_culmap_ul_map_type = -1;
-static gint hf_culmap_reserved = -1;
-static gint hf_culmap_nep_code = -1;
-static gint hf_culmap_nsch_code = -1;
-static gint hf_culmap_num_bands = -1;
-static gint hf_culmap_band_index = -1;
-static gint hf_culmap_nb_bitmap = -1;
-static gint hf_culmap_ul_map_type_1 = -1;
-static gint hf_culmap_reserved_1 = -1;
-static gint hf_culmap_nep_code_1 = -1;
-static gint hf_culmap_nsch_code_1 = -1;
-static gint hf_culmap_num_bands_1 = -1;
-/*static gint hf_culmap_band_index_1 = -1;*/
-static gint hf_culmap_nb_bitmap_1 = -1;
-
-static gint hf_culmap_shortened_uiuc = -1;
-static gint hf_culmap_companded_sc = -1;
-static gint hf_culmap_shortened_uiuc_1 = -1;
-static gint hf_culmap_companded_sc_1 = -1;
-
-static gint hf_culmap_bin_offset = -1;
-static gint hf_culmap_bin_offset_1 = -1;
-
-static gint hf_culmap_uiuc_ofdma_symbol_offset = -1;
-static gint hf_culmap_uiuc_ofdma_symbol_offset_1 = -1;
-static gint hf_culmap_uiuc_subchannel_offset_7 = -1;
-static gint hf_culmap_uiuc_num_of_ofdma_symbols_7 = -1;
-static gint hf_culmap_uiuc_num_of_subchannels_7 = -1;
-static gint hf_culmap_uiuc_ranging_method = -1;
-static gint hf_culmap_uiuc_reserved = -1;
-static gint hf_culmap_uiuc_subchannel_offset_7_1 = -1;
-static gint hf_culmap_uiuc_num_of_ofdma_symbols_7_1 = -1;
-static gint hf_culmap_uiuc_num_of_subchannels_7_1 = -1;
-static gint hf_culmap_uiuc_ranging_method_1 = -1;
-static gint hf_culmap_uiuc_reserved_1 = -1;
-static gint hf_culmap_uiuc_repetition_coding_indication = -1;
-static gint hf_culmap_uiuc_repetition_coding_indication_1 = -1;
-/* static gint hf_culmap_uiuc_reserved1 = -1; */
-/* static gint hf_culmap_uiuc_reserved11_1 = -1; */
-static gint hf_culmap_uiuc_subchannel_offset = -1;
-static gint hf_culmap_uiuc_subchannel_offset_1 = -1;
-static gint hf_culmap_uiuc_num_of_ofdma_symbols = -1;
-static gint hf_culmap_uiuc_num_of_ofdma_symbols_1 = -1;
-static gint hf_culmap_uiuc_num_of_subchannels = -1;
-static gint hf_culmap_uiuc_num_of_subchannels_1 = -1;
-
-static gint hf_culmap_harq_region_change_indication = -1;
-static gint hf_culmap_harq_region_change_indication_1 = -1;
-static gint hf_culmap_cqi_region_change_indication = -1;
-static gint hf_culmap_cqi_region_change_indication_1 = -1;
-
-static gint hf_culmap_uiuc = -1;
-static gint hf_culmap_uiuc_1 = -1;
-
-static gint hf_culmap_allocation_mode = -1;
-static gint hf_culmap_allocation_mode_rsvd = -1;
-static gint hf_culmap_num_subchannels = -1;
-static gint hf_culmap_allocation_mode_1 = -1;
-static gint hf_culmap_allocation_mode_rsvd_1 = -1;
-static gint hf_culmap_num_subchannels_1 = -1;
-
-/* static gint hf_culmap_reserved_type = -1; */
-static gint hf_culmap_reserved_type_1 = -1;
+static gint hf_culmap_ul_map_type;
+static gint hf_culmap_reserved;
+static gint hf_culmap_nep_code;
+static gint hf_culmap_nsch_code;
+static gint hf_culmap_num_bands;
+static gint hf_culmap_band_index;
+static gint hf_culmap_nb_bitmap;
+static gint hf_culmap_ul_map_type_1;
+static gint hf_culmap_reserved_1;
+static gint hf_culmap_nep_code_1;
+static gint hf_culmap_nsch_code_1;
+static gint hf_culmap_num_bands_1;
+/*static gint hf_culmap_band_index_1;*/
+static gint hf_culmap_nb_bitmap_1;
+
+static gint hf_culmap_shortened_uiuc;
+static gint hf_culmap_companded_sc;
+static gint hf_culmap_shortened_uiuc_1;
+static gint hf_culmap_companded_sc_1;
+
+static gint hf_culmap_bin_offset;
+static gint hf_culmap_bin_offset_1;
+
+static gint hf_culmap_uiuc_ofdma_symbol_offset;
+static gint hf_culmap_uiuc_ofdma_symbol_offset_1;
+static gint hf_culmap_uiuc_subchannel_offset_7;
+static gint hf_culmap_uiuc_num_of_ofdma_symbols_7;
+static gint hf_culmap_uiuc_num_of_subchannels_7;
+static gint hf_culmap_uiuc_ranging_method;
+static gint hf_culmap_uiuc_reserved;
+static gint hf_culmap_uiuc_subchannel_offset_7_1;
+static gint hf_culmap_uiuc_num_of_ofdma_symbols_7_1;
+static gint hf_culmap_uiuc_num_of_subchannels_7_1;
+static gint hf_culmap_uiuc_ranging_method_1;
+static gint hf_culmap_uiuc_reserved_1;
+static gint hf_culmap_uiuc_repetition_coding_indication;
+static gint hf_culmap_uiuc_repetition_coding_indication_1;
+/* static gint hf_culmap_uiuc_reserved1; */
+/* static gint hf_culmap_uiuc_reserved11_1; */
+static gint hf_culmap_uiuc_subchannel_offset;
+static gint hf_culmap_uiuc_subchannel_offset_1;
+static gint hf_culmap_uiuc_num_of_ofdma_symbols;
+static gint hf_culmap_uiuc_num_of_ofdma_symbols_1;
+static gint hf_culmap_uiuc_num_of_subchannels;
+static gint hf_culmap_uiuc_num_of_subchannels_1;
+
+static gint hf_culmap_harq_region_change_indication;
+static gint hf_culmap_harq_region_change_indication_1;
+static gint hf_culmap_cqi_region_change_indication;
+static gint hf_culmap_cqi_region_change_indication_1;
+
+static gint hf_culmap_uiuc;
+static gint hf_culmap_uiuc_1;
+
+static gint hf_culmap_allocation_mode;
+static gint hf_culmap_allocation_mode_rsvd;
+static gint hf_culmap_num_subchannels;
+static gint hf_culmap_allocation_mode_1;
+static gint hf_culmap_allocation_mode_rsvd_1;
+static gint hf_culmap_num_subchannels_1;
+
+/* static gint hf_culmap_reserved_type; */
+static gint hf_culmap_reserved_type_1;
 
 /* display indexies */
-static gint hf_rcid_ie_prefix = -1;
-static gint hf_rcid_ie_prefix_1 = -1;
-static gint hf_rcid_ie_normal_cid = -1;
-static gint hf_rcid_ie_normal_cid_1 = -1;
-static gint hf_rcid_ie_cid3 = -1;
-static gint hf_rcid_ie_cid3_1 = -1;
-static gint hf_rcid_ie_cid7 = -1;
-static gint hf_rcid_ie_cid7_1 = -1;
-static gint hf_rcid_ie_cid11 = -1;
-static gint hf_rcid_ie_cid11_1 = -1;
-static gint hf_rcid_ie_cid11_2 = -1;
-static gint hf_rcid_ie_cid11_3 = -1;
+static gint hf_rcid_ie_prefix;
+static gint hf_rcid_ie_prefix_1;
+static gint hf_rcid_ie_normal_cid;
+static gint hf_rcid_ie_normal_cid_1;
+static gint hf_rcid_ie_cid3;
+static gint hf_rcid_ie_cid3_1;
+static gint hf_rcid_ie_cid7;
+static gint hf_rcid_ie_cid7_1;
+static gint hf_rcid_ie_cid11;
+static gint hf_rcid_ie_cid11_1;
+static gint hf_rcid_ie_cid11_2;
+static gint hf_rcid_ie_cid11_3;
 
 /* Masks */
 #define WIMAX_RCID_IE_NORMAL_CID_MASK_1      0x0FFFF0
@@ -212,16 +212,16 @@ static gint hf_rcid_ie_cid11_3 = -1;
 #define WIMAX_RCID_IE_CID11_MASK_1           0x07FF
 
 /* HARQ MAP HARQ Control IE display indexies */
-static gint hf_harq_control_ie_prefix = -1;
-static gint hf_harq_control_ie_ai_sn = -1;
-static gint hf_harq_control_ie_spid = -1;
-static gint hf_harq_control_ie_acid = -1;
-static gint hf_harq_control_ie_reserved = -1;
-static gint hf_harq_control_ie_prefix_1 = -1;
-static gint hf_harq_control_ie_ai_sn_1 = -1;
-static gint hf_harq_control_ie_spid_1 = -1;
-static gint hf_harq_control_ie_acid_1 = -1;
-static gint hf_harq_control_ie_reserved_1 = -1;
+static gint hf_harq_control_ie_prefix;
+static gint hf_harq_control_ie_ai_sn;
+static gint hf_harq_control_ie_spid;
+static gint hf_harq_control_ie_acid;
+static gint hf_harq_control_ie_reserved;
+static gint hf_harq_control_ie_prefix_1;
+static gint hf_harq_control_ie_ai_sn_1;
+static gint hf_harq_control_ie_spid_1;
+static gint hf_harq_control_ie_acid_1;
+static gint hf_harq_control_ie_reserved_1;
 
 /* Masks */
 #define WIMAX_HARQ_CONTROL_IE_PREFIX_MASK      0x80
@@ -243,19 +243,19 @@ static gint hf_harq_control_ie_reserved_1 = -1;
 #define EXTENSION_LENGTH_MASK       0x00F0
 #define EXTENSION_LENGTH_MASK_1     0x000F
 
-static gint hf_culmap_extension_type = -1;
-static gint hf_culmap_extension_subtype = -1;
-static gint hf_culmap_extension_length = -1;
-static gint hf_culmap_extension_type_1 = -1;
-static gint hf_culmap_extension_subtype_1 = -1;
-static gint hf_culmap_extension_length_1 = -1;
+static gint hf_culmap_extension_type;
+static gint hf_culmap_extension_subtype;
+static gint hf_culmap_extension_length;
+static gint hf_culmap_extension_type_1;
+static gint hf_culmap_extension_subtype_1;
+static gint hf_culmap_extension_length_1;
 
-/* static gint hf_culmap_extension_time_diversity_mbs = -1; */
-static gint hf_culmap_extension_harq_mode = -1;
-static gint hf_culmap_extension_unknown_sub_type = -1;
-/* static gint hf_culmap_extension_time_diversity_mbs_1 = -1; */
-static gint hf_culmap_extension_harq_mode_1 = -1;
-static gint hf_culmap_extension_unknown_sub_type_1 = -1;
+/* static gint hf_culmap_extension_time_diversity_mbs; */
+static gint hf_culmap_extension_harq_mode;
+static gint hf_culmap_extension_unknown_sub_type;
+/* static gint hf_culmap_extension_time_diversity_mbs_1; */
+static gint hf_culmap_extension_harq_mode_1;
+static gint hf_culmap_extension_unknown_sub_type_1;
 
 /* UL-MAP CDMA Allocation IE */
 #define CDMA_ALLOCATION_DURATION_MASK               0xFC00
@@ -275,22 +275,22 @@ static gint hf_culmap_extension_unknown_sub_type_1 = -1;
 #define CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK_1   0x00000FE0
 #define CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK_1 0x00000010
 
-static gint hf_cdma_allocation_duration = -1;
-static gint hf_cdma_allocation_uiuc = -1;
-static gint hf_cdma_allocation_repetition = -1;
-static gint hf_cdma_allocation_frame_number_index = -1;
-static gint hf_cdma_allocation_ranging_code = -1;
-static gint hf_cdma_allocation_ranging_symbol = -1;
-static gint hf_cdma_allocation_ranging_subchannel = -1;
-static gint hf_cdma_allocation_bw_req = -1;
-static gint hf_cdma_allocation_duration_1 = -1;
-static gint hf_cdma_allocation_uiuc_1 = -1;
-static gint hf_cdma_allocation_repetition_1 = -1;
-static gint hf_cdma_allocation_frame_number_index_1 = -1;
-static gint hf_cdma_allocation_ranging_code_1 = -1;
-static gint hf_cdma_allocation_ranging_symbol_1 = -1;
-static gint hf_cdma_allocation_ranging_subchannel_1 = -1;
-static gint hf_cdma_allocation_bw_req_1 = -1;
+static gint hf_cdma_allocation_duration;
+static gint hf_cdma_allocation_uiuc;
+static gint hf_cdma_allocation_repetition;
+static gint hf_cdma_allocation_frame_number_index;
+static gint hf_cdma_allocation_ranging_code;
+static gint hf_cdma_allocation_ranging_symbol;
+static gint hf_cdma_allocation_ranging_subchannel;
+static gint hf_cdma_allocation_bw_req;
+static gint hf_cdma_allocation_duration_1;
+static gint hf_cdma_allocation_uiuc_1;
+static gint hf_cdma_allocation_repetition_1;
+static gint hf_cdma_allocation_frame_number_index_1;
+static gint hf_cdma_allocation_ranging_code_1;
+static gint hf_cdma_allocation_ranging_symbol_1;
+static gint hf_cdma_allocation_ranging_subchannel_1;
+static gint hf_cdma_allocation_bw_req_1;
 
 /* UL-MAP Extended UIUCs (table 290a) */
 #define MINI_SUBCHANNEL_CTYPE_MASK           0xC0
@@ -312,42 +312,42 @@ static gint hf_cdma_allocation_bw_req_1 = -1;
 #define MINI_SUBCHANNEL_PADDING_MASK         0xF0
 #define MINI_SUBCHANNEL_PADDING_MASK_1       0x0000000F
 
-static gint hf_extended_uiuc_ie_uiuc = -1;
-static gint hf_extended_uiuc_ie_length = -1;
-static gint hf_extended_uiuc_ie_uiuc_1 = -1;
-static gint hf_extended_uiuc_ie_length_1 = -1;
-static gint hf_extended_uiuc_ie_power_control = -1;
-static gint hf_extended_uiuc_ie_power_measurement_frame = -1;
-static gint hf_extended_uiuc_ie_power_control_24 = -1;
-static gint hf_extended_uiuc_ie_power_measurement_frame_24 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_ctype = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_duration = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_padding = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3 = -1;
-static gint hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1 = -1;
-static gint hf_extended_uiuc_ie_aas_ul = -1;
-static gint hf_extended_uiuc_ie_cqich_alloc = -1;
-static gint hf_extended_uiuc_ie_ul_zone = -1;
-static gint hf_extended_uiuc_ie_phymod_ul = -1;
-static gint hf_extended_uiuc_ie_mimo_ul_basic = -1;
-static gint hf_extended_uiuc_ie_fast_tracking = -1;
-static gint hf_extended_uiuc_ie_ul_pusc_burst_allocation = -1;
-static gint hf_extended_uiuc_ie_fast_ranging = -1;
-static gint hf_extended_uiuc_ie_ul_allocation_start = -1;
-static gint hf_extended_uiuc_ie_unknown_uiuc = -1;
+static gint hf_extended_uiuc_ie_uiuc;
+static gint hf_extended_uiuc_ie_length;
+static gint hf_extended_uiuc_ie_uiuc_1;
+static gint hf_extended_uiuc_ie_length_1;
+static gint hf_extended_uiuc_ie_power_control;
+static gint hf_extended_uiuc_ie_power_measurement_frame;
+static gint hf_extended_uiuc_ie_power_control_24;
+static gint hf_extended_uiuc_ie_power_measurement_frame_24;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_ctype;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_duration;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_padding;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3;
+static gint hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1;
+static gint hf_extended_uiuc_ie_aas_ul;
+static gint hf_extended_uiuc_ie_cqich_alloc;
+static gint hf_extended_uiuc_ie_ul_zone;
+static gint hf_extended_uiuc_ie_phymod_ul;
+static gint hf_extended_uiuc_ie_mimo_ul_basic;
+static gint hf_extended_uiuc_ie_fast_tracking;
+static gint hf_extended_uiuc_ie_ul_pusc_burst_allocation;
+static gint hf_extended_uiuc_ie_fast_ranging;
+static gint hf_extended_uiuc_ie_ul_allocation_start;
+static gint hf_extended_uiuc_ie_unknown_uiuc;
 
 
 /* Compact UL-MAP IE Types (table 90) */
diff --git a/plugins/epan/wimax/wimax_fch_decoder.c b/plugins/epan/wimax/wimax_fch_decoder.c
index 60f0251b60..69e2c1959c 100644
--- a/plugins/epan/wimax/wimax_fch_decoder.c
+++ b/plugins/epan/wimax/wimax_fch_decoder.c
@@ -25,8 +25,8 @@ extern gint proto_wimax;
 
 extern address bs_address;	/* declared in packet-wmx.c */
 
-static int proto_wimax_fch_decoder = -1;
-static gint ett_wimax_fch_decoder = -1;
+static int proto_wimax_fch_decoder;
+static gint ett_wimax_fch_decoder;
 
 #define FCH_BURST_LENGTH 3
 /* FCH Burst bits */
@@ -42,17 +42,17 @@ static gint ett_wimax_fch_decoder = -1;
 #define DL_MAP_LENGTH                0x000FF0
 #define FCH_RESERVED_2		     0x00000F
 
-static int hf_fch_used_subchannel_group0 = -1;
-static int hf_fch_used_subchannel_group1 = -1;
-static int hf_fch_used_subchannel_group2 = -1;
-static int hf_fch_used_subchannel_group3 = -1;
-static int hf_fch_used_subchannel_group4 = -1;
-static int hf_fch_used_subchannel_group5 = -1;
-static int hf_fch_reserved_1 = -1;
-static int hf_fch_repetition_coding_indication = -1;
-static int hf_fch_coding_indication = -1;
-static int hf_fch_dlmap_length = -1;
-static int hf_fch_reserved_2 = -1;
+static int hf_fch_used_subchannel_group0;
+static int hf_fch_used_subchannel_group1;
+static int hf_fch_used_subchannel_group2;
+static int hf_fch_used_subchannel_group3;
+static int hf_fch_used_subchannel_group4;
+static int hf_fch_used_subchannel_group5;
+static int hf_fch_reserved_1;
+static int hf_fch_repetition_coding_indication;
+static int hf_fch_coding_indication;
+static int hf_fch_dlmap_length;
+static int hf_fch_reserved_2;
 
 static const value_string used_or_not_used[] =
 {
diff --git a/plugins/epan/wimax/wimax_ffb_decoder.c b/plugins/epan/wimax/wimax_ffb_decoder.c
index 8a9ccad30b..5b8b8f8b72 100644
--- a/plugins/epan/wimax/wimax_ffb_decoder.c
+++ b/plugins/epan/wimax/wimax_ffb_decoder.c
@@ -21,15 +21,15 @@
 
 extern gint proto_wimax;
 
-static gint proto_wimax_ffb_decoder = -1;
-static gint ett_wimax_ffb_decoder = -1;
+static gint proto_wimax_ffb_decoder;
+static gint ett_wimax_ffb_decoder;
 
-/* static gint hf_ffb_burst = -1; */
-static gint hf_ffb_num_of_ffbs = -1;
-static gint hf_ffb_type = -1;
-static gint hf_ffb_subchannel = -1;
-static gint hf_ffb_symboloffset = -1;
-static gint hf_ffb_value = -1;
+/* static gint hf_ffb_burst; */
+static gint hf_ffb_num_of_ffbs;
+static gint hf_ffb_type;
+static gint hf_ffb_subchannel;
+static gint hf_ffb_symboloffset;
+static gint hf_ffb_value;
 
 
 static int dissect_wimax_ffb_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/plugins/epan/wimax/wimax_hack_decoder.c b/plugins/epan/wimax/wimax_hack_decoder.c
index 1c44e2994d..a1aaef93ef 100644
--- a/plugins/epan/wimax/wimax_hack_decoder.c
+++ b/plugins/epan/wimax/wimax_hack_decoder.c
@@ -21,8 +21,8 @@
 
 extern gint proto_wimax;
 
-static gint proto_wimax_hack_decoder = -1;
-static gint ett_wimax_hack_decoder = -1;
+static gint proto_wimax_hack_decoder;
+static gint ett_wimax_hack_decoder;
 
 static const value_string vals_flags[] =
 {
@@ -38,12 +38,12 @@ static const value_string vals_values[] =
 	{0, NULL}
 };
 
-/* static gint hf_hack_burst = -1; */
-static gint hf_hack_num_of_hacks = -1;
-static gint hf_hack_half_slot_flag = -1;
-static gint hf_hack_subchannel = -1;
-static gint hf_hack_symboloffset = -1;
-static gint hf_hack_value = -1;
+/* static gint hf_hack_burst; */
+static gint hf_hack_num_of_hacks;
+static gint hf_hack_half_slot_flag;
+static gint hf_hack_subchannel;
+static gint hf_hack_symboloffset;
+static gint hf_hack_value;
 
 
 static int dissect_wimax_hack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/plugins/epan/wimax/wimax_harq_map_decoder.c b/plugins/epan/wimax/wimax_harq_map_decoder.c
index ec99de002c..d0bb91cdad 100644
--- a/plugins/epan/wimax/wimax_harq_map_decoder.c
+++ b/plugins/epan/wimax/wimax_harq_map_decoder.c
@@ -25,8 +25,8 @@
 
 extern gint proto_wimax;
 
-static gint proto_wimax_harq_map_decoder = -1;
-static gint ett_wimax_harq_map_decoder = -1;
+static gint proto_wimax_harq_map_decoder;
+static gint ett_wimax_harq_map_decoder;
 
 /* MASKs */
 #define LSB_NIBBLE_MASK      0x0F
@@ -41,15 +41,15 @@ static gint ett_wimax_harq_map_decoder = -1;
 #define WIMAX_HARQ_MAP_DL_IE_COUNT_SHIFT 4
 
 /* HARQ MAP display indexies */
-static gint hf_harq_map_indicator = -1;
-static gint hf_harq_ul_map_appended = -1;
-static gint hf_harq_map_reserved = -1;
-static gint hf_harq_map_msg_length = -1;
-static gint hf_harq_dl_ie_count = -1;
-static gint hf_harq_map_msg_crc = -1;
-static gint hf_harq_map_msg_crc_status = -1;
-
-static expert_field ei_harq_map_msg_crc = EI_INIT;
+static gint hf_harq_map_indicator;
+static gint hf_harq_ul_map_appended;
+static gint hf_harq_map_reserved;
+static gint hf_harq_map_msg_length;
+static gint hf_harq_dl_ie_count;
+static gint hf_harq_map_msg_crc;
+static gint hf_harq_map_msg_crc_status;
+
+static expert_field ei_harq_map_msg_crc;
 
 
 /* Copied and renamed from proto.c because global value_strings don't work for plugins */
diff --git a/plugins/epan/wimax/wimax_pdu_decoder.c b/plugins/epan/wimax/wimax_pdu_decoder.c
index a7e7eaf2d8..3b764a69db 100644
--- a/plugins/epan/wimax/wimax_pdu_decoder.c
+++ b/plugins/epan/wimax/wimax_pdu_decoder.c
@@ -47,10 +47,10 @@ static dissector_handle_t wimax_harq_map_handle = NULL;
 /* Global Variables. */
 gboolean first_gmh;
 
-static gint proto_wimax_pdu_decoder = -1;
-static gint ett_wimax_pdu_decoder = -1;
+static gint proto_wimax_pdu_decoder;
+static gint ett_wimax_pdu_decoder;
 
-static int hf_wimax_value_bytes = -1;
+static int hf_wimax_value_bytes;
 
 static int dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/plugins/epan/wimax/wimax_phy_attributes_decoder.c b/plugins/epan/wimax/wimax_phy_attributes_decoder.c
index 25572401b2..daa691523c 100644
--- a/plugins/epan/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/epan/wimax/wimax_phy_attributes_decoder.c
@@ -21,8 +21,8 @@
 
 extern gint proto_wimax;
 
-static gint proto_wimax_phy_attributes_decoder = -1;
-static gint ett_wimax_phy_attributes_decoder = -1;
+static gint proto_wimax_phy_attributes_decoder;
+static gint ett_wimax_phy_attributes_decoder;
 
 static const value_string vals_subchannel_types[] =
 {
@@ -53,14 +53,14 @@ static const value_string vals_encoding_types[] =
 	{0, NULL}
 };
 
-static gint hf_phy_attributes_subchannelization_type = -1;
-static gint hf_phy_attributes_permbase = -1;
-static gint hf_phy_attributes_modulation_rate = -1;
-static gint hf_phy_attributes_encoding_type = -1;
-static gint hf_phy_attributes_num_repeat = -1;
-static gint hf_phy_attributes_symbol_offset = -1;
-static gint hf_phy_attributes_num_of_slots = -1;
-static gint hf_phy_attributes_subchannel = -1;
+static gint hf_phy_attributes_subchannelization_type;
+static gint hf_phy_attributes_permbase;
+static gint hf_phy_attributes_modulation_rate;
+static gint hf_phy_attributes_encoding_type;
+static gint hf_phy_attributes_num_repeat;
+static gint hf_phy_attributes_symbol_offset;
+static gint hf_phy_attributes_num_of_slots;
+static gint hf_phy_attributes_subchannel;
 
 
 
diff --git a/plugins/epan/wimax/wimax_utils.c b/plugins/epan/wimax/wimax_utils.c
index 226c536a15..e59bb2a561 100644
--- a/plugins/epan/wimax/wimax_utils.c
+++ b/plugins/epan/wimax/wimax_utils.c
@@ -32,22 +32,22 @@ extern gint proto_mac_mgmt_msg_reg_req_decoder;
 extern gint mac_sdu_length;                   /* declared in packet-wmx.c */
 extern gboolean include_cor2_changes;
 
-static gint proto_wimax_utility_decoders = -1;
-static gint ett_wimax_service_flow_encodings = -1;
-static gint ett_wimax_cst_encoding_rules = -1;
-static gint ett_wimax_error_parameter_set = -1;
-static gint ett_wimax_hmac_tuple = -1;
-static gint ett_wimax_cmac_tuple = -1;
-static gint ett_wimax_short_hmac_tuple = -1;
-static gint ett_security_negotiation_parameters = -1;
-static gint ett_pkm_tlv_encoded_attributes_decoder = -1;
-static gint ett_sa_descriptor_decoder = -1;
-static gint ett_cryptographic_suite_list_decoder = -1;
-static gint ett_security_capabilities_decoder = -1;
-static gint ett_vendor_specific_info_decoder = -1;
-static gint ett_vendor_id_encoding_decoder = -1;
-static gint ett_ul_service_flow_decoder = -1;
-static gint ett_dl_service_flow_decoder = -1;
+static gint proto_wimax_utility_decoders;
+static gint ett_wimax_service_flow_encodings;
+static gint ett_wimax_cst_encoding_rules;
+static gint ett_wimax_error_parameter_set;
+static gint ett_wimax_hmac_tuple;
+static gint ett_wimax_cmac_tuple;
+static gint ett_wimax_short_hmac_tuple;
+static gint ett_security_negotiation_parameters;
+static gint ett_pkm_tlv_encoded_attributes_decoder;
+static gint ett_sa_descriptor_decoder;
+static gint ett_cryptographic_suite_list_decoder;
+static gint ett_security_capabilities_decoder;
+static gint ett_vendor_specific_info_decoder;
+static gint ett_vendor_id_encoding_decoder;
+static gint ett_ul_service_flow_decoder;
+static gint ett_dl_service_flow_decoder;
 
 static dissector_handle_t eap_handle = NULL;
 
@@ -400,155 +400,155 @@ static const value_string vals_dcd_mac_version[] =
 };
 
 /* fix fields */
-static gint hf_sfe_unknown_type = -1;
-static gint hf_sfe_sf_id = -1;
-static gint hf_sfe_cid = -1;
-static gint hf_sfe_service_class_name = -1;
-static gint hf_sfe_mbs_service = -1;
-static gint hf_sfe_qos_params_set = -1;
-static gint hf_sfe_set_provisioned = -1;
-static gint hf_sfe_set_admitted = -1;
-static gint hf_sfe_set_active = -1;
-static gint hf_sfe_set_rsvd = -1;
-static gint hf_sfe_traffic_priority = -1;
-static gint hf_sfe_max_str = -1;
-static gint hf_sfe_max_traffic_burst = -1;
-static gint hf_sfe_min_rtr = -1;
-static gint hf_sfe_reserved_10 = -1;
-static gint hf_sfe_ul_grant_scheduling = -1;
-static gint hf_sfe_req_tx_policy = -1;
-static gint hf_sfe_policy_broadcast_bwr = -1;
-static gint hf_sfe_policy_multicast_bwr = -1;
-static gint hf_sfe_policy_piggyback = -1;
-static gint hf_sfe_policy_fragment = -1;
-static gint hf_sfe_policy_headers = -1;
-static gint hf_sfe_policy_packing = -1;
-static gint hf_sfe_policy_crc = -1;
-static gint hf_sfe_policy_rsvd1 = -1;
-static gint hf_sfe_jitter = -1;
-static gint hf_sfe_max_latency = -1;
-static gint hf_sfe_fixed_len_sdu = -1;
-static gint hf_sfe_sdu_size = -1;
-static gint hf_sfe_target_said = -1;
-static gint hf_sfe_cs_specification = -1;
-static gint hf_sfe_type_of_data_delivery_services = -1;
-static gint hf_sfe_sdu_inter_arrival_interval = -1;
-static gint hf_sfe_time_base = -1;
-static gint hf_sfe_paging_preference = -1;
-static gint hf_sfe_mbs_zone_identifier_assignment = -1;
-static gint hf_sfe_sn_feedback_enabled = -1;
-static gint hf_sfe_harq_service_flows = -1;
-static gint hf_sfe_harq_channel_mapping_index = -1;
-static gint hf_sfe_fsn_size = -1;
-static gint hf_sfe_unsolicited_grant_interval = -1;
-static gint hf_sfe_unsolicited_polling_interval = -1;
-/* static gint hf_sfe_harq_channel_mapping = -1; */
-static gint hf_sfe_global_service_class_name = -1;
-static gint hf_sfe_reserved_36 = -1;
-static gint hf_sfe_reserved_34 = -1;
-
-static gint hf_sfe_arq_enable = -1;
-static gint hf_sfe_arq_transmitter_delay = -1;
-static gint hf_sfe_arq_receiver_delay = -1;
-static gint hf_sfe_arq_block_lifetime = -1;
-static gint hf_sfe_arq_sync_loss_timeout = -1;
-static gint hf_sfe_arq_transmitter_delay_cor2 = -1;
-static gint hf_sfe_arq_receiver_delay_cor2 = -1;
-static gint hf_sfe_arq_block_lifetime_cor2 = -1;
-static gint hf_sfe_arq_sync_loss_timeout_cor2 = -1;
-static gint hf_sfe_arq_deliver_in_order = -1;
-static gint hf_sfe_arq_rx_purge_timeout = -1;
-static gint hf_sfe_arq_window_size = -1;
-static gint hf_sfe_arq_block_size = -1;
-static gint hf_sfe_arq_block_size_cor2 = -1;
-static gint hf_sfe_arq_min_block_size = -1;
-static gint hf_sfe_arq_max_block_size = -1;
-
-/* static gint hf_sfe_cid_alloc_for_active_bs = -1; */
-static gint hf_sfe_cid_alloc_for_active_bs_cid = -1;
-static gint hf_sfe_pdu_sn_ext_subheader_reorder = -1;
-static gint hf_sfe_mbs_contents_ids = -1;
-static gint hf_sfe_mbs_contents_ids_id = -1;
-static gint hf_sfe_authorization_token = -1;
-
-static gint hf_cst_classifier_dsc_action = -1;
-static gint hf_cst_error_set_errored_param = -1;
-static gint hf_cst_error_set_error_code = -1;
-static gint hf_cst_error_set_error_msg = -1;
-
-static gint hf_cst_pkt_class_rule = -1;
-
-static gint hf_cst_pkt_class_rule_priority = -1;
-static gint hf_cst_pkt_class_rule_range_mask = -1;
-static gint hf_cst_pkt_class_rule_tos_low = -1;
-static gint hf_cst_pkt_class_rule_tos_high = -1;
-static gint hf_cst_pkt_class_rule_tos_mask = -1;
-static gint hf_cst_pkt_class_rule_protocol = -1;
-/*static gint hf_cst_pkt_class_rule_protocol_number = -1;*/
-static gint hf_cst_pkt_class_rule_ip_masked_src_address = -1;
-static gint hf_cst_pkt_class_rule_ip_masked_dest_address = -1;
-static gint hf_cst_pkt_class_rule_src_ipv4 = -1;
-static gint hf_cst_pkt_class_rule_dest_ipv4 = -1;
-static gint hf_cst_pkt_class_rule_mask_ipv4 = -1;
-static gint hf_cst_pkt_class_rule_src_ipv6 = -1;
-static gint hf_cst_pkt_class_rule_dest_ipv6 = -1;
-static gint hf_cst_pkt_class_rule_mask_ipv6 = -1;
-static gint hf_cst_pkt_class_rule_prot_src_port_range = -1;
-static gint hf_cst_pkt_class_rule_src_port_low = -1;
-static gint hf_cst_pkt_class_rule_src_port_high = -1;
-static gint hf_cst_pkt_class_rule_prot_dest_port_range = -1;
-static gint hf_cst_pkt_class_rule_dest_port_low = -1;
-static gint hf_cst_pkt_class_rule_dest_port_high = -1;
-static gint hf_cst_pkt_class_rule_dest_mac_address = -1;
-static gint hf_cst_pkt_class_rule_dest_mac = -1;
-static gint hf_cst_pkt_class_rule_src_mac_address = -1;
-static gint hf_cst_pkt_class_rule_src_mac = -1;
-static gint hf_cst_pkt_class_rule_mask_mac = -1;
-static gint hf_cst_pkt_class_rule_ethertype = -1;
-static gint hf_cst_pkt_class_rule_etype = -1;
-static gint hf_cst_pkt_class_rule_eprot1 = -1;
-static gint hf_cst_pkt_class_rule_eprot2 = -1;
-static gint hf_cst_pkt_class_rule_user_priority          = -1;
-static gint hf_cst_pkt_class_rule_pri_low                = -1;
-static gint hf_cst_pkt_class_rule_pri_high               = -1;
-static gint hf_cst_pkt_class_rule_vlan_id                = -1;
-static gint hf_cst_pkt_class_rule_vlan_id1               = -1;
-static gint hf_cst_pkt_class_rule_vlan_id2               = -1;
-static gint hf_cst_pkt_class_rule_phsi                   = -1;
-static gint hf_cst_pkt_class_rule_index                  = -1;
-static gint hf_cst_pkt_class_rule_ipv6_flow_label        = -1;
-static gint hf_cst_pkt_class_rule_vendor_spec            = -1;
-static gint hf_cst_pkt_class_rule_classifier_action_rule = -1;
-static gint hf_cst_pkt_class_rule_classifier_action_rule_bit0 = -1;
-static gint hf_cst_pkt_class_rule_classifier_action_rule_bit1 = -1;
-
-static gint hf_cst_large_context_id = -1;
-static gint hf_cst_short_format_context_id = -1;
-
-static gint hf_cst_phs_dsc_action = -1;
-static gint hf_cst_phs_rule = -1;
-static gint hf_cst_phs_phsi = -1;
-static gint hf_cst_phs_phsf = -1;
-static gint hf_cst_phs_phsm = -1;
-static gint hf_cst_phs_phss = -1;
-static gint hf_cst_phs_phsv = -1;
-static gint hf_cst_phs_vendor_spec = -1;
-static gint hf_cst_invalid_tlv = -1;
-
-static gint hf_csper_atm_switching_encoding = -1;
-static gint hf_csper_atm_classifier = -1;
-static gint hf_csper_atm_classifier_vpi = -1;
-static gint hf_csper_atm_classifier_vci = -1;
-static gint hf_csper_atm_classifier_id = -1;
-/*static gint hf_csper_atm_classifier_dsc_action = -1;*/
-static gint hf_csper_unknown_type = -1;
-
-static gint hf_xmac_tuple_rsvd = -1;
-static gint hf_xmac_tuple_key_seq_num = -1;
-static gint hf_hmac_tuple_hmac_digest = -1;
-static gint hf_packet_number_counter = -1;
-static gint hf_cmac_tuple_cmac_value = -1;
-static gint hf_cmac_tuple_bsid = -1;
+static gint hf_sfe_unknown_type;
+static gint hf_sfe_sf_id;
+static gint hf_sfe_cid;
+static gint hf_sfe_service_class_name;
+static gint hf_sfe_mbs_service;
+static gint hf_sfe_qos_params_set;
+static gint hf_sfe_set_provisioned;
+static gint hf_sfe_set_admitted;
+static gint hf_sfe_set_active;
+static gint hf_sfe_set_rsvd;
+static gint hf_sfe_traffic_priority;
+static gint hf_sfe_max_str;
+static gint hf_sfe_max_traffic_burst;
+static gint hf_sfe_min_rtr;
+static gint hf_sfe_reserved_10;
+static gint hf_sfe_ul_grant_scheduling;
+static gint hf_sfe_req_tx_policy;
+static gint hf_sfe_policy_broadcast_bwr;
+static gint hf_sfe_policy_multicast_bwr;
+static gint hf_sfe_policy_piggyback;
+static gint hf_sfe_policy_fragment;
+static gint hf_sfe_policy_headers;
+static gint hf_sfe_policy_packing;
+static gint hf_sfe_policy_crc;
+static gint hf_sfe_policy_rsvd1;
+static gint hf_sfe_jitter;
+static gint hf_sfe_max_latency;
+static gint hf_sfe_fixed_len_sdu;
+static gint hf_sfe_sdu_size;
+static gint hf_sfe_target_said;
+static gint hf_sfe_cs_specification;
+static gint hf_sfe_type_of_data_delivery_services;
+static gint hf_sfe_sdu_inter_arrival_interval;
+static gint hf_sfe_time_base;
+static gint hf_sfe_paging_preference;
+static gint hf_sfe_mbs_zone_identifier_assignment;
+static gint hf_sfe_sn_feedback_enabled;
+static gint hf_sfe_harq_service_flows;
+static gint hf_sfe_harq_channel_mapping_index;
+static gint hf_sfe_fsn_size;
+static gint hf_sfe_unsolicited_grant_interval;
+static gint hf_sfe_unsolicited_polling_interval;
+/* static gint hf_sfe_harq_channel_mapping; */
+static gint hf_sfe_global_service_class_name;
+static gint hf_sfe_reserved_36;
+static gint hf_sfe_reserved_34;
+
+static gint hf_sfe_arq_enable;
+static gint hf_sfe_arq_transmitter_delay;
+static gint hf_sfe_arq_receiver_delay;
+static gint hf_sfe_arq_block_lifetime;
+static gint hf_sfe_arq_sync_loss_timeout;
+static gint hf_sfe_arq_transmitter_delay_cor2;
+static gint hf_sfe_arq_receiver_delay_cor2;
+static gint hf_sfe_arq_block_lifetime_cor2;
+static gint hf_sfe_arq_sync_loss_timeout_cor2;
+static gint hf_sfe_arq_deliver_in_order;
+static gint hf_sfe_arq_rx_purge_timeout;
+static gint hf_sfe_arq_window_size;
+static gint hf_sfe_arq_block_size;
+static gint hf_sfe_arq_block_size_cor2;
+static gint hf_sfe_arq_min_block_size;
+static gint hf_sfe_arq_max_block_size;
+
+/* static gint hf_sfe_cid_alloc_for_active_bs; */
+static gint hf_sfe_cid_alloc_for_active_bs_cid;
+static gint hf_sfe_pdu_sn_ext_subheader_reorder;
+static gint hf_sfe_mbs_contents_ids;
+static gint hf_sfe_mbs_contents_ids_id;
+static gint hf_sfe_authorization_token;
+
+static gint hf_cst_classifier_dsc_action;
+static gint hf_cst_error_set_errored_param;
+static gint hf_cst_error_set_error_code;
+static gint hf_cst_error_set_error_msg;
+
+static gint hf_cst_pkt_class_rule;
+
+static gint hf_cst_pkt_class_rule_priority;
+static gint hf_cst_pkt_class_rule_range_mask;
+static gint hf_cst_pkt_class_rule_tos_low;
+static gint hf_cst_pkt_class_rule_tos_high;
+static gint hf_cst_pkt_class_rule_tos_mask;
+static gint hf_cst_pkt_class_rule_protocol;
+/*static gint hf_cst_pkt_class_rule_protocol_number;*/
+static gint hf_cst_pkt_class_rule_ip_masked_src_address;
+static gint hf_cst_pkt_class_rule_ip_masked_dest_address;
+static gint hf_cst_pkt_class_rule_src_ipv4;
+static gint hf_cst_pkt_class_rule_dest_ipv4;
+static gint hf_cst_pkt_class_rule_mask_ipv4;
+static gint hf_cst_pkt_class_rule_src_ipv6;
+static gint hf_cst_pkt_class_rule_dest_ipv6;
+static gint hf_cst_pkt_class_rule_mask_ipv6;
+static gint hf_cst_pkt_class_rule_prot_src_port_range;
+static gint hf_cst_pkt_class_rule_src_port_low;
+static gint hf_cst_pkt_class_rule_src_port_high;
+static gint hf_cst_pkt_class_rule_prot_dest_port_range;
+static gint hf_cst_pkt_class_rule_dest_port_low;
+static gint hf_cst_pkt_class_rule_dest_port_high;
+static gint hf_cst_pkt_class_rule_dest_mac_address;
+static gint hf_cst_pkt_class_rule_dest_mac;
+static gint hf_cst_pkt_class_rule_src_mac_address;
+static gint hf_cst_pkt_class_rule_src_mac;
+static gint hf_cst_pkt_class_rule_mask_mac;
+static gint hf_cst_pkt_class_rule_ethertype;
+static gint hf_cst_pkt_class_rule_etype;
+static gint hf_cst_pkt_class_rule_eprot1;
+static gint hf_cst_pkt_class_rule_eprot2;
+static gint hf_cst_pkt_class_rule_user_priority;
+static gint hf_cst_pkt_class_rule_pri_low;
+static gint hf_cst_pkt_class_rule_pri_high;
+static gint hf_cst_pkt_class_rule_vlan_id;
+static gint hf_cst_pkt_class_rule_vlan_id1;
+static gint hf_cst_pkt_class_rule_vlan_id2;
+static gint hf_cst_pkt_class_rule_phsi;
+static gint hf_cst_pkt_class_rule_index;
+static gint hf_cst_pkt_class_rule_ipv6_flow_label;
+static gint hf_cst_pkt_class_rule_vendor_spec;
+static gint hf_cst_pkt_class_rule_classifier_action_rule;
+static gint hf_cst_pkt_class_rule_classifier_action_rule_bit0;
+static gint hf_cst_pkt_class_rule_classifier_action_rule_bit1;
+
+static gint hf_cst_large_context_id;
+static gint hf_cst_short_format_context_id;
+
+static gint hf_cst_phs_dsc_action;
+static gint hf_cst_phs_rule;
+static gint hf_cst_phs_phsi;
+static gint hf_cst_phs_phsf;
+static gint hf_cst_phs_phsm;
+static gint hf_cst_phs_phss;
+static gint hf_cst_phs_phsv;
+static gint hf_cst_phs_vendor_spec;
+static gint hf_cst_invalid_tlv;
+
+static gint hf_csper_atm_switching_encoding;
+static gint hf_csper_atm_classifier;
+static gint hf_csper_atm_classifier_vpi;
+static gint hf_csper_atm_classifier_vci;
+static gint hf_csper_atm_classifier_id;
+/*static gint hf_csper_atm_classifier_dsc_action;*/
+static gint hf_csper_unknown_type;
+
+static gint hf_xmac_tuple_rsvd;
+static gint hf_xmac_tuple_key_seq_num;
+static gint hf_hmac_tuple_hmac_digest;
+static gint hf_packet_number_counter;
+static gint hf_cmac_tuple_cmac_value;
+static gint hf_cmac_tuple_bsid;
 
 /* bit masks */
 /* 11.13.4 */
@@ -577,33 +577,33 @@ static gint hf_cmac_tuple_bsid = -1;
 #define XMAC_TUPLE_KEY_SEQ_NUM     0x0F
 
 /* WiMax Security Negotiation Parameters display */
-static gint hf_snp_pkm_version_support = -1;
-static gint hf_snp_pkm_version_support_bit0 = -1;
-static gint hf_snp_pkm_version_support_bit1 = -1;
-static gint hf_snp_pkm_version_support_reserved = -1;
-static gint hf_snp_auth_policy_support = -1;
-static gint hf_snp_auth_policy_support_bit0 = -1;
-static gint hf_snp_auth_policy_support_bit1 = -1;
-static gint hf_snp_auth_policy_support_bit2 = -1;
-static gint hf_snp_auth_policy_support_bit3 = -1;
-static gint hf_snp_auth_policy_support_bit4 = -1;
-static gint hf_snp_auth_policy_support_bit5 = -1;
-static gint hf_snp_auth_policy_support_bit6 = -1;
-static gint hf_snp_auth_policy_support_bit7 = -1;
-static gint hf_snp_mac_mode = -1;
-static gint hf_snp_mac_mode_bit0 = -1;
-static gint hf_snp_mac_mode_bit1 = -1;
-static gint hf_snp_mac_mode_bit1_rsvd = -1;
-static gint hf_snp_mac_mode_bit2 = -1;
-static gint hf_snp_mac_mode_bit3 = -1;
-static gint hf_snp_mac_mode_bit4 = -1;
-static gint hf_snp_mac_mode_bit5 = -1;
-static gint hf_snp_mac_mode_reserved = -1;
-static gint hf_snp_mac_mode_reserved1 = -1;
-static gint hf_snp_pn_window_size = -1;
-static gint hf_snp_max_conc_transactions = -1;
-static gint hf_snp_max_suppt_sec_assns = -1;
-static gint hf_snp_unknown_type = -1;
+static gint hf_snp_pkm_version_support;
+static gint hf_snp_pkm_version_support_bit0;
+static gint hf_snp_pkm_version_support_bit1;
+static gint hf_snp_pkm_version_support_reserved;
+static gint hf_snp_auth_policy_support;
+static gint hf_snp_auth_policy_support_bit0;
+static gint hf_snp_auth_policy_support_bit1;
+static gint hf_snp_auth_policy_support_bit2;
+static gint hf_snp_auth_policy_support_bit3;
+static gint hf_snp_auth_policy_support_bit4;
+static gint hf_snp_auth_policy_support_bit5;
+static gint hf_snp_auth_policy_support_bit6;
+static gint hf_snp_auth_policy_support_bit7;
+static gint hf_snp_mac_mode;
+static gint hf_snp_mac_mode_bit0;
+static gint hf_snp_mac_mode_bit1;
+static gint hf_snp_mac_mode_bit1_rsvd;
+static gint hf_snp_mac_mode_bit2;
+static gint hf_snp_mac_mode_bit3;
+static gint hf_snp_mac_mode_bit4;
+static gint hf_snp_mac_mode_bit5;
+static gint hf_snp_mac_mode_reserved;
+static gint hf_snp_mac_mode_reserved1;
+static gint hf_snp_pn_window_size;
+static gint hf_snp_max_conc_transactions;
+static gint hf_snp_max_suppt_sec_assns;
+static gint hf_snp_unknown_type;
 
 /* bit masks */
 /* 11.8.4.1 */
@@ -630,65 +630,65 @@ static gint hf_snp_unknown_type = -1;
 #define SNP_MAC_MODE_RSV1 0xC0
 
 /* PKM display */
-static gint hf_pkm_msg_unknown_type = -1;
-static gint hf_pkm_msg_attr_display = -1;
-static gint hf_pkm_config_settings_authorize_waitout = -1;
-static gint hf_pkm_config_settings_reauthorize_waitout = -1;
-static gint hf_pkm_config_settings_grace_time = -1;
-static gint hf_pkm_config_settings_operational_waittime = -1;
-static gint hf_pkm_msg_attr_auth_key = -1;
-static gint hf_pkm_msg_attr_tek = -1;
-static gint hf_pkm_msg_attr_key_life_time = -1;
-static gint hf_pkm_msg_attr_key_seq_num = -1;
-static gint hf_pkm_msg_attr_hmac_digest = -1;
-static gint hf_pkm_msg_attr_said = -1;
-static gint hf_pkm_msg_attr_cbc_iv = -1;
-static gint hf_pkm_msg_attr_error_code = -1;
-static gint hf_pkm_msg_attr_ca_certificate = -1;
-static gint hf_pkm_msg_attr_ss_certificate = -1;
-static gint hf_pkm_attr_auth_result_code = -1;
-static gint hf_pkm_attr_sa_service_type = -1;
-static gint hf_pkm_attr_frame_number = -1;
-static gint hf_pkm_attr_ss_random = -1;
-static gint hf_pkm_attr_bs_random = -1;
-static gint hf_pkm_attr_pre_pak = -1;
-static gint hf_pkm_attr_bs_certificate = -1;
-static gint hf_pkm_attr_sig_bs = -1;
-static gint hf_pkm_attr_ms_mac_address = -1;
-static gint hf_pkm_attr_cmac_digest = -1;
-static gint hf_pkm_attr_cmac_digest_pn = -1;
-static gint hf_pkm_attr_cmac_digest_value = -1;
-static gint hf_pkm_attr_eap_payload = -1;
-static gint hf_pkm_attr_nonce = -1;
-static gint hf_pkm_sa_type = -1;
-static gint hf_pkm_msg_crypto_suite = -1;
-static gint hf_pkm_msg_crypto_suite_msb = -1;
-static gint hf_pkm_msg_crypto_suite_middle = -1;
-static gint hf_pkm_msg_crypto_suite_lsb = -1;
-/*static gint hf_pkm_msg_version = -1;*/
-static gint hf_pkm_attr_push_modes = -1;
-static gint hf_pkm_attr_key_push_counter = -1;
-static gint hf_pkm_attr_gkek = -1;
-static gint hf_pkm_attr_sig_ss = -1;
-static gint hf_pkm_attr_akid = -1;
-static gint hf_pkm_config_settings_rekey_wait_timeout = -1;
-static gint hf_pkm_config_settings_tek_grace_time = -1;
-static gint hf_pkm_config_settings_authorize_reject_wait_timeout = -1;
-
-/* static gint hf_pkm_attr_pak_ak_seq_number = -1; */
-static gint hf_pkm_attr_associated_gkek_seq_number = -1;
-/* static gint hf_pkm_attr_gkek_params = -1; */
-
-/* static gint hf_common_tlv_unknown_type = -1; */
-static gint hf_common_tlv_mac_version = -1;
-static gint hf_common_tlv_vendor_id = -1;
-static gint hf_common_tlv_vendor_specific_type = -1;
-static gint hf_common_tlv_vendor_specific_length = -1;
-static gint hf_common_tlv_vendor_specific_length_size = -1;
-static gint hf_common_tlv_vendor_specific_value = -1;
-static gint hf_common_current_transmitted_power = -1;
-
-static expert_field ei_common_tlv_info = EI_INIT;
+static gint hf_pkm_msg_unknown_type;
+static gint hf_pkm_msg_attr_display;
+static gint hf_pkm_config_settings_authorize_waitout;
+static gint hf_pkm_config_settings_reauthorize_waitout;
+static gint hf_pkm_config_settings_grace_time;
+static gint hf_pkm_config_settings_operational_waittime;
+static gint hf_pkm_msg_attr_auth_key;
+static gint hf_pkm_msg_attr_tek;
+static gint hf_pkm_msg_attr_key_life_time;
+static gint hf_pkm_msg_attr_key_seq_num;
+static gint hf_pkm_msg_attr_hmac_digest;
+static gint hf_pkm_msg_attr_said;
+static gint hf_pkm_msg_attr_cbc_iv;
+static gint hf_pkm_msg_attr_error_code;
+static gint hf_pkm_msg_attr_ca_certificate;
+static gint hf_pkm_msg_attr_ss_certificate;
+static gint hf_pkm_attr_auth_result_code;
+static gint hf_pkm_attr_sa_service_type;
+static gint hf_pkm_attr_frame_number;
+static gint hf_pkm_attr_ss_random;
+static gint hf_pkm_attr_bs_random;
+static gint hf_pkm_attr_pre_pak;
+static gint hf_pkm_attr_bs_certificate;
+static gint hf_pkm_attr_sig_bs;
+static gint hf_pkm_attr_ms_mac_address;
+static gint hf_pkm_attr_cmac_digest;
+static gint hf_pkm_attr_cmac_digest_pn;
+static gint hf_pkm_attr_cmac_digest_value;
+static gint hf_pkm_attr_eap_payload;
+static gint hf_pkm_attr_nonce;
+static gint hf_pkm_sa_type;
+static gint hf_pkm_msg_crypto_suite;
+static gint hf_pkm_msg_crypto_suite_msb;
+static gint hf_pkm_msg_crypto_suite_middle;
+static gint hf_pkm_msg_crypto_suite_lsb;
+/*static gint hf_pkm_msg_version;*/
+static gint hf_pkm_attr_push_modes;
+static gint hf_pkm_attr_key_push_counter;
+static gint hf_pkm_attr_gkek;
+static gint hf_pkm_attr_sig_ss;
+static gint hf_pkm_attr_akid;
+static gint hf_pkm_config_settings_rekey_wait_timeout;
+static gint hf_pkm_config_settings_tek_grace_time;
+static gint hf_pkm_config_settings_authorize_reject_wait_timeout;
+
+/* static gint hf_pkm_attr_pak_ak_seq_number; */
+static gint hf_pkm_attr_associated_gkek_seq_number;
+/* static gint hf_pkm_attr_gkek_params; */
+
+/* static gint hf_common_tlv_unknown_type; */
+static gint hf_common_tlv_mac_version;
+static gint hf_common_tlv_vendor_id;
+static gint hf_common_tlv_vendor_specific_type;
+static gint hf_common_tlv_vendor_specific_length;
+static gint hf_common_tlv_vendor_specific_length_size;
+static gint hf_common_tlv_vendor_specific_value;
+static gint hf_common_current_transmitted_power;
+
+static expert_field ei_common_tlv_info;
 
 /* Register WiMax Utility Routines */
 void wimax_proto_register_wimax_utility_decoders(void)
@@ -1679,7 +1679,7 @@ void wimax_proto_register_wimax_utility_decoders(void)
 
 	expert_module_t* expert_wimax_utility;
 
-	if(proto_wimax_utility_decoders == -1)
+	if(proto_wimax_utility_decoders <= 0)
 	{
 		proto_wimax_utility_decoders = proto_register_protocol (
 							"WiMax Sub-TLV Messages",