Round 2

modules/access/cdda/access.c

@@ -31,7 +31,7 @@
 #include "info.h"          /* headers for meta info retrieval */
 #include <vlc_playlist.h>  /* Has to come *after* cdda.h */
 #include "vlc_keys.h"
-#include <vlc_interaction.h>
+#include <vlc_interface.h>
 
 #include <cdio/cdio.h>
 #include <cdio/logging.h>

modules/access/dshow/dshow.cpp

@@ -31,7 +31,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
-#include <vlc_interaction.h>
+#include <vlc_interface.h>
 
 #include "common.h"
 #include "filter.h"

modules/access/rtsp/access.c

@@ -26,7 +26,7 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 #include <vlc_access.h>
-#include <vlc_interaction.h>
+#include <vlc_interface.h>
 
 #include <vlc_network.h>
 #include "rtsp.h"

modules/access/v4l.c

@@ -33,8 +33,10 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <<vlc_input.h>>
-#include <<vlc_vout.h>>
+#include <vlc_input.h>
+#include <vlc_demux.h>
+#include <vlc_access.h>
+#include <vlc_vout.h>
 #include <codecs.h>
 
 #include <sys/types.h>

src/misc/win32_specific.c

@@ -25,8 +25,8 @@
 #include <stdlib.h>                                                /* free() */
 
 #include <vlc/vlc.h>
-#include "vlc_playlist.h"
-#include "charset.h"
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
 
 #ifdef WIN32                       /* optind, getopt(), included in unistd.h */
 #   include "../extras/getopt.h"