Index: libcfa/src/concurrency/alarm.cfa
===================================================================
--- libcfa/src/concurrency/alarm.cfa	(revision 4d741e9c9f39fd8ef3618df94fdff5f3077f862b)
+++ libcfa/src/concurrency/alarm.cfa	(revision d3ab18345e7d56314e0a9b01494e226dbd444325)
@@ -51,5 +51,4 @@
 	this.alarm = alarm;
 	this.period = period;
-	next = 0;
 	set = false;
 	kernel_alarm = false;
@@ -60,5 +59,4 @@
 	this.alarm = alarm;
 	this.period = period;
-	next = 0;
 	set = false;
 	kernel_alarm = true;
@@ -71,80 +69,30 @@
 }
 
-#if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__))
-bool validate( alarm_list_t * this ) {
-	alarm_node_t ** it = &this->head;
-	while( (*it) ) {
-		it = &(*it)->next;
+void insert( alarm_list_t * this, alarm_node_t * n ) {
+	alarm_node_t * it = & (*this)`first;
+	while( it && (n->alarm > it->alarm) ) {
+		it = & (*it)`next;
+	}
+	if ( it ) {
+		insert_before( *it, *n );
+	} else {
+		insert_last(*this, *n);
 	}
 
-	return it == this->tail;
-}
-#endif
-
-static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {
-	verify( !n->next );
-	if( p == this->tail ) {
-		this->tail = &n->next;
-	}
-	else {
-		n->next = *p;
-	}
-	*p = n;
-
-	verify( validate( this ) );
-}
-
-void insert( alarm_list_t * this, alarm_node_t * n ) {
-	alarm_node_t ** it = &this->head;
-	while( (*it) && (n->alarm > (*it)->alarm) ) {
-		it = &(*it)->next;
-	}
-
-	insert_at( this, n, it );
-
-	verify( validate( this ) );
+	verify( validate( *this ) );
 }
 
 alarm_node_t * pop( alarm_list_t * this ) {
-	alarm_node_t * head = this->head;
+	verify( validate( *this ) );
+	alarm_node_t * head = & (*this)`first;
 	if( head ) {
-		this->head = head->next;
-		if( !head->next ) {
-			this->tail = &this->head;
-		}
-		head->next = 0p;
+		remove(*head);
 	}
-	verify( validate( this ) );
+	verify( validate( *this ) );
 	return head;
 }
 
-static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
-	verify( it );
-	verify( (*it) == n );
-
-	(*it) = n->next;
-	if( !n-> next ) {
-		this->tail = it;
-	}
-	n->next = 0p;
-
-	verify( validate( this ) );
-}
-
-static inline void remove( alarm_list_t * this, alarm_node_t * n ) {
-	alarm_node_t ** it = &this->head;
-	while( (*it) && (*it) != n ) {
-		it = &(*it)->next;
-	}
-
-	verify( validate( this ) );
-
-	if( *it ) { remove_at( this, n, it ); }
-
-	verify( validate( this ) );
-}
-
 void register_self( alarm_node_t * this ) {
-	alarm_list_t * alarms = &event_kernel->alarms;
+	alarm_list_t & alarms = event_kernel->alarms;
 
 	disable_interrupts();
@@ -152,9 +100,9 @@
 	{
 		verify( validate( alarms ) );
-		bool first = !alarms->head;
+		bool first = ! & alarms`first;
 
-		insert( alarms, this );
+		insert( &alarms, this );
 		if( first ) {
-			__kernel_set_timer( alarms->head->alarm - __kernel_get_time() );
+			__kernel_set_timer( alarms`first.alarm - __kernel_get_time() );
 		}
 	}
@@ -168,6 +116,6 @@
 	lock( event_kernel->lock __cfaabi_dbg_ctx2 );
 	{
-		verify( validate( &event_kernel->alarms ) );
-		remove( &event_kernel->alarms, this );
+		verify( validate( event_kernel->alarms ) );
+		remove( *this );
 	}
 	unlock( event_kernel->lock );
@@ -187,5 +135,6 @@
 
 	/* paranoid */ verify( !node.set );
-	/* paranoid */ verify( node.next == 0p );
+	/* paranoid */ verify( & node`next == 0p );
+	/* paranoid */ verify( & node`prev == 0p );
 }
 
Index: libcfa/src/concurrency/alarm.hfa
===================================================================
--- libcfa/src/concurrency/alarm.hfa	(revision 4d741e9c9f39fd8ef3618df94fdff5f3077f862b)
+++ libcfa/src/concurrency/alarm.hfa	(revision d3ab18345e7d56314e0a9b01494e226dbd444325)
@@ -23,4 +23,6 @@
 #include "time.hfa"
 
+#include <containers/list.hfa>
+
 struct $thread;
 struct processor;
@@ -40,5 +42,6 @@
 	Time alarm;				// time when alarm goes off
 	Duration period;			// if > 0 => period of alarm
-	alarm_node_t * next;		// intrusive link list field
+
+	DLISTED_MGD_IMPL_IN(alarm_node_t)
 
 	union {
@@ -50,6 +53,5 @@
 	bool kernel_alarm	:1;		// true if this is not a user defined alarm
 };
-
-typedef alarm_node_t ** __alarm_it_t;
+DLISTED_MGD_IMPL_OUT(alarm_node_t)
 
 void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period );
@@ -57,13 +59,5 @@
 void ^?{}( alarm_node_t & this );
 
-struct alarm_list_t {
-	alarm_node_t * head;
-	__alarm_it_t tail;
-};
-
-static inline void ?{}( alarm_list_t & this ) with( this ) {
-	head = 0;
-	tail = &head;
-}
+typedef dlist(alarm_node_t, alarm_node_t) alarm_list_t;
 
 void insert( alarm_list_t * this, alarm_node_t * n );
Index: libcfa/src/concurrency/preemption.cfa
===================================================================
--- libcfa/src/concurrency/preemption.cfa	(revision 4d741e9c9f39fd8ef3618df94fdff5f3077f862b)
+++ libcfa/src/concurrency/preemption.cfa	(revision d3ab18345e7d56314e0a9b01494e226dbd444325)
@@ -84,6 +84,6 @@
 // Get next expired node
 static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
-	if( !alarms->head ) return 0p;						// If no alarms return null
-	if( alarms->head->alarm >= currtime ) return 0p;	// If alarms head not expired return null
+	if( ! & (*alarms)`first ) return 0p;						// If no alarms return null
+	if( (*alarms)`first.alarm >= currtime ) return 0p;	// If alarms head not expired return null
 	return pop(alarms);									// Otherwise just pop head
 }
@@ -120,12 +120,12 @@
 
 	// If there are still alarms pending, reset the timer
-	if( alarms->head ) {
+	if( & (*alarms)`first ) {
 		__cfaabi_dbg_print_buffer_decl( " KERNEL: @%ju(%ju) resetting alarm to %ju.\n", currtime.tv, __kernel_get_time().tv, (alarms->head->alarm - currtime).tv);
-		Duration delta = alarms->head->alarm - currtime;
-		Duration caped = max(delta, 50`us);
+		Duration delta = (*alarms)`first.alarm - currtime;
+		Duration capped = max(delta, 50`us);
 		// itimerval tim  = { caped };
 		// __cfaabi_dbg_print_buffer_local( "    Values are %lu, %lu, %lu %lu.\n", delta.tv, caped.tv, tim.it_value.tv_sec, tim.it_value.tv_usec);
 
-		__kernel_set_timer( caped );
+		__kernel_set_timer( capped );
 	}
 }