diff --git a/libcxx/include/span b/libcxx/include/span
--- a/libcxx/include/span
+++ b/libcxx/include/span
@@ -129,11 +129,9 @@
 */
 
 #include <__config>
-#include <cstddef>      // for ptrdiff_t
+#include <cstddef>      // for byte
 #include <iterator>     // for iterators
-#include <array>        // for array
 #include <type_traits>  // for remove_cv, etc
-#include <cstddef>      // for byte
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@@ -146,6 +144,8 @@
 inline constexpr size_t dynamic_extent = numeric_limits<size_t>::max();
 template <typename _Tp, size_t _Extent = dynamic_extent> class span;
 
+template <class _Tp, size_t _Sz>
+struct array;
 
 template <class _Tp>
 struct __is_span_impl : public false_type {};
diff --git a/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp b/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp
--- a/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp
+++ b/libcxx/test/std/containers/views/span.cons/stdarray.pass.cpp
@@ -22,6 +22,7 @@
 
 
 #include <span>
+#include <array>
 #include <cassert>
 #include <string>