diff --git a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt
index f96a2cfaca..8c2811e3a1 100644
--- a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt
+++ b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt
@@ -3,8 +3,4 @@ add_library(ldpc_segment OBJECT
   nrLDPC_coding_segment_decoder.c
   nrLDPC_coding_segment_encoder.c
 )
-
-#ensure that the T header files are generated before targets depending on them
-if (${T_TRACER})
-  add_dependencies(ldpc_segment generate_T)
-endif (${T_TRACER})
+target_link_libraries(ldpc_segment PUBLIC log_headers)
diff --git a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt
index 0325858389..0d8f5571cd 100644
--- a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt
+++ b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt
@@ -16,12 +16,7 @@ if (ENABLE_LDPC_XDMA)
   )
   target_include_directories(ldpc_xdma PRIVATE ../nrLDPC_coding_segment)
 
-  #ensure that the T header files are generated before targets depending on them
-  if (${T_TRACER})
-    add_dependencies(ldpc_xdma generate_T)
-  endif (${T_TRACER})
-
-  target_link_libraries(ldpc_xdma PRIVATE ldpc_gen_HEADERS)
+  target_link_libraries(ldpc_xdma PRIVATE ldpc_gen_HEADERS log_headers)
   set_target_properties(ldpc_xdma PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
   add_dependencies(nr-softmodem ldpc_xdma)