diff -r 89b2a83728b1 -r 2946e13c89a4 src/cx/map.h
--- a/src/cx/map.h	Thu May 19 14:30:20 2022 +0200
+++ b/src/cx/map.h	Sat May 21 11:22:47 2022 +0200
@@ -113,19 +113,19 @@
      * Iterator over the key/value pairs.
      */
     __attribute__((__nonnull__, __warn_unused_result__))
-    CxIterator (*iterator)(CxMap const *map);
+    CxIterator (*iterator)(CxMap *map);
 
     /**
      * Iterator over the keys.
      */
     __attribute__((__nonnull__, __warn_unused_result__))
-    CxIterator (*iterator_keys)(CxMap const *map);
+    CxIterator (*iterator_keys)(CxMap *map);
 
     /**
      * Iterator over the values.
      */
     __attribute__((__nonnull__, __warn_unused_result__))
-    CxIterator (*iterator_values)(CxMap const *map);
+    CxIterator (*iterator_values)(CxMap *map);
 };
 
 /**
@@ -133,13 +133,13 @@
  */
 struct cx_map_entry_s {
     /**
-     * The key.
+     * A pointer to the key.
      */
-    CxDataPtr key;
+    CxDataPtr const *key;
     /**
-     * The value.
+     * A pointer to the value.
      */
-    void const *value;
+    void *value;
 };
 
 
@@ -224,7 +224,7 @@
  * @return an iterator for the currently stored values
  */
 __attribute__((__nonnull__, __warn_unused_result__))
-static inline CxIterator cxMapIteratorValues(CxMap const *map) {
+static inline CxIterator cxMapIteratorValues(CxMap *map) {
     return map->cl->iterator_values(map);
 }
 
@@ -238,7 +238,7 @@
  * @return an iterator for the currently stored keys
  */
 __attribute__((__nonnull__, __warn_unused_result__))
-static inline CxIterator cxMapIteratorKeys(CxMap const *map) {
+static inline CxIterator cxMapIteratorKeys(CxMap *map) {
     return map->cl->iterator_keys(map);
 }
 
@@ -256,7 +256,7 @@
  * @see cxMapIteratorValues()
  */
 __attribute__((__nonnull__, __warn_unused_result__))
-static inline CxIterator cxMapIterator(CxMap const *map) {
+static inline CxIterator cxMapIterator(CxMap *map) {
     return map->cl->iterator(map);
 }