diff --git a/openair1/PHY/LTE_ESTIMATION/adjust_gain.c b/openair1/PHY/LTE_ESTIMATION/adjust_gain.c
index ead0ed7d99288beee7d910e36389931113153f6e..af72bce967cfa8c27465f36fc44b348197ad4bf3 100644
--- a/openair1/PHY/LTE_ESTIMATION/adjust_gain.c
+++ b/openair1/PHY/LTE_ESTIMATION/adjust_gain.c
@@ -29,8 +29,6 @@
 #include "PHY/types.h"
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 
 #ifdef EXMIMO
 #include "openair0_lib.h"
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c b/openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
index 9425e94d025edb33d97ff937d0fbef412d9ad7f6..059119c605536e1d599c657737e1d14ffd0a626b 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
@@ -29,8 +29,6 @@
 #include "PHY/types.h"
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 
 #define DEBUG_PHY
 
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c b/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
index 14e1c185711d119715c186b0328a36ab476b4297..b9608488594430bbe7efb7cce5b1538877b6faaf 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
@@ -48,7 +48,7 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB,
   LTE_eNB_COMMON *eNB_common_vars = &phy_vars_eNB->lte_eNB_common_vars;
   LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->lte_frame_parms;
   PHY_MEASUREMENTS_eNB *phy_measurements = &phy_vars_eNB->PHY_measurements_eNB[eNB_id];
-  int32_t *rb_mask = phy_vars_eNB->rb_mask_ul;
+  uint32_t *rb_mask = phy_vars_eNB->rb_mask_ul;
 
   uint32_t aarx,rx_power_correction;
   uint32_t rb;
@@ -56,7 +56,6 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB,
   int32_t n0_power_tot;
   int len;
   int offset;
-  int Nsymb = (frame_parms->Ncp==NORMAL)?14:12;
   // noise measurements
   // for the moment we measure the noise on the 7th OFDM symbol (in S subframe)
 
@@ -88,7 +87,7 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB,
 
       // select the 7th symbol in an uplink subframe
 	offset = (frame_parms->first_carrier_offset + (rb*12))%frame_parms->ofdm_symbol_size;
-	offset += (7*frame_parms->ofdm_symbol_size);//(((Nsymb*subframe)+7)*frame_parms->ofdm_symbol_size);
+	offset += (7*frame_parms->ofdm_symbol_size);
 	ul_ch  = &eNB_common_vars->rxdataF[eNB_id][aarx][offset];
 	len = 12;
 	// just do first half of middle PRB for odd number of PRBs
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
index edbdbda2d1986d915f195a9e544149a673e02afb..083459c397b3265fb00139550ee0f69b4f500a85 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
@@ -37,8 +37,6 @@
 #include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include <math.h>
 
 #ifdef OPENAIR2
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index c9d68cd0aad7b4f3ade100c940d3ea8e658f81b9..24781884dabedc33f1d8f1e57d0c9ddfc5952e1c 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -40,8 +40,6 @@
 #include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/defs.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #ifdef DEBUG_DCI_TOOLS
 #include "PHY/vars.h"
 #endif
diff --git a/openair1/PHY/LTE_TRANSPORT/pcfich.c b/openair1/PHY/LTE_TRANSPORT/pcfich.c
index f289fd3bd078afed7dbb67f65d5cee1859552564..978492a500b696ffe1059d751ae49817ae6bdb25 100644
--- a/openair1/PHY/LTE_TRANSPORT/pcfich.c
+++ b/openair1/PHY/LTE_TRANSPORT/pcfich.c
@@ -38,7 +38,6 @@
 * \warning
 */
 #include "PHY/defs.h"
-#include "MAC_INTERFACE/extern.h"
 
 //uint16_t pcfich_reg[4];
 //uint8_t pcfich_first_reg_idx = 0;
diff --git a/openair1/PHY/LTE_TRANSPORT/rar_tools.c b/openair1/PHY/LTE_TRANSPORT/rar_tools.c
index 1b789e114435269d9b3a3d476c67d7ae4dad9c9e..5482818873ddff7cd70c9128697176054c5f105c 100644
--- a/openair1/PHY/LTE_TRANSPORT/rar_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/rar_tools.c
@@ -40,12 +40,8 @@
 #include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/extern.h"
-#ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SCHED/defs.h"
-#endif
 
 #include "assertions.h"
 
diff --git a/openair1/PHY/LTE_TRANSPORT/uci_tools.c b/openair1/PHY/LTE_TRANSPORT/uci_tools.c
index 1cccc4aaac34bc39571c009f1c9587048974c3d7..6a475d52ee6e4f9ee9f85f1910822bf57f7494e9 100644
--- a/openair1/PHY/LTE_TRANSPORT/uci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/uci_tools.c
@@ -39,8 +39,6 @@
 */
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #ifdef DEBUG_UCI_TOOLS
 #include "PHY/vars.h"
 #endif
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index 25dae3ed63646da5a632e3eed86b6b56f7916284..b68f2c3090807a02d9a8e6c49f1735fdf2cfeac3 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -44,8 +44,6 @@
 #include "PHY/extern.h"
 #include "PHY/CODING/extern.h"
 #include "extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SCHED/extern.h"
 #ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
index f2e4dea58aa75c2264ef7d502e7a169d1ec3e7e1..e52cdf9567acf17fef5beadb45f031ddd8b06c60 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
@@ -40,8 +40,6 @@
 
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "defs.h"
 #include "extern.h"
 //#define DEBUG_ULSCH
diff --git a/openair1/PHY/MODULATION/slot_fep.c b/openair1/PHY/MODULATION/slot_fep.c
index 0d2389c2aecd6f8df13794da5e1f6ec2d8e6b4a6..38e603e5e48b3d858d71711a0782a5365b88974a 100644
--- a/openair1/PHY/MODULATION/slot_fep.c
+++ b/openair1/PHY/MODULATION/slot_fep.c
@@ -27,7 +27,6 @@
 
  *******************************************************************************/
 #include "PHY/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "defs.h"
 //#define DEBUG_FEP
 
diff --git a/openair1/PHY/MODULATION/slot_fep_mbsfn.c b/openair1/PHY/MODULATION/slot_fep_mbsfn.c
index d71a9d04778a5dd60b7b5acac86669512d1e1254..f6ca4aa2f41db203fb69a80f84fbc1bfe68e8343 100644
--- a/openair1/PHY/MODULATION/slot_fep_mbsfn.c
+++ b/openair1/PHY/MODULATION/slot_fep_mbsfn.c
@@ -27,7 +27,6 @@
 
  *******************************************************************************/
 #include "PHY/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "defs.h"
 //#define DEBUG_FEP
 
diff --git a/openair1/PHY/extern.h b/openair1/PHY/extern.h
index a7450e3e21cf14eec465082758db07d2c218d200..4c9e2706c78a6055a72546c6c7d102bf87399b98 100755
--- a/openair1/PHY/extern.h
+++ b/openair1/PHY/extern.h
@@ -30,7 +30,7 @@
 #define __PHY_EXTERN_H__
 
 #include "PHY/defs.h"
-
+#include "PHY_INTERFACE/defs.h"
 
 extern  char* namepointer_chMag ;
 extern char* namepointer_log2;
@@ -39,10 +39,7 @@ extern  char fmageren_name2[512];
 extern unsigned int RX_DMA_BUFFER[4][NB_ANTENNAS_RX];
 extern unsigned int TX_DMA_BUFFER[4][NB_ANTENNAS_TX];
 
-#ifdef OPENAIR_LTE
 #include "PHY/LTE_TRANSPORT/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SIMULATION/ETH_TRANSPORT/extern.h"
 
 extern unsigned int DAQ_MBOX;
@@ -56,6 +53,7 @@ extern PHY_VARS_eNB ***PHY_vars_eNB_g;
 extern PHY_VARS_RN **PHY_vars_RN_g;
 extern LTE_DL_FRAME_PARMS *lte_frame_parms_g;
 
+extern MAC_xface *mac_xface;
 
 
 extern short primary_synch0[144];
@@ -78,7 +76,6 @@ extern char mode_string[4][20];
 
 #include "PHY/LTE_TRANSPORT/extern.h"
 
-#endif
 
 #ifndef OPENAIR2
 extern unsigned char NB_eNB_INST;
diff --git a/openair1/SCHED/phy_mac_stub.c b/openair1/SCHED/phy_mac_stub.c
index 9bcba1072c300e8d71f9526c733c11c5ad466489..ab2c97a657abca0368cc02e9a8866ae1f7179577 100644
--- a/openair1/SCHED/phy_mac_stub.c
+++ b/openair1/SCHED/phy_mac_stub.c
@@ -40,8 +40,6 @@
 
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SCHED/defs.h"
 #include "SCHED/extern.h"
 #include "LAYER2/MAC/extern.h"
diff --git a/openair1/SCHED/phy_procedures_lte_common.c b/openair1/SCHED/phy_procedures_lte_common.c
index c51bd82d8a7345009537fc89051100bfbecdb98b..e56606e262b063b6766fe427565b6a75c04971fa 100755
--- a/openair1/SCHED/phy_procedures_lte_common.c
+++ b/openair1/SCHED/phy_procedures_lte_common.c
@@ -39,8 +39,6 @@
 */
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SCHED/defs.h"
 #include "SCHED/extern.h"
 
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index 375c0dcd1f165cf712e39e03e983c83da8a5fbc3..4c740f4e331c948d0dc9f60206e36bb84684f764 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -40,8 +40,6 @@
 
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SCHED/defs.h"
 #include "SCHED/extern.h"
 
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index b29c229f27aa0a277c1021830a2d33228dc78c07..902377f1403db08de3abbd91ae87e3f85481bb9c 100755
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -42,8 +42,6 @@
 #include "defs.h"
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SCHED/defs.h"
 #include "SCHED/extern.h"
 
diff --git a/openair2/LAYER2/MAC/rar_tools.c b/openair2/LAYER2/MAC/rar_tools.c
index 2e97f83fac72920610829cacebb77c1e6190bcd1..5efa737a918372e14cd315e248b10fb62fba7e17 100644
--- a/openair2/LAYER2/MAC/rar_tools.c
+++ b/openair2/LAYER2/MAC/rar_tools.c
@@ -39,8 +39,6 @@
 #include "defs.h"
 #include "proto.h"
 #include "extern.h"
-#include "MAC_INTERFACE/defs.h"
-#include "MAC_INTERFACE/extern.h"
 #include "SIMULATION/TOOLS/defs.h"
 #include "UTIL/LOG/log.h"
 #include "OCG.h"
diff --git a/openair2/LAYER2/MAC/vars.h b/openair2/LAYER2/MAC/vars.h
index 88da64de5a0634109a3621320d081ac143f18b0e..508c7f8c210a9f20753d79f6b298f0518ce87f88 100644
--- a/openair2/LAYER2/MAC/vars.h
+++ b/openair2/LAYER2/MAC/vars.h
@@ -55,6 +55,7 @@ const uint32_t BSR_TABLE[BSR_TABLE_SIZE]= {0,10,12,14,17,19,22,26,31,36,42,49,57
 
 //uint32_t EBSR_Level[63]={0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181};
 
+MAC_xface *mac_xface;
 
 uint32_t RRC_CONNECTION_FLAG;
 
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
index b2930e62966a59650ee330ab67514d2d4da7f838..881dc9b99338944a03e73e4369b2e959be5a613f 100644
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c
@@ -37,7 +37,6 @@
 #include "rlc_primitives.h"
 #include "mac_primitives.h"
 #include "list.h"
-#include "MAC_INTERFACE/extern.h"
 #include "UTIL/LOG/log.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
index 085f37e4c1bbeb5e5767bb14ef2d8ffc8b4273a6..6ea07a4677df3e406a89c0116e6e7f1c8c06e6d3 100755
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_receiver.c
@@ -36,7 +36,6 @@
 #include "rlc_primitives.h"
 #include "mac_primitives.h"
 #include "list.h"
-#include "MAC_INTERFACE/extern.h"
 #include "UTIL/LOG/log.h"
 
 //-----------------------------------------------------------------------------
diff --git a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
index a31f99091652ee742330547965d729dbfad6230a..24890bf957d0ae6519bf8560f11a9bcd8d735b90 100755
--- a/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
+++ b/openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c
@@ -40,7 +40,6 @@
 #include "list.h"
 #include "rlc_um.h"
 #include "rlc_primitives.h"
-#include "MAC_INTERFACE/extern.h"
 #include "UTIL/LOG/log.h"
 
 //-----------------------------------------------------------------------------
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 7df20f05c81212c64aa8159d032978f472aad98e..e384c1f79aef156325e0a0ac3c627982cf5740bf 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -77,8 +77,6 @@ struct gps_fix_t dummy_gps_data;
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
 
 #include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
-//#include "SCHED/defs.h"
 #include "SCHED/vars.h"
 #include "LAYER2/MAC/vars.h"
 
@@ -88,13 +86,11 @@ struct gps_fix_t dummy_gps_data;
 #include "SCHED/phy_procedures_emos.h"
 #endif
 
-#ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
 #include "LAYER2/MAC/vars.h"
 #include "LAYER2/MAC/proto.h"
 #include "RRC/LITE/vars.h"
 #include "PHY_INTERFACE/vars.h"
-#endif
 
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index e72b4ec80a39f1434a65e36a97ea96b19138f413..28676f015611cbaaedcce8de13feb576b4c7cfc3 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -75,13 +75,9 @@
 #endif
 
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/extern.h"
-//#include "SCHED/defs.h"
 #include "SCHED/extern.h"
-#ifdef OPENAIR2
 #include "LAYER2/MAC/extern.h"
 #include "LAYER2/MAC/proto.h"
-#endif
 
 #include "UTIL/LOG/log_extern.h"
 #include "UTIL/OTG/otg_tx.h"
diff --git a/targets/RT/USER/sched_dlsch.c b/targets/RT/USER/sched_dlsch.c
index d582e79310486bfbcd7fb4447dbb13e46b25e2cd..48fac642a9c1b63d52425ef6b97657c2c81fc724 100644
--- a/targets/RT/USER/sched_dlsch.c
+++ b/targets/RT/USER/sched_dlsch.c
@@ -51,14 +51,6 @@
 
 #include "SCHED/defs.h"
 
-#include "MAC_INTERFACE/extern.h"
-
-#ifdef CBMIMO1
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_device.h"
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/extern.h"
-#include "ARCH/CBMIMO1/DEVICE_DRIVER/defs.h"
-#endif // CBMIMO1
-
 #include "UTIL/LOG/vcd_signal_dumper.h"
 
 #define DEBUG_PHY
diff --git a/targets/RT/USER/sched_rx_pdsch.c b/targets/RT/USER/sched_rx_pdsch.c
index be1ffbd752611f818ccf96bd6aa75a4ae32e3cfe..e792fe737d936c2fb21f981cc52be3d957a67c86 100644
--- a/targets/RT/USER/sched_rx_pdsch.c
+++ b/targets/RT/USER/sched_rx_pdsch.c
@@ -51,8 +51,6 @@
 #include "SCHED/defs.h"
 #include "SCHED/extern.h"
 
-#include "MAC_INTERFACE/extern.h"
-
 #include "UTIL/LOG/vcd_signal_dumper.h"
 
 RTIME time0,time1;
diff --git a/targets/SIMU/USER/channel_sim.c b/targets/SIMU/USER/channel_sim.c
index e26129bca656b5bc14fd31fa9e4c36c6bc5c4298..1e9b2afe7f0db5d75f587b2f3d823f5a958c3bf7 100644
--- a/targets/SIMU/USER/channel_sim.c
+++ b/targets/SIMU/USER/channel_sim.c
@@ -39,7 +39,6 @@
 #include "PHY/types.h"
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/extern.h"
 
 #ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
diff --git a/targets/SIMU/USER/init_lte.c b/targets/SIMU/USER/init_lte.c
index bbb99260ebc0842c65783e9a465bbdfc1c1b9ce6..1d987b713e15bea744c5032fbf393c22fd00c8c8 100644
--- a/targets/SIMU/USER/init_lte.c
+++ b/targets/SIMU/USER/init_lte.c
@@ -38,14 +38,11 @@
 #include "init_lte.h"
 
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/extern.h"
 
-#ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
 #include "LAYER2/MAC/extern.h"
 #include "UTIL/LOG/log_if.h"
 #include "PHY_INTERFACE/extern.h"
-#endif
 
 
 
diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c
index 9e4880906d35b2a9d41162999d09afce48874b7a..6c987cdfbc137054e384040a443d1c52f6d4bf7b 100644
--- a/targets/SIMU/USER/oaisim.c
+++ b/targets/SIMU/USER/oaisim.c
@@ -53,7 +53,6 @@
 #include "PHY/defs.h"
 #include "PHY/LTE_TRANSPORT/proto.h"
 #include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
 
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index 014a9e39d02aa2d3192095c00ae1efd80a9cd1a7..446174c988e7985e5fa39b619f7bdbe0a1ca4736 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -51,7 +51,6 @@
 #include "oaisim_functions.h"
 
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/extern.h"
 #include "LAYER2/MAC/extern.h"
 #ifdef OPENAIR2
 #include "LAYER2/MAC/proto.h"
diff --git a/targets/SIMU/USER/sinr_sim.c b/targets/SIMU/USER/sinr_sim.c
index 9ac1371d1193ae848fdbeb217b4ece04d9faaebc..b235e16585d086e1dbafb642e1e0e45f249fb73f 100644
--- a/targets/SIMU/USER/sinr_sim.c
+++ b/targets/SIMU/USER/sinr_sim.c
@@ -40,7 +40,6 @@
 #include "PHY/types.h"
 #include "PHY/defs.h"
 #include "PHY/extern.h"
-#include "MAC_INTERFACE/extern.h"
 #include "oaisim_config.h"
 
 #ifdef OPENAIR2