From 05058863b5273757b5268e416d189fc65e74d924 Mon Sep 17 00:00:00 2001
From: Weiyi Wang <wwylele@gmail.com>
Date: Sat, 23 Mar 2019 17:09:02 -0400
Subject: [PATCH] cleanup includes

---
 src/core/hle/applets/mii_selector.h       | 2 +-
 src/core/hle/applets/swkbd.h              | 2 +-
 src/core/hle/ipc_helpers.h                | 2 +-
 src/core/hle/kernel/address_arbiter.h     | 1 +
 src/core/hle/kernel/client_port.h         | 1 +
 src/core/hle/kernel/handle_table.h        | 1 +
 src/core/hle/kernel/kernel.h              | 1 -
 src/core/hle/kernel/mutex.h               | 1 +
 src/core/hle/kernel/resource_limit.h      | 1 +
 src/core/hle/kernel/session.h             | 1 +
 src/core/hle/kernel/thread.h              | 1 +
 src/core/hle/kernel/wait_object.h         | 1 +
 src/core/hle/service/ac/ac.h              | 1 -
 src/core/hle/service/apt/applet_manager.h | 1 +
 src/core/hle/service/apt/apt.h            | 2 +-
 src/core/hle/service/apt/bcfnt/bcfnt.h    | 1 +
 src/core/hle/service/boss/boss.h          | 1 +
 src/core/hle/service/cecd/cecd.h          | 1 +
 src/core/hle/service/csnd/csnd_snd.h      | 1 +
 src/core/hle/service/dsp/dsp_dsp.h        | 1 +
 src/core/hle/service/fs/directory.h       | 2 +-
 src/core/hle/service/fs/file.cpp          | 2 --
 src/core/hle/service/fs/file.h            | 2 +-
 src/core/hle/service/fs/fs_user.cpp       | 1 -
 src/core/hle/service/gsp/gsp_gpu.h        | 1 +
 src/core/hle/service/hid/hid.h            | 1 -
 src/core/hle/service/ir/ir_rst.h          | 1 -
 src/core/hle/service/nfc/nfc.h            | 1 -
 src/core/hle/service/nim/nim_u.h          | 1 +
 src/core/hle/service/ns/ns.h              | 1 +
 src/core/hle/service/ns/ns_s.h            | 1 -
 src/core/hle/service/nwm/nwm_uds.h        | 2 +-
 src/core/hle/service/pxi/dev.h            | 1 -
 src/core/hle/service/service.h            | 1 +
 src/core/hle/service/sm/srv.h             | 2 +-
 src/core/hle/service/y2r_u.h              | 1 -
 src/core/loader/3dsx.cpp                  | 1 -
 src/core/loader/3dsx.h                    | 1 +
 src/core/loader/elf.cpp                   | 1 -
 src/core/loader/elf.h                     | 1 +
 src/core/loader/ncch.cpp                  | 1 -
 41 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/core/hle/applets/mii_selector.h b/src/core/hle/applets/mii_selector.h
index bc0861530..c4a7dae19 100644
--- a/src/core/hle/applets/mii_selector.h
+++ b/src/core/hle/applets/mii_selector.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <memory>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/hle/applets/applet.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
 #include "core/hle/service/apt/apt.h"
diff --git a/src/core/hle/applets/swkbd.h b/src/core/hle/applets/swkbd.h
index 840fac844..b63871b2f 100644
--- a/src/core/hle/applets/swkbd.h
+++ b/src/core/hle/applets/swkbd.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
+#include <memory>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/frontend/applets/swkbd.h"
 #include "core/hle/applets/applet.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
 #include "core/hle/service/apt/apt.h"
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h
index 81f623290..01282a69b 100644
--- a/src/core/hle/ipc_helpers.h
+++ b/src/core/hle/ipc_helpers.h
@@ -5,13 +5,13 @@
 #pragma once
 
 #include <array>
+#include <memory>
 #include <tuple>
 #include <type_traits>
 #include <utility>
 #include <vector>
 #include "core/hle/ipc.h"
 #include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/kernel/kernel.h"
 
 namespace IPC {
 
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index d8c7957de..8d154b6db 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <vector>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h
index 5131ea28c..75264a0a6 100644
--- a/src/core/hle/kernel/client_port.h
+++ b/src/core/hle/kernel/client_port.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h
index ca9b63c08..bd5a5df6a 100644
--- a/src/core/hle/kernel/handle_table.h
+++ b/src/core/hle/kernel/handle_table.h
@@ -6,6 +6,7 @@
 
 #include <array>
 #include <cstddef>
+#include <memory>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 535333c6a..9c32d9060 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <boost/smart_ptr/intrusive_ptr.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/memory.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h
index e50fe9d60..8cfbfa540 100644
--- a/src/core/hle/kernel/mutex.h
+++ b/src/core/hle/kernel/mutex.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h
index e1d3c8071..582cca43d 100644
--- a/src/core/hle/kernel/resource_limit.h
+++ b/src/core/hle/kernel/resource_limit.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <memory>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h
index 75810a959..17bb4d6c6 100644
--- a/src/core/hle/kernel/session.h
+++ b/src/core/hle/kernel/session.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/kernel/object.h"
 
 namespace Kernel {
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 3c25355b3..7ab90ccc4 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/src/core/hle/kernel/wait_object.h b/src/core/hle/kernel/wait_object.h
index ced94c7cf..5c2f38be8 100644
--- a/src/core/hle/kernel/wait_object.h
+++ b/src/core/hle/kernel/wait_object.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <functional>
+#include <memory>
 #include <vector>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include "common/common_types.h"
diff --git a/src/core/hle/service/ac/ac.h b/src/core/hle/service/ac/ac.h
index 1b741d6b4..f3554c876 100644
--- a/src/core/hle/service/ac/ac.h
+++ b/src/core/hle/service/ac/ac.h
@@ -6,7 +6,6 @@
 
 #include <array>
 #include <memory>
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/apt/applet_manager.h b/src/core/hle/service/apt/applet_manager.h
index 05743cefc..6bc880bd4 100644
--- a/src/core/hle/service/apt/applet_manager.h
+++ b/src/core/hle/service/apt/applet_manager.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <memory>
 #include <optional>
 #include <vector>
 #include "core/hle/kernel/event.h"
diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index a31f1ad6a..3755be43f 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
+#include <memory>
 #include <vector>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/apt/bcfnt/bcfnt.h b/src/core/hle/service/apt/bcfnt/bcfnt.h
index 91a84632c..cf847cce3 100644
--- a/src/core/hle/service/apt/bcfnt/bcfnt.h
+++ b/src/core/hle/service/apt/bcfnt/bcfnt.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "common/swap.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/boss/boss.h b/src/core/hle/service/boss/boss.h
index 2737f618d..e0cb39b37 100644
--- a/src/core/hle/service/boss/boss.h
+++ b/src/core/hle/service/boss/boss.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/kernel/event.h"
 #include "core/hle/service/service.h"
 
diff --git a/src/core/hle/service/cecd/cecd.h b/src/core/hle/service/cecd/cecd.h
index 25bfad6c1..004ef33e7 100644
--- a/src/core/hle/service/cecd/cecd.h
+++ b/src/core/hle/service/cecd/cecd.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "core/hle/kernel/event.h"
diff --git a/src/core/hle/service/csnd/csnd_snd.h b/src/core/hle/service/csnd/csnd_snd.h
index a7d514797..1d01b3117 100644
--- a/src/core/hle/service/csnd/csnd_snd.h
+++ b/src/core/hle/service/csnd/csnd_snd.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/dsp/dsp_dsp.h b/src/core/hle/service/dsp/dsp_dsp.h
index a9b367db9..ef1f0b76d 100644
--- a/src/core/hle/service/dsp/dsp_dsp.h
+++ b/src/core/hle/service/dsp/dsp_dsp.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "audio_core/dsp_interface.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/service/fs/directory.h b/src/core/hle/service/fs/directory.h
index 2f4529ca0..890b26648 100644
--- a/src/core/hle/service/fs/directory.h
+++ b/src/core/hle/service/fs/directory.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include <memory>
 #include "core/file_sys/archive_backend.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Service::FS {
diff --git a/src/core/hle/service/fs/file.cpp b/src/core/hle/service/fs/file.cpp
index 858df7996..9efd88dd3 100644
--- a/src/core/hle/service/fs/file.cpp
+++ b/src/core/hle/service/fs/file.cpp
@@ -196,7 +196,6 @@ void File::OpenLinkFile(Kernel::HLERequestContext& ctx) {
     LOG_WARNING(Service_FS, "(STUBBED) File command OpenLinkFile {}", GetName());
     using Kernel::ClientSession;
     using Kernel::ServerSession;
-    using std::shared_ptr;
     IPC::RequestParser rp(ctx, 0x080C, 0, 0);
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 2);
     auto sessions = system.Kernel().CreateSessionPair(GetName());
@@ -246,7 +245,6 @@ void File::OpenSubFile(Kernel::HLERequestContext& ctx) {
 
     using Kernel::ClientSession;
     using Kernel::ServerSession;
-    using std::shared_ptr;
     auto sessions = system.Kernel().CreateSessionPair(GetName());
     auto server = std::get<std::shared_ptr<ServerSession>>(sessions);
     ClientConnected(server);
diff --git a/src/core/hle/service/fs/file.h b/src/core/hle/service/fs/file.h
index 0c1f34f75..062fcd5e7 100644
--- a/src/core/hle/service/fs/file.h
+++ b/src/core/hle/service/fs/file.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include <memory>
 #include "core/file_sys/archive_backend.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index c2feeeb9f..ec1e1b851 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -30,7 +30,6 @@
 
 using Kernel::ClientSession;
 using Kernel::ServerSession;
-using std::shared_ptr;
 
 namespace Service::FS {
 
diff --git a/src/core/hle/service/gsp/gsp_gpu.h b/src/core/hle/service/gsp/gsp_gpu.h
index d3238fb26..b1ab6807f 100644
--- a/src/core/hle/service/gsp/gsp_gpu.h
+++ b/src/core/hle/service/gsp/gsp_gpu.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <cstddef>
+#include <memory>
 #include <string>
 #include "common/bit_field.h"
 #include "common/common_types.h"
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 8e865b921..8d217f835 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -14,7 +14,6 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/frontend/input.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 #include "core/settings.h"
 
diff --git a/src/core/hle/service/ir/ir_rst.h b/src/core/hle/service/ir/ir_rst.h
index 013a4898d..84ad70dfc 100644
--- a/src/core/hle/service/ir/ir_rst.h
+++ b/src/core/hle/service/ir/ir_rst.h
@@ -10,7 +10,6 @@
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/frontend/input.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Kernel {
diff --git a/src/core/hle/service/nfc/nfc.h b/src/core/hle/service/nfc/nfc.h
index cdc26a105..7f7af0517 100644
--- a/src/core/hle/service/nfc/nfc.h
+++ b/src/core/hle/service/nfc/nfc.h
@@ -7,7 +7,6 @@
 #include <atomic>
 #include <memory>
 #include "common/common_types.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/nim/nim_u.h b/src/core/hle/service/nim/nim_u.h
index 6a6d33036..367ee6ea8 100644
--- a/src/core/hle/service/nim/nim_u.h
+++ b/src/core/hle/service/nim/nim_u.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.h
index 1ebe9145d..25aec246e 100644
--- a/src/core/hle/service/ns/ns.h
+++ b/src/core/hle/service/ns/ns.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/service.h"
diff --git a/src/core/hle/service/ns/ns_s.h b/src/core/hle/service/ns/ns_s.h
index cc8cdb57a..d6c42b0fd 100644
--- a/src/core/hle/service/ns/ns_s.h
+++ b/src/core/hle/service/ns/ns_s.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Service::NS {
diff --git a/src/core/hle/service/nwm/nwm_uds.h b/src/core/hle/service/nwm/nwm_uds.h
index 5b1ef5913..52ca38663 100644
--- a/src/core/hle/service/nwm/nwm_uds.h
+++ b/src/core/hle/service/nwm/nwm_uds.h
@@ -10,13 +10,13 @@
 #include <deque>
 #include <list>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <unordered_map>
 #include <vector>
 #include <boost/optional.hpp>
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 #include "network/network.h"
 
diff --git a/src/core/hle/service/pxi/dev.h b/src/core/hle/service/pxi/dev.h
index d79fa49ba..115dc2308 100644
--- a/src/core/hle/service/pxi/dev.h
+++ b/src/core/hle/service/pxi/dev.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Service::PXI {
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 2067326ac..4aa60eb41 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -7,6 +7,7 @@
 #include <array>
 #include <cstddef>
 #include <functional>
+#include <memory>
 #include <string>
 #include <boost/container/flat_map.hpp>
 #include "common/common_types.h"
diff --git a/src/core/hle/service/sm/srv.h b/src/core/hle/service/sm/srv.h
index 8f386ff48..2382f4842 100644
--- a/src/core/hle/service/sm/srv.h
+++ b/src/core/hle/service/sm/srv.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include <memory>
 #include <unordered_map>
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/y2r_u.h b/src/core/hle/service/y2r_u.h
index db9b88bb6..332d3b240 100644
--- a/src/core/hle/service/y2r_u.h
+++ b/src/core/hle/service/y2r_u.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 #include "common/common_types.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
 
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index 2d39b7172..20dbc276f 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -92,7 +92,6 @@ static u32 TranslateAddr(u32 addr, const THREEloadinfo* loadinfo, u32* offsets)
 }
 
 using Kernel::CodeSet;
-using std::shared_ptr;
 
 static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr,
                                    std::shared_ptr<CodeSet>* out_codeset) {
diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h
index a887f841c..4d56a0624 100644
--- a/src/core/loader/3dsx.h
+++ b/src/core/loader/3dsx.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/loader/loader.h"
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 8d3e94d83..417c309a2 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -15,7 +15,6 @@
 #include "core/memory.h"
 
 using Kernel::CodeSet;
-using std::shared_ptr;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // ELF Header Constants
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
index 3f53b0db0..a43edff41 100644
--- a/src/core/loader/elf.h
+++ b/src/core/loader/elf.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/loader/loader.h"
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 09ae2e0d2..87aca79ac 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -63,7 +63,6 @@ std::pair<std::optional<u32>, ResultStatus> AppLoader_NCCH::LoadKernelSystemMode
 
 ResultStatus AppLoader_NCCH::LoadExec(std::shared_ptr<Kernel::Process>& process) {
     using Kernel::CodeSet;
-    using std::shared_ptr;
 
     if (!is_loaded)
         return ResultStatus::ErrorNotLoaded;