diff --git a/src/meson.build b/src/meson.build
index 092ff9155..8c7d21e25 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,65 +1,22 @@
 hb_base_sources = [
-  'hb-atomic.hh',
-  'hb-blob.hh',
   'hb-blob.cc',
-  'hb-buffer.hh',
   'hb-buffer-serialize.cc',
   'hb-buffer.cc',
-  'hb-cache.hh',
   'hb-common.cc',
-  'hb-debug.hh',
-  'hb-dsalgs.hh',
-  'hb-face.hh',
   'hb-face.cc',
-  'hb-font.hh',
   'hb-font.cc',
-  'hb-iter.hh',
-  'hb-kern.hh',
-  'hb-map.hh',
   'hb-map.cc',
-  'hb-machinery.hh',
-  'hb-mutex.hh',
-  'hb-null.hh',
-  'hb-object.hh',
-  'hb-open-file.hh',
-  'hb-open-type.hh',
-  'hb-ot-color-cbdt-table.hh',
-  'hb-ot-cmap-table.hh',
-  'hb-ot-glyf-table.hh',
-  'hb-ot-hdmx-table.hh',
-  'hb-ot-head-table.hh',
-  'hb-ot-hhea-table.hh',
-  'hb-ot-hmtx-table.hh',
-  'hb-ot-kern-table.hh',
-  'hb-ot-maxp-table.hh',
+  'hb-ot-cff1-table.cc',
+  'hb-ot-cff2-table.cc',
   'hb-ot-name-language.cc',
-  'hb-ot-name-language.hh',
-  'hb-ot-name-table.hh',
   'hb-ot-name.cc',
-  'hb-ot-os2-table.hh',
-  'hb-ot-os2-unicode-ranges.hh',
-  'hb-ot-post-macroman.hh',
-  'hb-ot-post-table.hh',
-  'hb-ot-tag-table.hh',
   'hb-ot-tag.cc',
-  'hb.hh',
-  'hb-set-digest.hh',
-  'hb-set.hh',
   'hb-set.cc',
   'hb-shape.cc',
-  'hb-shape-plan.hh',
   'hb-shape-plan.cc',
-  'hb-shaper-list.hh',
-  'hb-shaper-impl.hh',
-  'hb-shaper.hh',
   'hb-shaper.cc',
   'hb-static.cc',
-  'hb-string-array.hh',
-  'hb-unicode.hh',
-  'hb-unicode-emoji-table.hh',
   'hb-unicode.cc',
-  'hb-vector.hh',
-  'hb-utf.hh',
   'hb-warning.cc',
 ]
 
@@ -90,75 +47,31 @@ hb_fallback_sources = [
 
 hb_ot_sources = [
   'hb-aat-layout.cc',
-  'hb-aat-layout-common.hh',
-  'hb-aat-layout-ankr-table.hh',
-  'hb-aat-layout-bsln-table.hh',
-  'hb-aat-layout-feat-table.hh',
-  'hb-aat-layout-just-table.hh',
-  'hb-aat-layout-kerx-table.hh',
-  'hb-aat-layout-lcar-table.hh',
-  'hb-aat-layout-morx-table.hh',
-  'hb-aat-layout-trak-table.hh',
-  'hb-aat-layout.hh',
-  'hb-aat-ltag-table.hh',
   'hb-aat-map.cc',
-  'hb-aat-map.hh',
-  'hb-ot-face.hh',
   'hb-ot-face.cc',
   'hb-ot-font.cc',
   'hb-ot-layout.cc',
-  'hb-ot-layout-base-table.hh',
-  'hb-ot-layout-common.hh',
-  'hb-ot-layout-gdef-table.hh',
-  'hb-ot-layout-gpos-table.hh',
-  'hb-ot-layout-gsubgpos.hh',
-  'hb-ot-layout-gsub-table.hh',
-  'hb-ot-layout-jstf-table.hh',
-  'hb-ot-layout.hh',
   'hb-ot-color.cc',
-  'hb-ot-color-colr-table.hh',
-  'hb-ot-color-cpal-table.hh',
-  'hb-ot-color-sbix-table.hh',
-  'hb-ot-color-svg-table.hh',
   'hb-ot-map.cc',
-  'hb-ot-map.hh',
   'hb-ot-math.cc',
-  'hb-ot-math-table.hh',
   'hb-ot-shape.cc',
   'hb-ot-shape-complex-arabic.cc',
-  'hb-ot-shape-complex-arabic-fallback.hh',
-  'hb-ot-shape-complex-arabic.hh',
-  'hb-ot-shape-complex-arabic-table.hh',
-  'hb-ot-shape-complex-arabic-win1256.hh',
   'hb-ot-shape-complex-default.cc',
   'hb-ot-shape-complex-hangul.cc',
   'hb-ot-shape-complex-hebrew.cc',
   'hb-ot-shape-complex-indic.cc',
-  'hb-ot-shape-complex-indic.hh',
   'hb-ot-shape-complex-indic-table.cc',
-  'hb-ot-shape-complex-khmer.hh',
   'hb-ot-shape-complex-khmer.cc',
-  'hb-ot-shape-complex-myanmar.hh',
   'hb-ot-shape-complex-myanmar.cc',
   'hb-ot-shape-complex-thai.cc',
   'hb-ot-shape-complex-use.cc',
-  'hb-ot-shape-complex-use.hh',
   'hb-ot-shape-complex-use-table.cc',
   'hb-ot-shape-complex-vowel-constraints.cc',
-  'hb-ot-shape-complex-vowel-constraints.hh',
-  'hb-ot-shape-complex.hh',
-  'hb-ot-shape-normalize.hh',
   'hb-ot-shape-normalize.cc',
-  'hb-ot-shape-fallback.hh',
   'hb-ot-shape-fallback.cc',
-  'hb-ot-shape.hh',
-  'hb-ot-stat-table.hh',
+  'hb-ot-cff1-table.cc',
+  'hb-ot-cff2-table.cc',
   'hb-ot-var.cc',
-  'hb-ot-var-avar-table.hh',
-  'hb-ot-var-fvar-table.hh',
-  'hb-ot-var-hvar-table.hh',
-  'hb-ot-var-mvar-table.hh',
-  'hb-ot-vorg-table.hh',
 ]
 
 hb_ot_headers = files([
@@ -212,15 +125,16 @@ hb_icu_headers = files([
 ])
 
 hb_subset_sources = [
+  'hb-ot-cff1-table.cc',
+  'hb-ot-cff2-table.cc',
   'hb-static.cc',
   'hb-subset.cc',
-  'hb-subset.hh',
+  'hb-subset-cff1.cc',
+  'hb-subset-cff2.cc',
+  'hb-subset-cff-common.cc',
   'hb-subset-glyf.cc',
-  'hb-subset-glyf.hh',
   'hb-subset-input.cc',
-  'hb-subset-input.hh',
   'hb-subset-plan.cc',
-  'hb-subset-plan.hh',
 ]
 
 hb_subset_headers = files([