Index: libc/include/psthread.h
===================================================================
--- libc/include/psthread.h	(revision 520492a919fe1fbbbca2ba14c75775dab9c6f60a)
+++ libc/include/psthread.h	(revision 8fe1cdb01b8894ae130c2960e9b330b65a22e88f)
@@ -32,4 +32,5 @@
 #include <libarch/psthread.h>
 #include <libadt/list.h>
+#include <libarch/thread.h>
 
 #ifndef context_set
@@ -43,6 +44,4 @@
 
 struct psthread_data {
-	struct psthread_data *self; /* ia32, amd64 needs to get self address */
-
 	link_t link;
 	context_t ctx;
@@ -50,4 +49,5 @@
 	void *arg;
 	int (*func)(void *);
+	tcb_t *tcb;
 
 	struct psthread_data *waiter;
@@ -64,4 +64,7 @@
 int psthread_schedule_next(void);
 int psthread_join(pstid_t psthrid);
+psthread_data_t * psthread_setup(tcb_t *tcb);
+void psthread_teardown(psthread_data_t *pt);
+
 
 #endif