diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 543f5d6c7..ace2c375a 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -711,19 +711,14 @@ hb_version_string
 <FILE>hb-subset</FILE>
 hb_subset_flags_t
 hb_subset_input_t
+hb_subset_sets_t
 hb_subset_input_create_or_fail
 hb_subset_input_reference
 hb_subset_input_destroy
 hb_subset_input_set_user_data
 hb_subset_input_get_user_data
-hb_subset_input_unicode_set
-hb_subset_input_glyph_set
-hb_subset_input_nameid_set
-hb_subset_input_namelangid_set
-hb_subset_input_layout_features_set
-hb_subset_input_no_subset_tables_set
-hb_subset_input_drop_tables_set
 hb_subset_input_get_flags
 hb_subset_input_set_flags
+hb_subset_input_set
 hb_subset_or_fail
 </SECTION>
diff --git a/src/hb-subset.h b/src/hb-subset.h
index 569594dbb..cd1e75cbf 100644
--- a/src/hb-subset.h
+++ b/src/hb-subset.h
@@ -81,8 +81,8 @@ typedef enum { /*< flags >*/
 
 /**
  * hb_subset_sets_t:
- * HB_SUBSET_SETS_GLYPH_INDEX: the set of glyph indexes to retain in the subset.
- * HB_SUBSET_SETS_UNICODE: the set of unicode codepoints to retain in the subset.
+ * @HB_SUBSET_SETS_GLYPH_INDEX: the set of glyph indexes to retain in the subset.
+ * @HB_SUBSET_SETS_UNICODE: the set of unicode codepoints to retain in the subset.
  * @HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG: the set of table tags which specifies tables that should not be
  * subsetted.
  * @HB_SUBSET_SETS_DROP_TABLE_TAG: the set of table tags which specifies tables which will be dropped
@@ -126,27 +126,6 @@ HB_EXTERN void *
 hb_subset_input_get_user_data (const hb_subset_input_t *input,
 			       hb_user_data_key_t	   *key);
 
-HB_EXTERN hb_set_t *
-hb_subset_input_unicode_set (hb_subset_input_t *input);
-
-HB_EXTERN hb_set_t *
-hb_subset_input_glyph_set (hb_subset_input_t *input);
-
-HB_EXTERN hb_set_t *
-hb_subset_input_nameid_set (hb_subset_input_t *input);
-
-HB_EXTERN hb_set_t *
-hb_subset_input_namelangid_set (hb_subset_input_t *input);
-
-HB_EXTERN hb_set_t *
-hb_subset_input_layout_features_set (hb_subset_input_t *input);
-
-HB_EXTERN hb_set_t *
-hb_subset_input_no_subset_tables_set (hb_subset_input_t *input);
-
-HB_EXTERN hb_set_t *
-hb_subset_input_drop_tables_set (hb_subset_input_t *input);
-
 HB_EXTERN hb_set_t *
 hb_subset_input_set (hb_subset_input_t *input, hb_subset_sets_t set_type);
 
@@ -212,6 +191,27 @@ hb_subset_input_set_no_prune_unicode_ranges (hb_subset_input_t *subset_input,
 HB_EXTERN hb_bool_t
 hb_subset_input_get_no_prune_unicode_ranges (hb_subset_input_t *subset_input);
 
+HB_EXTERN hb_set_t *
+hb_subset_input_unicode_set (hb_subset_input_t *input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_glyph_set (hb_subset_input_t *input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_nameid_set (hb_subset_input_t *input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_namelangid_set (hb_subset_input_t *input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_layout_features_set (hb_subset_input_t *input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_no_subset_tables_set (hb_subset_input_t *input);
+
+HB_EXTERN hb_set_t *
+hb_subset_input_drop_tables_set (hb_subset_input_t *input);
+
 HB_EXTERN hb_face_t *
 hb_subset (hb_face_t *source, hb_subset_input_t *input);