diff --git a/common/platform_types.h b/common/platform_types.h
index 179a6d4df9..26c4bafa75 100644
--- a/common/platform_types.h
+++ b/common/platform_types.h
@@ -241,6 +241,9 @@ typedef struct protocol_ctxt_s {
   bool brOption;
 } protocol_ctxt_t;
 
+/// suppress compiler warning for unused arguments
+#define UNUSED(x) (void)x;
+
 #define UE_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD + RC.nb_inst
 #define ENB_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD
 #define UE_INSTANCE_TO_MODULE_ID(iNSTANCE) iNSTANCE - RC.nb_inst
diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index 385fef3a8e..06fb2f5c46 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -47,8 +47,6 @@
 #define openair_sched_exit() exit(-1)
 
 #define bzero(s,n) (memset((s),0,(n)))
-/// suppress compiler warning for unused arguments
-#define UNUSED(x) (void)x;
 
 // Set the number of barriers for processSlotTX to 512. This value has to be at least 483 for NTN where
 // DL-to-UL offset is up to 483. The selected value is also half of the frame range so that
diff --git a/openair2/LAYER2/CMakeLists.txt b/openair2/LAYER2/CMakeLists.txt
index d93e781891..1c325288a8 100644
--- a/openair2/LAYER2/CMakeLists.txt
+++ b/openair2/LAYER2/CMakeLists.txt
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
+add_compile_options(-Wunused-parameter)
 add_subdirectory(nr_rlc)
 add_subdirectory(nr_pdcp)
 add_subdirectory(NR_MAC_UE)
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.c
index a9d6e4bfd3..f88a7a7fb2 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.c
@@ -9,7 +9,6 @@
 
 #include "nr_rlc_pdu.h"
 #include "common/utils/time_stat.h"
-
 #include "LOG/log.h"
 
 /*************************************************************************/
@@ -78,9 +77,9 @@ static int generate_tx_pdu(nr_rlc_entity_tm_t *entity, char *buffer, int size)
   return ret;
 }
 
-nr_rlc_entity_buffer_status_t nr_rlc_entity_tm_buffer_status(
-    nr_rlc_entity_t *_entity, int maxsize)
+nr_rlc_entity_buffer_status_t nr_rlc_entity_tm_buffer_status(nr_rlc_entity_t *_entity, int maxsize)
 {
+  UNUSED(maxsize);
   nr_rlc_entity_tm_t *entity = (nr_rlc_entity_tm_t *)_entity;
   nr_rlc_entity_buffer_status_t ret;
 
@@ -166,7 +165,8 @@ void nr_rlc_entity_tm_set_time(nr_rlc_entity_t *_entity, uint64_t now)
 
 void nr_rlc_entity_tm_discard_sdu(nr_rlc_entity_t *_entity, int sdu_id)
 {
-  /* nothing to do */
+  UNUSED(_entity);
+  UNUSED(sdu_id);
 }
 
 static void clear_entity(nr_rlc_entity_tm_t *entity)
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.h b/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.h
index e81ad1db2b..085eb7996c 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_tm.h
@@ -30,8 +30,7 @@ void nr_rlc_entity_tm_recv_sdu(nr_rlc_entity_t *entity,
                                int sdu_id);
 void nr_rlc_entity_tm_recv_pdu(nr_rlc_entity_t *entity,
                                char *buffer, int size);
-nr_rlc_entity_buffer_status_t nr_rlc_entity_tm_buffer_status(
-    nr_rlc_entity_t *entity, int maxsize);
+nr_rlc_entity_buffer_status_t nr_rlc_entity_tm_buffer_status(nr_rlc_entity_t *entity, int maxsize);
 int nr_rlc_entity_tm_generate_pdu(nr_rlc_entity_t *entity,
                                   char *buffer, int size);
 void nr_rlc_entity_tm_set_time(nr_rlc_entity_t *entity, uint64_t now);
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c
index b0ada2e514..e33ff346c9 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.c
@@ -517,9 +517,9 @@ static int generate_tx_pdu(nr_rlc_entity_um_t *entity, char *buffer, int size)
   return ret;
 }
 
-nr_rlc_entity_buffer_status_t nr_rlc_entity_um_buffer_status(
-    nr_rlc_entity_t *_entity, int maxsize)
+nr_rlc_entity_buffer_status_t nr_rlc_entity_um_buffer_status(nr_rlc_entity_t *_entity, int maxsize)
 {
+  UNUSED(maxsize);
   nr_rlc_entity_um_t *entity = (nr_rlc_entity_um_t *)_entity;
   nr_rlc_entity_buffer_status_t ret;
 
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.h b/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.h
index b3e5da5b16..a230ac22cf 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_um.h
@@ -49,15 +49,10 @@ typedef struct {
   int                  tx_maxsize;
 } nr_rlc_entity_um_t;
 
-void nr_rlc_entity_um_recv_sdu(nr_rlc_entity_t *entity,
-                               char *buffer, int size,
-                               int sdu_id);
-void nr_rlc_entity_um_recv_pdu(nr_rlc_entity_t *entity,
-                               char *buffer, int size);
-nr_rlc_entity_buffer_status_t nr_rlc_entity_um_buffer_status(
-    nr_rlc_entity_t *entity, int maxsize);
-int nr_rlc_entity_um_generate_pdu(nr_rlc_entity_t *entity,
-                                  char *buffer, int size);
+void nr_rlc_entity_um_recv_sdu(nr_rlc_entity_t *entity, char *buffer, int size, int sdu_id);
+void nr_rlc_entity_um_recv_pdu(nr_rlc_entity_t *entity, char *buffer, int size);
+nr_rlc_entity_buffer_status_t nr_rlc_entity_um_buffer_status(nr_rlc_entity_t *entity, int maxsize);
+int nr_rlc_entity_um_generate_pdu(nr_rlc_entity_t *entity, char *buffer, int size);
 void nr_rlc_entity_um_set_time(nr_rlc_entity_t *entity, uint64_t now);
 void nr_rlc_entity_um_discard_sdu(nr_rlc_entity_t *_entity, int sdu_id);
 void nr_rlc_entity_um_reestablishment(nr_rlc_entity_t *_entity);
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index cd18d0261b..d0c2afa3cb 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -163,7 +163,7 @@ void nr_mac_rlc_data_ind(const module_id_t  module_idP,
     logical_chan_id_t ch = data[i].ch;
     nr_rlc_entity_t *rb = get_rlc_entity_from_lcid(ue, ch);
     if (rb != NULL) {
-      LOG_D(RLC, "RB found! (channel ID %d) \n", ch);
+      LOG_D(RLC, "RB found! (instance %d channel ID %d) \n", module_idP, ch);
       rb->set_time(rb, get_nr_rlc_current_time());
       rb->recv_pdu(rb, (char *)data[i].buf, data[i].len);
     } else {
@@ -196,7 +196,7 @@ int nr_mac_rlc_multi_data_req(const module_id_t module_idP,
       pdu_siz[0] = rb->generate_pdu(rb, buffer_pP + 3, tb_sizeP - 3);
       if (pdu_siz[0] == 0)
         break;
-      LOG_D(RLC, "MAC PDU created: channel_idP %d len %d\n", channel_idP, pdu_siz[0]);
+      LOG_D(RLC, "MAC PDU created: instance %d channel_idP %d len %d\n", module_idP, channel_idP, pdu_siz[0]);
       // reserve header
       tb_sizeP -= 3 + pdu_siz[0];
       buffer_pP += 3 + pdu_siz[0];
@@ -233,7 +233,7 @@ tbs_size_t nr_mac_rlc_data_req(const module_id_t  module_idP,
   nr_rlc_entity_t *rb = get_rlc_entity_from_lcid(ue, channel_idP);
 
   if (rb != NULL) {
-    LOG_D(RLC, "MAC PDU to get created for channel_idP:%d \n", channel_idP);
+    LOG_D(RLC, "MAC PDU to get created for channel_idP:%d instance %d\n", channel_idP, module_idP);
     rb->set_time(rb, get_nr_rlc_current_time());
     maxsize = tb_sizeP;
     ret = rb->generate_pdu(rb, buffer_pP, maxsize);
@@ -245,8 +245,7 @@ tbs_size_t nr_mac_rlc_data_req(const module_id_t  module_idP,
   nr_rlc_manager_unlock(nr_rlc_ue_manager);
 
   if (gnb_flagP)
-    T(T_ENB_RLC_MAC_DL, T_INT(module_idP), T_INT(ue_id),
-      T_INT(channel_idP), T_INT(ret));
+    T(T_ENB_RLC_MAC_DL, T_INT(module_idP), T_INT(ue_id), T_INT(channel_idP), T_INT(ret));
 
   return ret;
 }
@@ -911,6 +910,7 @@ struct srb0_data {
 
 void deliver_sdu_srb0(void *deliver_sdu_data, nr_rlc_entity_t *entity, char *buf, int size)
 {
+  UNUSED(entity);
   struct srb0_data *s0 = (struct srb0_data *)deliver_sdu_data;
   s0->send_initial_ul_rrc_message(s0->ue_id, (unsigned char *)buf, size, s0->data);
 }
@@ -933,8 +933,7 @@ bool nr_rlc_activate_srb0(int ue_id,
   srb0_data->data = data;
   srb0_data->send_initial_ul_rrc_message = send_initial_ul_rrc_message;
 
-  nr_rlc_entity_t *nr_rlc_tm = new_nr_rlc_entity_tm(10000,
-                                  deliver_sdu_srb0, srb0_data);
+  nr_rlc_entity_t *nr_rlc_tm = new_nr_rlc_entity_tm(10000, deliver_sdu_srb0, srb0_data);
   nr_rlc_ue_add_srb_rlc_entity(ue, 0, nr_rlc_tm);
 
   LOG_I(RLC, "Activated srb0 for UE %d\n", ue_id);