diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index 46314ade9..0a17a7a72 100644
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -343,7 +343,6 @@ struct Ligature
   inline bool apply (hb_apply_context_t *c) const
   {
     TRACE_APPLY ();
-    unsigned int i;
     unsigned int j = c->buffer->idx;
     unsigned int count = component.len;
     unsigned int end = MIN (c->buffer->len, j + c->context_length);
@@ -353,7 +352,7 @@ struct Ligature
     bool first_was_mark = (c->property & HB_OT_LAYOUT_GLYPH_CLASS_MARK);
     bool found_non_mark = false;
 
-    for (i = 1; i < count; i++)
+    for (unsigned int i = 1; i < count; i++)
     {
       unsigned int property;
       do
@@ -392,7 +391,7 @@ struct Ligature
 	 value it is later possible to check whether a specific
 	 component value really belongs to a given ligature. */
 
-      for (i = 1; i < count; i++)
+      for (unsigned int i = 1; i < count; i++)
       {
 	while (_hb_ot_layout_skip_mark (c->face, &c->buffer->info[c->buffer->idx], c->lookup_props, NULL))
 	{
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 5912924a1..24bc315b8 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -132,13 +132,12 @@ static inline bool match_input (hb_apply_context_t *c,
 				const void *match_data,
 				unsigned int *context_length_out)
 {
-  unsigned int i;
   unsigned int j = c->buffer->idx;
   unsigned int end = MIN (c->buffer->len, j + c->context_length);
   if (unlikely (j + count > end))
     return false;
 
-  for (i = 1; i < count; i++)
+  for (unsigned int i = 1; i < count; i++)
   {
     do
     {
@@ -187,11 +186,10 @@ static inline bool match_lookahead (hb_apply_context_t *c,
 				    const void *match_data,
 				    unsigned int offset)
 {
-  unsigned int i;
   unsigned int j = c->buffer->idx + offset - 1;
   unsigned int end = MIN (c->buffer->len, c->buffer->idx + c->context_length);
 
-  for (i = 0; i < count; i++)
+  for (unsigned int i = 0; i < count; i++)
   {
     do
     {