diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 5d32c96074..124298cf40 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/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;
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index f3686cfc1e..a18da282cc 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/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"
diff --git a/openair2/RRC/NR/rrc_gNB_du.c b/openair2/RRC/NR/rrc_gNB_du.c
index 3df1109778..d6e025309a 100644
--- a/openair2/RRC/NR/rrc_gNB_du.c
+++ b/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"
diff --git a/openair2/RRC/NR/rrc_gNB_mobility.c b/openair2/RRC/NR/rrc_gNB_mobility.c
index be12f2e562..477be84800 100644
--- a/openair2/RRC/NR/rrc_gNB_mobility.c
+++ b/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"