From ea82a404e991564ff7eb41929b2c1d912d347d1a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20Stenac?= <zorglub@videolan.org>
Date: Sun, 26 Nov 2006 16:01:31 +0000
Subject: [PATCH] Nicer commits, faster breaking time and better-looking
 headers That's not just the vlc service, thats *your* vlc service ! So
 remember the new number ! 0118 999 881 999 119 725...3

---
 modules/access/vcdx/info.c               | 8 ++++----
 modules/access/vcdx/intf.c               | 2 +-
 modules/access/vcdx/intf.h               | 1 +
 modules/access/vcdx/vcdplayer.c          | 2 +-
 modules/access/vcdx/vcdplayer.h          | 4 +++-
 modules/codec/xvmc/slice_xvmc_vld.c      | 2 +-
 modules/codec/xvmc/xxmc.c                | 2 +-
 modules/gui/ncurses.c                    | 6 ++++--
 modules/gui/pda/pda_callbacks.c          | 3 ++-
 modules/gui/qnx/aout.c                   | 3 +--
 modules/gui/qnx/vout.c                   | 2 +-
 modules/misc/notify/xosd.c               | 2 +-
 modules/misc/svg.c                       | 8 ++++----
 modules/misc/win32text.c                 | 8 ++++----
 modules/stream_out/transrate/block.c     | 2 +-
 modules/stream_out/transrate/frame.c     | 2 +-
 modules/stream_out/transrate/transrate.c | 2 +-
 modules/video_filter/motionblur.c        | 7 +++----
 modules/video_output/sdl.c               | 2 +-
 modules/video_output/x11/xvmc.c          | 2 +-
 20 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/modules/access/vcdx/info.c b/modules/access/vcdx/info.c
index 8d9e40a591..cae95122b0 100644
--- a/modules/access/vcdx/info.c
+++ b/modules/access/vcdx/info.c
@@ -22,11 +22,11 @@
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <<vlc_input.h>>
-
+#include <vlc_input.h>
+#include <vlc_access.h>
 #include "vcd.h"
-#include <vlc_playlist.h> 
-#include "vlc_keys.h"
+#include <vlc_playlist.h>
+#include <vlc_keys.h>
 #include "info.h"
 
 #include <cdio/cdio.h>
diff --git a/modules/access/vcdx/intf.c b/modules/access/vcdx/intf.c
index 2a43c3a6a0..d245af54b9 100644
--- a/modules/access/vcdx/intf.c
+++ b/modules/access/vcdx/intf.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-#include <<vlc_input.h>>
+#include <vlc_access.h>
 
 #include "vlc_keys.h"
 
diff --git a/modules/access/vcdx/intf.h b/modules/access/vcdx/intf.h
index de177c191f..6246ec11db 100644
--- a/modules/access/vcdx/intf.h
+++ b/modules/access/vcdx/intf.h
@@ -23,6 +23,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_input.h>
+#include "vcdplayer.h"
 
 /*****************************************************************************
  * intf_sys_t: description and status of interface
diff --git a/modules/access/vcdx/vcdplayer.c b/modules/access/vcdx/vcdplayer.c
index e4b2cb332f..0a3fcf69eb 100644
--- a/modules/access/vcdx/vcdplayer.c
+++ b/modules/access/vcdx/vcdplayer.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <<vlc_input.h>>
+#include <vlc_input.h>
 #include <vlc_interface.h>
 
 #include "vcd.h"
diff --git a/modules/access/vcdx/vcdplayer.h b/modules/access/vcdx/vcdplayer.h
index ac488f7d51..30c3205609 100644
--- a/modules/access/vcdx/vcdplayer.h
+++ b/modules/access/vcdx/vcdplayer.h
@@ -27,7 +27,9 @@
 #define _VCDPLAYER_H_
 
 #include <libvcd/info.h>
-#include "vlc_meta.h"
+#include <vlc_meta.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
 
 #define INPUT_DBG_META        1 /* Meta information */
 #define INPUT_DBG_EVENT       2 /* input (keyboard/mouse) events */
diff --git a/modules/codec/xvmc/slice_xvmc_vld.c b/modules/codec/xvmc/slice_xvmc_vld.c
index afbad15edd..12cc6d9e76 100644
--- a/modules/codec/xvmc/slice_xvmc_vld.c
+++ b/modules/codec/xvmc/slice_xvmc_vld.c
@@ -18,7 +18,7 @@
  */
  
 #include <vlc/vlc.h>
-#include <<vlc_vout.h>>
+#include <vlc_vout.h>
 #include <vlc_codec.h>
 
 #include "mpeg2.h"
diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c
index c8ac5a1a86..1fece216e8 100644
--- a/modules/codec/xvmc/xxmc.c
+++ b/modules/codec/xvmc/xxmc.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <<vlc_vout.h>>
+#include <vlc_vout.h>
 #include <vlc_codec.h>
 
 #include <mcheck.h>
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 56dbdc0cd0..09e7afb848 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -38,9 +38,11 @@
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-#include <<vlc_vout.h>>
-#include <<vlc_aout.h>>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
 #include <vlc_charset.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index 42337aa22e..9bab5be34d 100644
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -28,7 +28,8 @@
 #include <stdlib.h>
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-#include <<vlc_vout.h>>
+#include <vlc_playlist.h>
+#include <vlc_vout.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/modules/gui/qnx/aout.c b/modules/gui/qnx/aout.c
index cfdf5c5790..3f40512650 100644
--- a/modules/gui/qnx/aout.c
+++ b/modules/gui/qnx/aout.c
@@ -35,8 +35,7 @@
 #   include <alloca.h>
 #endif
 
-#include <<vlc_aout.h>>
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 #include <sys/asoundlib.h>
 
diff --git a/modules/gui/qnx/vout.c b/modules/gui/qnx/vout.c
index 5b3026c17f..6c274ab122 100644
--- a/modules/gui/qnx/vout.c
+++ b/modules/gui/qnx/vout.c
@@ -35,7 +35,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-#include <<vlc_vout.h>>
+#include <vlc_vout.h>
 
 /*****************************************************************************
  * vout_sys_t: video output QNX method descriptor
diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index 9ad7c05551..40438af4e2 100644
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -30,7 +30,7 @@
 #include <xosd.h>
 #include <vlc/vlc.h>
 #include <vlc_playlist.h>
-#include <vlc_item.h>
+#include <vlc_input.h>
 #include <vlc_interface.h>
 
 #ifdef HAVE_UNISTD_H
diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index d751122ad1..ee9e8dbc41 100644
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -28,10 +28,10 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <<vlc_vout.h>>
-#include "vlc_osd.h"
-#include "vlc_block.h"
-#include "vlc_filter.h"
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #   include <sys/types.h>
diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index 4164261d5b..ca6d03cb4b 100644
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -28,10 +28,10 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <<vlc_vout.h>>
-#include "vlc_osd.h"
-#include "vlc_block.h"
-#include "vlc_filter.h"
+#include <vlc_vout.h>
+#include <vlc_osd.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
 
 #include <math.h>
 
diff --git a/modules/stream_out/transrate/block.c b/modules/stream_out/transrate/block.c
index 6d0e1d90f0..70bf24e501 100644
--- a/modules/stream_out/transrate/block.c
+++ b/modules/stream_out/transrate/block.c
@@ -39,7 +39,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
-#include <<vlc_input.h>>
+#include <vlc_codec.h>
 
 #include "transrate.h"
 
diff --git a/modules/stream_out/transrate/frame.c b/modules/stream_out/transrate/frame.c
index a2ac5d978b..70690dbf8b 100644
--- a/modules/stream_out/transrate/frame.c
+++ b/modules/stream_out/transrate/frame.c
@@ -39,7 +39,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
-#include <<vlc_input.h>>
+#include <vlc_codec.h>
 
 #include "transrate.h"
 
diff --git a/modules/stream_out/transrate/transrate.c b/modules/stream_out/transrate/transrate.c
index 70409e995e..400965b58d 100644
--- a/modules/stream_out/transrate/transrate.c
+++ b/modules/stream_out/transrate/transrate.c
@@ -33,7 +33,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
-#include <<vlc_input.h>>
+#include <vlc_input.h>
 
 #include "transrate.h"
 
diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index 22fbcba131..caa9556b02 100644
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -29,10 +29,9 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include <vlc/decoder.h>
-
-#include "vlc_filter.h"
+#include <vlc_sout.h>
+#include <vlc_vout.h>
+#include <vlc_filter.h>
 
 /*****************************************************************************
  * Local protypes
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 1f44ad76fe..19a15ffa01 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -33,7 +33,7 @@
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
-#include <<vlc_aout.h>>
+#include <vlc_aout.h>
 
 #include <sys/types.h>
 #ifndef WIN32
diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
index 84e78674d0..d9e7229b31 100644
--- a/modules/video_output/x11/xvmc.c
+++ b/modules/video_output/x11/xvmc.c
@@ -33,7 +33,7 @@
 
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
-#include <<vlc_vout.h>>
+#include <vlc_vout.h>
 #include <vlc_keys.h>
 
 #ifdef HAVE_MACHINE_PARAM_H
-- 
2.39.2