diff --git a/src/gprs_l1.c b/src/gprs_l1.c
index d830e60..d00bf5b 100644
--- a/src/gprs_l1.c
+++ b/src/gprs_l1.c
@@ -20,14 +20,14 @@
 
 #include "protocol/diag_log_gprs_l1.h"
 
-const struct value_string gprs_tx_ul_chans[4] = {
+const struct value_string gprs_tx_ul_chans[] = {
 	{ DIAG_TX_UL_CH_T_PRACH,	"PRACK" },
 	{ DIAG_TX_UL_CH_T_UL_PTCCH,	"UL-PTCCH" },
 	{ DIAG_TX_UL_CH_T_UL_PACCH_PDTCH, "UL-PACCH-PDTCH" },
 	{ 0, NULL }
 };
 
-const struct value_string gprs_coding_schemes[16] = {
+const struct value_string gprs_coding_schemes[] = {
 	{ DIAG_GPRS_CS_CS1,	"CS1" },
 	{ DIAG_GPRS_CS_CS2,	"CS2" },
 	{ DIAG_GPRS_CS_CS3,	"CS3" },
diff --git a/src/gprs_rlc.c b/src/gprs_rlc.c
index be01a53..1b46c83 100644
--- a/src/gprs_rlc.c
+++ b/src/gprs_rlc.c
@@ -20,7 +20,7 @@
 
 #include "protocol/diag_log_gprs_rlc.h"
 
-struct value_string gprs_rlc_ul_state_vals[8] = {
+struct value_string gprs_rlc_ul_state_vals[] = {
 	{ US_NULL,		"US_NULL" },
 	{ US_AWAIT_ASS,		"US_AWAIT_ASS" },
 	{ US_ACK_XFER,		"US_AWAIT_XFER" },
@@ -31,7 +31,7 @@ struct value_string gprs_rlc_ul_state_vals[8] = {
 	{ 0, NULL }
 };
 
-struct value_string gprs_rlc_ul_substate_vals[5] = {
+struct value_string gprs_rlc_ul_substate_vals[] = {
 	{ RALS_NULL,		"RALS_NULL" },
 	{ RALS_AWAIT_TX_COMPLETE, "RALS_AWAIT_TX_COMPLETE" },
 	{ RALS_CURRENT_PDU_TX_COMPLETED, "RALS_CURRENT_PDU_TX_COMPLETED" },
@@ -39,7 +39,7 @@ struct value_string gprs_rlc_ul_substate_vals[5] = {
 	{ 0, NULL }
 };
 
-struct value_string gprs_rlc_dl_state_vals[7] = {
+struct value_string gprs_rlc_dl_state_vals[] = {
 	{ DS_NULL,		"DS_NULL" },
 	{ DS_RX_ACK,		"DS_RX_ACK" },
 	{ DS_RX_UNACK,		"DS_RX_UNACK" },
diff --git a/src/protocol/diag_log_gprs_l1.h b/src/protocol/diag_log_gprs_l1.h
index 8f8585c..995eff2 100644
--- a/src/protocol/diag_log_gprs_l1.h
+++ b/src/protocol/diag_log_gprs_l1.h
@@ -72,7 +72,7 @@ enum gprs_tx_ul_chan_t {
 	DIAG_TX_UL_CH_T_UL_PTCCH,
 	DIAG_TX_UL_CH_T_UL_PACCH_PDTCH,
 };
-extern const struct value_string gprs_tx_ul_chans[4];
+extern const struct value_string gprs_tx_ul_chans[];
 
 enum gprs_coding_scheme {
 	DIAG_GPRS_CS_CS1,
@@ -91,7 +91,7 @@ enum gprs_coding_scheme {
 	DIAG_GPRS_CS_MCS8,
 	DIAG_GPRS_CS_MCS9,
 };
-extern const struct value_string gprs_coding_schemes[16];
+extern const struct value_string gprs_coding_schemes[];
 
 struct gprs_tx_sched_res {
 	uint32_t	fn;
diff --git a/src/protocol/diag_log_gprs_mac.h b/src/protocol/diag_log_gprs_mac.h
index 536128d..16122ae 100644
--- a/src/protocol/diag_log_gprs_mac.h
+++ b/src/protocol/diag_log_gprs_mac.h
@@ -7,7 +7,7 @@ enum gprs_mac_mode {
 	IDLE_MODE,
 	TRANSFER_MODE,
 };
-extern struct value_string gprs_mac_mode_vals[4];
+extern struct value_string gprs_mac_mode_vals[];
 
 enum gprs_mac_null_substates {
 	NULL_INACTIVE,
@@ -23,7 +23,7 @@ enum gprs_mac_null_substates {
 	NULL_DTM_GTTP_UL_CON,
 	NULL_RESET,
 };
-extern struct value_string gprs_mac_null_substate_vals[13];
+extern struct value_string gprs_mac_null_substate_vals[];
 
 enum gprs_mac_idle_substates {
 	IDLE_PASSIVE,
@@ -35,7 +35,7 @@ enum gprs_mac_idle_substates {
 	IDLE_UL_1PHASE_CONT_RES,
 	IDLE_DL_ASS,
 };
-extern struct value_string gprs_mac_idle_substate_vals[9];
+extern struct value_string gprs_mac_idle_substate_vals[];
 
 enum gprs_mac_transfer_substates {
 	TRANSFER_INACTIVE,
@@ -52,7 +52,7 @@ enum gprs_mac_transfer_substates {
 	TRANSFER_CONCURRENT_DYNAMIC_REALLOC,
 	TRANSFER_CONCURRENT_DL_REASSIGN_DYNAMIC_REALLOC,
 };
-extern struct value_string gprs_mac_transfer_substate_vals[14];
+extern struct value_string gprs_mac_transfer_substate_vals[];
 
 /* LOG_GPRS_MAC_STATE_C */
 struct gprs_mac_state_change {
@@ -126,7 +126,7 @@ enum gprs_mac_chan_type {
 	PBCCH_CHANNEL		= 0x82,
 	DL_PACCH_CHANNEL	= 0x83,
 };
-extern struct value_string gprs_mac_chan_type_vals[8];
+extern struct value_string gprs_mac_chan_type_vals[];
 
 enum gprs_mac_msg_type {
 	PACKET_CELL_CHANGE_FAILURE		= 0x00,
@@ -146,7 +146,7 @@ enum gprs_mac_msg_type {
 	PACKET_CS_REQUEST			= 0x0e,
 	PACKET_CHANNEL_REQUEST			= 0x20,
 };
-extern struct value_string gprs_mac_msg_type_vals[17];
+extern struct value_string gprs_mac_msg_type_vals[];
 
 struct evt_gprs_mac_msg {
 	uint8_t msg_type;
diff --git a/src/protocol/diag_log_gprs_rlc.h b/src/protocol/diag_log_gprs_rlc.h
index f59c662..49f1b2c 100644
--- a/src/protocol/diag_log_gprs_rlc.h
+++ b/src/protocol/diag_log_gprs_rlc.h
@@ -28,7 +28,7 @@ enum gprs_rlc_ul_state {
 	US_TEST_MODE,
 	US_AWAIT_RECOVERY,
 };
-extern struct value_string gprs_rlc_ul_state_vals[8];
+extern struct value_string gprs_rlc_ul_state_vals[];
 
 enum gprs_rlc_ul_substate {
 	RALS_NULL,
@@ -36,7 +36,7 @@ enum gprs_rlc_ul_substate {
 	RALS_CURRENT_PDU_TX_COMPLETED,
 	RALS_COMPLETE,
 };
-extern struct value_string gprs_rlc_ul_substate_vals[5];
+extern struct value_string gprs_rlc_ul_substate_vals[];
 
 enum gprs_rlc_dl_state {
 	DS_NULL,
@@ -46,7 +46,7 @@ enum gprs_rlc_dl_state {
 	DS_RX_UNACK_PENDING_RELEASE,
 	DS_TEST_MODE,
 };
-extern struct value_string gprs_rlc_dl_state_vals[7];
+extern struct value_string gprs_rlc_dl_state_vals[];
 
 /* LOG_GPRS_RLC_UL_STATS_C */
 struct gprs_rlc_ul_stats {
@@ -125,7 +125,7 @@ enum gprs_rlc_hdr_type {
 	EGPRS_HEADER_TYPE_2,
 	EGPRS_HEADER_TYPE_3
 };
-extern struct value_string gprs_rlc_hdr_type_vals[5];
+extern struct value_string gprs_rlc_hdr_type_vals[];
 
 
 /* LOG_EGPRS_RLC_DL_HEADER_C */
diff --git a/src/protocol/diag_log_gsm.h b/src/protocol/diag_log_gsm.h
index d382f1a..5d956b4 100644
--- a/src/protocol/diag_log_gsm.h
+++ b/src/protocol/diag_log_gsm.h
@@ -158,7 +158,7 @@ enum diag_gsm_rr_st {
 	DIAG_RR_ST_RESET		= 23,
 	DIAG_RR_ST_W2G_BACKGROUND_PLN_SEARCH = 24,
 };
-extern const struct value_string diag_gsm_rr_st_vals[25];
+extern const struct value_string diag_gsm_rr_st_vals[];
 
 /* LOG_GSM_RR_STATE_C */
 struct diag_gsm_rr_state {
@@ -178,7 +178,7 @@ enum diag_gprs_grr_st {
 	DIAG_GRR_ST_BG_PLMN_SEARCH	= 7,
 	DIAG_GRR_ST_PCCO	= 8,
 };
-extern const struct value_string diag_gprs_grr_st_vals[9];
+extern const struct value_string diag_gprs_grr_st_vals[];
 
 /* LOG_GPRS_GRR_STATE_C */
 struct diag_gprs_grr_state {
@@ -192,7 +192,7 @@ enum diag_gprs_llme_state {
 	DIAG_GPRS_LLMES_TLLI_ASS	= 1,
 	DIAG_GPRS_LLMES_TEST_MODE	= 2,
 };
-extern const struct value_string diag_gprs_llme_st_vals[4];
+extern const struct value_string diag_gprs_llme_st_vals[];
 
 /* LOG_GPRS_LLC_ME_INFO_C */
 struct diag_gprs_llme_info {