diff --git a/src/hb-map.cc b/src/hb-map.cc
index 9c7ad787f2b780c4d14fda0272f5c5dd9e35d93b..4f50828fa282e092c9be1b4b57c0ca34e8b7a6d4 100644
--- a/src/hb-map.cc
+++ b/src/hb-map.cc
@@ -170,12 +170,12 @@ hb_map_allocation_successful (const hb_map_t  *map)
  *
  * Since: REPLACEME
  **/
-hb_bool_t
+void
 hb_map_set (hb_map_t       *map,
 	    hb_codepoint_t  key,
 	    hb_codepoint_t  value)
 {
-  return map->set (key, value);
+  map->set (key, value);
 }
 
 /**
diff --git a/src/hb-map.h b/src/hb-map.h
index c12fa56a701f568d08f3f5af70fa9b188c3fd28d..0901e3bd52190d123004440ab8e97506458b91ac 100644
--- a/src/hb-map.h
+++ b/src/hb-map.h
@@ -80,14 +80,14 @@ hb_map_allocation_successful (const hb_map_t *map);
  hb_map_is_empty (const hb_map_t *map);
 
  HB_EXTERN unsigned int
- hb_map_get_population (const hb_map_t *map);
+ hb_set_get_population (const hb_set_t *set);
 
  HB_EXTERN hb_bool_t
  hb_map_is_equal (const hb_map_t *map,
 		 const hb_map_t *other);
 */
 
-HB_EXTERN hb_bool_t
+HB_EXTERN void
 hb_map_set (hb_map_t       *map,
 	    hb_codepoint_t  key,
 	    hb_codepoint_t  value);