diff --git a/src/drivers/win/state.cpp b/src/drivers/win/state.cpp
index 8b66a403..259e4862 100644
--- a/src/drivers/win/state.cpp
+++ b/src/drivers/win/state.cpp
@@ -3,7 +3,7 @@
 /**
 * Show an Save File dialog and save a savegame state to the selected file.
 **/
-void FCEUD_SaveStateAs(void)
+void FCEUD_SaveStateAs()
 {
 	const char filter[] = "FCE Ultra Save State(*.fc?)\0*.fc?\0";
 	char nameo[2048];
@@ -28,7 +28,7 @@ void FCEUD_SaveStateAs(void)
 /**
 * Show an Open File dialog and load a savegame state from the selected file.
 **/
-void FCEUD_LoadStateFrom(void)
+void FCEUD_LoadStateFrom()
 {
 	const char filter[]="FCE Ultra Save State(*.fc?)\0*.fc?\0";
 	char nameo[2048];
diff --git a/src/drivers/win/state.h b/src/drivers/win/state.h
new file mode 100644
index 00000000..f0909119
--- /dev/null
+++ b/src/drivers/win/state.h
@@ -0,0 +1,2 @@
+void FCEUD_SaveStateAs();
+void FCEUD_LoadStateFrom();
\ No newline at end of file
diff --git a/src/drivers/win/wave.h b/src/drivers/win/wave.h
new file mode 100644
index 00000000..edee1109
--- /dev/null
+++ b/src/drivers/win/wave.h
@@ -0,0 +1,2 @@
+int CreateSoundSave();
+int CloseWave();
\ No newline at end of file
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index 2259c215..7dbc9038 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -20,7 +20,7 @@
 
 #include "window.h"
 #include "main.h"
-#include "state.cpp"      /* Save/Load state AS */
+#include "state.h"      /* Save/Load state AS */
 
 #include "sound.h"
 #include "wave.h"
diff --git a/src/drivers/win/window.h b/src/drivers/win/window.h
new file mode 100644
index 00000000..fe838549
--- /dev/null
+++ b/src/drivers/win/window.h
@@ -0,0 +1,23 @@
+#ifndef WIN_WINDOW_H
+#define WIN_WINDOW_H
+
+#include "common.h"
+
+static int EnableBackgroundInput = 0;
+
+extern char *recent_files[];
+extern char *recent_directories[10];
+
+void ShowCursorAbs(int set_visible);
+void HideFWindow(int h);
+void SetMainWindowStuff();
+int GetClientAbsRect(LPRECT lpRect);
+void FixWXY(int pref);
+void ByebyeWindow();
+void DoTimingConfigFix();
+int CreateMainWindow();
+void UpdateCheckedMenuItems();
+void ALoad(char *nameo);
+void LoadNewGamey(HWND hParent, const char *initialdir);
+
+#endif
\ No newline at end of file
diff --git a/vc8/fceux.vcproj b/vc8/fceux.vcproj
index 4e4a1df8..61a5b26a 100644
--- a/vc8/fceux.vcproj
+++ b/vc8/fceux.vcproj
@@ -1036,6 +1036,32 @@
 					RelativePath="..\src\drivers\win\sound.h"
 					>
 				</File>
+				<File
+					RelativePath="..\src\drivers\win\state.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\src\drivers\win\state.h"
+					>
+				</File>
 				<File
 					RelativePath="..\src\drivers\win\tracer.cpp"
 					>