diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1e1b5e7c4685133929f40f48934c62d09a3e4e47..71a75db54bf0c2e6aa6885d528ff5625fa2c66b1 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -28,7 +28,7 @@ SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-types
+SCAN_OPTIONS=--rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
diff --git a/docs/reference/harfbuzz-sections.txt b/docs/reference/harfbuzz-sections.txt
index 3ba4b0cef9988b6ea4606e7c5c8e9bac7d129bef..416d76d98d56b991034aba0e8daf4f097a3585ad 100644
--- a/docs/reference/harfbuzz-sections.txt
+++ b/docs/reference/harfbuzz-sections.txt
@@ -102,6 +102,7 @@ hb_script_from_string
 hb_script_get_horizontal_direction
 hb_script_t
 hb_script_to_iso15924_tag
+HB_SCRIPT_CANADIAN_ABORIGINAL
 hb_tag_from_string
 hb_tag_t
 hb_tag_to_string
@@ -276,9 +277,6 @@ HB_OT_LAYOUT_NO_SCRIPT_INDEX
 HB_OT_TAG_GDEF
 HB_OT_TAG_GPOS
 HB_OT_TAG_GSUB
-Xhb_ot_layout_lookup_enumerate_sequences
-Xhb_ot_layout_lookup_position
-Xhb_ot_layout_lookup_substitute
 hb_ot_layout_collect_lookups
 hb_ot_layout_feature_get_lookups
 hb_ot_layout_get_attach_points
@@ -305,6 +303,10 @@ hb_ot_layout_table_find_script
 hb_ot_layout_table_get_feature_tags
 hb_ot_layout_table_get_script_tags
 hb_ot_shape_plan_collect_lookups
+<SUBSECTION Private>
+Xhb_ot_layout_lookup_enumerate_sequences
+Xhb_ot_layout_lookup_position
+Xhb_ot_layout_lookup_substitute
 </SECTION>
 
 <SECTION>
diff --git a/src/hb-common.h b/src/hb-common.h
index 8699bf632e4099d226a98e7dc8d7d91483413175..5040b90889dc526918ce1fcd61756c168050f06f 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -273,8 +273,10 @@ typedef enum
   /*---*/ HB_SCRIPT_INVALID			= HB_TAG_NONE
 } hb_script_t;
 
-/* Deprecated misspellings. */
+#ifndef HB_DISABLE_DEPRECATED
+/* Deprecated misspelling. */
 #define HB_SCRIPT_CANADIAN_ABORIGINAL		  HB_SCRIPT_CANADIAN_SYLLABICS
+#endif
 
 /* These are moved out of hb_script_t because glib-mkenums chokes otherwise. */
 #if 0