diff --git a/cs-code/menu.qc b/cs-code/menu.qc
index 5c906ac3d..c685a64b3 100644
--- a/cs-code/menu.qc
+++ b/cs-code/menu.qc
@@ -1,5 +1,3 @@
-#include "QF/keys.h"
-
 float () random = #0;
 string () gametype = #0;
 string (...) sprintf = #0;
@@ -434,7 +432,7 @@ void () main_menu =
 	if (do_single_player)
 		single_player_menu ();
 	multi_player_menu ();
-	//options_menu ();
+	options_menu ();
 	help_menu ();
 	Menu_Item (54, 112, "", quit_f);
 	Menu_End ();
diff --git a/cs-code/menu.src.in b/cs-code/menu.src.in
index c39de3ab4..f617e8335 100644
--- a/cs-code/menu.src.in
+++ b/cs-code/menu.src.in
@@ -3,8 +3,11 @@ menu.dat
 @srcdir@/cbuf_def.qc
 @srcdir@/draw_def.qc
 @srcdir@/file_def.qc
+@srcdir@/game_def.qc
 @srcdir@/inputline_def.qc
+@srcdir@/key_defs.qc
 @srcdir@/menu_def.qc
 @srcdir@/string_def.qc
 
+@srcdir@/options.qc
 @srcdir@/menu.qc
diff --git a/cs-code/options.qc b/cs-code/options.qc
index 91dd12c16..c576ba2d0 100644
--- a/cs-code/options.qc
+++ b/cs-code/options.qc
@@ -1,5 +1,3 @@
-#include "QF/keys.h"
-
 float time;
 
 void (integer x, integer y) opt_cursor =
@@ -64,7 +62,7 @@ integer (integer key, integer unicode, integer down) options_controls_keyevent =
 
 integer () options_controls_draw = 
 {
-	local string tmp;
+	//local string tmp;
 
 	Draw_Pic (16, 4, "gfx/qplaque.lmp");
 	Draw_CenterPic (160, 4, "gfx/p_option.lmp");