diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
index d829d293e0..20f957b3e7 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
@@ -149,14 +149,6 @@ public:
         , last_index_(0)
     { }
 
-    /**
-     * Initialization is performed as follows (every step may fail and return an error):
-     *  1. Log is restored or initialized.
-     *  2. Current term is restored. If there was no current term stored and the log is empty, it will be initialized
-     *     with zero.
-     *  3. VotedFor value is restored. If there was no VotedFor value stored, the log is empty, and the current term is
-     *     zero, the value will be initialized with zero.
-     */
     int init()
     {
         StorageMarshaller io(storage_);
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
index 91869679c1..0152b1851e 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
@@ -42,6 +42,14 @@ public:
         , log_(storage, tracer)
     { }
 
+    /**
+     * Initialization is performed as follows (every step may fail and return an error):
+     *  1. Log is restored or initialized.
+     *  2. Current term is restored. If there was no current term stored and the log is empty, it will be initialized
+     *     with zero.
+     *  3. VotedFor value is restored. If there was no VotedFor value stored, the log is empty, and the current term is
+     *     zero, the value will be initialized with zero.
+     */
     int init()
     {
         /*
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
index 5fd35bb50a..98ed66eec5 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
@@ -7,7 +7,6 @@
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/debug.hpp>
-#include <uavcan/node/timer.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp>