diff --git a/command.c b/command.c
index 59d7e7a0d0..7ccd0ec9de 100644
--- a/command.c
+++ b/command.c
@@ -16,7 +16,6 @@
 #include "m_property.h"
 #include "help_mp.h"
 #include "metadata.h"
-#include "libmpcodecs/mp_image.h"
 #include "libmpcodecs/vf.h"
 #include "libmpcodecs/vd.h"
 #include "libvo/video_out.h"
@@ -25,7 +24,6 @@
 #include "libao2/audio_out.h"
 #include "mpcommon.h"
 #include "mixer.h"
-#include "libmpdemux/matroska.h"
 #include "libmpcodecs/dec_video.h"
 #include "vobsub.h"
 #include "spudec.h"
diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h
index 10026d23ac..ab0e999914 100644
--- a/libmpdemux/matroska.h
+++ b/libmpdemux/matroska.h
@@ -7,8 +7,6 @@
 #ifndef MPLAYER_MATROSKA_H
 #define MPLAYER_MATROSKA_H
 
-#include "demuxer.h"
-
 #define MKV_A_AAC_2MAIN  "A_AAC/MPEG2/MAIN"
 #define MKV_A_AAC_2LC    "A_AAC/MPEG2/LC"
 #define MKV_A_AAC_2SBR   "A_AAC/MPEG2/LC/SBR"
@@ -63,6 +61,4 @@
 #define MKV_S_SSA        "S_SSA" // Deprecated
 #define MKV_S_ASS        "S_ASS" // Deprecated
 
-int demux_mkv_change_subs(demuxer_t *demuxer, int new_num);
-
 #endif /* MPLAYER_MATROSKA_H */
diff --git a/mplayer.c b/mplayer.c
index 160b5a506d..1e92a43ac3 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -162,8 +162,6 @@ static int max_framesize=0;
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
-//#include "parse_es.h"
-#include "libmpdemux/matroska.h"
 
 #ifdef USE_DVDREAD
 #include "stream/stream_dvd.h"