diff --git a/include/etl/optional.h b/include/etl/optional.h
index 3a103b54..25b4af0a 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -167,7 +167,7 @@ namespace etl
     //***************************************************************************
     optional(T&& value_)
     {
-      ::new (storage.template get_address<T>()) T(std::move(value_));
+      ::new (storage.template get_address<T>()) T(etl::move(value_));
       valid = true;
     }
 #endif
diff --git a/include/etl/queue.h b/include/etl/queue.h
index 9585a030..64f8eaff 100644
--- a/include/etl/queue.h
+++ b/include/etl/queue.h
@@ -618,7 +618,7 @@ namespace etl
     queue(queue&& rhs)
       : base_t(reinterpret_cast<T*>(&buffer[0]), SIZE)
     {
-      base_t::move_clone(std::move(rhs));
+      base_t::move_clone(etl::move(rhs));
     }
 #endif