diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 789e54c7570dcea6d9e8c620b5a62f56e04e68fb..40ddbfbe4b0b46b887d3f958472a897a399712d8 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -27,12 +27,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
-
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
-#include <errno.h>                                                 /* ENOMEM */
+#include <ctype.h>
 #include <vlc_charset.h>
 #include "playlist.h"
 #include "vlc_meta.h"
diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index fc5db9c9cb2add462ade6e3292d46cef19648b51..e1b928078198e8af2046631f98af9ccc3c27112a 100644
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c
index 32514e74ae0ad69e474fe4281f7c59f2e10f9104..988c8c42f05a274b0c7a0f5b19fb1150ab86a215 100644
--- a/modules/demux/playlist/gvp.c
+++ b/modules/demux/playlist/gvp.c
@@ -51,7 +51,6 @@ description:The now infamous Apple Macintosh commercial aired during the 1984 Su
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 
 #define MAX_LINE 1024
diff --git a/modules/demux/playlist/ifo.c b/modules/demux/playlist/ifo.c
index 5cb1f04f7f190fa18e20a8eeb32fa5411cde90fe..88be49c38ff325bb9d4d70513649be327fc6ba44 100644
--- a/modules/demux/playlist/ifo.c
+++ b/modules/demux/playlist/ifo.c
@@ -27,7 +27,6 @@
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 
 /*****************************************************************************
@@ -81,8 +80,6 @@ void E_(Close_IFO)( vlc_object_t *p_this )
 static int Demux( demux_t *p_demux )
 {
     char *psz_url = NULL;
-    char *psz_file = p_demux->psz_path + strlen( p_demux->psz_path )
-                     - strlen( "VIDEO_TS.IFO" );
     size_t len = 0;
     input_item_t *p_input;
 
diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index 948fc4442eca15945bb031472f5895a91eb9168b..93230183cb2547cc79040dbf90a6e20448dbeaae 100644
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -30,7 +30,6 @@
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 
 struct demux_sys_t
diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index c74da0ecb4f0ba14b610b6eabe015fee2c47947d..86e2a179274bdd164d51b451ae29f2c7b9540eab 100644
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -24,8 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
-
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index 2ecedc303f4d724b80901d4bf8143308dbd629c1..af626f52121bdca5de0bf46f59973dc9b62ac951 100644
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -47,7 +47,6 @@ volume - 0 (mute) - 100 (max)
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 34c59b6668fc54fef9ab70b17a4b30e628c8efaa..616fc33e2bb065832ade687303fd6feb2870e561 100644
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -25,12 +25,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 #include "vlc_xml.h"