diff --git a/include/boost/unordered/detail/fca.hpp b/include/boost/unordered/detail/fca.hpp
index 7104b19b..7d023e60 100644
--- a/include/boost/unordered/detail/fca.hpp
+++ b/include/boost/unordered/detail/fca.hpp
@@ -454,8 +454,6 @@ namespace boost {
                 typename boost::allocator_void_pointer<Allocator>::type> >::
                 type>
       {
-        BOOST_MOVABLE_BUT_NOT_COPYABLE(grouped_bucket_array)
-
         typedef typename boost::allocator_value_type<Allocator>::type
           allocator_value_type;
         typedef
@@ -569,6 +567,9 @@ namespace boost {
 
         ~grouped_bucket_array() { this->deallocate(); }
 
+        grouped_bucket_array(grouped_bucket_array const&) = delete;
+        grouped_bucket_array& operator=(grouped_bucket_array const&) = delete;
+
         grouped_bucket_array(grouped_bucket_array&& other) noexcept
             : empty_value<node_allocator_type>(
                 empty_init_t(), other.get_node_allocator()),
diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp
index 17e514ce..6357094f 100644
--- a/include/boost/unordered/detail/implementation.hpp
+++ b/include/boost/unordered/detail/implementation.hpp
@@ -415,8 +415,6 @@ namespace boost {
 
       template <typename T> class optional
       {
-        BOOST_MOVABLE_BUT_NOT_COPYABLE(optional)
-
         boost::unordered::detail::value_base<T> value_;
         bool has_value_;
 
@@ -440,6 +438,9 @@ namespace boost {
       public:
         optional() noexcept : has_value_(false) {}
 
+        optional(optional const&) = delete;
+        optional& operator=(optional const&) = delete;
+
         optional(optional<T>&& x) : has_value_(false)
         {
           if (x.has_value_) {
diff --git a/test/objects/minimal.hpp b/test/objects/minimal.hpp
index 16174dc2..3a1ffb5b 100644
--- a/test/objects/minimal.hpp
+++ b/test/objects/minimal.hpp
@@ -165,12 +165,12 @@ namespace test {
 
     class movable1
     {
-      BOOST_MOVABLE_BUT_NOT_COPYABLE(movable1)
-
     public:
       movable1(constructor_param const&) {}
       movable1() {}
       explicit movable1(movable_init) {}
+      movable1(movable1 const&) = delete;
+      movable1& operator=(movable1 const&) = delete;
       movable1(movable1&&) {}
       movable1& operator=(movable1&&) { return *this; }
       ~movable1() {}