Refactoring - Moved some leftover files out of the root folder

2025-04-02 10:21:44 -04:00 · 2022-09-08 21:48:49 -04:00 · 2022-09-08 21:48:49 -04:00 · 7108bdde36
commit 7108bdde36
parent 152abf690b
90 changed files with 120 additions and 120 deletions
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@ -429,7 +429,7 @@
    <ClInclude Include="Shared\ControllerHub.h" />
    <ClInclude Include="Shared\Interfaces\IAudioProvider.h" />
    <ClInclude Include="Shared\Interfaces\IBattery.h" />
-    <ClInclude Include="MemoryOperationType.h" />
+    <ClInclude Include="Shared\MemoryOperationType.h" />
    <ClInclude Include="Shared\Interfaces\ITapeRecorder.h" />
    <ClInclude Include="Shared\KeyDefinitions.h" />
    <ClInclude Include="Shared\RenderedFrame.h" />
@ -546,7 +546,7 @@
    <ClInclude Include="Shared\Video\BaseRenderer.h" />
    <ClInclude Include="Shared\Audio\BaseSoundManager.h" />
    <ClInclude Include="Shared\Video\BaseVideoFilter.h" />
-    <ClInclude Include="FirmwareHelper.h" />
+    <ClInclude Include="Shared\FirmwareHelper.h" />
    <ClInclude Include="Debugger\Breakpoint.h" />
    <ClInclude Include="Debugger\BreakpointManager.h" />
    <ClInclude Include="Debugger\CallstackManager.h" />
@ -565,7 +565,7 @@
    <ClInclude Include="SNES\Debugger\DummySpc.h" />
    <ClInclude Include="Shared\EmuSettings.h" />
    <ClInclude Include="SNES\Debugger\SnesEventManager.h" />
-    <ClInclude Include="EventType.h" />
+    <ClInclude Include="Shared\EventType.h" />
    <ClInclude Include="Debugger\ExpressionEvaluator.h" />
    <ClInclude Include="Debugger\LabelManager.h" />
    <ClInclude Include="Debugger\LuaApi.h" />
@ -626,7 +626,7 @@
    <ClInclude Include="SNES\RegisterHandlerA.h" />
    <ClInclude Include="Shared\RewindData.h" />
    <ClInclude Include="Shared\RewindManager.h" />
-    <ClInclude Include="RomFinder.h" />
+    <ClInclude Include="Shared\RomFinder.h" />
    <ClInclude Include="SNES\RomHandler.h" />
    <ClInclude Include="SNES\Coprocessors\SPC7110\Rtc4513.h" />
    <ClInclude Include="SNES\Coprocessors\SA1\Sa1.h" />
@ -650,7 +650,7 @@
    <ClInclude Include="Shared\SettingTypes.h" />
    <ClInclude Include="Shared\ShortcutKeyHandler.h" />
    <ClInclude Include="SNES\Input\SnesController.h" />
-    <ClInclude Include="MemoryType.h" />
+    <ClInclude Include="Shared\MemoryType.h" />
    <ClInclude Include="SNES\Input\SnesMouse.h" />
    <ClInclude Include="Shared\Audio\SoundMixer.h" />
    <ClInclude Include="Shared\Audio\SoundResampler.h" />
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <None Include="Core.ruleset" />
-    <ClInclude Include="EventType.h" />
-    <ClInclude Include="FirmwareHelper.h" />
-    <ClInclude Include="MemoryOperationType.h" />
-    <ClInclude Include="MemoryType.h" />
-    <ClInclude Include="RomFinder.h" />
+    <ClInclude Include="Shared\EventType.h" />
+    <ClInclude Include="Shared\FirmwareHelper.h" />
+    <ClInclude Include="Shared\MemoryOperationType.h" />
+    <ClInclude Include="Shared\MemoryType.h" />
+    <ClInclude Include="Shared\RomFinder.h" />
    <ClCompile Include="pch.cpp" />
    <ClInclude Include="pch.h" />
    <ClCompile Include="Debugger\BaseEventManager.cpp">
--- a/Core/Debugger/BreakpointManager.cpp
+++ b/Core/Debugger/BreakpointManager.cpp
@ -6,7 +6,7 @@
 #include "Debugger/DebugUtilities.h"
 #include "Debugger/ExpressionEvaluator.h"
 #include "Debugger/BaseEventManager.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 BreakpointManager::BreakpointManager(Debugger *debugger, IDebugger* cpuDebugger, CpuType cpuType, BaseEventManager* eventManager)
 {
--- a/Core/Debugger/CdlManager.h
+++ b/Core/Debugger/CdlManager.h
@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"
 #include "Debugger/DebugTypes.h"
 #include "Debugger/DebugUtilities.h"

--- a/Core/Debugger/DebugTypes.h
+++ b/Core/Debugger/DebugTypes.h
@ -1,8 +1,8 @@
 #pragma once
 #include "pch.h"
-#include "Core/MemoryOperationType.h"
-#include "Core/Shared/CpuType.h"
-#include "Core/Debugger/DisassemblyInfo.h"
+#include "Shared/MemoryOperationType.h"
+#include "Shared/CpuType.h"
+#include "Debugger/DisassemblyInfo.h"

 enum class MemoryType;
 enum class CpuType : uint8_t;
--- a/Core/Debugger/DebugUtilities.h
+++ b/Core/Debugger/DebugUtilities.h
@ -1,7 +1,7 @@
 #pragma once
 #include "pch.h"
-#include "Core/Debugger/DebugTypes.h"
-#include "Core/MemoryType.h"
+#include "Debugger/DebugTypes.h"
+#include "Shared/MemoryType.h"
 #include "Utilities/HexUtilities.h"

 class DebugUtilities
--- a/Core/Debugger/Debugger.cpp
+++ b/Core/Debugger/Debugger.cpp
@ -46,8 +46,8 @@
 #include "Utilities/HexUtilities.h"
 #include "Utilities/FolderUtilities.h"
 #include "Utilities/Patches/IpsPatcher.h"
-#include "MemoryOperationType.h"
-#include "EventType.h"
+#include "Shared/MemoryOperationType.h"
+#include "Shared/EventType.h"

 uint64_t ITraceLogger::NextRowId = 0;

--- a/Core/Debugger/LuaApi.cpp
+++ b/Core/Debugger/LuaApi.cpp
@ -27,7 +27,7 @@
 #include "Utilities/HexUtilities.h"
 #include "Utilities/FolderUtilities.h"
 #include "Utilities/magic_enum.hpp"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 #ifdef _MSC_VER
 //TODO MSVC seems to trigger this by mistake because of the macros?
--- a/Core/Debugger/LuaApi.h
+++ b/Core/Debugger/LuaApi.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "Shared/CpuType.h"
 #include "Shared/SettingTypes.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 struct lua_State;
 class ScriptingContext;
--- a/Core/Debugger/LuaCallHelper.h
+++ b/Core/Debugger/LuaCallHelper.h
@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "../Lua/lua.hpp"
+#include "Lua/lua.hpp"

 template<typename T>
 struct Nullable
--- a/Core/Debugger/MemoryAccessCounter.h
+++ b/Core/Debugger/MemoryAccessCounter.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "Debugger/DebugTypes.h"
 #include "Debugger/DebugUtilities.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class Debugger;
 class SnesMemoryManager;
--- a/Core/Debugger/MemoryDumper.h
+++ b/Core/Debugger/MemoryDumper.h
@ -3,7 +3,7 @@
 #include <unordered_map>
 #include "Debugger/DebugTypes.h"
 #include "Debugger/DebugUtilities.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class SnesMemoryManager;
 class NesConsole;
--- a/Core/Debugger/ScriptHost.cpp
+++ b/Core/Debugger/ScriptHost.cpp
@ -2,8 +2,8 @@
 #include "Debugger/ScriptHost.h"
 #include "Debugger/ScriptingContext.h"
 #include "Debugger/ScriptingContext.h"
-#include "EventType.h"
-#include "MemoryOperationType.h"
+#include "Shared/EventType.h"
+#include "Shared/MemoryOperationType.h"

 ScriptHost::ScriptHost(int scriptId)
 {
--- a/Core/Debugger/ScriptHost.h
+++ b/Core/Debugger/ScriptHost.h
@ -2,8 +2,8 @@
 #include "pch.h"
 #include "Debugger/DebugTypes.h"
 #include "Debugger/ScriptingContext.h"
-#include "EventType.h"
-#include "MemoryOperationType.h"
+#include "Shared/EventType.h"
+#include "Shared/MemoryOperationType.h"
 #include "Utilities/safe_ptr.h"

 class Debugger;
--- a/Core/Debugger/ScriptManager.cpp
+++ b/Core/Debugger/ScriptManager.cpp
@ -5,7 +5,7 @@
 #include "Debugger/Debugger.h"
 #include "Shared/Emulator.h"
 #include "Shared/Video/DebugHud.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 ScriptManager::ScriptManager(Debugger* debugger)
 {
--- a/Core/Debugger/ScriptManager.h
+++ b/Core/Debugger/ScriptManager.h
@ -3,7 +3,7 @@
 #include "Debugger/DebugTypes.h"
 #include "Debugger/ScriptHost.h"
 #include "Utilities/SimpleLock.h"
-#include "EventType.h"
+#include "Shared/EventType.h"

 class Debugger;
 enum class MemoryOperationType;
--- a/Core/Debugger/ScriptingContext.cpp
+++ b/Core/Debugger/ScriptingContext.cpp
@ -12,7 +12,7 @@
 #include "Shared/EmuSettings.h"
 #include "Shared/SaveStateManager.h"
 #include "Utilities/magic_enum.hpp"
-#include "EventType.h"
+#include "Shared/EventType.h"

 ScriptingContext* ScriptingContext::_context = nullptr;

--- a/Core/Debugger/ScriptingContext.h
+++ b/Core/Debugger/ScriptingContext.h
@ -4,7 +4,7 @@
 #include "Utilities/SimpleLock.h"
 #include "Utilities/Timer.h"
 #include "Debugger/DebugTypes.h"
-#include "EventType.h"
+#include "Shared/EventType.h"

 class Debugger;
 struct lua_State;
--- a/Core/Gameboy/Debugger/GbDebugger.cpp
+++ b/Core/Gameboy/Debugger/GbDebugger.cpp
@ -28,7 +28,7 @@
 #include "Shared/EmuSettings.h"
 #include "Shared/Emulator.h"
 #include "Shared/BaseControlManager.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 GbDebugger::GbDebugger(Debugger* debugger)
 {
--- a/Core/Gameboy/Gameboy.cpp
+++ b/Core/Gameboy/Gameboy.cpp
@ -24,7 +24,7 @@
 #include "Shared/MessageManager.h"
 #include "Utilities/VirtualFile.h"
 #include "Utilities/Serializer.h"
-#include "FirmwareHelper.h"
+#include "Shared/FirmwareHelper.h"

 Gameboy::Gameboy(Emulator* emu, bool allowSgb)
 {
--- a/Core/Gameboy/GbMemoryManager.cpp
+++ b/Core/Gameboy/GbMemoryManager.cpp
@ -18,7 +18,7 @@
 #include "Utilities/VirtualFile.h"
 #include "Utilities/Serializer.h"
 #include "Utilities/HexUtilities.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 void GbMemoryManager::Init(Emulator* emu, Gameboy* gameboy, GbCart* cart, GbPpu* ppu, GbApu* apu, GbTimer* timer, GbDmaController* dmaController)
 {
--- a/Core/Gameboy/GbPpu.cpp
+++ b/Core/Gameboy/GbPpu.cpp
@ -16,7 +16,7 @@
 #include "SNES/Coprocessors/SGB/SuperGameboy.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/Serializer.h"
-#include "EventType.h"
+#include "Shared/EventType.h"

 constexpr uint16_t evtColors[6] = { 0x18C6, 0x294A, 0x108C, 0x4210, 0x3084, 0x1184 };

--- a/Core/Gameboy/GbTypes.h
+++ b/Core/Gameboy/GbTypes.h
@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"
 #include "Shared/BaseState.h"

 struct GbCpuState : BaseState
--- a/Core/NES/BaseMapper.cpp
+++ b/Core/NES/BaseMapper.cpp
@ -15,8 +15,8 @@
 #include "Utilities/FolderUtilities.h"
 #include "Utilities/Patches/IpsPatcher.h"
 #include "Utilities/Serializer.h"
-#include "MemoryType.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryType.h"
+#include "Shared/MemoryOperationType.h"

 void BaseMapper::WriteRegister(uint16_t addr, uint8_t value) { }
 uint8_t BaseMapper::ReadRegister(uint16_t addr) { return 0; }
--- a/Core/NES/BaseMapper.h
+++ b/Core/NES/BaseMapper.h
@ -6,7 +6,7 @@
 #include "NES/RomData.h"
 #include "Debugger/DebugTypes.h"
 #include "Shared/Emulator.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"
 #include "Utilities/ISerializable.h"

 class NesConsole;
--- a/Core/NES/Debugger/NesDebugger.cpp
+++ b/Core/NES/Debugger/NesDebugger.cpp
@ -34,7 +34,7 @@
 #include "Shared/SettingTypes.h"
 #include "Shared/BaseControlManager.h"
 #include "Shared/Emulator.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 NesDebugger::NesDebugger(Debugger* debugger)
 {
--- a/Core/NES/Debugger/NesDisUtils.cpp
+++ b/Core/NES/Debugger/NesDisUtils.cpp
@ -8,7 +8,7 @@
 #include "Debugger/MemoryDumper.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/FastString.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 static constexpr uint8_t _opSize[17] = {
 	1, 1, 1, 2, 2,
--- a/Core/NES/INesMemoryHandler.h
+++ b/Core/NES/INesMemoryHandler.h
@ -1,7 +1,7 @@
 #pragma once

-#include "../pch.h"
-#include "NesTypes.h"
+#include "pch.h"
+#include "NES/NesTypes.h"

 class MemoryRanges
 {
--- a/Core/NES/MapperFactory.h
+++ b/Core/NES/MapperFactory.h
@ -1,5 +1,5 @@
 #pragma once
-#include "../pch.h"
+#include "pch.h"

 class NesConsole;
 class BaseMapper;
--- a/Core/NES/Mappers/FDS/Fds.cpp
+++ b/Core/NES/Mappers/FDS/Fds.cpp
@ -12,7 +12,7 @@
 #include "Shared/BaseControlManager.h"
 #include "Shared/Movies/MovieManager.h"
 #include "Shared/NotificationManager.h"
-#include "FirmwareHelper.h"
+#include "Shared/FirmwareHelper.h"
 #include "Utilities/Patches/IpsPatcher.h"
 #include "Utilities/Serializer.h"

--- a/Core/NES/Mappers/StudyBox.h
+++ b/Core/NES/Mappers/StudyBox.h
@ -12,7 +12,7 @@
 #include "Utilities/StringUtilities.h"
 #include "Utilities/Serializer.h"
 #include "Utilities/HexUtilities.h"
-#include "FirmwareHelper.h"
+#include "Shared/FirmwareHelper.h"

 class StudyBox : public BaseMapper, IAudioProvider
 {
--- a/Core/NES/Mappers/Unlicensed/Supervision.h
+++ b/Core/NES/Mappers/Unlicensed/Supervision.h
@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "../Utilities/CRC32.h"
+#include "Utilities/CRC32.h"
 #include "NES/BaseMapper.h"

 class Supervision : public BaseMapper
--- a/Core/NES/NesCpu.cpp
+++ b/Core/NES/NesCpu.cpp
@ -11,7 +11,7 @@
 #include "Shared/MessageManager.h"
 #include "Shared/EmuSettings.h"
 #include "Shared/Emulator.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 NesCpu::NesCpu(NesConsole* console)
 {
--- a/Core/NES/NesCpu.h
+++ b/Core/NES/NesCpu.h
@ -8,7 +8,7 @@
 #include "pch.h"
 #include "Utilities/ISerializable.h"
 #include "NesTypes.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 enum class ConsoleRegion;
 class NesConsole;
--- a/Core/NES/NesMemoryManager.cpp
+++ b/Core/NES/NesMemoryManager.cpp
@ -6,7 +6,7 @@
 #include "Shared/Emulator.h"
 #include "Shared/EmuSettings.h"
 #include "Utilities/Serializer.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 NesMemoryManager::NesMemoryManager(NesConsole* console, BaseMapper* mapper)
 {
--- a/Core/NES/NesMemoryManager.h
+++ b/Core/NES/NesMemoryManager.h
@ -1,12 +1,12 @@
 #pragma once

-#include "../pch.h"
-#include "../../Utilities/ISerializable.h"
+#include "pch.h"

-#include "INesMemoryHandler.h"
-#include "OpenBusHandler.h"
-#include "InternalRamHandler.h"
-#include "MemoryOperationType.h"
+#include "NES/INesMemoryHandler.h"
+#include "NES/OpenBusHandler.h"
+#include "NES/InternalRamHandler.h"
+#include "Shared/MemoryOperationType.h"
+#include "Utilities/ISerializable.h"

 class BaseMapper;
 class CheatManager;
--- a/Core/NES/NesPpu.cpp
+++ b/Core/NES/NesPpu.cpp
@ -22,9 +22,9 @@
 #include "Shared/RewindManager.h"
 #include "Shared/NotificationManager.h"
 #include "Shared/RenderedFrame.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

-#include "EventType.h"
+#include "Shared/EventType.h"

 template<class T> NesPpu<T>::NesPpu(NesConsole* console)
 {
--- a/Core/NES/NesPpu.h
+++ b/Core/NES/NesPpu.h
@ -7,7 +7,7 @@
 #include "NES/BaseMapper.h"
 #include "NES/NesTypes.h"
 #include "NES/INesMemoryHandler.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 enum class ConsoleRegion;

--- a/Core/NES/RomData.h
+++ b/Core/NES/RomData.h
@ -1,8 +1,8 @@
 #pragma once
-#include "../pch.h"
+#include "pch.h"

-#include "NesTypes.h"
-#include "NesHeader.h"
+#include "NES/NesTypes.h"
+#include "NES/NesHeader.h"
 #include "Shared/RomInfo.h"

 enum class RomHeaderVersion
--- a/Core/Netplay/GameClientConnection.cpp
+++ b/Core/Netplay/GameClientConnection.cpp
@ -15,7 +15,7 @@
 #include "Shared/Emulator.h"
 #include "Shared/EmuSettings.h"
 #include "Shared/NotificationManager.h"
-#include "RomFinder.h"
+#include "Shared/RomFinder.h"

 GameClientConnection::GameClientConnection(Emulator* emu, unique_ptr<Socket> socket, ClientConnectionData &connectionData) : GameConnection(emu, std::move(socket))
 {
--- a/Core/PCE/Debugger/PceDebugger.cpp
+++ b/Core/PCE/Debugger/PceDebugger.cpp
@ -31,7 +31,7 @@
 #include "Shared/EmuSettings.h"
 #include "Shared/SettingTypes.h"
 #include "Shared/Emulator.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 PceDebugger::PceDebugger(Debugger* debugger)
 {
--- a/Core/PCE/Debugger/PceDisUtils.cpp
+++ b/Core/PCE/Debugger/PceDisUtils.cpp
@ -9,7 +9,7 @@
 #include "Debugger/MemoryDumper.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/FastString.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 static constexpr uint8_t _opSize[24] = {
 	1, 1, 1, 2, 2,
--- a/Core/PCE/PceCdRom.h
+++ b/Core/PCE/PceCdRom.h
@ -5,7 +5,7 @@
 #include "PCE/PceCdAudioPlayer.h"
 #include "PCE/PceTypes.h"
 #include "PCE/PceAudioFader.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"
 #include "Shared/CdReader.h"
 #include "Utilities/ISerializable.h"

--- a/Core/PCE/PceConsole.cpp
+++ b/Core/PCE/PceConsole.cpp
@ -19,8 +19,8 @@
 #include "PCE/HesFileData.h"
 #include "Utilities/Serializer.h"
 #include "Utilities/CRC32.h"
-#include "MemoryType.h"
-#include "FirmwareHelper.h"
+#include "Shared/MemoryType.h"
+#include "Shared/FirmwareHelper.h"

 PceConsole::PceConsole(Emulator* emu)
 {
--- a/Core/PCE/PceCpu.h
+++ b/Core/PCE/PceCpu.h
@ -8,7 +8,7 @@
 #include "pch.h"
 #include "PCE/PceTypes.h"
 #include "Utilities/ISerializable.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 class Emulator;
 class PceMemoryManager;
--- a/Core/PCE/PceMemoryManager.h
+++ b/Core/PCE/PceMemoryManager.h
@ -6,7 +6,7 @@
 #include "Shared/CheatManager.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/ISerializable.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 class PceConsole;
 class PceVpc;
--- a/Core/PCE/PceVce.cpp
+++ b/Core/PCE/PceVce.cpp
@ -5,7 +5,7 @@
 #include "Shared/EmuSettings.h"
 #include "Shared/CpuType.h"
 #include "Utilities/Serializer.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 PceVce::PceVce(Emulator* emu, PceConsole* console)
 {
--- a/Core/PCE/PceVdc.cpp
+++ b/Core/PCE/PceVdc.cpp
@ -7,7 +7,7 @@
 #include "PCE/PceConsole.h"
 #include "Shared/EmuSettings.h"
 #include "Utilities/Serializer.h"
-#include "EventType.h"
+#include "Shared/EventType.h"

 PceVdc::PceVdc(Emulator* emu, PceConsole* console, PceVpc* vpc, PceVce* vce, bool isVdc2)
 {
--- a/Core/PCE/PceVdc.h
+++ b/Core/PCE/PceVdc.h
@ -1,7 +1,7 @@
 #pragma once
 #include "pch.h"
 #include "Shared/Emulator.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"
 #include "PCE/PceTypes.h"
 #include "PCE/PceConstants.h"
 #include "Utilities/ISerializable.h"
--- a/Core/PCE/PceVpc.cpp
+++ b/Core/PCE/PceVpc.cpp
@ -12,7 +12,7 @@
 #include "Shared/Video/VideoRenderer.h"
 #include "Shared/NotificationManager.h"
 #include "Utilities/Serializer.h"
-#include "EventType.h"
+#include "Shared/EventType.h"

 PceVpc::PceVpc(Emulator* emu, PceConsole* console, PceVce* vce)
 {
--- a/Core/SNES/BaseCartridge.cpp
+++ b/Core/SNES/BaseCartridge.cpp
@ -30,7 +30,7 @@
 #include "Utilities/Serializer.h"
 #include "Utilities/sha1.h"
 #include "Utilities/CRC32.h"
-#include "FirmwareHelper.h"
+#include "Shared/FirmwareHelper.h"

 BaseCartridge::~BaseCartridge()
 {
--- a/Core/SNES/Coprocessors/BaseCoprocessor.h
+++ b/Core/SNES/Coprocessors/BaseCoprocessor.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "Utilities/ISerializable.h"
 #include "SNES/IMemoryHandler.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class BaseCoprocessor : public ISerializable, public IMemoryHandler
 {
--- a/Core/SNES/Coprocessors/DSP/NecDsp.cpp
+++ b/Core/SNES/Coprocessors/DSP/NecDsp.cpp
@ -11,7 +11,7 @@
 #include "Shared/MessageManager.h"
 #include "Shared/EmuSettings.h"
 #include "Shared/BatteryManager.h"
-#include "FirmwareHelper.h"
+#include "Shared/FirmwareHelper.h"
 #include "Utilities/FolderUtilities.h"
 #include "Utilities/Serializer.h"

--- a/Core/SNES/Coprocessors/GSU/Gsu.cpp
+++ b/Core/SNES/Coprocessors/GSU/Gsu.cpp
@ -13,7 +13,7 @@
 #include "Shared/BatteryManager.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/Serializer.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 Gsu::Gsu(SnesConsole *console, uint32_t gsuRamSize)
 {
--- a/Core/SNES/Coprocessors/GSU/GsuRamHandler.h
+++ b/Core/SNES/Coprocessors/GSU/GsuRamHandler.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "SNES/IMemoryHandler.h"
 #include "SNES/Coprocessors/GSU/GsuTypes.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class GsuRamHandler : public IMemoryHandler
 {
--- a/Core/SNES/Coprocessors/GSU/GsuRomHandler.h
+++ b/Core/SNES/Coprocessors/GSU/GsuRomHandler.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "SNES/IMemoryHandler.h"
 #include "SNES/Coprocessors/GSU/GsuTypes.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class GsuRomHandler : public IMemoryHandler
 {
--- a/Core/SNES/Coprocessors/SA1/Sa1.cpp
+++ b/Core/SNES/Coprocessors/SA1/Sa1.cpp
@ -17,7 +17,7 @@
 #include "Shared/BatteryManager.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/Serializer.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 Sa1::Sa1(SnesConsole* console)
 {
--- a/Core/SNES/Coprocessors/SA1/Sa1Cpu.cpp
+++ b/Core/SNES/Coprocessors/SA1/Sa1Cpu.cpp
@ -6,8 +6,8 @@
 #include "SNES/SnesMemoryManager.h"
 #include "SNES/Coprocessors/SA1/Sa1.h"
 #include "SNES/MemoryMappings.h"
-#include "MemoryOperationType.h"
-#include "EventType.h"
+#include "Shared/MemoryOperationType.h"
+#include "Shared/EventType.h"

 #define SnesCpu Sa1Cpu
 #include "SNES/SnesCpu.Instructions.h"
--- a/Core/SNES/Coprocessors/SA1/Sa1Cpu.h
+++ b/Core/SNES/Coprocessors/SA1/Sa1Cpu.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "SNES/SnesCpuTypes.h"
 #include "Utilities/ISerializable.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 class Sa1;
 class Emulator;
--- a/Core/SNES/Coprocessors/SA1/Sa1IRamHandler.h
+++ b/Core/SNES/Coprocessors/SA1/Sa1IRamHandler.h
@ -2,7 +2,7 @@
 #include "pch.h"
 #include "SNES/IMemoryHandler.h"
 #include "Debugger/DebugTypes.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class Sa1IRamHandler : public IMemoryHandler
 {
--- a/Core/SNES/Coprocessors/SDD1/Sdd1Mmc.cpp
+++ b/Core/SNES/Coprocessors/SDD1/Sdd1Mmc.cpp
@ -3,7 +3,7 @@
 #include "Sdd1Types.h"
 #include "SNES/BaseCartridge.h"
 #include "Utilities/Serializer.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 Sdd1Mmc::Sdd1Mmc(Sdd1State &state, BaseCartridge *cart) : IMemoryHandler(MemoryType::SnesRegister)
 {
--- a/Core/SNES/Debugger/Cx4Debugger.cpp
+++ b/Core/SNES/Debugger/Cx4Debugger.cpp
@ -18,7 +18,7 @@
 #include "Shared/Emulator.h"
 #include "Shared/EmuSettings.h"
 #include "SNES/MemoryMappings.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 Cx4Debugger::Cx4Debugger(Debugger* debugger)
 {
--- a/Core/SNES/Debugger/GsuDebugger.cpp
+++ b/Core/SNES/Debugger/GsuDebugger.cpp
@ -15,7 +15,7 @@
 #include "Debugger/Debugger.h"
 #include "Debugger/MemoryAccessCounter.h"
 #include "Debugger/CodeDataLogger.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"
 #include "Shared/Emulator.h"
 #include "Shared/EmuSettings.h"

--- a/Core/SNES/Debugger/GsuDisUtils.cpp
+++ b/Core/SNES/Debugger/GsuDisUtils.cpp
@ -6,7 +6,7 @@
 #include "Shared/EmuSettings.h"
 #include "Utilities/FastString.h"
 #include "Utilities/HexUtilities.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 void GsuDisUtils::GetDisassembly(DisassemblyInfo &info, string &out, uint32_t memoryAddr, LabelManager *labelManager, EmuSettings *settings)
 {
--- a/Core/SNES/Debugger/NecDspDebugger.cpp
+++ b/Core/SNES/Debugger/NecDspDebugger.cpp
@ -15,7 +15,7 @@
 #include "Debugger/ExpressionEvaluator.h"
 #include "Shared/Emulator.h"
 #include "Shared/EmuSettings.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 NecDspDebugger::NecDspDebugger(Debugger* debugger)
 {
--- a/Core/SNES/Debugger/NecDspDisUtils.cpp
+++ b/Core/SNES/Debugger/NecDspDisUtils.cpp
@ -6,7 +6,7 @@
 #include "Shared/EmuSettings.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/FastString.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 void NecDspDisUtils::GetDisassembly(DisassemblyInfo &info, string &out, uint32_t memoryAddr, LabelManager *labelManager, EmuSettings* settings)
 {
--- a/Core/SNES/Debugger/SnesDebugger.cpp
+++ b/Core/SNES/Debugger/SnesDebugger.cpp
@ -36,7 +36,7 @@
 #include "Utilities/FolderUtilities.h"
 #include "Utilities/Patches/IpsPatcher.h"
 #include "Utilities/CRC32.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 SnesDebugger::SnesDebugger(Debugger* debugger, CpuType cpuType)
 {
--- a/Core/SNES/Debugger/SpcDebugger.cpp
+++ b/Core/SNES/Debugger/SpcDebugger.cpp
@ -15,7 +15,7 @@
 #include "Debugger/ExpressionEvaluator.h"
 #include "Shared/EmuSettings.h"
 #include "Shared/Emulator.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 SpcDebugger::SpcDebugger(Debugger* debugger)
 {
--- a/Core/SNES/MemoryMappings.cpp
+++ b/Core/SNES/MemoryMappings.cpp
@ -1,7 +1,7 @@
 #include "pch.h"
 #include "MemoryMappings.h"
 #include "IMemoryHandler.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 void MemoryMappings::RegisterHandler(uint8_t startBank, uint8_t endBank, uint16_t startPage, uint16_t endPage, vector<unique_ptr<IMemoryHandler>> &handlers, uint16_t pageIncrement, uint16_t startPageNumber)
 {
--- a/Core/SNES/SnesConsole.cpp
+++ b/Core/SNES/SnesConsole.cpp
@ -32,7 +32,7 @@
 #include "Utilities/VirtualFile.h"
 #include "Utilities/PlatformUtilities.h"
 #include "Utilities/FolderUtilities.h"
-#include "EventType.h"
+#include "Shared/EventType.h"
 #include "SNES/RegisterHandlerA.h"
 #include "SNES/RegisterHandlerB.h"

--- a/Core/SNES/SnesControlManager.cpp
+++ b/Core/SNES/SnesControlManager.cpp
@ -12,7 +12,7 @@
 #include "SNES/Input/SnesMouse.h"
 #include "SNES/Input/Multitap.h"
 #include "SNES/Input/SuperScope.h"
-#include "EventType.h"
+#include "Shared/EventType.h"
 #include "Utilities/Serializer.h"
 #include "Shared/SystemActionManager.h"

--- a/Core/SNES/SnesCpu.cpp
+++ b/Core/SNES/SnesCpu.cpp
@ -9,8 +9,8 @@
 #include "SNES/SnesDmaController.h"
 #include "SNES/SnesCpu.Instructions.h"
 #include "SNES/SnesCpu.Shared.h"
-#include "EventType.h"
-#include "MemoryOperationType.h"
+#include "Shared/EventType.h"
+#include "Shared/MemoryOperationType.h"

 #ifndef DUMMYCPU
 SnesCpu::SnesCpu(SnesConsole *console)
--- a/Core/SNES/SnesCpu.h
+++ b/Core/SNES/SnesCpu.h
@ -8,7 +8,7 @@
 #include "pch.h"
 #include "SNES/SnesCpuTypes.h"
 #include "Utilities/ISerializable.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 class MemoryMappings;
 class SnesMemoryManager;
--- a/Core/SNES/SnesMemoryManager.cpp
+++ b/Core/SNES/SnesMemoryManager.cpp
@ -15,7 +15,7 @@
 #include "Shared/CheatManager.h"
 #include "Utilities/Serializer.h"
 #include "Utilities/HexUtilities.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 void SnesMemoryManager::Initialize(SnesConsole *console)
 {
--- a/Core/SNES/SnesMemoryManager.h
+++ b/Core/SNES/SnesMemoryManager.h
@ -3,7 +3,7 @@
 #include "Debugger/DebugTypes.h"
 #include "MemoryMappings.h"
 #include "Utilities/ISerializable.h"
-#include "MemoryType.h"
+#include "Shared/MemoryType.h"

 class IMemoryHandler;
 class RegisterHandlerA;
--- a/Core/SNES/SnesPpu.cpp
+++ b/Core/SNES/SnesPpu.cpp
@ -16,7 +16,7 @@
 #include "Shared/NotificationManager.h"
 #include "Shared/RenderedFrame.h"
 #include "Shared/MessageManager.h"
-#include "EventType.h"
+#include "Shared/EventType.h"
 #include "Shared/RewindManager.h"
 #include "Utilities/HexUtilities.h"
 #include "Utilities/Serializer.h"
--- a/Core/SNES/Spc.cpp
+++ b/Core/SNES/Spc.cpp
@ -16,7 +16,7 @@
 #include "Shared/EmuSettings.h"
 #include "Shared/Audio/SoundMixer.h"
 #include "Utilities/Serializer.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"

 Spc::Spc(SnesConsole* console)
 {
--- a/Core/SNES/Spc.h
+++ b/Core/SNES/Spc.h
@ -10,7 +10,7 @@
 #include "SNES/DSP/DspTypes.h"
 #include "SNES/SnesCpuTypes.h"
 #include "SNES/SpcTimer.h"
-#include "MemoryOperationType.h"
+#include "Shared/MemoryOperationType.h"
 #include "Utilities/ISerializable.h"

 class SnesConsole;
--- a/Core/Shared/BaseControlManager.cpp
+++ b/Core/Shared/BaseControlManager.cpp
@ -8,7 +8,7 @@
 #include "Shared/Interfaces/IInputProvider.h"
 #include "Shared/Interfaces/IInputRecorder.h"
 #include "SystemActionManager.h"
-#include "EventType.h"
+#include "Shared/EventType.h"
 #include "Utilities/Serializer.h"
 #include "Shared/MessageManager.h"

--- a/Core/Shared/Emulator.cpp
+++ b/Core/Shared/Emulator.cpp
@ -44,8 +44,8 @@
 #include "Utilities/VirtualFile.h"
 #include "Utilities/PlatformUtilities.h"
 #include "Utilities/FolderUtilities.h"
-#include "MemoryOperationType.h"
-#include "EventType.h"
+#include "Shared/MemoryOperationType.h"
+#include "Shared/EventType.h"

 Emulator::Emulator() :
 	_settings(new EmuSettings(this)),
--- a/Core/Shared/EventType.h
+++ b/Core/Shared/EventType.h
--- a/Core/Shared/FirmwareHelper.h
+++ b/Core/Shared/FirmwareHelper.h
@ -3,7 +3,6 @@
 #include "Shared/Emulator.h"
 #include "Shared/NotificationManager.h"
 #include "Utilities/FolderUtilities.h"
-#include "SNES/CartTypes.h"

 enum class FirmwareType
 {
--- a/Core/Shared/MemoryOperationType.h
+++ b/Core/Shared/MemoryOperationType.h
--- a/Core/Shared/MemoryType.h
+++ b/Core/Shared/MemoryType.h
--- a/Core/Shared/RomFinder.h
+++ b/Core/Shared/RomFinder.h
--- a/Core/Shared/SaveStateManager.cpp
+++ b/Core/Shared/SaveStateManager.cpp
@ -9,7 +9,7 @@
 #include "Shared/EmuSettings.h"
 #include "Shared/Movies/MovieManager.h"
 #include "Shared/RenderedFrame.h"
-#include "EventType.h"
+#include "Shared/EventType.h"
 #include "Debugger/Debugger.h"
 #include "Netplay/GameClient.h"
 #include "Shared/Video/VideoDecoder.h"
--- a/Core/pch.h
+++ b/Core/pch.h
@ -33,7 +33,7 @@
 #include <deque>
 #include <algorithm>

-#include "../Utilities/UTF8Util.h"
+#include "Utilities/UTF8Util.h"

 #ifdef _MSC_VER
 	#define __noinline __declspec(noinline)
--- a/Utilities/SZReader.cpp
+++ b/Utilities/SZReader.cpp
@ -2,8 +2,8 @@
 #include <algorithm>
 #include <cstring>
 #include "SZReader.h"
-#include "UTF8Util.h"
-#include "../SevenZip/7zMemBuffer.h"
+#include "Utilities/UTF8Util.h"
+#include "SevenZip/7zMemBuffer.h"

 SZReader::SZReader()
 {
--- a/Utilities/SZReader.h
+++ b/Utilities/SZReader.h
@ -1,11 +1,11 @@
 #pragma once
 #include "pch.h"
-#include "ArchiveReader.h"
-#include "../SevenZip/7z.h"
-#include "../SevenZip/7zAlloc.h"
-#include "../SevenZip/7zCrc.h"
-#include "../SevenZip/7zTypes.h"
-#include "../SevenZip/7zMemBuffer.h"
+#include "Utilities/ArchiveReader.h"
+#include "SevenZip/7z.h"
+#include "SevenZip/7zAlloc.h"
+#include "SevenZip/7zCrc.h"
+#include "SevenZip/7zTypes.h"
+#include "SevenZip/7zMemBuffer.h"

 class SZReader : public ArchiveReader
 {
--- a/Windows/DirectInputManager.h
+++ b/Windows/DirectInputManager.h
@ -1,7 +1,8 @@
 #pragma once
 #include "Common.h"
+#define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
-#include "../Utilities/SimpleLock.h"
+#include "Utilities/SimpleLock.h"

 class Emulator;