diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 8ab083e07f..27cbe0c21d 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include "mp_taglists.h"
 #include "libavformat/avformat.h"
 #include "libavformat/riff.h"
 
diff --git a/libmpdemux/mp_taglists.h b/libmpdemux/mp_taglists.h
index 5df8648c84..6ace1213d3 100644
--- a/libmpdemux/mp_taglists.h
+++ b/libmpdemux/mp_taglists.h
@@ -19,10 +19,10 @@
 #ifndef MPLAYER_MP_TAGLISTS_H
 #define MPLAYER_MP_TAGLISTS_H
 
-extern const struct AVCodecTag *mp_wav_taglists[];
+extern const struct AVCodecTag * const mp_wav_taglists[];
 
-extern const struct AVCodecTag *mp_codecid_override_taglists[];
+extern const struct AVCodecTag * const mp_codecid_override_taglists[];
 
-extern const struct AVCodecTag *mp_bmp_taglists[];
+extern const struct AVCodecTag * const mp_bmp_taglists[];
 
 #endif /* MPLAYER_MP_TAGLISTS_H */