diff --git a/emper/include/meson.build b/emper/include/meson.build
index 94d02a3a3f9e8c5865a8eba1694e59f8bc99efc2..931518432a3733fde23d8047e5709e0a59781e24 100644
--- a/emper/include/meson.build
+++ b/emper/include/meson.build
@@ -3,6 +3,6 @@ emper_include = include_directories('.')
 emper_version_h = custom_target(
   'emper-version.h',
   output: 'emper-version.h',
-  command: ['@SOURCE_DIR@/scripts/versionManager.sh', 'check', meson.project_version()]
+  command: ['@CURRENT_SOURCE_DIR@/../../scripts/versionManager.sh', 'check', meson.project_version()]
 )
 emper_generated_files += emper_version_h
diff --git a/emper/meson.build b/emper/meson.build
index 241dc029c57eb75d445def9d180b5b721ed0b288..cea4820079a59198e76e0301554309aae4426e07 100644
--- a/emper/meson.build
+++ b/emper/meson.build
@@ -45,6 +45,11 @@ emper = library(
   install: true,
 )
 
+emper_dep = declare_dependency(
+  include_directories : emper_all_include,
+  link_with : emper
+)
+
 
 emper_c_sources = [
   'c_emper.cpp',
@@ -57,3 +62,8 @@ emper_c = library(
   link_with: emper,
   install: true,
 )
+
+emper_c_dep = declare_dependency(
+  include_directories : emper_all_include,
+  link_with : emper_c
+)
diff --git a/meson.build b/meson.build
index 292ff97afa4889445416683e9b89308e79f9167f..d6ae18a8fc9364ebce13dda101b3118c0dfde569 100644
--- a/meson.build
+++ b/meson.build
@@ -9,7 +9,7 @@ project('EMPER', 'c', 'cpp',
 		])
 
 # TODO: Re-enable that warning.
-add_global_arguments('-Wno-non-virtual-dtor', language: 'cpp')
+add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
 
 thread_dep = dependency('threads')
 emper_dependencies = [thread_dep]