diff --git a/src/debugger/yacc/YaccParser.hxx b/src/debugger/yacc/YaccParser.hxx
index c8d3e08fd..9940b6aaa 100644
--- a/src/debugger/yacc/YaccParser.hxx
+++ b/src/debugger/yacc/YaccParser.hxx
@@ -15,8 +15,8 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#ifndef PARSER_HXX
-#define PARSER_HXX
+#ifndef YACC_PARSER_HXX
+#define YACC_PARSER_HXX
 
 #include "Expression.hxx"
 #include "CartDebug.hxx"
diff --git a/src/os/windows/Stella.vcxproj b/src/os/windows/Stella.vcxproj
index ff87f6e61..4dd8c193f 100755
--- a/src/os/windows/Stella.vcxproj
+++ b/src/os/windows/Stella.vcxproj
@@ -2384,7 +2384,6 @@
     <ClInclude Include="Windows.hxx" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\emucore\tia\frame-manager\module.mk" />
     <None Include="stella.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -2393,4 +2392,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/os/windows/Stella.vcxproj.filters b/src/os/windows/Stella.vcxproj.filters
index 3d03aec30..cbade6a8a 100644
--- a/src/os/windows/Stella.vcxproj.filters
+++ b/src/os/windows/Stella.vcxproj.filters
@@ -109,6 +109,12 @@
     <Filter Include="Source Files\lib\zlib">
       <UniqueIdentifier>{31501e98-40f8-4bcd-bf6f-52b133725061}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\debugger\yacc">
+      <UniqueIdentifier>{784bd01b-df5b-40b9-9119-6fff5281f307}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\debugger\yacc">
+      <UniqueIdentifier>{7e8254e5-72fa-4b53-9fde-7cf813f15562}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\common\FBBackendSDL2.cxx">
@@ -372,9 +378,6 @@
     <ClCompile Include="..\..\debugger\gui\ToggleWidget.cxx">
       <Filter>Source Files\debugger</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\debugger\yacc\YaccParser.cxx">
-      <Filter>Source Files\debugger</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gui\AboutDialog.cxx">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
@@ -1170,6 +1173,9 @@
     <ClCompile Include="..\..\lib\tinyexif\tinyexif.cxx">
       <Filter>Source Files\lib\tinyexif</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\debugger\yacc\YaccParser.cxx">
+      <Filter>Source Files\debugger\yacc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\common\bspf.hxx">
@@ -1454,9 +1460,6 @@
     <ClInclude Include="..\..\debugger\gui\ToggleWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\debugger\yacc\YaccParser.hxx">
-      <Filter>Header Files\debugger</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\cheat\BankRomCheat.hxx">
       <Filter>Header Files\cheat</Filter>
     </ClInclude>
@@ -2408,16 +2411,18 @@
     <ClInclude Include="..\..\lib\tinyexif\tinyexif_lib.hxx">
       <Filter>Header Files\lib\tinyexif</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\debugger\yacc\YaccParser.hxx">
+      <Filter>Header Files\debugger\yacc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\emucore\tia\frame-manager\module.mk" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="stella.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file