diff --git a/src/core/libraries/ngs2/ngs2_custom.cpp b/src/core/libraries/ngs2/ngs2_custom.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_custom.cpp
+++ b/src/core/libraries/ngs2/ngs2_custom.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_eq.cpp b/src/core/libraries/ngs2/ngs2_eq.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_eq.cpp
+++ b/src/core/libraries/ngs2/ngs2_eq.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_geom.cpp b/src/core/libraries/ngs2/ngs2_geom.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_geom.cpp
+++ b/src/core/libraries/ngs2/ngs2_geom.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_impl.h b/src/core/libraries/ngs2/ngs2_impl.h
index 99b847861..de4512986 100644
--- a/src/core/libraries/ngs2/ngs2_impl.h
+++ b/src/core/libraries/ngs2/ngs2_impl.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/libraries/kernel/thread_management.h"
+#include "core/libraries/kernel/threads/pthread.h"
 
 namespace Libraries::Ngs2 {
 
@@ -121,10 +121,10 @@ struct SystemInternal {
     void* systemListNext; // 232
     void* rackFunction;   // 240
 
-    Kernel::ScePthreadMutex processLock; // 248
+    Kernel::PthreadMutex processLock;    // 248
     u32 hasProcessMutex;                 // 256
     u32 unknown5;                        // 260
-    Kernel::ScePthreadMutex flushLock;   // 264
+    Kernel::PthreadMutex flushLock;      // 264
     u32 hasFlushMutex;                   // 272
     u32 unknown6;                        // 276
 
diff --git a/src/core/libraries/ngs2/ngs2_mastering.cpp b/src/core/libraries/ngs2/ngs2_mastering.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_mastering.cpp
+++ b/src/core/libraries/ngs2/ngs2_mastering.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_pan.cpp b/src/core/libraries/ngs2/ngs2_pan.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_pan.cpp
+++ b/src/core/libraries/ngs2/ngs2_pan.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_report.cpp b/src/core/libraries/ngs2/ngs2_report.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_report.cpp
+++ b/src/core/libraries/ngs2/ngs2_report.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_reverb.cpp b/src/core/libraries/ngs2/ngs2_reverb.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_reverb.cpp
+++ b/src/core/libraries/ngs2/ngs2_reverb.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_sampler.cpp b/src/core/libraries/ngs2/ngs2_sampler.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_sampler.cpp
+++ b/src/core/libraries/ngs2/ngs2_sampler.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;
 
diff --git a/src/core/libraries/ngs2/ngs2_submixer.cpp b/src/core/libraries/ngs2/ngs2_submixer.cpp
index 81f260a91..8c82e4e49 100644
--- a/src/core/libraries/ngs2/ngs2_submixer.cpp
+++ b/src/core/libraries/ngs2/ngs2_submixer.cpp
@@ -6,7 +6,6 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/libkernel.h"
 
 using namespace Libraries::Kernel;