diff --git a/libuavcan/include/uavcan/internal/marshalling/cast_mode.hpp b/libuavcan/include/uavcan/internal/marshalling/cast_mode.hpp
deleted file mode 100644
index dc70a31249..0000000000
--- a/libuavcan/include/uavcan/internal/marshalling/cast_mode.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
- */
-
-#pragma once
-
-namespace uavcan
-{
-
-enum CastMode { CastModeSaturate, CastModeTruncate };
-
-}
diff --git a/libuavcan/include/uavcan/internal/marshalling/float_spec.hpp b/libuavcan/include/uavcan/internal/marshalling/float_spec.hpp
index cdbc151897..9d7f4f13b3 100644
--- a/libuavcan/include/uavcan/internal/marshalling/float_spec.hpp
+++ b/libuavcan/include/uavcan/internal/marshalling/float_spec.hpp
@@ -8,7 +8,7 @@
 #include <limits>
 #include <math.h>            // Needed for isfinite
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/cast_mode.hpp>
+#include <uavcan/internal/marshalling/type_util.hpp>
 #include <uavcan/internal/marshalling/integer_spec.hpp>
 
 namespace uavcan
diff --git a/libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp b/libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp
index e8eef7be6c..3aecd0edf1 100644
--- a/libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp
+++ b/libuavcan/include/uavcan/internal/marshalling/integer_spec.hpp
@@ -8,7 +8,7 @@
 #include <limits>
 #include <uavcan/internal/util.hpp>
 #include <uavcan/internal/marshalling/scalar_codec.hpp>
-#include <uavcan/internal/marshalling/cast_mode.hpp>
+#include <uavcan/internal/marshalling/type_util.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/static_array.hpp b/libuavcan/include/uavcan/internal/marshalling/static_array.hpp
index ba5e5b31cf..a1043b8e9a 100644
--- a/libuavcan/include/uavcan/internal/marshalling/static_array.hpp
+++ b/libuavcan/include/uavcan/internal/marshalling/static_array.hpp
@@ -9,7 +9,7 @@
 #include <stdexcept>
 #include <uavcan/internal/impl_constants.hpp>
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshalling/type_util.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/internal/marshalling/type_util.hpp b/libuavcan/include/uavcan/internal/marshalling/type_util.hpp
new file mode 100644
index 0000000000..5d6d2d2a12
--- /dev/null
+++ b/libuavcan/include/uavcan/internal/marshalling/type_util.hpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#pragma once
+
+#include <uavcan/internal/util.hpp>
+
+namespace uavcan
+{
+
+enum CastMode { CastModeSaturate, CastModeTruncate };
+
+
+template <typename T, typename Enable = void>
+struct StorageTypeImpl { typedef T Type; };
+
+template <typename T>
+struct StorageTypeImpl<T, typename EnableIfType<typename T::StorageType>::Type>
+{
+    typedef typename T::StorageType Type;
+};
+
+template <typename T>
+class StorageType : public T
+{
+    StorageType();
+public:
+    typedef typename StorageTypeImpl<T>::Type Type;
+};
+
+}
diff --git a/libuavcan/include/uavcan/internal/marshalling/types.hpp b/libuavcan/include/uavcan/internal/marshalling/types.hpp
index 5f2f280811..207323ab8a 100644
--- a/libuavcan/include/uavcan/internal/marshalling/types.hpp
+++ b/libuavcan/include/uavcan/internal/marshalling/types.hpp
@@ -4,28 +4,7 @@
 
 #pragma once
 
-#include <uavcan/internal/util.hpp>
 #include <uavcan/internal/marshalling/integer_spec.hpp>
 #include <uavcan/internal/marshalling/float_spec.hpp>
-
-namespace uavcan
-{
-
-template <typename T, typename Enable = void>
-struct StorageTypeImpl { typedef T Type; };
-
-template <typename T>
-struct StorageTypeImpl<T, typename EnableIfType<typename T::StorageType>::Type>
-{
-    typedef typename T::StorageType Type;
-};
-
-template <typename T>
-class StorageType : public T
-{
-    StorageType();
-public:
-    typedef typename StorageTypeImpl<T>::Type Type;
-};
-
-}
+#include <uavcan/internal/marshalling/static_array.hpp>
+#include <uavcan/internal/marshalling/type_util.hpp>
diff --git a/libuavcan/test/marshalling/float_spec.cpp b/libuavcan/test/marshalling/float_spec.cpp
index 1cd1eba23c..48d4c8d3d3 100644
--- a/libuavcan/test/marshalling/float_spec.cpp
+++ b/libuavcan/test/marshalling/float_spec.cpp
@@ -3,7 +3,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/float_spec.hpp>
 #include <uavcan/internal/marshalling/types.hpp>
 
 
diff --git a/libuavcan/test/marshalling/integer_spec.cpp b/libuavcan/test/marshalling/integer_spec.cpp
index cd63e2ffc9..732d7dfee1 100644
--- a/libuavcan/test/marshalling/integer_spec.cpp
+++ b/libuavcan/test/marshalling/integer_spec.cpp
@@ -3,7 +3,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/integer_spec.hpp>
 #include <uavcan/internal/marshalling/types.hpp>
 
 
diff --git a/libuavcan/test/marshalling/static_array.cpp b/libuavcan/test/marshalling/static_array.cpp
index 4c5dad3d57..7cf6beb06a 100644
--- a/libuavcan/test/marshalling/static_array.cpp
+++ b/libuavcan/test/marshalling/static_array.cpp
@@ -3,9 +3,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/static_array.hpp>
-#include <uavcan/internal/marshalling/integer_spec.hpp>
-#include <uavcan/internal/marshalling/float_spec.hpp>
 #include <uavcan/internal/marshalling/types.hpp>