Merge pull request #7139 from Morph1984/service-headers

service: Reduce header include overhead

src/core/hle/ipc_helpers.h

@@ -4,17 +4,14 @@
 
 #pragma once
 
-#include <array>
 #include <cstring>
 #include <memory>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/hle/ipc.h"
 #include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/kernel/k_client_port.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_resource_limit.h"
 #include "core/hle/kernel/k_session.h"

src/core/hle/kernel/hle_ipc.cpp

@@ -15,6 +15,7 @@
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/hle_ipc.h"
+#include "core/hle/kernel/k_auto_object.h"
 #include "core/hle/kernel/k_handle_table.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_readable_event.h"

src/core/hle/kernel/hle_ipc.h

@@ -17,7 +17,6 @@
 #include "common/concepts.h"
 #include "common/swap.h"
 #include "core/hle/ipc.h"
-#include "core/hle/kernel/k_auto_object.h"
 #include "core/hle/kernel/svc_common.h"
 
 union ResultCode;
@@ -38,6 +37,7 @@ namespace Kernel {
 
 class Domain;
 class HLERequestContext;
+class KAutoObject;
 class KernelCore;
 class KHandleTable;
 class KProcess;

src/core/hle/service/am/applet_ae.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <memory>
-#include "core/hle/kernel/hle_ipc.h"
+
 #include "core/hle/service/service.h"
 
 namespace Service {

src/core/hle/service/am/applet_oe.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <memory>
-#include "core/hle/kernel/hle_ipc.h"
+
 #include "core/hle/service/service.h"
 
 namespace Service {

src/core/hle/service/audio/audin_u.cpp

@@ -5,7 +5,6 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/service/audio/audin_u.h"
 

src/core/hle/service/audio/audout_u.cpp

@@ -13,7 +13,6 @@
 #include "common/swap.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/audio/audout_u.h"

src/core/hle/service/audio/audren_u.cpp

@@ -15,7 +15,6 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/audio/audren_u.h"

src/core/hle/service/audio/hwopus.cpp

@@ -13,7 +13,6 @@
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/audio/hwopus.h"
 
 namespace Service::Audio {

src/core/hle/service/btdrv/btdrv.cpp

@@ -5,7 +5,6 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/btdrv/btdrv.h"

src/core/hle/service/btm/btm.cpp

@@ -7,7 +7,6 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/btm/btm.h"

src/core/hle/service/caps/caps.h

@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include "core/hle/service/service.h"
+#include "common/common_funcs.h"
+#include "common/common_types.h"
 
 namespace Core {
 class System;

src/core/hle/service/fgm/fgm.cpp

@@ -5,7 +5,6 @@
 #include <memory>
 
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/fgm/fgm.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"

src/core/hle/service/filesystem/fsp_ldr.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "core/hle/service/filesystem/fsp_ldr.h"
-#include "core/hle/service/service.h"
 
 namespace Service::FileSystem {
 

src/core/hle/service/filesystem/fsp_pr.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "core/hle/service/filesystem/fsp_pr.h"
-#include "core/hle/service/service.h"
 
 namespace Service::FileSystem {
 

src/core/hle/service/glue/arp.cpp

@@ -8,13 +8,11 @@
 #include "core/core.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/glue/arp.h"
 #include "core/hle/service/glue/errors.h"
 #include "core/hle/service/glue/glue_manager.h"
-#include "core/hle/service/service.h"
 
 namespace Service::Glue {
 

src/core/hle/service/hid/hid.cpp

@@ -8,12 +8,9 @@
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/core_timing_util.h"
 #include "core/frontend/emu_window.h"
 #include "core/frontend/input.h"
-#include "core/hardware_properties.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/k_client_port.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/k_transfer_memory.h"
@@ -23,7 +20,6 @@
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/irs.h"
 #include "core/hle/service/hid/xcd.h"
-#include "core/hle/service/service.h"
 #include "core/memory.h"
 
 #include "core/hle/service/hid/controllers/console_sixaxis.h"

src/core/hle/service/lbl/lbl.cpp

@@ -7,7 +7,6 @@
 
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/lbl/lbl.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"

src/core/hle/service/mii/mii.cpp

@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/mii/mii.h"
 #include "core/hle/service/mii/mii_manager.h"
 #include "core/hle/service/service.h"

src/core/hle/service/nfc/nfc.cpp

@@ -7,7 +7,6 @@
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/nfc/nfc.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"

src/core/hle/service/ns/ns.cpp

@@ -9,7 +9,6 @@
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/vfs.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/ns/errors.h"
 #include "core/hle/service/ns/language.h"
 #include "core/hle/service/ns/ns.h"

src/core/hle/service/olsc/olsc.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/olsc/olsc.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"

src/core/hle/service/set/set_sys.cpp

@@ -7,7 +7,6 @@
 #include "core/file_sys/errors.h"
 #include "core/file_sys/system_archive/system_version.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/k_client_port.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/set/set_sys.h"
 

src/core/hle/service/sockets/bsd.h

@@ -5,11 +5,9 @@
 #pragma once
 
 #include <memory>
-#include <string_view>
 #include <vector>
 
 #include "common/common_types.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sockets/sockets.h"
 

src/core/hle/service/sockets/sfdnsres.h

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

src/core/hle/service/sockets/sockets.h

@@ -4,13 +4,17 @@
 
 #pragma once
 
+#include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "core/hle/service/service.h"
 
 namespace Core {
 class System;
 }
 
+namespace Service::SM {
+class ServiceManager;
+}
+
 namespace Service::Sockets {
 
 enum class Errno : u32 {

src/core/hle/service/spl/spl_module.cpp

@@ -3,10 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <chrono>
 #include <cstdlib>
 #include <ctime>
-#include <functional>
 #include <vector>
 #include "common/logging/log.h"
 #include "common/settings.h"

src/core/hle/service/ssl/ssl.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/ssl/ssl.h"

src/core/hle/service/time/time.cpp

@@ -8,11 +8,11 @@
 #include "core/core_timing_util.h"
 #include "core/hardware_properties.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/k_client_port.h"
 #include "core/hle/kernel/k_scheduler.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/time/time.h"
 #include "core/hle/service/time/time_interface.h"
+#include "core/hle/service/time/time_manager.h"
 #include "core/hle/service/time/time_sharedmemory.h"
 #include "core/hle/service/time/time_zone_service.h"
 

src/core/hle/service/time/time.h

@@ -6,7 +6,6 @@
 
 #include "core/hle/service/service.h"
 #include "core/hle/service/time/clock_types.h"
-#include "core/hle/service/time/time_manager.h"
 
 namespace Core {
 class System;

src/core/hle/service/usb/usb.cpp

@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/usb/usb.h"

src/core/hle/service/vi/vi.h

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

src/yuzu/configuration/configure_system.cpp

@@ -12,7 +12,7 @@
 #include "common/assert.h"
 #include "common/settings.h"
 #include "core/core.h"
-#include "core/hle/service/time/time.h"
+#include "core/hle/service/time/time_manager.h"
 #include "ui_configure_system.h"
 #include "yuzu/configuration/configuration_shared.h"
 #include "yuzu/configuration/configure_system.h"