4 files changed, 1 insertions, 11 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index a70710b598..e07d747325 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -86,6 +86,7 @@ SRCS += demuxer.c \
         demux_viv.c \
         demux_vqf.c \
         demux_y4m.c \
+        demux_mkv.c ebml.c \
 
 ifeq ($(HAVE_DVD),yes)
 SRCS += stream_dvd.c
@@ -96,9 +97,6 @@ endif
 ifneq ($(W32_LIB),)
 SRCS += demux_avs.c
 endif
-ifeq ($(MATROSKA),yes)
-SRCS += demux_mkv.c ebml.c
-endif
 
 # Muxers
 MUXERS = muxer.c \
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 564e15803d..7fa484714f 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -7,7 +7,6 @@
  */
 
 #include "config.h"
-#ifdef HAVE_MATROSKA
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -3618,5 +3617,3 @@ demuxer_desc_t demuxer_desc_matroska = {
   demux_mkv_seek,
   demux_mkv_control
 };
-
-#endif /* HAVE_MATROSKA */
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 35553ce490..a95b453e87 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -81,9 +81,7 @@ demuxer_desc_t* demuxer_list[] = {
   &demuxer_desc_nuv,
   &demuxer_desc_real,
   &demuxer_desc_smjpeg,
-#ifdef HAVE_MATROSKA
   &demuxer_desc_matroska,
-#endif
   &demuxer_desc_realaudio,
   &demuxer_desc_vqf,
   &demuxer_desc_mov,
diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c
index 89da629288..2e5d5a8164 100644
--- a/libmpdemux/ebml.c
+++ b/libmpdemux/ebml.c
@@ -6,7 +6,6 @@
  */
 
 #include "config.h"
-#ifdef HAVE_MATROSKA
 
 #include <stdlib.h>
 
@@ -363,5 +362,3 @@ ebml_read_header (stream_t *s, int *version)
 
   return str;
 }
-
-#endif /* HAVE_MATROSKA */