diff --git a/src/hb-ot-layout-private.h b/src/hb-ot-layout-private.h
index 1a55d2d74..e8ef86bb9 100644
--- a/src/hb-ot-layout-private.h
+++ b/src/hb-ot-layout-private.h
@@ -64,27 +64,25 @@ struct _hb_ot_layout_t
 };
 
 
-#define HB_OT_LAYOUT_INTERNAL static
-
 HB_BEGIN_DECLS
 
 /*
  * GDEF
  */
 
-HB_OT_LAYOUT_INTERNAL hb_bool_t
+HB_INTERNAL hb_bool_t
 _hb_ot_layout_has_new_glyph_classes (hb_ot_layout_t *layout);
 
-HB_OT_LAYOUT_INTERNAL unsigned int
+HB_INTERNAL unsigned int
 _hb_ot_layout_get_glyph_property (hb_ot_layout_t *layout,
 				  hb_codepoint_t  glyph);
 
-HB_OT_LAYOUT_INTERNAL void
+HB_INTERNAL void
 _hb_ot_layout_set_glyph_property (hb_ot_layout_t *layout,
 				  hb_codepoint_t  glyph,
 				  unsigned int    property);
 
-HB_OT_LAYOUT_INTERNAL hb_bool_t
+HB_INTERNAL hb_bool_t
 _hb_ot_layout_check_glyph_property (hb_ot_layout_t *layout,
 				    HB_GlyphItem    gitem,
 				    unsigned int    lookup_flags,
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index e79662a5f..20fc0a122 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -126,13 +126,13 @@ hb_ot_layout_has_font_glyph_classes (hb_ot_layout_t *layout)
   return layout->gdef->has_glyph_classes ();
 }
 
-HB_OT_LAYOUT_INTERNAL hb_bool_t
+HB_INTERNAL hb_bool_t
 _hb_ot_layout_has_new_glyph_classes (hb_ot_layout_t *layout)
 {
   return layout->new_gdef.len > 0;
 }
 
-HB_OT_LAYOUT_INTERNAL unsigned int
+HB_INTERNAL unsigned int
 _hb_ot_layout_get_glyph_property (hb_ot_layout_t *layout,
 				  hb_codepoint_t  glyph)
 {
@@ -159,7 +159,7 @@ _hb_ot_layout_get_glyph_property (hb_ot_layout_t *layout,
   }
 }
 
-HB_OT_LAYOUT_INTERNAL hb_bool_t
+HB_INTERNAL hb_bool_t
 _hb_ot_layout_check_glyph_property (hb_ot_layout_t *layout,
 				    HB_GlyphItem    gitem,
 				    unsigned int    lookup_flags,
@@ -208,7 +208,7 @@ _hb_ot_layout_check_glyph_property (hb_ot_layout_t *layout,
   return true;
 }
 
-HB_OT_LAYOUT_INTERNAL void
+HB_INTERNAL void
 _hb_ot_layout_set_glyph_property (hb_ot_layout_t *layout,
 				  hb_codepoint_t  glyph,
 				  unsigned int    property)