remove now unneccessary MAC includes and forward declaration

executables/nr-gnb.c

@@ -63,7 +63,7 @@
 
 #include "PHY/phy_extern.h"
 
-#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
+#include "common/ran_context.h"
 #include "RRC/LTE/rrc_extern.h"
 #include "PHY_INTERFACE/phy_interface.h"
 #include "common/utils/LOG/log_extern.h"
@@ -74,7 +74,6 @@
 #include "UTIL/OPT/opt.h"
 #include "enb_config.h"
 #include "gnb_paramdef.h"
-#include "LAYER2/NR_MAC_gNB/mac_proto.h"
 
 #include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
@@ -497,7 +496,6 @@ void print_opp_meas(void) {
 void init_eNB_afterRU(void) {
   int inst,ru_id,i,aa;
   PHY_VARS_gNB *gNB;
-  gNB_MAC_INST *mac;
   LOG_I(PHY,"%s() RC.nb_nr_inst:%d\n", __FUNCTION__, RC.nb_nr_inst);
 
   if(NFAPI_MODE == NFAPI_MODE_PNF)

openair1/PHY/INIT/nr_init.c

@@ -36,7 +36,6 @@
 #include "MBSFN-SubframeConfigList.h"*/
 #include "openair1/PHY/defs_RU.h"
 #include "openair1/PHY/CODING/nrLDPC_extern.h"
-#include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
 #include "assertions.h"
 #include <math.h>
 #include <complex.h>

openair1/PHY/INIT/phy_init.h

@@ -37,8 +37,6 @@
 #include "LTE_SCellToAddMod-r10.h"
 #include "LTE_NonMBSFN-SubframeConfig-r14.h"
 
-typedef struct gNB_MAC_INST_s gNB_MAC_INST;
-
 /** @addtogroup _PHY_STRUCTURES_
  * @{
  */