diff --git a/openair3/CMakeLists.txt b/openair3/CMakeLists.txt
index c3b3756362..e31761006e 100644
--- a/openair3/CMakeLists.txt
+++ b/openair3/CMakeLists.txt
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
+add_compile_options(-Wunused-parameter)
 add_subdirectory(LPP)
 add_subdirectory(ocp-gtpu)
 add_subdirectory(M3AP)
diff --git a/openair3/NAS/CMakeLists.txt b/openair3/NAS/CMakeLists.txt
index ff9a1bcf99..39bfc888dd 100644
--- a/openair3/NAS/CMakeLists.txt
+++ b/openair3/NAS/CMakeLists.txt
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
-add_compile_options(-Wunused-parameter)
 add_subdirectory(COMMON)
 add_subdirectory(NR_UE)
 add_subdirectory(UE)
diff --git a/openair3/NRPPA/nrppa_gNB.c b/openair3/NRPPA/nrppa_gNB.c
index b315eacb37..4c11686b16 100644
--- a/openair3/NRPPA/nrppa_gNB.c
+++ b/openair3/NRPPA/nrppa_gNB.c
@@ -24,6 +24,7 @@ void nrppa_gNB_init(void)
 
 void *nrppa_gNB_process_itti_msg(void *notUsed)
 {
+  UNUSED(notUsed);
   MessageDef *received_msg = NULL;
   int result;
   itti_receive_msg(TASK_NRPPA, &received_msg);
@@ -65,6 +66,7 @@ void *nrppa_gNB_process_itti_msg(void *notUsed)
 
 void *nrppa_gNB_task(void *arg)
 {
+  UNUSED(arg);
   nrppa_gNB_init();
 
   while (1) {
diff --git a/openair3/UICC/pdu_session.c b/openair3/UICC/pdu_session.c
index 879eabebdf..7cc22ae054 100644
--- a/openair3/UICC/pdu_session.c
+++ b/openair3/UICC/pdu_session.c
@@ -42,6 +42,7 @@
 
 static int config_check_dnn(configmodule_interface_t *cfg, paramdef_t *param)
 {
+  UNUSED(cfg);
   const char *dnn = *param->strptr;
   int dnn_len = strlen(dnn);
   if (dnn_len > 102) {
diff --git a/openair3/ocp-gtpu/gtp_itf.cpp b/openair3/ocp-gtpu/gtp_itf.cpp
index 69ed55c0ae..78f48feac9 100644
--- a/openair3/ocp-gtpu/gtp_itf.cpp
+++ b/openair3/ocp-gtpu/gtp_itf.cpp
@@ -908,6 +908,9 @@ int gtpv1u_create_x2u_tunnel(const instance_t instanceP,
                              const gtpv1u_enb_create_x2u_tunnel_req_t *const create_tunnel_req_pP,
                              gtpv1u_enb_create_x2u_tunnel_resp_t *const create_tunnel_resp_pP)
 {
+  UNUSED(instanceP);
+  UNUSED(create_tunnel_req_pP);
+  UNUSED(create_tunnel_resp_pP);
   AssertFatal(false, "to be developped\n");
 }
 
@@ -1002,6 +1005,8 @@ int gtpv1u_delete_all_s1u_tunnel(const instance_t instance, const rnti_t rnti)
 
 int gtpv1u_delete_x2u_tunnel(const instance_t instanceP, const gtpv1u_enb_delete_tunnel_req_t *const req_pP)
 {
+  UNUSED(instanceP);
+  UNUSED(req_pP);
   LOG_E(GTPU, "x2 tunnel not implemented\n");
   return 0;
 }
@@ -1013,7 +1018,7 @@ static gtpv1u_bearer_t create_bearer(int socket, const struct sockaddr_in *addr,
   return bearer;
 }
 
-static int Gtpv1uHandleEchoReq(int h, uint8_t *msgBuf, uint32_t msgBufLen, const struct sockaddr_in *addr)
+static int Gtpv1uHandleEchoReq(int h, uint8_t *msgBuf, const struct sockaddr_in *addr)
 {
   Gtpv1uMsgHeaderT *msgHdr = (Gtpv1uMsgHeaderT *)msgBuf;
 
@@ -1041,7 +1046,7 @@ static int Gtpv1uHandleEchoReq(int h, uint8_t *msgBuf, uint32_t msgBufLen, const
                                 0);
 }
 
-static int Gtpv1uHandleError(int h, uint8_t *msgBuf, uint32_t msgBufLen, const struct sockaddr_in *addr)
+static int Gtpv1uHandleError(uint8_t *msgBuf, uint32_t msgBufLen)
 {
   if (msgBufLen < sizeof(Gtpv1uError))
     LOG_E(GTPU, "Received GTP error indication with truncated size %u (mini size: %lu)\n", msgBufLen,sizeof(Gtpv1uError)+4);
@@ -1063,7 +1068,7 @@ static int Gtpv1uHandleError(int h, uint8_t *msgBuf, uint32_t msgBufLen, const s
   return rc;
 }
 
-static int Gtpv1uHandleSupportedExt(int h, uint8_t *msgBuf, uint32_t msgBufLen, const sockaddr_in *addr)
+static int Gtpv1uHandleSupportedExt()
 {
   LOG_E(GTPU, "Supported extensions to be dev\n");
   int rc = GTPNOK;
@@ -1073,7 +1078,7 @@ static int Gtpv1uHandleSupportedExt(int h, uint8_t *msgBuf, uint32_t msgBufLen,
 // When end marker arrives, we notify the client with buffer size = 0
 // The client will likely call "delete tunnel"
 // nevertheless we don't take the initiative
-static int Gtpv1uHandleEndMarker(int h, uint8_t *msgBuf, uint32_t msgBufLen, const sockaddr_in *addr)
+static int Gtpv1uHandleEndMarker(int h, uint8_t *msgBuf)
 {
   Gtpv1uMsgHeaderT *msgHdr = (Gtpv1uMsgHeaderT *)msgBuf;
 
@@ -1302,19 +1307,19 @@ static bool gtpv1uReceiveHandleMessage(int h)
         break;
 
       case GTP_ECHO_REQ:
-        Gtpv1uHandleEchoReq(h, udpData, udpDataLen, &addr);
+        Gtpv1uHandleEchoReq(h, udpData, &addr);
         break;
 
       case GTP_ERROR_INDICATION:
-        Gtpv1uHandleError(h, udpData, udpDataLen, &addr);
+        Gtpv1uHandleError(udpData, udpDataLen);
         break;
 
       case GTP_SUPPORTED_EXTENSION_HEADER_INDICATION:
-        Gtpv1uHandleSupportedExt(h, udpData, udpDataLen, &addr);
+        Gtpv1uHandleSupportedExt();
         break;
 
       case GTP_END_MARKER:
-        Gtpv1uHandleEndMarker(h, udpData, udpDataLen, &addr);
+        Gtpv1uHandleEndMarker(h, udpData);
         break;
 
       case GTP_GPDU:
@@ -1351,6 +1356,7 @@ static void gtpv1uReceiverCancel(pthread_t t)
 
 void *gtpv1uTask(void *args)
 {
+  UNUSED(args);
   while (1) {
     /* Trying to fetch a message from the message queue.
        If the queue is empty, this function will block till a