diff --git a/spa/include/spa/meson.build b/spa/include/spa/meson.build
index 86a8dcb8c..c774cf208 100644
--- a/spa/include/spa/meson.build
+++ b/spa/include/spa/meson.build
@@ -1,11 +1,33 @@
 spa_buffer_headers = [
+  'buffer/alloc.h',
   'buffer/buffer.h',
   'buffer/meta.h',
+  'buffer/type-info.h',
 ]
 
 install_headers(spa_buffer_headers,
   subdir : 'spa/buffer')
 
+spa_control_headers = [
+  'control/control.h',
+  'control/type-info.h',
+]
+
+install_headers(spa_control_headers,
+  subdir : 'spa/control')
+
+spa_debug_headers = [
+  'debug/buffer.h',
+  'debug/dict.h',
+  'debug/format.h',
+  'debug/mem.h',
+  'debug/node.h',
+  'debug/pod.h',
+  'debug/types.h',
+]
+install_headers(spa_debug_headers,
+  subdir : 'spa/debug')
+
 spa_graph_headers = [
   'graph/graph.h',
 ]
@@ -14,7 +36,9 @@ install_headers(spa_graph_headers,
   subdir : 'spa/graph')
 
 spa_monitor_headers = [
+  'monitor/device.h',
   'monitor/monitor.h',
+  'monitor/type-info.h',
 ]
 
 install_headers(spa_monitor_headers,
@@ -23,18 +47,19 @@ install_headers(spa_monitor_headers,
 spa_node_headers = [
   'node/command.h',
   'node/event.h',
-  'node/node.h',
   'node/io.h',
+  'node/node.h',
+  'node/type-info.h',
 ]
 
 install_headers(spa_node_headers,
   subdir : 'spa/node')
 
 spa_param_headers = [
-  'param/param.h',
-  'param/props.h',
   'param/format.h',
   'param/format-utils.h',
+  'param/param.h',
+  'param/props.h',
   'param/type-info.h',
 ]
 
@@ -42,18 +67,21 @@ install_headers(spa_param_headers,
   subdir : 'spa/param')
 
 spa_pod_headers = [
-  'pod/pod.h',
   'pod/builder.h',
   'pod/command.h',
+  'pod/compare.h',
   'pod/event.h',
+  'pod/filter.h',
   'pod/iter.h',
   'pod/parser.h',
+  'pod/pod.h',
 ]
-
 install_headers(spa_pod_headers,
   subdir : 'spa/pod')
 
 spa_support_headers = [
+  'support/cpu.h',
+  'support/dbus.h',
   'support/log.h',
   'support/log-impl.h',
   'support/loop.h',
@@ -70,6 +98,7 @@ spa_utils_headers = [
   'utils/list.h',
   'utils/ringbuffer.h',
   'utils/type.h',
+  'utils/type-info.h',
 ]
 
 install_headers(spa_utils_headers,
@@ -78,7 +107,9 @@ install_headers(spa_utils_headers,
 spa_audio_headers = [
   'param/audio/format.h',
   'param/audio/format-utils.h',
+  'param/audio/layout.h',
   'param/audio/raw.h',
+  'param/audio/type-info.h',
 ]
 
 install_headers(spa_audio_headers,
@@ -92,6 +123,7 @@ spa_video_headers = [
   'param/video/format-utils.h',
   'param/video/multiview.h',
   'param/video/raw.h',
+  'param/video/type-info.h',
 ]
 
 install_headers(spa_video_headers,