Index: libcfa/src/bits/collections.hfa
===================================================================
--- libcfa/src/bits/collections.hfa	(revision 43eb8e90d846d77241aadc77e96af2b5a47fe73d)
+++ libcfa/src/bits/collections.hfa	(revision f54e6ec8f379b4f45d0b911f99fb6ac3c6e9c9c5)
@@ -79,13 +79,13 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-	forall(TYPE &)
-	#define T TYPE
-#else
-	#define T void
+	forall(T &)
+	#define __elem_t T
+#else
+	#define __elem_t void
 #endif
 struct __stack {
-	T * top;
+	__elem_t * top;
 };
-#undef T
+#undef __elem_t
 
 #ifdef __cforall
@@ -127,14 +127,14 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-	forall(TYPE &)
-	#define T TYPE
-#else
-	#define T void
+	forall(T &)
+	#define __elem_t T
+#else
+	#define __elem_t void
 #endif
 struct __queue {
-	T * head;
-	T ** tail;
+	__elem_t * head;
+	__elem_t ** tail;
 };
-#undef T
+#undef __elem_t
 
 #ifdef __cforall
@@ -217,17 +217,17 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-	forall(TYPE &)
-	#define T TYPE
-	#define __getter_t * [T * & next, T * & prev] ( T & )
+	forall(T &)
+	#define __elem_t T
+	#define __getter_t * [__elem_t * & next, __elem_t * & prev] ( __elem_t & )
 #else
 	typedef void (*__generit_c_getter_t)();
-	#define T void
+	#define __elem_t void
 	#define __getter_t __generit_c_getter_t
 #endif
 struct __dllist {
-	T * head;
+	__elem_t * head;
 	__getter_t __get;
 };
-#undef T
+#undef __elem_t
 #undef __getter_t