diff --git a/nfapi/oai_integration/aerial/fapi_nvIPC.h b/nfapi/oai_integration/aerial/fapi_nvIPC.h
index 594edd843a..3d88937f60 100644
--- a/nfapi/oai_integration/aerial/fapi_nvIPC.h
+++ b/nfapi/oai_integration/aerial/fapi_nvIPC.h
@@ -38,6 +38,8 @@
 #include "nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h"
 #include "debug.h"
 
+#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
+
 typedef struct {
   uint8_t num_msg;
   uint8_t opaque_handle;
@@ -53,6 +55,6 @@ int aerial_send_P7_msg_with_data(void *packedBuf,
                                       uint32_t dataLength,
                                       nfapi_p7_message_header_t *header);
 void set_config(nfapi_vnf_config_t *conf);
-int nvIPC_Init(nvipc_params_t);
+int nvIPC_Init(nvipc_params_t nvipc_params_s);
 
 #endif // OPENAIRINTERFACE_FAPI_NVIPC_H
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index 1306652033..18b44bcf28 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -792,6 +792,11 @@ typedef struct f1_config_t {
   uint32_t gnb_id; // associated gNB's ID, not used in DU itself
 } f1_config_t;
 
+typedef struct {
+  char *nvipc_shm_prefix;
+  int8_t nvipc_poll_core;
+} nvipc_params_t;
+
 /*! \brief top level eNB MAC structure */
 typedef struct gNB_MAC_INST_s {
   /// Ethernet parameters for northbound midhaul interface
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index 0cc456c322..2e4687a352 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -241,6 +241,8 @@ void handle_nr_srs(NR_UL_IND_t *UL_info) {
   const int num_srs = UL_info->srs_ind.number_of_pdus;
   nfapi_nr_srs_indication_pdu_t *srs_list = UL_info->srs_ind.pdu_list;
 
+  // from here
+
   for (int i = 0; i < num_srs; i++) {
     nfapi_nr_srs_indication_pdu_t *srs_ind = &srs_list[i];
     LOG_D(NR_PHY, "(%d.%d) UL_info->srs_ind.pdu_list[%d].rnti: 0x%04x\n", frame, slot, i, srs_ind->rnti);
diff --git a/radio/COMMON/common_lib.h b/radio/COMMON/common_lib.h
index 80894c2a1d..aa2d9e3189 100644
--- a/radio/COMMON/common_lib.h
+++ b/radio/COMMON/common_lib.h
@@ -336,11 +336,6 @@ typedef struct {
   uint8_t if_compress;
 } eth_params_t;
 
-typedef struct {
-  char *nvipc_shm_prefix;
-  int8_t nvipc_poll_core;
-} nvipc_params_t;
-
 typedef struct {
   //! Tx buffer for if device, keep one per subframe now to allow multithreading
   void *tx[10];