diff --git a/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_F4_data_types_for_links_codec.c b/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_F4_data_types_for_links_codec.c
index b69c3743024a144e877aef0dd9ea431fb63a6188..3ed8806e9442777cafddb0a8fdd0f4eb0509e176 100755
--- a/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_F4_data_types_for_links_codec.c
+++ b/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_F4_data_types_for_links_codec.c
@@ -773,8 +773,8 @@ inline void MIH_C_LINK_TUPLE_ID_encode(Bit_Buffer_t* bbP, MIH_C_LINK_TUPLE_ID_T
     MIH_C_LINK_ID_encode(bbP, &dataP->link_id);
     MIH_C_CHOICE_encode(bbP, &dataP->choice);
     switch (dataP->choice) {
-        case 0:  break;
-        case 1:  MIH_C_LINK_ADDR_encode(bbP, &dataP->_union.link_addr); break;
+        case MIH_C_LINK_TUPLE_ID_CHOICE_NULL:  break;
+        case MIH_C_LINK_TUPLE_ID_CHOICE_LINK_ADDR:  MIH_C_LINK_ADDR_encode(bbP, &dataP->_union.link_addr); break;
         default:
             printf("[MIH_C] ERROR NO KNOWN VALUE FOR ENCODING CHOICE OF MIH_C_LINK_TUPLE_ID_T %d\n", dataP->choice);
     }
@@ -785,8 +785,8 @@ inline void MIH_C_LINK_TUPLE_ID_decode(Bit_Buffer_t* bbP, MIH_C_LINK_TUPLE_ID_T
     MIH_C_LINK_ID_decode(bbP, &dataP->link_id);
     MIH_C_CHOICE_decode(bbP, &dataP->choice);
     switch (dataP->choice) {
-        case 0:  break;
-        case 1:  MIH_C_LINK_ADDR_decode(bbP, &dataP->_union.link_addr); break;
+        case MIH_C_LINK_TUPLE_ID_CHOICE_NULL:       break;
+        case MIH_C_LINK_TUPLE_ID_CHOICE_LINK_ADDR:  MIH_C_LINK_ADDR_decode(bbP, &dataP->_union.link_addr); break;
         default:
             printf("[MIH_C] ERROR NO KNOWN VALUE FOR DECODING CHOICE OF MIH_C_LINK_TUPLE_ID_T %d\n", dataP->choice);
     }
diff --git a/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_bit_buffer.c b/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_bit_buffer.c
index 36bad73f91fd9cbb21cf0296dc9d3f17f12508e5..a2f2442fab4d719626e99d43e68c23568861dd9e 100755
--- a/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_bit_buffer.c
+++ b/openair3/RAL-LTE/INTERFACE-802.21/C/MIH_C_bit_buffer.c
@@ -5,6 +5,7 @@
 #include <assert.h>
 #include <string.h>
 #include <arpa/inet.h>
+#include <stdio.h>
 //-----------------------------------------------------------------------------
 #include "MIH_C_bit_buffer.h"
 //-----------------------------------------------------------------------------
diff --git a/openair3/RAL-LTE/INTERFACE-802.21/INCLUDE/MIH_C_Types.h b/openair3/RAL-LTE/INTERFACE-802.21/INCLUDE/MIH_C_Types.h
index 08d0cf557324aadc030d90b5ddb88f6499cea7cb..79317eb12ff5689f1c55b32d37e0a3d2ee700ab2 100755
--- a/openair3/RAL-LTE/INTERFACE-802.21/INCLUDE/MIH_C_Types.h
+++ b/openair3/RAL-LTE/INTERFACE-802.21/INCLUDE/MIH_C_Types.h
@@ -1459,6 +1459,12 @@ TYPEDEF_UNSIGNED_INT1(MIH_C_LINK_PARAM_GEN)
 *        6–255: (Reserved)
 */
 TYPEDEF_UNSIGNED_INT1(MIH_C_LINK_PARAM_QOS)
+#define MIH_C_LINK_PARAM_QOS_MAX_NUM_DIF_COS_SUPPORTED            (MIH_C_LINK_PARAM_QOS_T)0
+#define MIH_C_LINK_PARAM_QOS_MIN_PACKET_TRANSFER_DELAY_ALL_COS    (MIH_C_LINK_PARAM_QOS_T)1
+#define MIH_C_LINK_PARAM_QOS_AVG_PACKET_TRANSFER_DELAY_ALL_COS    (MIH_C_LINK_PARAM_QOS_T)2
+#define MIH_C_LINK_PARAM_QOS_MAX_PACKET_TRANSFER_DELAY_ALL_COS    (MIH_C_LINK_PARAM_QOS_T)3
+#define MIH_C_LINK_PARAM_QOS_STD_DEVIATION_PACKET_TRANSFER_DELAY  (MIH_C_LINK_PARAM_QOS_T)4
+#define MIH_C_LINK_PARAM_QOS_PACKET_LOSS_RATE_ALL_COS_FRAME_RATIO (MIH_C_LINK_PARAM_QOS_T)5
 //-------------------------------------------
 /*! \var MIH_C_LINK_PARAM_GG_T
 * \ingroup MIH_C_F4_DATA_TYPES_FOR_LINKS_CODEC