diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 2c36b412c..45a7caecc 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -151,6 +151,7 @@ hb_variation_from_string
 hb_variation_to_string
 hb_bool_t
 hb_codepoint_t
+HB_CODEPOINT_INVALID
 hb_destroy_func_t
 hb_direction_t
 hb_language_t
diff --git a/src/hb-common.h b/src/hb-common.h
index a5da4e76a..7040f1e4c 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -104,6 +104,16 @@ typedef int hb_bool_t;
  *
  **/
 typedef uint32_t hb_codepoint_t;
+
+/**
+ * HB_SET_VALUE_INVALID:
+ *
+ * Unused #hb_codepoint_t value.
+ *
+ * XSince: REPLACEME
+ */
+#define HB_CODEPOINT_INVALID ((hb_codepoint_t) -1)
+
 /**
  * hb_position_t:
  * 
diff --git a/src/hb-map.h b/src/hb-map.h
index e928628fa..0ae171714 100644
--- a/src/hb-map.h
+++ b/src/hb-map.h
@@ -44,7 +44,7 @@ HB_BEGIN_DECLS
  *
  * Since: 1.7.7
  */
-#define HB_MAP_VALUE_INVALID ((hb_codepoint_t) -1)
+#define HB_MAP_VALUE_INVALID HB_CODEPOINT_INVALID
 
 /**
  * hb_map_t:
diff --git a/src/hb-set.h b/src/hb-set.h
index de5323103..192abf6f6 100644
--- a/src/hb-set.h
+++ b/src/hb-set.h
@@ -43,7 +43,7 @@ HB_BEGIN_DECLS
  *
  * Since: 0.9.21
  */
-#define HB_SET_VALUE_INVALID ((hb_codepoint_t) -1)
+#define HB_SET_VALUE_INVALID HB_CODEPOINT_INVALID
 
 /**
  * hb_set_t: