Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 48dcc699ceb1979a093dbc5c8b698fe7f16536ed)
+++ kernel/generic/include/proc/task.h	(revision ccb426c40c1bb63880c8f1dd8edb16e9b19286f9)
@@ -40,5 +40,4 @@
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
-#include <synch/rwlock.h>
 #include <synch/futex.h>
 #include <adt/avl.h>
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 48dcc699ceb1979a093dbc5c8b698fe7f16536ed)
+++ kernel/generic/include/proc/thread.h	(revision ccb426c40c1bb63880c8f1dd8edb16e9b19286f9)
@@ -40,5 +40,4 @@
 #include <time/timeout.h>
 #include <cpu.h>
-#include <synch/rwlock.h>
 #include <synch/spinlock.h>
 #include <adt/avl.h>
@@ -155,11 +154,4 @@
 	int fpu_context_engaged;
 	
-	rwlock_type_t rwlock_holder_type;
-	
-	/** Callback fired in scheduler before the thread is put asleep. */
-	void (* call_me)(void *);
-	/** Argument passed to call_me(). */
-	void *call_me_with;
-	
 	/** Thread's state. */
 	state_t state;
@@ -239,5 +231,4 @@
 extern void thread_detach(thread_t *);
 
-extern void thread_register_call_me(void (*)(void *), void *);
 extern void thread_print_list(bool);
 extern void thread_destroy(thread_t *, bool);