diff --git a/common/utils/telnetsrv/CMakeLists.txt b/common/utils/telnetsrv/CMakeLists.txt
index 1a740adbe2..a249596d97 100644
--- a/common/utils/telnetsrv/CMakeLists.txt
+++ b/common/utils/telnetsrv/CMakeLists.txt
@@ -44,7 +44,7 @@ add_library(telnetsrv_enb MODULE
             telnetsrv_enb_phycmd.c
 )
 add_dependencies(telnetsrv telnetsrv_enb)
-target_link_libraries(telnetsrv_enb PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
+target_link_libraries(telnetsrv_enb PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs log_headers)
 
 message(STATUS "No specific telnet functions for gnb")
 
diff --git a/common/utils/time_manager/CMakeLists.txt b/common/utils/time_manager/CMakeLists.txt
index 3a197ae556..37cae023b0 100644
--- a/common/utils/time_manager/CMakeLists.txt
+++ b/common/utils/time_manager/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(time_management_core OBJECT
             time_client.c)
 
 target_link_libraries(time_management PUBLIC time_management_core)
-target_link_libraries(time_management_core PRIVATE ${T_LIB})
+target_link_libraries(time_management_core PRIVATE log_headers)
 
 if(ENABLE_TESTS)
   add_subdirectory(tests)
diff --git a/nfapi/oai_integration/socket/CMakeLists.txt b/nfapi/oai_integration/socket/CMakeLists.txt
index 57cad36362..a909372d37 100644
--- a/nfapi/oai_integration/socket/CMakeLists.txt
+++ b/nfapi/oai_integration/socket/CMakeLists.txt
@@ -8,7 +8,6 @@ target_include_directories(nfapi_socket_lib PRIVATE include/)
 
 target_compile_definitions(nfapi_socket_lib PUBLIC ENABLE_SOCKET)
 target_link_libraries(nfapi_socket_lib PRIVATE NFAPI_LIB NFAPI_USER_LIB)
-target_link_libraries(nfapi_socket_lib PRIVATE LOG)
-add_dependencies(nfapi_socket_lib generate_T)
+target_link_libraries(nfapi_socket_lib PRIVATE log_headers)
 target_link_libraries(nfapi_socket_lib PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 target_link_libraries(nfapi_socket_lib PRIVATE nr_fapi_p5 nr_fapi_p7)
diff --git a/openair2/LAYER2/NR_MAC_UE/CMakeLists.txt b/openair2/LAYER2/NR_MAC_UE/CMakeLists.txt
index aa583c8598..8a7fec829e 100644
--- a/openair2/LAYER2/NR_MAC_UE/CMakeLists.txt
+++ b/openair2/LAYER2/NR_MAC_UE/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_library(nr_ue_power_procedures nr_ue_power_procedures.c)
-target_link_libraries(nr_ue_power_procedures PUBLIC asn1_nr_rrc ${T_LIB} MAC_NR_COMMON nr_common)
+target_link_libraries(nr_ue_power_procedures PUBLIC asn1_nr_rrc log_headers MAC_NR_COMMON nr_common)
 add_library(nr_ue_ra_procedures nr_ra_procedures.c)
-target_link_libraries(nr_ue_ra_procedures PUBLIC asn1_nr_rrc asn1_lte_rrc_hdrs ${T_LIB} MAC_NR_COMMON nr_common)
+target_link_libraries(nr_ue_ra_procedures PUBLIC asn1_nr_rrc asn1_lte_rrc_hdrs log_headers MAC_NR_COMMON nr_common)
 if (ENABLE_TESTS)
   add_subdirectory(tests)
 endif()
diff --git a/openair3/NAS/TOOLS/CMakeLists.txt b/openair3/NAS/TOOLS/CMakeLists.txt
index e57db8255f..50058ad5bc 100755
--- a/openair3/NAS/TOOLS/CMakeLists.txt
+++ b/openair3/NAS/TOOLS/CMakeLists.txt
@@ -13,6 +13,7 @@ add_library(conf2uedata_lib OBJECT
     ${OPENAIR_DIR}/common/utils/mem/memory.c
     ${OPENAIR_DIR}/common/utils/utils.c
 )
+target_link_libraries(conf2uedata_lib PUBLIC log_headers)
 
 add_executable(conf2uedata conf2uedata.c)
 target_link_libraries(conf2uedata PRIVATE conf2uedata_lib)
@@ -28,9 +29,3 @@ add_executable(nvram nvram.c)
 target_link_libraries(nvram PRIVATE conf2uedata_lib)
 set_target_properties(nvram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 target_link_libraries(nvram PRIVATE LOG minimal_lib ${libconfig_LIBRARIES})
-
-if (${T_TRACER})
-  add_dependencies(conf2uedata generate_T)
-  add_dependencies(usim generate_T)
-  add_dependencies(nvram generate_T)
-endif (${T_TRACER})