diff --git a/src/hb-ot-layout-gpos-private.h b/src/hb-ot-layout-gpos-private.h
index 275a5e8f5..3854aeb98 100644
--- a/src/hb-ot-layout-gpos-private.h
+++ b/src/hb-ot-layout-gpos-private.h
@@ -1313,7 +1313,10 @@ struct GPOS : GSUBGPOS
 {
   static const hb_tag_t Tag		= HB_TAG ('G','P','O','S');
 
-  STATIC_DEFINE_GET_FOR_DATA_CHECK_MAJOR_VERSION (GPOS, 1);
+  static inline const GPOS& get_for_data (const char *data)
+  {
+    return (const GPOS&) GSUBGPOS::get_for_data (data);
+  }
 
   inline const PosLookup& get_lookup (unsigned int i) const
   {
diff --git a/src/hb-ot-layout-gsub-private.h b/src/hb-ot-layout-gsub-private.h
index 757947ca9..c025ac56a 100644
--- a/src/hb-ot-layout-gsub-private.h
+++ b/src/hb-ot-layout-gsub-private.h
@@ -730,7 +730,10 @@ struct GSUB : GSUBGPOS
 {
   static const hb_tag_t Tag		= HB_TAG ('G','S','U','B');
 
-  STATIC_DEFINE_GET_FOR_DATA_CHECK_MAJOR_VERSION (GSUB, 1);
+  static inline const GSUB& get_for_data (const char *data)
+  {
+    return (const GSUB&) GSUBGPOS::get_for_data (data);
+  }
 
   inline const SubstLookup& get_lookup (unsigned int i) const
   {