diff --git a/include/boost/archive/detail/decl.hpp b/include/boost/archive/detail/decl.hpp
index d8ffb2e6..4b0ceec6 100644
--- a/include/boost/archive/detail/decl.hpp
+++ b/include/boost/archive/detail/decl.hpp
@@ -26,22 +26,25 @@
 #if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK))
     #if defined(BOOST_ARCHIVE_SOURCE)
         #define BOOST_ARCHIVE_DECL BOOST_SYMBOL_EXPORT
-        #define BOOST_ARCHIVE_OR_WARCHIVE_DECL  BOOST_SYMBOL_EXPORT
     #else
         #define BOOST_ARCHIVE_DECL BOOST_SYMBOL_IMPORT
     #endif
     #if defined(BOOST_WARCHIVE_SOURCE)
         #define BOOST_WARCHIVE_DECL BOOST_SYMBOL_EXPORT
-        #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_EXPORT
     #else
         #define BOOST_WARCHIVE_DECL BOOST_SYMBOL_IMPORT
-        #define BOOST_ARCHIVE_OR_WARCHIVE_DECL  BOOST_SYMBOL_IMPORT
     #endif
     #if !defined(BOOST_WARCHIVE_SOURCE) && !defined(BOOST_ARCHIVE_SOURCE)
         #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_IMPORT
     #endif
 #endif
 
+#if defined(BOOST_WARCHIVE_SOURCE) || defined(BOOST_ARCHIVE_SOURCE)
+    #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_EXPORT
+#else
+    #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_IMPORT
+#endif
+
 #if ! defined(BOOST_ARCHIVE_DECL)
     #define BOOST_ARCHIVE_DECL
 #endif