From 9df009cf66d68171f18175f63d9f4273bf6249fb Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Mon, 14 Apr 2025 18:22:39 +0200
Subject: [PATCH] remove rrc_gNB_radio_bearers.h dependency in nr_pdcp_entity.h

---
 openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.c | 1 +
 openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h              | 4 ++--
 openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h          | 2 +-
 openair2/RRC/NR/nr_rrc_common.h                       | 1 -
 openair3/ocp-gtpu/gtp_itf.h                           | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.c b/openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.c
index 21b2e0f41c..3583661475 100644
--- a/openair2/E2AP/RAN_FUNCTION/CUSTOMIZED/ran_func_pdcp.c
+++ b/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)
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
index b5de4c2b44..f05ba07b02 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
+++ b/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,
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h b/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h
index 9899b0cf56..a30016f5dc 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h
+++ b/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;
diff --git a/openair2/RRC/NR/nr_rrc_common.h b/openair2/RRC/NR/nr_rrc_common.h
index f3bc3681a9..99a64f5c81 100644
--- a/openair2/RRC/NR/nr_rrc_common.h
+++ b/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,
diff --git a/openair3/ocp-gtpu/gtp_itf.h b/openair3/ocp-gtpu/gtp_itf.h
index f3f336dc2c..d5226bb972 100644
--- a/openair3/ocp-gtpu/gtp_itf.h
+++ b/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" {