diff --git a/AppleWinExpress2008.vcproj b/AppleWinExpress2008.vcproj
index 7adf14cf..560775d5 100644
--- a/AppleWinExpress2008.vcproj
+++ b/AppleWinExpress2008.vcproj
@@ -242,6 +242,14 @@
 				RelativePath=".\source\Core.h"
 				>
 			</File>
+			<File
+				RelativePath=".\source\FrameBase.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\source\FrameBase.h"
+				>
+			</File>
 			<File
 				RelativePath=".\source\Interface.h"
 				>
@@ -985,6 +993,14 @@
 					RelativePath=".\source\Windows\DirectInput.h"
 					>
 				</File>
+				<File
+					RelativePath=".\source\Windows\Win32Frame.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\source\Windows\Win32Frame.h"
+					>
+				</File>
 				<File
 					RelativePath=".\source\Windows\WinFrame.cpp"
 					>
diff --git a/test/TestDebugger/TestDebugger.cpp b/test/TestDebugger/TestDebugger.cpp
index f45621df..e28a56e0 100644
--- a/test/TestDebugger/TestDebugger.cpp
+++ b/test/TestDebugger/TestDebugger.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include "../../source/Windows/Applewin.h"
+#include "../../source/Windows/AppleWin.h"
 #include "../../source/CPU.h"
 
 #include "../../source/Debugger/Debugger_Types.h"
@@ -9,12 +9,29 @@
 // NB. DebugDefs.h must come after Debugger_Types.h which declares these as extern
 #include "../../source/Debugger/DebugDefs.h"
 
+// From FrameBase
+class FrameBase
+{
+public:
+	FrameBase() { g_hFrameWindow = (HWND)0; }
+	HWND   g_hFrameWindow;
+};
+
+// From Win32Frame
+class Win32Frame : public FrameBase
+{
+};
+
+// From AppleWin.cpp
+FrameBase& GetFrame()
+{
+	static Win32Frame sg_Win32Frame;
+	return sg_Win32Frame;
+}
+
 // From CPU.cpp
 regsrec regs;
 
-// From Frame.cpp
-HWND   g_hFrameWindow   = (HWND)0;
-
 // From Memory.cpp
 LPBYTE         mem          = NULL;	// TODO: Init
 LPBYTE         memdirty     = NULL;	// TODO: Init
diff --git a/test/TestDebugger/stdafx.h b/test/TestDebugger/stdafx.h
index 4bb17e80..213b7e51 100644
--- a/test/TestDebugger/stdafx.h
+++ b/test/TestDebugger/stdafx.h
@@ -9,6 +9,16 @@
 #include <tchar.h>
 
 #include <windows.h>
+
+#if _MSC_VER >= 1600	// <stdint.h> supported from VS2010 (cl.exe v16.00)
+#include <stdint.h> // cleanup WORD DWORD -> uint16_t uint32_t
+#else
+typedef UINT8 uint8_t;
+typedef UINT16 uint16_t;
+typedef UINT32 uint32_t;
+typedef UINT64 uint64_t;
+#endif
+
 #include <ddraw.h>
 
 #include <algorithm>