diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8f4f698a..d99e70349 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,22 +208,20 @@ set(GNM_LIB src/core/libraries/gnmdriver/gnmdriver.cpp
             src/core/libraries/gnmdriver/gnm_error.h
 )
 
-set(KERNEL_LIB
+set(KERNEL_LIB src/core/libraries/kernel/threads/condvar.cpp
                src/core/libraries/kernel/threads/event_flag.cpp
-               src/core/libraries/kernel/threads/event_flag.h
-               src/core/libraries/kernel/threads/thr_attr.cpp
-               src/core/libraries/kernel/threads/thr_cond.cpp
-               src/core/libraries/kernel/threads/thr_create.cpp
-               src/core/libraries/kernel/threads/threads.h
-               src/core/libraries/kernel/threads/thr_mutex.cpp
-               src/core/libraries/kernel/threads/thr_rwlock.cpp
-               src/core/libraries/kernel/threads/thr_sem.cpp
-               src/core/libraries/kernel/threads/thr_spec.cpp
-               src/core/libraries/kernel/threads/thr_stack.cpp
-               src/core/libraries/kernel/threads/thr_clean.cpp
+               src/core/libraries/kernel/threads/mutex.cpp
+               src/core/libraries/kernel/threads/pthread_attr.cpp
+               src/core/libraries/kernel/threads/pthread_clean.cpp
+               src/core/libraries/kernel/threads/pthread.cpp
+               src/core/libraries/kernel/threads/pthread_spec.cpp
+               src/core/libraries/kernel/threads/rwlock.cpp
+               src/core/libraries/kernel/threads/semaphore.cpp
+               src/core/libraries/kernel/threads/stack.cpp
+               src/core/libraries/kernel/threads/tcb.cpp
+               src/core/libraries/kernel/threads/pthread.h
                src/core/libraries/kernel/threads/thread_state.cpp
                src/core/libraries/kernel/threads/thread_state.h
-               src/core/libraries/kernel/threads/thr_ctrdtr.cpp
                src/core/libraries/kernel/cpu_management.cpp
                src/core/libraries/kernel/cpu_management.h
                src/core/libraries/kernel/event_queues.cpp
@@ -232,12 +230,12 @@ set(KERNEL_LIB
                src/core/libraries/kernel/file_system.h
                src/core/libraries/kernel/kernel.cpp
                src/core/libraries/kernel/kernel.h
-               src/core/libraries/kernel/memory_management.cpp
-               src/core/libraries/kernel/memory_management.h
-               src/core/libraries/kernel/thread_management.cpp
-               src/core/libraries/kernel/thread_management.h
-               src/core/libraries/kernel/time_management.cpp
-               src/core/libraries/kernel/time_management.h
+               src/core/libraries/kernel/memory.cpp
+               src/core/libraries/kernel/memory.h
+               src/core/libraries/kernel/threads.cpp
+               src/core/libraries/kernel/threads.h
+               src/core/libraries/kernel/time.cpp
+               src/core/libraries/kernel/time.h
 )
 
 set(NETWORK_LIBS src/core/libraries/network/http.cpp
diff --git a/src/core/address_space.cpp b/src/core/address_space.cpp
index 8ba99e32d..4633cbe2e 100644
--- a/src/core/address_space.cpp
+++ b/src/core/address_space.cpp
@@ -7,7 +7,7 @@
 #include "common/assert.h"
 #include "common/error.h"
 #include "core/address_space.h"
-#include "core/libraries/kernel/memory_management.h"
+#include "core/libraries/kernel/memory.h"
 #include "core/memory.h"
 #include "libraries/error_codes.h"
 
diff --git a/src/core/debug_state.cpp b/src/core/debug_state.cpp
index adcb0cadb..1dc4297c3 100644
--- a/src/core/debug_state.cpp
+++ b/src/core/debug_state.cpp
@@ -8,7 +8,7 @@
 #include "common/singleton.h"
 #include "debug_state.h"
 #include "devtools/widget/common.h"
-#include "libraries/kernel/time_management.h"
+#include "libraries/kernel/time.h"
 #include "libraries/system/msgdialog.h"
 #include "video_core/amdgpu/pm4_cmds.h"
 
diff --git a/src/core/libraries/avplayer/avplayer_source.h b/src/core/libraries/avplayer/avplayer_source.h
index c8ad75865..7e199c457 100644
--- a/src/core/libraries/avplayer/avplayer_source.h
+++ b/src/core/libraries/avplayer/avplayer_source.h
@@ -14,7 +14,7 @@
 #include "core/libraries/avplayer/avplayer.h"
 #include "core/libraries/avplayer/avplayer_common.h"
 #include "core/libraries/avplayer/avplayer_data_streamer.h"
-#include "core/libraries/kernel/thread_management.h"
+#include "core/libraries/kernel/threads.h"
 
 struct AVCodecContext;
 struct AVFormatContext;
diff --git a/src/core/libraries/avplayer/avplayer_state.h b/src/core/libraries/avplayer/avplayer_state.h
index 4d24b1712..8a0d7f4f8 100644
--- a/src/core/libraries/avplayer/avplayer_state.h
+++ b/src/core/libraries/avplayer/avplayer_state.h
@@ -9,7 +9,7 @@
 
 #include "core/libraries/avplayer/avplayer.h"
 #include "core/libraries/avplayer/avplayer_source.h"
-#include "core/libraries/kernel/thread_management.h"
+#include "core/libraries/kernel/threads.h"
 
 namespace Libraries::AvPlayer {
 
diff --git a/src/core/libraries/kernel/file_system.h b/src/core/libraries/kernel/file_system.h
index 67bf579d9..0bc473ec0 100644
--- a/src/core/libraries/kernel/file_system.h
+++ b/src/core/libraries/kernel/file_system.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/types.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 
 namespace Core::Loader {
 class SymbolsResolver;
diff --git a/src/core/libraries/kernel/kernel.cpp b/src/core/libraries/kernel/kernel.cpp
index 764ef0e2f..9c6f4da2c 100644
--- a/src/core/libraries/kernel/kernel.cpp
+++ b/src/core/libraries/kernel/kernel.cpp
@@ -14,13 +14,12 @@
 #include "core/file_sys/fs.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/cpu_management.h"
-#include "core/libraries/kernel/threads/event_flag.h"
 #include "core/libraries/kernel/event_queues.h"
 #include "core/libraries/kernel/file_system.h"
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/memory_management.h"
-#include "core/libraries/kernel/thread_management.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/memory.h"
+#include "core/libraries/kernel/threads.h"
+#include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
 #include "core/linker.h"
 
diff --git a/src/core/libraries/kernel/memory_management.cpp b/src/core/libraries/kernel/memory.cpp
similarity index 99%
rename from src/core/libraries/kernel/memory_management.cpp
rename to src/core/libraries/kernel/memory.cpp
index 41c8b2ccc..0a615d731 100644
--- a/src/core/libraries/kernel/memory_management.cpp
+++ b/src/core/libraries/kernel/memory.cpp
@@ -9,7 +9,7 @@
 #include "common/singleton.h"
 #include "core/file_sys/fs.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/memory_management.h"
+#include "core/libraries/kernel/memory.h"
 #include "core/libraries/libs.h"
 #include "core/linker.h"
 #include "core/memory.h"
diff --git a/src/core/libraries/kernel/memory_management.h b/src/core/libraries/kernel/memory.h
similarity index 100%
rename from src/core/libraries/kernel/memory_management.h
rename to src/core/libraries/kernel/memory.h
diff --git a/src/core/libraries/kernel/thread_management.cpp b/src/core/libraries/kernel/threads.cpp
similarity index 82%
rename from src/core/libraries/kernel/thread_management.cpp
rename to src/core/libraries/kernel/threads.cpp
index c33e6ea04..3c617d2ff 100644
--- a/src/core/libraries/kernel/thread_management.cpp
+++ b/src/core/libraries/kernel/threads.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/thread_management.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 
 namespace Libraries::Kernel {
 
diff --git a/src/core/libraries/kernel/thread_management.h b/src/core/libraries/kernel/threads.h
similarity index 96%
rename from src/core/libraries/kernel/thread_management.h
rename to src/core/libraries/kernel/threads.h
index 2a73d625f..a57959899 100644
--- a/src/core/libraries/kernel/thread_management.h
+++ b/src/core/libraries/kernel/threads.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 
 namespace Core::Loader {
 class SymbolsResolver;
diff --git a/src/core/libraries/kernel/threads/thr_cond.cpp b/src/core/libraries/kernel/threads/condvar.cpp
similarity index 99%
rename from src/core/libraries/kernel/threads/thr_cond.cpp
rename to src/core/libraries/kernel/threads/condvar.cpp
index eeedf85f5..2f387a4d3 100644
--- a/src/core/libraries/kernel/threads/thr_cond.cpp
+++ b/src/core/libraries/kernel/threads/condvar.cpp
@@ -5,7 +5,7 @@
 #include "common/assert.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {
diff --git a/src/core/libraries/kernel/threads/event_flag.h b/src/core/libraries/kernel/threads/event_flag.h
deleted file mode 100644
index 8efbb93fe..000000000
--- a/src/core/libraries/kernel/threads/event_flag.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-namespace Core::Loader {
-class SymbolsResolver;
-}
-
-namespace Libraries::Kernel {
-
-void RegisterKernelEventFlag(Core::Loader::SymbolsResolver* sym);
-
-} // namespace Libraries::Kernel
diff --git a/src/core/libraries/kernel/threads/thr_mutex.cpp b/src/core/libraries/kernel/threads/mutex.cpp
similarity index 99%
rename from src/core/libraries/kernel/threads/thr_mutex.cpp
rename to src/core/libraries/kernel/threads/mutex.cpp
index 6d2af0c47..51e49db01 100644
--- a/src/core/libraries/kernel/threads/thr_mutex.cpp
+++ b/src/core/libraries/kernel/threads/mutex.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-#pragma clang optimize off
+
 #include "common/assert.h"
 #include "common/scope_exit.h"
 #include "common/types.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {
diff --git a/src/core/libraries/kernel/threads/thr_create.cpp b/src/core/libraries/kernel/threads/pthread.cpp
similarity index 99%
rename from src/core/libraries/kernel/threads/thr_create.cpp
rename to src/core/libraries/kernel/threads/pthread.cpp
index 1ef6a7c19..7791d86c8 100644
--- a/src/core/libraries/kernel/threads/thr_create.cpp
+++ b/src/core/libraries/kernel/threads/pthread.cpp
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-#pragma clang optimize off
+
 #include "common/assert.h"
 #include "common/thread.h"
 #include "core/debug_state.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/kernel/threads/thread_state.h"
-#include "core/libraries/kernel/threads/threads.h"
 #include "core/libraries/libs.h"
 #include "core/memory.h"
 
diff --git a/src/core/libraries/kernel/threads/threads.h b/src/core/libraries/kernel/threads/pthread.h
similarity index 98%
rename from src/core/libraries/kernel/threads/threads.h
rename to src/core/libraries/kernel/threads/pthread.h
index 15d89adaf..57d8d38e4 100644
--- a/src/core/libraries/kernel/threads/threads.h
+++ b/src/core/libraries/kernel/threads/pthread.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <condition_variable>
-#include <deque>
 #include <forward_list>
 #include <mutex>
 #include <shared_mutex>
@@ -12,7 +11,7 @@
 #include <boost/thread/thread.hpp>
 
 #include "common/enum.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 #include "core/tls.h"
 
 namespace Core::Loader {
@@ -333,5 +332,6 @@ void RegisterSpec(Core::Loader::SymbolsResolver* sym);
 void RegisterThreadAttr(Core::Loader::SymbolsResolver* sym);
 void RegisterThread(Core::Loader::SymbolsResolver* sym);
 void RegisterRtld(Core::Loader::SymbolsResolver* sym);
+void RegisterKernelEventFlag(Core::Loader::SymbolsResolver* sym);
 
 } // namespace Libraries::Kernel
diff --git a/src/core/libraries/kernel/threads/thr_attr.cpp b/src/core/libraries/kernel/threads/pthread_attr.cpp
similarity index 99%
rename from src/core/libraries/kernel/threads/thr_attr.cpp
rename to src/core/libraries/kernel/threads/pthread_attr.cpp
index d9f073bab..8d96693bc 100644
--- a/src/core/libraries/kernel/threads/thr_attr.cpp
+++ b/src/core/libraries/kernel/threads/pthread_attr.cpp
@@ -3,8 +3,8 @@
 #pragma clang optimize off
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/kernel/threads/thread_state.h"
-#include "core/libraries/kernel/threads/threads.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {
diff --git a/src/core/libraries/kernel/threads/thr_clean.cpp b/src/core/libraries/kernel/threads/pthread_clean.cpp
similarity index 95%
rename from src/core/libraries/kernel/threads/thr_clean.cpp
rename to src/core/libraries/kernel/threads/pthread_clean.cpp
index 0f4150d27..86d73c808 100644
--- a/src/core/libraries/kernel/threads/thr_clean.cpp
+++ b/src/core/libraries/kernel/threads/pthread_clean.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 
 namespace Libraries::Kernel {
 
diff --git a/src/core/libraries/kernel/threads/thr_spec.cpp b/src/core/libraries/kernel/threads/pthread_spec.cpp
similarity index 99%
rename from src/core/libraries/kernel/threads/thr_spec.cpp
rename to src/core/libraries/kernel/threads/pthread_spec.cpp
index 487306ad7..2fd262923 100644
--- a/src/core/libraries/kernel/threads/thr_spec.cpp
+++ b/src/core/libraries/kernel/threads/pthread_spec.cpp
@@ -4,7 +4,7 @@
 #include "common/assert.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {
diff --git a/src/core/libraries/kernel/threads/thr_rwlock.cpp b/src/core/libraries/kernel/threads/rwlock.cpp
similarity index 96%
rename from src/core/libraries/kernel/threads/thr_rwlock.cpp
rename to src/core/libraries/kernel/threads/rwlock.cpp
index 1fca4d9c8..4e3279207 100644
--- a/src/core/libraries/kernel/threads/thr_rwlock.cpp
+++ b/src/core/libraries/kernel/threads/rwlock.cpp
@@ -3,7 +3,7 @@
 
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {
@@ -186,19 +186,6 @@ int PS4_SYSV_ABI posix_pthread_rwlock_unlock(PthreadRwlockT* rwlock) {
         }
     }
 
-    /*s32 state = prwlock->lock.rw_state;
-    if (state & URWLOCK_WRITE_OWNER) {
-        if (prwlock->owner != curthread) [[unlikely]] {
-            return POSIX_EPERM;
-        }
-        prwlock->owner = nullptr;
-    }
-
-    prwlock->lock.unlock();
-    if ((state & URWLOCK_WRITE_OWNER) == 0) {
-        curthread->rdlock_count--;
-    }*/
-
     return 0;
 }
 
diff --git a/src/core/libraries/kernel/threads/thr_sem.cpp b/src/core/libraries/kernel/threads/semaphore.cpp
similarity index 99%
rename from src/core/libraries/kernel/threads/thr_sem.cpp
rename to src/core/libraries/kernel/threads/semaphore.cpp
index 5c3a8394b..33414eb5c 100644
--- a/src/core/libraries/kernel/threads/thr_sem.cpp
+++ b/src/core/libraries/kernel/threads/semaphore.cpp
@@ -8,7 +8,7 @@
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/kernel.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {
diff --git a/src/core/libraries/kernel/threads/thr_stack.cpp b/src/core/libraries/kernel/threads/stack.cpp
similarity index 98%
rename from src/core/libraries/kernel/threads/thr_stack.cpp
rename to src/core/libraries/kernel/threads/stack.cpp
index 396b24e47..3c8061de5 100644
--- a/src/core/libraries/kernel/threads/thr_stack.cpp
+++ b/src/core/libraries/kernel/threads/stack.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/assert.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/kernel/threads/thread_state.h"
-#include "core/libraries/kernel/threads/threads.h"
 #include "core/memory.h"
 
 namespace Libraries::Kernel {
diff --git a/src/core/libraries/kernel/threads/thr_ctrdtr.cpp b/src/core/libraries/kernel/threads/tcb.cpp
similarity index 98%
rename from src/core/libraries/kernel/threads/thr_ctrdtr.cpp
rename to src/core/libraries/kernel/threads/tcb.cpp
index 55504ec6d..e5a158216 100644
--- a/src/core/libraries/kernel/threads/thr_ctrdtr.cpp
+++ b/src/core/libraries/kernel/threads/tcb.cpp
@@ -3,7 +3,7 @@
 
 #include "common/assert.h"
 #include "common/singleton.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/libs.h"
 #include "core/linker.h"
 #include "core/tls.h"
diff --git a/src/core/libraries/kernel/threads/thr_exit.cpp b/src/core/libraries/kernel/threads/thr_exit.cpp
deleted file mode 100644
index 3816a1de8..000000000
--- a/src/core/libraries/kernel/threads/thr_exit.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <pthread.h>
-#include "common/assert.h"
-#include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/threads/thread_state.h"
-#include "core/libraries/kernel/threads/threads.h"
-
-namespace Libraries::Kernel {} // namespace Libraries::Kernel
diff --git a/src/core/libraries/kernel/threads/thread_state.cpp b/src/core/libraries/kernel/threads/thread_state.cpp
index 9d91ab618..ee644552b 100644
--- a/src/core/libraries/kernel/threads/thread_state.cpp
+++ b/src/core/libraries/kernel/threads/thread_state.cpp
@@ -5,8 +5,8 @@
 #include "common/alignment.h"
 #include "common/scope_exit.h"
 #include "core/libraries/error_codes.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/libraries/kernel/threads/thread_state.h"
-#include "core/libraries/kernel/threads/threads.h"
 #include "core/memory.h"
 #include "core/tls.h"
 
diff --git a/src/core/libraries/kernel/time_management.cpp b/src/core/libraries/kernel/time.cpp
similarity index 99%
rename from src/core/libraries/kernel/time_management.cpp
rename to src/core/libraries/kernel/time.cpp
index 7d5657b10..4a4407f85 100644
--- a/src/core/libraries/kernel/time_management.cpp
+++ b/src/core/libraries/kernel/time.cpp
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-#pragma clang optimize off
+
 #include <thread>
 
 #include "common/assert.h"
 #include "common/native_clock.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
 
 #ifdef _WIN64
diff --git a/src/core/libraries/kernel/time_management.h b/src/core/libraries/kernel/time.h
similarity index 100%
rename from src/core/libraries/kernel/time_management.h
rename to src/core/libraries/kernel/time.h
diff --git a/src/core/libraries/rtc/rtc.cpp b/src/core/libraries/rtc/rtc.cpp
index d7bfe0f62..0e2187d1b 100644
--- a/src/core/libraries/rtc/rtc.cpp
+++ b/src/core/libraries/rtc/rtc.cpp
@@ -6,7 +6,7 @@
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/kernel/cpu_management.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/rtc/rtc.h"
 #include "core/libraries/rtc/rtc_error.h"
diff --git a/src/core/libraries/videoout/driver.cpp b/src/core/libraries/videoout/driver.cpp
index e2fd00028..c19892264 100644
--- a/src/core/libraries/videoout/driver.cpp
+++ b/src/core/libraries/videoout/driver.cpp
@@ -10,7 +10,7 @@
 #include "common/thread.h"
 #include "core/debug_state.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 #include "core/libraries/videoout/driver.h"
 #include "core/platform.h"
 #include "video_core/renderer_vulkan/renderer_vulkan.h"
diff --git a/src/core/linker.cpp b/src/core/linker.cpp
index 8781f7a03..16c6687b0 100644
--- a/src/core/linker.cpp
+++ b/src/core/linker.cpp
@@ -11,8 +11,8 @@
 #include "common/thread.h"
 #include "core/aerolib/aerolib.h"
 #include "core/aerolib/stubs.h"
-#include "core/libraries/kernel/memory_management.h"
-#include "core/libraries/kernel/thread_management.h"
+#include "core/libraries/kernel/memory.h"
+#include "core/libraries/kernel/threads.h"
 #include "core/linker.h"
 #include "core/memory.h"
 #include "core/tls.h"
diff --git a/src/core/linker.h b/src/core/linker.h
index dfdc847a4..3a1aeb960 100644
--- a/src/core/linker.h
+++ b/src/core/linker.h
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <mutex>
 #include <vector>
-#include "core/libraries/kernel/thread_management.h"
+#include "core/libraries/kernel/threads.h"
 #include "core/module.h"
 
 namespace Core {
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 61eb421e5..f638e5e1a 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -6,7 +6,7 @@
 #include "common/config.h"
 #include "common/debug.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/memory_management.h"
+#include "core/libraries/kernel/memory.h"
 #include "core/memory.h"
 #include "video_core/renderer_vulkan/vk_instance.h"
 #include "video_core/renderer_vulkan/vk_rasterizer.h"
diff --git a/src/core/memory.h b/src/core/memory.h
index ce4b87d18..35bd457a0 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -10,7 +10,7 @@
 #include "common/singleton.h"
 #include "common/types.h"
 #include "core/address_space.h"
-#include "core/libraries/kernel/memory_management.h"
+#include "core/libraries/kernel/memory.h"
 
 namespace Vulkan {
 class Rasterizer;
diff --git a/src/core/tls.cpp b/src/core/tls.cpp
index 679208de9..7f556b3a1 100644
--- a/src/core/tls.cpp
+++ b/src/core/tls.cpp
@@ -6,7 +6,7 @@
 #include "common/assert.h"
 #include "common/types.h"
 #include "core/cpu_patches.h"
-#include "core/libraries/kernel/threads/threads.h"
+#include "core/libraries/kernel/threads/pthread.h"
 #include "core/tls.h"
 
 #ifdef _WIN32
diff --git a/src/input/controller.cpp b/src/input/controller.cpp
index 2187608e5..cd7d3d8af 100644
--- a/src/input/controller.cpp
+++ b/src/input/controller.cpp
@@ -4,7 +4,7 @@
 #include "controller.h"
 
 #include "common/assert.h"
-#include "core/libraries/kernel/time_management.h"
+#include "core/libraries/kernel/time.h"
 #include "core/libraries/pad/pad.h"
 
 #include <SDL3/SDL.h>