diff --git a/openair2/COMMON/gtpv1_u_messages_types.h b/openair2/COMMON/gtpv1_u_messages_types.h
index c4a7f7bb18..0a2691e643 100644
--- a/openair2/COMMON/gtpv1_u_messages_types.h
+++ b/openair2/COMMON/gtpv1_u_messages_types.h
@@ -24,6 +24,7 @@
 
 #include "LTE_asn_constant.h"
 #include "NR_asn_constant.h"
+#include "s1ap_messages_types.h"
 
 #define GTPV1U_MAX_BEARERS_PER_UE max_val_LTE_DRB_Identity
 #define NR_GTPV1U_MAX_BEARERS_PER_UE max_val_NR_DRB_Identity
diff --git a/openair2/LAYER2/NR_MAC_gNB/main.c b/openair2/LAYER2/NR_MAC_gNB/main.c
index a663ed522c..add3b6589a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/main.c
+++ b/openair2/LAYER2/NR_MAC_gNB/main.c
@@ -41,6 +41,7 @@
 
 #include "common/ran_context.h"
 #include "executables/softmodem-common.h"
+#include "openair2/RRC/NR/MESSAGES/asn1_msg.h"
 
 extern RAN_CONTEXT_t RC;
 
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.h b/openair2/RRC/NR/MESSAGES/asn1_msg.h
index 2f0b4febf8..d7642ca663 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.h
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.h
@@ -31,17 +31,30 @@
 #ifndef __RRC_NR_MESSAGES_ASN1_MSG__H__
 #define __RRC_NR_MESSAGES_ASN1_MSG__H__
 
+#include <common/utils/assertions.h>
+#include <stdint.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h> /* for atoi(3) */
-#include <unistd.h> /* for getopt(3) */
-#include <string.h> /* for strerror(3) */
-#include <sysexits.h> /* for EX_* exit codes */
-#include <errno.h>  /* for errno */
-
-#include <asn_application.h>
-
-#include "RRC/NR/nr_rrc_config.h"
+#include "NR_ARFCN-ValueNR.h"
+#include "NR_CellGroupConfig.h"
+#include "NR_CipheringAlgorithm.h"
+#include "NR_DRB-ToAddModList.h"
+#include "NR_DRB-ToReleaseList.h"
+#include "NR_IntegrityProtAlgorithm.h"
+#include "NR_LogicalChannelConfig.h"
+#include "NR_MeasConfig.h"
+#include "NR_MeasTiming.h"
+#include "NR_RLC-BearerConfig.h"
+#include "NR_RLC-Config.h"
+#include "NR_RRC-TransactionIdentifier.h"
+#include "NR_RadioBearerConfig.h"
+#include "NR_ReestablishmentCause.h"
+#include "NR_SRB-ToAddModList.h"
+#include "NR_SecurityConfig.h"
+#include "RRC/NR/nr_rrc_defs.h"
+#include "ds/seq_arr.h"
+#include "rrc_messages_types.h"
+struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList;
+struct asn_TYPE_descriptor_s;
 
 /*
  * The variant of the above function which dumps the BASIC-XER (XER_F_BASIC)
diff --git a/openair2/RRC/NR/cucp_cuup_direct.c b/openair2/RRC/NR/cucp_cuup_direct.c
index 97763d65d7..2e8bbfa428 100644
--- a/openair2/RRC/NR/cucp_cuup_direct.c
+++ b/openair2/RRC/NR/cucp_cuup_direct.c
@@ -19,8 +19,10 @@
  *      contact@openairinterface.org
  */
 
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include "assertions.h"
 #include "cucp_cuup_if.h"
-
 #include "nr_rrc_defs.h"
 #include "openair2/COMMON/e1ap_messages_types.h"
 #include "openair2/LAYER2/nr_pdcp/cucp_cuup_handler.h"
diff --git a/openair2/RRC/NR/cucp_cuup_e1ap.c b/openair2/RRC/NR/cucp_cuup_e1ap.c
index b567fd76d4..69cb92f50a 100644
--- a/openair2/RRC/NR/cucp_cuup_e1ap.c
+++ b/openair2/RRC/NR/cucp_cuup_e1ap.c
@@ -19,13 +19,14 @@
  *      contact@openairinterface.org
  */
 
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include "assertions.h"
 #include "cucp_cuup_if.h"
+#include "e1ap_messages_types.h"
+#include "intertask_interface.h"
 #include "nr_rrc_defs.h"
 
-#include "nr_rrc_proto.h"
-#include "nr_rrc_extern.h"
-#include "cucp_cuup_if.h"
-
 static void cucp_cuup_bearer_context_setup_e1ap(sctp_assoc_t assoc_id, const e1ap_bearer_setup_req_t *req)
 {
   AssertFatal(assoc_id > 0, "illegal assoc_id %d\n", assoc_id);
diff --git a/openair2/RRC/NR/mac_rrc_dl_direct.c b/openair2/RRC/NR/mac_rrc_dl_direct.c
index 54ec7c8e4c..77113f6c8b 100644
--- a/openair2/RRC/NR/mac_rrc_dl_direct.c
+++ b/openair2/RRC/NR/mac_rrc_dl_direct.c
@@ -19,9 +19,13 @@
  *      contact@openairinterface.org
  */
 
-#include "nr_rrc_defs.h"
-
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include <stdbool.h>
+#include "assertions.h"
+#include "f1ap_messages_types.h"
 #include "mac_rrc_dl.h"
+#include "nr_rrc_defs.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h"
 
 static void f1_reset_cu_initiated_direct(sctp_assoc_t assoc_id, const f1ap_reset_t *reset)
diff --git a/openair2/RRC/NR/mac_rrc_dl_f1ap.c b/openair2/RRC/NR/mac_rrc_dl_f1ap.c
index 70d36a144f..8593ff816a 100644
--- a/openair2/RRC/NR/mac_rrc_dl_f1ap.c
+++ b/openair2/RRC/NR/mac_rrc_dl_f1ap.c
@@ -19,8 +19,15 @@
  *      contact@openairinterface.org
  */
 
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
-
+#include <string.h>
+#include "assertions.h"
+#include "f1ap_messages_types.h"
+#include "intertask_interface.h"
 #include "mac_rrc_dl.h"
 #include "nr_rrc_defs.h"
 #include "openair2/F1AP/lib/f1ap_rrc_message_transfer.h"
diff --git a/openair2/RRC/NR/nr_rrc_common.h b/openair2/RRC/NR/nr_rrc_common.h
index f81a57f5ad..f3bc3681a9 100644
--- a/openair2/RRC/NR/nr_rrc_common.h
+++ b/openair2/RRC/NR/nr_rrc_common.h
@@ -22,8 +22,6 @@
 #ifndef __NR_RRC_COMMON_H__
 #define __NR_RRC_COMMON_H__
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h> 
 
 #define NR_NUM_SRB 4 /* Number of Signalling Radio Bearers according to clause 4.2.2 of 3GPP TS 38.331 */
diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index 6966394667..72ea552601 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -28,18 +28,33 @@
  * \email: raymond.knopp@eurecom.fr, kroempa@gmail.com
  */
 
-#include "openair3/UTILS/conversions.h"
 #include "nr_rrc_config.h"
+#include <endian.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "BIT_STRING.h"
+#include "NULL.h"
+#include "RRC/NR/MESSAGES/asn1_msg.h"
+#include "RRC/NR/nr_rrc_proto.h"
+#include "SIMULATION/TOOLS/sim.h"
+#include "T.h"
+#include "asn_SET_OF.h"
+#include "asn_codecs.h"
+#include "asn_internal.h"
+#include "assertions.h"
+#include "common/openairinterface5g_limits.h"
+#include "common/utils/T/T.h"
 #include "common/utils/nr/nr_common.h"
-#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
+#include "constr_TYPE.h"
 #include "executables/softmodem-common.h"
 #include "oai_asn1.h"
-#include "SIMULATION/TOOLS/sim.h" // for taus();
-
-#include "NR_MeasurementTimingConfiguration.h"
-
+#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
+#include "openair3/UTILS/conversions.h"
 #include "uper_decoder.h"
 #include "uper_encoder.h"
+#include "utils.h"
+#include "xer_encoder.h"
 
 const uint8_t slotsperframe[5] = {10, 20, 40, 80, 160};
 
@@ -3090,8 +3105,6 @@ NR_CellGroupConfig_t *get_initial_cellGroupConfig(int uid,
   return cellGroupConfig;
 }
 
-#include "common/ran_context.h"
-#include "nr_rrc_defs.h"
 void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig,
                             const int uid,
                             NR_UE_NR_Capability_t *uecap,
diff --git a/openair2/RRC/NR/nr_rrc_config.h b/openair2/RRC/NR/nr_rrc_config.h
index ff94f2ab7e..b9f030e897 100644
--- a/openair2/RRC/NR/nr_rrc_config.h
+++ b/openair2/RRC/NR/nr_rrc_config.h
@@ -31,8 +31,17 @@
 #ifndef __NR_RRC_CONFIG_H__
 #define __NR_RRC_CONFIG_H__
 
-#include "nr_rrc_defs.h"
-#include "openair2/RRC/NR/MESSAGES/asn1_msg.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include "NR_BCCH-BCH-Message.h"
+#include "NR_BCCH-DL-SCH-Message.h"
+#include "NR_CellGroupConfig.h"
+#include "NR_UE-NR-Capability.h"
+#include "NR_UL-CCCH-Message.h"
+#include "PHY/defs_common.h"
+#include "f1ap_messages_types.h"
+struct NR_MeasurementTimingConfiguration;
+struct NR_PDSCH_TimeDomainResourceAllocationList;
 
 // forward declaration of MAC configuration parameters, definition is included in C file
 struct nr_mac_config_t;
diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index 7650718e66..b33b2c158c 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -34,39 +34,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include "collection/tree.h"
 #include "collection/linear_alloc.h"
 #include "common/utils/ds/seq_arr.h"
 #include "nr_rrc_common.h"
 #include "ds/byte_array.h"
-
 #include "common/platform_constants.h"
 #include "common/platform_types.h"
 #include "mac_rrc_dl.h"
 #include "cucp_cuup_if.h"
-
-#include "NR_SIB1.h"
-#include "NR_RRCReconfigurationComplete.h"
-#include "NR_RRCReconfiguration.h"
-#include "NR_RRCReestablishmentRequest.h"
 #include "NR_BCCH-BCH-Message.h"
 #include "NR_BCCH-DL-SCH-Message.h"
-#include "NR_BCCH-BCH-Message.h"
-#include "NR_PLMN-IdentityInfo.h"
-#include "NR_MCC-MNC-Digit.h"
-#include "NR_NG-5G-S-TMSI.h"
-
-#include "NR_UE-NR-Capability.h"
-#include "NR_UE-MRDC-Capability.h"
-#include "NR_MeasResults.h"
 #include "NR_CellGroupConfig.h"
-#include "NR_ServingCellConfigCommon.h"
-#include "NR_EstablishmentCause.h"
+#include "NR_MeasurementReport.h"
 #include "NR_MeasurementTimingConfiguration.h"
-
-//-------------------
-
+#include "NR_RRCReconfiguration.h"
+#include "NR_UE-CapabilityRAT-ContainerList.h"
+#include "NR_UL-CCCH-Message.h"
+#include "NR_UE-MRDC-Capability.h"
+#include "NR_UE-NR-Capability.h"
 #include "intertask_interface.h"
 
 // 3GPP TS 38.331 Section 12 Table 12.1-1: UE performance requirements for RRC procedures for UEs
diff --git a/openair2/RRC/NR/nr_rrc_proto.h b/openair2/RRC/NR/nr_rrc_proto.h
index 576a1f636a..ab2a95ecde 100644
--- a/openair2/RRC/NR/nr_rrc_proto.h
+++ b/openair2/RRC/NR/nr_rrc_proto.h
@@ -35,14 +35,9 @@
 #define __NR_RRC_PROTO_H__
 
 #include "RRC/NR/nr_rrc_defs.h"
-#include "NR_RRCReconfiguration.h"
-#include "NR_UE-NR-Capability.h"
-#include "NR_UE-CapabilityRAT-ContainerList.h"
-#include "LTE_UE-CapabilityRAT-ContainerList.h"
 #include "NR_CG-Config.h"
 #include "NR_CG-ConfigInfo.h"
-#include "NR_SecurityConfig.h"
-#include "NR_CellGroupConfig.h"
+#include "NR_RRCReconfiguration.h"
 
 #define NR_MAX_SUPPORTED_DL_LAYERS 4
 
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 87c05e134d..5a7f0099aa 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -30,79 +30,70 @@
 #define RRC_GNB_C
 #define RRC_GNB_C
 
-#include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
+#include <netinet/sctp.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
-
-#include "nr_rrc_config.h"
-#include "nr_rrc_defs.h"
-#include "nr_rrc_extern.h"
-#include "assertions.h"
-#include "common/ran_context.h"
-#include "oai_asn1.h"
-#include "rrc_gNB_radio_bearers.h"
-
-#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#include "LAYER2/NR_MAC_gNB/mac_proto.h"
-#include "common/utils/LOG/log.h"
+#include "openair2/RRC/NR/nr_rrc_proto.h"
+#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
+#include "openair3/SECU/key_nas_deriver.h"
+#include "openair3/ocp-gtpu/gtp_itf.h"
+#include "BIT_STRING.h"
+#include "F1AP_CauseProtocol.h"
+#include "F1AP_CauseRadioNetwork.h"
+#include "NGAP_CauseRadioNetwork.h"
+#include "openair2/LAYER2/NR_MAC_COMMON/nr_mac.h"
+#include "OCTET_STRING.h"
+#include "PHY/defs_common.h"
 #include "RRC/NR/MESSAGES/asn1_msg.h"
-#include "openair2/E1AP/e1ap_asnc.h"
-
-#include "NR_BCCH-BCH-Message.h"
-#include "NR_UL-DCCH-Message.h"
-#include "NR_DL-DCCH-Message.h"
-#include "NR_DL-CCCH-Message.h"
-#include "NR_UL-CCCH-Message.h"
-#include "NR_RRCReject.h"
-#include "NR_RejectWaitTime.h"
-#include "NR_RRCSetup.h"
-
-#include "NR_CellGroupConfig.h"
-#include "NR_MeasResults.h"
-#include "NR_UL-CCCH-Message.h"
-#include "NR_RRCSetupRequest-IEs.h"
-#include "NR_RRCSetupComplete-IEs.h"
-#include "NR_RRCReestablishmentRequest-IEs.h"
-#include "NR_MIB.h"
-#include "uper_encoder.h"
-#include "uper_decoder.h"
-
-#include "common/platform_types.h"
-#include "common/utils/LOG/vcd_signal_dumper.h"
-
+#include "RRC/NR/mac_rrc_dl.h"
+#include "RRC/NR/nr_rrc_common.h"
+#include "SIMULATION/TOOLS/sim.h"
 #include "T.h"
-
-#include "openair3/SECU/secu_defs.h"
-
-#include "rrc_gNB_NGAP.h"
-#include "rrc_gNB_du.h"
-#include "rrc_gNB_mobility.h"
-
-#include "rrc_gNB_GTPV1U.h"
-
+#include "asn_codecs.h"
+#include "asn_internal.h"
+#include "assertions.h"
+#include "byte_array.h"
+#include "common/ngran_types.h"
+#include "common/openairinterface5g_limits.h"
+#include "common/platform_constants.h"
+#include "common/ran_context.h"
+#include "common_lib.h"
+#include "constr_SEQUENCE.h"
+#include "constr_TYPE.h"
+#include "cucp_cuup_if.h"
+#include "e1ap_messages_types.h"
+#include "executables/softmodem-common.h"
+#include "f1ap_messages_types.h"
+#include "gtpv1_u_messages_types.h"
+#include "intertask_interface.h"
+#include "linear_alloc.h"
+#include "ngap_messages_types.h"
 #include "nr_pdcp/nr_pdcp_entity.h"
 #include "nr_pdcp/nr_pdcp_oai_api.h"
-
-#include "intertask_interface.h"
-#include "SIMULATION/TOOLS/sim.h" // for taus
-
-#include "executables/softmodem-common.h"
-#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
-#include <openair2/X2AP/x2ap_eNB.h>
-#include <openair3/SECU/key_nas_deriver.h>
-#include <openair3/ocp-gtpu/gtp_itf.h>
-#include <openair2/RRC/NR/nr_rrc_proto.h>
+#include "nr_rrc_defs.h"
+#include "nr_rrc_extern.h"
+#include "oai_asn1.h"
 #include "openair2/F1AP/f1ap_common.h"
 #include "openair2/F1AP/f1ap_ids.h"
 #include "openair2/F1AP/lib/f1ap_lib_extern.h"
-#include "openair2/SDAP/nr_sdap/nr_sdap_entity.h"
-#include "openair2/E1AP/e1ap.h"
-#include "cucp_cuup_if.h"
 #include "lib/f1ap_interface_management.h"
-
-#include "BIT_STRING.h"
-#include "assertions.h"
+#include "rrc_gNB_NGAP.h"
+#include "rrc_gNB_du.h"
+#include "rrc_gNB_mobility.h"
+#include "rrc_gNB_radio_bearers.h"
+#include "rrc_messages_types.h"
+#include "seq_arr.h"
+#include "tree.h"
+#include "uper_decoder.h"
+#include "uper_encoder.h"
+#include "utils.h"
+#include "x2ap_messages_types.h"
+#include "xer_encoder.h"
 
 #ifdef E2_AGENT
 #include "openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h"
diff --git a/openair2/RRC/NR/rrc_gNB_GTPV1U.c b/openair2/RRC/NR/rrc_gNB_GTPV1U.c
index e5412778bc..6bf64a27a9 100644
--- a/openair2/RRC/NR/rrc_gNB_GTPV1U.c
+++ b/openair2/RRC/NR/rrc_gNB_GTPV1U.c
@@ -27,20 +27,14 @@
  * \email: lionel.gauthier@eurecom.fr, panagiotis.matzakos@eurecom.fr
  */
 
-# include "rrc_defs.h"
-# include "rrc_extern.h"
-# include "RRC/LTE/MESSAGES/asn1_msg.h"
-# include "rrc_eNB_GTPV1U.h"
-# include "rrc_eNB_UE_context.h"
-# include "openair2/RRC/NR/rrc_gNB_UE_context.h"
-
-//# if defined(ENABLE_ITTI)
-#   include "oai_asn1.h"
-#   include "intertask_interface.h"
-//#endif
-
-# include "common/ran_context.h"
 #include "openair2/RRC/NR/rrc_gNB_GTPV1U.h"
+#include "LOG/log.h"
+#include "RRC/NR/nr_rrc_defs.h"
+#include "common/ran_context.h"
+#include "openair2/RRC/NR/rrc_gNB_UE_context.h"
+#include "rrc_defs.h"
+#include "rrc_eNB_GTPV1U.h"
+#include "s1ap_messages_types.h"
 
 extern RAN_CONTEXT_t RC;
 
diff --git a/openair2/RRC/NR/rrc_gNB_GTPV1U.h b/openair2/RRC/NR/rrc_gNB_GTPV1U.h
index 85ad11105e..60a6c0c5b5 100644
--- a/openair2/RRC/NR/rrc_gNB_GTPV1U.h
+++ b/openair2/RRC/NR/rrc_gNB_GTPV1U.h
@@ -30,6 +30,10 @@
 #ifndef RRC_GNB_GTPV1U_H_
 #define RRC_GNB_GTPV1U_H_
 
+#include <stdint.h>
+#include "openair2/RRC/NR/nr_rrc_defs.h"
+#include "gtpv1_u_messages_types.h"
+
 int rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(gNB_RRC_UE_t *ue,
                                               const gtpv1u_enb_create_tunnel_resp_t *const create_tunnel_resp_pP,
                                               uint8_t *inde_list);
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index cd47fbc8bc..c2a641db32 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -29,57 +29,64 @@
  */
 
 #include "rrc_gNB_NGAP.h"
-#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#include "rrc_eNB_S1AP.h"
-#include "gnb_config.h"
-#include "openair2/LAYER2/NR_MAC_COMMON/nr_mac.h"
-#include "common/ran_context.h"
-
-#include "oai_asn1.h"
-#include "intertask_interface.h"
-#include "nr_pdcp/nr_pdcp_oai_api.h"
-#include "pdcp_primitives.h"
-#include "SDAP/nr_sdap/nr_sdap.h"
-
-#include "openair3/ocp-gtpu/gtp_itf.h"
+#include <netinet/in.h>
+#include <netinet/sctp.h>
 #include <openair3/ocp-gtpu/gtp_itf.h>
-#include "RRC/LTE/rrc_eNB_GTPV1U.h"
-#include "RRC/NR/rrc_gNB_GTPV1U.h"
-
-#include "S1AP_NAS-PDU.h"
-#include "executables/softmodem-common.h"
-#include "openair3/SECU/key_nas_deriver.h"
-
-#include "ngap_gNB_defs.h"
-#include "ngap_gNB_ue_context.h"
-#include "ngap_gNB_management_procedures.h"
-#include "NR_ULInformationTransfer.h"
-#include "RRC/NR/MESSAGES/asn1_msg.h"
-#include "NR_UERadioAccessCapabilityInformation.h"
-#include "NR_UE-CapabilityRAT-ContainerList.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "E1AP_ConfidentialityProtectionIndication.h"
+#include "E1AP_IntegrityProtectionIndication.h"
 #include "NGAP_CauseRadioNetwork.h"
-#include "f1ap_messages_types.h"
-#include "openair2/F1AP/f1ap_ids.h"
-#include "openair2/E1AP/e1ap_asnc.h"
-#include "openair2/E1AP/e1ap.h"
-#include "NGAP_asn_constant.h"
-#include "NGAP_PDUSessionResourceSetupRequestTransfer.h"
-#include "NGAP_PDUSessionResourceModifyRequestTransfer.h"
-#include "NGAP_ProtocolIE-Field.h"
-#include "NGAP_GTPTunnel.h"
-#include "NGAP_QosFlowSetupRequestItem.h"
-#include "NGAP_QosFlowAddOrModifyRequestItem.h"
-#include "NGAP_NonDynamic5QIDescriptor.h"
 #include "NGAP_Dynamic5QIDescriptor.h"
-#include "conversions.h"
+#include "NGAP_GTPTunnel.h"
+#include "NGAP_NonDynamic5QIDescriptor.h"
+#include "NGAP_PDUSessionResourceModifyRequestTransfer.h"
+#include "NGAP_PDUSessionResourceSetupRequestTransfer.h"
+#include "NGAP_QosFlowAddOrModifyRequestItem.h"
+#include "NGAP_QosFlowSetupRequestItem.h"
+#include "NGAP_asn_constant.h"
+#include "NGAP_ProtocolIE-Field.h"
+#include "NR_UE-NR-Capability.h"
+#include "NR_UERadioAccessCapabilityInformation.h"
+#include "MAC/mac.h"
+#include "OCTET_STRING.h"
+#include "PHY/defs_common.h"
+#include "RRC/NR/MESSAGES/asn1_msg.h"
+#include "RRC/NR/nr_rrc_common.h"
+#include "RRC/NR/nr_rrc_defs.h"
+#include "RRC/NR/nr_rrc_proto.h"
+#include "RRC/NR/rrc_gNB_UE_context.h"
 #include "RRC/NR/rrc_gNB_radio_bearers.h"
+#include "openair2/LAYER2/NR_MAC_COMMON/nr_mac.h"
+#include "T.h"
+#include "aper_decoder.h"
+#include "asn_codecs.h"
+#include "assertions.h"
+#include "common/ngran_types.h"
+#include "common/platform_constants.h"
+#include "common/ran_context.h"
+#include "common/utils/T/T.h"
+#include "constr_TYPE.h"
+#include "conversions.h"
+#include "e1ap_messages_types.h"
+#include "f1ap_messages_types.h"
+#include "gtpv1_u_messages_types.h"
+#include "intertask_interface.h"
+#include "nr_pdcp/nr_pdcp_entity.h"
+#include "nr_pdcp/nr_pdcp_oai_api.h"
+#include "oai_asn1.h"
+#include "openair2/F1AP/f1ap_ids.h"
+#include "openair3/SECU/key_nas_deriver.h"
+#include "rrc_messages_types.h"
+#include "s1ap_messages_types.h"
+#include "uper_encoder.h"
 
 #ifdef E2_AGENT
 #include "openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_extern.h"
 #endif
 
-#include "uper_encoder.h"
-
 extern RAN_CONTEXT_t RC;
 
 /* Masks for NGAP Encryption algorithms, NEA0 is always supported (not coded) */
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.h b/openair2/RRC/NR/rrc_gNB_NGAP.h
index 9d83f28c3c..235a175954 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.h
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.h
@@ -31,14 +31,14 @@
 #ifndef RRC_GNB_NGAP_H_
 #define RRC_GNB_NGAP_H_
 
-#include "rrc_gNB_UE_context.h"
-#include "nr_rrc_defs.h"
-#include "nr_rrc_extern.h"
-
+#include <assertions.h>
+#include <stdint.h>
 #include "NR_RRCSetupComplete-IEs.h"
-#include "NR_RegisteredAMF.h"
+#include "NR_UECapabilityInformation.h"
 #include "NR_UL-DCCH-Message.h"
-#include "NGAP_CauseRadioNetwork.h"
+#include "intertask_interface.h"
+#include "ngap_messages_types.h"
+#include "nr_rrc_defs.h"
 
 void rrc_gNB_send_NGAP_NAS_FIRST_REQ(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE, NR_RRCSetupComplete_IEs_t *rrcSetupComplete);
 
diff --git a/openair2/RRC/NR/rrc_gNB_UE_context.c b/openair2/RRC/NR/rrc_gNB_UE_context.c
index 15f644955d..eae5c0706e 100644
--- a/openair2/RRC/NR/rrc_gNB_UE_context.c
+++ b/openair2/RRC/NR/rrc_gNB_UE_context.c
@@ -28,15 +28,18 @@
  * \email: lionel.gauthier@eurecom.fr
  */
 
+#include "rrc_gNB_UE_context.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <limits.h>
 #include <time.h>
-
+#include "RRC/NR/nr_rrc_defs.h"
+#include "T.h"
+#include "assertions.h"
+#include "common/platform_constants.h"
 #include "common/utils/LOG/log.h"
-#include "rrc_gNB_UE_context.h"
+#include "linear_alloc.h"
 #include "openair2/F1AP/f1ap_ids.h"
+#include "tree.h"
 
 static void rrc_gNB_ue_context_update_time(rrc_gNB_ue_context_t *ctxt)
 {
diff --git a/openair2/RRC/NR/rrc_gNB_UE_context.h b/openair2/RRC/NR/rrc_gNB_UE_context.h
index 37d71f9c29..9485672463 100644
--- a/openair2/RRC/NR/rrc_gNB_UE_context.h
+++ b/openair2/RRC/NR/rrc_gNB_UE_context.h
@@ -30,8 +30,11 @@
 #ifndef __RRC_GNB_UE_CONTEXT_H__
 #define __RRC_GNB_UE_CONTEXT_H__
 
+#include <common/utils/assertions.h>
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include <stdint.h>
 #include "collection/tree.h"
-#include "common/platform_types.h"
 #include "nr_rrc_defs.h"
 
 int rrc_gNB_compare_ue_rnti_id(rrc_gNB_ue_context_t* c1_pP, rrc_gNB_ue_context_t* c2_pP);
diff --git a/openair2/RRC/NR/rrc_gNB_cuup.c b/openair2/RRC/NR/rrc_gNB_cuup.c
index 729f5f28b4..621ebca56e 100644
--- a/openair2/RRC/NR/rrc_gNB_cuup.c
+++ b/openair2/RRC/NR/rrc_gNB_cuup.c
@@ -19,9 +19,24 @@
  *      contact@openairinterface.org
  */
 
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include "PHY/defs_common.h"
+#include "RRC/NR/nr_rrc_proto.h"
+#include "T.h"
+#include "as_message.h"
+#include "assertions.h"
 #include "common/ran_context.h"
+#include "common/utils/T/T.h"
+#include "e1ap_messages_types.h"
+#include "intertask_interface.h"
 #include "nr_rrc_defs.h"
 #include "openair2/F1AP/f1ap_ids.h"
+#include "rrc_messages_types.h"
+#include "tree.h"
 
 static int cuup_compare(const nr_rrc_cuup_container_t *a, const nr_rrc_cuup_container_t *b)
 {
diff --git a/openair2/RRC/NR/rrc_gNB_du.c b/openair2/RRC/NR/rrc_gNB_du.c
index 98cdb313df..639c279d4d 100644
--- a/openair2/RRC/NR/rrc_gNB_du.c
+++ b/openair2/RRC/NR/rrc_gNB_du.c
@@ -20,17 +20,37 @@
  */
 
 #include "rrc_gNB_du.h"
-#include "rrc_gNB_NGAP.h"
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include "F1AP_CauseMisc.h"
+#include "F1AP_CauseProtocol.h"
+#include "F1AP_CauseRadioNetwork.h"
+#include "PHY/defs_common.h"
+#include "T.h"
+#include "asn_codecs.h"
+#include "assertions.h"
 #include "common/ran_context.h"
+#include "common/utils/T/T.h"
+#include "common/utils/alg/foreach.h"
+#include "common/utils/ds/seq_arr.h"
+#include "constr_TYPE.h"
+#include "executables/softmodem-common.h"
+#include "f1ap_messages_types.h"
+#include "ngap_messages_types.h"
 #include "nr_rrc_defs.h"
-#include "rrc_gNB_UE_context.h"
 #include "rrc_gNB_mobility.h"
 #include "openair2/F1AP/f1ap_common.h"
 #include "openair2/F1AP/f1ap_ids.h"
-#include "executables/softmodem-common.h"
-#include "common/utils/ds/seq_arr.h"
-#include "common/utils/alg/foreach.h"
 #include "lib/f1ap_interface_management.h"
+#include "rrc_gNB_NGAP.h"
+#include "rrc_gNB_UE_context.h"
+#include "rrc_messages_types.h"
+#include "s1ap_messages_types.h"
+#include "tree.h"
+#include "uper_decoder.h"
+#include "utils.h"
+#include "xer_encoder.h"
 
 int get_dl_band(const struct f1ap_served_cell_info_t *cell_info)
 {
diff --git a/openair2/RRC/NR/rrc_gNB_du.h b/openair2/RRC/NR/rrc_gNB_du.h
index bd3c4f6443..aadac0845a 100644
--- a/openair2/RRC/NR/rrc_gNB_du.h
+++ b/openair2/RRC/NR/rrc_gNB_du.h
@@ -26,7 +26,6 @@
 #include <netinet/sctp.h>
 #include <stdint.h>
 #include <stdio.h>
-
 struct f1ap_setup_req_s;
 struct f1ap_lost_connection_t;
 struct gNB_RRC_INST_s;
diff --git a/openair2/RRC/NR/rrc_gNB_internode.c b/openair2/RRC/NR/rrc_gNB_internode.c
index 6b001e16fd..4fbca5f8f0 100644
--- a/openair2/RRC/NR/rrc_gNB_internode.c
+++ b/openair2/RRC/NR/rrc_gNB_internode.c
@@ -30,16 +30,22 @@
 #ifndef RRC_GNB_INTERNODE_C
 #define RRC_GNB_INTERNODE_C
 
-#include "nr_rrc_defs.h"
-#include "NR_RRCReconfiguration.h"
-#include "NR_UE-NR-Capability.h"
-#include "NR_CG-ConfigInfo.h"
-#include "NR_UE-CapabilityRAT-ContainerList.h"
-#include "LTE_UE-CapabilityRAT-ContainerList.h"
-#include "NR_CG-Config.h"
-#include "uper_encoder.h"
-#include "uper_decoder.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "OCTET_STRING.h"
+#include "PHY/defs_common.h"
+#include "RRC/NR/nr_rrc_proto.h"
+#include "T.h"
+#include "asn_codecs.h"
+#include "assertions.h"
+#include "common/utils/T/T.h"
+#include "constr_TYPE.h"
 #include "executables/softmodem-common.h"
+#include "nr_rrc_defs.h"
+#include "uper_decoder.h"
+#include "uper_encoder.h"
+#include "x2ap_messages_types.h"
 
 int parse_CG_ConfigInfo(gNB_RRC_INST *rrc, NR_CG_ConfigInfo_t *CG_ConfigInfo, x2ap_ENDC_sgnb_addition_req_t *m) {
   if (CG_ConfigInfo->criticalExtensions.present == NR_CG_ConfigInfo__criticalExtensions_PR_c1) {
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index 73509f6d72..bae7c45180 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -28,30 +28,49 @@
  * \email: raymond.knopp@eurecom.fr
  */
 
+#include <assert.h>
+#include <assertions.h>
+#include <openair2/RRC/NR/nr_rrc_proto.h>
+#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
+#include <openair3/ocp-gtpu/gtp_itf.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MESSAGES/asn1_msg.h"
+#include "OCTET_STRING.h"
+#include "PHY/defs_common.h"
+#include "RRC/NR/nr_rrc_config.h"
+#include "T.h"
+#include "asn_codecs.h"
+#include "asn_internal.h"
+#include "assertions.h"
+#include "common/ngran_types.h"
+#include "common/ran_context.h"
+#include "common/utils/T/T.h"
+#include "constr_TYPE.h"
+#include "executables/nr-softmodem.h"
+#include "executables/softmodem-common.h"
+#include "gtpv1_u_messages_types.h"
+#include "intertask_interface.h"
+#include "ngap_messages_types.h"
+#include "nr_pdcp/nr_pdcp_entity.h"
+#include "nr_pdcp/nr_pdcp_oai_api.h"
 #include "nr_rrc_defs.h"
-#include "NR_RRCReconfiguration.h"
-#include "NR_UE-NR-Capability.h"
-//#include "NR_UE-CapabilityRAT-ContainerList.h"
-#include "LTE_UE-CapabilityRAT-ContainerList.h"
-#include "NR_CellGroupConfig.h"
-#include "NR_CG-Config.h"
-//#include "NR_SRB-ToAddModList.h"
-#include "uper_encoder.h"
-#include "uper_decoder.h"
+#include "openair2/F1AP/f1ap_ids.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h"
 #include "openair2/RRC/NR/rrc_gNB_GTPV1U.h"
-#include "openair2/F1AP/f1ap_ids.h"
-#include "executables/softmodem-common.h"
-#include "executables/nr-softmodem.h"
-#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
-#include <openair3/ocp-gtpu/gtp_itf.h>
-#include "openair3/SECU/secu_defs.h"
 #include "openair3/SECU/key_nas_deriver.h"
-
-#include <openair2/RRC/NR/nr_rrc_proto.h>
-#include "nr_pdcp/nr_pdcp_oai_api.h"
-#include "MESSAGES/asn1_msg.h"
+#include "rlc.h"
+#include "s1ap_messages_types.h"
+#include "tree.h"
+#include "uper_decoder.h"
+#include "uper_encoder.h"
+#include "x2ap_messages_types.h"
+#include "xer_decoder.h"
+#include "xer_encoder.h"
 
 void rrc_parse_ue_capabilities(gNB_RRC_INST *rrc, NR_UE_CapabilityRAT_ContainerList_t *UE_CapabilityRAT_ContainerList, x2ap_ENDC_sgnb_addition_req_t *m, NR_CG_ConfigInfo_IEs_t *cg_config_info)
 {
diff --git a/openair2/RRC/NR/rrc_gNB_radio_bearers.c b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
index aec7865a1c..ce6eb40bbe 100644
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.c
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
@@ -20,8 +20,17 @@
  */
 
 #include "rrc_gNB_radio_bearers.h"
+#include <stddef.h>
+#include "E1AP_RLC-Mode.h"
+#include "PHY/defs_common.h"
+#include "RRC/NR/nr_rrc_defs.h"
+#include "T.h"
+#include "asn_internal.h"
+#include "assertions.h"
+#include "common/platform_constants.h"
+#include "common/utils/T/T.h"
+#include "ngap_messages_types.h"
 #include "oai_asn1.h"
-#include "openair2/E1AP/e1ap.h"
 
 rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create)
 {
diff --git a/openair2/RRC/NR/rrc_gNB_radio_bearers.h b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
index 29fead6bea..37ddbdd431 100644
--- a/openair2/RRC/NR/rrc_gNB_radio_bearers.h
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
@@ -22,12 +22,11 @@
 #ifndef _RRC_GNB_DRBS_H_
 #define _RRC_GNB_DRBS_H_
 
-#include "nr_rrc_defs.h"
-#include "NR_SDAP-Config.h"
+#include <stdbool.h>
+#include <stdint.h>
 #include "NR_DRB-ToAddMod.h"
-#include "NR_SRB-ToAddMod.h"
-
-#include "common/platform_constants.h"
+#include "e1ap_messages_types.h"
+#include "nr_rrc_defs.h"
 
 #define DRB_ACTIVE_NONGBR       (2)   /* DRB is used for Non-GBR Flows */
 #define DRB_ACTIVE              (1)
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index d8e9593e08..1f94e21d6c 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -30,24 +30,15 @@
 #ifndef RRC_GNB_NSA_C
 #define RRC_GNB_NSA_C
 
-#include "NR_ServingCellConfigCommon.h"
-#include "NR_ServingCellConfig.h"
-#include "NR_RRCReconfiguration.h"
-#include "NR_RRCReconfiguration-IEs.h"
-#include "NR_CellGroupConfig.h"
-#include "NR_MAC-CellGroupConfig.h"
-#include "NR_BSR-Config.h"
-#include "NR_PDSCH-ServingCellConfig.h"
-#include "NR_RLC-BearerConfig.h"
-#include "BOOLEAN.h"
-#include "uper_encoder.h"
+#include <stdlib.h>
+
+#include "OCTET_STRING.h"
+#include "RRC/NR/nr_rrc_proto.h"
+#include "asn_codecs.h"
 #include "assertions.h"
+#include "constr_TYPE.h"
 #include "oai_asn1.h"
-#include "common/utils/nr/nr_common.h"
-#include "executables/softmodem-common.h"
-#include "LAYER2/nr_rlc/nr_rlc_oai_api.h"
-#include "nr_rrc_config.h"
-#include "MESSAGES/asn1_msg.h"
+#include "uper_encoder.h"
 
 NR_RRCReconfiguration_IEs_t *get_default_reconfig(const NR_CellGroupConfig_t *secondaryCellGroup)
 {
diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c
index 53364b0768..675d8988a4 100644
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
@@ -47,6 +47,7 @@
 
 #include "rrc_defs.h"
 #include "rrc_proto.h"
+#include "openair2/RRC/LTE/rrc_defs.h"
 #include "L2_interface_ue.h"
 #include "LAYER2/NR_MAC_UE/mac_proto.h"
 
diff --git a/openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.c b/openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
index 2872ba3d5e..aa19cae2e4 100644
--- a/openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
+++ b/openair3/NAS/COMMON/ESM/MSG/PduSessionEstablishmentAccept.c
@@ -19,6 +19,7 @@
  *      contact@openairinterface.org
  */
 
+#include <netinet/in.h>
 #include "PduSessionEstablishmentAccept.h"
 #include "common/utils/LOG/log.h"
 #include "nr_nas_msg.h"