diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index b9302392ab..332e06e7af 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -23,6 +23,7 @@
 #define _GNU_SOURCE             /* See feature_test_macros(7) */
 
 #include "common/config/config_userapi.h"
+#include "common/utils/load_module_shlib.h"
 #include "RRC/LTE/rrc_vars.h"
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index d97783604f..8d42b7cc02 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -89,9 +89,6 @@
 #include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
 #include "NR_TAG.h"
 
-#include <openair3/UICC/usim_interface.h>
-
-
 /* Defs */
 #define MAX_NUM_BWP 5
 #define MAX_NUM_CORESET 12
@@ -100,7 +97,6 @@
 #define NR_NB_RA_PROC_MAX 4
 #define MAX_NUM_OF_SSB 64
 #define MAX_NUM_NR_PRACH_PREAMBLES 64
-#define MIN_NUM_PRBS_TO_SCHEDULE  5
 
 uint8_t nr_get_rv(int rel_round);
 
@@ -677,10 +673,6 @@ typedef struct {
   float pdcch_cl_adjust;
 } NR_UE_sched_ctrl_t;
 
-typedef struct {
-  uicc_t *uicc;
-} NRUEcontext_t;
-
 typedef struct NR_mac_dir_stats {
   uint64_t lc_bytes[64];
   uint64_t rounds[8];