Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 947ab77e1138e5b43ed8d4e74ae82a491381bfec)
+++ kernel/generic/include/proc/task.h	(revision 90efa3b9570ec6f523c45b1a178410890295d3ec)
@@ -43,6 +43,4 @@
 #include <synch/mutex.h>
 #include <synch/futex.h>
-#include <synch/workqueue.h>
-#include <adt/cht.h>
 #include <adt/list.h>
 #include <adt/odict.h>
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 947ab77e1138e5b43ed8d4e74ae82a491381bfec)
+++ kernel/generic/include/proc/thread.h	(revision 90efa3b9570ec6f523c45b1a178410890295d3ec)
@@ -41,5 +41,4 @@
 #include <cpu.h>
 #include <synch/spinlock.h>
-#include <synch/rcu_types.h>
 #include <adt/odict.h>
 #include <mm/slab.h>
@@ -194,16 +193,4 @@
 	thread_id_t tid;
 
-	/** Work queue this thread belongs to or NULL. Immutable. */
-	struct work_queue *workq;
-	/** Links work queue threads. Protected by workq->lock. */
-	link_t workq_link;
-	/** True if the worker was blocked and is not running. Use thread->lock. */
-	bool workq_blocked;
-	/** True if the worker will block in order to become idle. Use workq->lock. */
-	bool workq_idling;
-
-	/** RCU thread related data. Protected by its own locks. */
-	rcu_thread_data_t rcu;
-
 	/** Architecture-specific data. */
 	thread_arch_t arch;