2 files changed, 11 insertions, 4 deletions
diff --git a/src/main.zig b/src/main.zig
index 09e9e07..947375f 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -37,13 +37,13 @@ pub fn main() !void {
         .allocator = gpa,
     }) catch |err| {
         // Report useful error and exit.
-        diag.report(std.io.getStdErr().writer(), err) catch {};
+        try diag.reportToFile(.stderr(), err);
         return err;
     };
     defer res.deinit();
 
     if (res.args.help != 0) {
-        return clap.help(std.io.getStdErr().writer(), clap.Help, &params, .{});
+        return clap.helpToFile(.stderr(), clap.Help, &params, .{});
     }
 
     var client = try SaprusClient.init("enp7s0");
@@ -65,7 +65,7 @@ pub fn main() !void {
         return;
     }
 
-    return clap.help(std.io.getStdErr().writer(), clap.Help, &params, .{});
+    return clap.helpToFile(.stderr(), clap.Help, &params, .{});
 }
 
 fn parseDest(in: ?[]const u8) [4]u8 {
diff --git a/src/root.zig b/src/root.zig
index 71d5b2d..6f45130 100644
--- a/src/root.zig
+++ b/src/root.zig
@@ -1,4 +1,11 @@
 pub const Client = @import("Client.zig");
 pub const Connection = @import("Connection.zig");
 
-pub usingnamespace @import("message.zig");
+const msg = @import("message.zig");
+
+pub const PacketType = msg.PacketType;
+pub const foo = msg.foo;
+pub const ConnectionOptions = msg.ConnectionOptions;
+pub const MessageTypeError = msg.MessageTypeError;
+pub const MessageParseError = msg.MessageParseError;
+pub const Message = msg.Message;