diff --git a/src/config.zig b/src/config.zig
index 34b209c09..3be645cc3 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -1,12 +1,15 @@
 const builtin = @import("builtin");
 
-pub usingnamespace @import("config/key.zig");
-pub usingnamespace @import("config/formatter.zig");
+const formatter = @import("config/formatter.zig");
 pub const Config = @import("config/Config.zig");
 pub const string = @import("config/string.zig");
 pub const edit = @import("config/edit.zig");
 pub const url = @import("config/url.zig");
 
+pub const FileFormatter = formatter.FileFormatter;
+pub const entryFormatter = formatter.entryFormatter;
+pub const formatEntry = formatter.formatEntry;
+
 // Field types
 pub const ClipboardAccess = Config.ClipboardAccess;
 pub const CopyOnSelect = Config.CopyOnSelect;
diff --git a/src/simd/main.zig b/src/simd/main.zig
index d3ada5708..bfcd68c0a 100644
--- a/src/simd/main.zig
+++ b/src/simd/main.zig
@@ -1,9 +1,10 @@
 const std = @import("std");
 
-pub usingnamespace @import("codepoint_width.zig");
+const codepoint_width = @import("codepoint_width.zig");
 pub const base64 = @import("base64.zig");
 pub const index_of = @import("index_of.zig");
 pub const vt = @import("vt.zig");
+pub const codepointWidth = codepoint_width.codepointWidth;
 
 test {
     @import("std").testing.refAllDecls(@This());