cleanup includes

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"

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"

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 {
 

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"

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"

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"

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"

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"

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"
 

src/core/hle/kernel/session.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/kernel/object.h"
 
 namespace Kernel {

src/core/hle/kernel/thread.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>

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"

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 {

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"

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 {

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"

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"
 

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"

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"

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"

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 {

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);

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 {

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 {
 

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"

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"
 

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 {

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 {

src/core/hle/service/nim/nim_u.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include "core/hle/service/service.h"
 
 namespace Core {

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"

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 {

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"
 

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 {

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"

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 {

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"
 

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) {

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"

src/core/loader/elf.cpp

@@ -15,7 +15,6 @@
 #include "core/memory.h"
 
 using Kernel::CodeSet;
-using std::shared_ptr;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // ELF Header Constants

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"

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;