diff --git a/src/rdkafka_cgrp.c b/src/rdkafka_cgrp.c
index be024e478e..d5d9b074bc 100644
--- a/src/rdkafka_cgrp.c
+++ b/src/rdkafka_cgrp.c
@@ -3045,8 +3045,7 @@ rd_kafka_cgrp_consumer_assignment_with_metadata(
                              rd_kafka_Uuid_base64str(&request_topic_id));
         }
         if (missing_topic_ids && *missing_topic_ids)
-                rd_list_deduplicate(missing_topic_ids,
-                                    (void *)rd_kafka_Uuid_ptr_cmp);
+                rd_list_deduplicate(missing_topic_ids, rd_kafka_Uuid_ptr_cmp);
         return assignment_with_metadata;
 }
 
diff --git a/src/rdkafka_metadata.c b/src/rdkafka_metadata.c
index fe6572223e..8829809fb1 100644
--- a/src/rdkafka_metadata.c
+++ b/src/rdkafka_metadata.c
@@ -951,13 +951,13 @@ rd_kafka_parse_Metadata0(rd_kafka_broker_t *rkb,
                         rd_list_free_cb(missing_topics,
                                         rd_list_remove_cmp(missing_topics,
                                                            md->topics[i].topic,
-                                                           (void *)strcmp));
+                                                           rd_list_cmp_str));
                 if (requested_topic_ids)
                         rd_list_free_cb(
                             missing_topic_ids,
                             rd_list_remove_cmp(missing_topic_ids,
                                                &mdi->topics[i].topic_id,
-                                               (void *)rd_kafka_Uuid_ptr_cmp));
+                                               rd_kafka_Uuid_ptr_cmp));
                 /* Only update cache when not asking
                  * for all topics or cache entry
                  * already exists. */
diff --git a/src/rdkafka_partition.c b/src/rdkafka_partition.c
index f7e5906a4a..effa2420cb 100644
--- a/src/rdkafka_partition.c
+++ b/src/rdkafka_partition.c
@@ -3940,7 +3940,7 @@ static rd_bool_t rd_kafka_topic_partition_list_get_leaders(
                         rktpar->err = RD_KAFKA_RESP_ERR__IN_PROGRESS;
                         if (query_topics &&
                             !rd_list_find(query_topics, rktpar->topic,
-                                          (void *)strcmp))
+                                          rd_list_cmp_str))
                                 rd_list_add(query_topics,
                                             rd_strdup(rktpar->topic));
                         continue;
@@ -4372,7 +4372,7 @@ int rd_kafka_topic_partition_list_get_topic_names(
                 if (!include_regex && *rktpar->topic == '^')
                         continue;
 
-                if (!rd_list_find(topics, rktpar->topic, (void *)strcmp)) {
+                if (!rd_list_find(topics, rktpar->topic, rd_list_cmp_str)) {
                         rd_list_add(topics, rd_strdup(rktpar->topic));
                         cnt++;
                 }
diff --git a/src/rdkafka_proto.h b/src/rdkafka_proto.h
index 0ad21e06fc..85429fd165 100644
--- a/src/rdkafka_proto.h
+++ b/src/rdkafka_proto.h
@@ -619,8 +619,9 @@ static RD_INLINE RD_UNUSED int rd_kafka_Uuid_cmp(rd_kafka_Uuid_t a,
         return 0;
 }
 
-static RD_INLINE RD_UNUSED int rd_kafka_Uuid_ptr_cmp(void *a, void *b) {
-        rd_kafka_Uuid_t *a_uuid = a, *b_uuid = b;
+static RD_INLINE RD_UNUSED int rd_kafka_Uuid_ptr_cmp(const void *a,
+                                                     const void *b) {
+        const rd_kafka_Uuid_t *a_uuid = a, *b_uuid = b;
         return rd_kafka_Uuid_cmp(*a_uuid, *b_uuid);
 }
 
diff --git a/src/rdkafka_sasl_oauthbearer.c b/src/rdkafka_sasl_oauthbearer.c
index daf77da8fb..9e80ad6e90 100644
--- a/src/rdkafka_sasl_oauthbearer.c
+++ b/src/rdkafka_sasl_oauthbearer.c
@@ -774,7 +774,7 @@ static char *create_jws_compact_serialization(
                                 ++curr;
                         }
 
-                        if (!rd_list_find(&scope, start, (void *)strcmp))
+                        if (!rd_list_find(&scope, start, rd_list_cmp_str))
                                 rd_list_add(&scope, rd_strdup(start));
 
                         if (scope_json_length == 0) {
diff --git a/src/rdkafka_topic.c b/src/rdkafka_topic.c
index e357ebf4f8..3247a9eece 100644
--- a/src/rdkafka_topic.c
+++ b/src/rdkafka_topic.c
@@ -2021,7 +2021,7 @@ void rd_kafka_topic_scan_all(rd_kafka_t *rk, rd_ts_t now) {
                 /* Need to re-query this topic's leader. */
                 if (query_this &&
                     !rd_list_find(&query_topics, rkt->rkt_topic->str,
-                                  (void *)strcmp))
+                                  rd_list_cmp_str))
                         rd_list_add(&query_topics,
                                     rd_strdup(rkt->rkt_topic->str));
         }
diff --git a/src/rdlist.c b/src/rdlist.c
index 9c341833c9..b7dc950dd2 100644
--- a/src/rdlist.c
+++ b/src/rdlist.c
@@ -194,7 +194,7 @@ void *rd_list_remove(rd_list_t *rl, void *match_elem) {
 
 void *rd_list_remove_cmp(rd_list_t *rl,
                          void *match_elem,
-                         int (*cmp)(void *_a, void *_b)) {
+                         int (*cmp)(const void *_a, const void *_b)) {
         void *elem;
         int i;
 
@@ -211,7 +211,7 @@ void *rd_list_remove_cmp(rd_list_t *rl,
 
 int rd_list_remove_multi_cmp(rd_list_t *rl,
                              void *match_elem,
-                             int (*cmp)(void *_a, void *_b)) {
+                             int (*cmp)(const void *_a, const void *_b)) {
 
         void *elem;
         int i;
diff --git a/src/rdlist.h b/src/rdlist.h
index 3403b230d1..e30308199b 100644
--- a/src/rdlist.h
+++ b/src/rdlist.h
@@ -161,7 +161,7 @@ void *rd_list_remove(rd_list_t *rl, void *match_elem);
  */
 void *rd_list_remove_cmp(rd_list_t *rl,
                          void *match_elem,
-                         int (*cmp)(void *_a, void *_b));
+                         int (*cmp)(const void *_a, const void *_b));
 
 
 /**
@@ -188,7 +188,7 @@ void *rd_list_pop(rd_list_t *rl);
  */
 int rd_list_remove_multi_cmp(rd_list_t *rl,
                              void *match_elem,
-                             int (*cmp)(void *_a, void *_b));
+                             int (*cmp)(const void *_a, const void *_b));
 
 
 /**