diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index ecf361df91..385dd5bc2d 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -29,15 +29,13 @@
  */
 
 #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/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"
@@ -48,10 +46,11 @@
 #include "constr_TYPE.h"
 #include "executables/softmodem-common.h"
 #include "oai_asn1.h"
-#include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "openair3/UTILS/conversions.h"
+
+#include "NR_MeasurementTimingConfiguration.h"
 #include "uper_decoder.h"
 #include "uper_encoder.h"
 #include "utils.h"