diff --git a/doc/meson.build b/doc/meson.build
index 93d7b603d..f47c59a73 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,8 +1,8 @@
 doxyfile_conf = configuration_data()
 doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
 doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())
-doxyfile_conf.set('top_srcdir', meson.project_source_root())
-doxyfile_conf.set('top_builddir', meson.project_build_root())
+doxyfile_conf.set('top_srcdir', meson.source_root())
+doxyfile_conf.set('top_builddir', meson.build_root())
 
 dot_found = find_program('dot', required: false).found()
 summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
@@ -14,18 +14,18 @@ endif
 
 inputs = []
 foreach h : pipewire_headers
-  inputs += meson.project_source_root() / 'src' / 'pipewire' / h
+  inputs += meson.source_root() / 'src' / 'pipewire' / h
 endforeach
 foreach h : pipewire_sources
-  inputs += meson.project_source_root() / 'src' / 'pipewire' / h
+  inputs += meson.source_root() / 'src' / 'pipewire' / h
 endforeach
 foreach h : module_sources
-  inputs += meson.project_source_root() / 'src' / 'modules' / h
+  inputs += meson.source_root() / 'src' / 'modules' / h
 endforeach
 foreach h : media_session_sources
-  inputs += meson.project_source_root() / 'src' / 'examples' / h
+  inputs += meson.source_root() / 'src' / 'examples' / h
 endforeach
-inputs += meson.project_source_root() / 'test' / 'pwtest.h'
+inputs += meson.source_root() / 'test' / 'pwtest.h'
 
 # SPA headers use static inline functions. Doxygen doesn't extract those
 # unless we have EXTRACT_STATIC set - but we don't want it to extract
@@ -39,7 +39,7 @@ inputs += meson.project_source_root() / 'test' / 'pwtest.h'
 sed = find_program('sed', required: false)
 summary({'sed (for SPA docs)': sed.found()}, bool_yn: true, section: 'Optional programs')
 if sed.found()
-  spa_srcdir = meson.project_source_root() / 'spa' / 'include' / 'spa'
+  spa_srcdir = meson.source_root() / 'spa' / 'include' / 'spa'
   spa_dstdir = meson.current_build_dir() / 'spa'
   spa_strip_static = custom_target(
     'spa-strip-static',
@@ -86,12 +86,12 @@ extra_docs = [
 ]
 
 foreach extra : extra_docs
-  inputs += meson.project_source_root() / 'doc' / extra
+  inputs += meson.source_root() / 'doc' / extra
 endforeach
 
 cssfiles = [
-  meson.project_source_root() / 'doc' / 'doxygen-awesome.css',
-  meson.project_source_root() / 'doc' / 'custom.css'
+  meson.source_root() / 'doc' / 'doxygen-awesome.css',
+  meson.source_root() / 'doc' / 'custom.css'
 ]
 
 doxyfile_conf.set('inputs', ' '.join(inputs + [spa_dstdir]))
diff --git a/man/meson.build b/man/meson.build
index 1a7a8bde2..c15ad34b4 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -5,8 +5,8 @@ manpage_conf.set('PACKAGE_URL', 'http://pipewire.org')
 manpage_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/pipewire/pipewire/issues')
 manpage_conf.set('PIPEWIRE_CONFIG_DIR', pipewire_configdir)
 manpage_conf.set('PIPEWIRE_CONFDATADIR', pipewire_confdatadir)
-manpage_conf.set('top_srcdir', meson.project_source_root())
-manpage_conf.set('top_builddir', meson.project_build_root())
+manpage_conf.set('top_srcdir', meson.source_root())
+manpage_conf.set('top_builddir', meson.build_root())
 
 manpages = [
   'pipewire.1.xml.in',
diff --git a/meson.build b/meson.build
index 97d76c098..962860887 100644
--- a/meson.build
+++ b/meson.build
@@ -302,8 +302,8 @@ includes_inc = include_directories('include')
 pipewire_inc = include_directories('src')
 
 makedata = configuration_data()
-  makedata.set('BUILD_ROOT', meson.project_build_root())
-  makedata.set('SOURCE_ROOT', meson.project_source_root())
+  makedata.set('BUILD_ROOT', meson.build_root())
+  makedata.set('SOURCE_ROOT', meson.source_root())
   makedata.set('VERSION', pipewire_version)
 if version_arr.length() == 4
   makedata.set('TAG', 'HEAD')
@@ -447,7 +447,7 @@ endif
 
 setenv = find_program('pw-uninstalled.sh')
 run_target('pw-uninstalled', command : [setenv,
-    '-b@0@'.format(meson.project_build_root()), '-v@0@'.format(pipewire_version)])
+    '-b@0@'.format(meson.build_root()), '-v@0@'.format(pipewire_version)])
 
 if meson.version().version_compare('>=0.58.0')
   devenv = environment()
diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
index b25c772a0..620960090 100644
--- a/spa/plugins/audioconvert/meson.build
+++ b/spa/plugins/audioconvert/meson.build
@@ -139,7 +139,7 @@ foreach a : test_apps
       install : installed_tests_enabled,
       install_dir : installed_tests_execdir / 'audioconvert'),
       env : [
-        'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
+        'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
         ])
 
     if installed_tests_enabled
@@ -170,7 +170,7 @@ foreach a : benchmark_apps
       install : installed_tests_enabled,
       install_dir : installed_tests_execdir / 'audioconvert'),
       env : [
-        'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
+        'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
         ])
 
     if installed_tests_enabled
diff --git a/spa/tests/meson.build b/spa/tests/meson.build
index 1fdba2743..98df31748 100644
--- a/spa/tests/meson.build
+++ b/spa/tests/meson.build
@@ -5,7 +5,7 @@ find = find_program('find', required: false)
 summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs')
 if find.found()
   spa_headers = run_command(find,
-                            meson.project_source_root() / 'spa' / 'include',
+                            meson.source_root() / 'spa' / 'include',
                             '-name', '*.h',
                             '-not', '-name', 'type-info.h',
                             '-type', 'f',
@@ -40,7 +40,7 @@ foreach a : benchmark_apps
 		install : installed_tests_enabled,
 		install_dir : installed_tests_execdir),
 	env : [
-		'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
+		'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
 	])
 
   if installed_tests_enabled
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 89a1db7bf..5f51d0b8b 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -17,11 +17,11 @@ conf_config.set('comment', '#')
 
 conf_config_uninstalled = conf_config
 conf_config_uninstalled.set('session_manager_path',
-  meson.project_build_root() / 'src' / 'examples' / 'pipewire-media-session')
+  meson.build_root() / 'src' / 'examples' / 'pipewire-media-session')
 conf_config_uninstalled.set('pipewire_path',
-  meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
+  meson.build_root() / 'src' / 'daemon' / 'pipewire')
 conf_config_uninstalled.set('pipewire_pulse_path',
-  meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
+  meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
 conf_config_uninstalled.set('comment', '')
 
 build_ms = get_option('session-managers').contains('media-session')
@@ -48,9 +48,9 @@ elif build_wp
 
     # wp-uninstalled.sh -b path/to/wp/build/root wireplumber
     conf_config_uninstalled.set('session_manager_path',
-      meson.project_source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
+      meson.source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
     conf_config_uninstalled.set('session_manager_args',
-      '-b ' + meson.project_build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
+      '-b ' + meson.build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
   endif
 endif
 
@@ -96,7 +96,7 @@ custom_target('pipewire-uninstalled',
   install: false,
   input: pipewire_exec,
   output: 'pipewire-uninstalled',
-  command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
+  command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
 )
 
 #desktop_file = i18n.merge_file(
diff --git a/src/daemon/systemd/system/meson.build b/src/daemon/systemd/system/meson.build
index 31cc88dee..944c211fe 100644
--- a/src/daemon/systemd/system/meson.build
+++ b/src/daemon/systemd/system/meson.build
@@ -1,4 +1,4 @@
-systemd_system_services_dir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir', pkgconfig_define : [ 'prefix', prefix])
+systemd_system_services_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir', define_variable : [ 'prefix', prefix])
 
 install_data(sources : 'pipewire.socket',
              install_dir : systemd_system_services_dir)
diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
index c4aa1571f..e4f996057 100644
--- a/src/daemon/systemd/user/meson.build
+++ b/src/daemon/systemd/user/meson.build
@@ -1,4 +1,4 @@
-systemd_user_services_dir = systemd.get_variable(pkgconfig : 'systemduserunitdir', pkgconfig_define : [ 'prefix', prefix])
+systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir', define_variable : [ 'prefix', prefix])
 if get_option('systemd-user-unit-dir') != ''
   systemd_user_services_dir = get_option('systemd-user-unit-dir')
 endif
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 6d16c1127..67d362c55 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -307,9 +307,9 @@ test('pw-test-protocol-native',
 			install : installed_tests_enabled,
 			install_dir : installed_tests_execdir),
 	env : [
-		'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
-		'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
-		'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
+		'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
+		'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
+		'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
 	])
 
 if installed_tests_enabled
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 3b78c7625..dfb2f749c 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -13,9 +13,9 @@ foreach a : test_apps
       install : installed_tests_enabled,
       install_dir : installed_tests_execdir),
     env : [
-      'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
-      'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
-      'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
+      'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
+      'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
+      'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
       ])
 
   if installed_tests_enabled
diff --git a/test/meson.build b/test/meson.build
index 57fe8e80e..bbef49de7 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -14,8 +14,8 @@ pwtest_deps = [
 ]
 
 pwtest_c_args = [
-  '-DBUILD_ROOT="@0@"'.format(meson.project_build_root()),
-  '-DSOURCE_ROOT="@0@"'.format(meson.project_source_root()),
+  '-DBUILD_ROOT="@0@"'.format(meson.build_root()),
+  '-DSOURCE_ROOT="@0@"'.format(meson.source_root()),
 ]
 
 pwtest_inc = [