diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
index cc008f2a..33dcf81c 100644
--- a/app/src/main/cpp/main.cpp
+++ b/app/src/main/cpp/main.cpp
@@ -1,8 +1,8 @@
+#include <csignal>
+#include <unistd.h>
 #include "skyline/common.h"
 #include "skyline/os.h"
 #include "skyline/jvm.h"
-#include <unistd.h>
-#include <csignal>
 
 bool Halt;
 jobject Surface;
diff --git a/app/src/main/cpp/skyline/kernel/memory.h b/app/src/main/cpp/skyline/kernel/memory.h
index 4910d540..1f323bc8 100644
--- a/app/src/main/cpp/skyline/kernel/memory.h
+++ b/app/src/main/cpp/skyline/kernel/memory.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <forward_list>
 #include <common.h>
 #include "types/KObject.h"
-#include <forward_list>
 
 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 6eb9ca59..50ca057c 100644
--- a/app/src/main/cpp/skyline/kernel/svc.cpp
+++ b/app/src/main/cpp/skyline/kernel/svc.cpp
@@ -1,5 +1,5 @@
-#include "svc.h"
 #include <os.h>
+#include "svc.h"
 
 namespace skyline::kernel::svc {
     void SetHeapSize(DeviceState &state) {
diff --git a/app/src/main/cpp/skyline/kernel/svc.h b/app/src/main/cpp/skyline/kernel/svc.h
index f78ff39f..4cb0c848 100644
--- a/app/src/main/cpp/skyline/kernel/svc.h
+++ b/app/src/main/cpp/skyline/kernel/svc.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ipc.h"
 #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 61bb1b70..0be2c445 100644
--- a/app/src/main/cpp/skyline/kernel/types/KPrivateMemory.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KPrivateMemory.cpp
@@ -1,9 +1,9 @@
-#include "KPrivateMemory.h"
-#include "KProcess.h"
-#include <os.h>
 #include <android/sharedmem.h>
 #include <asm/unistd.h>
 #include <unistd.h>
+#include <os.h>
+#include "KPrivateMemory.h"
+#include "KProcess.h"
 
 namespace skyline::kernel::type {
     KPrivateMemory::KPrivateMemory(const DeviceState &state, u64 address, size_t size, memory::Permission permission, const memory::MemoryState memState) : size(size), KMemory(state, KType::KPrivateMemory) {
diff --git a/app/src/main/cpp/skyline/kernel/types/KProcess.cpp b/app/src/main/cpp/skyline/kernel/types/KProcess.cpp
index 0fcdb5c6..532525ab 100644
--- a/app/src/main/cpp/skyline/kernel/types/KProcess.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KProcess.cpp
@@ -1,11 +1,11 @@
-#include "KProcess.h"
-#include <nce.h>
-#include <os.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/uio.h>
 #include <asm/unistd.h>
 #include <nce/guest.h>
+#include <nce.h>
+#include <os.h>
+#include "KProcess.h"
 
 namespace skyline::kernel::type {
     KProcess::TlsPage::TlsPage(u64 address) : address(address) {}
diff --git a/app/src/main/cpp/skyline/kernel/types/KProcess.h b/app/src/main/cpp/skyline/kernel/types/KProcess.h
index 12234b6c..8738121d 100644
--- a/app/src/main/cpp/skyline/kernel/types/KProcess.h
+++ b/app/src/main/cpp/skyline/kernel/types/KProcess.h
@@ -1,13 +1,13 @@
 #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"
-#include <kernel/memory.h>
-#include <list>
 
 namespace skyline {
     namespace constant {
diff --git a/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp b/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp
index 93606834..e27a10c4 100644
--- a/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KSharedMemory.cpp
@@ -1,9 +1,9 @@
-#include "KSharedMemory.h"
-#include "KProcess.h"
-#include <os.h>
 #include <android/sharedmem.h>
 #include <unistd.h>
 #include <asm/unistd.h>
+#include <os.h>
+#include "KSharedMemory.h"
+#include "KProcess.h"
 
 namespace skyline::kernel::type {
     KSharedMemory::KSharedMemory(const DeviceState &state, u64 address, size_t size, const memory::Permission permission, memory::MemoryState memState, int mmapFlags) : initialState(memState), KMemory(state, KType::KSharedMemory) {
diff --git a/app/src/main/cpp/skyline/kernel/types/KThread.cpp b/app/src/main/cpp/skyline/kernel/types/KThread.cpp
index 24680951..5649da6d 100644
--- a/app/src/main/cpp/skyline/kernel/types/KThread.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KThread.cpp
@@ -1,7 +1,7 @@
 #include <sys/resource.h>
+#include <nce.h>
 #include "KThread.h"
 #include "KProcess.h"
-#include <nce.h>
 
 namespace skyline::kernel::type {
     KThread::KThread(const DeviceState &state, KHandle handle, pid_t selfPid, u64 entryPoint, u64 entryArg, u64 stackTop, u64 tls, u8 priority, KProcess *parent, std::shared_ptr<type::KSharedMemory> &tlsMemory) : handle(handle), pid(selfPid), entryPoint(entryPoint), entryArg(entryArg), stackTop(stackTop), tls(tls), priority(priority), parent(parent), ctxMemory(tlsMemory), KSyncObject(state, KType::KThread) {
diff --git a/app/src/main/cpp/skyline/kernel/types/KTransferMemory.cpp b/app/src/main/cpp/skyline/kernel/types/KTransferMemory.cpp
index b625d13e..afad443a 100644
--- a/app/src/main/cpp/skyline/kernel/types/KTransferMemory.cpp
+++ b/app/src/main/cpp/skyline/kernel/types/KTransferMemory.cpp
@@ -1,7 +1,7 @@
-#include "KTransferMemory.h"
+#include <asm/unistd.h>
 #include <nce.h>
 #include <os.h>
-#include <asm/unistd.h>
+#include "KTransferMemory.h"
 
 namespace skyline::kernel::type {
     KTransferMemory::KTransferMemory(const DeviceState &state, bool host, u64 address, size_t size, const memory::Permission permission, memory::MemoryState memState) : host(host), size(size), KMemory(state, KType::KTransferMemory) {
diff --git a/app/src/main/cpp/skyline/loader/loader.h b/app/src/main/cpp/skyline/loader/loader.h
index b3832fd0..441445fc 100644
--- a/app/src/main/cpp/skyline/loader/loader.h
+++ b/app/src/main/cpp/skyline/loader/loader.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <unistd.h>
 #include <os.h>
 #include <kernel/types/KProcess.h>
-#include <unistd.h>
 
 namespace skyline::loader {
     class Loader {
diff --git a/app/src/main/cpp/skyline/nce/guest.h b/app/src/main/cpp/skyline/nce/guest.h
index 32e400e5..3f026000 100644
--- a/app/src/main/cpp/skyline/nce/guest.h
+++ b/app/src/main/cpp/skyline/nce/guest.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "guest_common.h"
+
 namespace skyline {
     namespace guest {
         constexpr size_t SaveCtxSize = 20 * sizeof(u32); //!< The size of the SaveCtx function in 32-bit ARMv8 instructions
diff --git a/app/src/main/cpp/skyline/os.h b/app/src/main/cpp/skyline/os.h
index b7d92463..05991a3f 100644
--- a/app/src/main/cpp/skyline/os.h
+++ b/app/src/main/cpp/skyline/os.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <sys/mman.h>
 #include <thread>
+#include <sys/mman.h>
 #include "common.h"
 #include "kernel/ipc.h"
 #include "kernel/types/KProcess.h"
diff --git a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/revision_info.h b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/revision_info.h
index ac8f19e7..a98b351d 100644
--- a/app/src/main/cpp/skyline/services/audio/IAudioRenderer/revision_info.h
+++ b/app/src/main/cpp/skyline/services/audio/IAudioRenderer/revision_info.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <common.h>
+
 namespace skyline {
     namespace constant {
         constexpr u32 SupportedRevision = 7; //!< The audren revision our implementation supports
diff --git a/app/src/main/cpp/skyline/services/common/parcel.cpp b/app/src/main/cpp/skyline/services/common/parcel.cpp
index 55667b07..f5c8acb8 100644
--- a/app/src/main/cpp/skyline/services/common/parcel.cpp
+++ b/app/src/main/cpp/skyline/services/common/parcel.cpp
@@ -1,6 +1,6 @@
-#include "parcel.h"
 #include <os.h>
 #include <kernel/types/KProcess.h>
+#include "parcel.h"
 
 namespace skyline::service {
     Parcel::Parcel(kernel::ipc::InputBuffer &buffer, const DeviceState &state, bool hasToken) : Parcel(buffer.address, buffer.size, state, hasToken) {}
diff --git a/app/src/main/cpp/skyline/services/hid/IAppletResource.h b/app/src/main/cpp/skyline/services/hid/IAppletResource.h
index 796b2555..787896ee 100644
--- a/app/src/main/cpp/skyline/services/hid/IAppletResource.h
+++ b/app/src/main/cpp/skyline/services/hid/IAppletResource.h
@@ -3,6 +3,7 @@
 #include <kernel/types/KProcess.h>
 #include <services/base_service.h>
 #include <services/serviceman.h>
+
 namespace skyline {
     namespace constant {
         constexpr auto HidSharedMemSize = 0x40000; //!< The size of HID Shared Memory (https://switchbrew.org/wiki/HID_Shared_Memory)
diff --git a/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.cpp b/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.cpp
index b97dc1f4..d9e09050 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/INvDrvServices.cpp
@@ -1,9 +1,9 @@
-#include "INvDrvServices.h"
 #include <kernel/types/KProcess.h>
 #include "devices/nvhost_ctrl.h"
 #include "devices/nvhost_ctrl_gpu.h"
 #include "devices/nvhost_channel.h"
 #include "devices/nvhost_as_gpu.h"
+#include "INvDrvServices.h"
 
 namespace skyline::service::nvdrv {
     u32 INvDrvServices::OpenDevice(const std::string &path) {
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 079fb7ed..a72d05c1 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.h
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvdevice.h
@@ -51,7 +51,7 @@ namespace skyline::service::nvdrv::device {
         {"/dev/nvhost-as-gpu", NvDeviceType::nvhost_as_gpu},
         {"/dev/nvhost-dbg-gpu", NvDeviceType::nvhost_dbg_gpu},
         {"/dev/nvhost-prof-gpu", NvDeviceType::nvhost_prof_gpu},
-        {"/dev/nvhost-ctrl-gpu", NvDeviceType::nvhost_ctrl_gpu}
+        {"/dev/nvhost-ctrl-gpu", NvDeviceType::nvhost_ctrl_gpu},
     };
 
     /**
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 4cd4bc43..720d6920 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
@@ -1,5 +1,5 @@
-#include "nvhost_channel.h"
 #include <kernel/types/KProcess.h>
+#include "nvhost_channel.h"
 
 namespace skyline::service::nvdrv::device {
     NvHostChannel::NvHostChannel(const DeviceState &state, NvDeviceType type) : NvDevice(state, type, {
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 b82ef629..6620b1e2 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,5 +1,5 @@
-#include "nvhost_ctrl_gpu.h"
 #include <kernel/types/KProcess.h>
+#include "nvhost_ctrl_gpu.h"
 
 namespace skyline::service::nvdrv::device {
     NvHostCtrlGpu::NvHostCtrlGpu(const DeviceState &state) : NvDevice(state, NvDeviceType::nvhost_ctrl_gpu, {
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 1baa702a..99fd44a2 100644
--- a/app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp
+++ b/app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp
@@ -1,5 +1,5 @@
-#include "nvmap.h"
 #include <kernel/types/KProcess.h>
+#include "nvmap.h"
 
 namespace skyline::service::nvdrv::device {
     NvMap::NvMapObject::NvMapObject(u32 id, u32 size) : id(id), size(size) {}
diff --git a/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp b/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp
index e962a7ad..f3689174 100644
--- a/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp
+++ b/app/src/main/cpp/skyline/services/visrv/IManagerRootService.cpp
@@ -1,5 +1,5 @@
-#include "IManagerRootService.h"
 #include <kernel/types/KProcess.h>
+#include "IManagerRootService.h"
 #include "IApplicationDisplayService.h"
 
 namespace skyline::service::visrv {