diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in
index 7ff08bced..7ab0ed3a4 100644
--- a/port/daemon/src/Makefile.in
+++ b/port/daemon/src/Makefile.in
@@ -50,6 +50,7 @@ BTdaemon_SOURCES =      \
     bnep.c                      \
     btstack_memory.c            \
     btstack_memory_pool.c       \
+    btstack_tlv.c               \
     btstack_uart_block_posix.c  \
     daemon.c                    \
     gatt_client.c               \
diff --git a/port/ez430-rf2560/Makefile b/port/ez430-rf2560/Makefile
index eae256df4..8a086ac90 100644
--- a/port/ez430-rf2560/Makefile
+++ b/port/ez430-rf2560/Makefile
@@ -48,6 +48,7 @@ CORE   = \
     btstack_run_loop.c		     \
     btstack_run_loop_embedded.c  \
     btstack_util.c			          \
+    btstack_tlv.c             \
 
 COMMON = \
 	ad_parser.c 					   \
diff --git a/port/max32630-fthr/example/template/Makefile b/port/max32630-fthr/example/template/Makefile
index 0ae0d1f2c..c5684c411 100644
--- a/port/max32630-fthr/example/template/Makefile
+++ b/port/max32630-fthr/example/template/Makefile
@@ -143,6 +143,7 @@ COMMON = \
     hci_dump.o                \
     btstack_uart_block_embedded.o \
     hal_flash_bank_mxc.o      \
+    btstack_tlv.o             \
     btstack_tlv_flash_bank.o  \
     btstack_stdin_embedded.o  \
 
diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile
index 21aabc324..5d0866e74 100644
--- a/port/msp-exp430f5438-cc2564b/Makefile
+++ b/port/msp-exp430f5438-cc2564b/Makefile
@@ -39,6 +39,7 @@ CORE   = \
     btstack_memory_pool.c        \
     btstack_run_loop_embedded.c  \
     btstack_run_loop.c		     \
+    btstack_tlv.c             \
     hal_board.c	              \
     hal_compat.c              \
     hal_cpu.c                 \
diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile
index d133288aa..e6c9b4dff 100644
--- a/port/msp430f5229lp-cc2564b/Makefile
+++ b/port/msp430f5229lp-cc2564b/Makefile
@@ -41,6 +41,7 @@ CORE   = \
     btstack_memory_pool.c       \
     btstack_run_loop.c		    \
     btstack_run_loop_embedded.c \
+    btstack_tlv.c             \
     hal_board.c	              \
     hal_compat.c              \
     hal_cpu.c                 \
diff --git a/port/mtk/Makefile b/port/mtk/Makefile
index d8ac4285e..b609fb969 100644
--- a/port/mtk/Makefile
+++ b/port/mtk/Makefile
@@ -29,6 +29,7 @@ libBTstack_OBJS  = 		           \
 	btstack_linked_list.o          \
 	btstack_run_loop.o             \
 	btstack_run_loop_posix.o       \
+    btstack_tlv.o                  \
 	btstack_util.o 	               \
 	hci_cmd.o                      \
 	daemon_cmds.o                  \
diff --git a/port/nrf5-zephyr/Makefile.src b/port/nrf5-zephyr/Makefile.src
index bf0d072f1..43bf33aec 100644
--- a/port/nrf5-zephyr/Makefile.src
+++ b/port/nrf5-zephyr/Makefile.src
@@ -5,6 +5,7 @@ obj-y +=  \
 	btstack_memory_pool.o \
 	btstack_ring_buffer.o \
 	btstack_run_loop.o \
+    btstack_tlv.o  \
 	btstack_util.o \
 	hci.o \
 	hci_cmd.o \
diff --git a/port/samv71-xplained-atwilc3000/example/template/config.mk b/port/samv71-xplained-atwilc3000/example/template/config.mk
index 618b5910b..54584312a 100644
--- a/port/samv71-xplained-atwilc3000/example/template/config.mk
+++ b/port/samv71-xplained-atwilc3000/example/template/config.mk
@@ -156,6 +156,7 @@ CSRCS += \
 	${BTSTACK_ROOT_CONFIG}/src/btstack_ring_buffer.c \
 	${BTSTACK_ROOT_CONFIG}/src/btstack_run_loop.c \
 	${BTSTACK_ROOT_CONFIG}/src/btstack_util.c \
+	${BTSTACK_ROOT_CONFIG}/src/btstack_tlv.c \
 	${BTSTACK_ROOT_CONFIG}/src/classic/a2dp_sink.c  		\
 	${BTSTACK_ROOT_CONFIG}/src/classic/a2dp_source.c 		\
 	${BTSTACK_ROOT_CONFIG}/src/classic/avdtp.c  			\
diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile
index d53f7a020..52d2c19e8 100644
--- a/port/stm32-f103rb-nucleo/Makefile
+++ b/port/stm32-f103rb-nucleo/Makefile
@@ -31,6 +31,7 @@ COMMON = \
 	rfcomm.c			      \
 	sdp_client_rfcomm.c 		  \
     btstack_util.c			  \
+    btstack_tlv.c	          \
     hci.c			          \
     hci_cmd.c		          \
     hci_dump.c		          \
diff --git a/port/stm32-l053r8-em9304/cubemx-l053r8-em9304/Makefile b/port/stm32-l053r8-em9304/cubemx-l053r8-em9304/Makefile
index 89ae4fff5..a1b3352fa 100644
--- a/port/stm32-l053r8-em9304/cubemx-l053r8-em9304/Makefile
+++ b/port/stm32-l053r8-em9304/cubemx-l053r8-em9304/Makefile
@@ -92,6 +92,7 @@ Src/stm32l0xx_it.c \
 	btstack_ring_buffer.c \
 	btstack_run_loop.c \
 	btstack_run_loop_embedded.c \
+	btstack_tlv.c \
 	btstack_uart_block_embedded.c \
 	btstack_util.c \
 	device_information_service_server.c \
diff --git a/port/wiced-h4/wiced-h4.mk b/port/wiced-h4/wiced-h4.mk
index 16ffe2533..6e87d294a 100644
--- a/port/wiced-h4/wiced-h4.mk
+++ b/port/wiced-h4/wiced-h4.mk
@@ -47,6 +47,7 @@ $(NAME)_SOURCES += \
 	../../src/btstack_memory.c            \
 	../../src/btstack_memory_pool.c       \
 	../../src/btstack_run_loop.c          \
+	../../src/btstack_tlv.c               \
 	../../src/btstack_util.c              \
 	../../src/hci.c                       \
 	../../src/hci_cmd.c                   \
diff --git a/port/wiced-h5/wiced-h5.mk b/port/wiced-h5/wiced-h5.mk
index 060c095f7..cfe2be53a 100644
--- a/port/wiced-h5/wiced-h5.mk
+++ b/port/wiced-h5/wiced-h5.mk
@@ -49,6 +49,7 @@ $(NAME)_SOURCES += \
 	../../src/btstack_run_loop.c          \
 	../../src/btstack_util.c              \
 	../../src/btstack_slip.c              \
+	../../src/btstack_tlv.c               \
 	../../src/hci.c                       \
 	../../src/hci_cmd.c                   \
 	../../src/hci_dump.c                  \