diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 046df976596a8caea3fac16f3ca501a4d664941e..475187bae31b5055707cab23d4b54d3a1a1fc1ba 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -289,7 +289,7 @@ template <typename Type>
 struct Sanitizer
 {
   static hb_blob_t *sanitize (hb_blob_t *blob) {
-    hb_sanitize_context_t c[1] = {{0}};
+    hb_sanitize_context_t c[1] = {{0, NULL, NULL, false, 0, NULL}};
     bool sane;
 
     /* TODO is_sane() stuff */
diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh
index 9b063008006f68902fe96b9783e3364f0d7f4554..d94ac5072de03c71102916bfdcaa54b6f40adce4 100644
--- a/src/hb-ot-layout-private.hh
+++ b/src/hb-ot-layout-private.hh
@@ -127,7 +127,7 @@ struct hb_ot_layout_lookup_accelerator_t
   }
 
   template <typename TLookup>
-  inline void fini (const TLookup &lookup)
+  inline void fini (const TLookup &lookup HB_UNUSED)
   {
   }
 
diff --git a/src/hb-private.hh b/src/hb-private.hh
index b24c9d1e32cd296263037aaf1c9de3b6a5c4e2bf..5a4ca69915e630adf41573fc03049f44fd068f2d 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -284,7 +284,7 @@ typedef int (*hb_compare_func_t) (const void *, const void *);
 /* arrays and maps */
 
 
-#define HB_PREALLOCED_ARRAY_INIT {0}
+#define HB_PREALLOCED_ARRAY_INIT {0, 0, NULL}
 template <typename Type, unsigned int StaticSize=16>
 struct hb_prealloced_array_t
 {