remove rrc_gNB_radio_bearers.h dependency in nr_pdcp_entity.h

openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.c

@@ -25,6 +25,7 @@
 
 #include "ran_func_pdcp.h"
 #include "common/ran_context.h"
+#include "common/openairinterface5g_limits.h"
 #include "openair2/E2AP/flexric/src/util/time_now_us.h"
 
 #if defined (NGRAN_GNB_DU)

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h

@@ -25,9 +25,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "common/platform_types.h"
-
 #include "nr_pdcp_sdu.h"
-#include "openair2/RRC/NR/rrc_gNB_radio_bearers.h"
 #include "openair3/SECU/secu_defs.h"
 
 /* PDCP Formats according to clause 6.2 of 3GPP TS 38.323 */
@@ -41,6 +39,8 @@
 #define LONG_PDCP_HEADER_SIZE 3
 /* MAC-I size (unit: byte) */
 #define PDCP_INTEGRITY_SIZE 4
+/* K keys have 128 bits length */
+#define NR_K_KEY_SIZE 16
 
 typedef enum {
   NR_PDCP_DRB_AM,

openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h

@@ -23,7 +23,7 @@
 #define _NR_PDCP_UE_MANAGER_H_
 
 #include "nr_pdcp_entity.h"
-
+#include "common/platform_constants.h"
 #include "common/platform_types.h"
 
 typedef void nr_pdcp_ue_manager_t;

openair2/RRC/NR/nr_rrc_common.h

@@ -25,7 +25,6 @@
 #include <stdint.h> 
 
 #define NR_NUM_SRB 4 /* Number of Signalling Radio Bearers according to clause 4.2.2 of 3GPP TS 38.331 */
-#define NR_K_KEY_SIZE 16 /* K keys have 128 bits length */
 
 typedef enum UE_STATE_NR_e {
   NR_RRC_INACTIVE=0,

openair3/ocp-gtpu/gtp_itf.h

@@ -5,6 +5,7 @@
 
 # define GTPU_HEADER_OVERHEAD_MAX 64
 
+#include "openair2/COMMON/gtpv1_u_messages_types.h"
 #include "common/utils/hashtable/hashtable.h"
 #ifdef __cplusplus
 extern "C" {