[PATCH 4/5] Move libc++ headers to /usr/include/c++/v1

[Michał Górny <mgorny%gentoo.org@localhost>]

---
 distrib/sets/lists/base/mi           |   7 +-
 distrib/sets/lists/comp/mi           | 381 +++++++++++++++++----------
 etc/mtree/NetBSD.dist.base           |   5 +-
 external/bsd/libc++/include/Makefile |   2 +-
 4 files changed, 251 insertions(+), 144 deletions(-)

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 0e7167b96e85..b1c44dd77257 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1097,8 +1097,11 @@
 ./usr/include/altq				base-c-usr
 ./usr/include/arpa				base-c-usr
 ./usr/include/c++				base-cxx-usr
-./usr/include/c++/experimental			base-cxx-usr
-./usr/include/c++/ext				base-cxx-usr
+./usr/include/c++/experimental			base-cxx-usr		obsolete
+./usr/include/c++/ext				base-cxx-usr		obsolete
+./usr/include/c++/v1				base-cxx-usr
+./usr/include/c++/v1/experimental		base-cxx-usr
+./usr/include/c++/v1/ext			base-cxx-usr
 ./usr/include/cdk				base-obsolete		obsolete
 ./usr/include/clang-3.4				base-obsolete		obsolete
 ./usr/include/clang-3.5				base-obsolete		obsolete
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 773891ae2cb0..21853bdef435 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -208,157 +208,260 @@
 ./usr/include/bm.h				comp-c-include
 ./usr/include/bozohttpd.h			comp-c-include
 ./usr/include/bzlib.h				comp-c-include
-./usr/include/c++/__bit_reference		comp-cxx-include	libcxx
-./usr/include/c++/__bsd_locale_defaults.h	comp-cxx-include	libcxx
-./usr/include/c++/__bsd_locale_fallbacks.h	comp-cxx-include	libcxx
-./usr/include/c++/__config			comp-cxx-include	libcxx
-./usr/include/c++/__debug			comp-cxx-include	libcxx
-./usr/include/c++/__errc			comp-cxx-include	libcxx
-./usr/include/c++/__functional_03		comp-cxx-include	libcxx
-./usr/include/c++/__functional_base		comp-cxx-include	libcxx
-./usr/include/c++/__functional_base_03		comp-cxx-include	libcxx
-./usr/include/c++/__hash_table			comp-cxx-include	libcxx
-./usr/include/c++/__libcpp_version		comp-cxx-include	libcxx
-./usr/include/c++/__locale			comp-cxx-include	libcxx
-./usr/include/c++/__mutex_base			comp-cxx-include	libcxx
-./usr/include/c++/__node_handle			comp-cxx-include	libcxx
-./usr/include/c++/__nullptr			comp-cxx-include	libcxx
-./usr/include/c++/__split_buffer		comp-cxx-include	libcxx
-./usr/include/c++/__sso_allocator		comp-cxx-include	libcxx
-./usr/include/c++/__std_stream			comp-cxx-include	libcxx
-./usr/include/c++/__string			comp-cxx-include	libcxx
-./usr/include/c++/__threading_support		comp-cxx-include	libcxx
-./usr/include/c++/__tree			comp-cxx-include	libcxx
-./usr/include/c++/__tuple			comp-cxx-include	libcxx
+./usr/include/c++/__bit_reference		comp-obsolete		obsolete
+./usr/include/c++/__config			comp-obsolete		obsolete
+./usr/include/c++/__debug			comp-obsolete		obsolete
+./usr/include/c++/__functional_03		comp-obsolete		obsolete
+./usr/include/c++/__functional_base		comp-obsolete		obsolete
+./usr/include/c++/__functional_base_03		comp-obsolete		obsolete
+./usr/include/c++/__hash_table			comp-obsolete		obsolete
+./usr/include/c++/__locale			comp-obsolete		obsolete
+./usr/include/c++/__mutex_base			comp-obsolete		obsolete
+./usr/include/c++/__split_buffer		comp-obsolete		obsolete
+./usr/include/c++/__sso_allocator		comp-obsolete		obsolete
+./usr/include/c++/__std_stream			comp-obsolete		obsolete
+./usr/include/c++/__tree			comp-obsolete		obsolete
+./usr/include/c++/__tuple			comp-obsolete		obsolete
 ./usr/include/c++/__tuple_03			comp-obsolete		obsolete
 ./usr/include/c++/__undef___deallocate		comp-obsolete		obsolete
-./usr/include/c++/__undef_macros		comp-cxx-include	libcxx
 ./usr/include/c++/__undef_min_max		comp-obsolete		obsolete
-./usr/include/c++/algorithm			comp-cxx-include	libcxx
-./usr/include/c++/any				comp-cxx-include	libcxx
-./usr/include/c++/array				comp-cxx-include	libcxx
-./usr/include/c++/atomic			comp-cxx-include	libcxx
-./usr/include/c++/bit				comp-cxx-include	libcxx
-./usr/include/c++/bitset			comp-cxx-include	libcxx
-./usr/include/c++/cassert			comp-cxx-include	libcxx
-./usr/include/c++/ccomplex			comp-cxx-include	libcxx
-./usr/include/c++/cctype			comp-cxx-include	libcxx
-./usr/include/c++/cerrno			comp-cxx-include	libcxx
-./usr/include/c++/cfenv				comp-cxx-include	libcxx
-./usr/include/c++/cfloat			comp-cxx-include	libcxx
-./usr/include/c++/charconv			comp-cxx-include	libcxx
-./usr/include/c++/chrono			comp-cxx-include	libcxx
-./usr/include/c++/cinttypes			comp-cxx-include	libcxx
-./usr/include/c++/ciso646			comp-cxx-include	libcxx
-./usr/include/c++/climits			comp-cxx-include	libcxx
-./usr/include/c++/clocale			comp-cxx-include	libcxx
-./usr/include/c++/cmath				comp-cxx-include	libcxx
-./usr/include/c++/codecvt			comp-cxx-include	libcxx
-./usr/include/c++/compare			comp-cxx-include	libcxx
-./usr/include/c++/complex			comp-cxx-include	libcxx
-./usr/include/c++/complex.h			comp-cxx-include	libcxx
-./usr/include/c++/condition_variable		comp-cxx-include	libcxx
-./usr/include/c++/csetjmp			comp-cxx-include	libcxx
-./usr/include/c++/csignal			comp-cxx-include	libcxx
-./usr/include/c++/cstdarg			comp-cxx-include	libcxx
-./usr/include/c++/cstdbool			comp-cxx-include	libcxx
-./usr/include/c++/cstddef			comp-cxx-include	libcxx
-./usr/include/c++/cstdint			comp-cxx-include	libcxx
-./usr/include/c++/cstdio			comp-cxx-include	libcxx
-./usr/include/c++/cstdlib			comp-cxx-include	libcxx
-./usr/include/c++/cstring			comp-cxx-include	libcxx
-./usr/include/c++/ctgmath			comp-cxx-include	libcxx
-./usr/include/c++/ctime				comp-cxx-include	libcxx
-./usr/include/c++/cwchar			comp-cxx-include	libcxx
-./usr/include/c++/cwctype			comp-cxx-include	libcxx
-./usr/include/c++/cxxabi.h			comp-cxx-include	libcxx
-./usr/include/c++/deque				comp-cxx-include	libcxx
+./usr/include/c++/algorithm			comp-obsolete		obsolete
+./usr/include/c++/array				comp-obsolete		obsolete
+./usr/include/c++/atomic			comp-obsolete		obsolete
+./usr/include/c++/bitset			comp-obsolete		obsolete
+./usr/include/c++/cassert			comp-obsolete		obsolete
+./usr/include/c++/ccomplex			comp-obsolete		obsolete
+./usr/include/c++/cctype			comp-obsolete		obsolete
+./usr/include/c++/cerrno			comp-obsolete		obsolete
+./usr/include/c++/cfenv				comp-obsolete		obsolete
+./usr/include/c++/cfloat			comp-obsolete		obsolete
+./usr/include/c++/chrono			comp-obsolete		obsolete
+./usr/include/c++/cinttypes			comp-obsolete		obsolete
+./usr/include/c++/ciso646			comp-obsolete		obsolete
+./usr/include/c++/climits			comp-obsolete		obsolete
+./usr/include/c++/clocale			comp-obsolete		obsolete
+./usr/include/c++/cmath				comp-obsolete		obsolete
+./usr/include/c++/codecvt			comp-obsolete		obsolete
+./usr/include/c++/complex			comp-obsolete		obsolete
+./usr/include/c++/complex.h			comp-obsolete		obsolete
+./usr/include/c++/condition_variable		comp-obsolete		obsolete
+./usr/include/c++/csetjmp			comp-obsolete		obsolete
+./usr/include/c++/csignal			comp-obsolete		obsolete
+./usr/include/c++/cstdarg			comp-obsolete		obsolete
+./usr/include/c++/cstdbool			comp-obsolete		obsolete
+./usr/include/c++/cstddef			comp-obsolete		obsolete
+./usr/include/c++/cstdint			comp-obsolete		obsolete
+./usr/include/c++/cstdio			comp-obsolete		obsolete
+./usr/include/c++/cstdlib			comp-obsolete		obsolete
+./usr/include/c++/cstring			comp-obsolete		obsolete
+./usr/include/c++/ctgmath			comp-obsolete		obsolete
+./usr/include/c++/ctime				comp-obsolete		obsolete
+./usr/include/c++/cwchar			comp-obsolete		obsolete
+./usr/include/c++/cwctype			comp-obsolete		obsolete
+./usr/include/c++/cxxabi.h			comp-obsolete		obsolete
+./usr/include/c++/deque				comp-obsolete		obsolete
 ./usr/include/c++/dynarray			comp-obsolete		obsolete
-./usr/include/c++/exception			comp-cxx-include	libcxx
-./usr/include/c++/execution			comp-cxx-include	libcxx
-./usr/include/c++/experimental/__config		comp-cxx-include	libcxx
-./usr/include/c++/experimental/__memory		comp-cxx-include	libcxx
-./usr/include/c++/experimental/algorithm	comp-cxx-include	libcxx
+./usr/include/c++/exception			comp-obsolete		obsolete
+./usr/include/c++/experimental/__config		comp-obsolete		obsolete
+./usr/include/c++/experimental/algorithm	comp-obsolete		obsolete
 ./usr/include/c++/experimental/chrono		comp-obsolete		obsolete
-./usr/include/c++/experimental/coroutine	comp-cxx-include	libcxx
-./usr/include/c++/experimental/deque		comp-cxx-include	libcxx
 ./usr/include/c++/experimental/dynarray		comp-obsolete		obsolete
-./usr/include/c++/experimental/filesystem	comp-cxx-include	libcxx
-./usr/include/c++/experimental/forward_list	comp-cxx-include	libcxx
-./usr/include/c++/experimental/iterator		comp-cxx-include	libcxx
-./usr/include/c++/experimental/list		comp-cxx-include	libcxx
-./usr/include/c++/experimental/map		comp-cxx-include	libcxx
-./usr/include/c++/experimental/memory_resource	comp-cxx-include	libcxx
 ./usr/include/c++/experimental/optional		comp-obsolete		obsolete
-./usr/include/c++/experimental/propagate_const	comp-cxx-include	libcxx
 ./usr/include/c++/experimental/ratio		comp-obsolete		obsolete
-./usr/include/c++/experimental/regex		comp-cxx-include	libcxx
-./usr/include/c++/experimental/set		comp-cxx-include	libcxx
-./usr/include/c++/experimental/simd		comp-cxx-include	libcxx
-./usr/include/c++/experimental/string		comp-cxx-include	libcxx
 ./usr/include/c++/experimental/string_view	comp-obsolete		obsolete
 ./usr/include/c++/experimental/system_error	comp-obsolete		obsolete
 ./usr/include/c++/experimental/tuple		comp-obsolete		obsolete
-./usr/include/c++/experimental/type_traits	comp-cxx-include	libcxx
-./usr/include/c++/experimental/unordered_map	comp-cxx-include	libcxx
-./usr/include/c++/experimental/unordered_set	comp-cxx-include	libcxx
-./usr/include/c++/experimental/utility		comp-cxx-include	libcxx
-./usr/include/c++/experimental/vector		comp-cxx-include	libcxx
-./usr/include/c++/ext/__hash			comp-cxx-include	libcxx
-./usr/include/c++/ext/hash_map			comp-cxx-include	libcxx
-./usr/include/c++/ext/hash_set			comp-cxx-include	libcxx
-./usr/include/c++/filesystem			comp-cxx-include	libcxx
-./usr/include/c++/forward_list			comp-cxx-include	libcxx
-./usr/include/c++/fstream			comp-cxx-include	libcxx
-./usr/include/c++/functional			comp-cxx-include	libcxx
-./usr/include/c++/future			comp-cxx-include	libcxx
-./usr/include/c++/initializer_list		comp-cxx-include	libcxx
-./usr/include/c++/iomanip			comp-cxx-include	libcxx
-./usr/include/c++/ios				comp-cxx-include	libcxx
-./usr/include/c++/iosfwd			comp-cxx-include	libcxx
-./usr/include/c++/iostream			comp-cxx-include	libcxx
-./usr/include/c++/istream			comp-cxx-include	libcxx
-./usr/include/c++/iterator			comp-cxx-include	libcxx
-./usr/include/c++/limits			comp-cxx-include	libcxx
-./usr/include/c++/list				comp-cxx-include	libcxx
-./usr/include/c++/locale			comp-cxx-include	libcxx
-./usr/include/c++/map				comp-cxx-include	libcxx
-./usr/include/c++/math.h			comp-cxx-include	libcxx
-./usr/include/c++/memory			comp-cxx-include	libcxx
-./usr/include/c++/mutex				comp-cxx-include	libcxx
-./usr/include/c++/new				comp-cxx-include	libcxx
-./usr/include/c++/numeric			comp-cxx-include	libcxx
+./usr/include/c++/experimental/type_traits	comp-obsolete		obsolete
+./usr/include/c++/experimental/utility		comp-obsolete		obsolete
+./usr/include/c++/ext/__hash			comp-obsolete		obsolete
+./usr/include/c++/ext/hash_map			comp-obsolete		obsolete
+./usr/include/c++/ext/hash_set			comp-obsolete		obsolete
+./usr/include/c++/forward_list			comp-obsolete		obsolete
+./usr/include/c++/fstream			comp-obsolete		obsolete
+./usr/include/c++/functional			comp-obsolete		obsolete
+./usr/include/c++/future			comp-obsolete		obsolete
+./usr/include/c++/initializer_list		comp-obsolete		obsolete
+./usr/include/c++/iomanip			comp-obsolete		obsolete
+./usr/include/c++/ios				comp-obsolete		obsolete
+./usr/include/c++/iosfwd			comp-obsolete		obsolete
+./usr/include/c++/iostream			comp-obsolete		obsolete
+./usr/include/c++/istream			comp-obsolete		obsolete
+./usr/include/c++/iterator			comp-obsolete		obsolete
+./usr/include/c++/limits			comp-obsolete		obsolete
+./usr/include/c++/list				comp-obsolete		obsolete
+./usr/include/c++/locale			comp-obsolete		obsolete
+./usr/include/c++/map				comp-obsolete		obsolete
+./usr/include/c++/memory			comp-obsolete		obsolete
+./usr/include/c++/mutex				comp-obsolete		obsolete
+./usr/include/c++/new				comp-obsolete		obsolete
+./usr/include/c++/numeric			comp-obsolete		obsolete
 ./usr/include/c++/optional			comp-obsolete		obsolete
-./usr/include/c++/ostream			comp-cxx-include	libcxx
-./usr/include/c++/queue				comp-cxx-include	libcxx
-./usr/include/c++/random			comp-cxx-include	libcxx
-./usr/include/c++/ratio				comp-cxx-include	libcxx
-./usr/include/c++/regex				comp-cxx-include	libcxx
-./usr/include/c++/scoped_allocator		comp-cxx-include	libcxx
-./usr/include/c++/set				comp-cxx-include	libcxx
-./usr/include/c++/shared_mutex			comp-cxx-include	libcxx
-./usr/include/c++/span				comp-cxx-include	libcxx
-./usr/include/c++/sstream			comp-cxx-include	libcxx
-./usr/include/c++/stack				comp-cxx-include	libcxx
-./usr/include/c++/stdexcept			comp-cxx-include	libcxx
-./usr/include/c++/streambuf			comp-cxx-include	libcxx
-./usr/include/c++/string			comp-cxx-include	libcxx
-./usr/include/c++/string_view			comp-cxx-include	libcxx
-./usr/include/c++/strstream			comp-cxx-include	libcxx
-./usr/include/c++/system_error			comp-cxx-include	libcxx
-./usr/include/c++/tgmath.h			comp-cxx-include	libcxx
-./usr/include/c++/thread			comp-cxx-include	libcxx
-./usr/include/c++/tuple				comp-cxx-include	libcxx
-./usr/include/c++/type_traits			comp-cxx-include	libcxx
-./usr/include/c++/typeindex			comp-cxx-include	libcxx
-./usr/include/c++/typeinfo			comp-cxx-include	libcxx
-./usr/include/c++/unordered_map			comp-cxx-include	libcxx
-./usr/include/c++/unordered_set			comp-cxx-include	libcxx
-./usr/include/c++/utility			comp-cxx-include	libcxx
-./usr/include/c++/valarray			comp-cxx-include	libcxx
-./usr/include/c++/variant			comp-cxx-include	libcxx
-./usr/include/c++/vector			comp-cxx-include	libcxx
-./usr/include/c++/version			comp-cxx-include	libcxx
+./usr/include/c++/ostream			comp-obsolete		obsolete
+./usr/include/c++/queue				comp-obsolete		obsolete
+./usr/include/c++/random			comp-obsolete		obsolete
+./usr/include/c++/ratio				comp-obsolete		obsolete
+./usr/include/c++/regex				comp-obsolete		obsolete
+./usr/include/c++/scoped_allocator		comp-obsolete		obsolete
+./usr/include/c++/set				comp-obsolete		obsolete
+./usr/include/c++/shared_mutex			comp-obsolete		obsolete
+./usr/include/c++/sstream			comp-obsolete		obsolete
+./usr/include/c++/stack				comp-obsolete		obsolete
+./usr/include/c++/stdexcept			comp-obsolete		obsolete
+./usr/include/c++/streambuf			comp-obsolete		obsolete
+./usr/include/c++/string			comp-obsolete		obsolete
+./usr/include/c++/strstream			comp-obsolete		obsolete
+./usr/include/c++/system_error			comp-obsolete		obsolete
+./usr/include/c++/tgmath.h			comp-obsolete		obsolete
+./usr/include/c++/thread			comp-obsolete		obsolete
+./usr/include/c++/tuple				comp-obsolete		obsolete
+./usr/include/c++/type_traits			comp-obsolete		obsolete
+./usr/include/c++/typeindex			comp-obsolete		obsolete
+./usr/include/c++/typeinfo			comp-obsolete		obsolete
+./usr/include/c++/unordered_map			comp-obsolete		obsolete
+./usr/include/c++/unordered_set			comp-obsolete		obsolete
+./usr/include/c++/utility			comp-obsolete		obsolete
+./usr/include/c++/valarray			comp-obsolete		obsolete
+./usr/include/c++/vector			comp-obsolete		obsolete
+./usr/include/c++/v1/__bit_reference		comp-cxx-include	libcxx
+./usr/include/c++/v1/__bsd_locale_defaults.h	comp-cxx-include	libcxx
+./usr/include/c++/v1/__bsd_locale_fallbacks.h	comp-cxx-include	libcxx
+./usr/include/c++/v1/__config			comp-cxx-include	libcxx
+./usr/include/c++/v1/__debug			comp-cxx-include	libcxx
+./usr/include/c++/v1/__errc			comp-cxx-include	libcxx
+./usr/include/c++/v1/__functional_03		comp-cxx-include	libcxx
+./usr/include/c++/v1/__functional_base		comp-cxx-include	libcxx
+./usr/include/c++/v1/__functional_base_03	comp-cxx-include	libcxx
+./usr/include/c++/v1/__hash_table		comp-cxx-include	libcxx
+./usr/include/c++/v1/__libcpp_version		comp-cxx-include	libcxx
+./usr/include/c++/v1/__locale			comp-cxx-include	libcxx
+./usr/include/c++/v1/__mutex_base		comp-cxx-include	libcxx
+./usr/include/c++/v1/__node_handle		comp-cxx-include	libcxx
+./usr/include/c++/v1/__nullptr			comp-cxx-include	libcxx
+./usr/include/c++/v1/__split_buffer		comp-cxx-include	libcxx
+./usr/include/c++/v1/__sso_allocator		comp-cxx-include	libcxx
+./usr/include/c++/v1/__std_stream		comp-cxx-include	libcxx
+./usr/include/c++/v1/__string			comp-cxx-include	libcxx
+./usr/include/c++/v1/__threading_support	comp-cxx-include	libcxx
+./usr/include/c++/v1/__tree			comp-cxx-include	libcxx
+./usr/include/c++/v1/__tuple			comp-cxx-include	libcxx
+./usr/include/c++/v1/__undef_macros		comp-cxx-include	libcxx
+./usr/include/c++/v1/algorithm			comp-cxx-include	libcxx
+./usr/include/c++/v1/any			comp-cxx-include	libcxx
+./usr/include/c++/v1/array			comp-cxx-include	libcxx
+./usr/include/c++/v1/atomic			comp-cxx-include	libcxx
+./usr/include/c++/v1/bit			comp-cxx-include	libcxx
+./usr/include/c++/v1/bitset			comp-cxx-include	libcxx
+./usr/include/c++/v1/cassert			comp-cxx-include	libcxx
+./usr/include/c++/v1/ccomplex			comp-cxx-include	libcxx
+./usr/include/c++/v1/cctype			comp-cxx-include	libcxx
+./usr/include/c++/v1/cerrno			comp-cxx-include	libcxx
+./usr/include/c++/v1/cfenv				comp-cxx-include	libcxx
+./usr/include/c++/v1/cfloat			comp-cxx-include	libcxx
+./usr/include/c++/v1/charconv			comp-cxx-include	libcxx
+./usr/include/c++/v1/chrono			comp-cxx-include	libcxx
+./usr/include/c++/v1/cinttypes			comp-cxx-include	libcxx
+./usr/include/c++/v1/ciso646			comp-cxx-include	libcxx
+./usr/include/c++/v1/climits			comp-cxx-include	libcxx
+./usr/include/c++/v1/clocale			comp-cxx-include	libcxx
+./usr/include/c++/v1/cmath				comp-cxx-include	libcxx
+./usr/include/c++/v1/codecvt			comp-cxx-include	libcxx
+./usr/include/c++/v1/compare			comp-cxx-include	libcxx
+./usr/include/c++/v1/complex			comp-cxx-include	libcxx
+./usr/include/c++/v1/complex.h			comp-cxx-include	libcxx
+./usr/include/c++/v1/condition_variable		comp-cxx-include	libcxx
+./usr/include/c++/v1/csetjmp			comp-cxx-include	libcxx
+./usr/include/c++/v1/csignal			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstdarg			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstdbool			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstddef			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstdint			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstdio			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstdlib			comp-cxx-include	libcxx
+./usr/include/c++/v1/cstring			comp-cxx-include	libcxx
+./usr/include/c++/v1/ctgmath			comp-cxx-include	libcxx
+./usr/include/c++/v1/ctime			comp-cxx-include	libcxx
+./usr/include/c++/v1/cwchar			comp-cxx-include	libcxx
+./usr/include/c++/v1/cwctype			comp-cxx-include	libcxx
+./usr/include/c++/v1/cxxabi.h			comp-cxx-include	libcxx
+./usr/include/c++/v1/deque			comp-cxx-include	libcxx
+./usr/include/c++/v1/exception			comp-cxx-include	libcxx
+./usr/include/c++/v1/execution			comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/__config	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/__memory	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/algorithm	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/coroutine	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/deque		comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/filesystem	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/forward_list	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/iterator	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/list		comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/map		comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/memory_resource	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/propagate_const	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/regex		comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/set		comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/simd		comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/string	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/type_traits	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/unordered_map	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/unordered_set	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/utility	comp-cxx-include	libcxx
+./usr/include/c++/v1/experimental/vector	comp-cxx-include	libcxx
+./usr/include/c++/v1/ext/__hash			comp-cxx-include	libcxx
+./usr/include/c++/v1/ext/hash_map		comp-cxx-include	libcxx
+./usr/include/c++/v1/ext/hash_set		comp-cxx-include	libcxx
+./usr/include/c++/v1/filesystem			comp-cxx-include	libcxx
+./usr/include/c++/v1/forward_list		comp-cxx-include	libcxx
+./usr/include/c++/v1/fstream			comp-cxx-include	libcxx
+./usr/include/c++/v1/functional			comp-cxx-include	libcxx
+./usr/include/c++/v1/future			comp-cxx-include	libcxx
+./usr/include/c++/v1/initializer_list		comp-cxx-include	libcxx
+./usr/include/c++/v1/iomanip			comp-cxx-include	libcxx
+./usr/include/c++/v1/ios			comp-cxx-include	libcxx
+./usr/include/c++/v1/iosfwd			comp-cxx-include	libcxx
+./usr/include/c++/v1/iostream			comp-cxx-include	libcxx
+./usr/include/c++/v1/istream			comp-cxx-include	libcxx
+./usr/include/c++/v1/iterator			comp-cxx-include	libcxx
+./usr/include/c++/v1/limits			comp-cxx-include	libcxx
+./usr/include/c++/v1/list			comp-cxx-include	libcxx
+./usr/include/c++/v1/locale			comp-cxx-include	libcxx
+./usr/include/c++/v1/map			comp-cxx-include	libcxx
+./usr/include/c++/v1/math.h			comp-cxx-include	libcxx
+./usr/include/c++/v1/memory			comp-cxx-include	libcxx
+./usr/include/c++/v1/mutex			comp-cxx-include	libcxx
+./usr/include/c++/v1/new			comp-cxx-include	libcxx
+./usr/include/c++/v1/numeric			comp-cxx-include	libcxx
+./usr/include/c++/v1/optional			comp-cxx-include	libcxx
+./usr/include/c++/v1/ostream			comp-cxx-include	libcxx
+./usr/include/c++/v1/queue			comp-cxx-include	libcxx
+./usr/include/c++/v1/random			comp-cxx-include	libcxx
+./usr/include/c++/v1/ratio			comp-cxx-include	libcxx
+./usr/include/c++/v1/regex			comp-cxx-include	libcxx
+./usr/include/c++/v1/scoped_allocator		comp-cxx-include	libcxx
+./usr/include/c++/v1/set			comp-cxx-include	libcxx
+./usr/include/c++/v1/shared_mutex		comp-cxx-include	libcxx
+./usr/include/c++/v1/span			comp-cxx-include	libcxx
+./usr/include/c++/v1/sstream			comp-cxx-include	libcxx
+./usr/include/c++/v1/stack			comp-cxx-include	libcxx
+./usr/include/c++/v1/stdexcept			comp-cxx-include	libcxx
+./usr/include/c++/v1/streambuf			comp-cxx-include	libcxx
+./usr/include/c++/v1/string			comp-cxx-include	libcxx
+./usr/include/c++/v1/string_view		comp-cxx-include	libcxx
+./usr/include/c++/v1/strstream			comp-cxx-include	libcxx
+./usr/include/c++/v1/system_error		comp-cxx-include	libcxx
+./usr/include/c++/v1/tgmath.h			comp-cxx-include	libcxx
+./usr/include/c++/v1/thread			comp-cxx-include	libcxx
+./usr/include/c++/v1/tuple			comp-cxx-include	libcxx
+./usr/include/c++/v1/type_traits		comp-cxx-include	libcxx
+./usr/include/c++/v1/typeindex			comp-cxx-include	libcxx
+./usr/include/c++/v1/typeinfo			comp-cxx-include	libcxx
+./usr/include/c++/v1/unordered_map		comp-cxx-include	libcxx
+./usr/include/c++/v1/unordered_set		comp-cxx-include	libcxx
+./usr/include/c++/v1/utility			comp-cxx-include	libcxx
+./usr/include/c++/v1/valarray			comp-cxx-include	libcxx
+./usr/include/c++/v1/variant			comp-cxx-include	libcxx
+./usr/include/c++/v1/vector			comp-cxx-include	libcxx
+./usr/include/c++/v1/version			comp-cxx-include	libcxx
 ./usr/include/cbor				comp-c-include
 ./usr/include/cbor.h				comp-c-include
 ./usr/include/cbor/arrays.h			comp-c-include
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index 19e077ecb445..82d084baf138 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -109,8 +109,9 @@
 ./usr/include/atf-c
 ./usr/include/atf-c++
 ./usr/include/c++
-./usr/include/c++/experimental
-./usr/include/c++/ext
+./usr/include/c++/v1
+./usr/include/c++/v1/experimental
+./usr/include/c++/v1/ext
 ./usr/include/cbor
 ./usr/include/clang-9.0
 ./usr/include/crypto
diff --git a/external/bsd/libc++/include/Makefile b/external/bsd/libc++/include/Makefile
index 805749b47199..249756e375d3 100644
--- a/external/bsd/libc++/include/Makefile
+++ b/external/bsd/libc++/include/Makefile
@@ -4,7 +4,7 @@
 
 .PATH: ${LIBCXX_SRCDIR}/include
 
-INCSDIR=	/usr/include/c++
+INCSDIR=	/usr/include/c++/v1
 
 INCS=	__bit_reference \
 	__bsd_locale_defaults.h \
-- 
2.25.1