diff --git a/test/api/test-ot-extents-cff.c b/test/api/test-ot-extents-cff.c
index fe44a5a03b4ce5997c6cf42bacc69042eea12a26..259437c46d91e40d634888ed74ce13c2e17c95db 100644
--- a/test/api/test-ot-extents-cff.c
+++ b/test/api/test-ot-extents-cff.c
@@ -157,7 +157,7 @@ test_extents_cff2_vsindex (void)
   hb_glyph_extents_t  extents;
   float coords[2] = { 800.0f, 50.0f };
   hb_font_set_var_coords_design (font, coords, 2);
-  bool result = hb_font_get_glyph_extents (font, 1, &extents);
+  hb_bool_t result = hb_font_get_glyph_extents (font, 1, &extents);
   g_assert (result);
 
   g_assert_cmpint (extents.x_bearing, ==, 11);
diff --git a/test/api/test-subset-cff1.c b/test/api/test-subset-cff1.c
index 2089d3086401f050a58b046552bfd9b2c461b259..8f0c1b60933fa846f95b996ea286c49adbae6dcd 100644
--- a/test/api/test-subset-cff1.c
+++ b/test/api/test-subset-cff1.c
@@ -25,6 +25,7 @@
  */
 
 #include "hb-test.h"
+#include "hb-subset-test.h"
 
 /* Unit tests for CFF subsetting */
 
diff --git a/test/api/test-subset-cff2.c b/test/api/test-subset-cff2.c
index a909b73d027a288dabf1f4218e4c6e945952f4e8..dafb32b62376ca24f0bfeeb82d8b00b4f2ac0b91 100644
--- a/test/api/test-subset-cff2.c
+++ b/test/api/test-subset-cff2.c
@@ -25,6 +25,7 @@
  */
 
 #include "hb-test.h"
+#include "hb-subset-test.h"
 
 /* Unit tests for CFF2 subsetting */