From 8cf9eb7f431e235a39f380118cfd081a604ea1c9 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Sat, 20 Jun 2015 22:24:01 +0100
Subject: Common: Fix FileUtil includes, and everything relying on those.

---
 src/core/loader/loader.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/loader')

diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 8b14edf00..6e608a858 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -6,6 +6,7 @@
 
 #include "common/logging/log.h"
 #include "common/make_unique.h"
+#include "common/string_util.h"
 
 #include "core/file_sys/archive_romfs.h"
 #include "core/hle/kernel/process.h"
-- 
cgit v1.2.3


From 596b7c4f63e38d275b6a056d6125c0027a1376e7 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Sun, 21 Jun 2015 13:40:28 +0100
Subject: Common: Cleanup key_map includes.

---
 src/core/loader/loader.cpp | 1 +
 src/core/loader/loader.h   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/core/loader')

diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 6e608a858..2e450fce4 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <memory>
 #include <string>
 
 #include "common/logging/log.h"
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 87e16fb98..1c33b1c16 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <vector>
 
 #include "common/common_types.h"
-- 
cgit v1.2.3


From 45c4781544624c85a8178c6ee445cfe6a4751910 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Sun, 21 Jun 2015 14:58:59 +0100
Subject: CitraQt: Cleanup includes.

---
 src/core/loader/elf.cpp  | 3 ++-
 src/core/loader/loader.h | 7 ++++++-
 src/core/loader/ncch.cpp | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/core/loader')

diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index f00753a79..a7eea78aa 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cstring>
 #include <string>
 #include <memory>
 
@@ -10,7 +11,7 @@
 #include "common/logging/log.h"
 #include "common/symbols.h"
 
-#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/loader/elf.h"
 #include "core/memory.h"
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 1c33b1c16..52bbf35b8 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -4,13 +4,18 @@
 
 #pragma once
 
+#include <algorithm>
+#include <initializer_list>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "common/common_types.h"
 #include "common/file_util.h"
 
-#include "core/hle/kernel/process.h"
+namespace Kernel {
+struct AddressMapping;
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Loader namespace
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 08993c4fa..a8f8f78b7 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <cstring>
 #include <memory>
 
 #include "common/logging/log.h"
@@ -10,7 +11,7 @@
 #include "common/string_util.h"
 #include "common/swap.h"
 
-#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/loader/ncch.h"
 #include "core/memory.h"
-- 
cgit v1.2.3