diff --git a/src/meson.build b/src/meson.build
index 807a7727d..092ff9155 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,16 +1,65 @@
 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-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',
 ]
 
@@ -22,6 +71,7 @@ hb_base_headers = files([
   'hb-deprecated.h',
   'hb-face.h',
   'hb-font.h',
+  'hb-map.h',
   'hb-set.h',
   'hb-shape.h',
   'hb-shape-plan.h',
@@ -40,36 +90,85 @@ 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-tibetan.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-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([
   'hb-ot.h',
+  'hb-ot-color.h',
   'hb-ot-font.h',
   'hb-ot-layout.h',
   'hb-ot-math.h',
+  'hb-ot-name.h',
   'hb-ot-shape.h',
-  'hb-ot-tag.h',
   'hb-ot-var.h',
 ])
 
@@ -113,17 +212,19 @@ hb_icu_headers = files([
 ])
 
 hb_subset_sources = [
+  'hb-static.cc',
   'hb-subset.cc',
+  'hb-subset.hh',
   '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([
   'hb-subset.h',
-  'hb-subset-glyf.hh',
-  'hb-subset-plan.hh',
-  'hb-subset-private.hh',
 ])
 
 hb_gobject_sources = [
diff --git a/test/api/meson.build b/test/api/meson.build
index 1b7819791..0a9ade6ea 100644
--- a/test/api/meson.build
+++ b/test/api/meson.build
@@ -1,13 +1,22 @@
 tests = [
+  ['test-baseline.c'],
   ['test-blob.c'],
   ['test-buffer.c'],
+  ['test-c.c'],
+  ['test-collect-unicodes.c'],
   ['test-common.c'],
+  ['test-cplusplus.cc'],
   ['test-font.c'],
+  ['test-map.c'],
   ['test-object.c'],
+  ['test-ot-color.c'],
+  ['test-ot-face.c'],
+  ['test-ot-ligature-carets.c'],
+  ['test-ot-name.c'],
+  ['test-ot-tag.c'],
   ['test-set.c'],
   ['test-shape.c'],
   ['test-subset.c'],
-  ['test-subset-codepoints.c'],
   ['test-subset-cmap.c'],
   ['test-subset-glyf.c'],
   ['test-subset-hdmx.c'],
@@ -17,14 +26,15 @@ tests = [
   ['test-subset-vmtx.c'],
   ['test-unicode.c'],
   ['test-version.c'],
-  ['test-ot-color.c'],
-  ['test-ot-tag.c'],
 ]
 
 if conf.get('HAVE_FREETYPE', 0) == 1
   tests += [['test-ot-math.c']]
 endif
 
+if conf.get('HAVE_FREETYPE', 0) == 1 and conf.get('HAVE_PTHREAD', 0) == 1
+  tests += [['test-multithread.c']]
+endif
 if conf.get('HAVE_GLIB', 0) == 1
   env = environment()
   env.set('G_TEST_SRCDIR', meson.current_source_dir())
diff --git a/test/fuzzing/meson.build b/test/fuzzing/meson.build
index a479c4cab..2a18cc5dc 100644
--- a/test/fuzzing/meson.build
+++ b/test/fuzzing/meson.build
@@ -1,7 +1,6 @@
 tests = [
   ['hb-shape-fuzzer.cc'],
   ['hb-subset-fuzzer.cc'],
-  ['hb-subset-get-codepoints-fuzzer.cc'],
 ]
 
 foreach test_data : tests
@@ -34,7 +33,6 @@ test('subset_fuzzer', python3,
   args: [
     files('run-subset-fuzzer-tests.py')[0],
     hb_subset_fuzzer_exe,
-    hb_subset_get_codepoints_fuzzer_exe,
   ],
   workdir: join_paths(meson.current_build_dir(), '..', '..'),
   env: env)
diff --git a/test/shaping/meson.build b/test/shaping/meson.build
index f6ef3016b..93cd9fb55 100644
--- a/test/shaping/meson.build
+++ b/test/shaping/meson.build
@@ -1,18 +1,21 @@
 in_house_tests = [
+  ['aat-trak.tests'],
+  ['aat-morx.tests'],
   ['arabic-fallback-shaping.tests'],
   ['arabic-feature-order.tests'],
   ['arabic-like-joining.tests'],
+  ['arabic-mark-attach.tests'],
   ['arabic-mark-order.tests'],
   ['arabic-stch.tests'],
   ['automatic-fractions.tests'],
   ['cluster.tests'],
+  ['collections.tests'],
   ['color-fonts.tests'],
   ['context-matching.tests'],
   ['cursive-positioning.tests'],
   ['default-ignorables.tests'],
-  ['emoji-flag-tags.tests'],
+  ['emoji.tests'],
   ['fallback-positioning.tests'],
-  ['fuzzed.tests'],
   ['hangul-jamo.tests'],
   ['hyphens.tests'],
   ['indic-consonant-with-stacker.tests'],
@@ -25,19 +28,26 @@ in_house_tests = [
   ['indic-script-extensions.tests'],
   ['indic-special-cases.tests'],
   ['indic-syllable.tests'],
+  ['indic-vowel-letter-spoofing.tests'],
+  ['khmer-mark-order.tests'],
+  ['khmer-misc.tests'],
   ['language-tags.tests'],
   ['ligature-id.tests'],
   ['mark-attachment.tests'],
   ['mark-filtering-sets.tests'],
   ['mongolian-variation-selector.tests'],
   ['myanmar-syllable.tests'],
+  ['myanmar-zawgyi.tests'],
   ['none-directional.tests'],
+  ['rand.tests'],
   ['spaces.tests'],
   ['simple.tests'],
+  ['sinhala.tests'],
   ['tibetan-contractions-1.tests'],
   ['tibetan-contractions-2.tests'],
   ['tibetan-vowels.tests'],
   ['use.tests'],
+  ['use-indic3.tests'],
   ['use-marchen.tests'],
   ['use-syllable.tests'],
   ['variations-rvrn.tests'],
@@ -62,6 +72,7 @@ text_rendering_tests = [
   ['GPOS-5.tests'],
   ['GSUB-1.tests'],
   ['GSUB-2.tests'],
+  ['GSUB-3.tests'],
   ['GVAR-1.tests'],
   ['GVAR-2.tests'],
   ['GVAR-3.tests'],
@@ -75,10 +86,59 @@ text_rendering_tests = [
   ['HVAR-2.tests'],
   ['KERN-1.tests'],
   ['KERN-2.tests'],
+  ['MORX-10.tests'],
+  ['MORX-11.tests'],
+  ['MORX-12.tests'],
+  ['MORX-13.tests'],
+  ['MORX-14.tests'],
+  ['MORX-16.tests'],
+  ['MORX-17.tests'],
+  ['MORX-18.tests'],
+  ['MORX-19.tests'],
+  ['MORX-1.tests'],
+  ['MORX-20.tests'],
+  ['MORX-21.tests'],
+  ['MORX-22.tests'],
+  ['MORX-23.tests'],
+  ['MORX-24.tests'],
+  ['MORX-25.tests'],
+  ['MORX-26.tests'],
+  ['MORX-27.tests'],
+  ['MORX-28.tests'],
+  ['MORX-29.tests'],
+  ['MORX-2.tests'],
+  ['MORX-30.tests'],
+  ['MORX-32.tests'],
+  ['MORX-33.tests'],
+  ['MORX-34.tests'],
+  ['MORX-35.tests'],
+  ['MORX-36.tests'],
+  ['MORX-37.tests'],
+  ['MORX-38.tests'],
+  ['MORX-39.tests'],
+  ['MORX-3.tests'],
+  ['MORX-40.tests'],
+  ['MORX-4.tests'],
+  ['MORX-5.tests'],
+  ['MORX-6.tests'],
+  ['MORX-7.tests'],
+  ['MORX-8.tests'],
+  ['MORX-9.tests'],
   ['SHBALI-3.tests'],
   ['SHKNDA-1.tests'],
 ]
 
+disabled_text_rendering_tests = [
+  ['CMAP-3.tests'],
+  ['MORX-31.tests'],
+  ['MORX-41.tests'],
+  ['SHARAN-1.tests'],
+  ['SHBALI-1.tests'],
+  ['SHBALI-2.tests'],
+  ['SHKNDA-2.tests'],
+  ['SHKNDA-3.tests'],
+]
+
 foreach test_data : in_house_tests
   fname = test_data[0]