From 2764bd7c968c5d416acfc5877b189fd9f3493e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=97=B1=20PixelyIon?= <pixelyion@protonmail.com>
Date: Fri, 25 Sep 2020 20:05:10 +0530
Subject: [PATCH] Use Vector for Kernel Handles + Remove Redundant Includes

---
 app/src/main/cpp/emu_jni.cpp                  |  1 +
 app/src/main/cpp/skyline/audio.h              |  5 ----
 .../main/cpp/skyline/audio/adpcm_decoder.cpp  |  2 --
 .../main/cpp/skyline/audio/adpcm_decoder.h    |  1 -
 .../main/cpp/skyline/audio/circular_buffer.h  |  2 --
 app/src/main/cpp/skyline/audio/resampler.cpp  |  2 --
 app/src/main/cpp/skyline/audio/resampler.h    |  1 -
 app/src/main/cpp/skyline/audio/track.cpp      |  2 +-
 app/src/main/cpp/skyline/audio/track.h        |  3 ---
 app/src/main/cpp/skyline/common.h             |  5 +++-
 app/src/main/cpp/skyline/crypto/aes_cipher.h  |  2 --
 app/src/main/cpp/skyline/crypto/key_store.cpp |  1 -
 app/src/main/cpp/skyline/crypto/key_store.h   |  2 --
 app/src/main/cpp/skyline/gpu.h                |  4 ----
 app/src/main/cpp/skyline/gpu/engines/gpfifo.h |  4 +---
 .../cpp/skyline/gpu/engines/maxwell_3d.cpp    |  1 -
 .../main/cpp/skyline/gpu/engines/maxwell_3d.h |  6 ++---
 app/src/main/cpp/skyline/gpu/gpfifo.h         |  1 -
 .../cpp/skyline/gpu/macro_interpreter.cpp     |  1 -
 app/src/main/cpp/skyline/gpu/syncpoint.cpp    |  1 -
 app/src/main/cpp/skyline/gpu/syncpoint.h      |  4 ++--
 .../main/cpp/skyline/input/sections/common.h  |  1 -
 app/src/main/cpp/skyline/input/touch.cpp      |  1 -
 app/src/main/cpp/skyline/input/touch.h        |  1 -
 app/src/main/cpp/skyline/kernel/ipc.h         |  1 -
 app/src/main/cpp/skyline/kernel/memory.cpp    |  4 ++--
 app/src/main/cpp/skyline/kernel/memory.h      |  2 --
 app/src/main/cpp/skyline/kernel/svc.cpp       |  3 +--
 app/src/main/cpp/skyline/kernel/svc.h         |  1 -
 .../skyline/kernel/types/KPrivateMemory.cpp   |  1 +
 .../cpp/skyline/kernel/types/KProcess.cpp     | 23 ++++++++++---------
 .../main/cpp/skyline/kernel/types/KProcess.h  | 21 +++++++++--------
 .../main/cpp/skyline/kernel/types/KSession.h  |  6 +++--
 .../skyline/kernel/types/KSharedMemory.cpp    |  1 +
 .../cpp/skyline/kernel/types/KSyncObject.h    |  1 -
 app/src/main/cpp/skyline/loader/loader.h      |  1 -
 app/src/main/cpp/skyline/loader/nca.h         |  2 --
 app/src/main/cpp/skyline/loader/nro.h         |  1 -
 app/src/main/cpp/skyline/loader/nso.h         |  1 -
 app/src/main/cpp/skyline/loader/nsp.h         |  1 -
 app/src/main/cpp/skyline/nce.h                |  5 ----
 app/src/main/cpp/skyline/os.cpp               |  1 +
 app/src/main/cpp/skyline/os.h                 |  2 --
 .../account/IAccountServiceForApplication.cpp |  1 -
 .../account/IAccountServiceForApplication.h   |  1 -
 .../services/account/IManagerForApplication.h |  3 +--
 .../cpp/skyline/services/account/IProfile.cpp |  1 -
 .../cpp/skyline/services/account/IProfile.h   |  1 -
 .../am/IAllSystemAppletProxiesService.h       |  1 -
 .../services/am/IApplicationProxyService.h    |  1 -
 .../am/applet/ILibraryAppletAccessor.h        |  1 -
 .../am/controller/IAppletCommonFunctions.h    |  1 -
 .../am/controller/IApplicationFunctions.h     |  1 -
 .../services/am/controller/IAudioController.h |  1 -
 .../am/controller/ICommonStateGetter.h        |  3 +--
 .../services/am/controller/IDebugFunctions.h  |  1 -
 .../am/controller/IDisplayController.h        |  1 -
 .../am/controller/ILibraryAppletCreator.h     |  1 -
 .../am/controller/ISelfController.cpp         |  2 +-
 .../services/am/controller/ISelfController.h  |  1 -
 .../am/controller/IWindowController.h         |  1 -
 .../skyline/services/am/proxy/base_proxy.h    |  1 -
 .../skyline/services/am/storage/IStorage.h    |  1 -
 .../services/am/storage/IStorageAccessor.cpp  |  1 -
 .../services/am/storage/IStorageAccessor.h    |  2 +-
 .../services/aocsrv/IAddOnContentManager.h    |  1 -
 .../main/cpp/skyline/services/apm/IManager.h  |  1 -
 .../cpp/skyline/services/apm/ISession.cpp     |  2 +-
 .../main/cpp/skyline/services/apm/ISession.h  |  1 -
 .../cpp/skyline/services/audio/IAudioDevice.h |  1 -
 .../cpp/skyline/services/audio/IAudioOut.cpp  |  8 +++----
 .../cpp/skyline/services/audio/IAudioOut.h    |  2 --
 .../skyline/services/audio/IAudioOutManager.h |  1 -
 .../audio/IAudioRenderer/IAudioRenderer.cpp   |  2 +-
 .../audio/IAudioRenderer/IAudioRenderer.h     |  2 --
 .../services/audio/IAudioRenderer/voice.h     |  2 --
 .../services/audio/IAudioRendererManager.cpp  |  5 +---
 .../services/audio/IAudioRendererManager.h    |  1 -
 .../cpp/skyline/services/base_service.cpp     |  1 +
 .../main/cpp/skyline/services/base_service.h  |  3 ---
 .../main/cpp/skyline/services/common/fence.h  |  1 -
 .../cpp/skyline/services/common/parcel.cpp    |  2 --
 .../main/cpp/skyline/services/common/parcel.h |  1 -
 .../cpp/skyline/services/fatalsrv/IService.h  |  1 -
 .../skyline/services/friends/IFriendService.h |  1 -
 .../services/friends/INotificationService.h   |  1 -
 .../services/friends/IServiceCreator.h        |  1 -
 .../main/cpp/skyline/services/fssrv/IFile.cpp |  1 -
 .../main/cpp/skyline/services/fssrv/IFile.h   |  1 -
 .../skyline/services/fssrv/IFileSystem.cpp    |  2 --
 .../cpp/skyline/services/fssrv/IFileSystem.h  |  1 -
 .../skyline/services/fssrv/IFileSystemProxy.h |  2 --
 .../cpp/skyline/services/fssrv/IStorage.cpp   |  1 -
 .../cpp/skyline/services/fssrv/IStorage.h     |  1 -
 .../services/hid/IActiveVibrationDeviceList.h |  2 --
 .../skyline/services/hid/IAppletResource.cpp  |  1 +
 .../skyline/services/hid/IAppletResource.h    |  2 --
 .../cpp/skyline/services/hid/IHidServer.cpp   |  1 +
 .../cpp/skyline/services/hid/IHidServer.h     |  1 -
 .../hosbinder/GraphicBufferProducer.cpp       |  2 --
 .../hosbinder/GraphicBufferProducer.h         |  5 +++-
 .../services/hosbinder/IHOSBinderDriver.cpp   |  1 +
 .../services/hosbinder/IHOSBinderDriver.h     |  1 -
 .../cpp/skyline/services/lm/ILogService.h     |  1 -
 .../main/cpp/skyline/services/lm/ILogger.cpp  |  1 -
 .../main/cpp/skyline/services/lm/ILogger.h    |  1 -
 app/src/main/cpp/skyline/services/nfp/IUser.h |  1 -
 .../cpp/skyline/services/nfp/IUserManager.h   |  1 -
 .../skyline/services/nifm/IGeneralService.h   |  1 -
 .../main/cpp/skyline/services/nifm/IRequest.h |  1 -
 .../skyline/services/nifm/IStaticService.h    |  1 -
 .../skyline/services/nvdrv/INvDrvServices.h   |  1 -
 .../services/nvdrv/devices/nvdevice.cpp       |  1 +
 .../skyline/services/nvdrv/devices/nvdevice.h |  2 --
 .../services/nvdrv/devices/nvhost_as_gpu.cpp  |  2 --
 .../services/nvdrv/devices/nvhost_channel.cpp |  2 +-
 .../services/nvdrv/devices/nvhost_ctrl.cpp    |  1 -
 .../nvdrv/devices/nvhost_ctrl_gpu.cpp         |  1 -
 .../skyline/services/nvdrv/devices/nvmap.cpp  |  1 -
 .../services/pctl/IParentalControlService.h   |  1 -
 .../pctl/IParentalControlServiceFactory.h     |  1 -
 .../services/pl/IPlatformServiceManager.h     |  2 +-
 .../skyline/services/prepo/IPrepoService.h    |  1 -
 .../main/cpp/skyline/services/serviceman.h    |  1 -
 .../services/settings/ISettingsServer.cpp     |  1 -
 .../services/settings/ISettingsServer.h       |  1 -
 .../settings/ISystemSettingsServer.cpp        |  1 -
 .../services/settings/ISystemSettingsServer.h |  1 -
 .../cpp/skyline/services/sm/IUserInterface.h  |  1 -
 .../cpp/skyline/services/socket/bsd/IClient.h |  1 -
 .../cpp/skyline/services/ssl/ISslContext.h    |  1 -
 .../cpp/skyline/services/ssl/ISslService.h    |  1 -
 .../skyline/services/timesrv/IStaticService.h |  1 -
 .../skyline/services/timesrv/ISteadyClock.h   |  1 -
 .../skyline/services/timesrv/ISystemClock.h   |  1 -
 .../services/timesrv/ITimeZoneService.h       |  1 -
 .../visrv/IApplicationDisplayService.cpp      |  2 +-
 .../services/visrv/IDisplayService.cpp        |  1 -
 .../skyline/services/visrv/IDisplayService.h  |  2 --
 .../services/visrv/IManagerDisplayService.cpp |  1 -
 .../services/visrv/IManagerRootService.cpp    |  1 -
 .../services/visrv/IManagerRootService.h      |  3 +--
 app/src/main/cpp/skyline/vfs/filesystem.h     |  1 -
 app/src/main/cpp/skyline/vfs/nacp.h           |  4 +---
 app/src/main/cpp/skyline/vfs/nca.h            |  3 +--
 .../cpp/skyline/vfs/partition_filesystem.h    |  1 -
 146 files changed, 70 insertions(+), 212 deletions(-)

diff --git a/app/src/main/cpp/emu_jni.cpp b/app/src/main/cpp/emu_jni.cpp
index a6addcb7..9c811d17 100644
--- a/app/src/main/cpp/emu_jni.cpp
+++ b/app/src/main/cpp/emu_jni.cpp
@@ -3,6 +3,7 @@
 
 #include <csignal>
 #include <unistd.h>
+#include <sys/resource.h>
 #include "skyline/loader/loader.h"
 #include "skyline/common.h"
 #include "skyline/os.h"
diff --git a/app/src/main/cpp/skyline/audio.h b/app/src/main/cpp/skyline/audio.h
index 6d346dd3..638120af 100644
--- a/app/src/main/cpp/skyline/audio.h
+++ b/app/src/main/cpp/skyline/audio.h
@@ -3,12 +3,7 @@
 
 #pragma once
 
-#include <queue>
-#include <oboe/Oboe.h>
-
-#include <kernel/types/KEvent.h>
 #include <audio/track.h>
-#include "common.h"
 
 namespace skyline::audio {
     /**
diff --git a/app/src/main/cpp/skyline/audio/adpcm_decoder.cpp b/app/src/main/cpp/skyline/audio/adpcm_decoder.cpp
index dcd050e2..a0a2293b 100644
--- a/app/src/main/cpp/skyline/audio/adpcm_decoder.cpp
+++ b/app/src/main/cpp/skyline/audio/adpcm_decoder.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <array>
-#include <common.h>
 #include "common.h"
 #include "adpcm_decoder.h"
 
diff --git a/app/src/main/cpp/skyline/audio/adpcm_decoder.h b/app/src/main/cpp/skyline/audio/adpcm_decoder.h
index ee83fcb6..e460ca90 100644
--- a/app/src/main/cpp/skyline/audio/adpcm_decoder.h
+++ b/app/src/main/cpp/skyline/audio/adpcm_decoder.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <span>
 #include <common.h>
 
 namespace skyline::audio {
diff --git a/app/src/main/cpp/skyline/audio/circular_buffer.h b/app/src/main/cpp/skyline/audio/circular_buffer.h
index 1b1d6ec2..7b945975 100644
--- a/app/src/main/cpp/skyline/audio/circular_buffer.h
+++ b/app/src/main/cpp/skyline/audio/circular_buffer.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <array>
-#include <span>
 #include <common.h>
 
 namespace skyline::audio {
diff --git a/app/src/main/cpp/skyline/audio/resampler.cpp b/app/src/main/cpp/skyline/audio/resampler.cpp
index 745ff1cf..ffb90147 100644
--- a/app/src/main/cpp/skyline/audio/resampler.cpp
+++ b/app/src/main/cpp/skyline/audio/resampler.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <array>
-#include <common.h>
 #include "common.h"
 #include "resampler.h"
 
diff --git a/app/src/main/cpp/skyline/audio/resampler.h b/app/src/main/cpp/skyline/audio/resampler.h
index 8edd09d6..ec8f2df0 100644
--- a/app/src/main/cpp/skyline/audio/resampler.h
+++ b/app/src/main/cpp/skyline/audio/resampler.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <span>
 #include <common.h>
 
 namespace skyline::audio {
diff --git a/app/src/main/cpp/skyline/audio/track.cpp b/app/src/main/cpp/skyline/audio/track.cpp
index 8dda92c8..e9f705fb 100644
--- a/app/src/main/cpp/skyline/audio/track.cpp
+++ b/app/src/main/cpp/skyline/audio/track.cpp
@@ -19,7 +19,7 @@ namespace skyline::audio {
 
     bool AudioTrack::ContainsBuffer(u64 tag) {
         // Iterate from front of queue as we don't want released samples
-        for (auto identifier = identifiers.crbegin(); identifier != identifiers.crend(); ++identifier) {
+        for (auto identifier = identifiers.crbegin(); identifier != identifiers.crend(); identifier++) {
             if (identifier->released)
                 return false;
 
diff --git a/app/src/main/cpp/skyline/audio/track.h b/app/src/main/cpp/skyline/audio/track.h
index 832242dc..b9ba4a0f 100644
--- a/app/src/main/cpp/skyline/audio/track.h
+++ b/app/src/main/cpp/skyline/audio/track.h
@@ -3,10 +3,7 @@
 
 #pragma once
 
-#include <span>
-#include <queue>
 #include <kernel/types/KEvent.h>
-#include <common.h>
 #include "common.h"
 
 namespace skyline::audio {
diff --git a/app/src/main/cpp/skyline/common.h b/app/src/main/cpp/skyline/common.h
index c345e959..cbaba7e7 100644
--- a/app/src/main/cpp/skyline/common.h
+++ b/app/src/main/cpp/skyline/common.h
@@ -9,6 +9,7 @@
 #include <vector>
 #include <fstream>
 #include <mutex>
+#include <functional>
 #include <thread>
 #include <string>
 #include <cstdint>
@@ -106,6 +107,7 @@ namespace skyline {
 
         /**
          * @return The value aligned up to the next multiple
+         * @note The multiple needs to be a power of 2
          */
         template<typename TypeVal, typename TypeMul>
         constexpr inline TypeVal AlignUp(TypeVal value, TypeMul multiple) {
@@ -115,6 +117,7 @@ namespace skyline {
 
         /**
          * @return The value aligned down to the previous multiple
+         * @note The multiple needs to be a power of 2
          */
         template<typename TypeVal, typename TypeMul>
         constexpr inline TypeVal AlignDown(TypeVal value, TypeMul multiple) {
@@ -178,7 +181,7 @@ namespace skyline {
             if (hexString.size() != Size * 2)
                 throw exception("Invalid size");
             std::array<u8, Size> result;
-            for (size_t i{}; i < Size; ++i) {
+            for (size_t i{}; i < Size; i++) {
                 size_t hexStrIndex{i * 2};
                 result[i] = (HexDigitToByte(hexString[hexStrIndex]) << 4) | HexDigitToByte(hexString[hexStrIndex + 1]);
             }
diff --git a/app/src/main/cpp/skyline/crypto/aes_cipher.h b/app/src/main/cpp/skyline/crypto/aes_cipher.h
index d7881aa5..c021d791 100644
--- a/app/src/main/cpp/skyline/crypto/aes_cipher.h
+++ b/app/src/main/cpp/skyline/crypto/aes_cipher.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <array>
-#include <span>
 #include <mbedtls/cipher.h>
 #include <common.h>
 
diff --git a/app/src/main/cpp/skyline/crypto/key_store.cpp b/app/src/main/cpp/skyline/crypto/key_store.cpp
index 79ca1d4d..19e46781 100644
--- a/app/src/main/cpp/skyline/crypto/key_store.cpp
+++ b/app/src/main/cpp/skyline/crypto/key_store.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <functional>
 #include <vfs/os_filesystem.h>
 #include "key_store.h"
 
diff --git a/app/src/main/cpp/skyline/crypto/key_store.h b/app/src/main/cpp/skyline/crypto/key_store.h
index 74d69454..e73ab7cc 100644
--- a/app/src/main/cpp/skyline/crypto/key_store.h
+++ b/app/src/main/cpp/skyline/crypto/key_store.h
@@ -3,9 +3,7 @@
 
 #pragma once
 
-#include <array>
 #include <vfs/backing.h>
-#include "common.h"
 
 namespace skyline::crypto {
     /**
diff --git a/app/src/main/cpp/skyline/gpu.h b/app/src/main/cpp/skyline/gpu.h
index 40c90ec0..7838f52a 100644
--- a/app/src/main/cpp/skyline/gpu.h
+++ b/app/src/main/cpp/skyline/gpu.h
@@ -3,16 +3,12 @@
 
 #pragma once
 
-#include <queue>
 #include <android/native_window.h>
-#include <kernel/ipc.h>
 #include <kernel/types/KEvent.h>
 #include <services/nvdrv/devices/nvmap.h>
-#include "gpu/texture.h"
 #include "gpu/memory_manager.h"
 #include "gpu/gpfifo.h"
 #include "gpu/syncpoint.h"
-#include "gpu/engines/engine.h"
 #include "gpu/engines/maxwell_3d.h"
 
 namespace skyline::gpu {
diff --git a/app/src/main/cpp/skyline/gpu/engines/gpfifo.h b/app/src/main/cpp/skyline/gpu/engines/gpfifo.h
index ee09a4bd..680d204e 100644
--- a/app/src/main/cpp/skyline/gpu/engines/gpfifo.h
+++ b/app/src/main/cpp/skyline/gpu/engines/gpfifo.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <array>
-#include <common.h>
 #include "engine.h"
 
 namespace skyline {
@@ -179,4 +177,4 @@ namespace skyline {
             };
         };
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.cpp b/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.cpp
index 5fd049ad..28c08945 100644
--- a/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.cpp
+++ b/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.cpp
@@ -2,7 +2,6 @@
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
 #include <gpu.h>
-#include <gpu/syncpoint.h>
 #include "maxwell_3d.h"
 
 namespace skyline::gpu::engine {
diff --git a/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.h b/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.h
index d7e49cd1..272b085c 100644
--- a/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.h
+++ b/app/src/main/cpp/skyline/gpu/engines/maxwell_3d.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <array>
-#include <common.h>
 #include <gpu/texture.h>
 #include <gpu/macro_interpreter.h>
 #include "engine.h"
@@ -561,7 +559,7 @@ namespace skyline {
             static_assert(sizeof(Registers) == (constant::Maxwell3DRegisterCounter * sizeof(u32)));
 #pragma pack(pop)
 
-            Registers registers{}; //!< The maxwell 3D register space
+            Registers registers{}; //!< The Maxwell 3D register space
             Registers shadowRegisters{}; //!< The shadow registers, their function is controlled by the 'shadowRamControl' register
 
             std::array<u32, 0x10000> macroCode{}; //!< This is used to store GPU macros, the 256kb size is from Ryujinx
@@ -576,4 +574,4 @@ namespace skyline {
             void CallMethod(MethodParams params);
         };
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/cpp/skyline/gpu/gpfifo.h b/app/src/main/cpp/skyline/gpu/gpfifo.h
index c768612b..49c73d7b 100644
--- a/app/src/main/cpp/skyline/gpu/gpfifo.h
+++ b/app/src/main/cpp/skyline/gpu/gpfifo.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include <queue>
 #include "engines/engine.h"
 #include "engines/gpfifo.h"
diff --git a/app/src/main/cpp/skyline/gpu/macro_interpreter.cpp b/app/src/main/cpp/skyline/gpu/macro_interpreter.cpp
index 4abdcbfc..5fc5f84e 100644
--- a/app/src/main/cpp/skyline/gpu/macro_interpreter.cpp
+++ b/app/src/main/cpp/skyline/gpu/macro_interpreter.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "engines/maxwell_3d.h"
 #include "memory_manager.h"
 #include "macro_interpreter.h"
diff --git a/app/src/main/cpp/skyline/gpu/syncpoint.cpp b/app/src/main/cpp/skyline/gpu/syncpoint.cpp
index af892510..88d6745f 100644
--- a/app/src/main/cpp/skyline/gpu/syncpoint.cpp
+++ b/app/src/main/cpp/skyline/gpu/syncpoint.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <common.h>
 #include "syncpoint.h"
 
 namespace skyline::gpu {
diff --git a/app/src/main/cpp/skyline/gpu/syncpoint.h b/app/src/main/cpp/skyline/gpu/syncpoint.h
index 8c3b52fb..8e8702df 100644
--- a/app/src/main/cpp/skyline/gpu/syncpoint.h
+++ b/app/src/main/cpp/skyline/gpu/syncpoint.h
@@ -24,8 +24,8 @@ namespace skyline {
                 std::function<void()> callback;
             };
 
-            Mutex waiterLock{}; //!< Locks insertions and deletions of waiters
-            std::map<u64, Waiter> waiterMap{};
+            Mutex waiterLock; //!< Locks insertions and deletions of waiters
+            std::map<u64, Waiter> waiterMap;
             u64 nextWaiterId{1};
 
           public:
diff --git a/app/src/main/cpp/skyline/input/sections/common.h b/app/src/main/cpp/skyline/input/sections/common.h
index 8e2964dd..4418ebe7 100644
--- a/app/src/main/cpp/skyline/input/sections/common.h
+++ b/app/src/main/cpp/skyline/input/sections/common.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <array>
 #include <common.h>
 
 namespace skyline {
diff --git a/app/src/main/cpp/skyline/input/touch.cpp b/app/src/main/cpp/skyline/input/touch.cpp
index 5fb4b955..77aa65d3 100644
--- a/app/src/main/cpp/skyline/input/touch.cpp
+++ b/app/src/main/cpp/skyline/input/touch.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <input.h>
 #include "touch.h"
 
 namespace skyline::input {
diff --git a/app/src/main/cpp/skyline/input/touch.h b/app/src/main/cpp/skyline/input/touch.h
index 7d0005a9..f116595d 100644
--- a/app/src/main/cpp/skyline/input/touch.h
+++ b/app/src/main/cpp/skyline/input/touch.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include "shared_mem.h"
 
 namespace skyline::input {
diff --git a/app/src/main/cpp/skyline/kernel/ipc.h b/app/src/main/cpp/skyline/kernel/ipc.h
index d0b2300a..5a2663c6 100644
--- a/app/src/main/cpp/skyline/kernel/ipc.h
+++ b/app/src/main/cpp/skyline/kernel/ipc.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <array>
 #include <common.h>
 
 namespace skyline {
diff --git a/app/src/main/cpp/skyline/kernel/memory.cpp b/app/src/main/cpp/skyline/kernel/memory.cpp
index d825e5ee..caace774 100644
--- a/app/src/main/cpp/skyline/kernel/memory.cpp
+++ b/app/src/main/cpp/skyline/kernel/memory.cpp
@@ -56,7 +56,7 @@ namespace skyline::kernel {
             if (chunk->address <= address && (chunk->address + chunk->size) > address)
                 chunk = chunkList.erase(chunk);
             else
-                ++chunk;
+                chunk++;
         }
     }
 
@@ -82,7 +82,7 @@ namespace skyline::kernel {
                 if (block->address > endAddress)
                     block = chunk->blockList.erase(block);
                 else
-                    ++block;
+                    block++;
             }
 
             auto end = std::prev(chunk->blockList.end());
diff --git a/app/src/main/cpp/skyline/kernel/memory.h b/app/src/main/cpp/skyline/kernel/memory.h
index 14c9cbdf..86739e0c 100644
--- a/app/src/main/cpp/skyline/kernel/memory.h
+++ b/app/src/main/cpp/skyline/kernel/memory.h
@@ -3,9 +3,7 @@
 
 #pragma once
 
-#include <forward_list>
 #include <common.h>
-#include "types/KObject.h"
 
 namespace skyline {
     namespace memory {
diff --git a/app/src/main/cpp/skyline/kernel/svc.cpp b/app/src/main/cpp/skyline/kernel/svc.cpp
index 01cd4a88..02c2cf44 100644
--- a/app/src/main/cpp/skyline/kernel/svc.cpp
+++ b/app/src/main/cpp/skyline/kernel/svc.cpp
@@ -114,7 +114,6 @@ namespace skyline::kernel::svc {
         auto object = state.process->GetMemoryObject(source);
         if (!object)
             throw exception("svcMapMemory: Cannot find memory object in handle table for address 0x{:X}", source);
-
         object->item->UpdatePermission(source, size, {false, false, false});
 
         state.logger->Debug("svcMapMemory: Mapped range 0x{:X} - 0x{:X} to 0x{:X} - 0x{:X} (Size: 0x{:X} bytes)", source, source + size, destination, destination + size, size);
@@ -376,7 +375,7 @@ namespace skyline::kernel::svc {
     void CloseHandle(DeviceState &state) {
         auto handle = static_cast<KHandle>(state.ctx->registers.w0);
         try {
-            state.process->handles.erase(handle);
+            state.process->DeleteHandle(handle);
             state.logger->Debug("svcCloseHandle: Closing handle: 0x{:X}", handle);
             state.ctx->registers.w0 = Result{};
         } catch (const std::exception &) {
diff --git a/app/src/main/cpp/skyline/kernel/svc.h b/app/src/main/cpp/skyline/kernel/svc.h
index 2f7b6896..655f9422 100644
--- a/app/src/main/cpp/skyline/kernel/svc.h
+++ b/app/src/main/cpp/skyline/kernel/svc.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <common.h>
-#include "ipc.h"
 
 namespace skyline {
     namespace constant::infoState {
diff --git a/app/src/main/cpp/skyline/kernel/types/KPrivateMemory.cpp b/app/src/main/cpp/skyline/kernel/types/KPrivateMemory.cpp
index fb2725a9..2da356c0 100644
--- a/app/src/main/cpp/skyline/kernel/types/KPrivateMemory.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KPrivateMemory.cpp
@@ -5,6 +5,7 @@
 #include <asm/unistd.h>
 #include <unistd.h>
 #include <os.h>
+#include <nce.h>
 #include "KPrivateMemory.h"
 #include "KProcess.h"
 
diff --git a/app/src/main/cpp/skyline/kernel/types/KProcess.cpp b/app/src/main/cpp/skyline/kernel/types/KProcess.cpp
index e569209d..6319d9ea 100644
--- a/app/src/main/cpp/skyline/kernel/types/KProcess.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KProcess.cpp
@@ -165,8 +165,8 @@ namespace skyline::kernel::type {
             if (size <= PAGE_SIZE) {
                 std::vector<u8> buffer(size);
 
-                state.process->ReadMemory(buffer.data(), source, size);
-                state.process->WriteMemory(buffer.data(), destination, size);
+                ReadMemory(buffer.data(), source, size);
+                WriteMemory(buffer.data(), destination, size);
             } else {
                 Registers fregs{
                     .x0 = source,
@@ -180,20 +180,21 @@ namespace skyline::kernel::type {
     }
 
     std::optional<KProcess::HandleOut<KMemory>> KProcess::GetMemoryObject(u64 address) {
-        for (auto&[handle, object] : state.process->handles) {
+        for (KHandle index{}; index < handles.size(); index++) {
+            auto& object = handles[index];
             switch (object->objectType) {
                 case type::KType::KPrivateMemory:
                 case type::KType::KSharedMemory:
                 case type::KType::KTransferMemory: {
                     auto mem = std::static_pointer_cast<type::KMemory>(object);
                     if (mem->IsInside(address))
-                        return std::make_optional<KProcess::HandleOut<KMemory>>({mem, handle});
+                        return std::make_optional<KProcess::HandleOut<KMemory>>({mem, constant::BaseHandleIndex + index});
                 }
+
                 default:
                     break;
             }
         }
-
         return std::nullopt;
     }
 
@@ -213,7 +214,7 @@ namespace skyline::kernel::type {
             return false;
 
         std::shared_ptr<WaitStatus> status;
-        for (auto it = mtxWaiters.begin();; ++it) {
+        for (auto it = mtxWaiters.begin();; it++) {
             if (it != mtxWaiters.end() && (*it)->priority >= state.thread->priority)
                 continue;
 
@@ -227,7 +228,7 @@ namespace skyline::kernel::type {
         lock.lock();
         status->flag = false;
 
-        for (auto it = mtxWaiters.begin(); it != mtxWaiters.end(); ++it) {
+        for (auto it = mtxWaiters.begin(); it != mtxWaiters.end(); it++) {
             if ((*it)->handle == state.thread->handle) {
                 mtxWaiters.erase(it);
                 break;
@@ -270,7 +271,7 @@ namespace skyline::kernel::type {
         auto &condWaiters = conditionals[conditionalAddress];
 
         std::shared_ptr<WaitStatus> status;
-        for (auto it = condWaiters.begin();; ++it) {
+        for (auto it = condWaiters.begin();; it++) {
             if (it != condWaiters.end() && (*it)->priority >= state.thread->priority)
                 continue;
 
@@ -294,7 +295,7 @@ namespace skyline::kernel::type {
         else
             status->flag = false;
 
-        for (auto it = condWaiters.begin(); it != condWaiters.end(); ++it) {
+        for (auto it = condWaiters.begin(); it != condWaiters.end(); it++) {
             if ((*it)->handle == state.thread->handle) {
                 condWaiters.erase(it);
                 break;
@@ -339,7 +340,7 @@ namespace skyline::kernel::type {
                 auto &mtxWaiters = mutexes[thread->mutexAddress];
                 std::shared_ptr<WaitStatus> status;
 
-                for (auto it = mtxWaiters.begin();; ++it) {
+                for (auto it = mtxWaiters.begin();; it++) {
                     if (it != mtxWaiters.end() && (*it)->priority >= thread->priority)
                         continue;
                     status = std::make_shared<WaitStatus>(thread->priority, thread->handle);
@@ -352,7 +353,7 @@ namespace skyline::kernel::type {
                 mtxLock.lock();
                 status->flag = false;
 
-                for (auto it = mtxWaiters.begin(); it != mtxWaiters.end(); ++it) {
+                for (auto it = mtxWaiters.begin(); it != mtxWaiters.end(); it++) {
                     if ((*it)->handle == thread->handle) {
                         mtxWaiters.erase(it);
                         break;
diff --git a/app/src/main/cpp/skyline/kernel/types/KProcess.h b/app/src/main/cpp/skyline/kernel/types/KProcess.h
index 92fd1451..c181baa4 100644
--- a/app/src/main/cpp/skyline/kernel/types/KProcess.h
+++ b/app/src/main/cpp/skyline/kernel/types/KProcess.h
@@ -4,11 +4,9 @@
 #pragma once
 
 #include <list>
-#include <kernel/memory.h>
 #include "KThread.h"
 #include "KPrivateMemory.h"
 #include "KTransferMemory.h"
-#include "KSharedMemory.h"
 #include "KSession.h"
 #include "KEvent.h"
 
@@ -26,6 +24,8 @@ namespace skyline {
         */
         class KProcess : public KSyncObject {
           private:
+            KHandle handleIndex = constant::BaseHandleIndex; //!< This is used to keep track of what to map as an handle
+
             /**
             * @brief This class holds a single TLS page's status
             * @details tls_page_t holds the status of a single TLS page (A page is 4096 bytes on ARMv8).
@@ -110,10 +110,9 @@ namespace skyline {
                 WaitStatus(u8 priority, KHandle handle, u64 mutexAddress) : priority(priority), handle(handle), mutexAddress(mutexAddress) {}
             };
 
-            KHandle handleIndex = constant::BaseHandleIndex; //!< This is used to keep track of what to map as an handle
             pid_t pid; //!< The PID of the process or TGID of the threads
             int memFd; //!< The file descriptor to the memory of the process
-            std::unordered_map<KHandle, std::shared_ptr<KObject>> handles; //!< A mapping from a handle_t to it's corresponding KObject which is the actual underlying object
+            std::vector<std::shared_ptr<KObject>> handles; //!< A vector of KObject which corresponds to the handle
             std::unordered_map<pid_t, std::shared_ptr<KThread>> threads; //!< A mapping from a PID to it's corresponding KThread object
             std::unordered_map<u64, std::vector<std::shared_ptr<WaitStatus>>> mutexes; //!< A map from a mutex's address to a vector of Mutex objects for threads waiting on it
             std::unordered_map<u64, std::list<std::shared_ptr<WaitStatus>>> conditionals; //!< A map from a conditional variable's address to a vector of threads waiting on it
@@ -285,7 +284,7 @@ namespace skyline {
                     item = std::make_shared<objectClass>(state, handleIndex, args...);
                 else
                     item = std::make_shared<objectClass>(state, args...);
-                handles[handleIndex] = std::static_pointer_cast<KObject>(item);
+                handles.push_back(std::static_pointer_cast<KObject>(item));
                 return {item, handleIndex++};
             }
 
@@ -296,7 +295,7 @@ namespace skyline {
             */
             template<typename objectClass>
             KHandle InsertItem(std::shared_ptr<objectClass> &item) {
-                handles[handleIndex] = std::static_pointer_cast<KObject>(item);
+                handles.push_back(std::static_pointer_cast<KObject>(item));
                 return handleIndex++;
             }
 
@@ -326,13 +325,15 @@ namespace skyline {
                 else
                     throw exception("KProcess::GetHandle couldn't determine object type");
                 try {
-                    auto item = handles.at(handle);
-                    if (item->objectType == objectType)
+                    auto& item = handles.at(handle - constant::BaseHandleIndex);
+                    if (item != nullptr && item->objectType == objectType)
                         return std::static_pointer_cast<objectClass>(item);
+                    else if (item == nullptr)
+                        throw exception("GetHandle was called with a deleted handle: 0x{:X}", handle);
                     else
                         throw exception("Tried to get kernel object (0x{:X}) with different type: {} when object is {}", handle, objectType, item->objectType);
                 } catch (std::out_of_range) {
-                    throw exception("GetHandle was called with invalid handle: 0x{:X}", handle);
+                    throw exception("GetHandle was called with an invalid handle: 0x{:X}", handle);
                 }
             }
 
@@ -348,7 +349,7 @@ namespace skyline {
             * @param handle The handle to delete
             */
             inline void DeleteHandle(KHandle handle) {
-                handles.erase(handle);
+                handles.at(handle - constant::BaseHandleIndex) = nullptr;
             }
 
             /**
diff --git a/app/src/main/cpp/skyline/kernel/types/KSession.h b/app/src/main/cpp/skyline/kernel/types/KSession.h
index 9ec36699..5636ce7c 100644
--- a/app/src/main/cpp/skyline/kernel/types/KSession.h
+++ b/app/src/main/cpp/skyline/kernel/types/KSession.h
@@ -3,10 +3,12 @@
 
 #pragma once
 
-#include <common.h>
-#include <services/base_service.h>
 #include "KSyncObject.h"
 
+namespace skyline::service {
+    class BaseService;
+}
+
 namespace skyline::kernel::type {
     /**
      * @brief KService holds a reference to a service, this is equivalent to KClientSession
diff --git a/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp b/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp
index cb0b05e3..61ffd5d8 100644
--- a/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <asm/unistd.h>
 #include <os.h>
+#include <nce.h>
 #include "KSharedMemory.h"
 #include "KProcess.h"
 
diff --git a/app/src/main/cpp/skyline/kernel/types/KSyncObject.h b/app/src/main/cpp/skyline/kernel/types/KSyncObject.h
index c8ec780c..67456331 100644
--- a/app/src/main/cpp/skyline/kernel/types/KSyncObject.h
+++ b/app/src/main/cpp/skyline/kernel/types/KSyncObject.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include "KObject.h"
 
 namespace skyline::kernel::type {
diff --git a/app/src/main/cpp/skyline/loader/loader.h b/app/src/main/cpp/skyline/loader/loader.h
index a62cc151..47c354c5 100644
--- a/app/src/main/cpp/skyline/loader/loader.h
+++ b/app/src/main/cpp/skyline/loader/loader.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <vfs/backing.h>
 #include <vfs/nacp.h>
 #include "executable.h"
 
diff --git a/app/src/main/cpp/skyline/loader/nca.h b/app/src/main/cpp/skyline/loader/nca.h
index 401b81f1..a4814495 100644
--- a/app/src/main/cpp/skyline/loader/nca.h
+++ b/app/src/main/cpp/skyline/loader/nca.h
@@ -3,9 +3,7 @@
 
 #pragma once
 
-#include <common.h>
 #include <vfs/nca.h>
-#include <crypto/key_store.h>
 #include "loader.h"
 
 namespace skyline::loader {
diff --git a/app/src/main/cpp/skyline/loader/nro.h b/app/src/main/cpp/skyline/loader/nro.h
index 355c7062..ddb952f0 100644
--- a/app/src/main/cpp/skyline/loader/nro.h
+++ b/app/src/main/cpp/skyline/loader/nro.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include "loader.h"
 
 namespace skyline::loader {
diff --git a/app/src/main/cpp/skyline/loader/nso.h b/app/src/main/cpp/skyline/loader/nso.h
index 865472c6..b6d59f1f 100644
--- a/app/src/main/cpp/skyline/loader/nso.h
+++ b/app/src/main/cpp/skyline/loader/nso.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include "loader.h"
 
 namespace skyline::loader {
diff --git a/app/src/main/cpp/skyline/loader/nsp.h b/app/src/main/cpp/skyline/loader/nsp.h
index eb60a4f3..bb497119 100644
--- a/app/src/main/cpp/skyline/loader/nsp.h
+++ b/app/src/main/cpp/skyline/loader/nsp.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include <vfs/nca.h>
 #include <vfs/rom_filesystem.h>
 #include <vfs/partition_filesystem.h>
diff --git a/app/src/main/cpp/skyline/nce.h b/app/src/main/cpp/skyline/nce.h
index 3b153a0b..a7f3d0c6 100644
--- a/app/src/main/cpp/skyline/nce.h
+++ b/app/src/main/cpp/skyline/nce.h
@@ -3,12 +3,7 @@
 
 #pragma once
 
-#include <syslog.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <vector>
-#include <unordered_map>
-#include "common.h"
 #include "kernel/types/KSharedMemory.h"
 
 namespace skyline {
diff --git a/app/src/main/cpp/skyline/os.cpp b/app/src/main/cpp/skyline/os.cpp
index 6f1aab08..21400906 100644
--- a/app/src/main/cpp/skyline/os.cpp
+++ b/app/src/main/cpp/skyline/os.cpp
@@ -6,6 +6,7 @@
 #include "loader/nso.h"
 #include "loader/nca.h"
 #include "loader/nsp.h"
+#include "nce.h"
 #include "nce/guest.h"
 #include "os.h"
 
diff --git a/app/src/main/cpp/skyline/os.h b/app/src/main/cpp/skyline/os.h
index 6a7ff8d6..a03e1a4a 100644
--- a/app/src/main/cpp/skyline/os.h
+++ b/app/src/main/cpp/skyline/os.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <thread>
-#include <sys/mman.h>
 #include "common.h"
 #include "loader/loader.h"
 #include "kernel/ipc.h"
diff --git a/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.cpp b/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.cpp
index 837788e7..f2253eb4 100644
--- a/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.cpp
+++ b/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "IManagerForApplication.h"
 #include "IProfile.h"
 #include "IAccountServiceForApplication.h"
diff --git a/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.h b/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.h
index 8edfeffb..f7d37e3a 100644
--- a/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.h
+++ b/app/src/main/cpp/skyline/services/account/IAccountServiceForApplication.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline {
diff --git a/app/src/main/cpp/skyline/services/account/IManagerForApplication.h b/app/src/main/cpp/skyline/services/account/IManagerForApplication.h
index e7c13159..a42fca27 100644
--- a/app/src/main/cpp/skyline/services/account/IManagerForApplication.h
+++ b/app/src/main/cpp/skyline/services/account/IManagerForApplication.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::account {
@@ -14,4 +13,4 @@ namespace skyline::service::account {
       public:
         IManagerForApplication(const DeviceState &state, ServiceManager &manager);
     };
-}
\ No newline at end of file
+}
diff --git a/app/src/main/cpp/skyline/services/account/IProfile.cpp b/app/src/main/cpp/skyline/services/account/IProfile.cpp
index 29d44ceb..d1b07382 100644
--- a/app/src/main/cpp/skyline/services/account/IProfile.cpp
+++ b/app/src/main/cpp/skyline/services/account/IProfile.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "IProfile.h"
 
 namespace skyline::service::account {
diff --git a/app/src/main/cpp/skyline/services/account/IProfile.h b/app/src/main/cpp/skyline/services/account/IProfile.h
index f20200ce..cd07f303 100644
--- a/app/src/main/cpp/skyline/services/account/IProfile.h
+++ b/app/src/main/cpp/skyline/services/account/IProfile.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "IAccountServiceForApplication.h"
-#include <services/base_service.h>
 
 namespace skyline::service::account {
 
diff --git a/app/src/main/cpp/skyline/services/am/IAllSystemAppletProxiesService.h b/app/src/main/cpp/skyline/services/am/IAllSystemAppletProxiesService.h
index b5a4335f..aad6d8d3 100644
--- a/app/src/main/cpp/skyline/services/am/IAllSystemAppletProxiesService.h
+++ b/app/src/main/cpp/skyline/services/am/IAllSystemAppletProxiesService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/IApplicationProxyService.h b/app/src/main/cpp/skyline/services/am/IApplicationProxyService.h
index e4320b95..20a6c2ff 100644
--- a/app/src/main/cpp/skyline/services/am/IApplicationProxyService.h
+++ b/app/src/main/cpp/skyline/services/am/IApplicationProxyService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/applet/ILibraryAppletAccessor.h b/app/src/main/cpp/skyline/services/am/applet/ILibraryAppletAccessor.h
index 85408e79..4e75a530 100644
--- a/app/src/main/cpp/skyline/services/am/applet/ILibraryAppletAccessor.h
+++ b/app/src/main/cpp/skyline/services/am/applet/ILibraryAppletAccessor.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/IAppletCommonFunctions.h b/app/src/main/cpp/skyline/services/am/controller/IAppletCommonFunctions.h
index f122d656..42321747 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IAppletCommonFunctions.h
+++ b/app/src/main/cpp/skyline/services/am/controller/IAppletCommonFunctions.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.h b/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.h
index 7c679964..84a73b0b 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.h
+++ b/app/src/main/cpp/skyline/services/am/controller/IApplicationFunctions.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/IAudioController.h b/app/src/main/cpp/skyline/services/am/controller/IAudioController.h
index d4bca4e4..2cb95201 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IAudioController.h
+++ b/app/src/main/cpp/skyline/services/am/controller/IAudioController.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h b/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h
index 4746305f..c6e6a58c 100644
--- a/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h
+++ b/app/src/main/cpp/skyline/services/am/controller/ICommonStateGetter.h
@@ -5,7 +5,6 @@
 
 #include <queue>
 #include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
@@ -33,7 +32,7 @@ namespace skyline::service::am {
         };
 
         std::shared_ptr<type::KEvent> messageEvent; //!< The event signalled when there is a message available
-        std::queue<Message> messageQueue;
+        std::queue<Message> messageQueue; //!< A queue of all the messages that the program is yet to consume
 
         enum class FocusState : u8 {
             InFocus = 1, //!< The application is in foreground
diff --git a/app/src/main/cpp/skyline/services/am/controller/IDebugFunctions.h b/app/src/main/cpp/skyline/services/am/controller/IDebugFunctions.h
index 58d17182..7d4ab831 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IDebugFunctions.h
+++ b/app/src/main/cpp/skyline/services/am/controller/IDebugFunctions.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/IDisplayController.h b/app/src/main/cpp/skyline/services/am/controller/IDisplayController.h
index b78eb937..99a9f4e9 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IDisplayController.h
+++ b/app/src/main/cpp/skyline/services/am/controller/IDisplayController.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/ILibraryAppletCreator.h b/app/src/main/cpp/skyline/services/am/controller/ILibraryAppletCreator.h
index e9849bcd..f1a44e2c 100644
--- a/app/src/main/cpp/skyline/services/am/controller/ILibraryAppletCreator.h
+++ b/app/src/main/cpp/skyline/services/am/controller/ILibraryAppletCreator.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/ISelfController.cpp b/app/src/main/cpp/skyline/services/am/controller/ISelfController.cpp
index 12da4f8a..4c9ae8c0 100644
--- a/app/src/main/cpp/skyline/services/am/controller/ISelfController.cpp
+++ b/app/src/main/cpp/skyline/services/am/controller/ISelfController.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <os.h>
+#include <kernel/types/KProcess.h>
 #include <services/hosbinder/GraphicBufferProducer.h>
 #include "ISelfController.h"
 
diff --git a/app/src/main/cpp/skyline/services/am/controller/ISelfController.h b/app/src/main/cpp/skyline/services/am/controller/ISelfController.h
index 0a7f6ef9..7820b81a 100644
--- a/app/src/main/cpp/skyline/services/am/controller/ISelfController.h
+++ b/app/src/main/cpp/skyline/services/am/controller/ISelfController.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/controller/IWindowController.h b/app/src/main/cpp/skyline/services/am/controller/IWindowController.h
index d3a20957..9afdabfc 100644
--- a/app/src/main/cpp/skyline/services/am/controller/IWindowController.h
+++ b/app/src/main/cpp/skyline/services/am/controller/IWindowController.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/proxy/base_proxy.h b/app/src/main/cpp/skyline/services/am/proxy/base_proxy.h
index 8aeabbb3..2e7956e0 100644
--- a/app/src/main/cpp/skyline/services/am/proxy/base_proxy.h
+++ b/app/src/main/cpp/skyline/services/am/proxy/base_proxy.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/storage/IStorage.h b/app/src/main/cpp/skyline/services/am/storage/IStorage.h
index 09c14891..4fff6018 100644
--- a/app/src/main/cpp/skyline/services/am/storage/IStorage.h
+++ b/app/src/main/cpp/skyline/services/am/storage/IStorage.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
diff --git a/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.cpp b/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.cpp
index c9a4f493..15957f7a 100644
--- a/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.cpp
+++ b/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "IStorage.h"
 #include "IStorageAccessor.h"
 
diff --git a/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.h b/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.h
index b94822a4..5cf6b27e 100644
--- a/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.h
+++ b/app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.h
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::am {
     namespace result {
         constexpr Result OutOfBounds(128, 503);
     }
+
     class IStorage;
 
     /**
diff --git a/app/src/main/cpp/skyline/services/aocsrv/IAddOnContentManager.h b/app/src/main/cpp/skyline/services/aocsrv/IAddOnContentManager.h
index b90b03d8..87d239ee 100644
--- a/app/src/main/cpp/skyline/services/aocsrv/IAddOnContentManager.h
+++ b/app/src/main/cpp/skyline/services/aocsrv/IAddOnContentManager.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::aocsrv {
diff --git a/app/src/main/cpp/skyline/services/apm/IManager.h b/app/src/main/cpp/skyline/services/apm/IManager.h
index aad8fbb1..b2cee803 100644
--- a/app/src/main/cpp/skyline/services/apm/IManager.h
+++ b/app/src/main/cpp/skyline/services/apm/IManager.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::apm {
diff --git a/app/src/main/cpp/skyline/services/apm/ISession.cpp b/app/src/main/cpp/skyline/services/apm/ISession.cpp
index cfb4333f..ba5f1830 100644
--- a/app/src/main/cpp/skyline/services/apm/ISession.cpp
+++ b/app/src/main/cpp/skyline/services/apm/ISession.cpp
@@ -10,7 +10,7 @@ namespace skyline::service::apm {
         auto mode = request.Pop<u32>();
         auto config = request.Pop<u32>();
         performanceConfig.at(mode) = config;
-        state.logger->Info("SetPerformanceConfiguration called with 0x{:X} ({})", config, mode ? "Docked" : "Handheld");
+        state.logger->Info("Performance configuration set to 0x{:X} ({})", config, mode ? "Docked" : "Handheld");
         return {};
     }
 
diff --git a/app/src/main/cpp/skyline/services/apm/ISession.h b/app/src/main/cpp/skyline/services/apm/ISession.h
index 070f4a64..bc19b9a0 100644
--- a/app/src/main/cpp/skyline/services/apm/ISession.h
+++ b/app/src/main/cpp/skyline/services/apm/ISession.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::apm {
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioDevice.h b/app/src/main/cpp/skyline/services/audio/IAudioDevice.h
index e74242b8..65174156 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioDevice.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioDevice.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::audio {
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioOut.cpp b/app/src/main/cpp/skyline/services/audio/IAudioOut.cpp
index 8ad4b134..fb2f4ffa 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioOut.cpp
+++ b/app/src/main/cpp/skyline/services/audio/IAudioOut.cpp
@@ -19,13 +19,13 @@ namespace skyline::service::audio {
     }
 
     Result IAudioOut::StartAudioOut(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
-        state.logger->Debug("IAudioOut: Start playback");
+        state.logger->Debug("Start playback");
         track->Start();
         return {};
     }
 
     Result IAudioOut::StopAudioOut(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
-        state.logger->Debug("IAudioOut: Stop playback");
+        state.logger->Debug("Stop playback");
         track->Stop();
         return {};
     }
@@ -40,7 +40,7 @@ namespace skyline::service::audio {
         } &data{request.inputBuf.at(0).as<Data>()};
         auto tag = request.Pop<u64>();
 
-        state.logger->Debug("IAudioOut: Appending buffer with address: 0x{:X}, size: 0x{:X}", data.sampleBufferPtr, data.sampleSize);
+        state.logger->Debug("Appending buffer with address: 0x{:X}, size: 0x{:X}", data.sampleBufferPtr, data.sampleSize);
 
         if (sampleRate != constant::SampleRate) {
             auto resampledBuffer = resampler.ResampleBuffer(span(state.process->GetPointer<i16>(data.sampleBufferPtr), data.sampleSize / sizeof(i16)), static_cast<double>(sampleRate) / constant::SampleRate, channelCount);
@@ -54,7 +54,7 @@ namespace skyline::service::audio {
 
     Result IAudioOut::RegisterBufferEvent(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
         auto handle{state.process->InsertItem(releaseEvent)};
-        state.logger->Debug("IAudioOut: Buffer Release Event Handle: 0x{:X}", handle);
+        state.logger->Debug("Buffer Release Event Handle: 0x{:X}", handle);
         response.copyHandles.push_back(handle);
         return {};
     }
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioOut.h b/app/src/main/cpp/skyline/services/audio/IAudioOut.h
index a849d8a9..ea196d99 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioOut.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioOut.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 #include <audio/resampler.h>
 #include <audio.h>
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioOutManager.h b/app/src/main/cpp/skyline/services/audio/IAudioOutManager.h
index fb2112cd..e33a9cc1 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioOutManager.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioOutManager.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline {
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.cpp b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.cpp
index cddf12a8..1bb264d4 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.cpp
+++ b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.cpp
@@ -173,7 +173,7 @@ namespace skyline::service::audio::IAudioRenderer {
 
     Result IAudioRenderer::QuerySystemEvent(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
         auto handle{state.process->InsertItem(systemEvent)};
-        state.logger->Debug("Audren System Event Handle: 0x{:X}", handle);
+        state.logger->Debug("System Event Handle: 0x{:X}", handle);
         response.copyHandles.push_back(handle);
         return {};
     }
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.h b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.h
index 25ffbeac..a7abb81b 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/IAudioRenderer.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 #include <audio.h>
 #include "memory_pool.h"
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/voice.h b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/voice.h
index 8d06284b..8856e27a 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/voice.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/voice.h
@@ -3,11 +3,9 @@
 
 #pragma once
 
-#include <array>
 #include <audio/resampler.h>
 #include <audio/adpcm_decoder.h>
 #include <audio.h>
-#include <common.h>
 
 namespace skyline::service::audio::IAudioRenderer {
     /**
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.cpp b/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.cpp
index 8983b7c2..4015f38f 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.cpp
+++ b/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "IAudioRenderer/IAudioRenderer.h"
 #include "IAudioDevice.h"
 #include "IAudioRendererManager.h"
@@ -51,7 +50,6 @@ namespace skyline::service::audio {
         }
 
         i64 splitterWorkSize{};
-
         if (revisionInfo.SplitterSupported()) {
             splitterWorkSize += params.splitterDestinationDataCount * 0xE0 + params.splitterCount * 0x20;
 
@@ -63,7 +61,6 @@ namespace skyline::service::audio {
 
         if (params.performanceManagerCount > 0) {
             i64 performanceMetricsBufferSize{};
-
             if (revisionInfo.UsesPerformanceMetricDataFormatV2()) {
                 performanceMetricsBufferSize = (params.voiceCount + params.effectCount + totalMixCount + params.sinkCount) + 0x990;
             } else {
@@ -81,7 +78,7 @@ namespace skyline::service::audio {
 
         size = util::AlignUp(size, 0x1000);
 
-        state.logger->Debug("IAudioRendererManager: Work buffer size: 0x{:X}", size);
+        state.logger->Debug("Work buffer size: 0x{:X}", size);
         response.Push<i64>(size);
         return {};
     }
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.h b/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.h
index 6999d0df..51f70a02 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioRendererManager.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::audio {
diff --git a/app/src/main/cpp/skyline/services/base_service.cpp b/app/src/main/cpp/skyline/services/base_service.cpp
index 3947299b..c4558e6c 100644
--- a/app/src/main/cpp/skyline/services/base_service.cpp
+++ b/app/src/main/cpp/skyline/services/base_service.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
+#include <cxxabi.h>
 #include "base_service.h"
 
 namespace skyline::service {
diff --git a/app/src/main/cpp/skyline/services/base_service.h b/app/src/main/cpp/skyline/services/base_service.h
index 315eacf8..480d8352 100644
--- a/app/src/main/cpp/skyline/services/base_service.h
+++ b/app/src/main/cpp/skyline/services/base_service.h
@@ -3,10 +3,7 @@
 
 #pragma once
 
-#include <functional>
-#include <cxxabi.h>
 #include <kernel/ipc.h>
-#include <common.h>
 
 #define SFUNC(id, Class, Function) std::pair<u32, std::pair<std::function<Result(Class*, type::KSession &, ipc::IpcRequest &, ipc::IpcResponse &)>, std::string_view>>{id, {&Class::Function, #Function}}
 #define SFUNC_BASE(id, Class, BaseClass, Function) std::pair<u32, std::pair<std::function<Result(Class*, type::KSession &, ipc::IpcRequest &, ipc::IpcResponse &)>, std::string_view>>{id, {&CallBaseFunction<Class, BaseClass, decltype(&BaseClass::Function), &BaseClass::Function>, #Function}}
diff --git a/app/src/main/cpp/skyline/services/common/fence.h b/app/src/main/cpp/skyline/services/common/fence.h
index b4b4045a..7ca7f71a 100644
--- a/app/src/main/cpp/skyline/services/common/fence.h
+++ b/app/src/main/cpp/skyline/services/common/fence.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include <services/nvdrv/devices/nvhost_syncpoint.h>
 
 namespace skyline::service::nvdrv {
diff --git a/app/src/main/cpp/skyline/services/common/parcel.cpp b/app/src/main/cpp/skyline/services/common/parcel.cpp
index 652f4d53..3f5f0265 100644
--- a/app/src/main/cpp/skyline/services/common/parcel.cpp
+++ b/app/src/main/cpp/skyline/services/common/parcel.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <os.h>
-#include <kernel/types/KProcess.h>
 #include "parcel.h"
 
 namespace skyline::service {
diff --git a/app/src/main/cpp/skyline/services/common/parcel.h b/app/src/main/cpp/skyline/services/common/parcel.h
index 69b8b110..414a6fdf 100644
--- a/app/src/main/cpp/skyline/services/common/parcel.h
+++ b/app/src/main/cpp/skyline/services/common/parcel.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include <kernel/ipc.h>
 
 namespace skyline::service {
diff --git a/app/src/main/cpp/skyline/services/fatalsrv/IService.h b/app/src/main/cpp/skyline/services/fatalsrv/IService.h
index 1a760916..84753807 100644
--- a/app/src/main/cpp/skyline/services/fatalsrv/IService.h
+++ b/app/src/main/cpp/skyline/services/fatalsrv/IService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::fatalsrv {
diff --git a/app/src/main/cpp/skyline/services/friends/IFriendService.h b/app/src/main/cpp/skyline/services/friends/IFriendService.h
index 12c336b9..babb0ea9 100644
--- a/app/src/main/cpp/skyline/services/friends/IFriendService.h
+++ b/app/src/main/cpp/skyline/services/friends/IFriendService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::friends {
diff --git a/app/src/main/cpp/skyline/services/friends/INotificationService.h b/app/src/main/cpp/skyline/services/friends/INotificationService.h
index c3edeb33..79c31e20 100644
--- a/app/src/main/cpp/skyline/services/friends/INotificationService.h
+++ b/app/src/main/cpp/skyline/services/friends/INotificationService.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::friends {
diff --git a/app/src/main/cpp/skyline/services/friends/IServiceCreator.h b/app/src/main/cpp/skyline/services/friends/IServiceCreator.h
index c3d24b25..5053c6ce 100644
--- a/app/src/main/cpp/skyline/services/friends/IServiceCreator.h
+++ b/app/src/main/cpp/skyline/services/friends/IServiceCreator.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::friends {
diff --git a/app/src/main/cpp/skyline/services/fssrv/IFile.cpp b/app/src/main/cpp/skyline/services/fssrv/IFile.cpp
index d5df1cb8..670ce170 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IFile.cpp
+++ b/app/src/main/cpp/skyline/services/fssrv/IFile.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "results.h"
 #include "IFile.h"
 
diff --git a/app/src/main/cpp/skyline/services/fssrv/IFile.h b/app/src/main/cpp/skyline/services/fssrv/IFile.h
index 1bdaca75..6ca03271 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IFile.h
+++ b/app/src/main/cpp/skyline/services/fssrv/IFile.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 #include <vfs/backing.h>
 
diff --git a/app/src/main/cpp/skyline/services/fssrv/IFileSystem.cpp b/app/src/main/cpp/skyline/services/fssrv/IFileSystem.cpp
index e1c3c657..e33db93a 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IFileSystem.cpp
+++ b/app/src/main/cpp/skyline/services/fssrv/IFileSystem.cpp
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
-#include <vfs/filesystem.h>
 #include "results.h"
 #include "IFile.h"
 #include "IFileSystem.h"
diff --git a/app/src/main/cpp/skyline/services/fssrv/IFileSystem.h b/app/src/main/cpp/skyline/services/fssrv/IFileSystem.h
index b121b7ae..ce3137d7 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IFileSystem.h
+++ b/app/src/main/cpp/skyline/services/fssrv/IFileSystem.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <vfs/filesystem.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::fssrv {
diff --git a/app/src/main/cpp/skyline/services/fssrv/IFileSystemProxy.h b/app/src/main/cpp/skyline/services/fssrv/IFileSystemProxy.h
index f99d526f..42c83b94 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IFileSystemProxy.h
+++ b/app/src/main/cpp/skyline/services/fssrv/IFileSystemProxy.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
-#include <services/serviceman.h>
 #include <services/account/IAccountServiceForApplication.h>
 #include "IFileSystem.h"
 
diff --git a/app/src/main/cpp/skyline/services/fssrv/IStorage.cpp b/app/src/main/cpp/skyline/services/fssrv/IStorage.cpp
index 7799a6ad..f516605b 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IStorage.cpp
+++ b/app/src/main/cpp/skyline/services/fssrv/IStorage.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "results.h"
 #include "IStorage.h"
 
diff --git a/app/src/main/cpp/skyline/services/fssrv/IStorage.h b/app/src/main/cpp/skyline/services/fssrv/IStorage.h
index 6f90f3d9..5f9d5a0b 100644
--- a/app/src/main/cpp/skyline/services/fssrv/IStorage.h
+++ b/app/src/main/cpp/skyline/services/fssrv/IStorage.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 #include <vfs/backing.h>
 
diff --git a/app/src/main/cpp/skyline/services/hid/IActiveVibrationDeviceList.h b/app/src/main/cpp/skyline/services/hid/IActiveVibrationDeviceList.h
index 8bca6397..8224ae93 100644
--- a/app/src/main/cpp/skyline/services/hid/IActiveVibrationDeviceList.h
+++ b/app/src/main/cpp/skyline/services/hid/IActiveVibrationDeviceList.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <kernel/types/KProcess.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::hid {
diff --git a/app/src/main/cpp/skyline/services/hid/IAppletResource.cpp b/app/src/main/cpp/skyline/services/hid/IAppletResource.cpp
index 3c38db24..d8413faa 100644
--- a/app/src/main/cpp/skyline/services/hid/IAppletResource.cpp
+++ b/app/src/main/cpp/skyline/services/hid/IAppletResource.cpp
@@ -2,6 +2,7 @@
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
 #include <input.h>
+#include <kernel/types/KProcess.h>
 #include "IAppletResource.h"
 
 namespace skyline::service::hid {
diff --git a/app/src/main/cpp/skyline/services/hid/IAppletResource.h b/app/src/main/cpp/skyline/services/hid/IAppletResource.h
index 9d4e364f..14d97785 100644
--- a/app/src/main/cpp/skyline/services/hid/IAppletResource.h
+++ b/app/src/main/cpp/skyline/services/hid/IAppletResource.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <kernel/types/KProcess.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::hid {
diff --git a/app/src/main/cpp/skyline/services/hid/IHidServer.cpp b/app/src/main/cpp/skyline/services/hid/IHidServer.cpp
index 103ed3e1..8accdce4 100644
--- a/app/src/main/cpp/skyline/services/hid/IHidServer.cpp
+++ b/app/src/main/cpp/skyline/services/hid/IHidServer.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
+#include <os.h>
 #include <input.h>
 #include "IHidServer.h"
 #include "IActiveVibrationDeviceList.h"
diff --git a/app/src/main/cpp/skyline/services/hid/IHidServer.h b/app/src/main/cpp/skyline/services/hid/IHidServer.h
index d7a8d1e1..a105aaba 100644
--- a/app/src/main/cpp/skyline/services/hid/IHidServer.h
+++ b/app/src/main/cpp/skyline/services/hid/IHidServer.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 #include "IAppletResource.h"
 
diff --git a/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp b/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp
index 3b075966..16917137 100644
--- a/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp
+++ b/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.cpp
@@ -2,8 +2,6 @@
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
 #include <gpu.h>
-#include <os.h>
-#include <kernel/types/KProcess.h>
 #include <services/nvdrv/driver.h>
 #include <services/common/fence.h>
 #include <gpu/format.h>
diff --git a/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.h b/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.h
index 17f5b33c..a8211634 100644
--- a/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.h
+++ b/app/src/main/cpp/skyline/services/hosbinder/GraphicBufferProducer.h
@@ -3,9 +3,12 @@
 
 #pragma once
 
-#include <gpu.h>
 #include <services/common/parcel.h>
 
+namespace skyline::gpu {
+    class PresentationTexture;
+}
+
 namespace skyline::service::hosbinder {
     /**
      * @brief This internal struct contains all data about the graphics buffer (https://github.com/reswitched/libtransistor/blob/0f0c36227842c344d163922fc98ee76229e9f0ee/lib/display/graphic_buffer_queue.c#L66)
diff --git a/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.cpp b/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.cpp
index ef9c0f7a..6aecf0d0 100644
--- a/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.cpp
+++ b/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
+#include <gpu.h>
 #include <kernel/types/KProcess.h>
 #include "IHOSBinderDriver.h"
 #include "GraphicBufferProducer.h"
diff --git a/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.h b/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.h
index 9849a4e0..3705a8a3 100644
--- a/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.h
+++ b/app/src/main/cpp/skyline/services/hosbinder/IHOSBinderDriver.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::hosbinder {
diff --git a/app/src/main/cpp/skyline/services/lm/ILogService.h b/app/src/main/cpp/skyline/services/lm/ILogService.h
index 3579a7e4..d59b31ed 100644
--- a/app/src/main/cpp/skyline/services/lm/ILogService.h
+++ b/app/src/main/cpp/skyline/services/lm/ILogService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::lm {
diff --git a/app/src/main/cpp/skyline/services/lm/ILogger.cpp b/app/src/main/cpp/skyline/services/lm/ILogger.cpp
index 0838a321..6963312a 100644
--- a/app/src/main/cpp/skyline/services/lm/ILogger.cpp
+++ b/app/src/main/cpp/skyline/services/lm/ILogger.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "ILogger.h"
 
 namespace skyline::service::lm {
diff --git a/app/src/main/cpp/skyline/services/lm/ILogger.h b/app/src/main/cpp/skyline/services/lm/ILogger.h
index 7ea798fa..e9620443 100644
--- a/app/src/main/cpp/skyline/services/lm/ILogger.h
+++ b/app/src/main/cpp/skyline/services/lm/ILogger.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::lm {
diff --git a/app/src/main/cpp/skyline/services/nfp/IUser.h b/app/src/main/cpp/skyline/services/nfp/IUser.h
index b5b2b376..e53b544b 100644
--- a/app/src/main/cpp/skyline/services/nfp/IUser.h
+++ b/app/src/main/cpp/skyline/services/nfp/IUser.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::nfp {
diff --git a/app/src/main/cpp/skyline/services/nfp/IUserManager.h b/app/src/main/cpp/skyline/services/nfp/IUserManager.h
index 506601db..026d64d7 100644
--- a/app/src/main/cpp/skyline/services/nfp/IUserManager.h
+++ b/app/src/main/cpp/skyline/services/nfp/IUserManager.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::nfp {
diff --git a/app/src/main/cpp/skyline/services/nifm/IGeneralService.h b/app/src/main/cpp/skyline/services/nifm/IGeneralService.h
index 199ee5b2..95cb7d25 100644
--- a/app/src/main/cpp/skyline/services/nifm/IGeneralService.h
+++ b/app/src/main/cpp/skyline/services/nifm/IGeneralService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::nifm {
diff --git a/app/src/main/cpp/skyline/services/nifm/IRequest.h b/app/src/main/cpp/skyline/services/nifm/IRequest.h
index de996d72..fe36fe7e 100644
--- a/app/src/main/cpp/skyline/services/nifm/IRequest.h
+++ b/app/src/main/cpp/skyline/services/nifm/IRequest.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <kernel/types/KEvent.h>
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::nifm {
diff --git a/app/src/main/cpp/skyline/services/nifm/IStaticService.h b/app/src/main/cpp/skyline/services/nifm/IStaticService.h
index 75cd39fa..44f03089 100644
--- a/app/src/main/cpp/skyline/services/nifm/IStaticService.h
+++ b/app/src/main/cpp/skyline/services/nifm/IStaticService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::nifm {
diff --git a/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.h b/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.h
index 49ed6f66..ac87c287 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.h
+++ b/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::nvdrv {
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.cpp b/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.cpp
index ddd49aa8..c8f8285d 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
+#include <cxxabi.h>
 #include "nvdevice.h"
 
 namespace skyline::service::nvdrv::device {
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.h b/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.h
index ed5f57c7..a867965d 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.h
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <cxxabi.h>
-#include <common.h>
 #include <kernel/ipc.h>
 #include <kernel/types/KEvent.h>
 
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_as_gpu.cpp b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_as_gpu.cpp
index c0c3420e..1e966d00 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_as_gpu.cpp
@@ -2,8 +2,6 @@
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
 #include <gpu.h>
-#include <os.h>
-#include <kernel/types/KProcess.h>
 #include <services/nvdrv/driver.h>
 #include "nvmap.h"
 #include "nvhost_as_gpu.h"
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_channel.cpp b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_channel.cpp
index 757fef02..e54c52e3 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_channel.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_channel.cpp
@@ -2,8 +2,8 @@
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
 #include <os.h>
-#include <gpu/gpfifo.h>
 #include <kernel/types/KProcess.h>
+#include <gpu/gpfifo.h>
 #include <services/nvdrv/driver.h>
 #include "nvhost_channel.h"
 
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl.cpp b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl.cpp
index 33ff87a2..69880755 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <os.h>
 #include <gpu.h>
 #include <kernel/types/KProcess.h>
 #include <services/nvdrv/driver.h>
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl_gpu.cpp b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl_gpu.cpp
index 524d1994..1f60e2b7 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl_gpu.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvhost_ctrl_gpu.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "nvhost_ctrl_gpu.h"
 
 namespace skyline::service::nvdrv::device {
diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp b/app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp
index 2571090e..79cf259e 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "nvmap.h"
 
 namespace skyline::service::nvdrv::device {
diff --git a/app/src/main/cpp/skyline/services/pctl/IParentalControlService.h b/app/src/main/cpp/skyline/services/pctl/IParentalControlService.h
index 854099b4..d390458f 100644
--- a/app/src/main/cpp/skyline/services/pctl/IParentalControlService.h
+++ b/app/src/main/cpp/skyline/services/pctl/IParentalControlService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::pctl {
diff --git a/app/src/main/cpp/skyline/services/pctl/IParentalControlServiceFactory.h b/app/src/main/cpp/skyline/services/pctl/IParentalControlServiceFactory.h
index e42664cb..da2d2fd7 100644
--- a/app/src/main/cpp/skyline/services/pctl/IParentalControlServiceFactory.h
+++ b/app/src/main/cpp/skyline/services/pctl/IParentalControlServiceFactory.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::pctl {
diff --git a/app/src/main/cpp/skyline/services/pl/IPlatformServiceManager.h b/app/src/main/cpp/skyline/services/pl/IPlatformServiceManager.h
index e9f81f28..946cc0ad 100644
--- a/app/src/main/cpp/skyline/services/pl/IPlatformServiceManager.h
+++ b/app/src/main/cpp/skyline/services/pl/IPlatformServiceManager.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <services/base_service.h>
+#include <kernel/types/KSharedMemory.h>
 #include <services/serviceman.h>
 
 namespace skyline {
diff --git a/app/src/main/cpp/skyline/services/prepo/IPrepoService.h b/app/src/main/cpp/skyline/services/prepo/IPrepoService.h
index 623970c6..cdca3ccb 100644
--- a/app/src/main/cpp/skyline/services/prepo/IPrepoService.h
+++ b/app/src/main/cpp/skyline/services/prepo/IPrepoService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::prepo {
diff --git a/app/src/main/cpp/skyline/services/serviceman.h b/app/src/main/cpp/skyline/services/serviceman.h
index 0b76cd7a..30d34f2f 100644
--- a/app/src/main/cpp/skyline/services/serviceman.h
+++ b/app/src/main/cpp/skyline/services/serviceman.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <kernel/types/KSession.h>
-#include <nce.h>
 #include "base_service.h"
 
 namespace skyline::service {
diff --git a/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp b/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp
index 70d3d44b..d3940666 100644
--- a/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp
+++ b/app/src/main/cpp/skyline/services/settings/ISettingsServer.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "ISettingsServer.h"
 
 namespace skyline::service::settings {
diff --git a/app/src/main/cpp/skyline/services/settings/ISettingsServer.h b/app/src/main/cpp/skyline/services/settings/ISettingsServer.h
index 1fa869f5..52bdc584 100644
--- a/app/src/main/cpp/skyline/services/settings/ISettingsServer.h
+++ b/app/src/main/cpp/skyline/services/settings/ISettingsServer.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service {
diff --git a/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.cpp b/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.cpp
index ebe29347..228fcf40 100644
--- a/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.cpp
+++ b/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "ISystemSettingsServer.h"
 
 namespace skyline::service::settings {
diff --git a/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.h b/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.h
index 2d133a64..5403c8ec 100644
--- a/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.h
+++ b/app/src/main/cpp/skyline/services/settings/ISystemSettingsServer.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::settings {
diff --git a/app/src/main/cpp/skyline/services/sm/IUserInterface.h b/app/src/main/cpp/skyline/services/sm/IUserInterface.h
index 1586d9b1..47dc6422 100644
--- a/app/src/main/cpp/skyline/services/sm/IUserInterface.h
+++ b/app/src/main/cpp/skyline/services/sm/IUserInterface.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::sm {
diff --git a/app/src/main/cpp/skyline/services/socket/bsd/IClient.h b/app/src/main/cpp/skyline/services/socket/bsd/IClient.h
index eb0cff77..c214b10e 100644
--- a/app/src/main/cpp/skyline/services/socket/bsd/IClient.h
+++ b/app/src/main/cpp/skyline/services/socket/bsd/IClient.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::socket {
diff --git a/app/src/main/cpp/skyline/services/ssl/ISslContext.h b/app/src/main/cpp/skyline/services/ssl/ISslContext.h
index f56487de..5d84d76f 100644
--- a/app/src/main/cpp/skyline/services/ssl/ISslContext.h
+++ b/app/src/main/cpp/skyline/services/ssl/ISslContext.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::ssl {
diff --git a/app/src/main/cpp/skyline/services/ssl/ISslService.h b/app/src/main/cpp/skyline/services/ssl/ISslService.h
index a3209ce5..a4808f0d 100644
--- a/app/src/main/cpp/skyline/services/ssl/ISslService.h
+++ b/app/src/main/cpp/skyline/services/ssl/ISslService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::ssl {
diff --git a/app/src/main/cpp/skyline/services/timesrv/IStaticService.h b/app/src/main/cpp/skyline/services/timesrv/IStaticService.h
index 17abadab..c95baa96 100644
--- a/app/src/main/cpp/skyline/services/timesrv/IStaticService.h
+++ b/app/src/main/cpp/skyline/services/timesrv/IStaticService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::timesrv {
diff --git a/app/src/main/cpp/skyline/services/timesrv/ISteadyClock.h b/app/src/main/cpp/skyline/services/timesrv/ISteadyClock.h
index 9f6d5280..06953cb0 100644
--- a/app/src/main/cpp/skyline/services/timesrv/ISteadyClock.h
+++ b/app/src/main/cpp/skyline/services/timesrv/ISteadyClock.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::timesrv {
diff --git a/app/src/main/cpp/skyline/services/timesrv/ISystemClock.h b/app/src/main/cpp/skyline/services/timesrv/ISystemClock.h
index 6faa13c6..635ee920 100644
--- a/app/src/main/cpp/skyline/services/timesrv/ISystemClock.h
+++ b/app/src/main/cpp/skyline/services/timesrv/ISystemClock.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::timesrv {
diff --git a/app/src/main/cpp/skyline/services/timesrv/ITimeZoneService.h b/app/src/main/cpp/skyline/services/timesrv/ITimeZoneService.h
index f1bf3b16..1dcc2de1 100644
--- a/app/src/main/cpp/skyline/services/timesrv/ITimeZoneService.h
+++ b/app/src/main/cpp/skyline/services/timesrv/ITimeZoneService.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
 
 namespace skyline::service::timesrv {
diff --git a/app/src/main/cpp/skyline/services/visrv/IApplicationDisplayService.cpp b/app/src/main/cpp/skyline/services/visrv/IApplicationDisplayService.cpp
index 51143d06..a39dc6a7 100644
--- a/app/src/main/cpp/skyline/services/visrv/IApplicationDisplayService.cpp
+++ b/app/src/main/cpp/skyline/services/visrv/IApplicationDisplayService.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <os.h>
+#include <gpu.h>
 #include <kernel/types/KProcess.h>
 #include <services/hosbinder/IHOSBinderDriver.h>
 #include <services/hosbinder/GraphicBufferProducer.h>
diff --git a/app/src/main/cpp/skyline/services/visrv/IDisplayService.cpp b/app/src/main/cpp/skyline/services/visrv/IDisplayService.cpp
index 0802f404..39bce1f2 100644
--- a/app/src/main/cpp/skyline/services/visrv/IDisplayService.cpp
+++ b/app/src/main/cpp/skyline/services/visrv/IDisplayService.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <os.h>
 #include <services/hosbinder/GraphicBufferProducer.h>
 #include "IDisplayService.h"
 
diff --git a/app/src/main/cpp/skyline/services/visrv/IDisplayService.h b/app/src/main/cpp/skyline/services/visrv/IDisplayService.h
index 093ecfa1..9cbdf458 100644
--- a/app/src/main/cpp/skyline/services/visrv/IDisplayService.h
+++ b/app/src/main/cpp/skyline/services/visrv/IDisplayService.h
@@ -3,9 +3,7 @@
 
 #pragma once
 
-#include <services/base_service.h>
 #include <services/serviceman.h>
-#include <services/common/parcel.h>
 
 namespace skyline::service::visrv {
     /**
diff --git a/app/src/main/cpp/skyline/services/visrv/IManagerDisplayService.cpp b/app/src/main/cpp/skyline/services/visrv/IManagerDisplayService.cpp
index e40131d1..033c3aa8 100644
--- a/app/src/main/cpp/skyline/services/visrv/IManagerDisplayService.cpp
+++ b/app/src/main/cpp/skyline/services/visrv/IManagerDisplayService.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <os.h>
 #include <services/hosbinder/GraphicBufferProducer.h>
 #include "IManagerDisplayService.h"
 
diff --git a/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp b/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp
index 95b4fb36..54cd4ffa 100644
--- a/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp
+++ b/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MPL-2.0
 // Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
 
-#include <kernel/types/KProcess.h>
 #include "IManagerRootService.h"
 #include "IApplicationDisplayService.h"
 
diff --git a/app/src/main/cpp/skyline/services/visrv/IManagerRootService.h b/app/src/main/cpp/skyline/services/visrv/IManagerRootService.h
index b25c40bf..b3f60233 100644
--- a/app/src/main/cpp/skyline/services/visrv/IManagerRootService.h
+++ b/app/src/main/cpp/skyline/services/visrv/IManagerRootService.h
@@ -3,9 +3,8 @@
 
 #pragma once
 
-#include <services/base_service.h>
-#include <services/serviceman.h>
 #include <gpu.h>
+#include <services/serviceman.h>
 
 namespace skyline::service::visrv {
     /**
diff --git a/app/src/main/cpp/skyline/vfs/filesystem.h b/app/src/main/cpp/skyline/vfs/filesystem.h
index 9cd68bd2..f9ea051f 100644
--- a/app/src/main/cpp/skyline/vfs/filesystem.h
+++ b/app/src/main/cpp/skyline/vfs/filesystem.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <common.h>
 #include "backing.h"
 #include "directory.h"
 
diff --git a/app/src/main/cpp/skyline/vfs/nacp.h b/app/src/main/cpp/skyline/vfs/nacp.h
index d95363bb..3a87bef7 100644
--- a/app/src/main/cpp/skyline/vfs/nacp.h
+++ b/app/src/main/cpp/skyline/vfs/nacp.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <array>
-#include <common.h>
 #include "backing.h"
 
 namespace skyline::vfs {
@@ -42,4 +40,4 @@ namespace skyline::vfs {
         std::string applicationName; //!< The name of the application in the currently selected language
         std::string applicationPublisher; //!< The publisher of the application in the currently selected language
     };
-}
\ No newline at end of file
+}
diff --git a/app/src/main/cpp/skyline/vfs/nca.h b/app/src/main/cpp/skyline/vfs/nca.h
index 15cf835d..3bd41aae 100644
--- a/app/src/main/cpp/skyline/vfs/nca.h
+++ b/app/src/main/cpp/skyline/vfs/nca.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <array>
 #include <crypto/key_store.h>
 #include <crypto/aes_cipher.h>
 #include "filesystem.h"
@@ -223,4 +222,4 @@ namespace skyline {
             NCA(const std::shared_ptr<vfs::Backing> &backing, const std::shared_ptr<crypto::KeyStore> &keyStore);
         };
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/cpp/skyline/vfs/partition_filesystem.h b/app/src/main/cpp/skyline/vfs/partition_filesystem.h
index 1d53441b..be5ec479 100644
--- a/app/src/main/cpp/skyline/vfs/partition_filesystem.h
+++ b/app/src/main/cpp/skyline/vfs/partition_filesystem.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <array>
 #include "filesystem.h"
 
 namespace skyline::vfs {