diff --git a/CMakeLists.txt b/CMakeLists.txt
index bae1c590bc..ccc5e55d43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1136,6 +1136,7 @@ set(L2_SRC
   ${RRC_DIR}/rrc_eNB_M2AP.c
   ${RRC_DIR}/rrc_eNB_UE_context.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
+  ${RRC_DIR}/rrc_eNB_GTPV1U.c
   ${RRC_DIR}/rrc_common.c
   ${RRC_DIR}/L2_interface.c
   ${RRC_DIR}/L2_interface_common.c
@@ -1382,7 +1383,6 @@ include_directories("${OPENAIR1_DIR}/SCHED_NR_UE")
 ##########################
 
 add_library (GTPV1U
-  ${RRC_DIR}/rrc_eNB_GTPV1U.c
   ${OPENAIR3_DIR}/ocp-gtpu/gtp_itf.cpp
   ${OPENAIR3_DIR}/ocp-gtpu/gtpu_extensions.c
   )