diff --git a/daemon/src/audio/audioloop.cpp b/daemon/src/audio/audioloop.cpp
index 857259f42146640c7c97f2379c0687010c35a898..46d29c28cd659def3a0f910d13df7b33bf3688aa 100644
--- a/daemon/src/audio/audioloop.cpp
+++ b/daemon/src/audio/audioloop.cpp
@@ -34,7 +34,7 @@
 
 #include "audioloop.h"
 #include "manager.h"
-#include "client/dbus/callmanager.h"
+#include "client/callmanager.h"
 #include <cmath>
 #include <numeric>
 #include <cstring>
diff --git a/daemon/src/audio/audiortp/zrtp_session_callback.cpp b/daemon/src/audio/audiortp/zrtp_session_callback.cpp
index b2c502a5f3496a4a0f2b2aed8f91e2b7f7c8cf31..4106c7401d25c5935336d61a4ae20f45100b1614 100644
--- a/daemon/src/audio/audiortp/zrtp_session_callback.cpp
+++ b/daemon/src/audio/audiortp/zrtp_session_callback.cpp
@@ -31,7 +31,7 @@
 #include "logger.h"
 #include "sip/sipcall.h"
 #include "client/client.h"
-#include "client/dbus/callmanager.h"
+#include "client/callmanager.h"
 #include "manager.h"
 
 #include <cstdlib>
diff --git a/daemon/src/client/dbus/callmanager.h b/daemon/src/client/callmanager.h
similarity index 94%
rename from daemon/src/client/dbus/callmanager.h
rename to daemon/src/client/callmanager.h
index e99a72b6b0faa45d2ad97122b443c372ef454311..4f47ebfc58c12aad1fbf0a713974be044acbf9e2 100644
--- a/daemon/src/client/dbus/callmanager.h
+++ b/daemon/src/client/callmanager.h
@@ -31,7 +31,14 @@
 #ifndef __SFL_CALLMANAGER_H__
 #define __SFL_CALLMANAGER_H__
 
-#include "dbus_cpp.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if HAVE_DBUS
+
+#include "dbus/dbus_cpp.h"
+
 #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
 /* This warning option only exists for gcc 4.6.0 and greater. */
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -39,7 +46,7 @@
 
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#include "callmanager-glue.h"
+#include "dbus/callmanager-glue.h"
 #pragma GCC diagnostic warning "-Wignored-qualifiers"
 #pragma GCC diagnostic warning "-Wunused-parameter"
 
@@ -48,25 +55,34 @@
 #pragma GCC diagnostic warning "-Wunused-but-set-variable"
 #endif
 
+#endif  // HAVE_DBUS
+
 #include <stdexcept>
 
 class CallManagerException: public std::runtime_error {
     public:
-        CallManagerException(const std::string& str="") :
+        CallManagerException(const std::string& str = "") :
             std::runtime_error("A CallManagerException occured: " + str) {}
 };
 
 namespace sfl {
-    class AudioZrtpSession;
+class AudioZrtpSession;
 }
 
 class CallManager
+#if HAVE_DBUS
     : public org::sflphone::SFLphone::CallManager_adaptor,
   public DBus::IntrospectableAdaptor,
-      public DBus::ObjectAdaptor {
+  public DBus::ObjectAdaptor
+#endif
+{
     public:
 
+#if HAVE_DBUS
         CallManager(DBus::Connection& connection);
+#else
+        CallManager();
+#endif
 
         /* methods exported by this interface,
          * you will have to implement them in your ObjectAdaptor
diff --git a/daemon/src/client/dbus/Makefile.am b/daemon/src/client/dbus/Makefile.am
index 3fb1b4f646ce90229d30437fb4cb3da78c778c10..2064c9ae4718858b9c75b0b7f03ea8aed0391d4b 100644
--- a/daemon/src/client/dbus/Makefile.am
+++ b/daemon/src/client/dbus/Makefile.am
@@ -49,7 +49,7 @@ libclient_la_CXXFLAGS = -I../ \
 
 
 noinst_HEADERS =            \
-    callmanager.h           \
+    ../callmanager.h        \
     configurationmanager.h  \
     instance.h              \
     ../client.h             \
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index d73d389b120ad639845e5e0a402dfd2428487052..bf674db4b5ec8ba655d7ae7fbd656f5bde4271fa 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -71,7 +71,7 @@
 
 #ifndef __ANDROID__
 #include "client/dbus/configurationmanager.h"
-#include "client/dbus/callmanager.h"
+#include "client/callmanager.h"
 #else
 #include "client/android/configurationmanager.h"
 #include "client/android/callmanager.h"
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index 8cf53ae4d70f767466e4bd533b5622b783ebb787..8694bcab5cbd2bcdbece9b318b7ba12c3b5da79a 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -73,7 +73,7 @@
 #include "client/android/callmanager.h"
 #else
 #include "client/client.h"
-#include "client/dbus/callmanager.h"
+#include "client/callmanager.h"
 #include "client/dbus/configurationmanager.h"
 #endif