diff --git a/lib/include/srsran/interfaces/gnb_interfaces.h b/lib/include/srsran/interfaces/gnb_interfaces.h
index b902829e6..1864d8f3a 100644
--- a/lib/include/srsran/interfaces/gnb_interfaces.h
+++ b/lib/include/srsran/interfaces/gnb_interfaces.h
@@ -15,14 +15,12 @@
 
 #include "srsran/srsran.h"
 
-#include "srsenb/hdr/stack/mac/sched_interface.h"
 #include "srsran/common/interfaces_common.h"
 #include "srsran/common/security.h"
 #include "srsran/interfaces/pdcp_interface_types.h"
 #include "srsran/interfaces/rlc_interface_types.h"
 #include "srsran/interfaces/rrc_interface_types.h"
 // EUTRA interfaces that are used unmodified
-#include "srsran/interfaces/enb_mac_interfaces.h"
 #include "srsran/interfaces/enb_rrc_interfaces.h"
 
 namespace srsenb {
diff --git a/lib/include/srsran/interfaces/gnb_mac_interfaces.h b/lib/include/srsran/interfaces/gnb_mac_interfaces.h
index e25f3953a..6f9263f1b 100644
--- a/lib/include/srsran/interfaces/gnb_mac_interfaces.h
+++ b/lib/include/srsran/interfaces/gnb_mac_interfaces.h
@@ -14,6 +14,7 @@
 #define SRSRAN_GNB_MAC_INTERFACES_H
 
 #include "srsgnb/hdr/stack/mac/sched_nr_interface.h"
+#include "srsran/interfaces/enb_mac_interfaces.h"
 
 namespace srsenb {
 
diff --git a/srsenb/hdr/phy/phy_interfaces.h b/srsenb/hdr/phy/phy_interfaces.h
index dbd080d13..ed7bd23c8 100644
--- a/srsenb/hdr/phy/phy_interfaces.h
+++ b/srsenb/hdr/phy/phy_interfaces.h
@@ -13,6 +13,7 @@
 #ifndef SRSENB_PHY_INTERFACES_H_
 #define SRSENB_PHY_INTERFACES_H_
 
+#include "srsgnb/hdr/phy/phy_nr_interfaces.h"
 #include "srsran/asn1/rrc/rr_common.h"
 #include "srsran/common/interfaces_common.h"
 #include "srsran/phy/channel/channel.h"
@@ -33,22 +34,7 @@ struct phy_cell_cfg_t {
   float         gain_db;
 };
 
-struct phy_cell_cfg_nr_t {
-  srsran_carrier_nr_t   carrier;
-  uint32_t              rf_port;
-  uint32_t              cell_id;
-  double                dl_freq_hz;
-  double                ul_freq_hz;
-  uint32_t              root_seq_idx;
-  uint32_t              num_ra_preambles;
-  float                 gain_db;
-  srsran_pdcch_cfg_nr_t pdcch = {}; ///< Common CORESET and Search Space configuration
-  srsran_pdsch_cfg_t    pdsch = {};
-  srsran_prach_cfg_t    prach = {};
-};
-
-typedef std::vector<phy_cell_cfg_t>    phy_cell_cfg_list_t;
-typedef std::vector<phy_cell_cfg_nr_t> phy_cell_cfg_list_nr_t;
+typedef std::vector<phy_cell_cfg_t> phy_cell_cfg_list_t;
 
 struct phy_args_t {
   std::string            type;
diff --git a/srsgnb/hdr/phy/phy_nr_interfaces.h b/srsgnb/hdr/phy/phy_nr_interfaces.h
new file mode 100644
index 000000000..9248d06b0
--- /dev/null
+++ b/srsgnb/hdr/phy/phy_nr_interfaces.h
@@ -0,0 +1,39 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2021 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#ifndef SRSRAN_PHY_NR_INTERFACES_H
+#define SRSRAN_PHY_NR_INTERFACES_H
+
+#include "srsran/srsran.h"
+#include <vector>
+
+namespace srsenb {
+
+struct phy_cell_cfg_nr_t {
+  srsran_carrier_nr_t   carrier;
+  uint32_t              rf_port;
+  uint32_t              cell_id;
+  double                dl_freq_hz;
+  double                ul_freq_hz;
+  uint32_t              root_seq_idx;
+  uint32_t              num_ra_preambles;
+  float                 gain_db;
+  srsran_pdcch_cfg_nr_t pdcch = {}; ///< Common CORESET and Search Space configuration
+  srsran_pdsch_cfg_t    pdsch = {};
+  srsran_prach_cfg_t    prach = {};
+};
+
+using phy_cell_cfg_list_nr_t = std::vector<phy_cell_cfg_nr_t>;
+
+} // namespace srsenb
+
+#endif // SRSRAN_PHY_NR_INTERFACES_H
diff --git a/srsgnb/hdr/stack/rrc/rrc_nr_config.h b/srsgnb/hdr/stack/rrc/rrc_nr_config.h
index ed65ef653..7f8dfa3c8 100644
--- a/srsgnb/hdr/stack/rrc/rrc_nr_config.h
+++ b/srsgnb/hdr/stack/rrc/rrc_nr_config.h
@@ -13,11 +13,11 @@
 #ifndef SRSRAN_RRC_NR_CONFIG_H
 #define SRSRAN_RRC_NR_CONFIG_H
 
-#include "srsenb/hdr/phy/phy_interfaces.h"
 #include "srsenb/hdr/stack/rrc/rrc_config_common.h"
+#include "srsgnb/hdr/phy/phy_nr_interfaces.h"
 #include "srsran/asn1/rrc_nr.h"
+#include "srsran/common/security.h"
 #include "srsran/interfaces/gnb_rrc_nr_interfaces.h"
-#include "srsue/hdr/phy/phy_common.h"
 
 namespace srsenb {
 
diff --git a/srsgnb/src/stack/rrc/test/rrc_nr_test.cc b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc
index 2b524b3d7..1d07ab06b 100644
--- a/srsgnb/src/stack/rrc/test/rrc_nr_test.cc
+++ b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc
@@ -11,7 +11,6 @@
  */
 
 #include "rrc_nr_test_helpers.h"
-#include "srsgnb/hdr/stack/rrc/rrc_nr.h"
 #include "srsgnb/hdr/stack/rrc/rrc_nr_config_utils.h"
 #include "srsgnb/src/stack/mac/test/sched_nr_cfg_generators.h"
 #include "srsran/common/test_common.h"