Index: libcfa/src/concurrency/io/types.hfa
===================================================================
--- libcfa/src/concurrency/io/types.hfa	(revision b0d02851854bb3ad941a9022e9ebf6702163420b)
+++ libcfa/src/concurrency/io/types.hfa	(revision 40a606d2c7b826dafaa8f9aec47556b5b57893ac)
@@ -23,4 +23,5 @@
 #include "bits/locks.hfa"
 #include "bits/queue.hfa"
+#include "iofwd.hfa"
 #include "kernel/fwd.hfa"
 
@@ -170,21 +171,2 @@
 	// void __ioctx_prepare_block($io_context & ctx);
 #endif
-
-//-----------------------------------------------------------------------
-// IO user data
-struct io_future_t {
-	future_t self;
-	__s32 result;
-};
-
-static inline {
-	thread$ * fulfil( io_future_t & this, __s32 result, bool do_unpark = true ) {
-		this.result = result;
-		return fulfil(this.self, do_unpark);
-	}
-
-	// Wait for the future to be fulfilled
-	bool wait     ( io_future_t & this ) { return wait     (this.self); }
-	void reset    ( io_future_t & this ) { return reset    (this.self); }
-	bool available( io_future_t & this ) { return available(this.self); }
-}