Index: libcfa/src/concurrency/io/types.hfa
===================================================================
--- libcfa/src/concurrency/io/types.hfa	(revision 1afd9ccb9da2e410d6a44ba8624d04df80915ada)
+++ libcfa/src/concurrency/io/types.hfa	(revision cb0bcf1249969f856af9d395b77e2cf4e28095b7)
@@ -24,10 +24,8 @@
 
 #include "bits/locks.hfa"
-#include "bits/queue.hfa"
 #include "iofwd.hfa"
 #include "kernel/fwd.hfa"
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
-	#include "bits/sequence.hfa"
 	#include "monitor.hfa"
 
@@ -120,10 +118,10 @@
 	struct __outstanding_io {
 		// intrusive link fields
-		inline Colable;
+		inline dlink(__outstanding_io);
 
 		// primitive on which to block until the io is processed
 		oneshot waitctx;
 	};
-	static inline __outstanding_io *& Next( __outstanding_io * n ) { return (__outstanding_io *)Next( (Colable *)n ); }
+    P9_EMBEDDED( __outstanding_io, dlink(__outstanding_io) )
 
 	// queue of operations that are outstanding
@@ -134,5 +132,5 @@
 
 		// the actual queue
-		Queue(__outstanding_io) queue;
+		dlist(__outstanding_io) queue;
 
 		// volatile used to avoid the need for taking the lock if it's empty