From 2d52c6bfae801b016dd3627b8c0e7c4a99405549 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser@berlin.de>
Date: Mon, 5 Sep 2022 14:38:24 +0200
Subject: [libc++] Granularize __tuple

Reviewed By: ldionne, #libc

Spies: libcxx-commits, mgorny

Differential Revision: https://reviews.llvm.org/D133081
---
 libcxx/include/utility | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libcxx/include/utility')

diff --git a/libcxx/include/utility b/libcxx/include/utility
index 41bcaf3..b14ee43 100644
--- a/libcxx/include/utility
+++ b/libcxx/include/utility
@@ -226,7 +226,6 @@ template <class T>
 
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
-#include <__tuple>
 #include <__utility/as_const.h>
 #include <__utility/auto_cast.h>
 #include <__utility/cmp.h>
@@ -249,9 +248,15 @@ template <class T>
 #include <version>
 
 // standard-mandated includes
+
+// [utility.syn]
 #include <compare>
 #include <initializer_list>
 
+// [tuple.helper]
+#include <__tuple/tuple_element.h>
+#include <__tuple/tuple_size.h>
+
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-- 
cgit v1.1