diff --git a/pkg/macos/foundation.zig b/pkg/macos/foundation.zig
index f42fbb3bc..85562faf0 100644
--- a/pkg/macos/foundation.zig
+++ b/pkg/macos/foundation.zig
@@ -1,14 +1,35 @@
-pub const c = @import("foundation/c.zig");
-pub usingnamespace @import("foundation/array.zig");
-pub usingnamespace @import("foundation/attributed_string.zig");
-pub usingnamespace @import("foundation/base.zig");
-pub usingnamespace @import("foundation/character_set.zig");
-pub usingnamespace @import("foundation/data.zig");
-pub usingnamespace @import("foundation/dictionary.zig");
-pub usingnamespace @import("foundation/number.zig");
-pub usingnamespace @import("foundation/string.zig");
-pub usingnamespace @import("foundation/type.zig");
-pub usingnamespace @import("foundation/url.zig");
+const array = @import("foundation/array.zig");
+const attributed_string = @import("foundation/attributed_string.zig");
+const base = @import("foundation/base.zig");
+const character_set = @import("foundation/character_set.zig");
+const data = @import("foundation/data.zig");
+const dictionary = @import("foundation/dictionary.zig");
+const number = @import("foundation/number.zig");
+const string = @import("foundation/string.zig");
+const typepkg = @import("foundation/type.zig");
+const url = @import("foundation/url.zig");
+
+pub const c = @import("foundation/c.zig").c;
+pub const Array = array.Array;
+pub const MutableArray = array.MutableArray;
+pub const AttributedString = attributed_string.AttributedString;
+pub const MutableAttributedString = attributed_string.MutableAttributedString;
+pub const ComparisonResult = base.ComparisonResult;
+pub const Range = base.Range;
+pub const FourCharCode = base.FourCharCode;
+pub const CharacterSet = character_set.CharacterSet;
+pub const Data = data.Data;
+pub const Dictionary = dictionary.Dictionary;
+pub const MutableDictionary = dictionary.MutableDictionary;
+pub const Number = number.Number;
+pub const String = string.String;
+pub const MutableString = string.MutableString;
+pub const StringComparison = string.StringComparison;
+pub const StringEncoding = string.StringEncoding;
+pub const stringGetSurrogatePairForLongCharacter = string.stringGetSurrogatePairForLongCharacter;
+pub const URL = url.URL;
+pub const URLPathStyle = url.URLPathStyle;
+pub const CFRelease = typepkg.CFRelease;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/foundation/array.zig b/pkg/macos/foundation/array.zig
index df3cac8a0..37fa2b985 100644
--- a/pkg/macos/foundation/array.zig
+++ b/pkg/macos/foundation/array.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const base = @import("base.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const cftype = @import("type.zig");
 const ComparisonResult = base.ComparisonResult;
 const Range = base.Range;
diff --git a/pkg/macos/foundation/attributed_string.zig b/pkg/macos/foundation/attributed_string.zig
index b25cdef76..2801a506d 100644
--- a/pkg/macos/foundation/attributed_string.zig
+++ b/pkg/macos/foundation/attributed_string.zig
@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const AttributedString = opaque {
     pub fn create(
diff --git a/pkg/macos/foundation/base.zig b/pkg/macos/foundation/base.zig
index 24673ea2f..b926523fa 100644
--- a/pkg/macos/foundation/base.zig
+++ b/pkg/macos/foundation/base.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const assert = std.debug.assert;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const ComparisonResult = enum(c_int) {
     less = -1,
diff --git a/pkg/macos/foundation/c.zig b/pkg/macos/foundation/c.zig
index 9bd571adb..22fe8c6e5 100644
--- a/pkg/macos/foundation/c.zig
+++ b/pkg/macos/foundation/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("CoreFoundation/CoreFoundation.h");
 });
diff --git a/pkg/macos/foundation/character_set.zig b/pkg/macos/foundation/character_set.zig
index b6df66542..d80ca45dc 100644
--- a/pkg/macos/foundation/character_set.zig
+++ b/pkg/macos/foundation/character_set.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const CharacterSet = opaque {
     pub fn createWithCharactersInString(
diff --git a/pkg/macos/foundation/data.zig b/pkg/macos/foundation/data.zig
index cbac0db54..c06da65b7 100644
--- a/pkg/macos/foundation/data.zig
+++ b/pkg/macos/foundation/data.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Data = opaque {
     pub fn createWithBytesNoCopy(data: []const u8) Allocator.Error!*Data {
diff --git a/pkg/macos/foundation/dictionary.zig b/pkg/macos/foundation/dictionary.zig
index 499681190..90642e59a 100644
--- a/pkg/macos/foundation/dictionary.zig
+++ b/pkg/macos/foundation/dictionary.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Dictionary = opaque {
     pub fn create(
diff --git a/pkg/macos/foundation/number.zig b/pkg/macos/foundation/number.zig
index 0cf91538d..eec9f076a 100644
--- a/pkg/macos/foundation/number.zig
+++ b/pkg/macos/foundation/number.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Number = opaque {
     pub fn create(
diff --git a/pkg/macos/foundation/string.zig b/pkg/macos/foundation/string.zig
index f1f437140..2f679fef4 100644
--- a/pkg/macos/foundation/string.zig
+++ b/pkg/macos/foundation/string.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const String = opaque {
     pub fn createWithBytes(
diff --git a/pkg/macos/foundation/url.zig b/pkg/macos/foundation/url.zig
index 88cf4bcdb..b48a71817 100644
--- a/pkg/macos/foundation/url.zig
+++ b/pkg/macos/foundation/url.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const URL = opaque {
     pub fn createWithString(str: *foundation.String, base: ?*URL) Allocator.Error!*URL {