diff --git a/stella/src/win32/Stella/Stella.vcproj b/stella/src/win32/Stella/Stella.vcproj
index 53e60d2c8..a2e8ac023 100644
--- a/stella/src/win32/Stella/Stella.vcproj
+++ b/stella/src/win32/Stella/Stella.vcproj
@@ -222,7 +222,13 @@ opengl32.lib"
 				RelativePath="..\..\emucore\CartUA.cxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\CheatWidget.cxx">
+				RelativePath="..\..\debugger\Cheat.cxx">
+			</File>
+			<File
+				RelativePath="..\..\gui\CheatCodeDialog.cxx">
+			</File>
+			<File
+				RelativePath="..\..\debugger\CheetahCheat.cxx">
 			</File>
 			<File
 				RelativePath="..\..\gui\ColorWidget.cxx">
@@ -243,7 +249,10 @@ opengl32.lib"
 				RelativePath="..\..\debugger\CpuMethodExpression.cxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\CpuWidget.cxx">
+				RelativePath="..\..\debugger\CpuWidget.cxx">
+			</File>
+			<File
+				RelativePath="..\..\gui\DataGridOpsWidget.cxx">
 			</File>
 			<File
 				RelativePath="..\..\gui\DataGridWidget.cxx">
@@ -323,6 +332,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\FSNodeWin32.cxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\FunctionExpression.cxx">
+			</File>
 			<File
 				RelativePath="..\..\gui\GameInfoDialog.cxx">
 			</File>
@@ -341,6 +353,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\HiByteExpression.cxx">
 			</File>
+			<File
+				RelativePath="..\..\gui\InputTextDialog.cxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\Joystick.cxx">
 			</File>
@@ -438,7 +453,7 @@ opengl32.lib"
 				RelativePath="..\..\gui\ProgressDialog.cxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\PromptWidget.cxx">
+				RelativePath="..\..\debugger\PromptWidget.cxx">
 			</File>
 			<File
 				RelativePath="..\..\emucore\Props.cxx">
@@ -450,7 +465,7 @@ opengl32.lib"
 				RelativePath="..\..\debugger\RamDebug.cxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\RamWidget.cxx">
+				RelativePath="..\..\debugger\RamWidget.cxx">
 			</File>
 			<File
 				RelativePath="..\..\emucore\Random.cxx">
@@ -497,6 +512,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\TIADebug.cxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\TiaInfoWidget.cxx">
+			</File>
 			<File
 				RelativePath="..\..\debugger\TiaMethodExpression.cxx">
 			</File>
@@ -507,7 +525,7 @@ opengl32.lib"
 				RelativePath="..\..\emucore\TIASound.c">
 			</File>
 			<File
-				RelativePath="..\..\gui\TiaWidget.cxx">
+				RelativePath="..\..\debugger\TiaWidget.cxx">
 			</File>
 			<File
 				RelativePath="..\..\gui\ToggleBitWidget.cxx">
@@ -638,7 +656,13 @@ opengl32.lib"
 				RelativePath="..\..\emucore\CartUA.hxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\CheatWidget.hxx">
+				RelativePath="..\..\debugger\Cheat.hxx">
+			</File>
+			<File
+				RelativePath="..\..\gui\CheatCodeDialog.hxx">
+			</File>
+			<File
+				RelativePath="..\..\debugger\CheetahCheat.hxx">
 			</File>
 			<File
 				RelativePath="..\..\gui\ColorWidget.hxx">
@@ -665,7 +689,10 @@ opengl32.lib"
 				RelativePath="..\..\debugger\CpuMethodExpression.hxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\CpuWidget.hxx">
+				RelativePath="..\..\debugger\CpuWidget.hxx">
+			</File>
+			<File
+				RelativePath="..\..\gui\DataGridOpsWidget.hxx">
 			</File>
 			<File
 				RelativePath="..\..\gui\DataGridWidget.hxx">
@@ -748,6 +775,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\FSNode.hxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\FunctionExpression.hxx">
+			</File>
 			<File
 				RelativePath="..\..\gui\GameInfoDialog.hxx">
 			</File>
@@ -772,6 +802,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\HiByteExpression.hxx">
 			</File>
+			<File
+				RelativePath="..\..\gui\InputTextDialog.hxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\Joystick.hxx">
 			</File>
@@ -866,7 +899,7 @@ opengl32.lib"
 				RelativePath="..\..\gui\ProgressDialog.hxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\PromptWidget.hxx">
+				RelativePath="..\..\debugger\PromptWidget.hxx">
 			</File>
 			<File
 				RelativePath="..\..\emucore\Props.hxx">
@@ -878,7 +911,7 @@ opengl32.lib"
 				RelativePath="..\..\debugger\RamDebug.hxx">
 			</File>
 			<File
-				RelativePath="..\..\gui\RamWidget.hxx">
+				RelativePath="..\..\debugger\RamWidget.hxx">
 			</File>
 			<File
 				RelativePath="..\..\emucore\Random.hxx">
@@ -940,6 +973,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\TIADebug.hxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\TiaInfoWidget.hxx">
+			</File>
 			<File
 				RelativePath="..\..\debugger\TiaMethodExpression.hxx">
 			</File>
@@ -950,7 +986,7 @@ opengl32.lib"
 				RelativePath="..\..\emucore\TIASound.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\TiaWidget.hxx">
+				RelativePath="..\..\debugger\TiaWidget.hxx">
 			</File>
 			<File
 				RelativePath="..\..\gui\ToggleBitWidget.hxx">