diff --git a/libvo/video_out.h b/libvo/video_out.h
index 83de798f5b..bf64e98186 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -201,6 +201,7 @@ extern int vo_adapter_num;
 extern int vo_refresh_rate;
 extern int vo_keepaspect;
 extern int vo_rootwin;
+extern int vo_ontop;
 
 extern int vo_gamma_brightness;
 extern int vo_gamma_saturation;
@@ -220,6 +221,8 @@ extern char *vo_subdevice;
 
 extern int vo_colorkey;
 
+extern int WinID;
+
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 
 
 typedef struct {
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index f8cf5cff1b..0f9bfa32c2 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -81,14 +81,7 @@ static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO) = NULL;
 
 extern void mplayer_put_key(int code);              //let mplayer handel the keyevents 
 extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
-extern int vo_doublebuffering;                      //tribblebuffering    
-extern int vo_fs;
-extern int vo_directrendering;
-extern int vo_ontop;
-extern int vo_rootwin;
 extern int vidmode;
-extern int vo_colorkey;
-extern int WinID;
 
 /*****************************************************************************
  * DirectDraw GUIDs.
diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c
index d11890177a..ecd1796a28 100644
--- a/libvo/vo_ggi.c
+++ b/libvo/vo_ggi.c
@@ -39,10 +39,6 @@
 #include <ggi/wmh.h>
 #endif
 
-#ifdef HAVE_GGIWMH
-extern int vo_ontop;	/* Window on top */
-#endif
-
 /* maximum buffers */
 #undef GGI_FLIP
 
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index 7d75acbe28..f321a40ae2 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -69,7 +69,6 @@ static vo_info_t info = {
 LIBVO_EXTERN(gif89a)
 
 extern int verbose;
-extern int vo_config_count;
 
 
 // how many frames per second we are aiming for during output.
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 01503208da..d070a1960c 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -67,15 +67,10 @@ static MatrixRecord matrix;
 static int EnterMoviesDone = 0;
 static int get_image_done = 0;
 
-extern int vo_rootwin;
-extern int vo_ontop;
-extern int vo_fs; // user want fullscreen
 static int vo_quartz_fs; // we are in fullscreen
 extern float monitor_aspect;
-extern int vo_keepaspect; //keep aspect ratio when resizing
 extern float movie_aspect;
 static float old_movie_aspect;
-extern float vo_panscan;
 
 static int winLevel = 1;
 int levelList[] =
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 5089792fa7..aa9158b093 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -52,9 +52,6 @@ TODO:
 //silence warnings, probably it have to go in some global header
 #define UNUSED(x) ((void)(x)) 
 
-extern int vo_doublebuffering;
-extern int vo_directrendering;
-extern int vo_dbpp;
 extern int verbose;
 
 static int query_format(uint32_t format);
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index 36102517e4..2f75d88c66 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -56,7 +56,6 @@ static vidix_grkey_t gr_key;
     
 
 extern void set_video_eq( int cap );
-extern int vo_config_count;
 
 
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 0317f36d7a..1fa98d9382 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -46,7 +46,6 @@
 #define UNUSED(x) ((void)(x))
 
 
-extern int vo_directrendering;
 extern int vo_verbose;
 
 static int benchmark;
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index d40ead6b2a..6df71ac67d 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -80,7 +80,6 @@ int mScreen;
 int mLocalDisplay;
 
 /* output window id */
-extern int WinID;
 int vo_mouse_autohide = 0;
 int vo_wm_type = 0;
 int vo_fs_type = 0; // needs to be accessible for GUI X11 code
@@ -866,10 +865,6 @@ typedef struct
     long state;
 } MotifWmHints;
 
-extern int vo_depthonscreen;
-extern int vo_screenwidth;
-extern int vo_screenheight;
-
 static MotifWmHints vo_MotifWmHints;
 static Atom vo_MotifHints = None;
 
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index 449b51d855..a68994e588 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -21,27 +21,17 @@
 #define _NET_WM_STATE_TOGGLE        2    /* toggle property  */
 
 extern int metacity_hack;
-extern int vo_fsmode;
 
-extern int vo_depthonscreen;
-extern int vo_screenwidth;
-extern int vo_screenheight;
-extern int vo_dwidth;
-extern int vo_dheight;
-extern int vo_fs;
 extern int vo_fs_layer;
 extern int vo_wm_type;
 extern int vo_fs_type;
 extern char** vo_fstype_list;
-extern int vo_ontop;
-extern int vo_rootwin;
 
 extern char *mDisplayName;
 extern Display *mDisplay;
 extern Window mRootWin;
 extern int mScreen;
 extern int mLocalDisplay;
-extern int WinID;
 
 extern int vo_mouse_timer_const;
 extern int vo_mouse_autohide;