diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 5dc1f170..32e5510e 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -1636,15 +1636,15 @@ BEGIN
     CONTROL         "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,311,214
 END
 
-INSERTCOMMENTSUBTITLE DIALOGEX 0, 0, 147, 82
+GETFILENAME DIALOGEX 0, 0, 147, 82
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Insert Comment / Subtitle"
+CAPTION "Movie filename"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",INSERTCS_IDOK,7,55,50,14
     PUSHBUTTON      "Cancel",INSERTCS_IDCANCEL,89,55,50,14
     EDITTEXT        INSERTCS_MESSAGE,7,30,133,14,ES_AUTOHSCROLL
-    LTEXT           "Insert Message",INSERTCS_STATIC,34,14,87,8
+    LTEXT           "Type filename: (blank for default)",INSERTCS_STATIC,20,14,114,8
 END
 
 
@@ -1664,7 +1664,7 @@ BEGIN
         BOTTOMMARGIN, 243
     END
 
-    INSERTCOMMENTSUBTITLE, DIALOG
+    GETFILENAME, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 140
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index d29aaffc..8be698d0 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -134,6 +134,7 @@
 #define IDD_DIALOG3                     123
 #define CHECK_SOUND_GLOBAL_FOCUS        124
 #define INSERTCOMMENTSUBTITLE           124
+#define GETFILENAME                     124
 #define CHECK_SOUND_ENABLED             126
 #define CTL_LATENCY_TRACKBAR            128
 #define COMBO_SOUND_QUALITY             129
diff --git a/src/drivers/win/state.cpp b/src/drivers/win/state.cpp
index e2b0f547..07340a1a 100644
--- a/src/drivers/win/state.cpp
+++ b/src/drivers/win/state.cpp
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "../../state.h"
 #include <string>
 #include <string.h>
 #include <fstream>
@@ -6,11 +7,8 @@
 using namespace std;
 
 //Externs
-extern int CurrentState;					//Declared in src/state.cpp
-extern bool FCEUSS_Load(const char *fname); //Declared in src/state.cpp
 extern string GetBackupFileName();			//Declared in src/state.cpp
 
-bool CheckBackupSaveStateExist();	//Checks if backupsavestate exists
 /**
 * Show an Save File dialog and save a savegame state to the selected file.
 **/
diff --git a/src/drivers/win/state.h b/src/drivers/win/state.h
index 559106bf..ccc396d4 100644
--- a/src/drivers/win/state.h
+++ b/src/drivers/win/state.h
@@ -1,2 +1,5 @@
 void FCEUD_SaveStateAs();
 void FCEUD_LoadStateFrom();
+
+bool CheckBackupSaveStateExist();	//Checks if backupsavestate exists
+void LoadBackup();					//Load backup savestate
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index f765df9f..c2093523 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -92,10 +92,8 @@ char *md5_asciistr(uint8 digest[16]);
 void ShowNetplayConsole(void); //mbg merge 7/17/06 YECH had to add
 void MapInput(void);
 extern BOOL CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);	//Metadata dialog
-extern bool CheckBackupSaveStateExist();	//Checks if backupsavestate exists
-extern void LoadBackup();
 
-// Function definitions
+// Function declarations
 void MakeBackup(bool dispMessage);			//Makes a backup of current movie file
 bool CheckFileExists(const char* filename);	//Receives a filename (fullpath) and checks to see if that file exists
 
@@ -128,10 +126,6 @@ const unsigned int MAX_NUMBER_OF_RECENT_FILES = sizeof(recent_files)/sizeof(*rec
 int EnableBackgroundInput = 0;
 int ismaximized = 0;
 
-//Subtitles/Comments
-void InsertSubtitle(HWND main);
-void InsertComment(HWND main);
-
 //Help Menu subtopics
 string moviehelp = "{695C964E-B83F-4A6E-9BA2-1A975387DB55}";		 //Movie Recording
 string gettingstartedhelp = "{C76AEBD9-1E27-4045-8A37-69E5A52D0F9A}";//Getting Started