diff --git a/openair2/LAYER2/nr_rlc/CMakeLists.txt b/openair2/LAYER2/nr_rlc/CMakeLists.txt
index 953822df10..7473b1d493 100644
--- a/openair2/LAYER2/nr_rlc/CMakeLists.txt
+++ b/openair2/LAYER2/nr_rlc/CMakeLists.txt
@@ -7,14 +7,14 @@ add_library(nr_rlc_core OBJECT
             nr_rlc_sdu.c
             nr_rlc_rx_manager.c)
 target_include_directories(nr_rlc_core PRIVATE ../../..)
-target_link_libraries(nr_rlc_core PRIVATE ${T_LIB})
+target_link_libraries(nr_rlc_core PRIVATE log_headers)
 add_library(nr_rlc STATIC
             asn1_utils.c
             nr_rlc_oai_api.c
             nr_rlc_ue_manager.c
 )
 # L2_NR: for PDCP
-target_link_libraries(nr_rlc PUBLIC pthread f1ap nr_rlc_core UTIL ${T_LIB})
+target_link_libraries(nr_rlc PUBLIC pthread f1ap nr_rlc_core log_headers)
 target_include_directories(nr_rlc PRIVATE ../../..)
 target_link_libraries(nr_rlc PRIVATE asn1_lte_rrc asn1_nr_rrc)
 
diff --git a/openair2/LAYER2/nr_rlc/tests/CMakeLists.txt b/openair2/LAYER2/nr_rlc/tests/CMakeLists.txt
index c8d365ddf9..68d001ab94 100644
--- a/openair2/LAYER2/nr_rlc/tests/CMakeLists.txt
+++ b/openair2/LAYER2/nr_rlc/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 foreach(TESTNUM RANGE 1 17)
   add_executable(nr_rlc_test_${TESTNUM} test.c)
-  target_link_libraries(nr_rlc_test_${TESTNUM} PRIVATE nr_rlc_core pthread UTIL ${T_LIB} minimal_lib)
+  target_link_libraries(nr_rlc_test_${TESTNUM} PRIVATE nr_rlc_core pthread utils minimal_lib)
   target_compile_definitions(nr_rlc_test_${TESTNUM} PRIVATE TEST="test${TESTNUM}.h")
   #target_include_directories(nr_rlc_test_${TESTNUM} PRIVATE LOG)
   #target_compile_options(nr_rlc_test_${TESTNUM} PRIVATE -g --coverage -Wall)