diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index df43c29e4a89ae650ac56b7583e73bf0f77a9667..8fe15313417386ed552e8078a42b9ed14855220f 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -35,6 +35,7 @@
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-layout-jstf-table.hh" // Just so we compile it; unused otherwise.
+#include "hb-ot-name-table.hh" // Just so we compile it; unused otherwise.
 
 #include "hb-ot-map-private.hh"
 
diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index 731a0dbbbb38c354449f60c328e8ace16accaa08..8e688a6bfa2626e5e9978885d3caff396fcfd9d0 100644
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -42,8 +42,10 @@ namespace OT {
 
 struct NameRecord
 {
-  static int cmp (const NameRecord *a, const NameRecord *b)
+  static int cmp (const void *pa, const void *pb)
   {
+    const NameRecord *a = (const NameRecord *) pa;
+    const NameRecord *b = (const NameRecord *) pb;
     int ret;
     ret = b->platformID.cmp (a->platformID);
     if (ret) return ret;