diff --git a/src/drivers/Qt/MovieOptions.cpp b/src/drivers/Qt/MovieOptions.cpp
index ceb3855c..2cbaa26e 100644
--- a/src/drivers/Qt/MovieOptions.cpp
+++ b/src/drivers/Qt/MovieOptions.cpp
@@ -1,4 +1,4 @@
-// HotKeyConf.cpp
+// MovieOptions.cpp
 //
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index 7c2f0c88..970fba5e 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -759,8 +759,7 @@ static void KeyboardCommands (void)
 
 	if (_keyonly (Hotkeys[HK_TOGGLE_SUBTITLE]))
 	{
-		extern int movieSubtitles;
-		movieSubtitles ^= 1;
+		movieSubtitles = !movieSubtitles;
 		FCEUI_DispMessage ("Movie subtitles o%s.", 0,
 		movieSubtitles ? "n" : "ff");
 	}
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 363c2d0f..6aba08a9 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -822,7 +822,6 @@ int main(int argc, char *argv[])
 		input_display = id;
 		// not exactly an id as an true/false switch; still better than creating another int for that
 		g_config->getOption("SDL.SubtitleDisplay", &id); 
-		extern int movieSubtitles;
 		movieSubtitles = id;
 	}