diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index c66d707d1..78a1c3bd7 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -230,11 +230,11 @@ struct hb_sanitize_context_t
     return this->writable;
   }
 
+  unsigned int debug_depth;
   const char *start, *end;
   bool writable;
   unsigned int edit_count;
   hb_blob_t *blob;
-  unsigned int debug_depth;
 };
 
 
@@ -254,7 +254,7 @@ template <typename Type>
 struct Sanitizer
 {
   static hb_blob_t *sanitize (hb_blob_t *blob) {
-    hb_sanitize_context_t context[1] = {{}};
+    hb_sanitize_context_t context[1] = {{0}};
     bool sane;
 
     /* TODO is_sane() stuff */
diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index b1fb3cbed..613fd0b23 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -1490,7 +1490,7 @@ struct PosLookup : Lookup
 			  unsigned int    nesting_level_left) const
   {
     unsigned int lookup_type = get_type ();
-    hb_apply_context_t context[1] = {{}};
+    hb_apply_context_t context[1] = {{0}};
 
     context->layout = layout;
     context->buffer = buffer;
diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index 5cea951f7..7290e985d 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -775,7 +775,7 @@ struct SubstLookup : Lookup
 			  unsigned int nesting_level_left) const
   {
     unsigned int lookup_type = get_type ();
-    hb_apply_context_t context[1] = {{}};
+    hb_apply_context_t context[1] = {{0}};
 
     context->layout = layout;
     context->buffer = buffer;
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index b4c9e05c0..24889b9a0 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -42,13 +42,13 @@
 
 struct hb_apply_context_t
 {
+  unsigned int debug_depth;
   hb_ot_layout_context_t *layout;
   hb_buffer_t *buffer;
   unsigned int context_length;
   unsigned int nesting_level_left;
   unsigned int lookup_flag;
   unsigned int property; /* propety of first glyph (TODO remove) */
-  unsigned int debug_depth;
 };