diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp
index 94630c1f06..795bbae43f 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2015 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_INTERNAL_ALLOCATION_REQUEST_MANAGER_HPP_INCLUDED
-#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_INTERNAL_ALLOCATION_REQUEST_MANAGER_HPP_INCLUDED
+#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_ALLOCATION_REQUEST_MANAGER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_ALLOCATION_REQUEST_MANAGER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/debug.hpp>
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp
index 26c937db50..09870d9192 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2015 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_INTERNAL_STORAGE_MARSHALLER_HPP_INCLUDED
-#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_INTERNAL_STORAGE_MARSHALLER_HPP_INCLUDED
+#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_STORAGE_MARSHALLER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_STORAGE_MARSHALLER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/debug.hpp>
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/types.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/types.hpp
index 8ae2b6e9f6..360a93aee6 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/types.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/types.hpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2015 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_INTERNAL_TYPES_HPP_INCLUDED
-#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_INTERNAL_TYPES_HPP_INCLUDED
+#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_TYPES_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_TYPES_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 // UAVCAN types