diff --git a/common/gl_vidlinux_3dfx.c b/common/gl_vidlinux_3dfx.c
index a7a7716..28be565 100644
--- a/common/gl_vidlinux_3dfx.c
+++ b/common/gl_vidlinux_3dfx.c
@@ -828,13 +828,19 @@ void IN_Move (usercmd_t *cmd)
 	IN_MouseMove(cmd);
 }
 
-void VID_ExtraOptionDraw() 
+void VID_ExtraOptionDraw(void)
 {
-// No extra option menu items yet
+/* Port specific Options menu entrys */
 }
 
-void VID_ExtraOptionCmd() 
+void VID_ExtraOptionCmd(int option_cursor)
 {
-// Read the previous function
+/*
+	switch(option_cursor)
+	{
+	case 12:  // Always start with 12
+	break;
+	}
+*/
 }
 
diff --git a/common/gl_vidlinuxglx.c b/common/gl_vidlinuxglx.c
index 958212c..aad7cac 100644
--- a/common/gl_vidlinuxglx.c
+++ b/common/gl_vidlinuxglx.c
@@ -500,6 +500,12 @@ GL_Init
 */
 void GL_Init (void)
 {
+
+#ifdef XMESA
+        Cvar_RegisterVariable (&vid_mesa_mode);
+#endif
+	
+
 	gl_vendor = glGetString (GL_VENDOR);
 	Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
 	gl_renderer = glGetString (GL_RENDERER);
@@ -797,7 +803,7 @@ void IN_Move (usercmd_t *cmd)
 	IN_MouseMove(cmd);
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 
 	// Windowed Mouse
diff --git a/common/gl_vidnt.c b/common/gl_vidnt.c
index 2ba4054..2855bf1 100644
--- a/common/gl_vidnt.c
+++ b/common/gl_vidnt.c
@@ -1945,7 +1945,7 @@ void VID_MenuKey (int key)
 	}
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
diff --git a/common/vid.h b/common/vid.h
index 20c2eb8..8eea0ba 100644
--- a/common/vid.h
+++ b/common/vid.h
@@ -85,7 +85,7 @@ int VID_SetMode (int modenum, unsigned char *palette);
 void VID_HandlePause (qboolean pause);
 // called only on Win32, when pause happens, so the mouse can be released
 
-void VID_ExtraOptionDraw();
+void VID_ExtraOptionDraw(void);
 // draw extra option menu entries
 
 void VID_ExtraOptionCmd(int options_cursor);
diff --git a/common/vid_dos.c b/common/vid_dos.c
index 261b9e9..15b661f 100644
--- a/common/vid_dos.c
+++ b/common/vid_dos.c
@@ -779,7 +779,7 @@ void VID_MenuKey (int key)
 	}
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 /* Port specific Options menu entrys */
 }
diff --git a/common/vid_ggi.c b/common/vid_ggi.c
index b146b6a..646e11c 100644
--- a/common/vid_ggi.c
+++ b/common/vid_ggi.c
@@ -926,7 +926,7 @@ void IN_Move(usercmd_t *cmd)
 	mouse_x = mouse_y = 0.0;
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
diff --git a/common/vid_null.c b/common/vid_null.c
index fc3c488..e81b6cc 100644
--- a/common/vid_null.c
+++ b/common/vid_null.c
@@ -89,7 +89,7 @@ void D_EndDirectRect (int x, int y, int width, int height)
 {
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 /* Port specific Options menu entrys */
 }
diff --git a/common/vid_sdl.c b/common/vid_sdl.c
index 9c98de0..44c27ef 100644
--- a/common/vid_sdl.c
+++ b/common/vid_sdl.c
@@ -413,7 +413,7 @@ char *Sys_ConsoleInput (void)
 }
 */
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
diff --git a/common/vid_sunx.c b/common/vid_sunx.c
index 67377bd..6092314 100644
--- a/common/vid_sunx.c
+++ b/common/vid_sunx.c
@@ -1242,7 +1242,7 @@ void IN_Move (usercmd_t *cmd)
 	mouse_x = mouse_y = 0.0;
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
diff --git a/common/vid_sunxil.c b/common/vid_sunxil.c
index 53d0608..f599bf8 100644
--- a/common/vid_sunxil.c
+++ b/common/vid_sunxil.c
@@ -1264,7 +1264,7 @@ void IN_Move (usercmd_t *cmd)
 	mouse_x = mouse_y = 0.0;
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
diff --git a/common/vid_svgalib.c b/common/vid_svgalib.c
index e507811..e8e25ef 100644
--- a/common/vid_svgalib.c
+++ b/common/vid_svgalib.c
@@ -1020,7 +1020,7 @@ char *VID_ModeInfo (int modenum)
 	}
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 /* Port specific Options menu entrys */
 }
diff --git a/common/vid_win.c b/common/vid_win.c
index 216fc8b..2237d09 100644
--- a/common/vid_win.c
+++ b/common/vid_win.c
@@ -3391,7 +3391,7 @@ void VID_MenuKey (int key)
 	}
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	if(modestate == MS_WINDOWED)
 	{
diff --git a/common/vid_x.c b/common/vid_x.c
index 8373949..cb35b0f 100644
--- a/common/vid_x.c
+++ b/common/vid_x.c
@@ -1088,7 +1088,7 @@ void IN_Move (usercmd_t *cmd)
 	mouse_x = mouse_y = 0.0;
 }
 
-void VID_ExtraOptionDraw()
+void VID_ExtraOptionDraw(void)
 {
 	// Windowed Mouse
         M_Print (16, 128, "             Use Mouse");
diff --git a/uquake/menu.c b/uquake/menu.c
index b5546d5..bb42ba2 100644
--- a/uquake/menu.c
+++ b/uquake/menu.c
@@ -3088,10 +3088,6 @@ void M_Init (void)
 	Cmd_AddCommand ("help", M_Menu_Help_f);
 	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f);
 
-#ifdef XMESA
-	Cvar_RegisterVariable (&vid_mesa_mode);
-#endif
-
 }