diff --git a/core/libs/prx/libSceAgcVsh/Export.cpp b/core/libs/prx/libSceAgcVsh/Export.cpp
index 60c54f3fb..fb34206c2 100644
--- a/core/libs/prx/libSceAgcVsh/Export.cpp
+++ b/core/libs/prx/libSceAgcVsh/Export.cpp
@@ -5,9 +5,6 @@
 
 extern "C" {
 
-int DummyFunction_nid_no_patch() {
-    NotImplemented_nid_no_patch(__func__);
-    return 0;
-}
+APS5_DUMMY_FUN
 
 }
diff --git a/core/libs/prx/libc/include/General.hpp b/core/libs/prx/libc/include/General.hpp
index 987d0af45..05e86a048 100644
--- a/core/libs/prx/libc/include/General.hpp
+++ b/core/libs/prx/libc/include/General.hpp
@@ -14,4 +14,10 @@ extern "C" std::filesystem::path ResolvePath_nid_no_patch(const char* path);
 
 #define APS5_INVALID_ARG_EX throw std::invalid_argument(std::string(__func__) + ": invalid argument")
 
+#define APS5_DUMMY_FUN \
+int DummyFunction_nid_no_patch() { \
+    NotImplemented_nid_no_patch(__func__); \
+    return 0; \
+}
+
 #endif
diff --git a/core/libs/prx/libkernel/CMakeLists.txt b/core/libs/prx/libkernel/CMakeLists.txt
index aedaf3317..10e83b40a 100644
--- a/core/libs/prx/libkernel/CMakeLists.txt
+++ b/core/libs/prx/libkernel/CMakeLists.txt
@@ -11,6 +11,9 @@ add_library(libkernel SHARED EXCLUDE_FROM_ALL
         ${CMAKE_CURRENT_SOURCE_DIR}/Pthread/src/Cond.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Pthread/src/Attr.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Pthread/src/Thread.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Pthread/src/Tsd.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Pthread/src/Rwlock.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Pthread/src/Sem.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Time/Time.cpp
 )
 
diff --git a/core/libs/prx/libkernel/Pthread/src/Attr.cpp b/core/libs/prx/libkernel/Pthread/src/Attr.cpp
index 2a7e9b584..253718d49 100644
--- a/core/libs/prx/libkernel/Pthread/src/Attr.cpp
+++ b/core/libs/prx/libkernel/Pthread/src/Attr.cpp
@@ -85,4 +85,108 @@ int APS5_VABI scePthreadAttrGet(Pthread thread, PthreadAttr* attr) {
     return SCE_OK;
 }
 
+// ---------------------------------------------------------------------------
+// The following were moved as-is (not yet implemented) from the duplicated
+// stubs in libkernel_sys/Export.cpp and libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+int APS5_VABI scePthreadAttrGetaffinity(const PthreadAttr* attr, KernelCpumask* mask) {
+ (void)attr;
+ (void)mask;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrGetdetachstate(const PthreadAttr* attr, int* state) {
+ (void)attr;
+ (void)state;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrGetguardsize(const PthreadAttr* attr, size_t* guard_size) {
+ (void)attr;
+ (void)guard_size;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrGetschedparam(const PthreadAttr* attr, KernelSchedParam* param) {
+ (void)attr;
+ (void)param;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrGetsolosched(const PthreadAttr* attr, int* solosched) {
+ (void)attr;
+ (void)solosched;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrGetstackaddr(const PthreadAttr* attr, void** stack_addr) {
+ (void)attr;
+ (void)stack_addr;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrGetstacksize(const PthreadAttr* attr, size_t* stack_size) {
+ (void)attr;
+ (void)stack_size;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetaffinity(PthreadAttr* attr, KernelCpumask mask) {
+ (void)attr;
+ (void)mask;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetguardsize(PthreadAttr* attr, size_t guard_size) {
+ (void)attr;
+ (void)guard_size;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetinheritsched(PthreadAttr* attr, int inherit_sched) {
+ (void)attr;
+ (void)inherit_sched;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetschedpolicy(PthreadAttr* attr, int policy) {
+ (void)attr;
+ (void)policy;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetsolosched(PthreadAttr* attr, int solosched) {
+ (void)attr;
+ (void)solosched;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetstack(PthreadAttr* attr, void* addr, size_t size) {
+ (void)attr;
+ (void)addr;
+ (void)size;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadAttrSetstackaddr(PthreadAttr* attr, void* addr) {
+ (void)attr;
+ (void)addr;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
 }
diff --git a/core/libs/prx/libkernel/Pthread/src/Cond.cpp b/core/libs/prx/libkernel/Pthread/src/Cond.cpp
index 101779f4a..f09d20799 100644
--- a/core/libs/prx/libkernel/Pthread/src/Cond.cpp
+++ b/core/libs/prx/libkernel/Pthread/src/Cond.cpp
@@ -68,4 +68,23 @@ int APS5_VABI scePthreadCondTimedwait(PthreadCond* cond, PthreadMutex* mutex, un
     return res == std::cv_status::timeout ? SCE_KERNEL_ERROR_ETIMEDOUT : SCE_OK;
 }
 
+// ---------------------------------------------------------------------------
+// The following were moved as-is (not yet implemented) from the duplicated
+// stubs in libkernel_sys/Export.cpp and libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+int APS5_VABI scePthreadCondSignalto(PthreadCond* cond, Pthread thread) {
+ (void)cond;
+ (void)thread;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadCondWait(PthreadCond* cond, PthreadMutex* mutex) {
+ (void)cond;
+ (void)mutex;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
 }
diff --git a/core/libs/prx/libkernel/Pthread/src/Mutex.cpp b/core/libs/prx/libkernel/Pthread/src/Mutex.cpp
index 5b6d8b74e..1f0f157be 100644
--- a/core/libs/prx/libkernel/Pthread/src/Mutex.cpp
+++ b/core/libs/prx/libkernel/Pthread/src/Mutex.cpp
@@ -90,4 +90,29 @@ int APS5_VABI scePthreadMutexUnlock(PthreadMutex* mutex) {
     return SCE_OK;
 }
 
+// ---------------------------------------------------------------------------
+// The following were moved as-is (not yet implemented) from the duplicated
+// stubs in libkernel_sys/Export.cpp and libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+int APS5_VABI scePthreadMutexTimedlock(PthreadMutex* mutex, KernelUseconds usec) {
+ (void)mutex;
+ (void)usec;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadMutexTrylock(PthreadMutex* mutex) {
+ (void)mutex;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadMutexattrSetprotocol(PthreadMutexattr* attr, int protocol) {
+ (void)attr;
+ (void)protocol;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
 }
diff --git a/core/libs/prx/libkernel/Pthread/src/Rwlock.cpp b/core/libs/prx/libkernel/Pthread/src/Rwlock.cpp
new file mode 100644
index 000000000..797b07bab
--- /dev/null
+++ b/core/libs/prx/libkernel/Pthread/src/Rwlock.cpp
@@ -0,0 +1,75 @@
+#include "../include/Pthread.hpp"
+#include "prx/libc/include/General.hpp"
+
+// ---------------------------------------------------------------------------
+// Reader/writer locks (scePthreadRwlock*). Moved as-is (not yet implemented)
+// from the duplicated stubs in libkernel_sys/Export.cpp and
+// libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+extern "C" {
+
+int APS5_VABI scePthreadRwlockDestroy(PthreadRwlock* rwlock) {
+ (void)rwlock;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockInit(PthreadRwlock* rwlock, const PthreadRwlockattr* attr, const char* name) {
+ (void)rwlock;
+ (void)attr;
+ (void)name;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockRdlock(PthreadRwlock* rwlock) {
+ (void)rwlock;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockTryrdlock(PthreadRwlock* rwlock) {
+ (void)rwlock;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockTrywrlock(PthreadRwlock* rwlock) {
+ (void)rwlock;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockUnlock(PthreadRwlock* rwlock) {
+ (void)rwlock;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockWrlock(PthreadRwlock* rwlock) {
+ (void)rwlock;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockattrDestroy(PthreadRwlockattr* attr) {
+ (void)attr;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockattrInit(PthreadRwlockattr* attr) {
+ (void)attr;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRwlockattrSettype(PthreadRwlockattr* attr, int type) {
+ (void)attr;
+ (void)type;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+}
diff --git a/core/libs/prx/libkernel/Pthread/src/Sem.cpp b/core/libs/prx/libkernel/Pthread/src/Sem.cpp
new file mode 100644
index 000000000..8894f1bb5
--- /dev/null
+++ b/core/libs/prx/libkernel/Pthread/src/Sem.cpp
@@ -0,0 +1,60 @@
+#include "../include/Pthread.hpp"
+#include "prx/libc/include/General.hpp"
+
+// ---------------------------------------------------------------------------
+// POSIX-style pthread semaphores (scePthreadSem*). Not to be confused with
+// the native sceKernel* semaphore in libkernel/Semaphore. Moved as-is
+// (not yet implemented) from the duplicated stubs in libkernel_sys/Export.cpp
+// and libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+extern "C" {
+
+int APS5_VABI scePthreadSemDestroy(void* sem) {
+ (void)sem;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSemGetvalue(void* sem, int* value) {
+ (void)sem;
+ (void)value;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSemInit(void* sem, int flag, unsigned int value, const char* name) {
+ (void)sem;
+ (void)flag;
+ (void)value;
+ (void)name;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSemPost(void* sem) {
+ (void)sem;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSemTimedwait(void* sem, KernelUseconds usec) {
+ (void)sem;
+ (void)usec;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSemTrywait(void* sem) {
+ (void)sem;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSemWait(void* sem) {
+ (void)sem;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+}
diff --git a/core/libs/prx/libkernel/Pthread/src/Thread.cpp b/core/libs/prx/libkernel/Pthread/src/Thread.cpp
index 4dbf54305..0a957714b 100644
--- a/core/libs/prx/libkernel/Pthread/src/Thread.cpp
+++ b/core/libs/prx/libkernel/Pthread/src/Thread.cpp
@@ -209,4 +209,83 @@ void APS5_VABI scePthreadYield() {
     std::this_thread::yield();
 }
 
+// ---------------------------------------------------------------------------
+// The following were moved as-is (not yet implemented) from the duplicated
+// stubs in libkernel_sys/Export.cpp and libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+int APS5_VABI scePthreadCancel(Pthread thread) {
+ (void)thread;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadEqual(Pthread thread1, Pthread thread2) {
+ (void)thread1;
+ (void)thread2;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadGetaffinity(Pthread thread, KernelCpumask* mask) {
+ (void)thread;
+ (void)mask;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadGetname(Pthread thread, char* name) {
+ (void)thread;
+ (void)name;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadGetprio(Pthread thread, int* prio) {
+ (void)thread;
+ (void)prio;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadGetthreadid(void) {
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadRename(Pthread thread, const char* name) {
+ (void)thread;
+ (void)name;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSetaffinity(Pthread thread, KernelCpumask mask) {
+ (void)thread;
+ (void)mask;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSetcancelstate(int state, int* old_state) {
+ (void)state;
+ (void)old_state;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSetcanceltype(int type, int* old_type) {
+ (void)type;
+ (void)old_type;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadSetprio(Pthread thread, int prio) {
+ (void)thread;
+ (void)prio;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
 }
diff --git a/core/libs/prx/libkernel/Pthread/src/Tsd.cpp b/core/libs/prx/libkernel/Pthread/src/Tsd.cpp
new file mode 100644
index 000000000..3cfd850ba
--- /dev/null
+++ b/core/libs/prx/libkernel/Pthread/src/Tsd.cpp
@@ -0,0 +1,38 @@
+#include "../include/Pthread.hpp"
+#include "prx/libc/include/General.hpp"
+
+// ---------------------------------------------------------------------------
+// Thread-specific data (pthread keys). Moved as-is (not yet implemented)
+// from the duplicated stubs in libkernel_sys/Export.cpp and
+// libkernel_web/Export.cpp.
+// ---------------------------------------------------------------------------
+
+extern "C" {
+
+int APS5_VABI scePthreadKeyCreate(PthreadKey* key, pthread_key_destructor_func_t destructor) {
+ (void)key;
+ (void)destructor;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+int APS5_VABI scePthreadKeyDelete(PthreadKey key) {
+ (void)key;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+void* APS5_VABI scePthreadGetspecific(PthreadKey key) {
+ (void)key;
+ NotImplemented_nid_no_patch(__func__);
+ return nullptr;
+}
+
+int APS5_VABI scePthreadSetspecific(PthreadKey key, void* value) {
+ (void)key;
+ (void)value;
+ NotImplemented_nid_no_patch(__func__);
+ return 0;
+}
+
+}
diff --git a/core/libs/prx/libkernel_sys/Export.cpp b/core/libs/prx/libkernel_sys/Export.cpp
index 8840f0e07..fb34206c2 100644
--- a/core/libs/prx/libkernel_sys/Export.cpp
+++ b/core/libs/prx/libkernel_sys/Export.cpp
@@ -5,347 +5,6 @@
 
 extern "C" {
 
-int APS5_VABI scePthreadAttrGetaffinity(const PthreadAttr* attr, KernelCpumask* mask) {
- (void)attr;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetdetachstate(const PthreadAttr* attr, int* state) {
- (void)attr;
- (void)state;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetguardsize(const PthreadAttr* attr, size_t* guard_size) {
- (void)attr;
- (void)guard_size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetschedparam(const PthreadAttr* attr, KernelSchedParam* param) {
- (void)attr;
- (void)param;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetsolosched(const PthreadAttr* attr, int* solosched) {
- (void)attr;
- (void)solosched;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetstackaddr(const PthreadAttr* attr, void** stack_addr) {
- (void)attr;
- (void)stack_addr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetstacksize(const PthreadAttr* attr, size_t* stack_size) {
- (void)attr;
- (void)stack_size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetaffinity(PthreadAttr* attr, KernelCpumask mask) {
- (void)attr;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetguardsize(PthreadAttr* attr, size_t guard_size) {
- (void)attr;
- (void)guard_size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetinheritsched(PthreadAttr* attr, int inherit_sched) {
- (void)attr;
- (void)inherit_sched;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetschedpolicy(PthreadAttr* attr, int policy) {
- (void)attr;
- (void)policy;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetsolosched(PthreadAttr* attr, int solosched) {
- (void)attr;
- (void)solosched;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetstack(PthreadAttr* attr, void* addr, size_t size) {
- (void)attr;
- (void)addr;
- (void)size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetstackaddr(PthreadAttr* attr, void* addr) {
- (void)attr;
- (void)addr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadCancel(Pthread thread) {
- (void)thread;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadCondSignalto(PthreadCond* cond, Pthread thread) {
- (void)cond;
- (void)thread;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadCondWait(PthreadCond* cond, PthreadMutex* mutex) {
- (void)cond;
- (void)mutex;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadEqual(Pthread thread1, Pthread thread2) {
- (void)thread1;
- (void)thread2;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadGetaffinity(Pthread thread, KernelCpumask* mask) {
- (void)thread;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadGetname(Pthread thread, char* name) {
- (void)thread;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadGetprio(Pthread thread, int* prio) {
- (void)thread;
- (void)prio;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-void* APS5_VABI scePthreadGetspecific(PthreadKey key) {
- (void)key;
- NotImplemented_nid_no_patch(__func__);
- return nullptr;
-}
-
-int APS5_VABI scePthreadGetthreadid(void) {
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadKeyCreate(PthreadKey* key, pthread_key_destructor_func_t destructor) {
- (void)key;
- (void)destructor;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadKeyDelete(PthreadKey key) {
- (void)key;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadMutexattrSetprotocol(PthreadMutexattr* attr, int protocol) {
- (void)attr;
- (void)protocol;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadMutexTimedlock(PthreadMutex* mutex, KernelUseconds usec) {
- (void)mutex;
- (void)usec;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadMutexTrylock(PthreadMutex* mutex) {
- (void)mutex;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRename(Pthread thread, const char* name) {
- (void)thread;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockattrDestroy(PthreadRwlockattr* attr) {
- (void)attr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockattrInit(PthreadRwlockattr* attr) {
- (void)attr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockattrSettype(PthreadRwlockattr* attr, int type) {
- (void)attr;
- (void)type;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockDestroy(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockInit(PthreadRwlock* rwlock, const PthreadRwlockattr* attr, const char* name) {
- (void)rwlock;
- (void)attr;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockRdlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockTryrdlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockTrywrlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockUnlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockWrlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemDestroy(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemGetvalue(void* sem, int* value) {
- (void)sem;
- (void)value;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemInit(void* sem, int flag, unsigned int value, const char* name) {
- (void)sem;
- (void)flag;
- (void)value;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemPost(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemTimedwait(void* sem, KernelUseconds usec) {
- (void)sem;
- (void)usec;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemTrywait(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemWait(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetaffinity(Pthread thread, KernelCpumask mask) {
- (void)thread;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetcancelstate(int state, int* old_state) {
- (void)state;
- (void)old_state;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetcanceltype(int type, int* old_type) {
- (void)type;
- (void)old_type;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetprio(Pthread thread, int prio) {
- (void)thread;
- (void)prio;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetspecific(PthreadKey key, void* value) {
- (void)key;
- (void)value;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
+APS5_DUMMY_FUN
 
 }
diff --git a/core/libs/prx/libkernel_web/Export.cpp b/core/libs/prx/libkernel_web/Export.cpp
index 8840f0e07..fb34206c2 100644
--- a/core/libs/prx/libkernel_web/Export.cpp
+++ b/core/libs/prx/libkernel_web/Export.cpp
@@ -5,347 +5,6 @@
 
 extern "C" {
 
-int APS5_VABI scePthreadAttrGetaffinity(const PthreadAttr* attr, KernelCpumask* mask) {
- (void)attr;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetdetachstate(const PthreadAttr* attr, int* state) {
- (void)attr;
- (void)state;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetguardsize(const PthreadAttr* attr, size_t* guard_size) {
- (void)attr;
- (void)guard_size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetschedparam(const PthreadAttr* attr, KernelSchedParam* param) {
- (void)attr;
- (void)param;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetsolosched(const PthreadAttr* attr, int* solosched) {
- (void)attr;
- (void)solosched;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetstackaddr(const PthreadAttr* attr, void** stack_addr) {
- (void)attr;
- (void)stack_addr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrGetstacksize(const PthreadAttr* attr, size_t* stack_size) {
- (void)attr;
- (void)stack_size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetaffinity(PthreadAttr* attr, KernelCpumask mask) {
- (void)attr;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetguardsize(PthreadAttr* attr, size_t guard_size) {
- (void)attr;
- (void)guard_size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetinheritsched(PthreadAttr* attr, int inherit_sched) {
- (void)attr;
- (void)inherit_sched;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetschedpolicy(PthreadAttr* attr, int policy) {
- (void)attr;
- (void)policy;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetsolosched(PthreadAttr* attr, int solosched) {
- (void)attr;
- (void)solosched;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetstack(PthreadAttr* attr, void* addr, size_t size) {
- (void)attr;
- (void)addr;
- (void)size;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadAttrSetstackaddr(PthreadAttr* attr, void* addr) {
- (void)attr;
- (void)addr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadCancel(Pthread thread) {
- (void)thread;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadCondSignalto(PthreadCond* cond, Pthread thread) {
- (void)cond;
- (void)thread;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadCondWait(PthreadCond* cond, PthreadMutex* mutex) {
- (void)cond;
- (void)mutex;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadEqual(Pthread thread1, Pthread thread2) {
- (void)thread1;
- (void)thread2;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadGetaffinity(Pthread thread, KernelCpumask* mask) {
- (void)thread;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadGetname(Pthread thread, char* name) {
- (void)thread;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadGetprio(Pthread thread, int* prio) {
- (void)thread;
- (void)prio;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-void* APS5_VABI scePthreadGetspecific(PthreadKey key) {
- (void)key;
- NotImplemented_nid_no_patch(__func__);
- return nullptr;
-}
-
-int APS5_VABI scePthreadGetthreadid(void) {
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadKeyCreate(PthreadKey* key, pthread_key_destructor_func_t destructor) {
- (void)key;
- (void)destructor;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadKeyDelete(PthreadKey key) {
- (void)key;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadMutexattrSetprotocol(PthreadMutexattr* attr, int protocol) {
- (void)attr;
- (void)protocol;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadMutexTimedlock(PthreadMutex* mutex, KernelUseconds usec) {
- (void)mutex;
- (void)usec;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadMutexTrylock(PthreadMutex* mutex) {
- (void)mutex;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRename(Pthread thread, const char* name) {
- (void)thread;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockattrDestroy(PthreadRwlockattr* attr) {
- (void)attr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockattrInit(PthreadRwlockattr* attr) {
- (void)attr;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockattrSettype(PthreadRwlockattr* attr, int type) {
- (void)attr;
- (void)type;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockDestroy(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockInit(PthreadRwlock* rwlock, const PthreadRwlockattr* attr, const char* name) {
- (void)rwlock;
- (void)attr;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockRdlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockTryrdlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockTrywrlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockUnlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadRwlockWrlock(PthreadRwlock* rwlock) {
- (void)rwlock;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemDestroy(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemGetvalue(void* sem, int* value) {
- (void)sem;
- (void)value;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemInit(void* sem, int flag, unsigned int value, const char* name) {
- (void)sem;
- (void)flag;
- (void)value;
- (void)name;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemPost(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemTimedwait(void* sem, KernelUseconds usec) {
- (void)sem;
- (void)usec;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemTrywait(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSemWait(void* sem) {
- (void)sem;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetaffinity(Pthread thread, KernelCpumask mask) {
- (void)thread;
- (void)mask;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetcancelstate(int state, int* old_state) {
- (void)state;
- (void)old_state;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetcanceltype(int type, int* old_type) {
- (void)type;
- (void)old_type;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetprio(Pthread thread, int prio) {
- (void)thread;
- (void)prio;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
-
-int APS5_VABI scePthreadSetspecific(PthreadKey key, void* value) {
- (void)key;
- (void)value;
- NotImplemented_nid_no_patch(__func__);
- return 0;
-}
+APS5_DUMMY_FUN
 
 }