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;