diff --git a/src/hb-map.hh b/src/hb-map.hh
index 40c232eb0..02d540667 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -166,7 +166,7 @@ struct hb_map_t
   hb_codepoint_t operator [] (unsigned int key) const
   { return get (key); }
 
-  static const hb_codepoint_t INVALID = HB_MAP_VALUE_INVALID;
+  static constexpr hb_codepoint_t INVALID = HB_MAP_VALUE_INVALID;
 
   void clear ()
   {
diff --git a/src/hb-set.hh b/src/hb-set.hh
index 86a06fab5..81b9064d5 100644
--- a/src/hb-set.hh
+++ b/src/hb-set.hh
@@ -666,7 +666,7 @@ struct hb_set_t
     return INVALID;
   }
 
-  static const hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
+  static constexpr hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
 
   /*
    * Iterator implementation.