From f13ea7cace0adeef12285ed13e621e25822808bd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:28:22 -0700
Subject: [PATCH 01/16] pkg/opengl: yeet usingns

---
 pkg/opengl/Buffer.zig      |  2 +-
 pkg/opengl/Framebuffer.zig |  2 +-
 pkg/opengl/Program.zig     |  2 +-
 pkg/opengl/Shader.zig      |  2 +-
 pkg/opengl/Texture.zig     |  2 +-
 pkg/opengl/VertexArray.zig |  2 +-
 pkg/opengl/c.zig           |  2 +-
 pkg/opengl/draw.zig        |  2 +-
 pkg/opengl/errors.zig      |  2 +-
 pkg/opengl/extensions.zig  |  2 +-
 pkg/opengl/glad.zig        |  2 +-
 pkg/opengl/main.zig        | 17 ++++++++++++++---
 12 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkg/opengl/Buffer.zig b/pkg/opengl/Buffer.zig
index a8ba099d3..6b6a95a5d 100644
--- a/pkg/opengl/Buffer.zig
+++ b/pkg/opengl/Buffer.zig
@@ -1,7 +1,7 @@
 const Buffer = @This();
 
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
 
diff --git a/pkg/opengl/Framebuffer.zig b/pkg/opengl/Framebuffer.zig
index 8ab07a238..c5d659f98 100644
--- a/pkg/opengl/Framebuffer.zig
+++ b/pkg/opengl/Framebuffer.zig
@@ -1,7 +1,7 @@
 const Framebuffer = @This();
 
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
 const Texture = @import("Texture.zig");
diff --git a/pkg/opengl/Program.zig b/pkg/opengl/Program.zig
index 824687e83..ee77582c1 100644
--- a/pkg/opengl/Program.zig
+++ b/pkg/opengl/Program.zig
@@ -4,7 +4,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const log = std.log.scoped(.opengl);
 
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Shader = @import("Shader.zig");
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
diff --git a/pkg/opengl/Shader.zig b/pkg/opengl/Shader.zig
index beaae9e94..8973ace30 100644
--- a/pkg/opengl/Shader.zig
+++ b/pkg/opengl/Shader.zig
@@ -4,7 +4,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const log = std.log.scoped(.opengl);
 
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
 
diff --git a/pkg/opengl/Texture.zig b/pkg/opengl/Texture.zig
index 87f3ca102..4cd1cf9f9 100644
--- a/pkg/opengl/Texture.zig
+++ b/pkg/opengl/Texture.zig
@@ -1,7 +1,7 @@
 const Texture = @This();
 
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
 
diff --git a/pkg/opengl/VertexArray.zig b/pkg/opengl/VertexArray.zig
index 4071c3a2a..4a6a37576 100644
--- a/pkg/opengl/VertexArray.zig
+++ b/pkg/opengl/VertexArray.zig
@@ -1,6 +1,6 @@
 const VertexArray = @This();
 
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const glad = @import("glad.zig");
 const errors = @import("errors.zig");
 
diff --git a/pkg/opengl/c.zig b/pkg/opengl/c.zig
index 8f4a0f22f..fc95ee94c 100644
--- a/pkg/opengl/c.zig
+++ b/pkg/opengl/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("glad/gl.h");
 });
diff --git a/pkg/opengl/draw.zig b/pkg/opengl/draw.zig
index ea6b63103..866511c32 100644
--- a/pkg/opengl/draw.zig
+++ b/pkg/opengl/draw.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
 
diff --git a/pkg/opengl/errors.zig b/pkg/opengl/errors.zig
index 86639a53a..ec0464604 100644
--- a/pkg/opengl/errors.zig
+++ b/pkg/opengl/errors.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const glad = @import("glad.zig");
 
 pub const Error = error{
diff --git a/pkg/opengl/extensions.zig b/pkg/opengl/extensions.zig
index ca8a4973d..5fdbada93 100644
--- a/pkg/opengl/extensions.zig
+++ b/pkg/opengl/extensions.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const glad = @import("glad.zig");
 
diff --git a/pkg/opengl/glad.zig b/pkg/opengl/glad.zig
index 4ee85c549..c9f792a63 100644
--- a/pkg/opengl/glad.zig
+++ b/pkg/opengl/glad.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Context = c.GladGLContext;
 
diff --git a/pkg/opengl/main.zig b/pkg/opengl/main.zig
index 9045beabf..19cd750d0 100644
--- a/pkg/opengl/main.zig
+++ b/pkg/opengl/main.zig
@@ -11,10 +11,8 @@
 //! WARNING: Lots of performance improvements that we can make with Zig
 //! comptime help. I'm deferring this until later but have some fun ideas.
 
-pub const c = @import("c.zig");
+pub const c = @import("c.zig").c;
 pub const glad = @import("glad.zig");
-pub usingnamespace @import("draw.zig");
-
 pub const ext = @import("extensions.zig");
 pub const Buffer = @import("Buffer.zig");
 pub const Framebuffer = @import("Framebuffer.zig");
@@ -22,3 +20,16 @@ pub const Program = @import("Program.zig");
 pub const Shader = @import("Shader.zig");
 pub const Texture = @import("Texture.zig");
 pub const VertexArray = @import("VertexArray.zig");
+
+const draw = @import("draw.zig");
+
+pub const blendFunc = draw.blendFunc;
+pub const clear = draw.clear;
+pub const clearColor = draw.clearColor;
+pub const drawArrays = draw.drawArrays;
+pub const drawElements = draw.drawElements;
+pub const drawElementsInstanced = draw.drawElementsInstanced;
+pub const enable = draw.enable;
+pub const frontFace = draw.frontFace;
+pub const pixelStore = draw.pixelStore;
+pub const viewport = draw.viewport;

From c49b3b94b92ac08fd4a84339c1d5f2d223e649ed Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:32:21 -0700
Subject: [PATCH 02/16] pkg/oni: yeet usingnamespace

---
 pkg/oniguruma/c.zig      |  2 +-
 pkg/oniguruma/errors.zig |  2 +-
 pkg/oniguruma/init.zig   |  2 +-
 pkg/oniguruma/main.zig   | 18 +++++++++++++-----
 pkg/oniguruma/regex.zig  |  2 +-
 pkg/oniguruma/region.zig |  2 +-
 pkg/oniguruma/types.zig  |  2 +-
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkg/oniguruma/c.zig b/pkg/oniguruma/c.zig
index 1788a6289..73732f903 100644
--- a/pkg/oniguruma/c.zig
+++ b/pkg/oniguruma/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("oniguruma.h");
 });
diff --git a/pkg/oniguruma/errors.zig b/pkg/oniguruma/errors.zig
index f13eda95a..d63a481bd 100644
--- a/pkg/oniguruma/errors.zig
+++ b/pkg/oniguruma/errors.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Encoding = @import("types.zig").Encoding;
 
 /// Maximum error message length.
diff --git a/pkg/oniguruma/init.zig b/pkg/oniguruma/init.zig
index bf7420e40..933e50b5a 100644
--- a/pkg/oniguruma/init.zig
+++ b/pkg/oniguruma/init.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Encoding = @import("types.zig").Encoding;
 const errors = @import("errors.zig");
 
diff --git a/pkg/oniguruma/main.zig b/pkg/oniguruma/main.zig
index b4eb3053b..a8e415cfb 100644
--- a/pkg/oniguruma/main.zig
+++ b/pkg/oniguruma/main.zig
@@ -1,10 +1,18 @@
-pub usingnamespace @import("init.zig");
-pub usingnamespace @import("errors.zig");
-pub usingnamespace @import("regex.zig");
-pub usingnamespace @import("region.zig");
-pub usingnamespace @import("types.zig");
+const initpkg = @import("init.zig");
+const regex = @import("regex.zig");
+const region = @import("region.zig");
+const types = @import("types.zig");
+
 pub const c = @import("c.zig");
 pub const testing = @import("testing.zig");
+pub const errors = @import("errors.zig");
+
+pub const init = initpkg.init;
+pub const deinit = initpkg.deinit;
+pub const Encoding = types.Encoding;
+pub const Regex = regex.Regex;
+pub const Region = region.Region;
+pub const Syntax = types.Syntax;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/oniguruma/regex.zig b/pkg/oniguruma/regex.zig
index db9689ee2..e0c08d256 100644
--- a/pkg/oniguruma/regex.zig
+++ b/pkg/oniguruma/regex.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const types = @import("types.zig");
 const errors = @import("errors.zig");
 const testEnsureInit = @import("testing.zig").ensureInit;
diff --git a/pkg/oniguruma/region.zig b/pkg/oniguruma/region.zig
index 1b99b55b7..8c5c7a528 100644
--- a/pkg/oniguruma/region.zig
+++ b/pkg/oniguruma/region.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Region = extern struct {
     allocated: c_int = 0,
diff --git a/pkg/oniguruma/types.zig b/pkg/oniguruma/types.zig
index a47149ce0..84a0a7c95 100644
--- a/pkg/oniguruma/types.zig
+++ b/pkg/oniguruma/types.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Encoding = opaque {
     pub const ascii: *Encoding = @ptrCast(c.ONIG_ENCODING_ASCII());

From 91431a90a113d2ebb74fcfc626a0b40e9beddcb5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:34:46 -0700
Subject: [PATCH 03/16] pkg/freetype: remove usingns

---
 pkg/freetype/Library.zig      |  2 +-
 pkg/freetype/c.zig            |  2 +-
 pkg/freetype/computations.zig |  2 +-
 pkg/freetype/errors.zig       |  2 +-
 pkg/freetype/face.zig         |  2 +-
 pkg/freetype/main.zig         | 16 +++++++++++-----
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkg/freetype/Library.zig b/pkg/freetype/Library.zig
index f5dc606ef..1cff79210 100644
--- a/pkg/freetype/Library.zig
+++ b/pkg/freetype/Library.zig
@@ -1,7 +1,7 @@
 const Library = @This();
 
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const errors = @import("errors.zig");
 const Error = errors.Error;
diff --git a/pkg/freetype/c.zig b/pkg/freetype/c.zig
index 8a00bba2b..9431abeb6 100644
--- a/pkg/freetype/c.zig
+++ b/pkg/freetype/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("freetype-zig.h");
 });
diff --git a/pkg/freetype/computations.zig b/pkg/freetype/computations.zig
index 82a95cdeb..fc9b2ccb2 100644
--- a/pkg/freetype/computations.zig
+++ b/pkg/freetype/computations.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// Compute (a*b)/0x10000 with maximum accuracy. Its main use is to multiply
 /// a given value by a 16.16 fixed-point factor.
diff --git a/pkg/freetype/errors.zig b/pkg/freetype/errors.zig
index 3fe6dccb8..9eddc0575 100644
--- a/pkg/freetype/errors.zig
+++ b/pkg/freetype/errors.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 // Thanks to Mach (https://github.com/hexops/mach) for this work, I didn't
 // do this manually. I wrote the other Freetype bindings by hand but this
diff --git a/pkg/freetype/face.zig b/pkg/freetype/face.zig
index 94c3e2931..2724aba40 100644
--- a/pkg/freetype/face.zig
+++ b/pkg/freetype/face.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const errors = @import("errors.zig");
 const Library = @import("Library.zig");
 const Tag = @import("tag.zig").Tag;
diff --git a/pkg/freetype/main.zig b/pkg/freetype/main.zig
index bfa5e6bc1..b39650423 100644
--- a/pkg/freetype/main.zig
+++ b/pkg/freetype/main.zig
@@ -1,10 +1,16 @@
-pub const c = @import("c.zig");
+const computations = @import("computations.zig");
+const errors = @import("errors.zig");
+const face = @import("face.zig");
+const tag = @import("tag.zig");
+
+pub const c = @import("c.zig").c;
 pub const testing = @import("test.zig");
 pub const Library = @import("Library.zig");
-pub usingnamespace @import("computations.zig");
-pub usingnamespace @import("errors.zig");
-pub usingnamespace @import("face.zig");
-pub usingnamespace @import("tag.zig");
+
+pub const Error = errors.Error;
+pub const Face = face.Face;
+pub const Tag = tag.Tag;
+pub const mulFix = computations.mulFix;
 
 test {
     @import("std").testing.refAllDecls(@This());

From 0e2eb85989c7faf57af2c278d250b978d84e8d26 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:36:31 -0700
Subject: [PATCH 04/16] pkg/glslang: yeet usingns

---
 pkg/glslang/c.zig       |  2 +-
 pkg/glslang/init.zig    |  2 +-
 pkg/glslang/main.zig    | 14 ++++++++++----
 pkg/glslang/program.zig |  2 +-
 pkg/glslang/shader.zig  |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkg/glslang/c.zig b/pkg/glslang/c.zig
index 97d9046a5..c00108463 100644
--- a/pkg/glslang/c.zig
+++ b/pkg/glslang/c.zig
@@ -1,4 +1,4 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("glslang/Include/glslang_c_interface.h");
     @cInclude("glslang/Public/resource_limits_c.h");
 });
diff --git a/pkg/glslang/init.zig b/pkg/glslang/init.zig
index 33ddd081d..a865e9e79 100644
--- a/pkg/glslang/init.zig
+++ b/pkg/glslang/init.zig
@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub fn init() !void {
     if (c.glslang_initialize_process() == 0) return error.GlslangInitFailed;
diff --git a/pkg/glslang/main.zig b/pkg/glslang/main.zig
index 1a93e52be..2743650c6 100644
--- a/pkg/glslang/main.zig
+++ b/pkg/glslang/main.zig
@@ -1,8 +1,14 @@
-pub const c = @import("c.zig");
+const initpkg = @import("init.zig");
+const program = @import("program.zig");
+const shader = @import("shader.zig");
+
+pub const c = @import("c.zig").c;
 pub const testing = @import("test.zig");
-pub usingnamespace @import("init.zig");
-pub usingnamespace @import("program.zig");
-pub usingnamespace @import("shader.zig");
+
+pub const init = initpkg.init;
+pub const finalize = initpkg.finalize;
+pub const Program = program.Program;
+pub const Shader = shader.Shader;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/glslang/program.zig b/pkg/glslang/program.zig
index 70d3c88cd..4af687cc5 100644
--- a/pkg/glslang/program.zig
+++ b/pkg/glslang/program.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const testlib = @import("test.zig");
 const Shader = @import("shader.zig").Shader;
 
diff --git a/pkg/glslang/shader.zig b/pkg/glslang/shader.zig
index 90e5e192f..36a09f34d 100644
--- a/pkg/glslang/shader.zig
+++ b/pkg/glslang/shader.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const testlib = @import("test.zig");
 
 pub const Shader = opaque {

From ea73edaf7f0ba1902624b8dadd75c5ca84b3328a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:38:18 -0700
Subject: [PATCH 05/16] pkg/harfbuzz: fix c.zig

---
 pkg/harfbuzz/blob.zig     | 2 +-
 pkg/harfbuzz/buffer.zig   | 2 +-
 pkg/harfbuzz/c.zig        | 2 +-
 pkg/harfbuzz/common.zig   | 2 +-
 pkg/harfbuzz/coretext.zig | 2 +-
 pkg/harfbuzz/face.zig     | 2 +-
 pkg/harfbuzz/font.zig     | 2 +-
 pkg/harfbuzz/freetype.zig | 2 +-
 pkg/harfbuzz/main.zig     | 2 +-
 pkg/harfbuzz/shape.zig    | 2 +-
 pkg/harfbuzz/version.zig  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/harfbuzz/blob.zig b/pkg/harfbuzz/blob.zig
index c4d8c5936..d25df6974 100644
--- a/pkg/harfbuzz/blob.zig
+++ b/pkg/harfbuzz/blob.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Error = @import("errors.zig").Error;
 
 /// Data type holding the memory modes available to client programs.
diff --git a/pkg/harfbuzz/buffer.zig b/pkg/harfbuzz/buffer.zig
index f52385417..035120f1a 100644
--- a/pkg/harfbuzz/buffer.zig
+++ b/pkg/harfbuzz/buffer.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const common = @import("common.zig");
 const Error = @import("errors.zig").Error;
 const Direction = common.Direction;
diff --git a/pkg/harfbuzz/c.zig b/pkg/harfbuzz/c.zig
index 9f8790fe5..51e477ebf 100644
--- a/pkg/harfbuzz/c.zig
+++ b/pkg/harfbuzz/c.zig
@@ -1,6 +1,6 @@
 const builtin = @import("builtin");
 
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("hb.h");
     @cInclude("hb-ft.h");
     if (builtin.os.tag == .macos) @cInclude("hb-coretext.h");
diff --git a/pkg/harfbuzz/common.zig b/pkg/harfbuzz/common.zig
index 7ecea502c..840ff5868 100644
--- a/pkg/harfbuzz/common.zig
+++ b/pkg/harfbuzz/common.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// The direction of a text segment or buffer.
 ///
diff --git a/pkg/harfbuzz/coretext.zig b/pkg/harfbuzz/coretext.zig
index 4253feddb..73042624c 100644
--- a/pkg/harfbuzz/coretext.zig
+++ b/pkg/harfbuzz/coretext.zig
@@ -1,6 +1,6 @@
 const macos = @import("macos");
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const Font = @import("font.zig").Font;
 const Error = @import("errors.zig").Error;
diff --git a/pkg/harfbuzz/face.zig b/pkg/harfbuzz/face.zig
index 2fd3605e8..5ffad5d3e 100644
--- a/pkg/harfbuzz/face.zig
+++ b/pkg/harfbuzz/face.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// A font face is an object that represents a single face from within a font family.
 ///
diff --git a/pkg/harfbuzz/font.zig b/pkg/harfbuzz/font.zig
index 0947ea0b2..13544fb9f 100644
--- a/pkg/harfbuzz/font.zig
+++ b/pkg/harfbuzz/font.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const Error = @import("errors.zig").Error;
 
diff --git a/pkg/harfbuzz/freetype.zig b/pkg/harfbuzz/freetype.zig
index 570403061..d90d3f83c 100644
--- a/pkg/harfbuzz/freetype.zig
+++ b/pkg/harfbuzz/freetype.zig
@@ -1,6 +1,6 @@
 const freetype = @import("freetype");
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Face = @import("face.zig").Face;
 const Font = @import("font.zig").Font;
 const Error = @import("errors.zig").Error;
diff --git a/pkg/harfbuzz/main.zig b/pkg/harfbuzz/main.zig
index 6cbb1b2c3..988ca8fc9 100644
--- a/pkg/harfbuzz/main.zig
+++ b/pkg/harfbuzz/main.zig
@@ -1,4 +1,4 @@
-pub const c = @import("c.zig");
+pub const c = @import("c.zig").c;
 pub usingnamespace @import("blob.zig");
 pub usingnamespace @import("buffer.zig");
 pub usingnamespace @import("common.zig");
diff --git a/pkg/harfbuzz/shape.zig b/pkg/harfbuzz/shape.zig
index be197e5de..b49020c3c 100644
--- a/pkg/harfbuzz/shape.zig
+++ b/pkg/harfbuzz/shape.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Font = @import("font.zig").Font;
 const Buffer = @import("buffer.zig").Buffer;
 const Feature = @import("common.zig").Feature;
diff --git a/pkg/harfbuzz/version.zig b/pkg/harfbuzz/version.zig
index 0773e22fd..dbe25b522 100644
--- a/pkg/harfbuzz/version.zig
+++ b/pkg/harfbuzz/version.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Version = struct {
     major: u32,

From 59755363a3966dd6cf028b88a45962f404b287eb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:41:50 -0700
Subject: [PATCH 06/16] pkg/pixman: remove usingns

---
 pkg/pixman/c.zig      |  2 +-
 pkg/pixman/format.zig |  2 +-
 pkg/pixman/image.zig  |  2 +-
 pkg/pixman/main.zig   | 23 ++++++++++++++++++-----
 pkg/pixman/types.zig  |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkg/pixman/c.zig b/pkg/pixman/c.zig
index 04972bc40..912dd7fbc 100644
--- a/pkg/pixman/c.zig
+++ b/pkg/pixman/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("pixman.h");
 });
diff --git a/pkg/pixman/format.zig b/pkg/pixman/format.zig
index 9cea4308c..1176d5212 100644
--- a/pkg/pixman/format.zig
+++ b/pkg/pixman/format.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const pixman = @import("main.zig");
 
 pub const FormatCode = enum(c_uint) {
diff --git a/pkg/pixman/image.zig b/pkg/pixman/image.zig
index 09c60540f..76cb45922 100644
--- a/pkg/pixman/image.zig
+++ b/pkg/pixman/image.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const pixman = @import("main.zig");
 
 pub const Image = opaque {
diff --git a/pkg/pixman/main.zig b/pkg/pixman/main.zig
index 864736b2c..33ea19127 100644
--- a/pkg/pixman/main.zig
+++ b/pkg/pixman/main.zig
@@ -1,9 +1,22 @@
 const std = @import("std");
-pub const c = @import("c.zig");
-pub usingnamespace @import("error.zig");
-pub usingnamespace @import("format.zig");
-pub usingnamespace @import("image.zig");
-pub usingnamespace @import("types.zig");
+const format = @import("format.zig");
+const image = @import("image.zig");
+const types = @import("types.zig");
+
+pub const c = @import("c.zig").c;
+pub const Color = types.Color;
+pub const Error = @import("error.zig").Error;
+pub const Fixed = types.Fixed;
+pub const FormatCode = format.FormatCode;
+pub const Image = image.Image;
+pub const Op = types.Op;
+pub const PointFixed = types.PointFixed;
+pub const LineFixed = types.LineFixed;
+pub const Triangle = types.Triangle;
+pub const Trapezoid = types.Trapezoid;
+pub const Rectangle16 = types.Rectangle16;
+pub const Box32 = types.Box32;
+pub const Indexed = types.Indexed;
 
 test {
     std.testing.refAllDecls(@This());
diff --git a/pkg/pixman/types.zig b/pkg/pixman/types.zig
index cc15c1ef7..3547bd1d5 100644
--- a/pkg/pixman/types.zig
+++ b/pkg/pixman/types.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const pixman = @import("main.zig");
 
 pub const Op = enum(c_uint) {

From 480487b44021740b14bd60d63adf62b590ed01a5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:28:39 -0700
Subject: [PATCH 07/16] pkg/utf8proc: yeet usingns

---
 pkg/utf8proc/c.zig    | 2 +-
 pkg/utf8proc/main.zig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/utf8proc/c.zig b/pkg/utf8proc/c.zig
index adeb226b0..53c8afec0 100644
--- a/pkg/utf8proc/c.zig
+++ b/pkg/utf8proc/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("utf8proc.h");
 });
diff --git a/pkg/utf8proc/main.zig b/pkg/utf8proc/main.zig
index a351fff4b..1653c76db 100644
--- a/pkg/utf8proc/main.zig
+++ b/pkg/utf8proc/main.zig
@@ -1,4 +1,4 @@
-pub const c = @import("c.zig");
+pub const c = @import("c.zig").c;
 
 /// Given a codepoint, return a character width analogous to `wcwidth(codepoint)`,
 /// except that a width of 0 is returned for non-printable codepoints

From 2f578a0b978d29b6f8fdf194f952f03343d7c0b2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:33:47 -0700
Subject: [PATCH 08/16] pkg/macos: foundation yeet usingns

---
 pkg/macos/foundation.zig                   | 43 ++++++++++++++++------
 pkg/macos/foundation/array.zig             |  2 +-
 pkg/macos/foundation/attributed_string.zig |  2 +-
 pkg/macos/foundation/base.zig              |  2 +-
 pkg/macos/foundation/c.zig                 |  2 +-
 pkg/macos/foundation/character_set.zig     |  2 +-
 pkg/macos/foundation/data.zig              |  2 +-
 pkg/macos/foundation/dictionary.zig        |  2 +-
 pkg/macos/foundation/number.zig            |  2 +-
 pkg/macos/foundation/string.zig            |  2 +-
 pkg/macos/foundation/url.zig               |  2 +-
 11 files changed, 42 insertions(+), 21 deletions(-)

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 {

From 097b978052c162af4467f6e4faa55c6973f05cea Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:35:07 -0700
Subject: [PATCH 09/16] pkg/macos: animation yeet usingns

---
 pkg/macos/animation.zig       | 6 ++++--
 pkg/macos/animation/c.zig     | 2 +-
 pkg/macos/animation/layer.zig | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 pkg/macos/animation/layer.zig

diff --git a/pkg/macos/animation.zig b/pkg/macos/animation.zig
index af7405cd1..5c3c8fd30 100644
--- a/pkg/macos/animation.zig
+++ b/pkg/macos/animation.zig
@@ -1,5 +1,7 @@
-pub const c = @import("animation/c.zig");
-pub usingnamespace @import("animation/layer.zig");
+pub const c = @import("animation/c.zig").c;
+
+/// https://developer.apple.com/documentation/quartzcore/calayer/contents_gravity_values?language=objc
+pub extern "c" const kCAGravityTopLeft: *anyopaque;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/animation/c.zig b/pkg/macos/animation/c.zig
index 7cdcaf9bd..cfe6aacfc 100644
--- a/pkg/macos/animation/c.zig
+++ b/pkg/macos/animation/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("QuartzCore/CALayer.h");
 });
diff --git a/pkg/macos/animation/layer.zig b/pkg/macos/animation/layer.zig
deleted file mode 100644
index dde7a5b66..000000000
--- a/pkg/macos/animation/layer.zig
+++ /dev/null
@@ -1,2 +0,0 @@
-/// https://developer.apple.com/documentation/quartzcore/calayer/contents_gravity_values?language=objc
-pub extern "c" const kCAGravityTopLeft: *anyopaque;

From a4c05e4a328f2fde261563b75aafc286b936957c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:38:04 -0700
Subject: [PATCH 10/16] pkg/macos: graphics usingns yeet

---
 pkg/macos/dispatch.zig                  |  2 +-
 pkg/macos/dispatch/c.zig                |  2 +-
 pkg/macos/dispatch/data.zig             |  2 +-
 pkg/macos/dispatch/queue.zig            |  2 +-
 pkg/macos/graphics.zig                  | 28 ++++++++++++++++++-------
 pkg/macos/graphics/affine_transform.zig |  2 +-
 pkg/macos/graphics/bitmap_context.zig   |  2 +-
 pkg/macos/graphics/c.zig                |  2 +-
 pkg/macos/graphics/color_space.zig      |  2 +-
 pkg/macos/graphics/context.zig          |  2 +-
 pkg/macos/graphics/font.zig             |  2 +-
 pkg/macos/graphics/geometry.zig         |  2 +-
 pkg/macos/graphics/image.zig            |  2 +-
 13 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/pkg/macos/dispatch.zig b/pkg/macos/dispatch.zig
index 9c66b529f..2bc7e8396 100644
--- a/pkg/macos/dispatch.zig
+++ b/pkg/macos/dispatch.zig
@@ -1,4 +1,4 @@
-pub const c = @import("dispatch/c.zig");
+pub const c = @import("dispatch/c.zig").c;
 pub const data = @import("dispatch/data.zig");
 pub const queue = @import("dispatch/queue.zig");
 pub const Data = data.Data;
diff --git a/pkg/macos/dispatch/c.zig b/pkg/macos/dispatch/c.zig
index 527469765..703bb4de6 100644
--- a/pkg/macos/dispatch/c.zig
+++ b/pkg/macos/dispatch/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("dispatch/dispatch.h");
 });
diff --git a/pkg/macos/dispatch/data.zig b/pkg/macos/dispatch/data.zig
index 223eabeb1..28df24b7b 100644
--- a/pkg/macos/dispatch/data.zig
+++ b/pkg/macos/dispatch/data.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Data = opaque {
     pub const DESTRUCTOR_DEFAULT = c.DISPATCH_DATA_DESTRUCTOR_DEFAULT;
diff --git a/pkg/macos/dispatch/queue.zig b/pkg/macos/dispatch/queue.zig
index 72b6bbaec..cb2ca01c9 100644
--- a/pkg/macos/dispatch/queue.zig
+++ b/pkg/macos/dispatch/queue.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Queue = *anyopaque; // dispatch_queue_t
 
diff --git a/pkg/macos/graphics.zig b/pkg/macos/graphics.zig
index 2ea5d7b7f..5195da4a5 100644
--- a/pkg/macos/graphics.zig
+++ b/pkg/macos/graphics.zig
@@ -1,11 +1,23 @@
-pub const c = @import("graphics/c.zig");
-pub usingnamespace @import("graphics/affine_transform.zig");
-pub usingnamespace @import("graphics/bitmap_context.zig");
-pub usingnamespace @import("graphics/color_space.zig");
-pub usingnamespace @import("graphics/font.zig");
-pub usingnamespace @import("graphics/geometry.zig");
-pub usingnamespace @import("graphics/image.zig");
-pub usingnamespace @import("graphics/path.zig");
+const affine_transform = @import("graphics/affine_transform.zig");
+const bitmap_context = @import("graphics/bitmap_context.zig");
+const color_space = @import("graphics/color_space.zig");
+const font = @import("graphics/font.zig");
+const geometry = @import("graphics/geometry.zig");
+const image = @import("graphics/image.zig");
+const path = @import("graphics/path.zig");
+
+pub const c = @import("graphics/c.zig").c;
+pub const AffineTransform = affine_transform.AffineTransform;
+pub const BitmapContext = bitmap_context.BitmapContext;
+pub const ColorSpace = color_space.ColorSpace;
+pub const Glyph = font.Glyph;
+pub const Point = geometry.Point;
+pub const Rect = geometry.Rect;
+pub const Size = geometry.Size;
+pub const ImageAlphaInfo = image.ImageAlphaInfo;
+pub const BitmapInfo = image.BitmapInfo;
+pub const Path = path.Path;
+pub const MutablePath = path.MutablePath;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/graphics/affine_transform.zig b/pkg/macos/graphics/affine_transform.zig
index dd07f125a..e649e7a18 100644
--- a/pkg/macos/graphics/affine_transform.zig
+++ b/pkg/macos/graphics/affine_transform.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 AffineTransform = extern struct {
     a: c.CGFloat,
diff --git a/pkg/macos/graphics/bitmap_context.zig b/pkg/macos/graphics/bitmap_context.zig
index 8b633f36e..ac2412631 100644
--- a/pkg/macos/graphics/bitmap_context.zig
+++ b/pkg/macos/graphics/bitmap_context.zig
@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
 const context = @import("context.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const BitmapContext = opaque {
     pub usingnamespace context.Context(BitmapContext);
diff --git a/pkg/macos/graphics/c.zig b/pkg/macos/graphics/c.zig
index fe755e76c..c47b271a2 100644
--- a/pkg/macos/graphics/c.zig
+++ b/pkg/macos/graphics/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("CoreGraphics/CoreGraphics.h");
 });
diff --git a/pkg/macos/graphics/color_space.zig b/pkg/macos/graphics/color_space.zig
index e5735b22e..459f06302 100644
--- a/pkg/macos/graphics/color_space.zig
+++ b/pkg/macos/graphics/color_space.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const ColorSpace = opaque {
     pub fn createDeviceGray() Allocator.Error!*ColorSpace {
diff --git a/pkg/macos/graphics/context.zig b/pkg/macos/graphics/context.zig
index 6e1ac5016..6c3c243b7 100644
--- a/pkg/macos/graphics/context.zig
+++ b/pkg/macos/graphics/context.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 /// Returns a struct that has all the shared context functions for the
 /// given type.
diff --git a/pkg/macos/graphics/font.zig b/pkg/macos/graphics/font.zig
index 47089a70b..c310c62a2 100644
--- a/pkg/macos/graphics/font.zig
+++ b/pkg/macos/graphics/font.zig
@@ -1,3 +1,3 @@
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Glyph = c.CGGlyph;
diff --git a/pkg/macos/graphics/geometry.zig b/pkg/macos/graphics/geometry.zig
index 14dee2b42..66937403c 100644
--- a/pkg/macos/graphics/geometry.zig
+++ b/pkg/macos/graphics/geometry.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 Point = extern struct {
     x: c.CGFloat,
diff --git a/pkg/macos/graphics/image.zig b/pkg/macos/graphics/image.zig
index 0c4954c11..879384b12 100644
--- a/pkg/macos/graphics/image.zig
+++ b/pkg/macos/graphics/image.zig
@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
 const context = @import("context.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const ImageAlphaInfo = enum(c_uint) {
     none = c.kCGImageAlphaNone,

From 17d844e7bfff01fb71ce503831f67c743bcc24a6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:39:33 -0700
Subject: [PATCH 11/16] pkg/macos: more

---
 pkg/macos/os.zig                 | 5 ++++-
 pkg/macos/os/c.zig               | 2 +-
 pkg/macos/os/log.zig             | 2 +-
 pkg/macos/video.zig              | 6 ++++--
 pkg/macos/video/c.zig            | 2 +-
 pkg/macos/video/display_link.zig | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkg/macos/os.zig b/pkg/macos/os.zig
index 81ece7314..183913bac 100644
--- a/pkg/macos/os.zig
+++ b/pkg/macos/os.zig
@@ -1,5 +1,8 @@
+const log = @import("os/log.zig");
+
 pub const c = @import("os/c.zig");
-pub usingnamespace @import("os/log.zig");
+pub const Log = log.Log;
+pub const LogType = log.LogType;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/os/c.zig b/pkg/macos/os/c.zig
index 74cf51791..c0d88e866 100644
--- a/pkg/macos/os/c.zig
+++ b/pkg/macos/os/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("os/log.h");
 });
diff --git a/pkg/macos/os/log.zig b/pkg/macos/os/log.zig
index 0e1b32f29..8a399b73e 100644
--- a/pkg/macos/os/log.zig
+++ b/pkg/macos/os/log.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Log = opaque {
     pub fn create(
diff --git a/pkg/macos/video.zig b/pkg/macos/video.zig
index c04f5cf27..0f5cbc4d6 100644
--- a/pkg/macos/video.zig
+++ b/pkg/macos/video.zig
@@ -1,5 +1,7 @@
-pub const c = @import("video/c.zig");
-pub usingnamespace @import("video/display_link.zig");
+const display_link = @import("video/display_link.zig");
+
+pub const c = @import("video/c.zig").c;
+pub const DisplayLink = display_link.DisplayLink;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/video/c.zig b/pkg/macos/video/c.zig
index 46c5d9ef3..d99b1aeb6 100644
--- a/pkg/macos/video/c.zig
+++ b/pkg/macos/video/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("CoreVideo/CoreVideo.h");
 });
diff --git a/pkg/macos/video/display_link.zig b/pkg/macos/video/display_link.zig
index 456d7f8d1..ca0c80d0b 100644
--- a/pkg/macos/video/display_link.zig
+++ b/pkg/macos/video/display_link.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const DisplayLink = opaque {
     pub const Error = error{

From 318dc85c0260ea72e2021186609424b742b7b5ce Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:50:41 -0700
Subject: [PATCH 12/16] pkg/macos: yeet more usingns

---
 pkg/macos/graphics/bitmap_context.zig |  4 +--
 pkg/macos/graphics/context.zig        |  2 ++
 pkg/macos/text.zig                    | 42 ++++++++++++++++++++-------
 pkg/macos/text/c.zig                  |  2 +-
 pkg/macos/text/font.zig               |  2 +-
 pkg/macos/text/font_collection.zig    |  2 +-
 pkg/macos/text/font_descriptor.zig    |  2 +-
 pkg/macos/text/font_manager.zig       |  2 +-
 pkg/macos/text/frame.zig              |  2 +-
 pkg/macos/text/framesetter.zig        |  2 +-
 pkg/macos/text/line.zig               |  2 +-
 pkg/macos/text/paragraph_style.zig    |  2 +-
 pkg/macos/text/run.zig                |  2 +-
 pkg/macos/text/stylized_strings.zig   |  2 +-
 src/font/face/coretext.zig            | 33 +++++++++++----------
 15 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/pkg/macos/graphics/bitmap_context.zig b/pkg/macos/graphics/bitmap_context.zig
index ac2412631..70d28b83a 100644
--- a/pkg/macos/graphics/bitmap_context.zig
+++ b/pkg/macos/graphics/bitmap_context.zig
@@ -2,11 +2,11 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const graphics = @import("../graphics.zig");
-const context = @import("context.zig");
+const Context = @import("context.zig").Context;
 const c = @import("c.zig").c;
 
 pub const BitmapContext = opaque {
-    pub usingnamespace context.Context(BitmapContext);
+    pub const context = Context(BitmapContext);
 
     pub fn create(
         data: ?[]u8,
diff --git a/pkg/macos/graphics/context.zig b/pkg/macos/graphics/context.zig
index 6c3c243b7..d1c6c943f 100644
--- a/pkg/macos/graphics/context.zig
+++ b/pkg/macos/graphics/context.zig
@@ -8,6 +8,8 @@ const c = @import("c.zig").c;
 /// given type.
 pub fn Context(comptime T: type) type {
     return struct {
+        value: *T,
+
         pub fn release(self: *T) void {
             c.CGContextRelease(@ptrCast(self));
         }
diff --git a/pkg/macos/text.zig b/pkg/macos/text.zig
index 6a57c19b2..149cef66b 100644
--- a/pkg/macos/text.zig
+++ b/pkg/macos/text.zig
@@ -1,14 +1,34 @@
-pub const c = @import("text/c.zig");
-pub usingnamespace @import("text/font.zig");
-pub usingnamespace @import("text/font_collection.zig");
-pub usingnamespace @import("text/font_descriptor.zig");
-pub usingnamespace @import("text/font_manager.zig");
-pub usingnamespace @import("text/frame.zig");
-pub usingnamespace @import("text/framesetter.zig");
-pub usingnamespace @import("text/line.zig");
-pub usingnamespace @import("text/paragraph_style.zig");
-pub usingnamespace @import("text/run.zig");
-pub usingnamespace @import("text/stylized_strings.zig");
+const font = @import("text/font.zig");
+const font_collection = @import("text/font_collection.zig");
+const font_descriptor = @import("text/font_descriptor.zig");
+const font_manager = @import("text/font_manager.zig");
+const frame = @import("text/frame.zig");
+const framesetter = @import("text/framesetter.zig");
+const line = @import("text/line.zig");
+const paragraph_style = @import("text/paragraph_style.zig");
+const run = @import("text/run.zig");
+const stylized_strings = @import("text/stylized_strings.zig");
+
+pub const c = @import("text/c.zig").c;
+pub const Font = font.Font;
+pub const FontTableTag = font.FontTableTag;
+pub const FontCollection = font_collection.FontCollection;
+pub const FontDescriptor = font_descriptor.FontDescriptor;
+pub const FontAttribute = font_descriptor.FontAttribute;
+pub const FontTraitKey = font_descriptor.FontTraitKey;
+pub const FontVariationAxisKey = font_descriptor.FontVariationAxisKey;
+pub const FontSymbolicTraits = font_descriptor.FontSymbolicTraits;
+pub const createFontDescriptorsFromURL = font_manager.createFontDescriptorsFromURL;
+pub const createFontDescriptorsFromData = font_manager.createFontDescriptorsFromData;
+pub const Frame = frame.Frame;
+pub const Framesetter = framesetter.Framesetter;
+pub const Line = line.Line;
+pub const ParagraphStyle = paragraph_style.ParagraphStyle;
+pub const ParagraphStyleSetting = paragraph_style.ParagraphStyleSetting;
+pub const ParagraphStyleSpecifier = paragraph_style.ParagraphStyleSpecifier;
+pub const WritingDirection = paragraph_style.WritingDirection;
+pub const Run = run.Run;
+pub const StringAttribute = stylized_strings.StringAttribute;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/macos/text/c.zig b/pkg/macos/text/c.zig
index 1f9652583..e8608d6d0 100644
--- a/pkg/macos/text/c.zig
+++ b/pkg/macos/text/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("CoreText/CoreText.h");
 });
diff --git a/pkg/macos/text/font.zig b/pkg/macos/text/font.zig
index 10f8c23ca..7d8ca243c 100644
--- a/pkg/macos/text/font.zig
+++ b/pkg/macos/text/font.zig
@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const graphics = @import("../graphics.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Font = opaque {
     pub fn createWithFontDescriptor(desc: *const text.FontDescriptor, size: f32) Allocator.Error!*Font {
diff --git a/pkg/macos/text/font_collection.zig b/pkg/macos/text/font_collection.zig
index 163d51189..8b4a86a6f 100644
--- a/pkg/macos/text/font_collection.zig
+++ b/pkg/macos/text/font_collection.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 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 FontCollection = opaque {
     pub fn createFromAvailableFonts() Allocator.Error!*FontCollection {
diff --git a/pkg/macos/text/font_descriptor.zig b/pkg/macos/text/font_descriptor.zig
index d7ba2c304..fa4fba1ea 100644
--- a/pkg/macos/text/font_descriptor.zig
+++ b/pkg/macos/text/font_descriptor.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 FontDescriptor = opaque {
     pub fn createWithNameAndSize(name: *foundation.String, size: f64) Allocator.Error!*FontDescriptor {
diff --git a/pkg/macos/text/font_manager.zig b/pkg/macos/text/font_manager.zig
index 24a25660f..f918167a0 100644
--- a/pkg/macos/text/font_manager.zig
+++ b/pkg/macos/text/font_manager.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 fn createFontDescriptorsFromURL(url: *foundation.URL) ?*foundation.Array {
     return @ptrFromInt(@intFromPtr(c.CTFontManagerCreateFontDescriptorsFromURL(
diff --git a/pkg/macos/text/frame.zig b/pkg/macos/text/frame.zig
index f37ca3383..979134a12 100644
--- a/pkg/macos/text/frame.zig
+++ b/pkg/macos/text/frame.zig
@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const graphics = @import("../graphics.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Frame = opaque {
     pub fn release(self: *Frame) void {
diff --git a/pkg/macos/text/framesetter.zig b/pkg/macos/text/framesetter.zig
index 5088057d6..dbd82762c 100644
--- a/pkg/macos/text/framesetter.zig
+++ b/pkg/macos/text/framesetter.zig
@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const graphics = @import("../graphics.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Framesetter = opaque {
     pub fn createWithAttributedString(str: *foundation.AttributedString) Allocator.Error!*Framesetter {
diff --git a/pkg/macos/text/line.zig b/pkg/macos/text/line.zig
index c13220c8b..135fd8558 100644
--- a/pkg/macos/text/line.zig
+++ b/pkg/macos/text/line.zig
@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const graphics = @import("../graphics.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Line = opaque {
     pub fn createWithAttributedString(str: *foundation.AttributedString) Allocator.Error!*Line {
diff --git a/pkg/macos/text/paragraph_style.zig b/pkg/macos/text/paragraph_style.zig
index beb2c36a8..f1d7fe957 100644
--- a/pkg/macos/text/paragraph_style.zig
+++ b/pkg/macos/text/paragraph_style.zig
@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const graphics = @import("../graphics.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 // https://developer.apple.com/documentation/coretext/ctparagraphstyle?language=objc
 pub const ParagraphStyle = opaque {
diff --git a/pkg/macos/text/run.zig b/pkg/macos/text/run.zig
index a774ad6f3..9d40de81f 100644
--- a/pkg/macos/text/run.zig
+++ b/pkg/macos/text/run.zig
@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
 const foundation = @import("../foundation.zig");
 const graphics = @import("../graphics.zig");
 const text = @import("../text.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const Run = opaque {
     pub fn release(self: *Run) void {
diff --git a/pkg/macos/text/stylized_strings.zig b/pkg/macos/text/stylized_strings.zig
index 04350a273..8e262f9a8 100644
--- a/pkg/macos/text/stylized_strings.zig
+++ b/pkg/macos/text/stylized_strings.zig
@@ -1,5 +1,5 @@
 const foundation = @import("../foundation.zig");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 
 pub const StringAttribute = enum {
     font,
diff --git a/src/font/face/coretext.zig b/src/font/face/coretext.zig
index 7b0e1e9bf..2bc550a9f 100644
--- a/src/font/face/coretext.zig
+++ b/src/font/face/coretext.zig
@@ -338,6 +338,7 @@ pub const Face = struct {
         defer alloc.free(buf);
         @memset(buf, 0);
 
+        const context = macos.graphics.BitmapContext.context;
         const ctx = try macos.graphics.BitmapContext.create(
             buf,
             width,
@@ -347,15 +348,15 @@ pub const Face = struct {
             color.space,
             color.context_opts,
         );
-        defer ctx.release();
+        defer context.release(ctx);
 
         // Perform an initial fill. This ensures that we don't have any
         // uninitialized pixels in the bitmap.
         if (color.color)
-            ctx.setRGBFillColor(1, 1, 1, 0)
+            context.setRGBFillColor(ctx, 1, 1, 1, 0)
         else
-            ctx.setGrayFillColor(0, 0);
-        ctx.fillRect(.{
+            context.setGrayFillColor(ctx, 0, 0);
+        context.fillRect(ctx, .{
             .origin = .{ .x = 0, .y = 0 },
             .size = .{
                 .width = @floatFromInt(width),
@@ -363,22 +364,22 @@ pub const Face = struct {
             },
         });
 
-        ctx.setAllowsFontSmoothing(true);
-        ctx.setShouldSmoothFonts(opts.thicken); // The amadeus "enthicken"
-        ctx.setAllowsFontSubpixelQuantization(true);
-        ctx.setShouldSubpixelQuantizeFonts(true);
-        ctx.setAllowsFontSubpixelPositioning(true);
-        ctx.setShouldSubpixelPositionFonts(true);
-        ctx.setAllowsAntialiasing(true);
-        ctx.setShouldAntialias(true);
+        context.setAllowsFontSmoothing(ctx, true);
+        context.setShouldSmoothFonts(ctx, opts.thicken); // The amadeus "enthicken"
+        context.setAllowsFontSubpixelQuantization(ctx, true);
+        context.setShouldSubpixelQuantizeFonts(ctx, true);
+        context.setAllowsFontSubpixelPositioning(ctx, true);
+        context.setShouldSubpixelPositionFonts(ctx, true);
+        context.setAllowsAntialiasing(ctx, true);
+        context.setShouldAntialias(ctx, true);
 
         // Set our color for drawing
         if (color.color) {
-            ctx.setRGBFillColor(1, 1, 1, 1);
-            ctx.setRGBStrokeColor(1, 1, 1, 1);
+            context.setRGBFillColor(ctx, 1, 1, 1, 1);
+            context.setRGBStrokeColor(ctx, 1, 1, 1, 1);
         } else {
-            ctx.setGrayFillColor(1, 1);
-            ctx.setGrayStrokeColor(1, 1);
+            context.setGrayFillColor(ctx, 1, 1);
+            context.setGrayStrokeColor(ctx, 1, 1);
         }
 
         // We want to render the glyphs at (0,0), but the glyphs themselves

From 7a7f7da4ef416614ed7a9c7f8ae743e5f9b112a2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:52:28 -0700
Subject: [PATCH 13/16] pkg: yeet more usingns

---
 pkg/cimgui/c.zig         | 22 +---------------------
 pkg/cimgui/main.zig      | 19 ++++++++++++++++++-
 pkg/spirv-cross/c.zig    |  2 +-
 pkg/spirv-cross/main.zig |  2 +-
 src/apprt/embedded.zig   |  8 ++++----
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/pkg/cimgui/c.zig b/pkg/cimgui/c.zig
index 19a619634..f9b8ff920 100644
--- a/pkg/cimgui/c.zig
+++ b/pkg/cimgui/c.zig
@@ -1,24 +1,4 @@
-const c = @cImport({
+pub const c = @cImport({
     @cDefine("CIMGUI_DEFINE_ENUMS_AND_STRUCTS", "1");
     @cInclude("cimgui.h");
 });
-
-// Export all of the C API
-pub usingnamespace c;
-
-// OpenGL
-pub extern fn ImGui_ImplOpenGL3_Init(?[*:0]const u8) callconv(.C) bool;
-pub extern fn ImGui_ImplOpenGL3_Shutdown() callconv(.C) void;
-pub extern fn ImGui_ImplOpenGL3_NewFrame() callconv(.C) void;
-pub extern fn ImGui_ImplOpenGL3_RenderDrawData(*c.ImDrawData) callconv(.C) void;
-
-// Metal
-pub extern fn ImGui_ImplMetal_Init(*anyopaque) callconv(.C) bool;
-pub extern fn ImGui_ImplMetal_Shutdown() callconv(.C) void;
-pub extern fn ImGui_ImplMetal_NewFrame(*anyopaque) callconv(.C) void;
-pub extern fn ImGui_ImplMetal_RenderDrawData(*c.ImDrawData, *anyopaque, *anyopaque) callconv(.C) void;
-
-// OSX
-pub extern fn ImGui_ImplOSX_Init(*anyopaque) callconv(.C) bool;
-pub extern fn ImGui_ImplOSX_Shutdown() callconv(.C) void;
-pub extern fn ImGui_ImplOSX_NewFrame(*anyopaque) callconv(.C) void;
diff --git a/pkg/cimgui/main.zig b/pkg/cimgui/main.zig
index 22183a367..e6e54c357 100644
--- a/pkg/cimgui/main.zig
+++ b/pkg/cimgui/main.zig
@@ -1,3 +1,20 @@
-pub const c = @import("c.zig");
+pub const c = @import("c.zig").c;
+
+// OpenGL
+pub extern fn ImGui_ImplOpenGL3_Init(?[*:0]const u8) callconv(.C) bool;
+pub extern fn ImGui_ImplOpenGL3_Shutdown() callconv(.C) void;
+pub extern fn ImGui_ImplOpenGL3_NewFrame() callconv(.C) void;
+pub extern fn ImGui_ImplOpenGL3_RenderDrawData(*c.ImDrawData) callconv(.C) void;
+
+// Metal
+pub extern fn ImGui_ImplMetal_Init(*anyopaque) callconv(.C) bool;
+pub extern fn ImGui_ImplMetal_Shutdown() callconv(.C) void;
+pub extern fn ImGui_ImplMetal_NewFrame(*anyopaque) callconv(.C) void;
+pub extern fn ImGui_ImplMetal_RenderDrawData(*c.ImDrawData, *anyopaque, *anyopaque) callconv(.C) void;
+
+// OSX
+pub extern fn ImGui_ImplOSX_Init(*anyopaque) callconv(.C) bool;
+pub extern fn ImGui_ImplOSX_Shutdown() callconv(.C) void;
+pub extern fn ImGui_ImplOSX_NewFrame(*anyopaque) callconv(.C) void;
 
 test {}
diff --git a/pkg/spirv-cross/c.zig b/pkg/spirv-cross/c.zig
index 42ad77dab..08a999a3b 100644
--- a/pkg/spirv-cross/c.zig
+++ b/pkg/spirv-cross/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("spirv_cross_c.h");
 });
diff --git a/pkg/spirv-cross/main.zig b/pkg/spirv-cross/main.zig
index e66cd7094..1ef5493ba 100644
--- a/pkg/spirv-cross/main.zig
+++ b/pkg/spirv-cross/main.zig
@@ -1 +1 @@
-pub const c = @import("c.zig");
+pub const c = @import("c.zig").c;
diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index efeb2cf6f..d3b2d6f29 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -1157,7 +1157,7 @@ pub const Inspector = struct {
 
         pub fn deinit(self: Backend) void {
             switch (self) {
-                .metal => if (builtin.target.isDarwin()) cimgui.c.ImGui_ImplMetal_Shutdown(),
+                .metal => if (builtin.target.isDarwin()) cimgui.ImGui_ImplMetal_Shutdown(),
             }
         }
     };
@@ -1203,7 +1203,7 @@ pub const Inspector = struct {
             self.backend = null;
         }
 
-        if (!cimgui.c.ImGui_ImplMetal_Init(device.value)) {
+        if (!cimgui.ImGui_ImplMetal_Init(device.value)) {
             log.warn("failed to initialize metal backend", .{});
             return false;
         }
@@ -1229,7 +1229,7 @@ pub const Inspector = struct {
         // ImGui completes all its state processing. I don't know how to fix
         // this.
         for (0..2) |_| {
-            cimgui.c.ImGui_ImplMetal_NewFrame(desc.value);
+            cimgui.ImGui_ImplMetal_NewFrame(desc.value);
             try self.newFrame();
             cimgui.c.igNewFrame();
 
@@ -1251,7 +1251,7 @@ pub const Inspector = struct {
             .{desc.value},
         );
         defer encoder.msgSend(void, objc.sel("endEncoding"), .{});
-        cimgui.c.ImGui_ImplMetal_RenderDrawData(
+        cimgui.ImGui_ImplMetal_RenderDrawData(
             cimgui.c.igGetDrawData(),
             command_buffer.value,
             encoder.value,

From d7299b16bf54b8497d1424e74465b9de358624d7 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:53:17 -0700
Subject: [PATCH 14/16] apprt/gtk: fix imgui calls

---
 src/apprt/gtk/ImguiWidget.zig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apprt/gtk/ImguiWidget.zig b/src/apprt/gtk/ImguiWidget.zig
index de6bf606d..d78ed28a7 100644
--- a/src/apprt/gtk/ImguiWidget.zig
+++ b/src/apprt/gtk/ImguiWidget.zig
@@ -161,7 +161,7 @@ fn gtkRealize(area: *c.GtkGLArea, ud: ?*anyopaque) callconv(.C) void {
     // initialize the ImgUI OpenGL backend for our context.
     const self: *ImguiWidget = @ptrCast(@alignCast(ud.?));
     cimgui.c.igSetCurrentContext(self.ig_ctx);
-    _ = cimgui.c.ImGui_ImplOpenGL3_Init(null);
+    _ = cimgui.ImGui_ImplOpenGL3_Init(null);
 }
 
 fn gtkUnrealize(area: *c.GtkGLArea, ud: ?*anyopaque) callconv(.C) void {
@@ -170,7 +170,7 @@ fn gtkUnrealize(area: *c.GtkGLArea, ud: ?*anyopaque) callconv(.C) void {
 
     const self: *ImguiWidget = @ptrCast(@alignCast(ud.?));
     cimgui.c.igSetCurrentContext(self.ig_ctx);
-    cimgui.c.ImGui_ImplOpenGL3_Shutdown();
+    cimgui.ImGui_ImplOpenGL3_Shutdown();
 }
 
 fn gtkResize(area: *c.GtkGLArea, width: c.gint, height: c.gint, ud: ?*anyopaque) callconv(.C) void {
@@ -207,7 +207,7 @@ fn gtkRender(area: *c.GtkGLArea, ctx: *c.GdkGLContext, ud: ?*anyopaque) callconv
     // take multiple renders to process. I don't know how to make this
     // more efficient.
     for (0..2) |_| {
-        cimgui.c.ImGui_ImplOpenGL3_NewFrame();
+        cimgui.ImGui_ImplOpenGL3_NewFrame();
         self.newFrame() catch |err| {
             log.err("failed to setup frame: {}", .{err});
             return 0;
@@ -224,7 +224,7 @@ fn gtkRender(area: *c.GtkGLArea, ctx: *c.GdkGLContext, ud: ?*anyopaque) callconv
     // OpenGL final render
     gl.clearColor(0x28 / 0xFF, 0x2C / 0xFF, 0x34 / 0xFF, 1.0);
     gl.clear(gl.c.GL_COLOR_BUFFER_BIT);
-    cimgui.c.ImGui_ImplOpenGL3_RenderDrawData(cimgui.c.igGetDrawData());
+    cimgui.ImGui_ImplOpenGL3_RenderDrawData(cimgui.c.igGetDrawData());
 
     return 1;
 }

From 38a7a553005d26a9ae28029d0548f109c4c2cd08 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 16:58:16 -0700
Subject: [PATCH 15/16] pkg/fontconfig: yeet usingns

---
 pkg/fontconfig/c.zig          |  2 +-
 pkg/fontconfig/char_set.zig   |  2 +-
 pkg/fontconfig/common.zig     |  2 +-
 pkg/fontconfig/config.zig     |  2 +-
 pkg/fontconfig/font_set.zig   |  2 +-
 pkg/fontconfig/init.zig       |  2 +-
 pkg/fontconfig/lang_set.zig   |  2 +-
 pkg/fontconfig/main.zig       | 50 ++++++++++++++++++++++++++---------
 pkg/fontconfig/matrix.zig     |  2 +-
 pkg/fontconfig/object_set.zig |  2 +-
 pkg/fontconfig/pattern.zig    |  2 +-
 pkg/fontconfig/range.zig      |  2 +-
 pkg/fontconfig/value.zig      |  2 +-
 13 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/pkg/fontconfig/c.zig b/pkg/fontconfig/c.zig
index c1c243c2d..6e8ae76bc 100644
--- a/pkg/fontconfig/c.zig
+++ b/pkg/fontconfig/c.zig
@@ -1,3 +1,3 @@
-pub usingnamespace @cImport({
+pub const c = @cImport({
     @cInclude("fontconfig/fontconfig.h");
 });
diff --git a/pkg/fontconfig/char_set.zig b/pkg/fontconfig/char_set.zig
index 7bf385e32..b0e3a3415 100644
--- a/pkg/fontconfig/char_set.zig
+++ b/pkg/fontconfig/char_set.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 CharSet = opaque {
     pub fn create() *CharSet {
diff --git a/pkg/fontconfig/common.zig b/pkg/fontconfig/common.zig
index cdafd1e95..44c583f94 100644
--- a/pkg/fontconfig/common.zig
+++ b/pkg/fontconfig/common.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Error = @import("main.zig").Error;
 
 pub const Weight = enum(c_uint) {
diff --git a/pkg/fontconfig/config.zig b/pkg/fontconfig/config.zig
index 70a1158a6..2b3674c54 100644
--- a/pkg/fontconfig/config.zig
+++ b/pkg/fontconfig/config.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Error = @import("main.zig").Error;
 const CharSet = @import("char_set.zig").CharSet;
 const FontSet = @import("font_set.zig").FontSet;
diff --git a/pkg/fontconfig/font_set.zig b/pkg/fontconfig/font_set.zig
index 4a942c1e0..c5a8c5f97 100644
--- a/pkg/fontconfig/font_set.zig
+++ b/pkg/fontconfig/font_set.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;
 const Pattern = @import("pattern.zig").Pattern;
 
 pub const FontSet = opaque {
diff --git a/pkg/fontconfig/init.zig b/pkg/fontconfig/init.zig
index 290555bb9..6e8f4d617 100644
--- a/pkg/fontconfig/init.zig
+++ b/pkg/fontconfig/init.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Config = @import("config.zig").Config;
 
 pub fn init() bool {
diff --git a/pkg/fontconfig/lang_set.zig b/pkg/fontconfig/lang_set.zig
index 9f0ffd06e..aaf55bab6 100644
--- a/pkg/fontconfig/lang_set.zig
+++ b/pkg/fontconfig/lang_set.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 LangSet = opaque {
     pub fn create() *LangSet {
diff --git a/pkg/fontconfig/main.zig b/pkg/fontconfig/main.zig
index c759078c0..61f8a3295 100644
--- a/pkg/fontconfig/main.zig
+++ b/pkg/fontconfig/main.zig
@@ -1,16 +1,40 @@
-pub const c = @import("c.zig");
-pub usingnamespace @import("init.zig");
-pub usingnamespace @import("char_set.zig");
-pub usingnamespace @import("common.zig");
-pub usingnamespace @import("config.zig");
-pub usingnamespace @import("error.zig");
-pub usingnamespace @import("font_set.zig");
-pub usingnamespace @import("lang_set.zig");
-pub usingnamespace @import("matrix.zig");
-pub usingnamespace @import("object_set.zig");
-pub usingnamespace @import("pattern.zig");
-pub usingnamespace @import("range.zig");
-pub usingnamespace @import("value.zig");
+const initpkg = @import("init.zig");
+const char_set = @import("char_set.zig");
+const common = @import("common.zig");
+const config = @import("config.zig");
+const errorpkg = @import("error.zig");
+const font_set = @import("font_set.zig");
+const lang_set = @import("lang_set.zig");
+const matrix = @import("matrix.zig");
+const object_set = @import("object_set.zig");
+const pattern = @import("pattern.zig");
+const range = @import("range.zig");
+const value = @import("value.zig");
+
+pub const c = @import("c.zig").c;
+pub const init = initpkg.init;
+pub const fini = initpkg.fini;
+pub const initLoadConfig = initpkg.initLoadConfig;
+pub const initLoadConfigAndFonts = initpkg.initLoadConfigAndFonts;
+pub const version = initpkg.version;
+pub const CharSet = char_set.CharSet;
+pub const Weight = common.Weight;
+pub const Slant = common.Slant;
+pub const Spacing = common.Spacing;
+pub const Property = common.Property;
+pub const Result = common.Result;
+pub const MatchKind = common.MatchKind;
+pub const Config = config.Config;
+pub const Error = errorpkg.Error;
+pub const FontSet = font_set.FontSet;
+pub const LangSet = lang_set.LangSet;
+pub const Matrix = matrix.Matrix;
+pub const ObjectSet = object_set.ObjectSet;
+pub const Pattern = pattern.Pattern;
+pub const Range = range.Range;
+pub const Type = value.Type;
+pub const Value = value.Value;
+pub const ValueBinding = value.ValueBinding;
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/pkg/fontconfig/matrix.zig b/pkg/fontconfig/matrix.zig
index 11a7275ef..a9b05a9eb 100644
--- a/pkg/fontconfig/matrix.zig
+++ b/pkg/fontconfig/matrix.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 Matrix = extern struct {
     xx: f64,
diff --git a/pkg/fontconfig/object_set.zig b/pkg/fontconfig/object_set.zig
index defc47fbd..29cf63862 100644
--- a/pkg/fontconfig/object_set.zig
+++ b/pkg/fontconfig/object_set.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c.zig").c;
 const Property = @import("main.zig").Property;
 
 pub const ObjectSet = opaque {
diff --git a/pkg/fontconfig/pattern.zig b/pkg/fontconfig/pattern.zig
index 3175f1eea..e0ec27a69 100644
--- a/pkg/fontconfig/pattern.zig
+++ b/pkg/fontconfig/pattern.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;
 const Error = @import("main.zig").Error;
 const ObjectSet = @import("main.zig").ObjectSet;
 const Property = @import("main.zig").Property;
diff --git a/pkg/fontconfig/range.zig b/pkg/fontconfig/range.zig
index f1dfe3443..9eb0ef268 100644
--- a/pkg/fontconfig/range.zig
+++ b/pkg/fontconfig/range.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 Range = opaque {
     pub fn destroy(self: *Range) void {
diff --git a/pkg/fontconfig/value.zig b/pkg/fontconfig/value.zig
index de725c313..89f796a26 100644
--- a/pkg/fontconfig/value.zig
+++ b/pkg/fontconfig/value.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;
 const CharSet = @import("main.zig").CharSet;
 const LangSet = @import("main.zig").LangSet;
 const Matrix = @import("main.zig").Matrix;

From fd37e6a3518d9559bae26c18f44720ff7f048c78 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 17:00:58 -0700
Subject: [PATCH 16/16] pkg/harfbuzz: yeet usingns

---
 pkg/harfbuzz/main.zig | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkg/harfbuzz/main.zig b/pkg/harfbuzz/main.zig
index 988ca8fc9..d0e8ac2f3 100644
--- a/pkg/harfbuzz/main.zig
+++ b/pkg/harfbuzz/main.zig
@@ -1,14 +1,29 @@
+const blob = @import("blob.zig");
+const buffer = @import("buffer.zig");
+const common = @import("common.zig");
+const errors = @import("errors.zig");
+const face = @import("face.zig");
+const font = @import("font.zig");
+const shapepkg = @import("shape.zig");
+const versionpkg = @import("version.zig");
+
 pub const c = @import("c.zig").c;
-pub usingnamespace @import("blob.zig");
-pub usingnamespace @import("buffer.zig");
-pub usingnamespace @import("common.zig");
-pub usingnamespace @import("errors.zig");
-pub usingnamespace @import("face.zig");
-pub usingnamespace @import("font.zig");
-pub usingnamespace @import("shape.zig");
-pub usingnamespace @import("version.zig");
 pub const freetype = @import("freetype.zig");
 pub const coretext = @import("coretext.zig");
+pub const MemoryMode = blob.MemoryMode;
+pub const Blob = blob.Blob;
+pub const Buffer = buffer.Buffer;
+pub const Direction = common.Direction;
+pub const Script = common.Script;
+pub const Language = common.Language;
+pub const Feature = common.Feature;
+pub const Face = face.Face;
+pub const Font = font.Font;
+pub const shape = shapepkg.shape;
+pub const Version = versionpkg.Version;
+pub const version = versionpkg.version;
+pub const versionAtLeast = versionpkg.versionAtLeast;
+pub const versionString = versionpkg.versionString;
 
 test {
     @import("std").testing.refAllDecls(@This());