From be74da8f3c132a2ccced8f5e0d1a1de89d3ea403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 30 Dec 2013 00:23:04 +0100
Subject: [PATCH] More include cleanup, hopefully buildfix Symbian

---
 CMakeLists.txt                       |  2 ++
 Core/Debugger/DisassemblyManager.cpp | 22 +++++++++++++---------
 Core/Host.cpp                        | 10 ++++++++--
 Core/Host.h                          |  9 +++------
 Core/MIPS/x86/Jit.cpp                |  1 +
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd162a0bdf..50ca211dc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -933,6 +933,8 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/Debugger/DebugInterface.h
 	Core/Debugger/SymbolMap.cpp
 	Core/Debugger/SymbolMap.h
+	Core/Debugger/DisassemblyManager.cpp
+	Core/Debugger/DisassemblyManager.h
 	Core/Dialog/PSPDialog.cpp
 	Core/Dialog/PSPDialog.h
 	Core/Dialog/PSPGamedataInstallDialog.cpp
diff --git a/Core/Debugger/DisassemblyManager.cpp b/Core/Debugger/DisassemblyManager.cpp
index ac72137c12..57a0f55ac2 100644
--- a/Core/Debugger/DisassemblyManager.cpp
+++ b/Core/Debugger/DisassemblyManager.cpp
@@ -15,17 +15,21 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "DisassemblyManager.h"
-#include "DebugInterface.h"
-#include "Core/Debugger/SymbolMap.h"
-#include "Core/MIPS/MIPSCodeUtils.h"
-#include "Core/MIPS/MIPSTables.h"
-#include "Common/Common.h"
-#include "ext/xxhash.h"
 
 #include <algorithm>
+#include <map>
 
-std::map<u32,DisassemblyEntry*> DisassemblyManager::entries;
+#include "ext/xxhash.h"
+
+#include "Common/CommonTypes.h"
+#include "Core/System.h"
+#include "Core/MIPS/MIPSCodeUtils.h"
+#include "Core/MIPS/MIPSTables.h"
+#include "Core/Debugger/DebugInterface.h"
+#include "Core/Debugger/SymbolMap.h"
+#include "Core/Debugger/DisassemblyManager.h"
+
+std::map<u32, DisassemblyEntry*> DisassemblyManager::entries;
 DebugInterface* DisassemblyManager::cpu;
 int DisassemblyManager::maxParamChars = 29;
 
@@ -73,7 +77,7 @@ void parseDisasm(const char* disasm, char* opcode, char* arguments, bool insertS
 			} else {
 				arguments += sprintf(arguments,"0x%08X",branchTarget);
 			}
-			
+
 			disasm += 3+8;
 			continue;
 		}
diff --git a/Core/Host.cpp b/Core/Host.cpp
index 933b54b539..b2b6eb3184 100644
--- a/Core/Host.cpp
+++ b/Core/Host.cpp
@@ -15,6 +15,12 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Host.h"
+#include "Core/Host.h"
+#include "Core/Debugger/SymbolMap.h"
 
-Host *host;
\ No newline at end of file
+Host *host;
+
+bool Host::AttemptLoadSymbolMap() {
+	symbolMap.Clear();
+	return false;
+}
diff --git a/Core/Host.h b/Core/Host.h
index 44bc33e791..0205ec43c3 100644
--- a/Core/Host.h
+++ b/Core/Host.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "Globals.h"
-#include "Core/Debugger/SymbolMap.h"
+#include <string>
+#include "Common/CommonTypes.h"
 
 struct InputState;
 
@@ -55,10 +55,7 @@ public:
 	virtual void BootDone() {}
 
 	virtual bool IsDebuggingEnabled() {return true;}
-	virtual bool AttemptLoadSymbolMap() {
-		symbolMap.Clear();
-		return false;
-	}
+	virtual bool AttemptLoadSymbolMap();
 	virtual void SaveSymbolMap() {}
 	virtual void SetWindowTitle(const char *message) {}
 
diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp
index ebd0731fd6..8e352b7414 100644
--- a/Core/MIPS/x86/Jit.cpp
+++ b/Core/MIPS/x86/Jit.cpp
@@ -26,6 +26,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/Config.h"
 #include "Core/Reporting.h"
+#include "Core/Debugger/SymbolMap.h"
 #include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"