diff --git a/include/boost/detail/utf8_codecvt_facet.hpp b/include/boost/detail/utf8_codecvt_facet.hpp
index d34b306..97e6ddc 100644
--- a/include/boost/detail/utf8_codecvt_facet.hpp
+++ b/include/boost/detail/utf8_codecvt_facet.hpp
@@ -86,19 +86,20 @@
 // for std::size_t
 #include <cstddef>
 
-#include <boost/program_options/config.hpp>
-
+#include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
-#if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std {
-    using ::mbstate_t;
-
-    // Note: the serialization's version has using for
-    // __LIBCOMO__ and for BOOST_DINKUMWARE_STDLIB.
-    // Don't know why -- trying without.        
-}
-#endif
+    #if defined(__LIBCOMO__)
+        using ::mbstate_t;
+    #elif defined(BOOST_DINKUMWARE_STDLIB)
+        using ::mbstate_t;
+    #elif defined(__SGI_STL_PORT)
+    #elif defined(BOOST_NO_STDC_NAMESPACE)
+        using ::mbstate_t;
+        using ::codecvt;
+    #endif
+} // namespace std
 
 #if !defined(__MSL_CPP__) && !defined(__LIBCOMO__)
     #define BOOST_CODECVT_DO_LENGTH_CONST const