DirectDraw: remove unneeded includes

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index effb507ab709b35d24063328cd7a64a492a24bda..dbf7e54acbcd5f01191b42e100d2550c7f6974fd 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * vout.c: Windows DirectX video output display method
+ * directx.c: Windows DirectDraw video output
  *****************************************************************************
  * Copyright (C) 2001-2009 the VideoLAN team
  * $Id$
@@ -34,6 +34,7 @@
  * display video in window mode.
  *
  *****************************************************************************/
+
 #include <errno.h>                                                 /* ENOMEM */
 
 #ifdef HAVE_CONFIG_H
@@ -42,12 +43,10 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_interface.h>
-#include <vlc_playlist.h>
 #include <vlc_vout.h>
+#include <vlc_playlist.h>   /* needed for wallpaper */
 
 #include <windows.h>
-#include <tchar.h>
 #include <ddraw.h>
 #include <commctrl.h>
 

diff --git a/modules/video_output/msw/vout.h b/modules/video_output/msw/vout.h
index 9fbca15002a99d3fd4d36a1b6f13911e86ca4e10..d8f3b76cfeb108234c0850f2a87ff12c39a72678 100644 (file)
--- a/modules/video_output/msw/vout.h
+++ b/modules/video_output/msw/vout.h
@@ -133,7 +133,7 @@ struct vout_sys_t
     bool   b_hw_yuv;    /* Should we use hardware YUV->RGB conversions */
 
 
-#ifdef MODULE_NAME_IS_vout_directx
+#ifdef MODULE_NAME_IS_directx
     /* Overlay alignment restrictions */
     int          i_align_src_boundary;
     int          i_align_src_size;