diff --git a/include/boost/io/detail/buffer_fill.hpp b/include/boost/io/detail/buffer_fill.hpp
new file mode 100644
index 0000000..b25a884
--- /dev/null
+++ b/include/boost/io/detail/buffer_fill.hpp
@@ -0,0 +1,39 @@
+/*
+Copyright 2019-2020 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_IO_DETAIL_BUFFER_FILL_HPP
+#define BOOST_IO_DETAIL_BUFFER_FILL_HPP
+
+#include <iosfwd>
+#include <cstddef>
+
+namespace boost {
+namespace io {
+namespace detail {
+
+template<class charT, class traits>
+inline bool
+buffer_fill(std::basic_streambuf<charT, traits>& buf, charT ch,
+    std::size_t size)
+{
+    charT fill[] = { ch, ch, ch, ch, ch, ch, ch, ch };
+    enum {
+        chunk = sizeof fill / sizeof(charT)
+    };
+    for (; size > chunk; size -= chunk) {
+        if (static_cast<std::size_t>(buf.sputn(fill, chunk)) != chunk) {
+            return false;
+        }
+    }
+    return static_cast<std::size_t>(buf.sputn(fill, size)) == size;
+}
+
+} /* detail */
+} /* io */
+} /* boost */
+
+#endif
diff --git a/include/boost/io/detail/ostream_guard.hpp b/include/boost/io/detail/ostream_guard.hpp
new file mode 100644
index 0000000..6999d81
--- /dev/null
+++ b/include/boost/io/detail/ostream_guard.hpp
@@ -0,0 +1,45 @@
+/*
+Copyright 2019-2020 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#ifndef BOOST_IO_DETAIL_OSTREAM_GUARD_HPP
+#define BOOST_IO_DETAIL_OSTREAM_GUARD_HPP
+
+#include <boost/config.hpp>
+#include <iosfwd>
+
+namespace boost {
+namespace io {
+namespace detail {
+
+template<class Char, class Traits>
+class ostream_guard {
+public:
+    explicit ostream_guard(std::basic_ostream<Char, Traits>& os) BOOST_NOEXCEPT
+        : os_(&os) { }
+
+    ~ostream_guard() BOOST_NOEXCEPT_IF(false) {
+        if (os_) {
+            os_->setstate(std::basic_ostream<Char, Traits>::badbit);
+        }
+    }
+
+    void release() BOOST_NOEXCEPT {
+        os_ = 0;
+    }
+
+private:
+    ostream_guard(const ostream_guard&);
+    ostream_guard& operator=(const ostream_guard&);
+
+    std::basic_ostream<Char, Traits>* os_;
+};
+
+} /* detail */
+} /* io */
+} /* boost */
+
+#endif
diff --git a/include/boost/io/ostream_put.hpp b/include/boost/io/ostream_put.hpp
index 998ad5c..97627f8 100644
--- a/include/boost/io/ostream_put.hpp
+++ b/include/boost/io/ostream_put.hpp
@@ -8,62 +8,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_IO_OSTREAM_PUT_HPP
 #define BOOST_IO_OSTREAM_PUT_HPP
 
-#include <boost/config.hpp>
-#include <iosfwd>
-#include <cstddef>
+#include <boost/io/detail/buffer_fill.hpp>
+#include <boost/io/detail/ostream_guard.hpp>
 
 namespace boost {
 namespace io {
-namespace detail {
-
-template<class charT, class traits>
-inline std::size_t
-osp_put(std::basic_streambuf<charT, traits>& out, const charT* data,
-    std::size_t size)
-{
-    return static_cast<std::size_t>(out.sputn(data, size));
-}
-
-template<class charT, class traits>
-inline bool
-osp_fill(std::basic_streambuf<charT, traits>& out, charT c, std::size_t size)
-{
-    charT fill[] = { c, c, c, c, c, c, c, c };
-    enum {
-        chunk = sizeof fill / sizeof(charT)
-    };
-    for (; size > chunk; size -= chunk) {
-        if (boost::io::detail::osp_put(out, fill, chunk) != chunk) {
-            return false;
-        }
-    }
-    return boost::io::detail::osp_put(out, fill, size) == size;
-}
-
-template<class charT, class traits>
-class osp_guard {
-public:
-    explicit osp_guard(std::basic_ostream<charT, traits>& os) BOOST_NOEXCEPT
-        : os_(&os) { }
-
-    ~osp_guard() BOOST_NOEXCEPT_IF(false) {
-        if (os_) {
-            os_->setstate(std::basic_ostream<charT, traits>::badbit);
-        }
-    }
-
-    void release() BOOST_NOEXCEPT {
-        os_ = 0;
-    }
-
-private:
-    osp_guard(const osp_guard&);
-    osp_guard& operator=(const osp_guard&);
-
-    std::basic_ostream<charT, traits>* os_;
-};
-
-} /* detail */
 
 template<class charT, class traits>
 inline std::basic_ostream<charT, traits>&
@@ -71,22 +20,22 @@ ostream_put(std::basic_ostream<charT, traits>& os, const charT* data,
     std::size_t size)
 {
     typedef std::basic_ostream<charT, traits> stream;
-    detail::osp_guard<charT, traits> guard(os);
+    detail::ostream_guard<charT, traits> guard(os);
     typename stream::sentry entry(os);
     if (entry) {
-        std::basic_streambuf<charT, traits>& out = *os.rdbuf();
+        std::basic_streambuf<charT, traits>& buf = *os.rdbuf();
         std::size_t width = static_cast<std::size_t>(os.width());
         if (width <= size) {
-            if (detail::osp_put(out, data, size) != size) {
+            if (static_cast<std::size_t>(buf.sputn(data, size)) != size) {
                 return os;
             }
         } else if ((os.flags() & stream::adjustfield) == stream::left) {
-            if (detail::osp_put(out, data, size) != size ||
-                !detail::osp_fill(out, os.fill(), width - size)) {
+            if (static_cast<std::size_t>(buf.sputn(data, size)) != size ||
+                !detail::buffer_fill(buf, os.fill(), width - size)) {
                 return os;
             }
-        } else if (!detail::osp_fill(out, os.fill(), width - size) ||
-            detail::osp_put(out, data, size) != size) {
+        } else if (!detail::buffer_fill(buf, os.fill(), width - size) ||
+            static_cast<std::size_t>(buf.sputn(data, size)) != size) {
             return os;
         }
         os.width(0);