diff --git a/cmdopt.cpp b/cmdopt.cpp
index 968bdc7f..5ab3d2d2 100644
--- a/cmdopt.cpp
+++ b/cmdopt.cpp
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <sstream>
 
 using util::cmdopt::option::base;
 using util::cmdopt::option::bytes;
@@ -77,53 +76,6 @@ base::name (void) const
 
 
 ///////////////////////////////////////////////////////////////////////////////
-template <typename T>
-value<T>::value (std::string _name, T &_data):
-    base (_name),
-    m_data (_data)
-{ ; }
-
-
-//-----------------------------------------------------------------------------
-template <typename T>
-void
-value<T>::execute (const char *restrict str)
-{
-    try {
-        std::istringstream os (str);
-        os.exceptions (
-              std::istringstream::failbit
-            | std::istringstream::badbit
-        );
-        os >> m_data;
-
-        if (!os.eof ())
-            throw invalid_value (__func__);
-    } catch (...) {
-        throw invalid_value (__func__);
-    }
-}
-
-
-//-----------------------------------------------------------------------------
-template <typename T>
-T
-value<T>::data (void) const
-{
-    return m_data;
-}
-
-
-//-----------------------------------------------------------------------------
-template <typename T>
-T&
-value<T>::data (void)
-{
-    return m_data;
-}
-
-
-//-----------------------------------------------------------------------------
 namespace util { namespace cmdopt { namespace option {
     template class value<uint16_t>;
     template class value<uint32_t>;
diff --git a/cmdopt.ipp b/cmdopt.ipp
index 8b17c131..8a041c28 100644
--- a/cmdopt.ipp
+++ b/cmdopt.ipp
@@ -19,7 +19,57 @@
 #endif
 #define __UTIL_CMDLINE_IPP
 
+#include <sstream>
+
 namespace util { namespace cmdopt {
+    ///////////////////////////////////////////////////////////////////////////
+    template <typename T>
+    option::value<T>::value (std::string _name, T &_data):
+        base (std::move (_name)),
+        m_data (_data)
+    { ; }
+
+
+    //-------------------------------------------------------------------------
+    template <typename T>
+    void
+    option::value<T>::execute (const char *restrict str)
+    {
+        try {
+            std::istringstream os (str);
+            os.exceptions (
+                  std::istringstream::failbit
+                | std::istringstream::badbit
+            );
+            os >> m_data;
+
+            if (!os.eof ())
+                throw invalid_value (__func__);
+        } catch (...) {
+            throw invalid_value (__func__);
+        }
+    }
+
+
+    //-----------------------------------------------------------------------------
+    template <typename T>
+    T
+    option::value<T>::data (void) const
+    {
+        return m_data;
+    }
+
+
+    //-----------------------------------------------------------------------------
+    template <typename T>
+    T&
+    option::value<T>::data (void)
+    {
+        return m_data;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
     template <typename T, typename ...Args>
     T&
     parser::add (char shortname, std::string longname, std::string description, Args&&... args)