diff --git a/libuavcan/test/transport/dispatcher.cpp b/libuavcan/test/transport/dispatcher.cpp
index 1261b3ac92..3c1869e252 100644
--- a/libuavcan/test/transport/dispatcher.cpp
+++ b/libuavcan/test/transport/dispatcher.cpp
@@ -29,18 +29,6 @@ public:
 };
 
 
-static uavcan::DataTypeDescriptor makeDataType(uavcan::DataTypeKind kind, uint16_t id)
-{
-    uavcan::DataTypeDescriptor dtd(kind, id, uavcan::DataTypeHash());
-    for (int i = 0; i < uavcan::DataTypeHash::NUM_BYTES; i += 2)
-    {
-        dtd.hash.value[i] = id & 0xFF;
-        dtd.hash.value[i + 1] = id >> 8;
-    }
-    return dtd;
-}
-
-
 static const uavcan::NodeID SELF_NODE_ID(64);
 
 
diff --git a/libuavcan/test/transport/transfer_test_helpers.hpp b/libuavcan/test/transport/transfer_test_helpers.hpp
index 8a854d8dad..ce9288dbc7 100644
--- a/libuavcan/test/transport/transfer_test_helpers.hpp
+++ b/libuavcan/test/transport/transfer_test_helpers.hpp
@@ -209,6 +209,17 @@ std::vector<uavcan::RxFrame> serializeTransfer(const Transfer& transfer)
     return output;
 }
 
+uavcan::DataTypeDescriptor makeDataType(uavcan::DataTypeKind kind, uint16_t id)
+{
+    uavcan::DataTypeDescriptor dtd(kind, id, uavcan::DataTypeHash());
+    for (int i = 0; i < uavcan::DataTypeHash::NUM_BYTES; i += 2)
+    {
+        dtd.hash.value[i] = id & 0xFF;
+        dtd.hash.value[i + 1] = id >> 8;
+    }
+    return dtd;
+}
+
 }
 
 
@@ -272,4 +283,3 @@ public:
 
     template <int SIZE> void send(const Transfer (&transfers)[SIZE]) { send(transfers, SIZE); }
 };
-