diff --git a/apps/compositor.c b/apps/compositor.c
index 5b59cad5..c9f48063 100644
--- a/apps/compositor.c
+++ b/apps/compositor.c
@@ -29,9 +29,9 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <pthread.h>
 
 #include <toaru/graphics.h>
-#include <toaru/pthread.h>
 #include <toaru/mouse.h>
 #include <toaru/kbd.h>
 #include <toaru/pex.h>
diff --git a/apps/drawlines.c b/apps/drawlines.c
index b58974e6..bfcef0ec 100644
--- a/apps/drawlines.c
+++ b/apps/drawlines.c
@@ -11,10 +11,10 @@
 #include <assert.h>
 #include <syscall.h>
 #include <unistd.h>
+#include <pthread.h>
 
 #include <toaru/yutani.h>
 #include <toaru/graphics.h>
-#include <toaru/pthread.h>
 
 #define TRACE_APP_NAME "drawlines"
 #include <toaru/trace.h>
diff --git a/apps/panel.c b/apps/panel.c
index 533f8a21..ba971353 100644
--- a/apps/panel.c
+++ b/apps/panel.c
@@ -22,13 +22,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
+#include <syscall.h>
 #include <sys/time.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#include <toaru/pthread.h>
 #include <toaru/yutani.h>
 #include <toaru/graphics.h>
 #include <toaru/hashmap.h>
diff --git a/apps/plasma.c b/apps/plasma.c
index 34ccf668..d6b00310 100644
--- a/apps/plasma.c
+++ b/apps/plasma.c
@@ -12,11 +12,11 @@
 #include <math.h>
 #include <syscall.h>
 #include <wait.h>
+#include <pthread.h>
 
 #include <toaru/yutani.h>
 #include <toaru/graphics.h>
 #include <toaru/decorations.h>
-#include <toaru/pthread.h>
 #include <toaru/spinlock.h>
 #include <toaru/menu.h>
 
diff --git a/apps/pong.c b/apps/pong.c
index e823bb26..defbde02 100644
--- a/apps/pong.c
+++ b/apps/pong.c
@@ -28,7 +28,6 @@
 
 #include <toaru/yutani.h>
 #include <toaru/graphics.h>
-#include <toaru/pthread.h>
 
 #define GAME_PATH "/usr/share/pong"
 
diff --git a/apps/yutani-test.c b/apps/yutani-test.c
index 87a021a8..45409561 100644
--- a/apps/yutani-test.c
+++ b/apps/yutani-test.c
@@ -15,7 +15,6 @@
 
 #include <toaru/yutani.h>
 #include <toaru/graphics.h>
-#include <toaru/pthread.h>
 
 static int left, top, width, height;
 
diff --git a/base/usr/include/toaru/pthread.h b/base/usr/include/pthread.h
similarity index 100%
rename from base/usr/include/toaru/pthread.h
rename to base/usr/include/pthread.h
diff --git a/lib/pthread.c b/libc/pthread/pthread.c
similarity index 97%
rename from lib/pthread.c
rename to libc/pthread/pthread.c
index 8164cd72..765195ef 100644
--- a/lib/pthread.c
+++ b/libc/pthread/pthread.c
@@ -6,8 +6,7 @@
 #include <stdint.h>
 #include <syscall.h>
 #include <signal.h>
-
-#include <toaru/pthread.h>
+#include <pthread.h>
 
 #define PTHREAD_STACK_SIZE 0x100000
 
diff --git a/util/auto-dep.py b/util/auto-dep.py
index 2eb26218..16a8c78a 100755
--- a/util/auto-dep.py
+++ b/util/auto-dep.py
@@ -24,7 +24,6 @@ class Classifier(object):
         '<toaru/list.h>':        (None, '-ltoaru_list',        []),
         '<toaru/hashmap.h>':     (None, '-ltoaru_hashmap',     ['<toaru/list.h>']),
         '<toaru/tree.h>':        (None, '-ltoaru_tree',        ['<toaru/list.h>']),
-        '<toaru/pthread.h>':     (None, '-ltoaru_pthread',     []),
         '<toaru/pex.h>':         (None, '-ltoaru_pex',         []),
         '<toaru/graphics.h>':    (None, '-ltoaru_graphics',    []),
         '<toaru/drawstring.h>':  (None, '-ltoaru_drawstring',  ['<toaru/graphics.h>']),