From 51cc15687dc2235781f5540dfdb2e6775bbb598c Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Wed, 13 Jan 2016 22:15:30 +1100
Subject: [PATCH] [Project64] get headers to be full path

---
 Source/Project64-core/N64System/Mips/Audio.cpp             | 2 +-
 Source/Project64-core/N64System/Mips/Dma.cpp               | 2 +-
 Source/Project64-core/N64System/Mips/Eeprom.cpp            | 2 +-
 Source/Project64-core/N64System/Mips/FlashRam.cpp          | 2 +-
 Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp  | 2 +-
 Source/Project64-core/N64System/Mips/MemoryVirtualMem.h    | 2 +-
 Source/Project64-core/N64System/Mips/OpcodeName.cpp        | 2 +-
 Source/Project64-core/N64System/Mips/PifRam.cpp            | 2 +-
 Source/Project64-core/N64System/Mips/PifRam.h              | 2 +-
 Source/Project64-core/N64System/Mips/RegisterClass.cpp     | 3 +--
 Source/Project64-core/N64System/Mips/RegisterClass.h       | 1 +
 Source/Project64-core/N64System/Mips/SystemEvents.cpp      | 3 +--
 Source/Project64-core/N64System/Mips/SystemTiming.cpp      | 2 +-
 Source/Project64-core/N64System/Mips/TLBClass.h            | 2 +-
 Source/Project64-core/N64System/Mips/TLBclass.cpp          | 2 +-
 Source/Project64-core/N64System/N64Class.h                 | 7 +++----
 Source/Project64-core/N64System/Recompiler/CodeBlock.cpp   | 3 +--
 Source/Project64-core/N64System/Recompiler/CodeBlock.h     | 6 +++---
 Source/Project64-core/N64System/Recompiler/CodeSection.cpp | 3 ++-
 .../Project64-core/N64System/Recompiler/FunctionInfo.cpp   | 2 +-
 Source/Project64-core/N64System/Recompiler/FunctionInfo.h  | 2 +-
 .../N64System/Recompiler/FunctionMapClass.cpp              | 2 +-
 .../Project64-core/N64System/Recompiler/FunctionMapClass.h | 2 +-
 Source/Project64-core/N64System/Recompiler/JumpInfo.h      | 2 +-
 .../N64System/Recompiler/RecompilerClass.cpp               | 3 ++-
 .../Project64-core/N64System/Recompiler/RecompilerClass.h  | 2 +-
 .../N64System/Recompiler/RecompilerMemory.cpp              | 3 ++-
 .../Project64-core/N64System/Recompiler/RecompilerMemory.h | 2 +-
 .../Project64-core/N64System/Recompiler/RecompilerOps.cpp  | 7 +++----
 Source/Project64-core/N64System/Recompiler/RecompilerOps.h | 2 +-
 Source/Project64-core/N64System/Recompiler/RegInfo.cpp     | 4 ++--
 Source/Project64-core/N64System/Recompiler/RegInfo.h       | 2 +-
 32 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Source/Project64-core/N64System/Mips/Audio.cpp b/Source/Project64-core/N64System/Mips/Audio.cpp
index 6409a34f8..e95376ea2 100644
--- a/Source/Project64-core/N64System/Mips/Audio.cpp
+++ b/Source/Project64-core/N64System/Mips/Audio.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "Audio.h"
+#include <Project64-core/N64System/Mips/Audio.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64Class.h>
 
diff --git a/Source/Project64-core/N64System/Mips/Dma.cpp b/Source/Project64-core/N64System/Mips/Dma.cpp
index ba7b6049e..55fe88b37 100644
--- a/Source/Project64-core/N64System/Mips/Dma.cpp
+++ b/Source/Project64-core/N64System/Mips/Dma.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "Dma.h"
+#include <Project64-core/N64System/Mips/Dma.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64RomClass.h>
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
diff --git a/Source/Project64-core/N64System/Mips/Eeprom.cpp b/Source/Project64-core/N64System/Mips/Eeprom.cpp
index 89cd19247..886137b88 100644
--- a/Source/Project64-core/N64System/Mips/Eeprom.cpp
+++ b/Source/Project64-core/N64System/Mips/Eeprom.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "Eeprom.h"
+#include <Project64-core/N64System/Mips/Eeprom.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <time.h>
diff --git a/Source/Project64-core/N64System/Mips/FlashRam.cpp b/Source/Project64-core/N64System/Mips/FlashRam.cpp
index ef8478563..0125686b0 100644
--- a/Source/Project64-core/N64System/Mips/FlashRam.cpp
+++ b/Source/Project64-core/N64System/Mips/FlashRam.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "FlashRam.h"
+#include <Project64-core/N64System/Mips/FlashRam.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include <Common/path.h>
diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
index 820827efd..d0aa7d664 100644
--- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
+++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "MemoryVirtualMem.h"
+#include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64RomClass.h>
 #include <Project64-core/N64System/N64Class.h>
diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
index b988f5387..16463488e 100644
--- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
+++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #pragma once
-#include "MemoryVirtualMem.h"
+#include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include "TranslateVaddr.h"
 #include <Project64-core/N64System/Recompiler/RecompilerOps.h>
 #include <Project64-core/N64System/Interpreter/InterpreterOps.h>
diff --git a/Source/Project64-core/N64System/Mips/OpcodeName.cpp b/Source/Project64-core/N64System/Mips/OpcodeName.cpp
index 4c5f672b3..102f6cc7f 100644
--- a/Source/Project64-core/N64System/Mips/OpcodeName.cpp
+++ b/Source/Project64-core/N64System/Mips/OpcodeName.cpp
@@ -11,7 +11,7 @@
 #include "stdafx.h"
 #include <stdio.h>
 #include "OpCode.h"
-#include "RegisterClass.h"
+#include <Project64-core/N64System/Mips/RegisterClass.h>
 
 #define FPR_Type(Reg)	(Reg) == R4300i_COP1_S ? "S" : (Reg) == R4300i_COP1_D ? "D" :\
 						(Reg) == R4300i_COP1_W ? "W" : "L"
diff --git a/Source/Project64-core/N64System/Mips/PifRam.cpp b/Source/Project64-core/N64System/Mips/PifRam.cpp
index cf31273ec..361d706ce 100644
--- a/Source/Project64-core/N64System/Mips/PifRam.cpp
+++ b/Source/Project64-core/N64System/Mips/PifRam.cpp
@@ -11,8 +11,8 @@
 #include "stdafx.h"
 #include <stdio.h>
 #include <string.h>
-#include "PifRam.h"
 
+#include <Project64-core/N64System/Mips/PifRam.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/Plugins/ControllerPlugin.h>
 #include <Project64-core/N64System/Mips/RegisterClass.h>
diff --git a/Source/Project64-core/N64System/Mips/PifRam.h b/Source/Project64-core/N64System/Mips/PifRam.h
index ee7b54a7b..b70c02105 100644
--- a/Source/Project64-core/N64System/Mips/PifRam.h
+++ b/Source/Project64-core/N64System/Mips/PifRam.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include <Project64-core/Logging.h>
-#include "Eeprom.h"
+#include <Project64-core/N64System/Mips/Eeprom.h>
 
 class CPifRamSettings
 {
diff --git a/Source/Project64-core/N64System/Mips/RegisterClass.cpp b/Source/Project64-core/N64System/Mips/RegisterClass.cpp
index 4d1e6cd3d..5b9e9aedf 100644
--- a/Source/Project64-core/N64System/Mips/RegisterClass.cpp
+++ b/Source/Project64-core/N64System/Mips/RegisterClass.cpp
@@ -10,8 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include <string.h>
-#include "RegisterClass.h"
-
+#include <Project64-core/N64System/Mips/RegisterClass.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/Logging.h>
diff --git a/Source/Project64-core/N64System/Mips/RegisterClass.h b/Source/Project64-core/N64System/Mips/RegisterClass.h
index 193c6865c..9f6a4befa 100644
--- a/Source/Project64-core/N64System/Mips/RegisterClass.h
+++ b/Source/Project64-core/N64System/Mips/RegisterClass.h
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #pragma once
 
+#include <Common/Platform.h>
 #include <Project64-core/N64System/N64Types.h>
 #include <Project64-core/Settings/DebugSettings.h>
 #include <Project64-core/Settings/GameSettings.h>
diff --git a/Source/Project64-core/N64System/Mips/SystemEvents.cpp b/Source/Project64-core/N64System/Mips/SystemEvents.cpp
index eef98b815..5ae518330 100644
--- a/Source/Project64-core/N64System/Mips/SystemEvents.cpp
+++ b/Source/Project64-core/N64System/Mips/SystemEvents.cpp
@@ -1,4 +1,3 @@
-SysEvent_ChangingFullScreen
 /****************************************************************************
 *                                                                           *
 * Project64 - A Nintendo 64 emulator.                                      *
@@ -10,7 +9,7 @@ SysEvent_ChangingFullScreen
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "SystemEvents.h"
+#include <Project64-core/N64System/Mips/SystemEvents.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64Class.h>
 
diff --git a/Source/Project64-core/N64System/Mips/SystemTiming.cpp b/Source/Project64-core/N64System/Mips/SystemTiming.cpp
index efa7b0557..83f2f7b8e 100644
--- a/Source/Project64-core/N64System/Mips/SystemTiming.cpp
+++ b/Source/Project64-core/N64System/Mips/SystemTiming.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "SystemTiming.h"
+#include <Project64-core/N64System/Mips/SystemTiming.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/Mips/RegisterClass.h>
 #include <Project64-core/N64System/N64Class.h>
diff --git a/Source/Project64-core/N64System/Mips/TLBClass.h b/Source/Project64-core/N64System/Mips/TLBClass.h
index 5cd5cb372..d1a4f6f97 100644
--- a/Source/Project64-core/N64System/Mips/TLBClass.h
+++ b/Source/Project64-core/N64System/Mips/TLBClass.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include <Common/LogClass.h>
-#include "RegisterClass.h"
+#include <Project64-core/N64System/Mips/RegisterClass.h>
 
 class CDebugTlb;
 
diff --git a/Source/Project64-core/N64System/Mips/TLBclass.cpp b/Source/Project64-core/N64System/Mips/TLBclass.cpp
index dbb154f87..780ab9ead 100644
--- a/Source/Project64-core/N64System/Mips/TLBclass.cpp
+++ b/Source/Project64-core/N64System/Mips/TLBclass.cpp
@@ -11,7 +11,7 @@
 #include "stdafx.h"
 #include "TLBClass.h"
 #include <Project64-core/N64System/SystemGlobals.h>
-#include "RegisterClass.h"
+#include <Project64-core/N64System/Mips/RegisterClass.h>
 
 CTLB::CTLB(CTLB_CB * CallBack) :
 m_CB(CallBack)
diff --git a/Source/Project64-core/N64System/N64Class.h b/Source/Project64-core/N64System/N64Class.h
index 8b3ac35d7..40876f865 100644
--- a/Source/Project64-core/N64System/N64Class.h
+++ b/Source/Project64-core/N64System/N64Class.h
@@ -14,16 +14,15 @@
 #include <Project64-core/Settings/N64SystemSettings.h>
 #include <Project64-core/N64System/ProfilingClass.h>
 #include <Project64-core/N64System/Recompiler/RecompilerClass.h>
+#include <Project64-core/N64System/Mips/Audio.h>
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
+#include <Project64-core/N64System/Mips/SystemEvents.h>
+#include <Project64-core/N64System/Mips/SystemTiming.h>
 #include <Project64-core/Settings/DebugSettings.h>
 #include <Project64-core/Plugin.h>
 #include <Project64-core/Logging.h>
 
-#include "Mips/SystemEvents.h"
-#include "Mips/MemoryVirtualMem.h"
 #include "Mips/TLBClass.h"
-#include "Mips/Audio.h"
-#include "Mips/SystemTiming.h"
 #include "CheatClass.h"
 #include "FramePerSecondClass.h"
 #include "SpeedLimiterClass.h"
diff --git a/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp
index 8164fd08a..3ef0921ee 100644
--- a/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp
+++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp
@@ -10,9 +10,8 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include <string.h>
-#include "CodeBlock.h"
+#include <Project64-core/N64System/Recompiler/CodeBlock.h>
 #include "x86CodeLog.h"
-
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/Mips/TranslateVaddr.h>
 #include <Project64-core/N64System/N64Class.h>
diff --git a/Source/Project64-core/N64System/Recompiler/CodeBlock.h b/Source/Project64-core/N64System/Recompiler/CodeBlock.h
index 50530af87..c29b87ea5 100644
--- a/Source/Project64-core/N64System/Recompiler/CodeBlock.h
+++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.h
@@ -10,9 +10,9 @@
 ****************************************************************************/
 #pragma once
 #include <Common/md5.h>
-#include "RecompilerOps.h"
-#include "ExitInfo.h"
-#include "CodeSection.h"
+#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
+#include <Project64-core/N64System/Recompiler/ExitInfo.h>
+#include <Project64-core/N64System/Recompiler/CodeSection.h>
 
 class CCodeBlock :
     private CRecompilerOps
diff --git a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp
index 93264c61f..66d1e1dd2 100644
--- a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp
+++ b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "CodeSection.h"
+#include <Project64-core/N64System/Recompiler/CodeSection.h>
 #include <Project64-core/N64System/Mips/OpCode.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
@@ -19,6 +19,7 @@
 #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
 #include <Project64-core/N64System/Recompiler/LoopAnalysis.h>
 #include <Project64-core/N64System/Recompiler/SectionInfo.h>
+#include <Project64-core/ExceptionHandler.h>
 #include <Windows.h>
 
 void InPermLoop();
diff --git a/Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp b/Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp
index 6b107ae8a..c08769853 100644
--- a/Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp
+++ b/Source/Project64-core/N64System/Recompiler/FunctionInfo.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "FunctionInfo.h"
+#include <Project64-core/N64System/Recompiler/FunctionInfo.h>
 
 CCompiledFunc::CCompiledFunc( const CCodeBlock & CodeBlock ) :
     m_EnterPC(CodeBlock.VAddrEnter()),
diff --git a/Source/Project64-core/N64System/Recompiler/FunctionInfo.h b/Source/Project64-core/N64System/Recompiler/FunctionInfo.h
index 91df099ee..bcc97df65 100644
--- a/Source/Project64-core/N64System/Recompiler/FunctionInfo.h
+++ b/Source/Project64-core/N64System/Recompiler/FunctionInfo.h
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #pragma once
-#include "CodeBlock.h"
+#include <Project64-core/N64System/Recompiler/CodeBlock.h>
 
 class CCompiledFunc
 {
diff --git a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp
index cae54f509..b7f1d2cde 100644
--- a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp
+++ b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "FunctionMapClass.h"
+#include <Project64-core/N64System/Recompiler/FunctionMapClass.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <Windows.h>
diff --git a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h
index aa10f76fc..0d6f1e6c8 100644
--- a/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h
+++ b/Source/Project64-core/N64System/Recompiler/FunctionMapClass.h
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #pragma once
-#include "FunctionInfo.h"
+#include <Project64-core/N64System/Recompiler/FunctionInfo.h>
 
 class CFunctionMap
 {
diff --git a/Source/Project64-core/N64System/Recompiler/JumpInfo.h b/Source/Project64-core/N64System/Recompiler/JumpInfo.h
index 60cb3c60a..d8761675d 100644
--- a/Source/Project64-core/N64System/Recompiler/JumpInfo.h
+++ b/Source/Project64-core/N64System/Recompiler/JumpInfo.h
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #pragma once
-#include "ExitInfo.h"
+#include <Project64-core/N64System/Recompiler/ExitInfo.h>
 
 struct CJumpInfo
 {
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp
index 61960ae94..a0b3e8adf 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp
+++ b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp
@@ -9,11 +9,12 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "RecompilerClass.h"
+#include <Project64-core/N64System/Recompiler/RecompilerClass.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/Recompiler/x86CodeLog.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
+#include <Project64-core/ExceptionHandler.h>
 #include <Objbase.h>
 
 CRecompiler::CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation) :
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerClass.h b/Source/Project64-core/N64System/Recompiler/RecompilerClass.h
index ac34c5f56..e8a200aba 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerClass.h
+++ b/Source/Project64-core/N64System/Recompiler/RecompilerClass.h
@@ -11,8 +11,8 @@
 #pragma once
 #include <Project64-core/Settings/RecompilerSettings.h>
 #include <Project64-core/N64System/Recompiler/FunctionMapClass.h>
+#include <Project64-core/N64System/Recompiler/RecompilerMemory.h>
 #include <Project64-core/N64System/ProfilingClass.h>
-#include "RecompilerMemory.h"
 
 class CRecompiler :
     protected CDebugSettings,
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp
index f459d2743..1d852f692 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp
+++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp
@@ -9,9 +9,10 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include "RecompilerMemory.h"
+#include <Project64-core/N64System/Recompiler/RecompilerMemory.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/Recompiler/RecompilerClass.h>
+#include <Common/MemoryManagement.h>
 #include <Windows.h>
 
 CRecompMemory::CRecompMemory() :
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h
index d7b6140b4..47db91a83 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h
+++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h
@@ -9,7 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #pragma once
-#include "X86ops.h"
+#include <Project64-core/N64System/Recompiler/X86ops.h>
 
 class CRecompMemory :
     protected CX86Ops
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
index 1bf57f4ba..57f704e5d 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
+++ b/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp
@@ -14,12 +14,11 @@
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include <Project64-core/N64System/Interpreter/InterpreterOps.h>
 #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
+#include <Project64-core/N64System/Recompiler/RecompilerClass.h>
+#include <Project64-core/N64System/Recompiler/CodeSection.h>
+#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
 #include <Project64-core/N64System/N64Class.h>
-
 #include <stdio.h>
-#include "RecompilerClass.h"
-#include "RecompilerOps.h"
-#include "CodeSection.h"
 #include "x86CodeLog.h"
 
 CCodeSection * CRecompilerOps::m_Section = NULL;
diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerOps.h b/Source/Project64-core/N64System/Recompiler/RecompilerOps.h
index e148dfbd6..5b2e9d77e 100644
--- a/Source/Project64-core/N64System/Recompiler/RecompilerOps.h
+++ b/Source/Project64-core/N64System/Recompiler/RecompilerOps.h
@@ -13,10 +13,10 @@
 #include <Project64-core/N64System/Mips/RegisterClass.h>
 #include <Project64-core/N64System/Mips/OpCode.h>
 #include <Project64-core/N64System/Recompiler/RegInfo.h>
+#include <Project64-core/N64System/Recompiler/X86ops.h>
 #include <Project64-core/Settings/DebugSettings.h>
 #include <Project64-core/Settings/N64SystemSettings.h>
 #include <Project64-core/Settings/RecompilerSettings.h>
-#include "X86ops.h"
 
 class CCodeSection;
 
diff --git a/Source/Project64-core/N64System/Recompiler/RegInfo.cpp b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp
index 8d477bf1e..8012fc031 100644
--- a/Source/Project64-core/N64System/Recompiler/RegInfo.cpp
+++ b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp
@@ -11,11 +11,11 @@
 #include "stdafx.h"
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64Class.h>
+#include <Project64-core/N64System/Recompiler/RecompilerClass.h>
+#include <Project64-core/N64System/Recompiler/RegInfo.h>
 
 #include <stdio.h>
 #include <string.h>
-#include "RegInfo.h"
-#include "RecompilerClass.h"
 #include "x86CodeLog.h"
 
 uint32_t CRegInfo::m_fpuControl = 0;
diff --git a/Source/Project64-core/N64System/Recompiler/RegInfo.h b/Source/Project64-core/N64System/Recompiler/RegInfo.h
index 022252f52..945d9b887 100644
--- a/Source/Project64-core/N64System/Recompiler/RegInfo.h
+++ b/Source/Project64-core/N64System/Recompiler/RegInfo.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <Project64-core/Settings/DebugSettings.h>
 #include <Project64-core/N64System/Mips/RegisterClass.h>
-#include "X86ops.h"
+#include <Project64-core/N64System/Recompiler/X86ops.h>
 
 class CRegInfo :
     private CDebugSettings,