diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index 1454b5be5..494f5992e 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -1536,10 +1536,10 @@ struct GPOS : GSUBGPOS
   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); }
+  { return CONST_CAST(GPOS, GSUBGPOS::get_for_data (data), 0); }
 
   inline const PosLookup& get_lookup (unsigned int i) const
-  { return (const PosLookup&) GSUBGPOS::get_lookup (i); }
+  { return CONST_CAST(PosLookup, GSUBGPOS::get_lookup (i), 0); }
 
   inline bool position_lookup (hb_ot_layout_context_t *context,
 			       hb_buffer_t  *buffer,
diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index d04ea99f4..65402b8a4 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -846,10 +846,10 @@ struct GSUB : GSUBGPOS
   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); }
+  { return CONST_CAST(GSUB, GSUBGPOS::get_for_data (data), 0); }
 
   inline const SubstLookup& get_lookup (unsigned int i) const
-  { return (const SubstLookup&) GSUBGPOS::get_lookup (i); }
+  { return CONST_CAST(SubstLookup, GSUBGPOS::get_lookup (i), 0); }
 
   inline bool substitute_lookup (hb_ot_layout_context_t *context,
 				 hb_buffer_t  *buffer,