diff --git a/src/core/libraries/ngs2/ngs2.h b/src/core/libraries/ngs2/ngs2.h
index 077da74b2..6c499d974 100644
--- a/src/core/libraries/ngs2/ngs2.h
+++ b/src/core/libraries/ngs2/ngs2.h
@@ -16,7 +16,8 @@ class SymbolsResolver;
 
 namespace Libraries::Ngs2 {
 
-using OrbisNgs2ParseReadHandler = s32 PS4_SYSV_ABI (*)(uintptr_t user_data, u32 offset, void* data, size_t size);
+using OrbisNgs2ParseReadHandler = s32 PS4_SYSV_ABI (*)(uintptr_t user_data, u32 offset, void* data,
+                                                       size_t size);
 
 enum class OrbisNgs2HandleType : u32 {
     Invalid = 0,
@@ -114,7 +115,8 @@ struct OrbisNgs2UserFx2CleanupContext {
     u64 reserved[4];
 };
 
-using OrbisNgs2UserFx2CleanupHandler = s32 PS4_SYSV_ABI (*)(OrbisNgs2UserFx2CleanupContext* context);
+using OrbisNgs2UserFx2CleanupHandler =
+    s32 PS4_SYSV_ABI (*)(OrbisNgs2UserFx2CleanupContext* context);
 
 struct OrbisNgs2UserFx2ControlContext {
     const void* data;
@@ -125,7 +127,8 @@ struct OrbisNgs2UserFx2ControlContext {
     u64 reserved[4];
 };
 
-using OrbisNgs2UserFx2ControlHandler = s32 PS4_SYSV_ABI (*)(OrbisNgs2UserFx2ControlContext* context);
+using OrbisNgs2UserFx2ControlHandler =
+    s32 PS4_SYSV_ABI (*)(OrbisNgs2UserFx2ControlContext* context);
 
 struct OrbisNgs2UserFx2ProcessContext {
     float** aChannelData;
@@ -143,7 +146,8 @@ struct OrbisNgs2UserFx2ProcessContext {
     u64 reserved2[4];
 };
 
-using OrbisNgs2UserFx2ProcessHandler = s32 PS4_SYSV_ABI (*)(OrbisNgs2UserFx2ProcessContext* context);
+using OrbisNgs2UserFx2ProcessHandler =
+    s32 PS4_SYSV_ABI (*)(OrbisNgs2UserFx2ProcessContext* context);
 
 struct OrbisNgs2BufferAllocator {
     OrbisNgs2BufferAllocHandler allocHandler;
diff --git a/src/core/libraries/ngs2/ngs2_impl.h b/src/core/libraries/ngs2/ngs2_impl.h
index 575498c2a..ac673c38a 100644
--- a/src/core/libraries/ngs2/ngs2_impl.h
+++ b/src/core/libraries/ngs2/ngs2_impl.h
@@ -31,7 +31,8 @@ struct OrbisNgs2SystemOption {
 };
 
 
-using OrbisNgs2BufferAllocHandler = s32 PS4_SYSV_ABI (*)(OrbisNgs2ContextBufferInfo* io_buffer_info);
+using OrbisNgs2BufferAllocHandler =
+    s32 PS4_SYSV_ABI (*)(OrbisNgs2ContextBufferInfo* io_buffer_info);
 using OrbisNgs2BufferFreeHandler = s32 PS4_SYSV_ABI (*)(OrbisNgs2ContextBufferInfo* io_buffer_info);
 
 struct OrbisNgs2SystemInfo {
diff --git a/src/core/libraries/ngs2/ngs2_report.h b/src/core/libraries/ngs2/ngs2_report.h
index 88f6d1df0..9177a9649 100644
--- a/src/core/libraries/ngs2/ngs2_report.h
+++ b/src/core/libraries/ngs2/ngs2_report.h
@@ -18,7 +18,8 @@ struct OrbisNgs2ReportDataHeader {
     s32 result;
 };
 
-typedef void (*OrbisNgs2ReportHandler)(const OrbisNgs2ReportDataHeader* data, uintptr_t userData);
+using OrbisNgs2ReportHandler =
+    void PS4_SYSV_ABI (*)(const OrbisNgs2ReportDataHeader* data, uintptr_t user_data);
 
 struct OrbisNgs2ReportMessageData {
     OrbisNgs2ReportDataHeader header;