remove NR UE rrc_defs dependency in rrc_messages_types

openair2/COMMON/rrc_messages_types.h

@@ -43,6 +43,12 @@
 #include "NR_RACH-ConfigCommon.h"
 #include "NR_ServingCellConfigCommon.h"
 #include "NR_ServingCellConfig.h"
+#include "NR_SIB1.h"
+#include "NR_SIB19-r17.h"
+#include "NR_CellGroupConfig.h"
+#include "NR_BCCH-BCH-Message.h"
+#include "NR_ReestablishmentCause.h"
+#include "NR_UE-NR-Capability.h"
 
 //-------------------------------------------------------------------------------------------//
 // Messages for RRC logging
@@ -463,7 +469,6 @@ typedef struct {
   int ue_id;
 } RlcMaxRtxIndication;
 
-#include "openair2/RRC/NR_UE/rrc_defs.h"
 typedef struct {
   NR_ReestablishmentCause_t cause;
 } nr_mac_rrc_config_reset_t;

openair2/RRC/NR/rrc_gNB.c

@@ -94,6 +94,7 @@
 #include "xer_encoder.h"
 #include "E1AP/lib/e1ap_bearer_context_management.h"
 #include "E1AP/lib/e1ap_interface_management.h"
+#include "NR_DL-DCCH-Message.h"
 
 #ifdef E2_AGENT
 #include "openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h"

openair2/RRC/NR/rrc_gNB_du.c

@@ -30,6 +30,7 @@
 #include "asn_codecs.h"
 #include "assertions.h"
 #include "common/ran_context.h"
+#include "common/utils/nr/nr_common.h"
 #include "common/utils/T/T.h"
 #include "common/utils/alg/foreach.h"
 #include "common/utils/ds/seq_arr.h"

openair2/RRC/NR/rrc_gNB_mobility.c

@@ -35,6 +35,7 @@
 #include "nr_pdcp/nr_pdcp_oai_api.h"
 #include "openair3/SECU/key_nas_deriver.h"
 #include "openair2/RRC/NR/rrc_gNB_NGAP.h"
+#include "NR_DL-DCCH-MessageType.h"
 
 #ifdef E2_AGENT
 #include "openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h"