From 892990c56cc05188ad38c29c0acb283dcdf05b1e Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Thu, 5 Aug 2021 13:19:05 -0400
Subject: [PATCH] [libc++] IWYU to fix complaints when compiling with Modules.
 NFCI.

Differential Revision: https://reviews.llvm.org/D107583
---
 libcxx/include/__iterator/counted_iterator.h | 2 ++
 libcxx/include/__iterator/iter_swap.h        | 2 ++
 libcxx/include/__ranges/access.h             | 1 +
 libcxx/include/__ranges/common_view.h        | 1 +
 libcxx/include/__ranges/ref_view.h           | 1 +
 libcxx/include/__ranges/single_view.h        | 3 +++
 libcxx/include/__ranges/subrange.h           | 2 ++
 libcxx/include/__ranges/take_view.h          | 1 +
 libcxx/include/__ranges/transform_view.h     | 4 ++++
 9 files changed, 17 insertions(+)

diff --git a/libcxx/include/__iterator/counted_iterator.h b/libcxx/include/__iterator/counted_iterator.h
index 7136aaf02584..c9e138307577 100644
--- a/libcxx/include/__iterator/counted_iterator.h
+++ b/libcxx/include/__iterator/counted_iterator.h
@@ -19,6 +19,8 @@
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
 #include <__memory/pointer_traits.h>
+#include <__utility/move.h>
+#include <compare>
 #include <concepts>
 #include <type_traits>
 
diff --git a/libcxx/include/__iterator/iter_swap.h b/libcxx/include/__iterator/iter_swap.h
index d70da09b4ab8..a31b95f27457 100644
--- a/libcxx/include/__iterator/iter_swap.h
+++ b/libcxx/include/__iterator/iter_swap.h
@@ -15,6 +15,8 @@
 #include <__iterator/iterator_traits.h>
 #include <__iterator/readable_traits.h>
 #include <__ranges/access.h>
+#include <__utility/forward.h>
+#include <__utility/move.h>
 #include <concepts>
 #include <type_traits>
 
diff --git a/libcxx/include/__ranges/access.h b/libcxx/include/__ranges/access.h
index add848887c11..1c7dcbe64a0d 100644
--- a/libcxx/include/__ranges/access.h
+++ b/libcxx/include/__ranges/access.h
@@ -14,6 +14,7 @@
 #include <__iterator/readable_traits.h>
 #include <__ranges/enable_borrowed_range.h>
 #include <__utility/__decay_copy.h>
+#include <__utility/as_const.h>
 #include <__utility/forward.h>
 #include <concepts>
 #include <type_traits>
diff --git a/libcxx/include/__ranges/common_view.h b/libcxx/include/__ranges/common_view.h
index dab82602f671..f2909a2926c4 100644
--- a/libcxx/include/__ranges/common_view.h
+++ b/libcxx/include/__ranges/common_view.h
@@ -18,6 +18,7 @@
 #include <__ranges/enable_borrowed_range.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
+#include <__utility/move.h>
 #include <concepts>
 #include <type_traits>
 
diff --git a/libcxx/include/__ranges/ref_view.h b/libcxx/include/__ranges/ref_view.h
index fb45a359863b..6ed621741a2d 100644
--- a/libcxx/include/__ranges/ref_view.h
+++ b/libcxx/include/__ranges/ref_view.h
@@ -20,6 +20,7 @@
 #include <__ranges/empty.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
+#include <__utility/forward.h>
 #include <concepts>
 #include <type_traits>
 
diff --git a/libcxx/include/__ranges/single_view.h b/libcxx/include/__ranges/single_view.h
index ef9822d21148..9e1ff7e01da0 100644
--- a/libcxx/include/__ranges/single_view.h
+++ b/libcxx/include/__ranges/single_view.h
@@ -12,6 +12,9 @@
 #include <__config>
 #include <__ranges/view_interface.h>
 #include <__ranges/copyable_box.h>
+#include <__utility/forward.h>
+#include <__utility/in_place.h>
+#include <__utility/move.h>
 #include <concepts>
 #include <type_traits>
 
diff --git a/libcxx/include/__ranges/subrange.h b/libcxx/include/__ranges/subrange.h
index 25d333db02de..acae70cf3cc8 100644
--- a/libcxx/include/__ranges/subrange.h
+++ b/libcxx/include/__ranges/subrange.h
@@ -20,6 +20,8 @@
 #include <__ranges/enable_borrowed_range.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
+#include <__tuple>
+#include <__utility/move.h>
 #include <concepts>
 #include <type_traits>
 
diff --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h
index deef79ebfb82..73a57fe96c08 100644
--- a/libcxx/include/__ranges/take_view.h
+++ b/libcxx/include/__ranges/take_view.h
@@ -23,6 +23,7 @@
 #include <__ranges/view_interface.h>
 #include <__utility/move.h>
 #include <concepts>
+#include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h
index 4243dc0366e9..9aee8fce4958 100644
--- a/libcxx/include/__ranges/transform_view.h
+++ b/libcxx/include/__ranges/transform_view.h
@@ -10,9 +10,11 @@
 #define _LIBCPP___RANGES_TRANSFORM_VIEW_H
 
 #include <__config>
+#include <__functional/invoke.h>
 #include <__iterator/concepts.h>
 #include <__iterator/iter_swap.h>
 #include <__iterator/iterator_traits.h>
+#include <__memory/addressof.h>
 #include <__ranges/access.h>
 #include <__ranges/all.h>
 #include <__ranges/concepts.h>
@@ -20,6 +22,8 @@
 #include <__ranges/empty.h>
 #include <__ranges/size.h>
 #include <__ranges/view_interface.h>
+#include <__utility/in_place.h>
+#include <__utility/move.h>
 #include <concepts>
 #include <type_traits>