diff --git a/libuavcan/include/uavcan/marshal/array.hpp b/libuavcan/include/uavcan/marshal/array.hpp
index b5de6026b7..fd2bb3f106 100644
--- a/libuavcan/include/uavcan/marshal/array.hpp
+++ b/libuavcan/include/uavcan/marshal/array.hpp
@@ -769,7 +769,7 @@ public:
         if (src_row_major.size() == MaxSize)
         {
 #if UAVCAN_CPP_VERSION > UAVCAN_CPP03
-            typedef typename std::remove_reference<decltype(*src_row_major.begin())>::type RhsValueType;
+            typedef typename RemoveReference<decltype(*src_row_major.begin())>::Type RhsValueType;
             packSquareMatrixImpl<RhsValueType>(src_row_major.begin());
 #else
             packSquareMatrixImpl<typename R::value_type>(src_row_major.begin());
@@ -830,7 +830,7 @@ public:
         if (dst_row_major.size() == MaxSize)
         {
 #if UAVCAN_CPP_VERSION > UAVCAN_CPP03
-            typedef typename std::remove_reference<decltype(*dst_row_major.begin())>::type RhsValueType;
+            typedef typename RemoveReference<decltype(*dst_row_major.begin())>::Type RhsValueType;
             unpackSquareMatrixImpl<RhsValueType>(dst_row_major.begin());
 #else
             unpackSquareMatrixImpl<typename R::value_type>(dst_row_major.begin());
diff --git a/libuavcan/include/uavcan/util/templates.hpp b/libuavcan/include/uavcan/util/templates.hpp
index 6388e2ca66..e739873ec7 100644
--- a/libuavcan/include/uavcan/util/templates.hpp
+++ b/libuavcan/include/uavcan/util/templates.hpp
@@ -90,6 +90,15 @@ struct UAVCAN_EXPORT Select<false, TrueType, FalseType>
     typedef FalseType Result;
 };
 
+/**
+ * Remove reference as in <type_traits>
+ */
+template <class T> struct RemoveReference      { typedef T Type; };
+template <class T> struct RemoveReference<T&>  { typedef T Type; };
+#if UAVCAN_CPP_VERSION > UAVCAN_CPP03
+template <class T> struct RemoveReference<T&&> { typedef T Type; };
+#endif
+
 /**
  * Value types
  */