diff --git a/nx/include/switch/applets/error.h b/nx/include/switch/applets/error.h index 1690a64a..c755d7cb 100644 --- a/nx/include/switch/applets/error.h +++ b/nx/include/switch/applets/error.h @@ -6,7 +6,6 @@ */ #pragma once #include "../types.h" -#include "../services/applet.h" #include "../services/set.h" /// Error type for ErrorCommonHeader.type. diff --git a/nx/include/switch/services/capssc.h b/nx/include/switch/services/capssc.h index 53c3845f..34138f9e 100644 --- a/nx/include/switch/services/capssc.h +++ b/nx/include/switch/services/capssc.h @@ -7,7 +7,6 @@ #pragma once #include "../types.h" #include "../sf/service.h" -#include "../services/caps.h" /// Initialize caps:sc. Only available on [2.0.0+]. Result capsscInitialize(void); diff --git a/nx/include/switch/services/nfc.h b/nx/include/switch/services/nfc.h index b40f940a..3d0410a2 100644 --- a/nx/include/switch/services/nfc.h +++ b/nx/include/switch/services/nfc.h @@ -8,7 +8,6 @@ #pragma once #include "../types.h" #include "../sf/service.h" -#include "../services/hid.h" /// NfpServiceType typedef enum { diff --git a/nx/include/switch/services/pm.h b/nx/include/switch/services/pm.h index 5ec03d4e..aec8904a 100644 --- a/nx/include/switch/services/pm.h +++ b/nx/include/switch/services/pm.h @@ -10,7 +10,7 @@ #include "../types.h" #include "../kernel/event.h" #include "../sf/service.h" -#include "../services/ncm.h" +#include "../services/ncm_types.h" /// LaunchFlag typedef enum { diff --git a/nx/source/applets/friends_la.c b/nx/source/applets/friends_la.c index 35e3b050..34c7437e 100644 --- a/nx/source/applets/friends_la.c +++ b/nx/source/applets/friends_la.c @@ -1,7 +1,6 @@ #include #include "types.h" #include "result.h" -#include "services/acc.h" #include "services/applet.h" #include "applets/libapplet.h" #include "applets/friends_la.h" diff --git a/nx/source/applets/web.c b/nx/source/applets/web.c index 23d1fd2d..21b62fc9 100644 --- a/nx/source/applets/web.c +++ b/nx/source/applets/web.c @@ -2,7 +2,6 @@ #include #include "types.h" #include "result.h" -#include "services/caps.h" #include "services/applet.h" #include "applets/libapplet.h" #include "applets/web.h" diff --git a/nx/source/runtime/devices/fs_dev.c b/nx/source/runtime/devices/fs_dev.c index f837ab41..50620989 100644 --- a/nx/source/runtime/devices/fs_dev.c +++ b/nx/source/runtime/devices/fs_dev.c @@ -12,7 +12,6 @@ #include "runtime/devices/fs_dev.h" #include "runtime/util/utf.h" #include "runtime/env.h" -#include "services/fs.h" #include "services/time.h" #include "path_buf.h" diff --git a/nx/source/runtime/devices/romfs_dev.c b/nx/source/runtime/devices/romfs_dev.c index 5f24b43c..0cea5701 100644 --- a/nx/source/runtime/devices/romfs_dev.c +++ b/nx/source/runtime/devices/romfs_dev.c @@ -11,8 +11,6 @@ #include "runtime/devices/romfs_dev.h" #include "runtime/devices/fs_dev.h" #include "runtime/util/utf.h" -#include "services/fs.h" -#include "services/ncm_types.h" #include "runtime/env.h" #include "nro.h" diff --git a/nx/source/runtime/devices/usb_comms.c b/nx/source/runtime/devices/usb_comms.c index 01bb2f27..59faf628 100644 --- a/nx/source/runtime/devices/usb_comms.c +++ b/nx/source/runtime/devices/usb_comms.c @@ -4,7 +4,6 @@ #include "result.h" #include "kernel/rwlock.h" #include "services/fatal.h" -#include "services/usb.h" #include "services/usbds.h" #include "runtime/hosversion.h" #include "runtime/devices/usb_comms.h" diff --git a/nx/source/services/applet.c b/nx/source/services/applet.c index 25947d4d..a1656f1f 100644 --- a/nx/source/services/applet.c +++ b/nx/source/services/applet.c @@ -1,18 +1,10 @@ #include #include "service_guard.h" #include "arm/counter.h" -#include "kernel/tmem.h" -#include "kernel/event.h" #include "services/fatal.h" #include "services/applet.h" -#include "services/apm.h" -#include "services/caps.h" -#include "services/pm.h" -#include "services/ncm_types.h" -#include "services/acc.h" #include "runtime/env.h" #include "runtime/hosversion.h" -#include "nacp.h" __attribute__((weak)) u32 __nx_applet_type = AppletType_Default; __attribute__((weak)) bool __nx_applet_auto_notifyrunning = true; diff --git a/nx/source/services/async.c b/nx/source/services/async.c index b9c19987..c0807d78 100644 --- a/nx/source/services/async.c +++ b/nx/source/services/async.c @@ -1,7 +1,6 @@ #include "sf/service.h" #include "runtime/hosversion.h" #include "services/async.h" -#include "applets/error.h" static Result _asyncCmdNoIO(Service* srv, u32 cmd_id) { return serviceDispatch(srv, cmd_id); diff --git a/nx/source/services/capssc.c b/nx/source/services/capssc.c index e10b5c71..98bc564f 100644 --- a/nx/source/services/capssc.c +++ b/nx/source/services/capssc.c @@ -1,7 +1,6 @@ #define NX_SERVICE_ASSUME_NON_DOMAIN #include "service_guard.h" #include "runtime/hosversion.h" -#include "services/caps.h" #include "services/capssc.h" static Service g_capsscSrv; diff --git a/nx/source/services/capssu.c b/nx/source/services/capssu.c index 85608ceb..81304829 100644 --- a/nx/source/services/capssu.c +++ b/nx/source/services/capssu.c @@ -3,9 +3,7 @@ #include "service_guard.h" #include "runtime/hosversion.h" #include "services/applet.h" -#include "services/caps.h" #include "services/capssu.h" -#include "services/acc.h" static Service g_capssuSrv; diff --git a/nx/source/services/capsu.c b/nx/source/services/capsu.c index 806a0f82..0c5e37f4 100644 --- a/nx/source/services/capsu.c +++ b/nx/source/services/capsu.c @@ -4,9 +4,7 @@ #include "service_guard.h" #include "runtime/hosversion.h" #include "services/applet.h" -#include "services/caps.h" #include "services/capsu.h" -#include "services/acc.h" static Service g_capsuSrv; static Service g_capsuAccessor; diff --git a/nx/source/services/clkrst.c b/nx/source/services/clkrst.c index 1b137d55..476c7bea 100644 --- a/nx/source/services/clkrst.c +++ b/nx/source/services/clkrst.c @@ -1,6 +1,5 @@ #define NX_SERVICE_ASSUME_NON_DOMAIN #include "service_guard.h" -#include "services/pcv.h" #include "services/clkrst.h" #include "runtime/hosversion.h" diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c index 5d9ac14e..fe718b73 100644 --- a/nx/source/services/fs.c +++ b/nx/source/services/fs.c @@ -4,8 +4,6 @@ #include "sf/sessionmgr.h" #include "runtime/hosversion.h" #include "services/fs.h" -#include "services/ncm_types.h" -#include "services/acc.h" __attribute__((weak)) u32 __nx_fs_num_sessions = 3; diff --git a/nx/source/services/fsldr.c b/nx/source/services/fsldr.c index 9a13a367..08adedb5 100644 --- a/nx/source/services/fsldr.c +++ b/nx/source/services/fsldr.c @@ -2,7 +2,6 @@ #include #include "service_guard.h" #include "runtime/hosversion.h" -#include "services/fs.h" #include "services/fsldr.h" static Service g_fsldrSrv; diff --git a/nx/source/services/grc.c b/nx/source/services/grc.c index 04abd44e..9b579e22 100644 --- a/nx/source/services/grc.c +++ b/nx/source/services/grc.c @@ -1,11 +1,7 @@ #include "service_guard.h" #include -#include "kernel/event.h" -#include "kernel/tmem.h" #include "services/grc.h" -#include "services/caps.h" #include "services/applet.h" -#include "display/native_window.h" #include "audio/audio.h" #include "runtime/hosversion.h" diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index a9cda9e4..f80d9252 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -5,7 +5,6 @@ #include #include "kernel/shmem.h" #include "kernel/rwlock.h" -#include "kernel/event.h" #include "services/applet.h" #include "services/hid.h" #include "runtime/hosversion.h" diff --git a/nx/source/services/hiddbg.c b/nx/source/services/hiddbg.c index a7499062..abc9611d 100644 --- a/nx/source/services/hiddbg.c +++ b/nx/source/services/hiddbg.c @@ -3,7 +3,6 @@ #include #include "kernel/tmem.h" #include "services/hiddbg.h" -#include "services/hid.h" #include "runtime/hosversion.h" static Service g_hiddbgSrv; diff --git a/nx/source/services/hidsys.c b/nx/source/services/hidsys.c index 746cadc2..b5e92f09 100644 --- a/nx/source/services/hidsys.c +++ b/nx/source/services/hidsys.c @@ -1,10 +1,8 @@ #define NX_SERVICE_ASSUME_NON_DOMAIN #include "service_guard.h" #include -#include "kernel/event.h" #include "services/applet.h" #include "services/hidsys.h" -#include "services/hid.h" #include "runtime/hosversion.h" static Service g_hidsysSrv; diff --git a/nx/source/services/hwopus.c b/nx/source/services/hwopus.c index 091f413f..27b42a1c 100644 --- a/nx/source/services/hwopus.c +++ b/nx/source/services/hwopus.c @@ -1,7 +1,6 @@ #define NX_SERVICE_ASSUME_NON_DOMAIN #include #include "service_guard.h" -#include "kernel/tmem.h" #include "services/hwopus.h" #include "runtime/hosversion.h" diff --git a/nx/source/services/irs.c b/nx/source/services/irs.c index 8f08d0a1..571a9607 100644 --- a/nx/source/services/irs.c +++ b/nx/source/services/irs.c @@ -5,7 +5,6 @@ #include "kernel/tmem.h" #include "services/applet.h" #include "services/irs.h" -#include "services/hid.h" typedef struct { bool initialized; diff --git a/nx/source/services/nfc.c b/nx/source/services/nfc.c index f5904e7a..9caefe6a 100644 --- a/nx/source/services/nfc.c +++ b/nx/source/services/nfc.c @@ -1,7 +1,6 @@ #include "service_guard.h" #include #include "runtime/hosversion.h" -#include "services/hid.h" #include "services/applet.h" #include "services/nfc.h" diff --git a/nx/source/services/ns.c b/nx/source/services/ns.c index c054d42a..e4ba6f23 100644 --- a/nx/source/services/ns.c +++ b/nx/source/services/ns.c @@ -3,9 +3,7 @@ #include "service_guard.h" #include "runtime/hosversion.h" #include "services/ns.h" -#include "services/ncm_types.h" #include "services/async.h" -#include "kernel/tmem.h" static Service g_nsAppManSrv, g_nsGetterSrv; static Service g_nsvmSrv; diff --git a/nx/source/services/pdm.c b/nx/source/services/pdm.c index db53668d..4ce74af0 100644 --- a/nx/source/services/pdm.c +++ b/nx/source/services/pdm.c @@ -1,9 +1,7 @@ #define NX_SERVICE_ASSUME_NON_DOMAIN #include "service_guard.h" #include -#include "kernel/event.h" #include "services/pdm.h" -#include "services/acc.h" #include "runtime/hosversion.h" static Service g_pdmqrySrv; diff --git a/nx/source/services/pm.c b/nx/source/services/pm.c index 75a6a54d..648b24e3 100644 --- a/nx/source/services/pm.c +++ b/nx/source/services/pm.c @@ -3,7 +3,6 @@ #include "service_guard.h" #include "runtime/hosversion.h" #include "services/pm.h" -#include "services/ncm.h" #define PM_GENERATE_SERVICE_INIT(name) \ static Service g_pm##name##Srv; \ diff --git a/nx/source/services/psm.c b/nx/source/services/psm.c index 8aecdbe3..ca593634 100644 --- a/nx/source/services/psm.c +++ b/nx/source/services/psm.c @@ -1,6 +1,5 @@ #define NX_SERVICE_ASSUME_NON_DOMAIN #include "service_guard.h" -#include "kernel/event.h" #include "services/psm.h" static Service g_psmSrv; diff --git a/nx/source/services/usbds.c b/nx/source/services/usbds.c index 9007316e..2743494b 100644 --- a/nx/source/services/usbds.c +++ b/nx/source/services/usbds.c @@ -1,7 +1,6 @@ #include "service_guard.h" #include #include "arm/cache.h" -#include "services/usb.h" #include "services/usbds.h" #include "runtime/hosversion.h" #include "runtime/util/utf.h" diff --git a/nx/source/services/usbhs.c b/nx/source/services/usbhs.c index 4920c294..dbe2a3de 100644 --- a/nx/source/services/usbhs.c +++ b/nx/source/services/usbhs.c @@ -2,7 +2,6 @@ #include #include "arm/cache.h" #include "runtime/hosversion.h" -#include "services/usb.h" #include "services/usbhs.h" static Service g_usbHsSrv;