Index: uspace/lib/c/include/adt/generic_char_map.h
===================================================================
--- uspace/lib/c/include/adt/generic_char_map.h	(revision 278b97b19049e8eb0d12124d52808c8deccf5c5e)
+++ uspace/lib/c/include/adt/generic_char_map.h	(revision 736a33042b91e42f15b731512c6251d21f6399f5)
@@ -40,5 +40,4 @@
 #include <unistd.h>
 #include <errno.h>
-#include <err.h>
 
 #include <adt/char_map.h>
@@ -85,5 +84,5 @@
 	     type *value) \
 	{ \
-		ERROR_DECLARE; \
+		int rc; \
 		int index; \
 		if (!name##_is_valid(map)) \
@@ -92,8 +91,8 @@
 		if (index < 0) \
 			return index; \
-		if (ERROR_OCCURRED(char_map_add(&map->names, name, length, \
-		    index))) { \
+		rc = char_map_add(&map->names, name, length, index); \
+		if (rc != EOK) { \
 			name##_items_exclude_index(&map->values, index); \
-			return ERROR_CODE; \
+			return rc; \
 		} \
 		return EOK; \
@@ -141,11 +140,14 @@
 	int name##_initialize(name##_ref map) \
 	{ \
-		ERROR_DECLARE; \
+		int rc; \
 		if (!map) \
 			return EINVAL; \
-		ERROR_PROPAGATE(char_map_initialize(&map->names)); \
-		if (ERROR_OCCURRED(name##_items_initialize(&map->values))) { \
+		rc = char_map_initialize(&map->names); \
+		if (rc != EOK) \
+			return rc; \
+		rc = name##_items_initialize(&map->values); \
+		if (rc != EOK) { \
 			char_map_destroy(&map->names); \
-			return ERROR_CODE; \
+			return rc; \
 		} \
 		map->magic = GENERIC_CHAR_MAP_MAGIC_VALUE; \