Removed includes which are unneeded due to being included elsewhere, etc. Minor improvements.

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.

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

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 {

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 {

nx/source/applets/friends_la.c

@@ -1,7 +1,6 @@
 #include <string.h>
 #include "types.h"
 #include "result.h"
-#include "services/acc.h"
 #include "services/applet.h"
 #include "applets/libapplet.h"
 #include "applets/friends_la.h"

nx/source/applets/web.c

@@ -2,7 +2,6 @@
 #include <malloc.h>
 #include "types.h"
 #include "result.h"
-#include "services/caps.h"
 #include "services/applet.h"
 #include "applets/libapplet.h"
 #include "applets/web.h"

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"

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"
 

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"

nx/source/services/applet.c

@@ -1,18 +1,10 @@
 #include <string.h>
 #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;

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

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;

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;
 

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;

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"
 

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;
 

nx/source/services/fsldr.c

@@ -2,7 +2,6 @@
 #include <string.h>
 #include "service_guard.h"
 #include "runtime/hosversion.h"
-#include "services/fs.h"
 #include "services/fsldr.h"
 
 static Service g_fsldrSrv;

nx/source/services/grc.c

@@ -1,11 +1,7 @@
 #include "service_guard.h"
 #include <string.h>
-#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"
 

nx/source/services/hid.c

@@ -5,7 +5,6 @@
 #include <malloc.h>
 #include "kernel/shmem.h"
 #include "kernel/rwlock.h"
-#include "kernel/event.h"
 #include "services/applet.h"
 #include "services/hid.h"
 #include "runtime/hosversion.h"

nx/source/services/hiddbg.c

@@ -3,7 +3,6 @@
 #include <string.h>
 #include "kernel/tmem.h"
 #include "services/hiddbg.h"
-#include "services/hid.h"
 #include "runtime/hosversion.h"
 
 static Service g_hiddbgSrv;

nx/source/services/hidsys.c

@@ -1,10 +1,8 @@
 #define NX_SERVICE_ASSUME_NON_DOMAIN
 #include "service_guard.h"
 #include <string.h>
-#include "kernel/event.h"
 #include "services/applet.h"
 #include "services/hidsys.h"
-#include "services/hid.h"
 #include "runtime/hosversion.h"
 
 static Service g_hidsysSrv;

nx/source/services/hwopus.c

@@ -1,7 +1,6 @@
 #define NX_SERVICE_ASSUME_NON_DOMAIN
 #include <string.h>
 #include "service_guard.h"
-#include "kernel/tmem.h"
 #include "services/hwopus.h"
 #include "runtime/hosversion.h"
 

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;

nx/source/services/nfc.c

@@ -1,7 +1,6 @@
 #include "service_guard.h"
 #include <string.h>
 #include "runtime/hosversion.h"
-#include "services/hid.h"
 #include "services/applet.h"
 #include "services/nfc.h"
 

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;

nx/source/services/pdm.c

@@ -1,9 +1,7 @@
 #define NX_SERVICE_ASSUME_NON_DOMAIN
 #include "service_guard.h"
 #include <string.h>
-#include "kernel/event.h"
 #include "services/pdm.h"
-#include "services/acc.h"
 #include "runtime/hosversion.h"
 
 static Service g_pdmqrySrv;

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

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;

nx/source/services/usbds.c

@@ -1,7 +1,6 @@
 #include "service_guard.h"
 #include <string.h>
 #include "arm/cache.h"
-#include "services/usb.h"
 #include "services/usbds.h"
 #include "runtime/hosversion.h"
 #include "runtime/util/utf.h"

nx/source/services/usbhs.c

@@ -2,7 +2,6 @@
 #include <string.h>
 #include "arm/cache.h"
 #include "runtime/hosversion.h"
-#include "services/usb.h"
 #include "services/usbhs.h"
 
 static Service g_usbHsSrv;