#include <errno.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "charset.h"
+#include <vlc_demux.h>
+#include <vlc_charset.h>
/*****************************************************************************
* Module descriptor
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- char *psz_mode;
+ const char *psz_mode;
vlc_value_t val;
vlc_bool_t b_append;