[libcxx] Address comments to fix build failures

Author: elhewaty

libcxx/include/__mutex/unique_lock.h

@@ -16,6 +16,7 @@
 #include <__mutex/tag_types.h>
 #include <__system_error/throw_system_error.h>
 #include <__utility/swap.h>
+#include <__utility/move.h>
 #include <cerrno>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

libcxx/include/shared_mutex

@@ -139,6 +139,7 @@ template <class Mutex>
 #    include <__mutex/unique_lock.h>
 #    include <__system_error/throw_system_error.h>
 #    include <__utility/swap.h>
+#    include <__utility/move.h>
 #    include <cerrno>
 #    include <version>
 
@@ -151,6 +152,8 @@ _LIBCPP_PUSH_MACROS
 #        pragma GCC system_header
 #      endif
 
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 struct _LIBCPP_EXPORTED_FROM_ABI __shared_mutex_base {
@@ -430,6 +433,7 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(shared_lock<_Mutex>& __x, shared_lock<_Mu
 }
 
 _LIBCPP_END_NAMESPACE_STD
+_LIBCPP_POP_MACROS
 
 #    endif // _LIBCPP_STD_VER >= 14