diff --git a/apps/meson.build b/apps/meson.build
index 111457173d8872f60d8c6850dcf292f258f2538e..7ed455b24328a4572a91e1e17c71e68f425191f8 100644
--- a/apps/meson.build
+++ b/apps/meson.build
@@ -1,13 +1,11 @@
 fib_exe = executable(
   'fib',
   'Main.cpp',
-  include_directories: emper_all_include,
-  link_with: [emper],
+  dependencies: emper_dep,
 )
 
 worker_sleep_example_exe = executable(
   'worker_sleep_example',
   'WorkerSleepExample.cpp',
-  include_directories: emper_all_include,
-  link_with: [emper],
+  dependencies: emper_dep,
 )
diff --git a/emper/meson.build b/emper/meson.build
index f73891a7543d0266bdeea336542a7a009957264d..a175f3b775a87d7375ab61d560b8eaf661bb8904 100644
--- a/emper/meson.build
+++ b/emper/meson.build
@@ -71,3 +71,8 @@ emper_c_dep = declare_dependency(
   include_directories : emper_all_include,
   link_with : emper_c
 )
+
+emper_full_dep = [
+  emper_dep,
+  emper_c_dep,
+]
diff --git a/tests/meson.build b/tests/meson.build
index c88ddd489d466c0bcbab989eab10c8965829903b..b6cbcd961506dad9d8de01db2f39d9cd584123a5 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -64,9 +64,9 @@ foreach source, test_dict : tests
   # The test_name is the name of the source file without the file suffix.
   test_name = source.split('.')[0]
 
-  test_dep = [thread_dep]
+  test_deps = [thread_dep]
   if test_dict.has_key('dependencies')
-  	test_dep += test_dict['dependencies']
+  	test_deps += test_dict['dependencies']
   endif
 
   test_exe = executable(test_name,
@@ -74,8 +74,7 @@ foreach source, test_dict : tests
 						include_directories: emper_all_include,
 						c_args: undef_ndebug,
 						cpp_args: undef_ndebug,
-						dependencies: emper_dependencies + test_dep,
-						link_with: [emper, emper_c],
+						dependencies: [emper_full_dep] + test_deps,
 					   )
 
   test(test_name,