diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 8e1591ac1e..6ee93b792a 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -756,86 +756,6 @@ rrc_gNB_generate_defaultRRCReconfiguration(
   }
 }
 
-NR_DRB_ToAddMod_t *generateDRB(const pdu_session_param_t *pduSession,
-                               long drb_id,
-                               bool enable_sdap,
-                               int do_drb_integrity,
-                               int do_drb_ciphering)
-{
-  NR_DRB_ToAddMod_t *DRB_config  = NULL;
-  NR_SDAP_Config_t  *SDAP_config = NULL;
-
-  DRB_config = CALLOC(1, sizeof(*DRB_config));
-  DRB_config->drb_Identity = drb_id;
-  DRB_config->cnAssociation = CALLOC(1, sizeof(*DRB_config->cnAssociation));
-  DRB_config->cnAssociation->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
-  
-  /* SDAP Configuration */
-  SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
-  memset(SDAP_config, 0, sizeof(NR_SDAP_Config_t));
-  SDAP_config->mappedQoS_FlowsToAdd = calloc(1, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
-  memset(SDAP_config->mappedQoS_FlowsToAdd, 0, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
-  
-  SDAP_config->pdu_Session = pduSession->param.pdusession_id;
-  
-  if (enable_sdap) {
-    SDAP_config->sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_present;
-    SDAP_config->sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_present;
-  } else {
-    SDAP_config->sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_absent;
-    SDAP_config->sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_absent;
-  }
-  
-  SDAP_config->defaultDRB = true;
-  
-  for (int qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++) 
-  {
-    NR_QFI_t *qfi = calloc(1, sizeof(NR_QFI_t));
-    *qfi = pduSession->param.qos[qos_flow_index].qfi;
-    ASN_SEQUENCE_ADD(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi);
-  }
-  
-  SDAP_config->mappedQoS_FlowsToRelease = NULL;
-  DRB_config->cnAssociation->choice.sdap_Config = SDAP_config;
-  
-  /* PDCP Configuration */
-  DRB_config->reestablishPDCP  = NULL;
-  DRB_config->recoverPDCP      = NULL;
-  DRB_config->pdcp_Config      = calloc(1, sizeof(*DRB_config->pdcp_Config));
-  DRB_config->pdcp_Config->drb = calloc(1,sizeof(*DRB_config->pdcp_Config->drb));
-
-  DRB_config->pdcp_Config->drb->discardTimer    = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->discardTimer));
-  *DRB_config->pdcp_Config->drb->discardTimer   = NR_PDCP_Config__drb__discardTimer_infinity;
-  DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL  = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL));
-  *DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
-  DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL  = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL));
-  *DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
-
-  DRB_config->pdcp_Config->drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
-  DRB_config->pdcp_Config->drb->headerCompression.choice.notUsed = 0;
-  
-  DRB_config->pdcp_Config->drb->integrityProtection  = NULL;
-  DRB_config->pdcp_Config->drb->statusReportRequired = NULL;
-  DRB_config->pdcp_Config->drb->outOfOrderDelivery   = NULL;
-  DRB_config->pdcp_Config->moreThanOneRLC            = NULL;
-  
-  DRB_config->pdcp_Config->t_Reordering  = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
-  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
-  DRB_config->pdcp_Config->ext1          = NULL;
-  
-  if (do_drb_integrity) {
-    DRB_config->pdcp_Config->drb->integrityProtection = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->integrityProtection));
-    *DRB_config->pdcp_Config->drb->integrityProtection = NR_PDCP_Config__drb__integrityProtection_enabled;
-  }
-  
-  if (!do_drb_ciphering) {
-    DRB_config->pdcp_Config->ext1 = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1));
-    DRB_config->pdcp_Config->ext1->cipheringDisabled = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1->cipheringDisabled));
-    *DRB_config->pdcp_Config->ext1->cipheringDisabled = NR_PDCP_Config__ext1__cipheringDisabled_true;
-  }
-  return DRB_config;
-}
-
 //-----------------------------------------------------------------------------
 void
 rrc_gNB_generate_dedicatedRRCReconfiguration(
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.c b/openair2/RRC/NR/rrc_gNB_drbs.c
index 702216f0a7..196258adef 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.c
+++ b/openair2/RRC/NR/rrc_gNB_drbs.c
@@ -19,4 +19,83 @@
  *      contact@openairinterface.org
  */
 
-#include "rrc_gNB_drbs.h"
\ No newline at end of file
+#include "rrc_gNB_drbs.h"
+
+NR_DRB_ToAddMod_t *generateDRB(const pdu_session_param_t *pduSession,
+                               long drb_id,
+                               bool enable_sdap,
+                               int do_drb_integrity,
+                               int do_drb_ciphering) {
+  NR_DRB_ToAddMod_t *DRB_config  = NULL;
+  NR_SDAP_Config_t  *SDAP_config = NULL;
+
+  DRB_config = CALLOC(1, sizeof(*DRB_config));
+  DRB_config->drb_Identity = drb_id;
+  DRB_config->cnAssociation = CALLOC(1, sizeof(*DRB_config->cnAssociation));
+  DRB_config->cnAssociation->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
+  
+  /* SDAP Configuration */
+  SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
+  memset(SDAP_config, 0, sizeof(NR_SDAP_Config_t));
+  SDAP_config->mappedQoS_FlowsToAdd = calloc(1, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
+  memset(SDAP_config->mappedQoS_FlowsToAdd, 0, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd));
+  
+  SDAP_config->pdu_Session = pduSession->param.pdusession_id;
+  
+  if (enable_sdap) {
+    SDAP_config->sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_present;
+    SDAP_config->sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_present;
+  } else {
+    SDAP_config->sdap_HeaderDL = NR_SDAP_Config__sdap_HeaderDL_absent;
+    SDAP_config->sdap_HeaderUL = NR_SDAP_Config__sdap_HeaderUL_absent;
+  }
+  
+  SDAP_config->defaultDRB = true;
+  
+  for (int qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++) 
+  {
+    NR_QFI_t *qfi = calloc(1, sizeof(NR_QFI_t));
+    *qfi = pduSession->param.qos[qos_flow_index].qfi;
+    ASN_SEQUENCE_ADD(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi);
+  }
+  
+  SDAP_config->mappedQoS_FlowsToRelease = NULL;
+  DRB_config->cnAssociation->choice.sdap_Config = SDAP_config;
+  
+  /* PDCP Configuration */
+  DRB_config->reestablishPDCP  = NULL;
+  DRB_config->recoverPDCP      = NULL;
+  DRB_config->pdcp_Config      = calloc(1, sizeof(*DRB_config->pdcp_Config));
+  DRB_config->pdcp_Config->drb = calloc(1,sizeof(*DRB_config->pdcp_Config->drb));
+
+  DRB_config->pdcp_Config->drb->discardTimer    = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->discardTimer));
+  *DRB_config->pdcp_Config->drb->discardTimer   = NR_PDCP_Config__drb__discardTimer_infinity;
+  DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL  = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL));
+  *DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
+  DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL  = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL));
+  *DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
+
+  DRB_config->pdcp_Config->drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
+  DRB_config->pdcp_Config->drb->headerCompression.choice.notUsed = 0;
+  
+  DRB_config->pdcp_Config->drb->integrityProtection  = NULL;
+  DRB_config->pdcp_Config->drb->statusReportRequired = NULL;
+  DRB_config->pdcp_Config->drb->outOfOrderDelivery   = NULL;
+  DRB_config->pdcp_Config->moreThanOneRLC            = NULL;
+  
+  DRB_config->pdcp_Config->t_Reordering  = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
+  *DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
+  DRB_config->pdcp_Config->ext1          = NULL;
+  
+  if (do_drb_integrity) {
+    DRB_config->pdcp_Config->drb->integrityProtection = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->integrityProtection));
+    *DRB_config->pdcp_Config->drb->integrityProtection = NR_PDCP_Config__drb__integrityProtection_enabled;
+  }
+  
+  if (!do_drb_ciphering) {
+    DRB_config->pdcp_Config->ext1 = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1));
+    DRB_config->pdcp_Config->ext1->cipheringDisabled = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1->cipheringDisabled));
+    *DRB_config->pdcp_Config->ext1->cipheringDisabled = NR_PDCP_Config__ext1__cipheringDisabled_true;
+  }
+  return DRB_config;
+}
\ No newline at end of file
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.h b/openair2/RRC/NR/rrc_gNB_drbs.h
index 16a1276be0..f02d3b78e9 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.h
+++ b/openair2/RRC/NR/rrc_gNB_drbs.h
@@ -19,6 +19,17 @@
  *      contact@openairinterface.org
  */
 
+#ifndef _RRC_GNB_DRBS_H_
+#define _RRC_GNB_DRBS_H_
+
 #include "nr_rrc_defs.h"
 #include "NR_SDAP-Config.h"
-#include "NR_DRB-ToAddMod.h"
\ No newline at end of file
+#include "NR_DRB-ToAddMod.h"
+
+NR_DRB_ToAddMod_t *generateDRB(const pdu_session_param_t *pduSession,
+                               long drb_id,
+                               bool enable_sdap,
+                               int do_drb_integrity,
+                               int do_drb_ciphering);
+
+#endif
\ No newline at end of file