Round 2

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 54999a1f34231fc4182528736aec07f4a80f2d40..7965d20d21ccf32d361e0fe4338a98b3ef8ca91a 100644 (file)
--- a/modules/access/cdda/access.c
+++ b/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>

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 7f44a816878b20b2e5b1af75f00182a10ff01362..09355bcaa80e473037d488cbe7ae204f7689e101 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/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"

diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index a5f0ca23e3ea06d331ff9bcc2763e45ec0d861ab..90f3064113c4a6f5cb5390e3e6a93abf14927fa9 100644 (file)
--- a/modules/access/rtsp/access.c
+++ b/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"

diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index bc9c16214f100fb240ae78ba5bbc0936873d038e..fd24ad6c8c5efefc05ee629a20e1153e3cb12c9e 100644 (file)
--- a/modules/access/v4l.c
+++ b/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>

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 3317492502082e3e959ed161a084f3995f8b792f..f3f762ed37054243dada273190a23cf6b7046e24 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/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"