diff --git a/build.zig b/build.zig
index 6a707621fc3a..034388db3c54 100644
--- a/build.zig
+++ b/build.zig
@@ -94,7 +94,7 @@ pub fn build(b: *std.Build) !void {
     const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false;
     const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false;
     const skip_windows = b.option(bool, "skip-windows", "Main test suite skips targets with windows OS") orelse false;
-    const skip_macos = b.option(bool, "skip-macos", "Main test suite skips targets with macos OS") orelse false;
+    const skip_darwin = b.option(bool, "skip-darwin", "Main test suite skips targets with darwin OSs") orelse false;
     const skip_linux = b.option(bool, "skip-linux", "Main test suite skips targets with linux OS") orelse false;
     const skip_llvm = b.option(bool, "skip-llvm", "Main test suite skips targets that use LLVM backend") orelse false;
 
@@ -423,7 +423,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -454,7 +454,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -477,7 +477,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = true,
@@ -499,7 +499,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = true,
@@ -521,7 +521,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -562,7 +562,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_release = skip_release,
diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh
index 2c8071dfc1b5..ae2fdbce61d6 100755
--- a/ci/x86_64-freebsd-debug.sh
+++ b/ci/x86_64-freebsd-debug.sh
@@ -49,7 +49,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   --test-timeout 2m
diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh
index 9e0439a33e9d..39d653cc97b4 100755
--- a/ci/x86_64-freebsd-release.sh
+++ b/ci/x86_64-freebsd-release.sh
@@ -49,7 +49,7 @@ stage3-release/bin/zig build test docs \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   --test-timeout 2m
diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh
index 44b0a506bbc5..3c11820352b5 100755
--- a/ci/x86_64-linux-debug-llvm.sh
+++ b/ci/x86_64-linux-debug-llvm.sh
@@ -57,7 +57,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-freebsd \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh
index d2274d4bf811..fb2804487776 100755
--- a/ci/x86_64-linux-debug.sh
+++ b/ci/x86_64-linux-debug.sh
@@ -56,7 +56,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-freebsd \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   -Dskip-llvm \
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
diff --git a/lib/libc/include/any-macos-any/AssertMacros.h b/lib/libc/include/any-darwin-any/AssertMacros.h
similarity index 100%
rename from lib/libc/include/any-macos-any/AssertMacros.h
rename to lib/libc/include/any-darwin-any/AssertMacros.h
diff --git a/lib/libc/include/any-macos-any/Availability.h b/lib/libc/include/any-darwin-any/Availability.h
similarity index 100%
rename from lib/libc/include/any-macos-any/Availability.h
rename to lib/libc/include/any-darwin-any/Availability.h
diff --git a/lib/libc/include/any-macos-any/AvailabilityInternal.h b/lib/libc/include/any-darwin-any/AvailabilityInternal.h
similarity index 100%
rename from lib/libc/include/any-macos-any/AvailabilityInternal.h
rename to lib/libc/include/any-darwin-any/AvailabilityInternal.h
diff --git a/lib/libc/include/any-macos-any/AvailabilityInternalLegacy.h b/lib/libc/include/any-darwin-any/AvailabilityInternalLegacy.h
similarity index 100%
rename from lib/libc/include/any-macos-any/AvailabilityInternalLegacy.h
rename to lib/libc/include/any-darwin-any/AvailabilityInternalLegacy.h
diff --git a/lib/libc/include/any-macos-any/AvailabilityMacros.h b/lib/libc/include/any-darwin-any/AvailabilityMacros.h
similarity index 100%
rename from lib/libc/include/any-macos-any/AvailabilityMacros.h
rename to lib/libc/include/any-darwin-any/AvailabilityMacros.h
diff --git a/lib/libc/include/any-macos-any/AvailabilityVersions.h b/lib/libc/include/any-darwin-any/AvailabilityVersions.h
similarity index 100%
rename from lib/libc/include/any-macos-any/AvailabilityVersions.h
rename to lib/libc/include/any-darwin-any/AvailabilityVersions.h
diff --git a/lib/libc/include/any-macos-any/Block.h b/lib/libc/include/any-darwin-any/Block.h
similarity index 100%
rename from lib/libc/include/any-macos-any/Block.h
rename to lib/libc/include/any-darwin-any/Block.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonCrypto.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonCrypto.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonCrypto.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonCrypto.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonCryptoError.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonCryptoError.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonCryptoError.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonCryptoError.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonCryptor.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonCryptor.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonCryptor.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonCryptor.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonDigest.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonDigest.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonDigest.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonDigest.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonHMAC.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonHMAC.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonHMAC.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonHMAC.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonKeyDerivation.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonKeyDerivation.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonKeyDerivation.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonKeyDerivation.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonRandom.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonRandom.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonRandom.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonRandom.h
diff --git a/lib/libc/include/any-macos-any/CommonCrypto/CommonSymmetricKeywrap.h b/lib/libc/include/any-darwin-any/CommonCrypto/CommonSymmetricKeywrap.h
similarity index 100%
rename from lib/libc/include/any-macos-any/CommonCrypto/CommonSymmetricKeywrap.h
rename to lib/libc/include/any-darwin-any/CommonCrypto/CommonSymmetricKeywrap.h
diff --git a/lib/libc/include/any-macos-any/ConditionalMacros.h b/lib/libc/include/any-darwin-any/ConditionalMacros.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ConditionalMacros.h
rename to lib/libc/include/any-darwin-any/ConditionalMacros.h
diff --git a/lib/libc/include/any-macos-any/MacTypes.h b/lib/libc/include/any-darwin-any/MacTypes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/MacTypes.h
rename to lib/libc/include/any-darwin-any/MacTypes.h
diff --git a/lib/libc/include/any-macos-any/TargetConditionals.h b/lib/libc/include/any-darwin-any/TargetConditionals.h
similarity index 100%
rename from lib/libc/include/any-macos-any/TargetConditionals.h
rename to lib/libc/include/any-darwin-any/TargetConditionals.h
diff --git a/lib/libc/include/any-macos-any/___wctype.h b/lib/libc/include/any-darwin-any/___wctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/___wctype.h
rename to lib/libc/include/any-darwin-any/___wctype.h
diff --git a/lib/libc/include/any-macos-any/__wctype.h b/lib/libc/include/any-darwin-any/__wctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/__wctype.h
rename to lib/libc/include/any-darwin-any/__wctype.h
diff --git a/lib/libc/include/any-macos-any/__xlocale.h b/lib/libc/include/any-darwin-any/__xlocale.h
similarity index 100%
rename from lib/libc/include/any-macos-any/__xlocale.h
rename to lib/libc/include/any-darwin-any/__xlocale.h
diff --git a/lib/libc/include/any-macos-any/_abort.h b/lib/libc/include/any-darwin-any/_abort.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_abort.h
rename to lib/libc/include/any-darwin-any/_abort.h
diff --git a/lib/libc/include/any-macos-any/_assert.h b/lib/libc/include/any-darwin-any/_assert.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_assert.h
rename to lib/libc/include/any-darwin-any/_assert.h
diff --git a/lib/libc/include/any-macos-any/_bounds.h b/lib/libc/include/any-darwin-any/_bounds.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_bounds.h
rename to lib/libc/include/any-darwin-any/_bounds.h
diff --git a/lib/libc/include/any-macos-any/_ctermid.h b/lib/libc/include/any-darwin-any/_ctermid.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_ctermid.h
rename to lib/libc/include/any-darwin-any/_ctermid.h
diff --git a/lib/libc/include/any-macos-any/_ctype.h b/lib/libc/include/any-darwin-any/_ctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_ctype.h
rename to lib/libc/include/any-darwin-any/_ctype.h
diff --git a/lib/libc/include/any-macos-any/_inttypes.h b/lib/libc/include/any-darwin-any/_inttypes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_inttypes.h
rename to lib/libc/include/any-darwin-any/_inttypes.h
diff --git a/lib/libc/include/any-macos-any/_langinfo.h b/lib/libc/include/any-darwin-any/_langinfo.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_langinfo.h
rename to lib/libc/include/any-darwin-any/_langinfo.h
diff --git a/lib/libc/include/any-macos-any/_locale.h b/lib/libc/include/any-darwin-any/_locale.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_locale.h
rename to lib/libc/include/any-darwin-any/_locale.h
diff --git a/lib/libc/include/any-macos-any/_locale_posix2008.h b/lib/libc/include/any-darwin-any/_locale_posix2008.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_locale_posix2008.h
rename to lib/libc/include/any-darwin-any/_locale_posix2008.h
diff --git a/lib/libc/include/any-macos-any/_mb_cur_max.h b/lib/libc/include/any-darwin-any/_mb_cur_max.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_mb_cur_max.h
rename to lib/libc/include/any-darwin-any/_mb_cur_max.h
diff --git a/lib/libc/include/any-macos-any/_monetary.h b/lib/libc/include/any-darwin-any/_monetary.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_monetary.h
rename to lib/libc/include/any-darwin-any/_monetary.h
diff --git a/lib/libc/include/any-macos-any/_printf.h b/lib/libc/include/any-darwin-any/_printf.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_printf.h
rename to lib/libc/include/any-darwin-any/_printf.h
diff --git a/lib/libc/include/any-macos-any/_regex.h b/lib/libc/include/any-darwin-any/_regex.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_regex.h
rename to lib/libc/include/any-darwin-any/_regex.h
diff --git a/lib/libc/include/any-macos-any/_static_assert.h b/lib/libc/include/any-darwin-any/_static_assert.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_static_assert.h
rename to lib/libc/include/any-darwin-any/_static_assert.h
diff --git a/lib/libc/include/any-macos-any/_stdio.h b/lib/libc/include/any-darwin-any/_stdio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_stdio.h
rename to lib/libc/include/any-darwin-any/_stdio.h
diff --git a/lib/libc/include/any-macos-any/_stdlib.h b/lib/libc/include/any-darwin-any/_stdlib.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_stdlib.h
rename to lib/libc/include/any-darwin-any/_stdlib.h
diff --git a/lib/libc/include/any-macos-any/_string.h b/lib/libc/include/any-darwin-any/_string.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_string.h
rename to lib/libc/include/any-darwin-any/_string.h
diff --git a/lib/libc/include/any-macos-any/_strings.h b/lib/libc/include/any-darwin-any/_strings.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_strings.h
rename to lib/libc/include/any-darwin-any/_strings.h
diff --git a/lib/libc/include/any-macos-any/_time.h b/lib/libc/include/any-darwin-any/_time.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_time.h
rename to lib/libc/include/any-darwin-any/_time.h
diff --git a/lib/libc/include/any-macos-any/_types.h b/lib/libc/include/any-darwin-any/_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types.h
rename to lib/libc/include/any-darwin-any/_types.h
diff --git a/lib/libc/include/any-macos-any/_types/_intmax_t.h b/lib/libc/include/any-darwin-any/_types/_intmax_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_intmax_t.h
rename to lib/libc/include/any-darwin-any/_types/_intmax_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_locale_t.h b/lib/libc/include/any-darwin-any/_types/_locale_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_locale_t.h
rename to lib/libc/include/any-darwin-any/_types/_locale_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_nl_item.h b/lib/libc/include/any-darwin-any/_types/_nl_item.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_nl_item.h
rename to lib/libc/include/any-darwin-any/_types/_nl_item.h
diff --git a/lib/libc/include/any-macos-any/_types/_uint16_t.h b/lib/libc/include/any-darwin-any/_types/_uint16_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_uint16_t.h
rename to lib/libc/include/any-darwin-any/_types/_uint16_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_uint32_t.h b/lib/libc/include/any-darwin-any/_types/_uint32_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_uint32_t.h
rename to lib/libc/include/any-darwin-any/_types/_uint32_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_uint64_t.h b/lib/libc/include/any-darwin-any/_types/_uint64_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_uint64_t.h
rename to lib/libc/include/any-darwin-any/_types/_uint64_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_uint8_t.h b/lib/libc/include/any-darwin-any/_types/_uint8_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_uint8_t.h
rename to lib/libc/include/any-darwin-any/_types/_uint8_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_uintmax_t.h b/lib/libc/include/any-darwin-any/_types/_uintmax_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_uintmax_t.h
rename to lib/libc/include/any-darwin-any/_types/_uintmax_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_wctrans_t.h b/lib/libc/include/any-darwin-any/_types/_wctrans_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_wctrans_t.h
rename to lib/libc/include/any-darwin-any/_types/_wctrans_t.h
diff --git a/lib/libc/include/any-macos-any/_types/_wctype_t.h b/lib/libc/include/any-darwin-any/_types/_wctype_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_types/_wctype_t.h
rename to lib/libc/include/any-darwin-any/_types/_wctype_t.h
diff --git a/lib/libc/include/any-macos-any/_wchar.h b/lib/libc/include/any-darwin-any/_wchar.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_wchar.h
rename to lib/libc/include/any-darwin-any/_wchar.h
diff --git a/lib/libc/include/any-macos-any/_wctype.h b/lib/libc/include/any-darwin-any/_wctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_wctype.h
rename to lib/libc/include/any-darwin-any/_wctype.h
diff --git a/lib/libc/include/any-macos-any/_xlocale.h b/lib/libc/include/any-darwin-any/_xlocale.h
similarity index 100%
rename from lib/libc/include/any-macos-any/_xlocale.h
rename to lib/libc/include/any-darwin-any/_xlocale.h
diff --git a/lib/libc/include/any-macos-any/aio.h b/lib/libc/include/any-darwin-any/aio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/aio.h
rename to lib/libc/include/any-darwin-any/aio.h
diff --git a/lib/libc/include/any-macos-any/alloca.h b/lib/libc/include/any-darwin-any/alloca.h
similarity index 100%
rename from lib/libc/include/any-macos-any/alloca.h
rename to lib/libc/include/any-darwin-any/alloca.h
diff --git a/lib/libc/include/any-macos-any/ar.h b/lib/libc/include/any-darwin-any/ar.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ar.h
rename to lib/libc/include/any-darwin-any/ar.h
diff --git a/lib/libc/include/any-macos-any/architecture/byte_order.h b/lib/libc/include/any-darwin-any/architecture/byte_order.h
similarity index 100%
rename from lib/libc/include/any-macos-any/architecture/byte_order.h
rename to lib/libc/include/any-darwin-any/architecture/byte_order.h
diff --git a/lib/libc/include/any-macos-any/arm/_endian.h b/lib/libc/include/any-darwin-any/arm/_endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/_endian.h
rename to lib/libc/include/any-darwin-any/arm/_endian.h
diff --git a/lib/libc/include/any-macos-any/arm/_limits.h b/lib/libc/include/any-darwin-any/arm/_limits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/_limits.h
rename to lib/libc/include/any-darwin-any/arm/_limits.h
diff --git a/lib/libc/include/any-macos-any/arm/_mcontext.h b/lib/libc/include/any-darwin-any/arm/_mcontext.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/_mcontext.h
rename to lib/libc/include/any-darwin-any/arm/_mcontext.h
diff --git a/lib/libc/include/any-macos-any/arm/_param.h b/lib/libc/include/any-darwin-any/arm/_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/_param.h
rename to lib/libc/include/any-darwin-any/arm/_param.h
diff --git a/lib/libc/include/any-macos-any/arm/_types.h b/lib/libc/include/any-darwin-any/arm/_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/_types.h
rename to lib/libc/include/any-darwin-any/arm/_types.h
diff --git a/lib/libc/include/any-macos-any/arm/arch.h b/lib/libc/include/any-darwin-any/arm/arch.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/arch.h
rename to lib/libc/include/any-darwin-any/arm/arch.h
diff --git a/lib/libc/include/any-macos-any/arm/endian.h b/lib/libc/include/any-darwin-any/arm/endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/endian.h
rename to lib/libc/include/any-darwin-any/arm/endian.h
diff --git a/lib/libc/include/any-macos-any/arm/limits.h b/lib/libc/include/any-darwin-any/arm/limits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/limits.h
rename to lib/libc/include/any-darwin-any/arm/limits.h
diff --git a/lib/libc/include/any-macos-any/arm/param.h b/lib/libc/include/any-darwin-any/arm/param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/param.h
rename to lib/libc/include/any-darwin-any/arm/param.h
diff --git a/lib/libc/include/any-macos-any/arm/signal.h b/lib/libc/include/any-darwin-any/arm/signal.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/signal.h
rename to lib/libc/include/any-darwin-any/arm/signal.h
diff --git a/lib/libc/include/any-macos-any/arm/types.h b/lib/libc/include/any-darwin-any/arm/types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arm/types.h
rename to lib/libc/include/any-darwin-any/arm/types.h
diff --git a/lib/libc/include/any-macos-any/arpa/inet.h b/lib/libc/include/any-darwin-any/arpa/inet.h
similarity index 100%
rename from lib/libc/include/any-macos-any/arpa/inet.h
rename to lib/libc/include/any-darwin-any/arpa/inet.h
diff --git a/lib/libc/include/any-macos-any/assert.h b/lib/libc/include/any-darwin-any/assert.h
similarity index 100%
rename from lib/libc/include/any-macos-any/assert.h
rename to lib/libc/include/any-darwin-any/assert.h
diff --git a/lib/libc/include/any-macos-any/bsm/audit.h b/lib/libc/include/any-darwin-any/bsm/audit.h
similarity index 100%
rename from lib/libc/include/any-macos-any/bsm/audit.h
rename to lib/libc/include/any-darwin-any/bsm/audit.h
diff --git a/lib/libc/include/any-macos-any/complex.h b/lib/libc/include/any-darwin-any/complex.h
similarity index 100%
rename from lib/libc/include/any-macos-any/complex.h
rename to lib/libc/include/any-darwin-any/complex.h
diff --git a/lib/libc/include/any-macos-any/copyfile.h b/lib/libc/include/any-darwin-any/copyfile.h
similarity index 100%
rename from lib/libc/include/any-macos-any/copyfile.h
rename to lib/libc/include/any-darwin-any/copyfile.h
diff --git a/lib/libc/include/any-macos-any/cpio.h b/lib/libc/include/any-darwin-any/cpio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/cpio.h
rename to lib/libc/include/any-darwin-any/cpio.h
diff --git a/lib/libc/include/any-macos-any/crt_externs.h b/lib/libc/include/any-darwin-any/crt_externs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/crt_externs.h
rename to lib/libc/include/any-darwin-any/crt_externs.h
diff --git a/lib/libc/include/any-macos-any/ctype.h b/lib/libc/include/any-darwin-any/ctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ctype.h
rename to lib/libc/include/any-darwin-any/ctype.h
diff --git a/lib/libc/include/any-macos-any/db.h b/lib/libc/include/any-darwin-any/db.h
similarity index 100%
rename from lib/libc/include/any-macos-any/db.h
rename to lib/libc/include/any-darwin-any/db.h
diff --git a/lib/libc/include/any-macos-any/device/device_types.h b/lib/libc/include/any-darwin-any/device/device_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/device/device_types.h
rename to lib/libc/include/any-darwin-any/device/device_types.h
diff --git a/lib/libc/include/any-macos-any/dirent.h b/lib/libc/include/any-darwin-any/dirent.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dirent.h
rename to lib/libc/include/any-darwin-any/dirent.h
diff --git a/lib/libc/include/any-macos-any/dispatch/base.h b/lib/libc/include/any-darwin-any/dispatch/base.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/base.h
rename to lib/libc/include/any-darwin-any/dispatch/base.h
diff --git a/lib/libc/include/any-macos-any/dispatch/block.h b/lib/libc/include/any-darwin-any/dispatch/block.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/block.h
rename to lib/libc/include/any-darwin-any/dispatch/block.h
diff --git a/lib/libc/include/any-macos-any/dispatch/data.h b/lib/libc/include/any-darwin-any/dispatch/data.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/data.h
rename to lib/libc/include/any-darwin-any/dispatch/data.h
diff --git a/lib/libc/include/any-macos-any/dispatch/dispatch.h b/lib/libc/include/any-darwin-any/dispatch/dispatch.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/dispatch.h
rename to lib/libc/include/any-darwin-any/dispatch/dispatch.h
diff --git a/lib/libc/include/any-macos-any/dispatch/dispatch_swift_shims.h b/lib/libc/include/any-darwin-any/dispatch/dispatch_swift_shims.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/dispatch_swift_shims.h
rename to lib/libc/include/any-darwin-any/dispatch/dispatch_swift_shims.h
diff --git a/lib/libc/include/any-macos-any/dispatch/group.h b/lib/libc/include/any-darwin-any/dispatch/group.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/group.h
rename to lib/libc/include/any-darwin-any/dispatch/group.h
diff --git a/lib/libc/include/any-macos-any/dispatch/io.h b/lib/libc/include/any-darwin-any/dispatch/io.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/io.h
rename to lib/libc/include/any-darwin-any/dispatch/io.h
diff --git a/lib/libc/include/any-macos-any/dispatch/object.h b/lib/libc/include/any-darwin-any/dispatch/object.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/object.h
rename to lib/libc/include/any-darwin-any/dispatch/object.h
diff --git a/lib/libc/include/any-macos-any/dispatch/once.h b/lib/libc/include/any-darwin-any/dispatch/once.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/once.h
rename to lib/libc/include/any-darwin-any/dispatch/once.h
diff --git a/lib/libc/include/any-macos-any/dispatch/queue.h b/lib/libc/include/any-darwin-any/dispatch/queue.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/queue.h
rename to lib/libc/include/any-darwin-any/dispatch/queue.h
diff --git a/lib/libc/include/any-macos-any/dispatch/semaphore.h b/lib/libc/include/any-darwin-any/dispatch/semaphore.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/semaphore.h
rename to lib/libc/include/any-darwin-any/dispatch/semaphore.h
diff --git a/lib/libc/include/any-macos-any/dispatch/source.h b/lib/libc/include/any-darwin-any/dispatch/source.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/source.h
rename to lib/libc/include/any-darwin-any/dispatch/source.h
diff --git a/lib/libc/include/any-macos-any/dispatch/time.h b/lib/libc/include/any-darwin-any/dispatch/time.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/time.h
rename to lib/libc/include/any-darwin-any/dispatch/time.h
diff --git a/lib/libc/include/any-macos-any/dispatch/workloop.h b/lib/libc/include/any-darwin-any/dispatch/workloop.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dispatch/workloop.h
rename to lib/libc/include/any-darwin-any/dispatch/workloop.h
diff --git a/lib/libc/include/any-macos-any/dlfcn.h b/lib/libc/include/any-darwin-any/dlfcn.h
similarity index 100%
rename from lib/libc/include/any-macos-any/dlfcn.h
rename to lib/libc/include/any-darwin-any/dlfcn.h
diff --git a/lib/libc/include/any-macos-any/err.h b/lib/libc/include/any-darwin-any/err.h
similarity index 100%
rename from lib/libc/include/any-macos-any/err.h
rename to lib/libc/include/any-darwin-any/err.h
diff --git a/lib/libc/include/any-macos-any/errno.h b/lib/libc/include/any-darwin-any/errno.h
similarity index 100%
rename from lib/libc/include/any-macos-any/errno.h
rename to lib/libc/include/any-darwin-any/errno.h
diff --git a/lib/libc/include/any-macos-any/execinfo.h b/lib/libc/include/any-darwin-any/execinfo.h
similarity index 100%
rename from lib/libc/include/any-macos-any/execinfo.h
rename to lib/libc/include/any-darwin-any/execinfo.h
diff --git a/lib/libc/include/any-macos-any/fcntl.h b/lib/libc/include/any-darwin-any/fcntl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/fcntl.h
rename to lib/libc/include/any-darwin-any/fcntl.h
diff --git a/lib/libc/include/any-macos-any/fenv.h b/lib/libc/include/any-darwin-any/fenv.h
similarity index 100%
rename from lib/libc/include/any-macos-any/fenv.h
rename to lib/libc/include/any-darwin-any/fenv.h
diff --git a/lib/libc/include/any-macos-any/float.h b/lib/libc/include/any-darwin-any/float.h
similarity index 100%
rename from lib/libc/include/any-macos-any/float.h
rename to lib/libc/include/any-darwin-any/float.h
diff --git a/lib/libc/include/any-macos-any/fmtmsg.h b/lib/libc/include/any-darwin-any/fmtmsg.h
similarity index 100%
rename from lib/libc/include/any-macos-any/fmtmsg.h
rename to lib/libc/include/any-darwin-any/fmtmsg.h
diff --git a/lib/libc/include/any-macos-any/fnmatch.h b/lib/libc/include/any-darwin-any/fnmatch.h
similarity index 100%
rename from lib/libc/include/any-macos-any/fnmatch.h
rename to lib/libc/include/any-darwin-any/fnmatch.h
diff --git a/lib/libc/include/any-macos-any/fts.h b/lib/libc/include/any-darwin-any/fts.h
similarity index 100%
rename from lib/libc/include/any-macos-any/fts.h
rename to lib/libc/include/any-darwin-any/fts.h
diff --git a/lib/libc/include/any-macos-any/ftw.h b/lib/libc/include/any-darwin-any/ftw.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ftw.h
rename to lib/libc/include/any-darwin-any/ftw.h
diff --git a/lib/libc/include/any-macos-any/gethostuuid.h b/lib/libc/include/any-darwin-any/gethostuuid.h
similarity index 100%
rename from lib/libc/include/any-macos-any/gethostuuid.h
rename to lib/libc/include/any-darwin-any/gethostuuid.h
diff --git a/lib/libc/include/any-macos-any/getopt.h b/lib/libc/include/any-darwin-any/getopt.h
similarity index 100%
rename from lib/libc/include/any-macos-any/getopt.h
rename to lib/libc/include/any-darwin-any/getopt.h
diff --git a/lib/libc/include/any-macos-any/glob.h b/lib/libc/include/any-darwin-any/glob.h
similarity index 100%
rename from lib/libc/include/any-macos-any/glob.h
rename to lib/libc/include/any-darwin-any/glob.h
diff --git a/lib/libc/include/any-macos-any/grp.h b/lib/libc/include/any-darwin-any/grp.h
similarity index 100%
rename from lib/libc/include/any-macos-any/grp.h
rename to lib/libc/include/any-darwin-any/grp.h
diff --git a/lib/libc/include/any-macos-any/hfs/hfs_format.h b/lib/libc/include/any-darwin-any/hfs/hfs_format.h
similarity index 100%
rename from lib/libc/include/any-macos-any/hfs/hfs_format.h
rename to lib/libc/include/any-darwin-any/hfs/hfs_format.h
diff --git a/lib/libc/include/any-macos-any/hfs/hfs_unistr.h b/lib/libc/include/any-darwin-any/hfs/hfs_unistr.h
similarity index 100%
rename from lib/libc/include/any-macos-any/hfs/hfs_unistr.h
rename to lib/libc/include/any-darwin-any/hfs/hfs_unistr.h
diff --git a/lib/libc/include/any-macos-any/i386/_endian.h b/lib/libc/include/any-darwin-any/i386/_endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/_endian.h
rename to lib/libc/include/any-darwin-any/i386/_endian.h
diff --git a/lib/libc/include/any-macos-any/i386/_limits.h b/lib/libc/include/any-darwin-any/i386/_limits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/_limits.h
rename to lib/libc/include/any-darwin-any/i386/_limits.h
diff --git a/lib/libc/include/any-macos-any/i386/_mcontext.h b/lib/libc/include/any-darwin-any/i386/_mcontext.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/_mcontext.h
rename to lib/libc/include/any-darwin-any/i386/_mcontext.h
diff --git a/lib/libc/include/any-macos-any/i386/_param.h b/lib/libc/include/any-darwin-any/i386/_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/_param.h
rename to lib/libc/include/any-darwin-any/i386/_param.h
diff --git a/lib/libc/include/any-macos-any/i386/_types.h b/lib/libc/include/any-darwin-any/i386/_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/_types.h
rename to lib/libc/include/any-darwin-any/i386/_types.h
diff --git a/lib/libc/include/any-macos-any/i386/eflags.h b/lib/libc/include/any-darwin-any/i386/eflags.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/eflags.h
rename to lib/libc/include/any-darwin-any/i386/eflags.h
diff --git a/lib/libc/include/any-macos-any/i386/endian.h b/lib/libc/include/any-darwin-any/i386/endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/endian.h
rename to lib/libc/include/any-darwin-any/i386/endian.h
diff --git a/lib/libc/include/any-macos-any/i386/limits.h b/lib/libc/include/any-darwin-any/i386/limits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/limits.h
rename to lib/libc/include/any-darwin-any/i386/limits.h
diff --git a/lib/libc/include/any-macos-any/i386/param.h b/lib/libc/include/any-darwin-any/i386/param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/param.h
rename to lib/libc/include/any-darwin-any/i386/param.h
diff --git a/lib/libc/include/any-macos-any/i386/signal.h b/lib/libc/include/any-darwin-any/i386/signal.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/signal.h
rename to lib/libc/include/any-darwin-any/i386/signal.h
diff --git a/lib/libc/include/any-macos-any/i386/types.h b/lib/libc/include/any-darwin-any/i386/types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/i386/types.h
rename to lib/libc/include/any-darwin-any/i386/types.h
diff --git a/lib/libc/include/any-macos-any/iconv.h b/lib/libc/include/any-darwin-any/iconv.h
similarity index 100%
rename from lib/libc/include/any-macos-any/iconv.h
rename to lib/libc/include/any-darwin-any/iconv.h
diff --git a/lib/libc/include/any-macos-any/ifaddrs.h b/lib/libc/include/any-darwin-any/ifaddrs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ifaddrs.h
rename to lib/libc/include/any-darwin-any/ifaddrs.h
diff --git a/lib/libc/include/any-macos-any/inttypes.h b/lib/libc/include/any-darwin-any/inttypes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/inttypes.h
rename to lib/libc/include/any-darwin-any/inttypes.h
diff --git a/lib/libc/include/any-macos-any/iso646.h b/lib/libc/include/any-darwin-any/iso646.h
similarity index 100%
rename from lib/libc/include/any-macos-any/iso646.h
rename to lib/libc/include/any-darwin-any/iso646.h
diff --git a/lib/libc/include/any-macos-any/langinfo.h b/lib/libc/include/any-darwin-any/langinfo.h
similarity index 100%
rename from lib/libc/include/any-macos-any/langinfo.h
rename to lib/libc/include/any-darwin-any/langinfo.h
diff --git a/lib/libc/include/any-macos-any/launch.h b/lib/libc/include/any-darwin-any/launch.h
similarity index 100%
rename from lib/libc/include/any-macos-any/launch.h
rename to lib/libc/include/any-darwin-any/launch.h
diff --git a/lib/libc/include/any-macos-any/libgen.h b/lib/libc/include/any-darwin-any/libgen.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libgen.h
rename to lib/libc/include/any-darwin-any/libgen.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSAtomic.h b/lib/libc/include/any-darwin-any/libkern/OSAtomic.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSAtomic.h
rename to lib/libc/include/any-darwin-any/libkern/OSAtomic.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSAtomicDeprecated.h b/lib/libc/include/any-darwin-any/libkern/OSAtomicDeprecated.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSAtomicDeprecated.h
rename to lib/libc/include/any-darwin-any/libkern/OSAtomicDeprecated.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSAtomicQueue.h b/lib/libc/include/any-darwin-any/libkern/OSAtomicQueue.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSAtomicQueue.h
rename to lib/libc/include/any-darwin-any/libkern/OSAtomicQueue.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSByteOrder.h b/lib/libc/include/any-darwin-any/libkern/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSByteOrder.h
rename to lib/libc/include/any-darwin-any/libkern/OSByteOrder.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSCacheControl.h b/lib/libc/include/any-darwin-any/libkern/OSCacheControl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSCacheControl.h
rename to lib/libc/include/any-darwin-any/libkern/OSCacheControl.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSDebug.h b/lib/libc/include/any-darwin-any/libkern/OSDebug.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSDebug.h
rename to lib/libc/include/any-darwin-any/libkern/OSDebug.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSKextLib.h b/lib/libc/include/any-darwin-any/libkern/OSKextLib.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSKextLib.h
rename to lib/libc/include/any-darwin-any/libkern/OSKextLib.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSReturn.h b/lib/libc/include/any-darwin-any/libkern/OSReturn.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSReturn.h
rename to lib/libc/include/any-darwin-any/libkern/OSReturn.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSSpinLockDeprecated.h b/lib/libc/include/any-darwin-any/libkern/OSSpinLockDeprecated.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSSpinLockDeprecated.h
rename to lib/libc/include/any-darwin-any/libkern/OSSpinLockDeprecated.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSThermalNotification.h b/lib/libc/include/any-darwin-any/libkern/OSThermalNotification.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSThermalNotification.h
rename to lib/libc/include/any-darwin-any/libkern/OSThermalNotification.h
diff --git a/lib/libc/include/any-macos-any/libkern/OSTypes.h b/lib/libc/include/any-darwin-any/libkern/OSTypes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/OSTypes.h
rename to lib/libc/include/any-darwin-any/libkern/OSTypes.h
diff --git a/lib/libc/include/any-macos-any/libkern/_OSByteOrder.h b/lib/libc/include/any-darwin-any/libkern/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/_OSByteOrder.h
rename to lib/libc/include/any-darwin-any/libkern/_OSByteOrder.h
diff --git a/lib/libc/include/any-macos-any/libkern/arm/OSByteOrder.h b/lib/libc/include/any-darwin-any/libkern/arm/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/arm/OSByteOrder.h
rename to lib/libc/include/any-darwin-any/libkern/arm/OSByteOrder.h
diff --git a/lib/libc/include/any-macos-any/libkern/arm/_OSByteOrder.h b/lib/libc/include/any-darwin-any/libkern/arm/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/arm/_OSByteOrder.h
rename to lib/libc/include/any-darwin-any/libkern/arm/_OSByteOrder.h
diff --git a/lib/libc/include/any-macos-any/libkern/i386/OSByteOrder.h b/lib/libc/include/any-darwin-any/libkern/i386/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/i386/OSByteOrder.h
rename to lib/libc/include/any-darwin-any/libkern/i386/OSByteOrder.h
diff --git a/lib/libc/include/any-macos-any/libkern/i386/_OSByteOrder.h b/lib/libc/include/any-darwin-any/libkern/i386/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libkern/i386/_OSByteOrder.h
rename to lib/libc/include/any-darwin-any/libkern/i386/_OSByteOrder.h
diff --git a/lib/libc/include/any-macos-any/libproc.h b/lib/libc/include/any-darwin-any/libproc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/libproc.h
rename to lib/libc/include/any-darwin-any/libproc.h
diff --git a/lib/libc/include/any-macos-any/limits.h b/lib/libc/include/any-darwin-any/limits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/limits.h
rename to lib/libc/include/any-darwin-any/limits.h
diff --git a/lib/libc/include/any-macos-any/locale.h b/lib/libc/include/any-darwin-any/locale.h
similarity index 100%
rename from lib/libc/include/any-macos-any/locale.h
rename to lib/libc/include/any-darwin-any/locale.h
diff --git a/lib/libc/include/any-macos-any/mach-o/arch.h b/lib/libc/include/any-darwin-any/mach-o/arch.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/arch.h
rename to lib/libc/include/any-darwin-any/mach-o/arch.h
diff --git a/lib/libc/include/any-macos-any/mach-o/arm64/reloc.h b/lib/libc/include/any-darwin-any/mach-o/arm64/reloc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/arm64/reloc.h
rename to lib/libc/include/any-darwin-any/mach-o/arm64/reloc.h
diff --git a/lib/libc/include/any-macos-any/mach-o/compact_unwind_encoding.h b/lib/libc/include/any-darwin-any/mach-o/compact_unwind_encoding.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/compact_unwind_encoding.h
rename to lib/libc/include/any-darwin-any/mach-o/compact_unwind_encoding.h
diff --git a/lib/libc/include/any-macos-any/mach-o/dyld.h b/lib/libc/include/any-darwin-any/mach-o/dyld.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/dyld.h
rename to lib/libc/include/any-darwin-any/mach-o/dyld.h
diff --git a/lib/libc/include/any-macos-any/mach-o/fat.h b/lib/libc/include/any-darwin-any/mach-o/fat.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/fat.h
rename to lib/libc/include/any-darwin-any/mach-o/fat.h
diff --git a/lib/libc/include/any-macos-any/mach-o/getsect.h b/lib/libc/include/any-darwin-any/mach-o/getsect.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/getsect.h
rename to lib/libc/include/any-darwin-any/mach-o/getsect.h
diff --git a/lib/libc/include/any-macos-any/mach-o/loader.h b/lib/libc/include/any-darwin-any/mach-o/loader.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/loader.h
rename to lib/libc/include/any-darwin-any/mach-o/loader.h
diff --git a/lib/libc/include/any-macos-any/mach-o/nlist.h b/lib/libc/include/any-darwin-any/mach-o/nlist.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/nlist.h
rename to lib/libc/include/any-darwin-any/mach-o/nlist.h
diff --git a/lib/libc/include/any-macos-any/mach-o/ranlib.h b/lib/libc/include/any-darwin-any/mach-o/ranlib.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/ranlib.h
rename to lib/libc/include/any-darwin-any/mach-o/ranlib.h
diff --git a/lib/libc/include/any-macos-any/mach-o/reloc.h b/lib/libc/include/any-darwin-any/mach-o/reloc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/reloc.h
rename to lib/libc/include/any-darwin-any/mach-o/reloc.h
diff --git a/lib/libc/include/any-macos-any/mach-o/stab.h b/lib/libc/include/any-darwin-any/mach-o/stab.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/stab.h
rename to lib/libc/include/any-darwin-any/mach-o/stab.h
diff --git a/lib/libc/include/any-macos-any/mach-o/x86_64/reloc.h b/lib/libc/include/any-darwin-any/mach-o/x86_64/reloc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach-o/x86_64/reloc.h
rename to lib/libc/include/any-darwin-any/mach-o/x86_64/reloc.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/_structs.h b/lib/libc/include/any-darwin-any/mach/arm/_structs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/_structs.h
rename to lib/libc/include/any-darwin-any/mach/arm/_structs.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/boolean.h b/lib/libc/include/any-darwin-any/mach/arm/boolean.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/boolean.h
rename to lib/libc/include/any-darwin-any/mach/arm/boolean.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/exception.h b/lib/libc/include/any-darwin-any/mach/arm/exception.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/exception.h
rename to lib/libc/include/any-darwin-any/mach/arm/exception.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/kern_return.h b/lib/libc/include/any-darwin-any/mach/arm/kern_return.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/kern_return.h
rename to lib/libc/include/any-darwin-any/mach/arm/kern_return.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/processor_info.h b/lib/libc/include/any-darwin-any/mach/arm/processor_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/processor_info.h
rename to lib/libc/include/any-darwin-any/mach/arm/processor_info.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/rpc.h b/lib/libc/include/any-darwin-any/mach/arm/rpc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/rpc.h
rename to lib/libc/include/any-darwin-any/mach/arm/rpc.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/thread_state.h b/lib/libc/include/any-darwin-any/mach/arm/thread_state.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/thread_state.h
rename to lib/libc/include/any-darwin-any/mach/arm/thread_state.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/thread_status.h b/lib/libc/include/any-darwin-any/mach/arm/thread_status.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/thread_status.h
rename to lib/libc/include/any-darwin-any/mach/arm/thread_status.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/vm_param.h b/lib/libc/include/any-darwin-any/mach/arm/vm_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/vm_param.h
rename to lib/libc/include/any-darwin-any/mach/arm/vm_param.h
diff --git a/lib/libc/include/any-macos-any/mach/arm/vm_types.h b/lib/libc/include/any-darwin-any/mach/arm/vm_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/arm/vm_types.h
rename to lib/libc/include/any-darwin-any/mach/arm/vm_types.h
diff --git a/lib/libc/include/any-macos-any/mach/boolean.h b/lib/libc/include/any-darwin-any/mach/boolean.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/boolean.h
rename to lib/libc/include/any-darwin-any/mach/boolean.h
diff --git a/lib/libc/include/any-macos-any/mach/clock.h b/lib/libc/include/any-darwin-any/mach/clock.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/clock.h
rename to lib/libc/include/any-darwin-any/mach/clock.h
diff --git a/lib/libc/include/any-macos-any/mach/clock_priv.h b/lib/libc/include/any-darwin-any/mach/clock_priv.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/clock_priv.h
rename to lib/libc/include/any-darwin-any/mach/clock_priv.h
diff --git a/lib/libc/include/any-macos-any/mach/clock_types.h b/lib/libc/include/any-darwin-any/mach/clock_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/clock_types.h
rename to lib/libc/include/any-darwin-any/mach/clock_types.h
diff --git a/lib/libc/include/any-macos-any/mach/dyld_kernel.h b/lib/libc/include/any-darwin-any/mach/dyld_kernel.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/dyld_kernel.h
rename to lib/libc/include/any-darwin-any/mach/dyld_kernel.h
diff --git a/lib/libc/include/any-macos-any/mach/error.h b/lib/libc/include/any-darwin-any/mach/error.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/error.h
rename to lib/libc/include/any-darwin-any/mach/error.h
diff --git a/lib/libc/include/any-macos-any/mach/exception.h b/lib/libc/include/any-darwin-any/mach/exception.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/exception.h
rename to lib/libc/include/any-darwin-any/mach/exception.h
diff --git a/lib/libc/include/any-macos-any/mach/exception_types.h b/lib/libc/include/any-darwin-any/mach/exception_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/exception_types.h
rename to lib/libc/include/any-darwin-any/mach/exception_types.h
diff --git a/lib/libc/include/any-macos-any/mach/host_info.h b/lib/libc/include/any-darwin-any/mach/host_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/host_info.h
rename to lib/libc/include/any-darwin-any/mach/host_info.h
diff --git a/lib/libc/include/any-macos-any/mach/host_notify.h b/lib/libc/include/any-darwin-any/mach/host_notify.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/host_notify.h
rename to lib/libc/include/any-darwin-any/mach/host_notify.h
diff --git a/lib/libc/include/any-macos-any/mach/host_priv.h b/lib/libc/include/any-darwin-any/mach/host_priv.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/host_priv.h
rename to lib/libc/include/any-darwin-any/mach/host_priv.h
diff --git a/lib/libc/include/any-macos-any/mach/host_security.h b/lib/libc/include/any-darwin-any/mach/host_security.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/host_security.h
rename to lib/libc/include/any-darwin-any/mach/host_security.h
diff --git a/lib/libc/include/any-macos-any/mach/host_special_ports.h b/lib/libc/include/any-darwin-any/mach/host_special_ports.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/host_special_ports.h
rename to lib/libc/include/any-darwin-any/mach/host_special_ports.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/_structs.h b/lib/libc/include/any-darwin-any/mach/i386/_structs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/_structs.h
rename to lib/libc/include/any-darwin-any/mach/i386/_structs.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/boolean.h b/lib/libc/include/any-darwin-any/mach/i386/boolean.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/boolean.h
rename to lib/libc/include/any-darwin-any/mach/i386/boolean.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/exception.h b/lib/libc/include/any-darwin-any/mach/i386/exception.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/exception.h
rename to lib/libc/include/any-darwin-any/mach/i386/exception.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/fp_reg.h b/lib/libc/include/any-darwin-any/mach/i386/fp_reg.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/fp_reg.h
rename to lib/libc/include/any-darwin-any/mach/i386/fp_reg.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/kern_return.h b/lib/libc/include/any-darwin-any/mach/i386/kern_return.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/kern_return.h
rename to lib/libc/include/any-darwin-any/mach/i386/kern_return.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/processor_info.h b/lib/libc/include/any-darwin-any/mach/i386/processor_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/processor_info.h
rename to lib/libc/include/any-darwin-any/mach/i386/processor_info.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/rpc.h b/lib/libc/include/any-darwin-any/mach/i386/rpc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/rpc.h
rename to lib/libc/include/any-darwin-any/mach/i386/rpc.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/thread_state.h b/lib/libc/include/any-darwin-any/mach/i386/thread_state.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/thread_state.h
rename to lib/libc/include/any-darwin-any/mach/i386/thread_state.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/thread_status.h b/lib/libc/include/any-darwin-any/mach/i386/thread_status.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/thread_status.h
rename to lib/libc/include/any-darwin-any/mach/i386/thread_status.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/vm_param.h b/lib/libc/include/any-darwin-any/mach/i386/vm_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/vm_param.h
rename to lib/libc/include/any-darwin-any/mach/i386/vm_param.h
diff --git a/lib/libc/include/any-macos-any/mach/i386/vm_types.h b/lib/libc/include/any-darwin-any/mach/i386/vm_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/i386/vm_types.h
rename to lib/libc/include/any-darwin-any/mach/i386/vm_types.h
diff --git a/lib/libc/include/any-macos-any/mach/kern_return.h b/lib/libc/include/any-darwin-any/mach/kern_return.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/kern_return.h
rename to lib/libc/include/any-darwin-any/mach/kern_return.h
diff --git a/lib/libc/include/any-macos-any/mach/kmod.h b/lib/libc/include/any-darwin-any/mach/kmod.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/kmod.h
rename to lib/libc/include/any-darwin-any/mach/kmod.h
diff --git a/lib/libc/include/any-macos-any/mach/mach.h b/lib/libc/include/any-darwin-any/mach/mach.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach.h
rename to lib/libc/include/any-darwin-any/mach/mach.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_error.h b/lib/libc/include/any-darwin-any/mach/mach_error.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_error.h
rename to lib/libc/include/any-darwin-any/mach/mach_error.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_host.h b/lib/libc/include/any-darwin-any/mach/mach_host.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_host.h
rename to lib/libc/include/any-darwin-any/mach/mach_host.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_init.h b/lib/libc/include/any-darwin-any/mach/mach_init.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_init.h
rename to lib/libc/include/any-darwin-any/mach/mach_init.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_interface.h b/lib/libc/include/any-darwin-any/mach/mach_interface.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_interface.h
rename to lib/libc/include/any-darwin-any/mach/mach_interface.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_port.h b/lib/libc/include/any-darwin-any/mach/mach_port.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_port.h
rename to lib/libc/include/any-darwin-any/mach/mach_port.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_time.h b/lib/libc/include/any-darwin-any/mach/mach_time.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_time.h
rename to lib/libc/include/any-darwin-any/mach/mach_time.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_traps.h b/lib/libc/include/any-darwin-any/mach/mach_traps.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_traps.h
rename to lib/libc/include/any-darwin-any/mach/mach_traps.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_types.h b/lib/libc/include/any-darwin-any/mach/mach_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_types.h
rename to lib/libc/include/any-darwin-any/mach/mach_types.h
diff --git a/lib/libc/include/any-macos-any/mach/mach_voucher_types.h b/lib/libc/include/any-darwin-any/mach/mach_voucher_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mach_voucher_types.h
rename to lib/libc/include/any-darwin-any/mach/mach_voucher_types.h
diff --git a/lib/libc/include/any-macos-any/mach/machine.h b/lib/libc/include/any-darwin-any/mach/machine.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine.h
rename to lib/libc/include/any-darwin-any/mach/machine.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/_structs.h b/lib/libc/include/any-darwin-any/mach/machine/_structs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/_structs.h
rename to lib/libc/include/any-darwin-any/mach/machine/_structs.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/boolean.h b/lib/libc/include/any-darwin-any/mach/machine/boolean.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/boolean.h
rename to lib/libc/include/any-darwin-any/mach/machine/boolean.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/exception.h b/lib/libc/include/any-darwin-any/mach/machine/exception.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/exception.h
rename to lib/libc/include/any-darwin-any/mach/machine/exception.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/kern_return.h b/lib/libc/include/any-darwin-any/mach/machine/kern_return.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/kern_return.h
rename to lib/libc/include/any-darwin-any/mach/machine/kern_return.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/processor_info.h b/lib/libc/include/any-darwin-any/mach/machine/processor_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/processor_info.h
rename to lib/libc/include/any-darwin-any/mach/machine/processor_info.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/rpc.h b/lib/libc/include/any-darwin-any/mach/machine/rpc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/rpc.h
rename to lib/libc/include/any-darwin-any/mach/machine/rpc.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/thread_state.h b/lib/libc/include/any-darwin-any/mach/machine/thread_state.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/thread_state.h
rename to lib/libc/include/any-darwin-any/mach/machine/thread_state.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/thread_status.h b/lib/libc/include/any-darwin-any/mach/machine/thread_status.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/thread_status.h
rename to lib/libc/include/any-darwin-any/mach/machine/thread_status.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/vm_param.h b/lib/libc/include/any-darwin-any/mach/machine/vm_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/vm_param.h
rename to lib/libc/include/any-darwin-any/mach/machine/vm_param.h
diff --git a/lib/libc/include/any-macos-any/mach/machine/vm_types.h b/lib/libc/include/any-darwin-any/mach/machine/vm_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/machine/vm_types.h
rename to lib/libc/include/any-darwin-any/mach/machine/vm_types.h
diff --git a/lib/libc/include/any-macos-any/mach/memory_object_types.h b/lib/libc/include/any-darwin-any/mach/memory_object_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/memory_object_types.h
rename to lib/libc/include/any-darwin-any/mach/memory_object_types.h
diff --git a/lib/libc/include/any-macos-any/mach/message.h b/lib/libc/include/any-darwin-any/mach/message.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/message.h
rename to lib/libc/include/any-darwin-any/mach/message.h
diff --git a/lib/libc/include/any-macos-any/mach/mig.h b/lib/libc/include/any-darwin-any/mach/mig.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mig.h
rename to lib/libc/include/any-darwin-any/mach/mig.h
diff --git a/lib/libc/include/any-macos-any/mach/mig_errors.h b/lib/libc/include/any-darwin-any/mach/mig_errors.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mig_errors.h
rename to lib/libc/include/any-darwin-any/mach/mig_errors.h
diff --git a/lib/libc/include/any-macos-any/mach/mig_strncpy_zerofill_support.h b/lib/libc/include/any-darwin-any/mach/mig_strncpy_zerofill_support.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/mig_strncpy_zerofill_support.h
rename to lib/libc/include/any-darwin-any/mach/mig_strncpy_zerofill_support.h
diff --git a/lib/libc/include/any-macos-any/mach/ndr.h b/lib/libc/include/any-darwin-any/mach/ndr.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/ndr.h
rename to lib/libc/include/any-darwin-any/mach/ndr.h
diff --git a/lib/libc/include/any-macos-any/mach/notify.h b/lib/libc/include/any-darwin-any/mach/notify.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/notify.h
rename to lib/libc/include/any-darwin-any/mach/notify.h
diff --git a/lib/libc/include/any-macos-any/mach/policy.h b/lib/libc/include/any-darwin-any/mach/policy.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/policy.h
rename to lib/libc/include/any-darwin-any/mach/policy.h
diff --git a/lib/libc/include/any-macos-any/mach/port.h b/lib/libc/include/any-darwin-any/mach/port.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/port.h
rename to lib/libc/include/any-darwin-any/mach/port.h
diff --git a/lib/libc/include/any-macos-any/mach/processor.h b/lib/libc/include/any-darwin-any/mach/processor.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/processor.h
rename to lib/libc/include/any-darwin-any/mach/processor.h
diff --git a/lib/libc/include/any-macos-any/mach/processor_info.h b/lib/libc/include/any-darwin-any/mach/processor_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/processor_info.h
rename to lib/libc/include/any-darwin-any/mach/processor_info.h
diff --git a/lib/libc/include/any-macos-any/mach/processor_set.h b/lib/libc/include/any-darwin-any/mach/processor_set.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/processor_set.h
rename to lib/libc/include/any-darwin-any/mach/processor_set.h
diff --git a/lib/libc/include/any-macos-any/mach/rpc.h b/lib/libc/include/any-darwin-any/mach/rpc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/rpc.h
rename to lib/libc/include/any-darwin-any/mach/rpc.h
diff --git a/lib/libc/include/any-macos-any/mach/semaphore.h b/lib/libc/include/any-darwin-any/mach/semaphore.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/semaphore.h
rename to lib/libc/include/any-darwin-any/mach/semaphore.h
diff --git a/lib/libc/include/any-macos-any/mach/std_types.h b/lib/libc/include/any-darwin-any/mach/std_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/std_types.h
rename to lib/libc/include/any-darwin-any/mach/std_types.h
diff --git a/lib/libc/include/any-macos-any/mach/sync_policy.h b/lib/libc/include/any-darwin-any/mach/sync_policy.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/sync_policy.h
rename to lib/libc/include/any-darwin-any/mach/sync_policy.h
diff --git a/lib/libc/include/any-macos-any/mach/task.h b/lib/libc/include/any-darwin-any/mach/task.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/task.h
rename to lib/libc/include/any-darwin-any/mach/task.h
diff --git a/lib/libc/include/any-macos-any/mach/task_info.h b/lib/libc/include/any-darwin-any/mach/task_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/task_info.h
rename to lib/libc/include/any-darwin-any/mach/task_info.h
diff --git a/lib/libc/include/any-macos-any/mach/task_inspect.h b/lib/libc/include/any-darwin-any/mach/task_inspect.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/task_inspect.h
rename to lib/libc/include/any-darwin-any/mach/task_inspect.h
diff --git a/lib/libc/include/any-macos-any/mach/task_policy.h b/lib/libc/include/any-darwin-any/mach/task_policy.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/task_policy.h
rename to lib/libc/include/any-darwin-any/mach/task_policy.h
diff --git a/lib/libc/include/any-macos-any/mach/task_special_ports.h b/lib/libc/include/any-darwin-any/mach/task_special_ports.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/task_special_ports.h
rename to lib/libc/include/any-darwin-any/mach/task_special_ports.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_act.h b/lib/libc/include/any-darwin-any/mach/thread_act.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_act.h
rename to lib/libc/include/any-darwin-any/mach/thread_act.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_info.h b/lib/libc/include/any-darwin-any/mach/thread_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_info.h
rename to lib/libc/include/any-darwin-any/mach/thread_info.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_policy.h b/lib/libc/include/any-darwin-any/mach/thread_policy.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_policy.h
rename to lib/libc/include/any-darwin-any/mach/thread_policy.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_special_ports.h b/lib/libc/include/any-darwin-any/mach/thread_special_ports.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_special_ports.h
rename to lib/libc/include/any-darwin-any/mach/thread_special_ports.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_state.h b/lib/libc/include/any-darwin-any/mach/thread_state.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_state.h
rename to lib/libc/include/any-darwin-any/mach/thread_state.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_status.h b/lib/libc/include/any-darwin-any/mach/thread_status.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_status.h
rename to lib/libc/include/any-darwin-any/mach/thread_status.h
diff --git a/lib/libc/include/any-macos-any/mach/thread_switch.h b/lib/libc/include/any-darwin-any/mach/thread_switch.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/thread_switch.h
rename to lib/libc/include/any-darwin-any/mach/thread_switch.h
diff --git a/lib/libc/include/any-macos-any/mach/time_value.h b/lib/libc/include/any-darwin-any/mach/time_value.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/time_value.h
rename to lib/libc/include/any-darwin-any/mach/time_value.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_attributes.h b/lib/libc/include/any-darwin-any/mach/vm_attributes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_attributes.h
rename to lib/libc/include/any-darwin-any/mach/vm_attributes.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_behavior.h b/lib/libc/include/any-darwin-any/mach/vm_behavior.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_behavior.h
rename to lib/libc/include/any-darwin-any/mach/vm_behavior.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_inherit.h b/lib/libc/include/any-darwin-any/mach/vm_inherit.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_inherit.h
rename to lib/libc/include/any-darwin-any/mach/vm_inherit.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_map.h b/lib/libc/include/any-darwin-any/mach/vm_map.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_map.h
rename to lib/libc/include/any-darwin-any/mach/vm_map.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_page_size.h b/lib/libc/include/any-darwin-any/mach/vm_page_size.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_page_size.h
rename to lib/libc/include/any-darwin-any/mach/vm_page_size.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_param.h b/lib/libc/include/any-darwin-any/mach/vm_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_param.h
rename to lib/libc/include/any-darwin-any/mach/vm_param.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_prot.h b/lib/libc/include/any-darwin-any/mach/vm_prot.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_prot.h
rename to lib/libc/include/any-darwin-any/mach/vm_prot.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_purgable.h b/lib/libc/include/any-darwin-any/mach/vm_purgable.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_purgable.h
rename to lib/libc/include/any-darwin-any/mach/vm_purgable.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_region.h b/lib/libc/include/any-darwin-any/mach/vm_region.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_region.h
rename to lib/libc/include/any-darwin-any/mach/vm_region.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_statistics.h b/lib/libc/include/any-darwin-any/mach/vm_statistics.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_statistics.h
rename to lib/libc/include/any-darwin-any/mach/vm_statistics.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_sync.h b/lib/libc/include/any-darwin-any/mach/vm_sync.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_sync.h
rename to lib/libc/include/any-darwin-any/mach/vm_sync.h
diff --git a/lib/libc/include/any-macos-any/mach/vm_types.h b/lib/libc/include/any-darwin-any/mach/vm_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach/vm_types.h
rename to lib/libc/include/any-darwin-any/mach/vm_types.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/hash_info.h b/lib/libc/include/any-darwin-any/mach_debug/hash_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/hash_info.h
rename to lib/libc/include/any-darwin-any/mach_debug/hash_info.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/ipc_info.h b/lib/libc/include/any-darwin-any/mach_debug/ipc_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/ipc_info.h
rename to lib/libc/include/any-darwin-any/mach_debug/ipc_info.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/lockgroup_info.h b/lib/libc/include/any-darwin-any/mach_debug/lockgroup_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/lockgroup_info.h
rename to lib/libc/include/any-darwin-any/mach_debug/lockgroup_info.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/mach_debug_types.h b/lib/libc/include/any-darwin-any/mach_debug/mach_debug_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/mach_debug_types.h
rename to lib/libc/include/any-darwin-any/mach_debug/mach_debug_types.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/page_info.h b/lib/libc/include/any-darwin-any/mach_debug/page_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/page_info.h
rename to lib/libc/include/any-darwin-any/mach_debug/page_info.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/vm_info.h b/lib/libc/include/any-darwin-any/mach_debug/vm_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/vm_info.h
rename to lib/libc/include/any-darwin-any/mach_debug/vm_info.h
diff --git a/lib/libc/include/any-macos-any/mach_debug/zone_info.h b/lib/libc/include/any-darwin-any/mach_debug/zone_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/mach_debug/zone_info.h
rename to lib/libc/include/any-darwin-any/mach_debug/zone_info.h
diff --git a/lib/libc/include/any-macos-any/machine/_endian.h b/lib/libc/include/any-darwin-any/machine/_endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/_endian.h
rename to lib/libc/include/any-darwin-any/machine/_endian.h
diff --git a/lib/libc/include/any-macos-any/machine/_mcontext.h b/lib/libc/include/any-darwin-any/machine/_mcontext.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/_mcontext.h
rename to lib/libc/include/any-darwin-any/machine/_mcontext.h
diff --git a/lib/libc/include/any-macos-any/machine/_param.h b/lib/libc/include/any-darwin-any/machine/_param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/_param.h
rename to lib/libc/include/any-darwin-any/machine/_param.h
diff --git a/lib/libc/include/any-macos-any/machine/_types.h b/lib/libc/include/any-darwin-any/machine/_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/_types.h
rename to lib/libc/include/any-darwin-any/machine/_types.h
diff --git a/lib/libc/include/any-macos-any/machine/endian.h b/lib/libc/include/any-darwin-any/machine/endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/endian.h
rename to lib/libc/include/any-darwin-any/machine/endian.h
diff --git a/lib/libc/include/any-macos-any/machine/limits.h b/lib/libc/include/any-darwin-any/machine/limits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/limits.h
rename to lib/libc/include/any-darwin-any/machine/limits.h
diff --git a/lib/libc/include/any-macos-any/machine/param.h b/lib/libc/include/any-darwin-any/machine/param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/param.h
rename to lib/libc/include/any-darwin-any/machine/param.h
diff --git a/lib/libc/include/any-macos-any/machine/signal.h b/lib/libc/include/any-darwin-any/machine/signal.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/signal.h
rename to lib/libc/include/any-darwin-any/machine/signal.h
diff --git a/lib/libc/include/any-macos-any/machine/types.h b/lib/libc/include/any-darwin-any/machine/types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/machine/types.h
rename to lib/libc/include/any-darwin-any/machine/types.h
diff --git a/lib/libc/include/any-macos-any/malloc/_malloc.h b/lib/libc/include/any-darwin-any/malloc/_malloc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/malloc/_malloc.h
rename to lib/libc/include/any-darwin-any/malloc/_malloc.h
diff --git a/lib/libc/include/any-macos-any/malloc/_malloc_type.h b/lib/libc/include/any-darwin-any/malloc/_malloc_type.h
similarity index 100%
rename from lib/libc/include/any-macos-any/malloc/_malloc_type.h
rename to lib/libc/include/any-darwin-any/malloc/_malloc_type.h
diff --git a/lib/libc/include/any-macos-any/malloc/_platform.h b/lib/libc/include/any-darwin-any/malloc/_platform.h
similarity index 100%
rename from lib/libc/include/any-macos-any/malloc/_platform.h
rename to lib/libc/include/any-darwin-any/malloc/_platform.h
diff --git a/lib/libc/include/any-macos-any/malloc/_ptrcheck.h b/lib/libc/include/any-darwin-any/malloc/_ptrcheck.h
similarity index 100%
rename from lib/libc/include/any-macos-any/malloc/_ptrcheck.h
rename to lib/libc/include/any-darwin-any/malloc/_ptrcheck.h
diff --git a/lib/libc/include/any-macos-any/malloc/malloc.h b/lib/libc/include/any-darwin-any/malloc/malloc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/malloc/malloc.h
rename to lib/libc/include/any-darwin-any/malloc/malloc.h
diff --git a/lib/libc/include/any-macos-any/math.h b/lib/libc/include/any-darwin-any/math.h
similarity index 100%
rename from lib/libc/include/any-macos-any/math.h
rename to lib/libc/include/any-darwin-any/math.h
diff --git a/lib/libc/include/any-macos-any/memory.h b/lib/libc/include/any-darwin-any/memory.h
similarity index 100%
rename from lib/libc/include/any-macos-any/memory.h
rename to lib/libc/include/any-darwin-any/memory.h
diff --git a/lib/libc/include/any-macos-any/monetary.h b/lib/libc/include/any-darwin-any/monetary.h
similarity index 100%
rename from lib/libc/include/any-macos-any/monetary.h
rename to lib/libc/include/any-darwin-any/monetary.h
diff --git a/lib/libc/include/any-macos-any/ndbm.h b/lib/libc/include/any-darwin-any/ndbm.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ndbm.h
rename to lib/libc/include/any-darwin-any/ndbm.h
diff --git a/lib/libc/include/any-macos-any/net/if.h b/lib/libc/include/any-darwin-any/net/if.h
similarity index 100%
rename from lib/libc/include/any-macos-any/net/if.h
rename to lib/libc/include/any-darwin-any/net/if.h
diff --git a/lib/libc/include/any-macos-any/net/if_dl.h b/lib/libc/include/any-darwin-any/net/if_dl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/net/if_dl.h
rename to lib/libc/include/any-darwin-any/net/if_dl.h
diff --git a/lib/libc/include/any-macos-any/net/if_var.h b/lib/libc/include/any-darwin-any/net/if_var.h
similarity index 100%
rename from lib/libc/include/any-macos-any/net/if_var.h
rename to lib/libc/include/any-darwin-any/net/if_var.h
diff --git a/lib/libc/include/any-macos-any/net/net_kev.h b/lib/libc/include/any-darwin-any/net/net_kev.h
similarity index 100%
rename from lib/libc/include/any-macos-any/net/net_kev.h
rename to lib/libc/include/any-darwin-any/net/net_kev.h
diff --git a/lib/libc/include/any-macos-any/net/route.h b/lib/libc/include/any-darwin-any/net/route.h
similarity index 100%
rename from lib/libc/include/any-macos-any/net/route.h
rename to lib/libc/include/any-darwin-any/net/route.h
diff --git a/lib/libc/include/any-macos-any/netdb.h b/lib/libc/include/any-darwin-any/netdb.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netdb.h
rename to lib/libc/include/any-darwin-any/netdb.h
diff --git a/lib/libc/include/any-macos-any/netinet/in.h b/lib/libc/include/any-darwin-any/netinet/in.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netinet/in.h
rename to lib/libc/include/any-darwin-any/netinet/in.h
diff --git a/lib/libc/include/any-macos-any/netinet/in_systm.h b/lib/libc/include/any-darwin-any/netinet/in_systm.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netinet/in_systm.h
rename to lib/libc/include/any-darwin-any/netinet/in_systm.h
diff --git a/lib/libc/include/any-macos-any/netinet/ip.h b/lib/libc/include/any-darwin-any/netinet/ip.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netinet/ip.h
rename to lib/libc/include/any-darwin-any/netinet/ip.h
diff --git a/lib/libc/include/any-macos-any/netinet/tcp.h b/lib/libc/include/any-darwin-any/netinet/tcp.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netinet/tcp.h
rename to lib/libc/include/any-darwin-any/netinet/tcp.h
diff --git a/lib/libc/include/any-macos-any/netinet/udp.h b/lib/libc/include/any-darwin-any/netinet/udp.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netinet/udp.h
rename to lib/libc/include/any-darwin-any/netinet/udp.h
diff --git a/lib/libc/include/any-macos-any/netinet6/in6.h b/lib/libc/include/any-darwin-any/netinet6/in6.h
similarity index 100%
rename from lib/libc/include/any-macos-any/netinet6/in6.h
rename to lib/libc/include/any-darwin-any/netinet6/in6.h
diff --git a/lib/libc/include/any-macos-any/nl_types.h b/lib/libc/include/any-darwin-any/nl_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/nl_types.h
rename to lib/libc/include/any-darwin-any/nl_types.h
diff --git a/lib/libc/include/any-macos-any/objc/NSObjCRuntime.h b/lib/libc/include/any-darwin-any/objc/NSObjCRuntime.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/NSObjCRuntime.h
rename to lib/libc/include/any-darwin-any/objc/NSObjCRuntime.h
diff --git a/lib/libc/include/any-macos-any/objc/NSObject.h b/lib/libc/include/any-darwin-any/objc/NSObject.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/NSObject.h
rename to lib/libc/include/any-darwin-any/objc/NSObject.h
diff --git a/lib/libc/include/any-macos-any/objc/message.h b/lib/libc/include/any-darwin-any/objc/message.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/message.h
rename to lib/libc/include/any-darwin-any/objc/message.h
diff --git a/lib/libc/include/any-macos-any/objc/objc-api.h b/lib/libc/include/any-darwin-any/objc/objc-api.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/objc-api.h
rename to lib/libc/include/any-darwin-any/objc/objc-api.h
diff --git a/lib/libc/include/any-macos-any/objc/objc-runtime.h b/lib/libc/include/any-darwin-any/objc/objc-runtime.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/objc-runtime.h
rename to lib/libc/include/any-darwin-any/objc/objc-runtime.h
diff --git a/lib/libc/include/any-macos-any/objc/objc.h b/lib/libc/include/any-darwin-any/objc/objc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/objc.h
rename to lib/libc/include/any-darwin-any/objc/objc.h
diff --git a/lib/libc/include/any-macos-any/objc/runtime.h b/lib/libc/include/any-darwin-any/objc/runtime.h
similarity index 100%
rename from lib/libc/include/any-macos-any/objc/runtime.h
rename to lib/libc/include/any-darwin-any/objc/runtime.h
diff --git a/lib/libc/include/any-macos-any/os/availability.h b/lib/libc/include/any-darwin-any/os/availability.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/availability.h
rename to lib/libc/include/any-darwin-any/os/availability.h
diff --git a/lib/libc/include/any-macos-any/os/base.h b/lib/libc/include/any-darwin-any/os/base.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/base.h
rename to lib/libc/include/any-darwin-any/os/base.h
diff --git a/lib/libc/include/any-macos-any/os/clock.h b/lib/libc/include/any-darwin-any/os/clock.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/clock.h
rename to lib/libc/include/any-darwin-any/os/clock.h
diff --git a/lib/libc/include/any-macos-any/os/lock.h b/lib/libc/include/any-darwin-any/os/lock.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/lock.h
rename to lib/libc/include/any-darwin-any/os/lock.h
diff --git a/lib/libc/include/any-macos-any/os/object.h b/lib/libc/include/any-darwin-any/os/object.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/object.h
rename to lib/libc/include/any-darwin-any/os/object.h
diff --git a/lib/libc/include/any-macos-any/os/workgroup.h b/lib/libc/include/any-darwin-any/os/workgroup.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/workgroup.h
rename to lib/libc/include/any-darwin-any/os/workgroup.h
diff --git a/lib/libc/include/any-macos-any/os/workgroup_base.h b/lib/libc/include/any-darwin-any/os/workgroup_base.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/workgroup_base.h
rename to lib/libc/include/any-darwin-any/os/workgroup_base.h
diff --git a/lib/libc/include/any-macos-any/os/workgroup_interval.h b/lib/libc/include/any-darwin-any/os/workgroup_interval.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/workgroup_interval.h
rename to lib/libc/include/any-darwin-any/os/workgroup_interval.h
diff --git a/lib/libc/include/any-macos-any/os/workgroup_object.h b/lib/libc/include/any-darwin-any/os/workgroup_object.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/workgroup_object.h
rename to lib/libc/include/any-darwin-any/os/workgroup_object.h
diff --git a/lib/libc/include/any-macos-any/os/workgroup_parallel.h b/lib/libc/include/any-darwin-any/os/workgroup_parallel.h
similarity index 100%
rename from lib/libc/include/any-macos-any/os/workgroup_parallel.h
rename to lib/libc/include/any-darwin-any/os/workgroup_parallel.h
diff --git a/lib/libc/include/any-macos-any/paths.h b/lib/libc/include/any-darwin-any/paths.h
similarity index 100%
rename from lib/libc/include/any-macos-any/paths.h
rename to lib/libc/include/any-darwin-any/paths.h
diff --git a/lib/libc/include/any-macos-any/poll.h b/lib/libc/include/any-darwin-any/poll.h
similarity index 100%
rename from lib/libc/include/any-macos-any/poll.h
rename to lib/libc/include/any-darwin-any/poll.h
diff --git a/lib/libc/include/any-macos-any/pthread.h b/lib/libc/include/any-darwin-any/pthread.h
similarity index 100%
rename from lib/libc/include/any-macos-any/pthread.h
rename to lib/libc/include/any-darwin-any/pthread.h
diff --git a/lib/libc/include/any-macos-any/pthread/pthread_impl.h b/lib/libc/include/any-darwin-any/pthread/pthread_impl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/pthread/pthread_impl.h
rename to lib/libc/include/any-darwin-any/pthread/pthread_impl.h
diff --git a/lib/libc/include/any-macos-any/pthread/qos.h b/lib/libc/include/any-darwin-any/pthread/qos.h
similarity index 100%
rename from lib/libc/include/any-macos-any/pthread/qos.h
rename to lib/libc/include/any-darwin-any/pthread/qos.h
diff --git a/lib/libc/include/any-macos-any/pthread/sched.h b/lib/libc/include/any-darwin-any/pthread/sched.h
similarity index 100%
rename from lib/libc/include/any-macos-any/pthread/sched.h
rename to lib/libc/include/any-darwin-any/pthread/sched.h
diff --git a/lib/libc/include/any-macos-any/pwd.h b/lib/libc/include/any-darwin-any/pwd.h
similarity index 100%
rename from lib/libc/include/any-macos-any/pwd.h
rename to lib/libc/include/any-darwin-any/pwd.h
diff --git a/lib/libc/include/any-macos-any/regex.h b/lib/libc/include/any-darwin-any/regex.h
similarity index 100%
rename from lib/libc/include/any-macos-any/regex.h
rename to lib/libc/include/any-darwin-any/regex.h
diff --git a/lib/libc/include/any-macos-any/runetype.h b/lib/libc/include/any-darwin-any/runetype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/runetype.h
rename to lib/libc/include/any-darwin-any/runetype.h
diff --git a/lib/libc/include/any-macos-any/sched.h b/lib/libc/include/any-darwin-any/sched.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sched.h
rename to lib/libc/include/any-darwin-any/sched.h
diff --git a/lib/libc/include/any-macos-any/search.h b/lib/libc/include/any-darwin-any/search.h
similarity index 100%
rename from lib/libc/include/any-macos-any/search.h
rename to lib/libc/include/any-darwin-any/search.h
diff --git a/lib/libc/include/any-macos-any/secure/_common.h b/lib/libc/include/any-darwin-any/secure/_common.h
similarity index 100%
rename from lib/libc/include/any-macos-any/secure/_common.h
rename to lib/libc/include/any-darwin-any/secure/_common.h
diff --git a/lib/libc/include/any-macos-any/secure/_stdio.h b/lib/libc/include/any-darwin-any/secure/_stdio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/secure/_stdio.h
rename to lib/libc/include/any-darwin-any/secure/_stdio.h
diff --git a/lib/libc/include/any-macos-any/secure/_string.h b/lib/libc/include/any-darwin-any/secure/_string.h
similarity index 100%
rename from lib/libc/include/any-macos-any/secure/_string.h
rename to lib/libc/include/any-darwin-any/secure/_string.h
diff --git a/lib/libc/include/any-macos-any/secure/_strings.h b/lib/libc/include/any-darwin-any/secure/_strings.h
similarity index 100%
rename from lib/libc/include/any-macos-any/secure/_strings.h
rename to lib/libc/include/any-darwin-any/secure/_strings.h
diff --git a/lib/libc/include/any-macos-any/semaphore.h b/lib/libc/include/any-darwin-any/semaphore.h
similarity index 100%
rename from lib/libc/include/any-macos-any/semaphore.h
rename to lib/libc/include/any-darwin-any/semaphore.h
diff --git a/lib/libc/include/any-macos-any/setjmp.h b/lib/libc/include/any-darwin-any/setjmp.h
similarity index 100%
rename from lib/libc/include/any-macos-any/setjmp.h
rename to lib/libc/include/any-darwin-any/setjmp.h
diff --git a/lib/libc/include/any-macos-any/signal.h b/lib/libc/include/any-darwin-any/signal.h
similarity index 100%
rename from lib/libc/include/any-macos-any/signal.h
rename to lib/libc/include/any-darwin-any/signal.h
diff --git a/lib/libc/include/any-macos-any/simd/base.h b/lib/libc/include/any-darwin-any/simd/base.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/base.h
rename to lib/libc/include/any-darwin-any/simd/base.h
diff --git a/lib/libc/include/any-macos-any/simd/common.h b/lib/libc/include/any-darwin-any/simd/common.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/common.h
rename to lib/libc/include/any-darwin-any/simd/common.h
diff --git a/lib/libc/include/any-macos-any/simd/conversion.h b/lib/libc/include/any-darwin-any/simd/conversion.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/conversion.h
rename to lib/libc/include/any-darwin-any/simd/conversion.h
diff --git a/lib/libc/include/any-macos-any/simd/extern.h b/lib/libc/include/any-darwin-any/simd/extern.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/extern.h
rename to lib/libc/include/any-darwin-any/simd/extern.h
diff --git a/lib/libc/include/any-macos-any/simd/geometry.h b/lib/libc/include/any-darwin-any/simd/geometry.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/geometry.h
rename to lib/libc/include/any-darwin-any/simd/geometry.h
diff --git a/lib/libc/include/any-macos-any/simd/logic.h b/lib/libc/include/any-darwin-any/simd/logic.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/logic.h
rename to lib/libc/include/any-darwin-any/simd/logic.h
diff --git a/lib/libc/include/any-macos-any/simd/math.h b/lib/libc/include/any-darwin-any/simd/math.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/math.h
rename to lib/libc/include/any-darwin-any/simd/math.h
diff --git a/lib/libc/include/any-macos-any/simd/matrix.h b/lib/libc/include/any-darwin-any/simd/matrix.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/matrix.h
rename to lib/libc/include/any-darwin-any/simd/matrix.h
diff --git a/lib/libc/include/any-macos-any/simd/matrix_types.h b/lib/libc/include/any-darwin-any/simd/matrix_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/matrix_types.h
rename to lib/libc/include/any-darwin-any/simd/matrix_types.h
diff --git a/lib/libc/include/any-macos-any/simd/packed.h b/lib/libc/include/any-darwin-any/simd/packed.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/packed.h
rename to lib/libc/include/any-darwin-any/simd/packed.h
diff --git a/lib/libc/include/any-macos-any/simd/quaternion.h b/lib/libc/include/any-darwin-any/simd/quaternion.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/quaternion.h
rename to lib/libc/include/any-darwin-any/simd/quaternion.h
diff --git a/lib/libc/include/any-macos-any/simd/simd.h b/lib/libc/include/any-darwin-any/simd/simd.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/simd.h
rename to lib/libc/include/any-darwin-any/simd/simd.h
diff --git a/lib/libc/include/any-macos-any/simd/types.h b/lib/libc/include/any-darwin-any/simd/types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/types.h
rename to lib/libc/include/any-darwin-any/simd/types.h
diff --git a/lib/libc/include/any-macos-any/simd/vector.h b/lib/libc/include/any-darwin-any/simd/vector.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/vector.h
rename to lib/libc/include/any-darwin-any/simd/vector.h
diff --git a/lib/libc/include/any-macos-any/simd/vector_make.h b/lib/libc/include/any-darwin-any/simd/vector_make.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/vector_make.h
rename to lib/libc/include/any-darwin-any/simd/vector_make.h
diff --git a/lib/libc/include/any-macos-any/simd/vector_types.h b/lib/libc/include/any-darwin-any/simd/vector_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/simd/vector_types.h
rename to lib/libc/include/any-darwin-any/simd/vector_types.h
diff --git a/lib/libc/include/any-macos-any/spawn.h b/lib/libc/include/any-darwin-any/spawn.h
similarity index 100%
rename from lib/libc/include/any-macos-any/spawn.h
rename to lib/libc/include/any-darwin-any/spawn.h
diff --git a/lib/libc/include/any-macos-any/stddef.h b/lib/libc/include/any-darwin-any/stddef.h
similarity index 100%
rename from lib/libc/include/any-macos-any/stddef.h
rename to lib/libc/include/any-darwin-any/stddef.h
diff --git a/lib/libc/include/any-macos-any/stdint.h b/lib/libc/include/any-darwin-any/stdint.h
similarity index 100%
rename from lib/libc/include/any-macos-any/stdint.h
rename to lib/libc/include/any-darwin-any/stdint.h
diff --git a/lib/libc/include/any-macos-any/stdio.h b/lib/libc/include/any-darwin-any/stdio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/stdio.h
rename to lib/libc/include/any-darwin-any/stdio.h
diff --git a/lib/libc/include/any-macos-any/stdlib.h b/lib/libc/include/any-darwin-any/stdlib.h
similarity index 100%
rename from lib/libc/include/any-macos-any/stdlib.h
rename to lib/libc/include/any-darwin-any/stdlib.h
diff --git a/lib/libc/include/any-macos-any/string.h b/lib/libc/include/any-darwin-any/string.h
similarity index 100%
rename from lib/libc/include/any-macos-any/string.h
rename to lib/libc/include/any-darwin-any/string.h
diff --git a/lib/libc/include/any-macos-any/strings.h b/lib/libc/include/any-darwin-any/strings.h
similarity index 100%
rename from lib/libc/include/any-macos-any/strings.h
rename to lib/libc/include/any-darwin-any/strings.h
diff --git a/lib/libc/include/any-macos-any/sys/__endian.h b/lib/libc/include/any-darwin-any/sys/__endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/__endian.h
rename to lib/libc/include/any-darwin-any/sys/__endian.h
diff --git a/lib/libc/include/any-macos-any/sys/_endian.h b/lib/libc/include/any-darwin-any/sys/_endian.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_endian.h
rename to lib/libc/include/any-darwin-any/sys/_endian.h
diff --git a/lib/libc/include/any-macos-any/sys/_posix_availability.h b/lib/libc/include/any-darwin-any/sys/_posix_availability.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_posix_availability.h
rename to lib/libc/include/any-darwin-any/sys/_posix_availability.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_attr_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_attr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_attr_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_attr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_cond_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_cond_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_cond_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_cond_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_condattr_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_condattr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_condattr_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_condattr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_key_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_key_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_key_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_key_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_mutex_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_mutex_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_mutex_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_mutex_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_mutexattr_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_mutexattr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_mutexattr_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_mutexattr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_once_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_once_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_once_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_once_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_rwlock_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_rwlock_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_rwlock_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_rwlock_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_rwlockattr_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_rwlockattr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_rwlockattr_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_rwlockattr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_t.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_t.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_pthread/_pthread_types.h b/lib/libc/include/any-darwin-any/sys/_pthread/_pthread_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_pthread/_pthread_types.h
rename to lib/libc/include/any-darwin-any/sys/_pthread/_pthread_types.h
diff --git a/lib/libc/include/any-macos-any/sys/_select.h b/lib/libc/include/any-darwin-any/sys/_select.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_select.h
rename to lib/libc/include/any-darwin-any/sys/_select.h
diff --git a/lib/libc/include/any-macos-any/sys/_symbol_aliasing.h b/lib/libc/include/any-darwin-any/sys/_symbol_aliasing.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_symbol_aliasing.h
rename to lib/libc/include/any-darwin-any/sys/_symbol_aliasing.h
diff --git a/lib/libc/include/any-macos-any/sys/_types.h b/lib/libc/include/any-darwin-any/sys/_types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types.h
rename to lib/libc/include/any-darwin-any/sys/_types.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_blkcnt_t.h b/lib/libc/include/any-darwin-any/sys/_types/_blkcnt_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_blkcnt_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_blkcnt_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_blksize_t.h b/lib/libc/include/any-darwin-any/sys/_types/_blksize_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_blksize_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_blksize_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_caddr_t.h b/lib/libc/include/any-darwin-any/sys/_types/_caddr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_caddr_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_caddr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_clock_t.h b/lib/libc/include/any-darwin-any/sys/_types/_clock_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_clock_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_clock_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_ct_rune_t.h b/lib/libc/include/any-darwin-any/sys/_types/_ct_rune_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_ct_rune_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_ct_rune_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_dev_t.h b/lib/libc/include/any-darwin-any/sys/_types/_dev_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_dev_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_dev_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_errno_t.h b/lib/libc/include/any-darwin-any/sys/_types/_errno_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_errno_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_errno_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_clr.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_clr.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_clr.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_clr.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_copy.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_copy.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_copy.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_copy.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_def.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_def.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_def.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_def.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_isset.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_isset.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_isset.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_isset.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_set.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_set.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_set.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_set.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_setsize.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_setsize.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_setsize.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_setsize.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fd_zero.h b/lib/libc/include/any-darwin-any/sys/_types/_fd_zero.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fd_zero.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fd_zero.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_filesec_t.h b/lib/libc/include/any-darwin-any/sys/_types/_filesec_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_filesec_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_filesec_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fsblkcnt_t.h b/lib/libc/include/any-darwin-any/sys/_types/_fsblkcnt_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fsblkcnt_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fsblkcnt_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fsfilcnt_t.h b/lib/libc/include/any-darwin-any/sys/_types/_fsfilcnt_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fsfilcnt_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fsfilcnt_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fsid_t.h b/lib/libc/include/any-darwin-any/sys/_types/_fsid_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fsid_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fsid_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_fsobj_id_t.h b/lib/libc/include/any-darwin-any/sys/_types/_fsobj_id_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_fsobj_id_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_fsobj_id_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_gid_t.h b/lib/libc/include/any-darwin-any/sys/_types/_gid_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_gid_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_gid_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_graftdmg_un.h b/lib/libc/include/any-darwin-any/sys/_types/_graftdmg_un.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_graftdmg_un.h
rename to lib/libc/include/any-darwin-any/sys/_types/_graftdmg_un.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_guid_t.h b/lib/libc/include/any-darwin-any/sys/_types/_guid_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_guid_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_guid_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_id_t.h b/lib/libc/include/any-darwin-any/sys/_types/_id_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_id_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_id_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_in_addr_t.h b/lib/libc/include/any-darwin-any/sys/_types/_in_addr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_in_addr_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_in_addr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_in_port_t.h b/lib/libc/include/any-darwin-any/sys/_types/_in_port_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_in_port_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_in_port_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_ino64_t.h b/lib/libc/include/any-darwin-any/sys/_types/_ino64_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_ino64_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_ino64_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_ino_t.h b/lib/libc/include/any-darwin-any/sys/_types/_ino_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_ino_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_ino_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_int16_t.h b/lib/libc/include/any-darwin-any/sys/_types/_int16_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_int16_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_int16_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_int32_t.h b/lib/libc/include/any-darwin-any/sys/_types/_int32_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_int32_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_int32_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_int64_t.h b/lib/libc/include/any-darwin-any/sys/_types/_int64_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_int64_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_int64_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_int8_t.h b/lib/libc/include/any-darwin-any/sys/_types/_int8_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_int8_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_int8_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_intptr_t.h b/lib/libc/include/any-darwin-any/sys/_types/_intptr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_intptr_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_intptr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_iovec_t.h b/lib/libc/include/any-darwin-any/sys/_types/_iovec_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_iovec_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_iovec_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_key_t.h b/lib/libc/include/any-darwin-any/sys/_types/_key_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_key_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_key_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_mach_port_t.h b/lib/libc/include/any-darwin-any/sys/_types/_mach_port_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_mach_port_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_mach_port_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_mbstate_t.h b/lib/libc/include/any-darwin-any/sys/_types/_mbstate_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_mbstate_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_mbstate_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_mode_t.h b/lib/libc/include/any-darwin-any/sys/_types/_mode_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_mode_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_mode_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_mount_t.h b/lib/libc/include/any-darwin-any/sys/_types/_mount_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_mount_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_mount_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_nlink_t.h b/lib/libc/include/any-darwin-any/sys/_types/_nlink_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_nlink_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_nlink_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_null.h b/lib/libc/include/any-darwin-any/sys/_types/_null.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_null.h
rename to lib/libc/include/any-darwin-any/sys/_types/_null.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_o_dsync.h b/lib/libc/include/any-darwin-any/sys/_types/_o_dsync.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_o_dsync.h
rename to lib/libc/include/any-darwin-any/sys/_types/_o_dsync.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_o_sync.h b/lib/libc/include/any-darwin-any/sys/_types/_o_sync.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_o_sync.h
rename to lib/libc/include/any-darwin-any/sys/_types/_o_sync.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_off_t.h b/lib/libc/include/any-darwin-any/sys/_types/_off_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_off_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_off_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_offsetof.h b/lib/libc/include/any-darwin-any/sys/_types/_offsetof.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_offsetof.h
rename to lib/libc/include/any-darwin-any/sys/_types/_offsetof.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_os_inline.h b/lib/libc/include/any-darwin-any/sys/_types/_os_inline.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_os_inline.h
rename to lib/libc/include/any-darwin-any/sys/_types/_os_inline.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_pid_t.h b/lib/libc/include/any-darwin-any/sys/_types/_pid_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_pid_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_pid_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_posix_vdisable.h b/lib/libc/include/any-darwin-any/sys/_types/_posix_vdisable.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_posix_vdisable.h
rename to lib/libc/include/any-darwin-any/sys/_types/_posix_vdisable.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_ptrdiff_t.h b/lib/libc/include/any-darwin-any/sys/_types/_ptrdiff_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_ptrdiff_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_ptrdiff_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_rsize_t.h b/lib/libc/include/any-darwin-any/sys/_types/_rsize_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_rsize_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_rsize_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_rune_t.h b/lib/libc/include/any-darwin-any/sys/_types/_rune_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_rune_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_rune_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_s_ifmt.h b/lib/libc/include/any-darwin-any/sys/_types/_s_ifmt.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_s_ifmt.h
rename to lib/libc/include/any-darwin-any/sys/_types/_s_ifmt.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_sa_family_t.h b/lib/libc/include/any-darwin-any/sys/_types/_sa_family_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_sa_family_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_sa_family_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_seek_set.h b/lib/libc/include/any-darwin-any/sys/_types/_seek_set.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_seek_set.h
rename to lib/libc/include/any-darwin-any/sys/_types/_seek_set.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_sigaltstack.h b/lib/libc/include/any-darwin-any/sys/_types/_sigaltstack.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_sigaltstack.h
rename to lib/libc/include/any-darwin-any/sys/_types/_sigaltstack.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_sigset_t.h b/lib/libc/include/any-darwin-any/sys/_types/_sigset_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_sigset_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_sigset_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_size_t.h b/lib/libc/include/any-darwin-any/sys/_types/_size_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_size_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_size_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_socklen_t.h b/lib/libc/include/any-darwin-any/sys/_types/_socklen_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_socklen_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_socklen_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_ssize_t.h b/lib/libc/include/any-darwin-any/sys/_types/_ssize_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_ssize_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_ssize_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_suseconds_t.h b/lib/libc/include/any-darwin-any/sys/_types/_suseconds_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_suseconds_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_suseconds_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_time_t.h b/lib/libc/include/any-darwin-any/sys/_types/_time_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_time_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_time_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_timespec.h b/lib/libc/include/any-darwin-any/sys/_types/_timespec.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_timespec.h
rename to lib/libc/include/any-darwin-any/sys/_types/_timespec.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_timeval.h b/lib/libc/include/any-darwin-any/sys/_types/_timeval.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_timeval.h
rename to lib/libc/include/any-darwin-any/sys/_types/_timeval.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_timeval32.h b/lib/libc/include/any-darwin-any/sys/_types/_timeval32.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_timeval32.h
rename to lib/libc/include/any-darwin-any/sys/_types/_timeval32.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_timeval64.h b/lib/libc/include/any-darwin-any/sys/_types/_timeval64.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_timeval64.h
rename to lib/libc/include/any-darwin-any/sys/_types/_timeval64.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_char.h b/lib/libc/include/any-darwin-any/sys/_types/_u_char.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_char.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_char.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_int.h b/lib/libc/include/any-darwin-any/sys/_types/_u_int.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_int.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_int.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_int16_t.h b/lib/libc/include/any-darwin-any/sys/_types/_u_int16_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_int16_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_int16_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_int32_t.h b/lib/libc/include/any-darwin-any/sys/_types/_u_int32_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_int32_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_int32_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_int64_t.h b/lib/libc/include/any-darwin-any/sys/_types/_u_int64_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_int64_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_int64_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_int8_t.h b/lib/libc/include/any-darwin-any/sys/_types/_u_int8_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_int8_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_int8_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_u_short.h b/lib/libc/include/any-darwin-any/sys/_types/_u_short.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_u_short.h
rename to lib/libc/include/any-darwin-any/sys/_types/_u_short.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_ucontext.h b/lib/libc/include/any-darwin-any/sys/_types/_ucontext.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_ucontext.h
rename to lib/libc/include/any-darwin-any/sys/_types/_ucontext.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_uid_t.h b/lib/libc/include/any-darwin-any/sys/_types/_uid_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_uid_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_uid_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_uintptr_t.h b/lib/libc/include/any-darwin-any/sys/_types/_uintptr_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_uintptr_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_uintptr_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_useconds_t.h b/lib/libc/include/any-darwin-any/sys/_types/_useconds_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_useconds_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_useconds_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_uuid_t.h b/lib/libc/include/any-darwin-any/sys/_types/_uuid_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_uuid_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_uuid_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_va_list.h b/lib/libc/include/any-darwin-any/sys/_types/_va_list.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_va_list.h
rename to lib/libc/include/any-darwin-any/sys/_types/_va_list.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_vnode_t.h b/lib/libc/include/any-darwin-any/sys/_types/_vnode_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_vnode_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_vnode_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_wchar_t.h b/lib/libc/include/any-darwin-any/sys/_types/_wchar_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_wchar_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_wchar_t.h
diff --git a/lib/libc/include/any-macos-any/sys/_types/_wint_t.h b/lib/libc/include/any-darwin-any/sys/_types/_wint_t.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/_types/_wint_t.h
rename to lib/libc/include/any-darwin-any/sys/_types/_wint_t.h
diff --git a/lib/libc/include/any-macos-any/sys/acl.h b/lib/libc/include/any-darwin-any/sys/acl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/acl.h
rename to lib/libc/include/any-darwin-any/sys/acl.h
diff --git a/lib/libc/include/any-macos-any/sys/aio.h b/lib/libc/include/any-darwin-any/sys/aio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/aio.h
rename to lib/libc/include/any-darwin-any/sys/aio.h
diff --git a/lib/libc/include/any-macos-any/sys/appleapiopts.h b/lib/libc/include/any-darwin-any/sys/appleapiopts.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/appleapiopts.h
rename to lib/libc/include/any-darwin-any/sys/appleapiopts.h
diff --git a/lib/libc/include/any-macos-any/sys/attr.h b/lib/libc/include/any-darwin-any/sys/attr.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/attr.h
rename to lib/libc/include/any-darwin-any/sys/attr.h
diff --git a/lib/libc/include/any-macos-any/sys/cdefs.h b/lib/libc/include/any-darwin-any/sys/cdefs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/cdefs.h
rename to lib/libc/include/any-darwin-any/sys/cdefs.h
diff --git a/lib/libc/include/any-macos-any/sys/clonefile.h b/lib/libc/include/any-darwin-any/sys/clonefile.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/clonefile.h
rename to lib/libc/include/any-darwin-any/sys/clonefile.h
diff --git a/lib/libc/include/any-macos-any/sys/constrained_ctypes.h b/lib/libc/include/any-darwin-any/sys/constrained_ctypes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/constrained_ctypes.h
rename to lib/libc/include/any-darwin-any/sys/constrained_ctypes.h
diff --git a/lib/libc/include/any-macos-any/sys/dirent.h b/lib/libc/include/any-darwin-any/sys/dirent.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/dirent.h
rename to lib/libc/include/any-darwin-any/sys/dirent.h
diff --git a/lib/libc/include/any-macos-any/sys/errno.h b/lib/libc/include/any-darwin-any/sys/errno.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/errno.h
rename to lib/libc/include/any-darwin-any/sys/errno.h
diff --git a/lib/libc/include/any-macos-any/sys/event.h b/lib/libc/include/any-darwin-any/sys/event.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/event.h
rename to lib/libc/include/any-darwin-any/sys/event.h
diff --git a/lib/libc/include/any-macos-any/sys/fcntl.h b/lib/libc/include/any-darwin-any/sys/fcntl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/fcntl.h
rename to lib/libc/include/any-darwin-any/sys/fcntl.h
diff --git a/lib/libc/include/any-macos-any/sys/file.h b/lib/libc/include/any-darwin-any/sys/file.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/file.h
rename to lib/libc/include/any-darwin-any/sys/file.h
diff --git a/lib/libc/include/any-macos-any/sys/filio.h b/lib/libc/include/any-darwin-any/sys/filio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/filio.h
rename to lib/libc/include/any-darwin-any/sys/filio.h
diff --git a/lib/libc/include/any-macos-any/sys/ioccom.h b/lib/libc/include/any-darwin-any/sys/ioccom.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ioccom.h
rename to lib/libc/include/any-darwin-any/sys/ioccom.h
diff --git a/lib/libc/include/any-macos-any/sys/ioctl.h b/lib/libc/include/any-darwin-any/sys/ioctl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ioctl.h
rename to lib/libc/include/any-darwin-any/sys/ioctl.h
diff --git a/lib/libc/include/any-macos-any/sys/ipc.h b/lib/libc/include/any-darwin-any/sys/ipc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ipc.h
rename to lib/libc/include/any-darwin-any/sys/ipc.h
diff --git a/lib/libc/include/any-macos-any/sys/kauth.h b/lib/libc/include/any-darwin-any/sys/kauth.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/kauth.h
rename to lib/libc/include/any-darwin-any/sys/kauth.h
diff --git a/lib/libc/include/any-macos-any/sys/kern_control.h b/lib/libc/include/any-darwin-any/sys/kern_control.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/kern_control.h
rename to lib/libc/include/any-darwin-any/sys/kern_control.h
diff --git a/lib/libc/include/any-macos-any/sys/lock.h b/lib/libc/include/any-darwin-any/sys/lock.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/lock.h
rename to lib/libc/include/any-darwin-any/sys/lock.h
diff --git a/lib/libc/include/any-macos-any/sys/mman.h b/lib/libc/include/any-darwin-any/sys/mman.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/mman.h
rename to lib/libc/include/any-darwin-any/sys/mman.h
diff --git a/lib/libc/include/any-macos-any/sys/mount.h b/lib/libc/include/any-darwin-any/sys/mount.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/mount.h
rename to lib/libc/include/any-darwin-any/sys/mount.h
diff --git a/lib/libc/include/any-macos-any/sys/msg.h b/lib/libc/include/any-darwin-any/sys/msg.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/msg.h
rename to lib/libc/include/any-darwin-any/sys/msg.h
diff --git a/lib/libc/include/any-macos-any/sys/param.h b/lib/libc/include/any-darwin-any/sys/param.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/param.h
rename to lib/libc/include/any-darwin-any/sys/param.h
diff --git a/lib/libc/include/any-macos-any/sys/paths.h b/lib/libc/include/any-darwin-any/sys/paths.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/paths.h
rename to lib/libc/include/any-darwin-any/sys/paths.h
diff --git a/lib/libc/include/any-macos-any/sys/poll.h b/lib/libc/include/any-darwin-any/sys/poll.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/poll.h
rename to lib/libc/include/any-darwin-any/sys/poll.h
diff --git a/lib/libc/include/any-macos-any/sys/proc.h b/lib/libc/include/any-darwin-any/sys/proc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/proc.h
rename to lib/libc/include/any-darwin-any/sys/proc.h
diff --git a/lib/libc/include/any-macos-any/sys/proc_info.h b/lib/libc/include/any-darwin-any/sys/proc_info.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/proc_info.h
rename to lib/libc/include/any-darwin-any/sys/proc_info.h
diff --git a/lib/libc/include/any-macos-any/sys/qos.h b/lib/libc/include/any-darwin-any/sys/qos.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/qos.h
rename to lib/libc/include/any-darwin-any/sys/qos.h
diff --git a/lib/libc/include/any-macos-any/sys/queue.h b/lib/libc/include/any-darwin-any/sys/queue.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/queue.h
rename to lib/libc/include/any-darwin-any/sys/queue.h
diff --git a/lib/libc/include/any-macos-any/sys/random.h b/lib/libc/include/any-darwin-any/sys/random.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/random.h
rename to lib/libc/include/any-darwin-any/sys/random.h
diff --git a/lib/libc/include/any-macos-any/sys/resource.h b/lib/libc/include/any-darwin-any/sys/resource.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/resource.h
rename to lib/libc/include/any-darwin-any/sys/resource.h
diff --git a/lib/libc/include/any-macos-any/sys/select.h b/lib/libc/include/any-darwin-any/sys/select.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/select.h
rename to lib/libc/include/any-darwin-any/sys/select.h
diff --git a/lib/libc/include/any-macos-any/sys/sem.h b/lib/libc/include/any-darwin-any/sys/sem.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/sem.h
rename to lib/libc/include/any-darwin-any/sys/sem.h
diff --git a/lib/libc/include/any-macos-any/sys/semaphore.h b/lib/libc/include/any-darwin-any/sys/semaphore.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/semaphore.h
rename to lib/libc/include/any-darwin-any/sys/semaphore.h
diff --git a/lib/libc/include/any-macos-any/sys/shm.h b/lib/libc/include/any-darwin-any/sys/shm.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/shm.h
rename to lib/libc/include/any-darwin-any/sys/shm.h
diff --git a/lib/libc/include/any-macos-any/sys/signal.h b/lib/libc/include/any-darwin-any/sys/signal.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/signal.h
rename to lib/libc/include/any-darwin-any/sys/signal.h
diff --git a/lib/libc/include/any-macos-any/sys/socket.h b/lib/libc/include/any-darwin-any/sys/socket.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/socket.h
rename to lib/libc/include/any-darwin-any/sys/socket.h
diff --git a/lib/libc/include/any-macos-any/sys/sockio.h b/lib/libc/include/any-darwin-any/sys/sockio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/sockio.h
rename to lib/libc/include/any-darwin-any/sys/sockio.h
diff --git a/lib/libc/include/any-macos-any/sys/spawn.h b/lib/libc/include/any-darwin-any/sys/spawn.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/spawn.h
rename to lib/libc/include/any-darwin-any/sys/spawn.h
diff --git a/lib/libc/include/any-macos-any/sys/stat.h b/lib/libc/include/any-darwin-any/sys/stat.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/stat.h
rename to lib/libc/include/any-darwin-any/sys/stat.h
diff --git a/lib/libc/include/any-macos-any/sys/statvfs.h b/lib/libc/include/any-darwin-any/sys/statvfs.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/statvfs.h
rename to lib/libc/include/any-darwin-any/sys/statvfs.h
diff --git a/lib/libc/include/any-macos-any/sys/stdio.h b/lib/libc/include/any-darwin-any/sys/stdio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/stdio.h
rename to lib/libc/include/any-darwin-any/sys/stdio.h
diff --git a/lib/libc/include/any-macos-any/sys/sysctl.h b/lib/libc/include/any-darwin-any/sys/sysctl.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/sysctl.h
rename to lib/libc/include/any-darwin-any/sys/sysctl.h
diff --git a/lib/libc/include/any-macos-any/sys/syslimits.h b/lib/libc/include/any-darwin-any/sys/syslimits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/syslimits.h
rename to lib/libc/include/any-darwin-any/sys/syslimits.h
diff --git a/lib/libc/include/any-macos-any/sys/syslog.h b/lib/libc/include/any-darwin-any/sys/syslog.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/syslog.h
rename to lib/libc/include/any-darwin-any/sys/syslog.h
diff --git a/lib/libc/include/any-macos-any/sys/termios.h b/lib/libc/include/any-darwin-any/sys/termios.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/termios.h
rename to lib/libc/include/any-darwin-any/sys/termios.h
diff --git a/lib/libc/include/any-macos-any/sys/time.h b/lib/libc/include/any-darwin-any/sys/time.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/time.h
rename to lib/libc/include/any-darwin-any/sys/time.h
diff --git a/lib/libc/include/any-macos-any/sys/times.h b/lib/libc/include/any-darwin-any/sys/times.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/times.h
rename to lib/libc/include/any-darwin-any/sys/times.h
diff --git a/lib/libc/include/any-macos-any/sys/timex.h b/lib/libc/include/any-darwin-any/sys/timex.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/timex.h
rename to lib/libc/include/any-darwin-any/sys/timex.h
diff --git a/lib/libc/include/any-macos-any/sys/ttycom.h b/lib/libc/include/any-darwin-any/sys/ttycom.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ttycom.h
rename to lib/libc/include/any-darwin-any/sys/ttycom.h
diff --git a/lib/libc/include/any-macos-any/sys/ttydefaults.h b/lib/libc/include/any-darwin-any/sys/ttydefaults.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ttydefaults.h
rename to lib/libc/include/any-darwin-any/sys/ttydefaults.h
diff --git a/lib/libc/include/any-macos-any/sys/types.h b/lib/libc/include/any-darwin-any/sys/types.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/types.h
rename to lib/libc/include/any-darwin-any/sys/types.h
diff --git a/lib/libc/include/any-macos-any/sys/ucontext.h b/lib/libc/include/any-darwin-any/sys/ucontext.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ucontext.h
rename to lib/libc/include/any-darwin-any/sys/ucontext.h
diff --git a/lib/libc/include/any-macos-any/sys/ucred.h b/lib/libc/include/any-darwin-any/sys/ucred.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/ucred.h
rename to lib/libc/include/any-darwin-any/sys/ucred.h
diff --git a/lib/libc/include/any-macos-any/sys/uio.h b/lib/libc/include/any-darwin-any/sys/uio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/uio.h
rename to lib/libc/include/any-darwin-any/sys/uio.h
diff --git a/lib/libc/include/any-macos-any/sys/un.h b/lib/libc/include/any-darwin-any/sys/un.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/un.h
rename to lib/libc/include/any-darwin-any/sys/un.h
diff --git a/lib/libc/include/any-macos-any/sys/unistd.h b/lib/libc/include/any-darwin-any/sys/unistd.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/unistd.h
rename to lib/libc/include/any-darwin-any/sys/unistd.h
diff --git a/lib/libc/include/any-macos-any/sys/utsname.h b/lib/libc/include/any-darwin-any/sys/utsname.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/utsname.h
rename to lib/libc/include/any-darwin-any/sys/utsname.h
diff --git a/lib/libc/include/any-macos-any/sys/vm.h b/lib/libc/include/any-darwin-any/sys/vm.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/vm.h
rename to lib/libc/include/any-darwin-any/sys/vm.h
diff --git a/lib/libc/include/any-macos-any/sys/wait.h b/lib/libc/include/any-darwin-any/sys/wait.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sys/wait.h
rename to lib/libc/include/any-darwin-any/sys/wait.h
diff --git a/lib/libc/include/any-macos-any/sysexits.h b/lib/libc/include/any-darwin-any/sysexits.h
similarity index 100%
rename from lib/libc/include/any-macos-any/sysexits.h
rename to lib/libc/include/any-darwin-any/sysexits.h
diff --git a/lib/libc/include/any-macos-any/syslog.h b/lib/libc/include/any-darwin-any/syslog.h
similarity index 100%
rename from lib/libc/include/any-macos-any/syslog.h
rename to lib/libc/include/any-darwin-any/syslog.h
diff --git a/lib/libc/include/any-macos-any/tar.h b/lib/libc/include/any-darwin-any/tar.h
similarity index 100%
rename from lib/libc/include/any-macos-any/tar.h
rename to lib/libc/include/any-darwin-any/tar.h
diff --git a/lib/libc/include/any-macos-any/termios.h b/lib/libc/include/any-darwin-any/termios.h
similarity index 100%
rename from lib/libc/include/any-macos-any/termios.h
rename to lib/libc/include/any-darwin-any/termios.h
diff --git a/lib/libc/include/any-macos-any/tgmath.h b/lib/libc/include/any-darwin-any/tgmath.h
similarity index 100%
rename from lib/libc/include/any-macos-any/tgmath.h
rename to lib/libc/include/any-darwin-any/tgmath.h
diff --git a/lib/libc/include/any-macos-any/time.h b/lib/libc/include/any-darwin-any/time.h
similarity index 100%
rename from lib/libc/include/any-macos-any/time.h
rename to lib/libc/include/any-darwin-any/time.h
diff --git a/lib/libc/include/any-macos-any/ucontext.h b/lib/libc/include/any-darwin-any/ucontext.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ucontext.h
rename to lib/libc/include/any-darwin-any/ucontext.h
diff --git a/lib/libc/include/any-macos-any/ulimit.h b/lib/libc/include/any-darwin-any/ulimit.h
similarity index 100%
rename from lib/libc/include/any-macos-any/ulimit.h
rename to lib/libc/include/any-darwin-any/ulimit.h
diff --git a/lib/libc/include/any-macos-any/unistd.h b/lib/libc/include/any-darwin-any/unistd.h
similarity index 100%
rename from lib/libc/include/any-macos-any/unistd.h
rename to lib/libc/include/any-darwin-any/unistd.h
diff --git a/lib/libc/include/any-macos-any/utime.h b/lib/libc/include/any-darwin-any/utime.h
similarity index 100%
rename from lib/libc/include/any-macos-any/utime.h
rename to lib/libc/include/any-darwin-any/utime.h
diff --git a/lib/libc/include/any-macos-any/utmpx.h b/lib/libc/include/any-darwin-any/utmpx.h
similarity index 100%
rename from lib/libc/include/any-macos-any/utmpx.h
rename to lib/libc/include/any-darwin-any/utmpx.h
diff --git a/lib/libc/include/any-macos-any/uuid/uuid.h b/lib/libc/include/any-darwin-any/uuid/uuid.h
similarity index 100%
rename from lib/libc/include/any-macos-any/uuid/uuid.h
rename to lib/libc/include/any-darwin-any/uuid/uuid.h
diff --git a/lib/libc/include/any-macos-any/vis.h b/lib/libc/include/any-darwin-any/vis.h
similarity index 100%
rename from lib/libc/include/any-macos-any/vis.h
rename to lib/libc/include/any-darwin-any/vis.h
diff --git a/lib/libc/include/any-macos-any/wchar.h b/lib/libc/include/any-darwin-any/wchar.h
similarity index 100%
rename from lib/libc/include/any-macos-any/wchar.h
rename to lib/libc/include/any-darwin-any/wchar.h
diff --git a/lib/libc/include/any-macos-any/wctype.h b/lib/libc/include/any-darwin-any/wctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/wctype.h
rename to lib/libc/include/any-darwin-any/wctype.h
diff --git a/lib/libc/include/any-macos-any/wordexp.h b/lib/libc/include/any-darwin-any/wordexp.h
similarity index 100%
rename from lib/libc/include/any-macos-any/wordexp.h
rename to lib/libc/include/any-darwin-any/wordexp.h
diff --git a/lib/libc/include/any-macos-any/xlocale.h b/lib/libc/include/any-darwin-any/xlocale.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale.h
rename to lib/libc/include/any-darwin-any/xlocale.h
diff --git a/lib/libc/include/any-macos-any/xlocale/___wctype.h b/lib/libc/include/any-darwin-any/xlocale/___wctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/___wctype.h
rename to lib/libc/include/any-darwin-any/xlocale/___wctype.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_ctype.h b/lib/libc/include/any-darwin-any/xlocale/_ctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_ctype.h
rename to lib/libc/include/any-darwin-any/xlocale/_ctype.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_inttypes.h b/lib/libc/include/any-darwin-any/xlocale/_inttypes.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_inttypes.h
rename to lib/libc/include/any-darwin-any/xlocale/_inttypes.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_langinfo.h b/lib/libc/include/any-darwin-any/xlocale/_langinfo.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_langinfo.h
rename to lib/libc/include/any-darwin-any/xlocale/_langinfo.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_monetary.h b/lib/libc/include/any-darwin-any/xlocale/_monetary.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_monetary.h
rename to lib/libc/include/any-darwin-any/xlocale/_monetary.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_regex.h b/lib/libc/include/any-darwin-any/xlocale/_regex.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_regex.h
rename to lib/libc/include/any-darwin-any/xlocale/_regex.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_stdio.h b/lib/libc/include/any-darwin-any/xlocale/_stdio.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_stdio.h
rename to lib/libc/include/any-darwin-any/xlocale/_stdio.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_stdlib.h b/lib/libc/include/any-darwin-any/xlocale/_stdlib.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_stdlib.h
rename to lib/libc/include/any-darwin-any/xlocale/_stdlib.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_string.h b/lib/libc/include/any-darwin-any/xlocale/_string.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_string.h
rename to lib/libc/include/any-darwin-any/xlocale/_string.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_time.h b/lib/libc/include/any-darwin-any/xlocale/_time.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_time.h
rename to lib/libc/include/any-darwin-any/xlocale/_time.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_wchar.h b/lib/libc/include/any-darwin-any/xlocale/_wchar.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_wchar.h
rename to lib/libc/include/any-darwin-any/xlocale/_wchar.h
diff --git a/lib/libc/include/any-macos-any/xlocale/_wctype.h b/lib/libc/include/any-darwin-any/xlocale/_wctype.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xlocale/_wctype.h
rename to lib/libc/include/any-darwin-any/xlocale/_wctype.h
diff --git a/lib/libc/include/any-macos-any/xpc/activity.h b/lib/libc/include/any-darwin-any/xpc/activity.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/activity.h
rename to lib/libc/include/any-darwin-any/xpc/activity.h
diff --git a/lib/libc/include/any-macos-any/xpc/availability.h b/lib/libc/include/any-darwin-any/xpc/availability.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/availability.h
rename to lib/libc/include/any-darwin-any/xpc/availability.h
diff --git a/lib/libc/include/any-macos-any/xpc/base.h b/lib/libc/include/any-darwin-any/xpc/base.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/base.h
rename to lib/libc/include/any-darwin-any/xpc/base.h
diff --git a/lib/libc/include/any-macos-any/xpc/connection.h b/lib/libc/include/any-darwin-any/xpc/connection.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/connection.h
rename to lib/libc/include/any-darwin-any/xpc/connection.h
diff --git a/lib/libc/include/any-macos-any/xpc/debug.h b/lib/libc/include/any-darwin-any/xpc/debug.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/debug.h
rename to lib/libc/include/any-darwin-any/xpc/debug.h
diff --git a/lib/libc/include/any-macos-any/xpc/endpoint.h b/lib/libc/include/any-darwin-any/xpc/endpoint.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/endpoint.h
rename to lib/libc/include/any-darwin-any/xpc/endpoint.h
diff --git a/lib/libc/include/any-macos-any/xpc/listener.h b/lib/libc/include/any-darwin-any/xpc/listener.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/listener.h
rename to lib/libc/include/any-darwin-any/xpc/listener.h
diff --git a/lib/libc/include/any-macos-any/xpc/peer_requirement.h b/lib/libc/include/any-darwin-any/xpc/peer_requirement.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/peer_requirement.h
rename to lib/libc/include/any-darwin-any/xpc/peer_requirement.h
diff --git a/lib/libc/include/any-macos-any/xpc/rich_error.h b/lib/libc/include/any-darwin-any/xpc/rich_error.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/rich_error.h
rename to lib/libc/include/any-darwin-any/xpc/rich_error.h
diff --git a/lib/libc/include/any-macos-any/xpc/session.h b/lib/libc/include/any-darwin-any/xpc/session.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/session.h
rename to lib/libc/include/any-darwin-any/xpc/session.h
diff --git a/lib/libc/include/any-macos-any/xpc/xpc.h b/lib/libc/include/any-darwin-any/xpc/xpc.h
similarity index 100%
rename from lib/libc/include/any-macos-any/xpc/xpc.h
rename to lib/libc/include/any-darwin-any/xpc/xpc.h
diff --git a/lib/libc/include/any-macos-any/zconf.h b/lib/libc/include/any-darwin-any/zconf.h
similarity index 100%
rename from lib/libc/include/any-macos-any/zconf.h
rename to lib/libc/include/any-darwin-any/zconf.h
diff --git a/lib/libc/include/any-macos-any/zlib.h b/lib/libc/include/any-darwin-any/zlib.h
similarity index 100%
rename from lib/libc/include/any-macos-any/zlib.h
rename to lib/libc/include/any-darwin-any/zlib.h
diff --git a/lib/std/zig/LibCDirs.zig b/lib/std/zig/LibCDirs.zig
index dbd14a4f5635..2499bac80ac6 100644
--- a/lib/std/zig/LibCDirs.zig
+++ b/lib/std/zig/LibCDirs.zig
@@ -154,7 +154,7 @@ pub fn detectFromBuilding(
         const list = try arena.alloc([]const u8, 1);
         list[0] = try std.fmt.allocPrint(
             arena,
-            "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "any-macos-any",
+            "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "any-darwin-any",
             .{zig_lib_dir},
         );
         return .{
diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig
index 13eb7f8e2847..d1d39948c4af 100644
--- a/lib/std/zig/target.zig
+++ b/lib/std/zig/target.zig
@@ -34,6 +34,7 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .aarch64, .os = .freebsd, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
     .{ .arch = .aarch64, .os = .linux, .abi = .gnu, .os_ver = .{ .major = 3, .minor = 7, .patch = 0 }, .glibc_min = .{ .major = 2, .minor = 17, .patch = 0 } },
     .{ .arch = .aarch64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 3, .minor = 7, .patch = 0 } },
+    .{ .arch = .aarch64, .os = .maccatalyst, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
     .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0, .patch = 0 } },
     .{ .arch = .aarch64, .os = .netbsd, .abi = .none, .os_ver = .{ .major = 9, .minor = 0, .patch = 0 } },
     .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
@@ -105,6 +106,7 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .x86_64, .os = .linux, .abi = .gnux32, .os_ver = .{ .major = 3, .minor = 4, .patch = 0 }, .glibc_triple = "x86_64-linux-gnu-x32" },
     .{ .arch = .x86_64, .os = .linux, .abi = .musl, .os_ver = .{ .major = 2, .minor = 6, .patch = 4 } },
     .{ .arch = .x86_64, .os = .linux, .abi = .muslx32, .os_ver = .{ .major = 3, .minor = 4, .patch = 0 } },
+    .{ .arch = .x86_64, .os = .maccatalyst, .abi = .none, .os_ver = .{ .major = 10, .minor = 15, .patch = 0 } },
     .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 7, .patch = 0 } },
     .{ .arch = .x86_64, .os = .netbsd, .abi = .none, .os_ver = .{ .major = 2, .minor = 0, .patch = 0 } },
     .{ .arch = .x86_64, .os = .windows, .abi = .gnu },
@@ -393,11 +395,11 @@ pub fn isLibCLibName(target: *const std.Target, name: []const u8) bool {
             return true;
         if (eqlIgnoreCase(ignore_case, name, "rpcsvc"))
             return true;
-    }
 
-    if (target.os.isAtLeast(.macos, .{ .major = 10, .minor = 8, .patch = 0 }) orelse false) {
-        if (eqlIgnoreCase(ignore_case, name, "mx"))
-            return true;
+        if (target.os.tag == .maccatalyst or target.os.tag == .macos) {
+            if (eqlIgnoreCase(ignore_case, name, "mx"))
+                return true;
+        }
     }
 
     if (target.isFreeBSDLibC()) {
diff --git a/src/link/MachO/Dylib.zig b/src/link/MachO/Dylib.zig
index 526ca2d08682..c78d52f81594 100644
--- a/src/link/MachO/Dylib.zig
+++ b/src/link/MachO/Dylib.zig
@@ -716,6 +716,11 @@ pub const TargetMatcher = struct {
                 const host_target = try targetToAppleString(allocator, cpu_arch, .MACOS);
                 try self.target_strings.append(allocator, host_target);
             },
+            .MACCATALYST => {
+                // Mac Catalyst is allowed to link macOS libraries in a TBD because Apple were apparently too lazy
+                // to add the proper target strings despite doing so in other places in the format???
+                try self.target_strings.append(allocator, try targetToAppleString(allocator, cpu_arch, .MACOS));
+            },
             .MACOS => {
                 // Turns out that around 10.13/10.14 macOS release version, Apple changed the target tags in
                 // tbd files from `macosx` to `macos`. In order to be compliant and therefore actually support
diff --git a/test/src/Cases.zig b/test/src/Cases.zig
index 2fdcc451959b..95ee7e21e751 100644
--- a/test/src/Cases.zig
+++ b/test/src/Cases.zig
@@ -447,7 +447,7 @@ pub const CaseTestOptions = struct {
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
-    skip_macos: bool,
+    skip_darwin: bool,
     skip_linux: bool,
     skip_llvm: bool,
     skip_libc: bool,
@@ -475,7 +475,7 @@ pub fn lowerToBuildSteps(
         if (options.skip_freebsd and case.target.query.os_tag == .freebsd) continue;
         if (options.skip_netbsd and case.target.query.os_tag == .netbsd) continue;
         if (options.skip_windows and case.target.query.os_tag == .windows) continue;
-        if (options.skip_macos and case.target.query.os_tag == .macos) continue;
+        if (options.skip_darwin and case.target.query.os_tag != null and case.target.query.os_tag.?.isDarwin()) continue;
         if (options.skip_linux and case.target.query.os_tag == .linux) continue;
 
         const would_use_llvm = @import("../tests.zig").wouldUseLlvm(
diff --git a/test/tests.zig b/test/tests.zig
index a6931c408f4f..1f9db5f2ddbe 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -1186,7 +1186,15 @@ const test_targets = blk: {
             .use_lld = false,
         },
 
-        // macOS Targets
+        // Darwin Targets
+
+        .{
+            .target = .{
+                .cpu_arch = .aarch64,
+                .os_tag = .maccatalyst,
+                .abi = .none,
+            },
+        },
 
         .{
             .target = .{
@@ -1208,6 +1216,14 @@ const test_targets = blk: {
             .strip = true,
         },
 
+        .{
+            .target = .{
+                .cpu_arch = .x86_64,
+                .os_tag = .maccatalyst,
+                .abi = .none,
+            },
+        },
+
         .{
             .target = .{
                 .cpu_arch = .x86_64,
@@ -2234,7 +2250,7 @@ const ModuleTestOptions = struct {
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
-    skip_macos: bool,
+    skip_darwin: bool,
     skip_linux: bool,
     skip_llvm: bool,
     skip_libc: bool,
@@ -2269,7 +2285,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
         if (options.skip_freebsd and test_target.target.os_tag == .freebsd) continue;
         if (options.skip_netbsd and test_target.target.os_tag == .netbsd) continue;
         if (options.skip_windows and test_target.target.os_tag == .windows) continue;
-        if (options.skip_macos and test_target.target.os_tag == .macos) continue;
+        if (options.skip_darwin and test_target.target.os_tag != null and test_target.target.os_tag.?.isDarwin()) continue;
         if (options.skip_linux and test_target.target.os_tag == .linux) continue;
 
         const would_use_llvm = wouldUseLlvm(test_target.use_llvm, test_target.target, test_target.optimize_mode);
@@ -2506,7 +2522,7 @@ const CAbiTestOptions = struct {
     skip_freebsd: bool,
     skip_netbsd: bool,
     skip_windows: bool,
-    skip_macos: bool,
+    skip_darwin: bool,
     skip_linux: bool,
     skip_llvm: bool,
     skip_release: bool,
@@ -2525,7 +2541,7 @@ pub fn addCAbiTests(b: *std.Build, options: CAbiTestOptions) *Step {
             if (options.skip_freebsd and c_abi_target.target.os_tag == .freebsd) continue;
             if (options.skip_netbsd and c_abi_target.target.os_tag == .netbsd) continue;
             if (options.skip_windows and c_abi_target.target.os_tag == .windows) continue;
-            if (options.skip_macos and c_abi_target.target.os_tag == .macos) continue;
+            if (options.skip_darwin and c_abi_target.target.os_tag != null and c_abi_target.target.os_tag.?.isDarwin()) continue;
             if (options.skip_linux and c_abi_target.target.os_tag == .linux) continue;
 
             const would_use_llvm = wouldUseLlvm(c_abi_target.use_llvm, c_abi_target.target, .Debug);