-typedef void * (*map_alloc_t) (const datatype_t *);
-typedef map_val_t (*map_cas_t) (map_impl_t *, map_key_t , map_val_t, map_val_t);
-typedef map_val_t (*map_get_t) (map_impl_t *, map_key_t );
-typedef map_val_t (*map_remove_t) (map_impl_t *, map_key_t );
-typedef map_val_t (*map_count_t) (map_impl_t *);
-typedef void (*map_print_t) (map_impl_t *);
-typedef void (*map_free_t) (map_impl_t *);
+typedef void * (*map_alloc_t) (const datatype_t *);
+typedef map_val_t (*map_cas_t) (void *, map_key_t , map_val_t, map_val_t);
+typedef map_val_t (*map_get_t) (void *, map_key_t );
+typedef map_val_t (*map_remove_t) (void *, map_key_t );
+typedef size_t (*map_count_t) (void *);
+typedef void (*map_print_t) (void *, int);
+typedef void (*map_free_t) (void *);