diff --git a/src/stb/main.zig b/src/stb/main.zig
index b047104af..599e95d5f 100644
--- a/src/stb/main.zig
+++ b/src/stb/main.zig
@@ -1,4 +1,9 @@
-pub usingnamespace @cImport({
+const c = @cImport({
     @cInclude("stb_image.h");
     @cInclude("stb_image_resize.h");
 });
+
+// We'll just add the exports of the functions or types we actually use
+// here, no need to export everything from the C lib if we don't use it.
+pub const stbi_load_from_memory = c.stbi_load_from_memory;
+pub const stbi_image_free = c.stbi_image_free;
diff --git a/src/termio.zig b/src/termio.zig
index b4943cca9..c69785b25 100644
--- a/src/termio.zig
+++ b/src/termio.zig
@@ -19,7 +19,7 @@
 
 const stream_handler = @import("termio/stream_handler.zig");
 
-pub usingnamespace @import("termio/message.zig");
+const message = @import("termio/message.zig");
 pub const backend = @import("termio/backend.zig");
 pub const mailbox = @import("termio/mailbox.zig");
 pub const Exec = @import("termio/Exec.zig");
@@ -29,6 +29,8 @@ pub const Thread = @import("termio/Thread.zig");
 pub const Backend = backend.Backend;
 pub const DerivedConfig = Termio.DerivedConfig;
 pub const Mailbox = mailbox.Mailbox;
+pub const Message = message.Message;
+pub const MessageData = message.MessageData;
 pub const StreamHandler = stream_handler.StreamHandler;
 
 test {