From aea15f5c731b325be48ea4900ae3eca341ac03cd Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 21 Jun 2015 15:11:32 +0100
Subject: Core: Cleanup core includes.

---
 src/common/chunk_file.h            | 3 ++-
 src/core/arm/dyncom/arm_dyncom.h   | 5 +++++
 src/core/core.cpp                  | 3 ---
 src/core/core_timing.cpp           | 3 +--
 src/core/hle/kernel/vm_manager.cpp | 2 ++
 src/core/hle/kernel/vm_manager.h   | 1 -
 src/core/hle/shared_page.cpp       | 6 ------
 src/core/hle/shared_page.h         | 3 +++
 src/core/mem_map.cpp               | 5 +++--
 9 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index ee9f3d7c..8be0b110 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -33,10 +33,11 @@
 #include <set>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
+#include "common/assert.h"
 #include "common/common_types.h"
-#include "common/file_util.h"
 #include "common/logging/log.h"
 
 template <class T>
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 2488c879..cc935572 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -10,6 +10,11 @@
 
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/arm_regformat.h"
+
+namespace Core {
+struct ThreadContext;
+}
 
 class ARM_DynCom final : virtual public ARM_Interface {
 public:
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 79038cd5..dddc1670 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -2,15 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/common_types.h"
 #include "common/logging/log.h"
 
 #include "core/core.h"
 #include "core/core_timing.h"
 
-#include "core/settings.h"
 #include "core/arm/arm_interface.h"
-#include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/dyncom/arm_dyncom.h"
 #include "core/hle/hle.h"
 #include "core/hle/kernel/thread.h"
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 0eb717c8..72006a53 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -3,12 +3,11 @@
 // Refer to the license.txt file included.
 
 #include <atomic>
-#include <cstdio>
 #include <mutex>
 #include <vector>
 
-#include "common/assert.h"
 #include "common/chunk_file.h"
+#include "common/logging/log.h"
 #include "common/string_util.h"
 
 #include "core/arm/arm_interface.h"
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index b2dd2154..ec437cd6 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <iterator>
+
 #include "common/assert.h"
 
 #include "core/hle/kernel/vm_manager.h"
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h
index 22b72460..271e2333 100644
--- a/src/core/hle/kernel/vm_manager.h
+++ b/src/core/hle/kernel/vm_manager.h
@@ -6,7 +6,6 @@
 
 #include <map>
 #include <memory>
-#include <string>
 #include <vector>
 
 #include "common/common_types.h"
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
index 4014eee9..26d87c7e 100644
--- a/src/core/hle/shared_page.cpp
+++ b/src/core/hle/shared_page.cpp
@@ -4,12 +4,6 @@
 
 #include <cstring>
 
-#include "common/common_types.h"
-#include "common/common_funcs.h"
-
-#include "core/core.h"
-#include "core/memory.h"
-#include "core/hle/config_mem.h"
 #include "core/hle/shared_page.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/shared_page.h b/src/core/hle/shared_page.h
index fd2ab66a..db6a5340 100644
--- a/src/core/hle/shared_page.h
+++ b/src/core/hle/shared_page.h
@@ -10,9 +10,12 @@
  * write access, according to 3dbrew; this is not emulated)
  */
 
+#include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
 
+#include "core/memory.h"
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace SharedPage {
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index bf814b94..d8cae50d 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -3,13 +3,14 @@
 // Refer to the license.txt file included.
 
 #include <map>
+#include <memory>
+#include <utility>
+#include <vector>
 
 #include "common/common_types.h"
 #include "common/logging/log.h"
 
 #include "core/hle/config_mem.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/shared_memory.h"
 #include "core/hle/kernel/vm_manager.h"
 #include "core/hle/result.h"
 #include "core/hle/shared_page.h"
-- 
cgit v1.2.3