diff --git a/common/cl_main.c b/common/cl_main.c
index 7e2407f..73913bb 100644
--- a/common/cl_main.c
+++ b/common/cl_main.c
@@ -64,6 +64,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <view.h>
 #include <sbar.h>
 #include <cdaudio.h>
+#include <plugin.h>
 
 #ifdef __sun
 /* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index 6dc2013..d5dea55 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -157,7 +157,7 @@ UQ_NET_SRC = net_dgrm.c net_loop.c net_main.c net_vcr.c $(NET_SRC)
 
 MISC_SRC       = common.c crc.c cvar.c cmd.c mathlib.c register_check.c \
                  wad.c zone.c cvars.c lib_replace.c qendian.c quakefs.c \
-		 quakeio.c qargs.c
+		 quakeio.c qargs.c plugin.c
 
 # GL renderer source
 
diff --git a/uquake/menu.c b/uquake/menu.c
index 90833a5..4dcb3f3 100644
--- a/uquake/menu.c
+++ b/uquake/menu.c
@@ -1188,7 +1188,8 @@ void M_AdjustSliders (int dir)
 		break;
 
 	default:
-		VID_ExtraOptionCmd(options_cursor + 2 - L_OPTIONS_ITEMS);
+		//VID_ExtraOptionCmd(options_cursor + 2 - L_OPTIONS_ITEMS);
+		;
 	}
 }
 
@@ -1269,7 +1270,7 @@ void M_Options_Draw (void)
 	M_Print (16, options_draw_cursor+=8, "            Lookstrafe");
 	M_DrawCheckbox (220, options_draw_cursor, lookstrafe.value);
 
-	VID_ExtraOptionDraw(options_draw_cursor);
+	//VID_ExtraOptionDraw(options_draw_cursor);
 	options_draw_cursor+=VID_options_items*8;
 
 	if (vid_menudrawfn) {
diff --git a/uquake/screen.c b/uquake/screen.c
index 53ac0f1..cc90de3 100644
--- a/uquake/screen.c
+++ b/uquake/screen.c
@@ -38,6 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <lib_replace.h>
 #include <menu.h>
 #include <view.h>
+#include <plugin.h>
 
 #include <time.h>
 
@@ -844,7 +845,7 @@ int SCR_ModalMessage (char *text)
 	do
 	{
 		key_count = -1;		// wait for a key down and up
-		Sys_SendKeyEvents ();
+		IN->SendKeyEvents ();
 	} while (key_lastpress != 'y' && key_lastpress != 'n' && key_lastpress != K_ESCAPE);
 
 	scr_fullupdate = 0;