diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh
index 2a96a6487..ba34e3ae9 100644
--- a/src/hb-ot-layout-gdef-private.hh
+++ b/src/hb-ot-layout-gdef-private.hh
@@ -300,7 +300,7 @@ ASSERT_SIZE (MarkGlyphSets, 2);
 
 struct GDEF
 {
-  static const hb_tag_t Tag		= HB_TAG ('G','D','E','F');
+  static const hb_tag_t Tag	= HB_OT_TAG_GDEF;
 
   enum {
     UnclassifiedGlyph	= 0,
diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index c245e0f4c..4aaefeb8b 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -1487,7 +1487,7 @@ ASSERT_SIZE (PosLookupList, 2);
 
 struct GPOS : GSUBGPOS
 {
-  static const hb_tag_t Tag		= HB_TAG ('G','P','O','S');
+  static const hb_tag_t Tag	= HB_OT_TAG_GPOS;
 
   static inline const GPOS& get_for_data (const char *data)
   { return (const GPOS&) GSUBGPOS::get_for_data (data); }
diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index 535d63696..db608fd4a 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -823,7 +823,7 @@ ASSERT_SIZE (SubstLookupList, 2);
 
 struct GSUB : GSUBGPOS
 {
-  static const hb_tag_t Tag		= HB_TAG ('G','S','U','B');
+  static const hb_tag_t Tag	= HB_OT_TAG_GSUB;
 
   static inline const GSUB& get_for_data (const char *data)
   { return (const GSUB&) GSUBGPOS::get_for_data (data); }
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 06826912a..2f95674b4 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -835,8 +835,8 @@ ASSERT_SIZE (Extension, 2);
 
 struct GSUBGPOS
 {
-  static const hb_tag_t GSUBTag		= HB_TAG ('G','S','U','B');
-  static const hb_tag_t GPOSTag		= HB_TAG ('G','P','O','S');
+  static const hb_tag_t GSUBTag	= HB_OT_TAG_GSUB;
+  static const hb_tag_t GPOSTag	= HB_OT_TAG_GPOS;
 
   STATIC_DEFINE_GET_FOR_DATA_CHECK_MAJOR_VERSION (GSUBGPOS, 1, 1);