diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed.hpp
new file mode 100644
index 0000000000..eef49ccba1
--- /dev/null
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed.hpp
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2015 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_HPP_INCLUDED
+
+#include <uavcan/protocol/dynamic_node_id_server/distributed/server.hpp>
+
+#endif // UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_HPP_INCLUDED
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
index b5e6ed6068..38563e87be 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 #include <memory>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/server.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/distributed.hpp>
 #include <uavcan/protocol/dynamic_node_id_client.hpp>
 #include "event_tracer.hpp"
 #include "../../helpers.hpp"