diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index 3cc2d9d71..b6e696be3 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -46,7 +46,7 @@
 #endif
 
 
-struct _hb_blob_t {
+struct hb_blob_t {
   hb_object_header_t header;
   ASSERT_POD ();
 
diff --git a/src/hb-blob.h b/src/hb-blob.h
index 360310b4a..1a93baa46 100644
--- a/src/hb-blob.h
+++ b/src/hb-blob.h
@@ -43,7 +43,7 @@ typedef enum {
   HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE
 } hb_memory_mode_t;
 
-typedef struct _hb_blob_t hb_blob_t;
+typedef struct hb_blob_t hb_blob_t;
 
 hb_blob_t *
 hb_blob_create (const char        *data,
diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 39b6e5cf5..9bd80e0f7 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -40,7 +40,7 @@
 ASSERT_STATIC (sizeof (hb_glyph_info_t) == 20);
 ASSERT_STATIC (sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t));
 
-typedef struct _hb_segment_properties_t {
+typedef struct hb_segment_properties_t {
     hb_direction_t      direction;
     hb_script_t         script;
     hb_language_t       language;
@@ -48,7 +48,7 @@ typedef struct _hb_segment_properties_t {
 } hb_segment_properties_t;
 
 
-struct _hb_buffer_t {
+struct hb_buffer_t {
   hb_object_header_t header;
   ASSERT_POD ();
 
diff --git a/src/hb-buffer.h b/src/hb-buffer.h
index fe53197e0..73adc2e79 100644
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@@ -40,9 +40,9 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_buffer_t hb_buffer_t;
+typedef struct hb_buffer_t hb_buffer_t;
 
-typedef struct _hb_glyph_info_t {
+typedef struct hb_glyph_info_t {
   hb_codepoint_t codepoint;
   hb_mask_t      mask;
   uint32_t       cluster;
@@ -52,7 +52,7 @@ typedef struct _hb_glyph_info_t {
   hb_var_int_t   var2;
 } hb_glyph_info_t;
 
-typedef struct _hb_glyph_position_t {
+typedef struct hb_glyph_position_t {
   hb_position_t  x_advance;
   hb_position_t  y_advance;
   hb_position_t  x_offset;
diff --git a/src/hb-common.cc b/src/hb-common.cc
index 331d255b4..baf597750 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -98,7 +98,7 @@ hb_direction_to_string (hb_direction_t direction)
 
 /* hb_language_t */
 
-struct _hb_language_t {
+struct hb_language_impl_t {
   const char s[1];
 };
 
diff --git a/src/hb-common.h b/src/hb-common.h
index 562b04cec..78bc43c12 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -124,7 +124,7 @@ hb_direction_to_string (hb_direction_t direction);
 
 /* hb_language_t */
 
-typedef struct _hb_language_t *hb_language_t;
+typedef struct hb_language_impl_t *hb_language_t;
 
 /* len=-1 means str is NUL-terminated */
 hb_language_t
@@ -333,7 +333,7 @@ hb_script_get_horizontal_direction (hb_script_t script);
 
 /* User data */
 
-typedef struct _hb_user_data_key_t {
+typedef struct hb_user_data_key_t {
   /*< private >*/
   char unused;
 } hb_user_data_key_t;
diff --git a/src/hb-font-private.hh b/src/hb-font-private.hh
index 91a43047d..2f74cfa43 100644
--- a/src/hb-font-private.hh
+++ b/src/hb-font-private.hh
@@ -54,7 +54,7 @@
   HB_FONT_FUNC_IMPLEMENT (glyph_from_name) \
   /* ^--- Add new callbacks here */
 
-struct _hb_font_funcs_t {
+struct hb_font_funcs_t {
   hb_object_header_t header;
   ASSERT_POD ();
 
@@ -86,7 +86,7 @@ struct _hb_font_funcs_t {
  * hb_face_t
  */
 
-struct _hb_face_t {
+struct hb_face_t {
   hb_object_header_t header;
   ASSERT_POD ();
 
@@ -107,7 +107,7 @@ struct _hb_face_t {
  * hb_font_t
  */
 
-struct _hb_font_t {
+struct hb_font_t {
   hb_object_header_t header;
   ASSERT_POD ();
 
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 109caff31..7c62fbe7c 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -619,7 +619,7 @@ hb_face_create_for_tables (hb_reference_table_func_t  reference_table,
 }
 
 
-typedef struct _hb_face_for_data_closure_t {
+typedef struct hb_face_for_data_closure_t {
   hb_blob_t *blob;
   unsigned int  index;
 } hb_face_for_data_closure_t;
diff --git a/src/hb-font.h b/src/hb-font.h
index b98759b39..ae4fc9bb6 100644
--- a/src/hb-font.h
+++ b/src/hb-font.h
@@ -37,8 +37,8 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_face_t hb_face_t;
-typedef struct _hb_font_t hb_font_t;
+typedef struct hb_face_t hb_face_t;
+typedef struct hb_font_t hb_font_t;
 
 /*
  * hb_face_t
@@ -110,7 +110,7 @@ hb_face_get_upem (hb_face_t *face);
  * hb_font_funcs_t
  */
 
-typedef struct _hb_font_funcs_t hb_font_funcs_t;
+typedef struct hb_font_funcs_t hb_font_funcs_t;
 
 hb_font_funcs_t *
 hb_font_funcs_create (void);
@@ -145,7 +145,7 @@ hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs);
 
 /* funcs */
 
-typedef struct _hb_glyph_extents_t
+typedef struct hb_glyph_extents_t
 {
   hb_position_t x_bearing;
   hb_position_t y_bearing;
diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index 7f478e4fc..3b3f7fee3 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -34,7 +34,7 @@
 
 /* TODO Make this faster and memmory efficient. */
 
-struct _hb_set_t
+struct hb_set_t
 {
   hb_object_header_t header;
   ASSERT_POD ();
diff --git a/src/hb-set.h b/src/hb-set.h
index 9f849cf8a..1838889f2 100644
--- a/src/hb-set.h
+++ b/src/hb-set.h
@@ -36,7 +36,7 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_set_t hb_set_t;
+typedef struct hb_set_t hb_set_t;
 
 
 hb_set_t *
diff --git a/src/hb-shape.h b/src/hb-shape.h
index 1a0d6cf61..84bf3e76e 100644
--- a/src/hb-shape.h
+++ b/src/hb-shape.h
@@ -38,7 +38,7 @@
 HB_BEGIN_DECLS
 
 
-typedef struct _hb_feature_t {
+typedef struct hb_feature_t {
   hb_tag_t      tag;
   uint32_t      value;
   unsigned int  start;
diff --git a/src/hb-unicode-private.hh b/src/hb-unicode-private.hh
index 8a341747c..eaf151a52 100644
--- a/src/hb-unicode-private.hh
+++ b/src/hb-unicode-private.hh
@@ -61,7 +61,7 @@
   HB_UNICODE_FUNC_IMPLEMENT (hb_script_t, script) \
   /* ^--- Add new simple callbacks here */
 
-struct _hb_unicode_funcs_t {
+struct hb_unicode_funcs_t {
   hb_object_header_t header;
   ASSERT_POD ();
 
diff --git a/src/hb-unicode.h b/src/hb-unicode.h
index 205e4c7f5..808c6e16b 100644
--- a/src/hb-unicode.h
+++ b/src/hb-unicode.h
@@ -44,7 +44,7 @@ HB_BEGIN_DECLS
  * hb_unicode_funcs_t
  */
 
-typedef struct _hb_unicode_funcs_t hb_unicode_funcs_t;
+typedef struct hb_unicode_funcs_t hb_unicode_funcs_t;
 
 
 /*