diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj
index 807fcbe24..e67f3da0c 100644
--- a/src/windows/Stella.vcxproj
+++ b/src/windows/Stella.vcxproj
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;DEBUG_BUILD;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -145,7 +145,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\yacc;..\emucore;..\emucore\tia;..\emucore\tia\frame-manager;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;DEBUG_BUILD;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -261,6 +261,7 @@
     <ClCompile Include="..\common\PKeyboardHandler.cxx" />
     <ClCompile Include="..\common\RewindManager.cxx" />
     <ClCompile Include="..\common\StateManager.cxx" />
+    <ClCompile Include="..\common\ThreadDebugging.cxx" />
     <ClCompile Include="..\common\TimerManager.cxx" />
     <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx" />
     <ClCompile Include="..\common\tv_filters\NTSCFilter.cxx" />
@@ -349,6 +350,7 @@
     <ClCompile Include="..\emucore\DispatchResult.cxx" />
     <ClCompile Include="..\emucore\EmulationTiming.cxx" />
     <ClCompile Include="..\emucore\EmulationWorker.cxx" />
+    <ClCompile Include="..\emucore\exception\FatalEmulationError.cxx" />
     <ClCompile Include="..\emucore\FBSurface.cxx" />
     <ClCompile Include="..\emucore\MindLink.cxx" />
     <ClCompile Include="..\emucore\PointingDevice.cxx" />
@@ -832,6 +834,7 @@
     <ClInclude Include="..\common\StateManager.hxx" />
     <ClInclude Include="..\common\StellaKeys.hxx" />
     <ClInclude Include="..\common\StringParser.hxx" />
+    <ClInclude Include="..\common\ThreadDebugging.hxx" />
     <ClInclude Include="..\common\TimerManager.hxx" />
     <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx" />
     <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" />
@@ -929,6 +932,7 @@
     <ClInclude Include="..\emucore\EmulationTiming.hxx" />
     <ClInclude Include="..\emucore\EmulationWorker.hxx" />
     <ClInclude Include="..\emucore\EventHandlerConstants.hxx" />
+    <ClInclude Include="..\emucore\exception\FatalEmulationError.hxx" />
     <ClInclude Include="..\emucore\FBSurface.hxx" />
     <ClInclude Include="..\emucore\FrameBufferConstants.hxx" />
     <ClInclude Include="..\emucore\MindLink.hxx" />
diff --git a/src/windows/Stella.vcxproj.filters b/src/windows/Stella.vcxproj.filters
index d6cf395d5..c32174689 100644
--- a/src/windows/Stella.vcxproj.filters
+++ b/src/windows/Stella.vcxproj.filters
@@ -61,6 +61,12 @@
     <Filter Include="Source Files\audio">
       <UniqueIdentifier>{000e4a6b-8cd6-43db-8253-8255c7efa706}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\emucore\exception">
+      <UniqueIdentifier>{fb5429b5-4ffb-4574-a98d-54ba865e4199}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\emucore\exception">
+      <UniqueIdentifier>{e4a56aea-89f9-4680-a6b4-b26ec4799e1c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\common\FrameBufferSDL2.cxx">
@@ -942,6 +948,12 @@
     <ClCompile Include="..\emucore\Bankswitch.cxx">
       <Filter>Source Files\emucore</Filter>
     </ClCompile>
+    <ClCompile Include="..\emucore\exception\FatalEmulationError.cxx">
+      <Filter>Source Files\emucore\exception</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\ThreadDebugging.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\bspf.hxx">
@@ -1922,6 +1934,12 @@
     <ClInclude Include="..\emucore\Bankswitch.hxx">
       <Filter>Header Files\emucore</Filter>
     </ClInclude>
+    <ClInclude Include="..\emucore\exception\FatalEmulationError.hxx">
+      <Filter>Header Files\emucore\exception</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\ThreadDebugging.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">