diff --git a/include/boost/config/stdlib/libcpp.hpp b/include/boost/config/stdlib/libcpp.hpp
index c32eddf4..645bb63b 100644
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -54,20 +54,26 @@
 #  define BOOST_NO_CXX11_STD_ALIGN
 #  define BOOST_NO_CXX11_ADDRESSOF
 #  define BOOST_NO_CXX11_HDR_ATOMIC
+#  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#  define BOOST_NO_CXX11_HDR_CHRONO
+#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
+#  define BOOST_NO_CXX11_HDR_FUTURE
 #elif _LIBCPP_VERSION < 3700
-#  define BOOST_NO_CXX11_HDR_ATOMIC
-#endif
-
 //
 // These appear to be unusable/incomplete so far:
 //
-#  define BOOST_NO_CXX11_HDR_CHRONO
-#  define BOOST_NO_CXX11_HDR_FUTURE
-#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
+#  define BOOST_NO_CXX11_HDR_ATOMIC
 #  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#  define BOOST_NO_CXX11_HDR_CHRONO
+#  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
+#  define BOOST_NO_CXX11_HDR_FUTURE
+#endif
 
+
+#if _LIBCPP_VERSION < 3700
 // libc++ uses a non-standard messages_base
 #define BOOST_NO_STD_MESSAGES
+#endif
 
 #if defined(__has_include)
 #if !__has_include(<shared_mutex>)
diff --git a/test/boost_no_cxx11_hdr_atomic.ipp b/test/boost_no_cxx11_hdr_atomic.ipp
index b8e18766..edede3fc 100644
--- a/test/boost_no_cxx11_hdr_atomic.ipp
+++ b/test/boost_no_cxx11_hdr_atomic.ipp
@@ -29,7 +29,7 @@ int test()
 
    std::atomic<int> a1;
    std::atomic<unsigned> a2;
-   std::atomic<void*>    a3;
+   std::atomic<int*>    a3;
    a1.is_lock_free();
    a1.store(1);
    a1.load();