diff --git a/meson.build b/meson.build
index ca59c575..5f50b52e 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@ git = find_program('git', required: false)
 
 if git.found()
     txt = run_command('git', '--git-dir=' + srcdir + '/.git', 'rev-parse', 'HEAD', check:false).stdout().strip()
-    dirty = run_command(srcdir + '/git-dirty.sh', check:false).stdout().strip()
+    dirty = run_command(srcdir / 'git-dirty.sh', check:false).stdout().strip()
 else
     txt = ''
     dirty = ''
@@ -1123,7 +1123,7 @@ sysconfdir = get_option('prefix') / get_option('sysconfdir')/'elinks'
 conf_data.set('CONFDIR', sysconfdir)
 conf_data.set('sysconfdir', sysconfdir)
 conf_data.set('SOMETHING', '@SOMETHING@')
-conf_data.set('api_srcdir', srcdir + '/src')
+conf_data.set('api_srcdir', srcdir / 'src')
 conf_data.set('LIBDIR', get_option('prefix') / 'lib')
 conf_data.set('LOCALEDIR', get_option('prefix') / 'share/locale')
 
diff --git a/src/cookies/meson.build b/src/cookies/meson.build
index 84ad017a..4117cd5d 100644
--- a/src/cookies/meson.build
+++ b/src/cookies/meson.build
@@ -2,7 +2,7 @@ srcs += files('cookies.c', 'dialogs.c', 'path.c', 'parser.c')
 
 if get_option('test')
     exe = executable('cookies-t', 'cookies-t.c', 'path.c', include_directories:['..'], build_by_default:false)
-    test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+    test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
     t = find_program('test-cookies-t')
     test('cookies', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir())
 
diff --git a/src/document/html/test/meson.build b/src/document/html/test/meson.build
index 5f3f4cc9..70cce58a 100644
--- a/src/document/html/test/meson.build
+++ b/src/document/html/test/meson.build
@@ -1,3 +1,3 @@
-t = executable('parse-meta-refresh-test', 'parse-meta-refresh-test.c', testdeps, meson.current_source_dir() + '/../parse-meta-refresh.c', dependencies:[iconvdeps],
+t = executable('parse-meta-refresh-test', 'parse-meta-refresh-test.c', testdeps, meson.current_source_dir() / '../parse-meta-refresh.c', dependencies:[iconvdeps],
 c_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..', '../../..', '../../../..'])
 test('parse-meta-refresh', t)
diff --git a/src/dom/test/meson.build b/src/dom/test/meson.build
index 6f8a8642..b5099909 100644
--- a/src/dom/test/meson.build
+++ b/src/dom/test/meson.build
@@ -1,35 +1,35 @@
 exe1 = executable('html-mangle', 'html-mangle.c',
-meson.source_root()+'/src/dom/configuration.c',
-meson.source_root()+'/src/dom/node.c',
-meson.source_root()+'/src/dom/select.c',
-meson.source_root()+'/src/dom/stack.c',
-meson.source_root()+'/src/dom/scanner.c',
-meson.source_root()+'/src/dom/css/scanner.c',
+meson.source_root() / 'src/dom/configuration.c',
+meson.source_root() / 'src/dom/node.c',
+meson.source_root() / 'src/dom/select.c',
+meson.source_root() / 'src/dom/stack.c',
+meson.source_root() / 'src/dom/scanner.c',
+meson.source_root() / 'src/dom/css/scanner.c',
 testdeps,
 c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'],
 build_by_default:false)
 
 exe2 = executable('sgml-parser', 'sgml-parser.c',
-meson.source_root()+'/src/dom/configuration.c',
-meson.source_root()+'/src/dom/node.c',
-meson.source_root()+'/src/dom/select.c',
-meson.source_root()+'/src/dom/stack.c',
-meson.source_root()+'/src/dom/scanner.c',
-meson.source_root()+'/src/dom/css/scanner.c',
-meson.source_root()+'/src/dom/sgml/dump.c',
-meson.source_root()+'/src/dom/sgml/parser.c',
-meson.source_root()+'/src/dom/sgml/scanner.c',
-meson.source_root()+'/src/dom/sgml/sgml.c',
+meson.source_root() / 'src/dom/configuration.c',
+meson.source_root() / 'src/dom/node.c',
+meson.source_root() / 'src/dom/select.c',
+meson.source_root() / 'src/dom/stack.c',
+meson.source_root() / 'src/dom/scanner.c',
+meson.source_root() / 'src/dom/css/scanner.c',
+meson.source_root() / 'src/dom/sgml/dump.c',
+meson.source_root() / 'src/dom/sgml/parser.c',
+meson.source_root() / 'src/dom/sgml/scanner.c',
+meson.source_root() / 'src/dom/sgml/sgml.c',
 
-meson.source_root()+'/src/dom/sgml/docbook/docbook.c',
-meson.source_root()+'/src/dom/sgml/html/html.c',
-meson.source_root()+'/src/dom/sgml/rss/rss.c',
-meson.source_root()+'/src/dom/sgml/xbel/xbel.c',
+meson.source_root() / 'src/dom/sgml/docbook/docbook.c',
+meson.source_root() / 'src/dom/sgml/html/html.c',
+meson.source_root() / 'src/dom/sgml/rss/rss.c',
+meson.source_root() / 'src/dom/sgml/xbel/xbel.c',
 testdeps,
 c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'],
 build_by_default:false)
 
-test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
 
 t1 = find_program('test-dom-configuration-basic')
 t2 = find_program('test-sgml-dump-basic')
diff --git a/src/mime/backend/meson.build b/src/mime/backend/meson.build
index fe4e4231..625d8863 100644
--- a/src/mime/backend/meson.build
+++ b/src/mime/backend/meson.build
@@ -11,40 +11,40 @@ endif
 srcs += files('common.c', 'default.c')
 
 if conf_data.get('CONFIG_MAILCAP') and (get_option('test-mailcap') or get_option('test'))
-	mailcap_cache_files = files('common.c', 'mailcap.c', meson.source_root()+'/src/osdep/osdep.c')
+	mailcap_cache_files = files('common.c', 'mailcap.c', meson.source_root() / 'src/osdep/osdep.c')
 
 	if conf_data.get('CONFIG_NLS') and not conf_data.get('CONFIG_GETTEXT')
 		mailcap_cache_files += files(
-		meson.source_root()+'/src/intl/gettext/bindtextdom.c',
-		meson.source_root()+'/src/intl/gettext/dcgettext.c',
-		meson.source_root()+'/src/intl/gettext/dcigettext.c',
-		meson.source_root()+'/src/intl/gettext/dcngettext.c',
-		meson.source_root()+'/src/intl/gettext/dgettext.c',
-		meson.source_root()+'/src/intl/gettext/dngettext.c',
-		meson.source_root()+'/src/intl/gettext/explodename.c',
-		meson.source_root()+'/src/intl/gettext/finddomain.c',
-		meson.source_root()+'/src/intl/gettext/gettext.c',
-		meson.source_root()+'/src/intl/gettext/intl-compat.c',
-		meson.source_root()+'/src/intl/gettext/l10nflist.c',
-		meson.source_root()+'/src/intl/gettext/libintl.c',
-		meson.source_root()+'/src/intl/gettext/loadmsgcat.c',
-		meson.source_root()+'/src/intl/gettext/localcharset.c',
-		meson.source_root()+'/src/intl/gettext/localealias.c',
-		meson.source_root()+'/src/intl/gettext/ngettext.c',
-		meson.source_root()+'/src/intl/gettext/plural.c',
-		meson.source_root()+'/src/intl/gettext/textdomain.c')
+		meson.source_root() / 'src/intl/gettext/bindtextdom.c',
+		meson.source_root() / 'src/intl/gettext/dcgettext.c',
+		meson.source_root() / 'src/intl/gettext/dcigettext.c',
+		meson.source_root() / 'src/intl/gettext/dcngettext.c',
+		meson.source_root() / 'src/intl/gettext/dgettext.c',
+		meson.source_root() / 'src/intl/gettext/dngettext.c',
+		meson.source_root() / 'src/intl/gettext/explodename.c',
+		meson.source_root() / 'src/intl/gettext/finddomain.c',
+		meson.source_root() / 'src/intl/gettext/gettext.c',
+		meson.source_root() / 'src/intl/gettext/intl-compat.c',
+		meson.source_root() / 'src/intl/gettext/l10nflist.c',
+		meson.source_root() / 'src/intl/gettext/libintl.c',
+		meson.source_root() / 'src/intl/gettext/loadmsgcat.c',
+		meson.source_root() / 'src/intl/gettext/localcharset.c',
+		meson.source_root() / 'src/intl/gettext/localealias.c',
+		meson.source_root() / 'src/intl/gettext/ngettext.c',
+		meson.source_root() / 'src/intl/gettext/plural.c',
+		meson.source_root() / 'src/intl/gettext/textdomain.c')
 	endif
 
 	if conf_data.get('CONFIG_NLS') and conf_data.get('CONFIG_GETTEXT')
 		mailcap_cache_files += files(
-		meson.source_root()+'/src/intl/libintl.c',
-		meson.source_root()+'/src/util/env.c')
+		meson.source_root() / 'src/intl/libintl.c',
+		meson.source_root() / 'src/util/env.c')
 	endif
 
 	exe = executable('mailcap-cache', mailcap_cache_files, testdeps,
 	c_args:['-DHAVE_CONFIG_H', '-DTEST_MAILCAP'], include_directories:['.','..','../..','../../..'],
 	build_by_default:false, dependencies:[x11deps])
-	test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+	test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
 	t = find_program('test-mailcap-cache')
 	test('mailcap-cache', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir())
 endif
diff --git a/src/network/ssl/test/meson.build b/src/network/ssl/test/meson.build
index 5fb6df69..f71ab5b2 100644
--- a/src/network/ssl/test/meson.build
+++ b/src/network/ssl/test/meson.build
@@ -1,3 +1,3 @@
-t = executable('match-hostname-test', 'match-hostname-test.c',  meson.source_root()+'/src/network/ssl/match-hostname.c', testdeps, dependencies:[iconvdeps],
+t = executable('match-hostname-test', 'match-hostname-test.c',  meson.source_root() / 'src/network/ssl/match-hostname.c', testdeps, dependencies:[iconvdeps],
 c_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..', '../../..', '../../../..'])
 test('match-hostname-test', t)
diff --git a/src/protocol/ftp/meson.build b/src/protocol/ftp/meson.build
index a273c6db..90af90e9 100644
--- a/src/protocol/ftp/meson.build
+++ b/src/protocol/ftp/meson.build
@@ -1,11 +1,11 @@
 srcs += files('ftp.c')
 
 if get_option('test')
-    exe = executable('ftp-parser', 'ftp-parser.c', meson.source_root()+'/src/protocol/date.c', meson.source_root()+'/src/protocol/ftpparse.c', testdeps, dependencies:[iconvdeps],
+    exe = executable('ftp-parser', 'ftp-parser.c', meson.source_root() / 'src/protocol/date.c', meson.source_root() / 'src/protocol/ftpparse.c', testdeps, dependencies:[iconvdeps],
     c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.','../..','../../..'],
     build_by_default:false)
 
-    test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+    test_lib = environment({'TEST_LIB': meson.source_root() / 'test/libtest.sh'})
     t = find_program('test-ftp-parser')
     test('ftp-parser', t, depends:[exe], env:test_lib, workdir:meson.current_build_dir(), is_parallel:false)
 endif