Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision d3145715f4928ba664dc22786d6e0add62328cb0)
+++ kernel/generic/include/proc/task.h	(revision 0b5203bfbdafa8ef8abc2bd7521c6fd282f677e9)
@@ -42,5 +42,4 @@
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
-#include <synch/futex.h>
 #include <adt/list.h>
 #include <adt/odict.h>
@@ -128,9 +127,4 @@
 	task_arch_t arch;
 
-	/** Serializes access to futex_list.*/
-	SPINLOCK_DECLARE(futex_list_lock);
-	/** List of all futexes accesses by this task. */
-	list_t futex_list;
-
 	/** Accumulated accounting. */
 	uint64_t ucycles;
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision d3145715f4928ba664dc22786d6e0add62328cb0)
+++ 	(revision )
@@ -1,64 +1,0 @@
-/*
- * Copyright (c) 2006 Jakub Jermar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup kernel_sync
- * @{
- */
-/** @file
- */
-
-#ifndef KERN_FUTEX_H_
-#define KERN_FUTEX_H_
-
-#include <typedefs.h>
-#include <synch/waitq.h>
-#include <adt/hash_table.h>
-
-/** Kernel-side futex structure. */
-typedef struct {
-	/** Physical address of the status variable. */
-	uintptr_t paddr;
-	/** Wait queue for threads waiting for futex availability. */
-	waitq_t wq;
-	/** Futex hash table link. */
-	ht_link_t ht_link;
-	/** Number of tasks that reference this futex. */
-	size_t refcount;
-} futex_t;
-
-extern void futex_init(void);
-extern sys_errno_t sys_futex_sleep(uintptr_t, uintptr_t);
-extern sys_errno_t sys_futex_wakeup(uintptr_t);
-
-extern void futex_task_cleanup(void);
-extern void futex_task_init(struct task *);
-
-#endif
-
-/** @}
- */