diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 9f6050271d9702bab97f68f043ef6839ad2f1a69..ad10f0d0d238b271d6e408c5012eda6acbcea1ec 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,5 @@
 noinst_HEADERS =
+noinst_LTLIBRARIES =
 
 SOURCES_flac = flac.c
 SOURCES_vorbis = vorbis.c
@@ -87,8 +88,13 @@ libaes3_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libaraw_plugin_la_SOURCES = araw.c
 libaraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
-libdts_plugin_la_SOURCES = dts.c dts_header.h dts_header.c
+libdts_plugin_la_SOURCES = dts.c
 libdts_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libdts_plugin_la_LIBADD = libvlc_dts_header.la $(AM_LIBADD)
+
+libvlc_dts_header_la_SOURCES = dts_header.c dts_header.h
+libvlc_dts_header_la_LDFLAGS = -static
+noinst_LTLIBRARIES += libvlc_dts_header.la
 
 libg711_plugin_la_SOURCES = g711.c
 libg711_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index edd5bed46d10a8f7602d86a3496c70a59e697299..8aed5d25aadc86a3653dfce3030f52e9644d4917 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -73,9 +73,9 @@ if HAVE_AVFORMAT
 libvlc_LTLIBRARIES += libavformat_plugin.la
 endif
 
-libes_plugin_la_SOURCES  = mpeg/es.c ../codec/dts_header.c ../codec/dts_header.h ../codec/a52.h
+libes_plugin_la_SOURCES  = mpeg/es.c
 libes_plugin_la_CFLAGS = $(AM_CFLAGS)
-libes_plugin_la_LIBADD = $(AM_LIBADD)
+libes_plugin_la_LIBADD = ../codec/libvlc_dts_header.la $(AM_LIBADD)
 if HAVE_WIN32
 libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o
 endif