diff --git a/plugins/dummy/meson.build b/plugins/dummy/meson.build
index f5c4761..10c4482 100644
--- a/plugins/dummy/meson.build
+++ b/plugins/dummy/meson.build
@@ -51,6 +51,7 @@ calls_dummy = shared_module(
   dummy_sources,
   dependencies: dummy_deps,
   include_directories: src_include,
+  link_with: libcalls,
   install: true,
   install_dir: dummy_install_dir
 )
diff --git a/plugins/mm/meson.build b/plugins/mm/meson.build
index 0f64ebe..843dbce 100644
--- a/plugins/mm/meson.build
+++ b/plugins/mm/meson.build
@@ -51,6 +51,7 @@ calls_mm = shared_module(
   mm_sources,
   dependencies: mm_deps,
   include_directories: src_include,
+  link_with: libcalls,
   install: true,
   install_dir: mm_install_dir
 )
diff --git a/plugins/ofono/meson.build b/plugins/ofono/meson.build
index 714979b..2a85ba3 100644
--- a/plugins/ofono/meson.build
+++ b/plugins/ofono/meson.build
@@ -54,7 +54,7 @@ calls_ofono = shared_module(
     src_include,
     include_directories('.')
   ],
-  link_with: gdbofono_lib,
+  link_with: [gdbofono_lib, libcalls],
   install: true,
   install_dir: ofono_install_dir
 )
diff --git a/plugins/sip/meson.build b/plugins/sip/meson.build
index a4095bf..722cdef 100644
--- a/plugins/sip/meson.build
+++ b/plugins/sip/meson.build
@@ -69,6 +69,7 @@ calls_sip = shared_module(
   sip_sources,
   dependencies: sip_deps,
   include_directories: src_include,
+  link_with: libcalls,
   install: true,
   install_dir: sip_install_dir
 )
diff --git a/src/meson.build b/src/meson.build
index 257c368..cc21f61 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -131,13 +131,22 @@ version_h = vcs_tag(
 
 calls_sources += [ version_h ]
 
+libcalls = static_library(
+  'calls', calls_sources,
+  install: false,
+  dependencies : calls_deps,
+  link_with: calls_vala,
+  include_directories: src_include,
+)
+
 executable (
   'gnome-calls',
-  calls_sources, 'main.c',
+  calls_resources,
+  'main.c',
   dependencies : calls_deps,
   export_dynamic : true,
   include_directories : calls_includes,
   install : true,
-  link_with : calls_vala,
+  link_with : [calls_vala, libcalls],
   c_args : '-Wno-error=deprecated-declarations',
 )
diff --git a/tests/meson.build b/tests/meson.build
index eb66869..f2dbdca 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,11 +45,10 @@ foreach test : tests
                     'common.h' ]
 
   t = executable(name, test_sources,
-                 calls_sources,
                  dummy_sources,
                  c_args : test_cflags,
                  link_args: test_link_args,
-                 link_with : calls_vala,
+                 link_with : [calls_vala, libcalls],
                  dependencies: calls_deps,
                  include_directories : [
                    calls_includes,
@@ -62,10 +61,9 @@ endforeach
 test_sources = [ 'test-manager.c' ]
 
 t = executable('manager', test_sources,
-                 calls_sources,
                  c_args : test_cflags,
                  link_args: test_link_args,
-                 link_with : calls_vala,
+                 link_with : [calls_vala, libcalls],
                  dependencies: calls_deps,
                  include_directories : [
                    calls_includes
@@ -79,7 +77,7 @@ t = executable('plugins', test_sources,
                  calls_sources,
                  c_args : test_cflags,
                  link_args: test_link_args,
-                 link_with : calls_vala,
+                 link_with : [calls_vala, libcalls],
                  dependencies: calls_deps,
                  include_directories : [
                    calls_includes
@@ -89,10 +87,9 @@ test('plugins', t, env: test_env)
 
 test_sources = [ 'test-sip.c' ]
 t = executable('sip', test_sources,
-               calls_sources,
                c_args : test_cflags,
                link_args: test_link_args,
-               link_with : [calls_vala, calls_sip],
+               link_with : [calls_vala, calls_sip, libcalls],
                dependencies: [calls_deps, sip_deps],
                include_directories : [
                    calls_includes,
@@ -103,10 +100,9 @@ test('sip', t, env: test_env)
 
 test_sources = [ 'test-account.c' ]
 t = executable('account', test_sources,
-               calls_sources,
                c_args : test_cflags,
                link_args: test_link_args,
-               link_with : [calls_vala, calls_sip],
+               link_with : [calls_vala, calls_sip, libcalls],
                dependencies: [calls_deps, sip_deps],
                include_directories : [
                    calls_includes,