From a5d5adfa26d1a946f5dc19d66ffb825aad89e900 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Thu, 9 Nov 2017 18:06:52 +1100
Subject: [PATCH] [Project64] Fix up the move of debugger UI code

---
 Source/Project64/Project64.vcxproj            |  90 ++++----
 Source/Project64/Project64.vcxproj.filters    | 215 +++++++++---------
 .../UserInterface/Debugger/DebugDialog.h      |   2 +
 .../Project64/UserInterface/Debugger/stdafx.h |   1 -
 Source/Project64/UserInterface/GuiClass.h     |   2 +-
 .../Project64/UserInterface/MainMenuClass.cpp |  81 ++++---
 6 files changed, 198 insertions(+), 193 deletions(-)
 delete mode 100644 Source/Project64/UserInterface/Debugger/stdafx.h

diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 35b5a178c..c78b2bd17 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -65,37 +65,37 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="N64System\Debugger\Debugger-StackView.cpp" />
-    <ClCompile Include="N64System\Debugger\Assembler.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="Multilanguage\LanguageSelector.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-AddSymbol.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-MemoryDump.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-MemorySearch.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-RegisterTabs.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-TLB.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-ViewMemory.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger.cpp" />
-    <ClCompile Include="N64System\Debugger\Breakpoints.cpp" />
-    <ClCompile Include="N64System\Debugger\DMALog.cpp" />
-    <ClCompile Include="N64System\Debugger\ScriptSystem.cpp" />
     <ClCompile Include="Plugins\PluginList.cpp" />
     <ClCompile Include="Settings\GuiSettings.cpp" />
     <ClCompile Include="Settings\NotificationSettings.cpp" />
     <ClCompile Include="Settings\UISettings.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-Commands.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-Scripts.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-Symbols.cpp" />
-    <ClCompile Include="N64System\Debugger\Symbols.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-AddBreakpoint.cpp" />
-    <ClCompile Include="N64System\Debugger\ScriptInstance.cpp" />
-    <ClCompile Include="N64System\Debugger\ScriptHook.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-DMALogView.cpp" />
-    <ClCompile Include="N64System\Debugger\Debugger-StackTrace.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="UserInterface\CheatClassUI.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Assembler.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Breakpoints.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-AddBreakpoint.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-AddSymbol.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-Commands.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-DMALogView.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-MemoryDump.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-MemorySearch.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-RegisterTabs.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-Scripts.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-StackTrace.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-StackView.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-Symbols.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-TLB.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger-ViewMemory.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Debugger.cpp" />
+    <ClCompile Include="UserInterface\Debugger\DMALog.cpp" />
+    <ClCompile Include="UserInterface\Debugger\ScriptHook.cpp" />
+    <ClCompile Include="UserInterface\Debugger\ScriptInstance.cpp" />
+    <ClCompile Include="UserInterface\Debugger\ScriptSystem.cpp" />
+    <ClCompile Include="UserInterface\Debugger\Symbols.cpp" />
     <ClCompile Include="UserInterface\GuiClass.cpp" />
     <ClCompile Include="UserInterface\LoggingUI.cpp" />
     <ClCompile Include="UserInterface\MainMenuClass.cpp" />
@@ -122,32 +122,9 @@
     <ClCompile Include="UserInterface\WTLControls\PartialGroupBox.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="N64System\Debugger\Debugger-StackView.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-AddSymbol.h" />
-    <ClInclude Include="N64System\Debugger\Assembler.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-RegisterTabs.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-StackTrace.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-DMALogView.h" />
-    <ClInclude Include="N64System\Debugger\DMALog.h" />
     <ClInclude Include="N64System\Debugger\OpInfo.h" />
-    <ClInclude Include="N64System\Debugger\ScriptHook.h" />
-    <ClInclude Include="N64System\Debugger\ScriptInstance.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-AddBreakpoint.h" />
-    <ClInclude Include="N64System\Debugger\Breakpoints.h" />
-    <ClInclude Include="N64System\Debugger\Symbols.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-Symbols.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-Scripts.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-Commands.h" />
     <ClInclude Include="Multilanguage\LanguageSelector.h" />
     <ClInclude Include="N64System.h" />
-    <ClInclude Include="N64System\Debugger\DebugDialog.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-MemoryDump.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-MemorySearch.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-TLB.h" />
-    <ClInclude Include="N64System\Debugger\Debugger-ViewMemory.h" />
-    <ClInclude Include="N64System\Debugger\debugger.h" />
-    <ClInclude Include="N64System\Debugger\DebuggerUI.h" />
-    <ClInclude Include="N64System\Debugger\ScriptSystem.h" />
     <ClInclude Include="Settings\GuiSettings.h" />
     <ClInclude Include="Settings\NotificationSettings.h" />
     <ClInclude Include="Settings\UISettings.h" />
@@ -155,6 +132,31 @@
     <ClInclude Include="Support.h" />
     <ClInclude Include="UserInterface.h" />
     <ClInclude Include="UserInterface\CheatClassUI.h" />
+    <ClInclude Include="UserInterface\Debugger\Assembler.h" />
+    <ClInclude Include="UserInterface\Debugger\Breakpoints.h" />
+    <ClInclude Include="UserInterface\Debugger\DebugDialog.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-AddBreakpoint.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-AddSymbol.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-Commands.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-DMALogView.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-MemoryDump.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-MemorySearch.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-RegisterTabs.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-Scripts.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-StackTrace.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-StackView.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-Symbols.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-TLB.h" />
+    <ClInclude Include="UserInterface\Debugger\Debugger-ViewMemory.h" />
+    <ClInclude Include="UserInterface\Debugger\debugger.h" />
+    <ClInclude Include="UserInterface\Debugger\DebuggerUI.h" />
+    <ClInclude Include="UserInterface\Debugger\DMALog.h" />
+    <ClInclude Include="UserInterface\Debugger\OpInfo.h" />
+    <ClInclude Include="UserInterface\Debugger\ScriptHook.h" />
+    <ClInclude Include="UserInterface\Debugger\ScriptInstance.h" />
+    <ClInclude Include="UserInterface\Debugger\ScriptSystem.h" />
+    <ClInclude Include="UserInterface\Debugger\stdafx.h" />
+    <ClInclude Include="UserInterface\Debugger\Symbols.h" />
     <ClInclude Include="UserInterface\GuiClass.h" />
     <ClInclude Include="UserInterface\LoggingUI.h" />
     <ClInclude Include="UserInterface\MainMenuClass.h" />
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index b4af2e5e2..d90850483 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -46,15 +46,12 @@
     <Filter Include="Header Files\Multilanguage Headers">
       <UniqueIdentifier>{5531af4d-33bb-4e84-8a55-c971a18ec7bf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\N64 System Headers">
-      <UniqueIdentifier>{6cfab019-2f8d-4e09-be41-1df513b5a680}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers\Debugger Headers">
-      <UniqueIdentifier>{c4249d55-df70-4453-b017-b548514ad094}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\Settings">
       <UniqueIdentifier>{8eaf5c00-c88d-418e-a27c-d658c547ab79}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\User Interface Headers\Debugger Headers">
+      <UniqueIdentifier>{c4249d55-df70-4453-b017-b548514ad094}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -132,21 +129,6 @@
     <ClCompile Include="UserInterface\SettingsConfig.cpp">
       <Filter>Source Files\User Interface Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-MemoryDump.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-MemorySearch.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-TLB.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-ViewMemory.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
     <ClCompile Include="Settings\GuiSettings.cpp">
       <Filter>Source Files\Settings Files</Filter>
     </ClCompile>
@@ -168,52 +150,67 @@
     <ClCompile Include="UserInterface\SupportWindow.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-Commands.cpp">
+    <ClCompile Include="UserInterface\Debugger\Assembler.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-Scripts.cpp">
+    <ClCompile Include="UserInterface\Debugger\Breakpoints.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\ScriptSystem.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-Symbols.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-AddBreakpoint.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Breakpoints.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-AddSymbol.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-AddBreakpoint.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-Commands.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Symbols.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-DMALogView.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\ScriptHook.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-MemoryDump.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\ScriptInstance.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-MemorySearch.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-StackTrace.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-RegisterTabs.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Assembler.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-Scripts.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\DMALog.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-StackTrace.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-AddSymbol.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-StackView.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-DMALogView.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-Symbols.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-RegisterTabs.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-TLB.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
-    <ClCompile Include="N64System\Debugger\Debugger-StackView.cpp">
+    <ClCompile Include="UserInterface\Debugger\Debugger-ViewMemory.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="UserInterface\Debugger\DMALog.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="UserInterface\Debugger\ScriptHook.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="UserInterface\Debugger\ScriptInstance.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="UserInterface\Debugger\ScriptSystem.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="UserInterface\Debugger\Symbols.cpp">
       <Filter>Source Files\User Interface Source\Debugger Source</Filter>
     </ClCompile>
   </ItemGroup>
@@ -224,27 +221,6 @@
     <ClInclude Include="Multilanguage\LanguageSelector.h">
       <Filter>Header Files\Multilanguage Headers</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Debugger\DebugDialog.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\debugger.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-MemoryDump.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-MemorySearch.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-TLB.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\DebuggerUI.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-ViewMemory.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
     <ClInclude Include="UserInterface\CheatClassUI.h">
       <Filter>Header Files\User Interface Headers</Filter>
     </ClInclude>
@@ -353,60 +329,87 @@
     <ClInclude Include="UserInterface\SupportWindow.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-Commands.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-Scripts.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\ScriptSystem.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-Symbols.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Breakpoints.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Symbols.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-AddBreakpoint.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\ScriptHook.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\ScriptInstance.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-StackTrace.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Assembler.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-AddSymbol.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\DMALog.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-DMALogView.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-RegisterTabs.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64System\Debugger\Debugger-StackView.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
     <ClInclude Include="N64System\Debugger\OpInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="UserInterface\WTLControls\TooltipDialog.h">
       <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
     </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Assembler.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Breakpoints.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\DebugDialog.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\debugger.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-AddBreakpoint.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-AddSymbol.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-Commands.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-DMALogView.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-MemoryDump.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-MemorySearch.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-RegisterTabs.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-Scripts.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-StackTrace.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-StackView.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-Symbols.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-TLB.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\DebuggerUI.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Debugger-ViewMemory.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\DMALog.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\OpInfo.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\ScriptHook.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\ScriptInstance.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\ScriptSystem.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\stdafx.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="UserInterface\Debugger\Symbols.h">
+      <Filter>Header Files\User Interface Headers\Debugger Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\divider.cur">
diff --git a/Source/Project64/UserInterface/Debugger/DebugDialog.h b/Source/Project64/UserInterface/Debugger/DebugDialog.h
index 70413dc31..9a5330b5a 100644
--- a/Source/Project64/UserInterface/Debugger/DebugDialog.h
+++ b/Source/Project64/UserInterface/Debugger/DebugDialog.h
@@ -1,3 +1,5 @@
+#pragma once
+
 template <class T>
 class CDebugDialog :
     public CDialogImpl < T >
diff --git a/Source/Project64/UserInterface/Debugger/stdafx.h b/Source/Project64/UserInterface/Debugger/stdafx.h
deleted file mode 100644
index 8b696d0b1..000000000
--- a/Source/Project64/UserInterface/Debugger/stdafx.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../stdafx.h"
diff --git a/Source/Project64/UserInterface/GuiClass.h b/Source/Project64/UserInterface/GuiClass.h
index e9e3d4cb5..48d00af0f 100644
--- a/Source/Project64/UserInterface/GuiClass.h
+++ b/Source/Project64/UserInterface/GuiClass.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "../Settings/GuiSettings.h"
-#include <Project64/N64System/Debugger/debugger.h>
+#include <Project64/UserInterface/Debugger/debugger.h>
 #include <Project64-core/Plugins/PluginClass.h>
 
 class CGfxPlugin;      //Plugin that controls the rendering
diff --git a/Source/Project64/UserInterface/MainMenuClass.cpp b/Source/Project64/UserInterface/MainMenuClass.cpp
index 65f8d3759..7bbc57291 100644
--- a/Source/Project64/UserInterface/MainMenuClass.cpp
+++ b/Source/Project64/UserInterface/MainMenuClass.cpp
@@ -1,10 +1,9 @@
 #include "stdafx.h"
 #include "RomInformationClass.h"
+#include "Debugger/Breakpoints.h"
+#include "Debugger/ScriptSystem.h"
 #include <Project64-core/N64System/N64DiskClass.h>
 
-#include <Project64/N64System/Debugger/Breakpoints.h>
-#include <Project64/N64System/Debugger/ScriptSystem.h>
-
 #include <windows.h>
 #include <commdlg.h>
 
@@ -54,7 +53,7 @@ CMainMenu::CMainMenu(CMainGui * hMainWindow) :
     m_ChangeSettingList.push_back(Debugger_AppLogFlush);
     m_ChangeSettingList.push_back(Game_CurrentSaveState);
     m_ChangeSettingList.push_back(Setting_CurrentLanguage);
-	
+
     for (UISettingList::const_iterator iter = m_ChangeUISettingList.begin(); iter != m_ChangeUISettingList.end(); iter++)
     {
         g_Settings->RegisterChangeCB((SettingID)(FirstUISettings + *iter), this, (CSettings::SettingChangedFunc)SettingsChanged);
@@ -507,13 +506,13 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
     case ID_DEBUGGER_INTERRUPT_VI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_VI); break;
     case ID_DEBUGGER_INTERRUPT_PI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_PI); break;
     case ID_DEBUGGER_INTERRUPT_DP: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_DP); break;
-	case ID_DEBUGGER_BREAKPOINTS: m_Gui->Debug_ShowCommandsWindow(); break;
-	case ID_DEBUGGER_SCRIPTS: m_Gui->Debug_ShowScriptsWindow(); break;
-	case ID_DEBUGGER_SYMBOLS: m_Gui->Debug_ShowSymbolsWindow(); break;
-	case ID_DEBUGGER_DMALOG: m_Gui->Debug_ShowDMALogWindow(); break;
-	case ID_DEBUGGER_STACKTRACE: m_Gui->Debug_ShowStackTrace(); break;
-	case ID_DEBUGGER_STACKVIEW: m_Gui->Debug_ShowStackWindow(); break;
-	case ID_CURRENT_SAVE_DEFAULT:
+    case ID_DEBUGGER_BREAKPOINTS: m_Gui->Debug_ShowCommandsWindow(); break;
+    case ID_DEBUGGER_SCRIPTS: m_Gui->Debug_ShowScriptsWindow(); break;
+    case ID_DEBUGGER_SYMBOLS: m_Gui->Debug_ShowSymbolsWindow(); break;
+    case ID_DEBUGGER_DMALOG: m_Gui->Debug_ShowDMALogWindow(); break;
+    case ID_DEBUGGER_STACKTRACE: m_Gui->Debug_ShowStackTrace(); break;
+    case ID_DEBUGGER_STACKVIEW: m_Gui->Debug_ShowStackWindow(); break;
+    case ID_CURRENT_SAVE_DEFAULT:
         g_Notify->DisplayMessage(3, stdstr_f(GS(MENU_SLOT_SAVE), GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str()).c_str());
         g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)(MenuID - ID_CURRENT_SAVE_DEFAULT));
         break;
@@ -1004,10 +1003,10 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
 
         /* Debug - R4300i
         *******************/
-		
-		//ID_DEBUGGER_LOGOPTIONS
+
+        //ID_DEBUGGER_LOGOPTIONS
         Item.Reset(ID_DEBUGGER_BREAKPOINTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"R4300i &Commands...");
-		Item.SetItemEnabled(CPURunning);
+        Item.SetItemEnabled(CPURunning);
 
         DebugR4300Menu.push_back(Item);
         //Item.Reset(ID_DEBUGGER_R4300REGISTERS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"R4300i &Registers...");
@@ -1127,36 +1126,36 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
         Item.Reset(ID_DEBUGGER_BREAKPOINTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Breakpoint...");
         //Item.SetItemEnabled(CPURunning);
         DebugMenu.push_back(Item);
-        
-		/* Debugger - Symbols
-		****************/
-		Item.Reset(ID_DEBUGGER_SYMBOLS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Symbols...");
-		//Item.SetItemEnabled(CPURunning);
-		DebugMenu.push_back(Item);
 
-		/* Debug - Scripts
-		*******************/
-		Item.Reset(ID_DEBUGGER_SCRIPTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Scripts...");
-		//Item.SetItemEnabled(CPURunning);
-		DebugMenu.push_back(Item);
-		
-		/* Debug - DMA Log
-		*******************/
-		Item.Reset(ID_DEBUGGER_DMALOG, EMPTY_STRING, EMPTY_STDSTR, NULL, L"DMA Log...");
-		//Item.SetItemEnabled(CPURunning);
-		DebugMenu.push_back(Item);
+        /* Debugger - Symbols
+        ****************/
+        Item.Reset(ID_DEBUGGER_SYMBOLS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Symbols...");
+        //Item.SetItemEnabled(CPURunning);
+        DebugMenu.push_back(Item);
 
-		/* Debug - Stack
-		*******************/
-		Item.Reset(ID_DEBUGGER_STACKVIEW, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack...");
-		DebugMenu.push_back(Item);
+        /* Debug - Scripts
+        *******************/
+        Item.Reset(ID_DEBUGGER_SCRIPTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Scripts...");
+        //Item.SetItemEnabled(CPURunning);
+        DebugMenu.push_back(Item);
 
-		/* Debug - Stack Trace
-		*******************/
-		Item.Reset(ID_DEBUGGER_STACKTRACE, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack Trace...");
-		DebugMenu.push_back(Item);
+        /* Debug - DMA Log
+        *******************/
+        Item.Reset(ID_DEBUGGER_DMALOG, EMPTY_STRING, EMPTY_STDSTR, NULL, L"DMA Log...");
+        //Item.SetItemEnabled(CPURunning);
+        DebugMenu.push_back(Item);
 
-		DebugMenu.push_back(MENU_ITEM(SPLITER));
+        /* Debug - Stack
+        *******************/
+        Item.Reset(ID_DEBUGGER_STACKVIEW, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack...");
+        DebugMenu.push_back(Item);
+
+        /* Debug - Stack Trace
+        *******************/
+        Item.Reset(ID_DEBUGGER_STACKTRACE, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack Trace...");
+        DebugMenu.push_back(Item);
+
+        DebugMenu.push_back(MENU_ITEM(SPLITER));
 
         /* Debug - RSP
         *******************/
@@ -1344,4 +1343,4 @@ void CMainMenu::ResetMenu(void)
     ResetAccelerators();
 
     WriteTrace(TraceUserInterface, TraceDebug, "Done");
-}
+}
\ No newline at end of file