--- a/src/cx/hash_map.h	Thu Nov 07 20:22:56 2024 +0100
+++ b/src/cx/hash_map.h	Thu Nov 07 22:46:58 2024 +0100
@@ -81,7 +81,10 @@
  * @param buckets the initial number of buckets in this hash map
  * @return a pointer to the new hash map
  */
-__attribute__((__nonnull__, __warn_unused_result__))
+cx_attr_nonnull
+cx_attr_nodiscard
+cx_attr_malloc
+cx_attr_dealloc(cxMapDestroy, 1)
 CxMap *cxHashMapCreate(
         const CxAllocator *allocator,
         size_t itemsize,
@@ -122,7 +125,7 @@
  * @param map the map to rehash
  * @return zero on success, non-zero if a memory allocation error occurred
  */
-__attribute__((__nonnull__))
+cx_attr_nonnull
 int cxMapRehash(CxMap *map);