diff --git a/bin/dbus/dbuscallmanager.cpp b/bin/dbus/dbuscallmanager.cpp
index 78af29c7d9c53248cb6e7cf1740a25238ab90408..2501a9391ef877ce24bbaf8c6c4d0b3e12fd6979 100644
--- a/bin/dbus/dbuscallmanager.cpp
+++ b/bin/dbus/dbuscallmanager.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "dbuscallmanager.h"
-#include "jami/callmanager_interface.h"
+#include "callmanager_interface.h"
 
 DBusCallManager::DBusCallManager(DBus::Connection& connection)
     : DBus::ObjectAdaptor(connection, "/cx/ring/Ring/CallManager")
@@ -400,4 +400,4 @@ DBusCallManager::raiseParticipantHand(const std::string& accountId,
                                       const bool& state)
 {
     DRing::raiseParticipantHand(accountId, confId, peerId, state);
-}
\ No newline at end of file
+}
diff --git a/bin/dbus/dbuscallmanager.h b/bin/dbus/dbuscallmanager.h
index 8ed03425cf37e864be51d4a8958bfc0b9bb319d9..76aaaa405916e96aa53a70ee3fb0d76f470d48fc 100644
--- a/bin/dbus/dbuscallmanager.h
+++ b/bin/dbus/dbuscallmanager.h
@@ -25,7 +25,7 @@
 #include <map>
 #include <string>
 
-#include "jami/def.h"
+#include "def.h"
 #include "dbus_cpp.h"
 
 #if __GNUC__ >= 5 || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/dbusclient.h b/bin/dbus/dbusclient.h
index e8f0e23368cf81aca2549d64234ff260a714ac94..db69873c3a49329eba5782e7bb42458f0d9161d5 100644
--- a/bin/dbus/dbusclient.h
+++ b/bin/dbus/dbusclient.h
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include "jami/def.h"
+#include "def.h"
 #include <memory>
 
 class DBusConfigurationManager;
diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h
index d1d4e99efaeb96fad767898ef5413c4fe242079b..4cda8959413645868e4a4c7c51f1b4c222fd721b 100644
--- a/bin/dbus/dbusconfigurationmanager.h
+++ b/bin/dbus/dbusconfigurationmanager.h
@@ -29,10 +29,10 @@
 #include <map>
 #include <string>
 
-#include "jami/def.h"
+#include "def.h"
 #include "dbus_cpp.h"
 
-#include "jami/datatransfer_interface.h"
+#include "datatransfer_interface.h"
 
 #if __GNUC__ >= 5 || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
 /* This warning option only exists for gcc 4.6.0 and greater. */
diff --git a/bin/dbus/dbusinstance.cpp b/bin/dbus/dbusinstance.cpp
index f9fb721bceb791c6054a5ba484cf0dbecdf38a80..c7a4d9849a82cc9f25aaf94b705be1d3e6c1f395 100644
--- a/bin/dbus/dbusinstance.cpp
+++ b/bin/dbus/dbusinstance.cpp
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
-#include "compiler_intrinsics.h"
+
 #include "dbusinstance.h"
 
 DBusInstance::DBusInstance(DBus::Connection& connection,
@@ -28,15 +28,15 @@ DBusInstance::DBusInstance(DBus::Connection& connection,
 {}
 
 void
-DBusInstance::Register(const int32_t& pid UNUSED,
-                       const std::string& name UNUSED)
+DBusInstance::Register(const int32_t& /*pid*/,
+                       const std::string& /*name*/)
 {
     ++count_;
 }
 
 
 void
-DBusInstance::Unregister(const int32_t& pid UNUSED)
+DBusInstance::Unregister(const int32_t& /*pid*/)
 {
     --count_;
 
diff --git a/bin/dbus/dbusinstance.h b/bin/dbus/dbusinstance.h
index bc2b2447dd73b629e9e9ad2dd6f61275db43d787..73457af0dd5483fab1a8a1b7a7aa2ad4e4017dc8 100644
--- a/bin/dbus/dbusinstance.h
+++ b/bin/dbus/dbusinstance.h
@@ -21,7 +21,7 @@
 #ifndef __RING_DBUSINSTANCE_H__
 #define __RING_DBUSINSTANCE_H__
 
-#include "jami/def.h"
+#include "def.h"
 
 #include <functional>
 
diff --git a/bin/dbus/dbuspluginmanagerinterface.cpp b/bin/dbus/dbuspluginmanagerinterface.cpp
index 16325470d8e0efa6e814af597b5d829c977230f0..46371c8c5c18330b3ed3159e464e49125f96ae86 100644
--- a/bin/dbus/dbuspluginmanagerinterface.cpp
+++ b/bin/dbus/dbuspluginmanagerinterface.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "dbuspluginmanagerinterface.h"
-#include "jami/plugin_manager_interface.h"
+#include "plugin_manager_interface.h"
 
 DBusPluginManagerInterface::DBusPluginManagerInterface(DBus::Connection& connection)
     : DBus::ObjectAdaptor(connection, "/cx/ring/Ring/PluginManagerInterface")
diff --git a/bin/dbus/dbuspluginmanagerinterface.h b/bin/dbus/dbuspluginmanagerinterface.h
index ec2864b1183b16383b7cae23f3f03434823d5647..9b3855ad1acf50646d6c7c8d4511d73112ef0d24 100644
--- a/bin/dbus/dbuspluginmanagerinterface.h
+++ b/bin/dbus/dbuspluginmanagerinterface.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <string>
 
-#include "jami/def.h"
+#include "def.h"
 #include "dbus_cpp.h"
 
 #if __GNUC__ >= 5 || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/dbuspresencemanager.h b/bin/dbus/dbuspresencemanager.h
index 41fb34ff133a497c2c084d2a981e4f57985d6f86..1f1a257f5df71f32f6a4f36709cd754356405863 100644
--- a/bin/dbus/dbuspresencemanager.h
+++ b/bin/dbus/dbuspresencemanager.h
@@ -25,7 +25,7 @@
 #include <map>
 #include <string>
 
-#include "jami/def.h"
+#include "def.h"
 #include "dbus_cpp.h"
 
 #if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/dbusvideomanager.cpp b/bin/dbus/dbusvideomanager.cpp
index aa440ee8d82906a04b5718dde3c29f667e18647c..9000793133a465afe6188603b48f5877c6ea1adc 100644
--- a/bin/dbus/dbusvideomanager.cpp
+++ b/bin/dbus/dbusvideomanager.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "dbusvideomanager.h"
-#include "jami/videomanager_interface.h"
+#include "videomanager_interface.h"
 
 DBusVideoManager::DBusVideoManager(DBus::Connection& connection)
     : DBus::ObjectAdaptor(connection, "/cx/ring/Ring/VideoManager")
diff --git a/bin/dbus/dbusvideomanager.h b/bin/dbus/dbusvideomanager.h
index 664a2f46683d083d48ad83d0e0e389fedc97ddad..c082f089b057e6ea8c461fde903946f15d063fd1 100644
--- a/bin/dbus/dbusvideomanager.h
+++ b/bin/dbus/dbusvideomanager.h
@@ -23,7 +23,7 @@
 #include <map>
 #include <string>
 
-#include "jami/def.h"
+#include "def.h"
 #include "dbus_cpp.h"
 
 #if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/main.cpp b/bin/dbus/main.cpp
index 5625ca10a571a519f013c3b676006b06026971b4..d0e2f55b6767279975d5163817b938157a11933d 100644
--- a/bin/dbus/main.cpp
+++ b/bin/dbus/main.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "dbusclient.h"
-#include "jami/jami.h"
+#include "jami.h"
 
 #include <signal.h>
 #include <getopt.h>
diff --git a/bin/dbus/meson.build b/bin/dbus/meson.build
index 24b77b1a05884f85cdaaba52772a0a7c5e776993..bb3120fef7f01fe1e327859863b3f88a2e8bc1d0 100644
--- a/bin/dbus/meson.build
+++ b/bin/dbus/meson.build
@@ -1,7 +1,5 @@
 jamid_includedirs = include_directories(
-    '../..',
-    '../../src',
-    '../../src/jami'
+    '../..'
 )
 
 jamid_sources = files(
@@ -44,10 +42,7 @@ if conf.get('ENABLE_VIDEO')
         input: 'cx.ring.Ring.VideoManager.xml',
         output: 'dbusvideomanager.adaptor.h'
     )
-
-    jamid_sources += files(
-        'dbusvideomanager.cpp'
-    )
+    jamid_sources += files('dbusvideomanager.cpp')
 endif
 
 if conf.get('ENABLE_PLUGIN')
@@ -56,10 +51,7 @@ if conf.get('ENABLE_PLUGIN')
         input: 'cx.ring.Ring.PluginManagerInterface.xml',
         output: 'dbuspluginmanagerinterface.adaptor.h'
     )
-
-    jamid_sources += files(
-        'dbuspluginmanagerinterface.cpp'
-    )
+    jamid_sources += files('dbuspluginmanagerinterface.cpp')
 endif
 
 if progpod2man.found()
@@ -76,8 +68,7 @@ jamid = executable('jamid',
     jamid_targets,
     include_directories: jamid_includedirs,
     sources: jamid_sources,
-    dependencies: depdbuscpp,
-    link_with: libjami,
+    dependencies: [depdbuscpp, depjami],
     install: true,
     install_dir: get_option('libdir')
 )
diff --git a/bin/main.cpp b/bin/main.cpp
index 1af1122316b62cb88b7421a3219fa9901a428d44..761b4b8acf71e3eec893293c753210b6ca8bbfa9 100644
--- a/bin/main.cpp
+++ b/bin/main.cpp
@@ -21,9 +21,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
  */
 
-#include "jami/jami.h"
-
-#include "logger.h"
+#include "jami.h"
 
 #if REST_API
 #include "restcpp/restclient.h"