Index: libcfa/src/bits/defs.hfa
===================================================================
--- libcfa/src/bits/defs.hfa	(revision cd5b58fc76b159ad81278f9373a3ebf2c3563d5b)
+++ libcfa/src/bits/defs.hfa	(revision 6a4ef0c58dbf5d0381bd99ba85707bbd8e3b205a)
@@ -30,10 +30,8 @@
 #ifdef __cforall
 #define __cfa_anonymous_object(x) inline struct x
-#define __cfa_dlink1(x) dlink(x)
-#define __cfa_dlink2(x, name) inline struct name { inline dlink(x); }
+#define __cfa_dlink(x) struct { inline dlink(x); }
 #else
 #define __cfa_anonymous_object(x) struct x __cfa_anonymous_object
-#define __cfa_dlink1(x) struct { struct x * next; struct x * back; }
-#define __cfa_dlink2(x, name) struct { struct x * next; struct x * back; } __dlink ## name
+#define __cfa_dlink(x) struct { struct x * next; struct x * back; }
 #endif