diff --git a/include/boost/archive/detail/utf8_codecvt_facet.hpp b/include/boost/archive/detail/utf8_codecvt_facet.hpp
index b5410d9a..b88df89f 100644
--- a/include/boost/archive/detail/utf8_codecvt_facet.hpp
+++ b/include/boost/archive/detail/utf8_codecvt_facet.hpp
@@ -10,9 +10,10 @@
 #include <boost/config.hpp>
 
 #ifdef BOOST_NO_CXX11_HDR_CODECVT
+    #include <boost/archive/detail/decl.hpp>
     #define BOOST_UTF8_BEGIN_NAMESPACE \
          namespace boost { namespace archive { namespace detail {
-    #define BOOST_UTF8_DECL
+    #define BOOST_UTF8_DECL BOOST_ARCHIVE_OR_WARCHIVE_DECL
     #define BOOST_UTF8_END_NAMESPACE }}}
 
     #include <boost/detail/utf8_codecvt_facet.hpp>
diff --git a/src/utf8_codecvt_facet.cpp b/src/utf8_codecvt_facet.cpp
index c20b05c1..62b4202b 100644
--- a/src/utf8_codecvt_facet.cpp
+++ b/src/utf8_codecvt_facet.cpp
@@ -3,18 +3,16 @@
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_ARCHIVE_SOURCE
 #include <boost/config.hpp>
-
-#include <boost/archive/detail/auto_link_archive.hpp>
-
 #ifdef BOOST_NO_STD_WSTREAMBUF
 #error "wide char i/o not supported on this platform"
 #else
     #ifdef BOOST_NO_CXX11_HDR_CODECVT
+        # define BOOST_ARCHIVE_SOURCE
+        #include <boost/archive/detail/decl.hpp>
         #define BOOST_UTF8_BEGIN_NAMESPACE \
              namespace boost { namespace archive { namespace detail {
-        #define BOOST_UTF8_DECL BOOST_ARCHIVE_DECL
+        #define BOOST_UTF8_DECL BOOST_ARCHIVE_OR_WARCHIVE_DECL
         #define BOOST_UTF8_END_NAMESPACE }}}
         #include <boost/detail/utf8_codecvt_facet.ipp>
         #undef BOOST_UTF8_END_NAMESPACE