3 files changed, 21 insertions, 11 deletions
diff --git a/src/libPThread/PThreadKit/Thread.h b/src/libPThread/PThreadKit/Thread.h
index de8efe8a..7e528ab2 100644
--- a/src/libPThread/PThreadKit/Thread.h
+++ b/src/libPThread/PThreadKit/Thread.h
@@ -8,16 +8,15 @@
 
 #include <libPOSIXWrapper/POSIXKit/unistd.h>
 
-/// @brief Please use these macros to specify whether your function is thread safe or not.
-#define PTHREAD_UNSAFE __THREAD_UNSAFE
-#define PTHREAD_SAFE __THREAD_SAFE
+/// @internal Internal type, please do not rely on it for multi-platform builds.
+typedef ThreadRef pthread_ref_t;
 
-PTHREAD_SAFE SInt32    pthread_create(_Output ThreadRef* thread, VoidPtr         attr,
-                                      VoidPtr (*start_routine)(VoidPtr), VoidPtr arg);
-PTHREAD_SAFE SInt32    pthread_join(ThreadRef thread, VoidPtr* retval);
-PTHREAD_SAFE SInt32    pthread_exit(SInt32 retval);
-PTHREAD_SAFE SInt32    pthread_detach(ThreadRef thread);
-PTHREAD_SAFE ThreadRef pthread_self(Void);
-PTHREAD_SAFE SInt32    pthread_yield(void);
+PTHREAD_SAFE IMPORT_C SInt32        pthread_create(_Output pthread_ref_t* thread, VoidPtr     attr,
+                                                   VoidPtr (*start_routine)(VoidPtr), VoidPtr arg);
+PTHREAD_SAFE IMPORT_C SInt32        pthread_join(pthread_ref_t thread, VoidPtr* retval);
+PTHREAD_SAFE IMPORT_C SInt32        pthread_exit(SInt32 retval);
+PTHREAD_SAFE IMPORT_C SInt32        pthread_detach(pthread_ref_t thread);
+PTHREAD_SAFE IMPORT_C pthread_ref_t pthread_self(Void);
+PTHREAD_SAFE IMPORT_C SInt32        pthread_yield(void);
 
 #endif  // LIBPOSIX_POSIXKIT_THREAD_H
diff --git a/src/libPThread/PThreadKit/pthread.h b/src/libPThread/PThreadKit/pthread.h
new file mode 100644
index 00000000..2448c458
--- /dev/null
+++ b/src/libPThread/PThreadKit/pthread.h
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org)
+// Licensed under the Apache License, Version 2.0 (see LICENSE file)
+// Official repository: https://github.com/ne-foss-org/nekernel
+
+#ifndef LIBPOSIX_POSIXKIT_PTHREAD_H
+#define LIBPOSIX_POSIXKIT_PTHREAD_H
+
+#include <libPThread/ThreadKit/Thread.h>
+
+#endif
diff --git a/src/libPThread/src/Thread.cpp b/src/libPThread/src/Thread.cpp
index c1799d9c..5324d979 100644
--- a/src/libPThread/src/Thread.cpp
+++ b/src/libPThread/src/Thread.cpp
@@ -26,7 +26,7 @@ PTHREAD_SAFE SInt32 pthread_join(ThreadRef thread, VoidPtr* retval) {
 
   if (!ret) return -1;
 
-  *ret        = ThrJoinThread(thread);
+  *ret = ThrJoinThread(thread);
   return 0;
 }