diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index cf9a897d..0623b6c6 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -118,6 +118,8 @@ if(Boost_USE_STATIC_LIBS)
 else()
   set(BUILD_SHARED_LIBRARIES ON)
   # set(ENV{DYLD_LIBRARY_PATH} "${Boost_LIBRARY_DIRS}" ")
+  # set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+  # set(VISIBILITY_INLINES_HIDDEN)
 endif()
 
 ###########################
@@ -156,7 +158,7 @@ add_library(serialization
   ../src/basic_xml_grammar.ipp # doesn't show up in "Source Files" in Xcode"'
 )
 
-target_compile_options(serialization PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden )
+# target_compile_options(serialization PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden )
 
 add_library(wserialization
   ../src/basic_text_wiprimitive.cpp
@@ -169,7 +171,7 @@ add_library(wserialization
   ../src/basic_xml_grammar.ipp # doesn't show up in "Source Files" in Xcode"'
 )
 
-target_compile_options(wserialization PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden )
+#target_compile_options(wserialization PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden )
 
 # end library build
 ###########################
diff --git a/include/boost/archive/detail/iserializer.hpp b/include/boost/archive/detail/iserializer.hpp
index 6419e623..a053fba4 100644
--- a/include/boost/archive/detail/iserializer.hpp
+++ b/include/boost/archive/detail/iserializer.hpp
@@ -39,7 +39,6 @@ namespace std{
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/greater_equal.hpp>
 #include <boost/mpl/equal_to.hpp>
-#include <boost/mpl/bool.hpp>
 #include <boost/core/no_exceptions_support.hpp>
 
 #ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO   
diff --git a/include/boost/archive/detail/oserializer.hpp b/include/boost/archive/detail/oserializer.hpp
index 7a7e2393..0f2e733c 100644
--- a/include/boost/archive/detail/oserializer.hpp
+++ b/include/boost/archive/detail/oserializer.hpp
@@ -33,6 +33,7 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/greater_equal.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 
 #ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO   
     #include <boost/serialization/extended_type_info_typeid.hpp>   
diff --git a/include/boost/archive/impl/xml_oarchive_impl.ipp b/include/boost/archive/impl/xml_oarchive_impl.ipp
index e7138caf..c8dbfedc 100644
--- a/include/boost/archive/impl/xml_oarchive_impl.ipp
+++ b/include/boost/archive/impl/xml_oarchive_impl.ipp
@@ -114,6 +114,21 @@ xml_oarchive_impl<Archive>::xml_oarchive_impl(
         this->init();
 }
 
+template<class Archive>
+BOOST_ARCHIVE_DECL void
+xml_oarchive_impl<Archive>::save_binary(const void *address, std::size_t count){
+    this->end_preamble();
+    #if ! defined(__MWERKS__)
+    this->basic_text_oprimitive<std::ostream>::save_binary(
+    #else
+    this->basic_text_oprimitive::save_binary(
+    #endif
+        address, 
+        count
+    );
+    this->indent_next = true;
+}
+
 template<class Archive>
 BOOST_ARCHIVE_DECL
 xml_oarchive_impl<Archive>::~xml_oarchive_impl(){
diff --git a/include/boost/archive/iterators/dataflow.hpp b/include/boost/archive/iterators/dataflow.hpp
index 6f8001d3..07733d5f 100644
--- a/include/boost/archive/iterators/dataflow.hpp
+++ b/include/boost/archive/iterators/dataflow.hpp
@@ -20,7 +20,6 @@
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/if.hpp>
-#include <boost/mpl/bool.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/plus.hpp>
 #include <boost/mpl/int.hpp>
diff --git a/include/boost/archive/xml_oarchive.hpp b/include/boost/archive/xml_oarchive.hpp
index d150a053..79f96805 100644
--- a/include/boost/archive/xml_oarchive.hpp
+++ b/include/boost/archive/xml_oarchive.hpp
@@ -67,9 +67,6 @@ protected:
         friend class save_access;
     #endif
 #endif
-    //void end_preamble(){
-    //    basic_xml_oarchive<Archive>::end_preamble();
-    //}
     template<class T>
     void save(const T & t){
         basic_text_oprimitive<std::ostream>::save(t);
@@ -99,18 +96,7 @@ protected:
     BOOST_ARCHIVE_DECL 
     ~xml_oarchive_impl();
 public:
-    void save_binary(const void *address, std::size_t count){
-        this->end_preamble();
-        #if ! defined(__MWERKS__)
-        this->basic_text_oprimitive<std::ostream>::save_binary(
-        #else
-        this->basic_text_oprimitive::save_binary(
-        #endif
-            address, 
-            count
-        );
-        this->indent_next = true;
-    }
+    void save_binary(const void *address, std::size_t count);
 };
 
 // we use the following because we can't use
diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp
index 112a7505..2cd023ac 100644
--- a/include/boost/serialization/array.hpp
+++ b/include/boost/serialization/array.hpp
@@ -22,7 +22,7 @@ namespace std{
 #include <boost/serialization/collection_size_type.hpp>
 #include <boost/mpl/always.hpp>
 #include <boost/mpl/apply.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/static_assert.hpp>
diff --git a/include/boost/serialization/assume_abstract.hpp b/include/boost/serialization/assume_abstract.hpp
index a5cb2f55..632f9312 100644
--- a/include/boost/serialization/assume_abstract.hpp
+++ b/include/boost/serialization/assume_abstract.hpp
@@ -19,6 +19,7 @@
 // this is useful for compilers which don't support the boost::is_abstract
 
 #include <boost/type_traits/is_abstract.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 
 #ifndef BOOST_NO_IS_ABSTRACT
 
diff --git a/include/boost/serialization/base_object.hpp b/include/boost/serialization/base_object.hpp
index 7ede6473..1a82cecd 100644
--- a/include/boost/serialization/base_object.hpp
+++ b/include/boost/serialization/base_object.hpp
@@ -25,7 +25,6 @@
 
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/bool.hpp>
 #include <boost/mpl/identity.hpp>
 
 #include <boost/type_traits/is_base_and_derived.hpp>
diff --git a/include/boost/serialization/export.hpp b/include/boost/serialization/export.hpp
index 9da9434a..9eef440d 100644
--- a/include/boost/serialization/export.hpp
+++ b/include/boost/serialization/export.hpp
@@ -32,7 +32,7 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/not.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 
 #include <boost/serialization/extended_type_info.hpp> // for guid_defined only
 #include <boost/serialization/static_warning.hpp>
diff --git a/include/boost/serialization/is_bitwise_serializable.hpp b/include/boost/serialization/is_bitwise_serializable.hpp
index dac597ec..7e24a2cb 100644
--- a/include/boost/serialization/is_bitwise_serializable.hpp
+++ b/include/boost/serialization/is_bitwise_serializable.hpp
@@ -21,7 +21,7 @@
 # pragma once
 #endif
 
-#include <boost/mpl/bool.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
 
 namespace boost {
diff --git a/include/boost/serialization/static_warning.hpp b/include/boost/serialization/static_warning.hpp
index 2d49de1c..1d9238fc 100644
--- a/include/boost/serialization/static_warning.hpp
+++ b/include/boost/serialization/static_warning.hpp
@@ -66,6 +66,7 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/print.hpp>
 #include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost {
diff --git a/include/boost/serialization/traits.hpp b/include/boost/serialization/traits.hpp
index d338b1b1..9e114fdd 100644
--- a/include/boost/serialization/traits.hpp
+++ b/include/boost/serialization/traits.hpp
@@ -28,7 +28,7 @@
 #include <boost/static_assert.hpp>
 
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 #include <boost/serialization/level_enum.hpp>
 #include <boost/serialization/tracking_enum.hpp>
 
diff --git a/include/boost/serialization/vector.hpp b/include/boost/serialization/vector.hpp
index 6e49bff3..54ed14a8 100644
--- a/include/boost/serialization/vector.hpp
+++ b/include/boost/serialization/vector.hpp
@@ -34,7 +34,7 @@
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/detail/get_data.hpp>
 #include <boost/serialization/detail/stack_constructor.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 #include <boost/mpl/if.hpp>
 
 // default is being compatible with version 1.34.1 files, not 1.35 files
diff --git a/include/boost/serialization/wrapper.hpp b/include/boost/serialization/wrapper.hpp
index 6a2a730d..60d7910b 100644
--- a/include/boost/serialization/wrapper.hpp
+++ b/include/boost/serialization/wrapper.hpp
@@ -9,7 +9,7 @@
 #include <boost/serialization/traits.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/bool.hpp>
+#include <boost/mpl/bool_fwd.hpp>
 
 namespace boost { namespace serialization {
 
diff --git a/src/utf8_codecvt_facet.cpp b/src/utf8_codecvt_facet.cpp
index 9384a02f..042eae82 100644
--- a/src/utf8_codecvt_facet.cpp
+++ b/src/utf8_codecvt_facet.cpp
@@ -7,13 +7,14 @@
 #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"
+    #error "wide char i/o not supported on this platform"
 #else
     #ifdef BOOST_NO_CXX11_HDR_CODECVT
         #define BOOST_UTF8_BEGIN_NAMESPACE \
              namespace boost { namespace archive { namespace detail {
-        #define BOOST_UTF8_DECL
+        #define BOOST_UTF8_DECL BOOST_ARCHIVE_DECL
         #define BOOST_UTF8_END_NAMESPACE }}}
+        #include <boost/archive/detail/utf8_codecvt_facet.hpp>
         #include <boost/detail/utf8_codecvt_facet.ipp>
         #undef BOOST_UTF8_END_NAMESPACE
         #undef BOOST_UTF8_DECL
diff --git a/src/xml_iarchive.cpp b/src/xml_iarchive.cpp
index 9e5fae56..0a19a8e8 100644
--- a/src/xml_iarchive.cpp
+++ b/src/xml_iarchive.cpp
@@ -12,12 +12,8 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/serialization/config.hpp>
-
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/src/xml_oarchive.cpp b/src/xml_oarchive.cpp
index e9d7cc19..c238845d 100644
--- a/src/xml_oarchive.cpp
+++ b/src/xml_oarchive.cpp
@@ -14,7 +14,6 @@
 
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/serialization/config.hpp>
-
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 
diff --git a/test/polymorphic_derived2.cpp b/test/polymorphic_derived2.cpp
index 26137ad2..4919b16f 100644
--- a/test/polymorphic_derived2.cpp
+++ b/test/polymorphic_derived2.cpp
@@ -27,11 +27,11 @@ void polymorphic_derived2::serialize(
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
 
-template BOOST_SYMBOL_EXPORT polymorphic_derived2::serialize(
+template BOOST_SYMBOL_EXPORT void polymorphic_derived2::serialize(
     boost::archive::text_oarchive & ar,
     const unsigned int version
 );
-template BOOST_SYMBOL_EXPORT polymorphic_derived2::serialize(
+template BOOST_SYMBOL_EXPORT void polymorphic_derived2::serialize(
     boost::archive::text_iarchive & ar,
     const unsigned int version
 );
@@ -40,11 +40,11 @@ template BOOST_SYMBOL_EXPORT polymorphic_derived2::serialize(
 #include <boost/archive/polymorphic_iarchive.hpp>
 #include <boost/archive/polymorphic_oarchive.hpp>
 
-template BOOST_SYMBOL_EXPORT polymorphic_derived2::serialize(
+template BOOST_SYMBOL_EXPORT void polymorphic_derived2::serialize(
     boost::archive::polymorphic_oarchive & ar,
     const unsigned int version
 );
-template BOOST_SYMBOL_EXPORT polymorphic_derived2::serialize(
+template BOOST_SYMBOL_EXPORT void polymorphic_derived2::serialize(
     boost::archive::polymorphic_iarchive & ar,
     const unsigned int version
 );
@@ -60,6 +60,6 @@ BOOST_CLASS_EXPORT_IMPLEMENT(polymorphic_derived2)
 BOOST_SERIALIZATION_FACTORY_0(polymorphic_derived2)
 
 template
-BOOST_SYMBOL_EXPORT polymorphic_derived2 *
+BOOST_SYMBOL_EXPORT void polymorphic_derived2 *
 boost::serialization::factory<polymorphic_derived2, 0>(std::va_list ap);
 #endif