diff --git a/src/hb-ot-name.h b/src/hb-ot-name.h
index 076773946..9cb6f5a1b 100644
--- a/src/hb-ot-name.h
+++ b/src/hb-ot-name.h
@@ -34,6 +34,26 @@
 HB_BEGIN_DECLS
 
 
+/**
+ * hb_name_id_t:
+ *
+ * An integral type representing an OpenType 'name' table name identifier.
+ * There are predefined name IDs, as well as name IDs return from other
+ * API.  These can be used to fetch name strings from a font face.
+ *
+ * Since: 2.0.0
+ */
+typedef unsigned int hb_name_id_t;
+
+/**
+ * HB_NAME_ID_INVALID
+ *
+ * Value to represent a nonexistent name ID.
+ *
+ * Since: 2.0.0
+ **/
+#define HB_NAME_ID_INVALID 0xFFFF
+
 enum {
   HB_NAME_ID_COPYRIGHT			= 0,
   HB_NAME_ID_FONT_FAMILY		= 1,
@@ -63,48 +83,6 @@ enum {
   HB_NAME_ID_VARIATIONS_PS_PREFIX	= 25
 };
 
-/**
- * hb_name_id_t:
- *
- * An integral type representing an OpenType 'name' table name identifier.
- * There are predefined name IDs, as well as name IDs return from other
- * API.  These can be used to fetch name strings from a font face.
- *
- * Since: 2.0.0
- */
-typedef unsigned int hb_name_id_t;
-
-/**
- * HB_NAME_ID_INVALID
- *
- * Value to represent a nonexistent name ID.
- *
- * Since: 2.0.0
- **/
-#define HB_NAME_ID_INVALID 0xFFFF
-
-
-HB_EXTERN unsigned int
-hb_ot_name_get_utf8 (hb_face_t     *face,
-		     hb_name_id_t   name_id,
-		     hb_language_t  language,
-		     unsigned int  *text_size /* IN/OUT */,
-		     char          *text      /* OUT */);
-
-HB_EXTERN unsigned int
-hb_ot_name_get_utf16 (hb_face_t     *face,
-		      hb_name_id_t   name_id,
-		      hb_language_t  language,
-		      unsigned int  *text_size /* IN/OUT */,
-		      uint16_t      *text      /* OUT */);
-
-HB_EXTERN unsigned int
-hb_ot_name_get_utf32 (hb_face_t     *face,
-		      hb_name_id_t   name_id,
-		      hb_language_t  language,
-		      unsigned int  *text_size /* IN/OUT */,
-		      uint32_t      *text      /* OUT */);
-
 
 /**
  * hb_ot_name_entry_t:
@@ -129,6 +107,28 @@ hb_ot_name_list_names (hb_face_t    *face,
 		       unsigned int *num_entries /* OUT */);
 
 
+HB_EXTERN unsigned int
+hb_ot_name_get_utf8 (hb_face_t     *face,
+		     hb_name_id_t   name_id,
+		     hb_language_t  language,
+		     unsigned int  *text_size /* IN/OUT */,
+		     char          *text      /* OUT */);
+
+HB_EXTERN unsigned int
+hb_ot_name_get_utf16 (hb_face_t     *face,
+		      hb_name_id_t   name_id,
+		      hb_language_t  language,
+		      unsigned int  *text_size /* IN/OUT */,
+		      uint16_t      *text      /* OUT */);
+
+HB_EXTERN unsigned int
+hb_ot_name_get_utf32 (hb_face_t     *face,
+		      hb_name_id_t   name_id,
+		      hb_language_t  language,
+		      unsigned int  *text_size /* IN/OUT */,
+		      uint32_t      *text      /* OUT */);
+
+
 HB_END_DECLS
 
 #endif /* HB_OT_NAME_H */