diff --git a/src/dring/CMakeLists.txt b/src/dring/CMakeLists.txt
index d0badbe31cbd3c4d767728cc3a209e83f05c1e0c..ece134194d047c4f9c0d4b5fa7b59536a3b995ce 100644
--- a/src/dring/CMakeLists.txt
+++ b/src/dring/CMakeLists.txt
@@ -7,6 +7,7 @@ list (APPEND Source_Files__dring
       "${CMAKE_CURRENT_SOURCE_DIR}/callmanager_interface.h"
       "${CMAKE_CURRENT_SOURCE_DIR}/plugin_manager_interface.h"
       "${CMAKE_CURRENT_SOURCE_DIR}/configurationmanager_interface.h"
+      "${CMAKE_CURRENT_SOURCE_DIR}/conversation_interface.h"
       "${CMAKE_CURRENT_SOURCE_DIR}/datatransfer_interface.h"
       "${CMAKE_CURRENT_SOURCE_DIR}/dring.h"
       "${CMAKE_CURRENT_SOURCE_DIR}/media_const.h"
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 3497579e62a81b08d32b716b255edf73509370e5..409b858f0325ad4e6254f481a3c87d507680b669 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -1510,7 +1510,7 @@ IceTransport::send(int comp_id, const unsigned char* buf, size_t len)
         // bytes length).
         std::unique_lock<std::mutex> lk(pimpl_->iceMutex_);
         pimpl_->waitDataCv_.wait(lk, [&] {
-            return pimpl_->lastSentLen_ >= static_cast<pj_ssize_t>(len)
+            return pimpl_->lastSentLen_ >= static_cast<pj_size_t>(len)
                    or pimpl_->destroying_.load();
         });
         pimpl_->lastSentLen_ = 0;
diff --git a/src/jamidht/account_manager.h b/src/jamidht/account_manager.h
index 945f916f428b242ee2145214008d2eed26240d20..6d9bb8df71897b98f3519bfb225b73eae126dbe6 100644
--- a/src/jamidht/account_manager.h
+++ b/src/jamidht/account_manager.h
@@ -31,8 +31,8 @@
 #include <opendht/crypto.h>
 
 #include <functional>
-#include <string>
 #include <map>
+#include <string>
 
 namespace dht {
 class DhtRunner;
diff --git a/src/manager.h b/src/manager.h
index 98ec4686334a3b11c74e11f595d7689821cbbee4..8daf9b722f8cafb1e0a41ad6cbc24f72e7f657ca 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -37,13 +37,14 @@
 #include "audio/audiolayer.h"
 #include "scheduled_executor.h"
 
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
+#include <algorithm>
 #include <atomic>
 #include <functional>
-#include <algorithm>
+#include <map>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
 
 namespace asio {
 class io_context;
diff --git a/src/meson.build b/src/meson.build
index 959cf469ccccb5a202c2a9b90110b31b19543b0f..4a975487ed87838e9d39af89bc38843f814a108b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -314,6 +314,7 @@ if get_option('interfaces').contains('library')
         'dring/callmanager_interface.h',
         'dring/configurationmanager_interface.h',
         'dring/datatransfer_interface.h',
+        'dring/conversation_interface.h',
         'dring/def.h',
         'dring/dring.h',
         'dring/media_const.h',
diff --git a/src/peer_connection.h b/src/peer_connection.h
index d46b6d1c9c00f92655411c5c8a83fa6af3b318cd..d3905154122f44e7324e8d3c0674191470c1aae4 100644
--- a/src/peer_connection.h
+++ b/src/peer_connection.h
@@ -69,7 +69,7 @@ public:
         // Not implemented
     }
 
-    virtual void setOnStateChangedCb(const OnStateChangedCb& cb) {}
+    virtual void setOnStateChangedCb(const OnStateChangedCb&) {}
 };
 
 //==============================================================================