diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp
index 2adb0eb..07c174b 100644
--- a/include/boost/container/string.hpp
+++ b/include/boost/container/string.hpp
@@ -38,7 +38,6 @@
 #include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/container/detail/version_type.hpp>
 #include <boost/container/detail/type_traits.hpp>
-#include <boost/container/detail/minimal_char_traits_header.hpp>
 #include <boost/container/detail/algorithm.hpp>
 
 #include <boost/intrusive/pointer_traits.hpp>
@@ -51,7 +50,7 @@
 #include <boost/core/no_exceptions_support.hpp>
 #include <boost/container_hash/hash.hpp>
 
-#include <string>    //char_traits
+#include <boost/container/detail/minimal_char_traits_header.hpp>  // for char_traits
 #include <iosfwd> 
 #include <istream>   //
 #include <ostream>
diff --git a/test/string_test.cpp b/test/string_test.cpp
index cef5732..258085b 100644
--- a/test/string_test.cpp
+++ b/test/string_test.cpp
@@ -577,8 +577,8 @@ int main()
       typedef boost::container::allocator_traits<allocator_type>::pointer pointer;
       BOOST_STATIC_ASSERT_MSG
       (  (boost::has_trivial_destructor_after_move<cont>::value ==
-          boost::has_trivial_destructor_after_move<allocator_type>::value ||
-          boost::has_trivial_destructor_after_move<pointer>::value),
+          (boost::has_trivial_destructor_after_move<allocator_type>::value &&
+           boost::has_trivial_destructor_after_move<pointer>::value)),
           "has_trivial_destructor_after_move(default allocator) test failed");
    }
    // std::allocator
@@ -588,8 +588,8 @@ int main()
       typedef boost::container::allocator_traits<allocator_type>::pointer pointer;
       BOOST_STATIC_ASSERT_MSG
       (  (boost::has_trivial_destructor_after_move<cont>::value ==
-          boost::has_trivial_destructor_after_move<allocator_type>::value ||
-          boost::has_trivial_destructor_after_move<pointer>::value),
+          (boost::has_trivial_destructor_after_move<allocator_type>::value &&
+           boost::has_trivial_destructor_after_move<pointer>::value)),
           "has_trivial_destructor_after_move(std::allocator) test failed");
    }