diff --git a/src/App.zig b/src/App.zig
index 2fae4d7df..99d03399c 100644
--- a/src/App.zig
+++ b/src/App.zig
@@ -7,19 +7,14 @@ const std = @import("std");
 const builtin = @import("builtin");
 const assert = @import("quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const build_config = @import("build_config.zig");
 const apprt = @import("apprt.zig");
 const Surface = @import("Surface.zig");
-const tracy = @import("tracy");
 const input = @import("input.zig");
 const configpkg = @import("config.zig");
 const Config = configpkg.Config;
 const BlockingQueue = @import("datastruct/main.zig").BlockingQueue;
 const renderer = @import("renderer.zig");
 const font = @import("font/main.zig");
-const internal_os = @import("os/main.zig");
-const macos = @import("macos");
-const objc = @import("objc");
 
 const log = std.log.scoped(.app);
 
diff --git a/src/Surface.zig b/src/Surface.zig
index d0866e901..591ee7220 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -26,9 +26,6 @@ const crash = @import("crash/main.zig");
 const unicode = @import("unicode/main.zig");
 const rendererpkg = @import("renderer.zig");
 const termio = @import("termio.zig");
-const objc = @import("objc");
-const imgui = @import("imgui");
-const Pty = @import("pty.zig").Pty;
 const font = @import("font/main.zig");
 const Command = @import("Command.zig");
 const terminal = @import("terminal/main.zig");
diff --git a/src/apprt.zig b/src/apprt.zig
index dbd62fbfb..c467f1801 100644
--- a/src/apprt.zig
+++ b/src/apprt.zig
@@ -8,8 +8,6 @@
 //! The goal is to have different implementations share as much of the core
 //! logic as possible, and to only reach out to platform-specific implementation
 //! code when absolutely necessary.
-const std = @import("std");
-const builtin = @import("builtin");
 const build_config = @import("build_config.zig");
 
 const structs = @import("apprt/structs.zig");
diff --git a/src/apprt/gtk.zig b/src/apprt/gtk.zig
index aa2404566..415d3773d 100644
--- a/src/apprt/gtk.zig
+++ b/src/apprt/gtk.zig
@@ -1,5 +1,3 @@
-const internal_os = @import("../os/main.zig");
-
 // The required comptime API for any apprt.
 pub const App = @import("gtk/App.zig");
 pub const Surface = @import("gtk/Surface.zig");
diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig
index 4d2006fbb..6c7310339 100644
--- a/src/apprt/gtk/App.zig
+++ b/src/apprt/gtk/App.zig
@@ -5,18 +5,13 @@ const App = @This();
 const std = @import("std");
 const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
-const adw = @import("adw");
-const gio = @import("gio");
 const apprt = @import("../../apprt.zig");
 const configpkg = @import("../../config.zig");
-const internal_os = @import("../../os/main.zig");
 const Config = configpkg.Config;
 const CoreApp = @import("../../App.zig");
 
 const Application = @import("class/application.zig").Application;
 const Surface = @import("Surface.zig");
-const gtk_version = @import("gtk_version.zig");
-const adw_version = @import("adw_version.zig");
 const ipcNewWindow = @import("ipc/new_window.zig").newWindow;
 
 const log = std.log.scoped(.gtk);
diff --git a/src/apprt/gtk/cgroup.zig b/src/apprt/gtk/cgroup.zig
index dbf11a287..654c1e1ac 100644
--- a/src/apprt/gtk/cgroup.zig
+++ b/src/apprt/gtk/cgroup.zig
@@ -1,14 +1,11 @@
 /// Contains all the logic for putting the Ghostty process and
 /// each individual surface into its own cgroup.
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 const gio = @import("gio");
 const glib = @import("glib");
-const gobject = @import("gobject");
 
-const App = @import("App.zig");
 const internal_os = @import("../../os/main.zig");
 
 const log = std.log.scoped(.gtk_systemd_cgroup);
diff --git a/src/apprt/gtk/class/application.zig b/src/apprt/gtk/class/application.zig
index 9c22782c7..cc070240c 100644
--- a/src/apprt/gtk/class/application.zig
+++ b/src/apprt/gtk/class/application.zig
@@ -1,7 +1,6 @@
 const std = @import("std");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const builtin = @import("builtin");
 const adw = @import("adw");
 const gdk = @import("gdk");
 const gio = @import("gio");
@@ -9,7 +8,6 @@ const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const build_config = @import("../../../build_config.zig");
 const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
 const cgroup = @import("../cgroup.zig");
diff --git a/src/apprt/gtk/class/clipboard_confirmation_dialog.zig b/src/apprt/gtk/class/clipboard_confirmation_dialog.zig
index 4bcc8696a..d44d38a35 100644
--- a/src/apprt/gtk/class/clipboard_confirmation_dialog.zig
+++ b/src/apprt/gtk/class/clipboard_confirmation_dialog.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const glib = @import("glib");
 const gobject = @import("gobject");
diff --git a/src/apprt/gtk/class/close_confirmation_dialog.zig b/src/apprt/gtk/class/close_confirmation_dialog.zig
index e806eb354..5919f9c94 100644
--- a/src/apprt/gtk/class/close_confirmation_dialog.zig
+++ b/src/apprt/gtk/class/close_confirmation_dialog.zig
@@ -1,13 +1,10 @@
 const std = @import("std");
-const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
 const i18n = @import("../../../os/main.zig").i18n;
-const adw_version = @import("../adw_version.zig");
 const Common = @import("../class.zig").Common;
-const Config = @import("config.zig").Config;
 const Dialog = @import("dialog.zig").Dialog;
 
 const log = std.log.scoped(.gtk_ghostty_close_confirmation_dialog);
diff --git a/src/apprt/gtk/class/config.zig b/src/apprt/gtk/class/config.zig
index eadd3b7b8..9a705d356 100644
--- a/src/apprt/gtk/class/config.zig
+++ b/src/apprt/gtk/class/config.zig
@@ -1,7 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const adw = @import("adw");
-const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
diff --git a/src/apprt/gtk/class/config_errors_dialog.zig b/src/apprt/gtk/class/config_errors_dialog.zig
index fc76bc268..46d5fe621 100644
--- a/src/apprt/gtk/class/config_errors_dialog.zig
+++ b/src/apprt/gtk/class/config_errors_dialog.zig
@@ -1,10 +1,8 @@
 const std = @import("std");
-const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
-const adw_version = @import("../adw_version.zig");
 const Common = @import("../class.zig").Common;
 const Config = @import("config.zig").Config;
 const Dialog = @import("dialog.zig").Dialog;
diff --git a/src/apprt/gtk/class/debug_warning.zig b/src/apprt/gtk/class/debug_warning.zig
index edda6659b..0ad320337 100644
--- a/src/apprt/gtk/class/debug_warning.zig
+++ b/src/apprt/gtk/class/debug_warning.zig
@@ -1,9 +1,7 @@
-const std = @import("std");
 const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const build_config = @import("../../../build_config.zig");
 const adw_version = @import("../adw_version.zig");
 const gresource = @import("../build/gresource.zig");
 const Common = @import("../class.zig").Common;
diff --git a/src/apprt/gtk/class/dialog.zig b/src/apprt/gtk/class/dialog.zig
index 41a1988ba..5bc3cdfa5 100644
--- a/src/apprt/gtk/class/dialog.zig
+++ b/src/apprt/gtk/class/dialog.zig
@@ -3,10 +3,8 @@ const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const gresource = @import("../build/gresource.zig");
 const adw_version = @import("../adw_version.zig");
 const Common = @import("../class.zig").Common;
-const Config = @import("config.zig").Config;
 
 const log = std.log.scoped(.gtk_ghostty_dialog);
 
diff --git a/src/apprt/gtk/class/global_shortcuts.zig b/src/apprt/gtk/class/global_shortcuts.zig
index e5d89003a..57652916a 100644
--- a/src/apprt/gtk/class/global_shortcuts.zig
+++ b/src/apprt/gtk/class/global_shortcuts.zig
@@ -1,14 +1,11 @@
 const std = @import("std");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const adw = @import("adw");
 const gio = @import("gio");
 const glib = @import("glib");
 const gobject = @import("gobject");
-const gtk = @import("gtk");
 
 const Binding = @import("../../../input.zig").Binding;
-const gresource = @import("../build/gresource.zig");
 const key = @import("../key.zig");
 const Common = @import("../class.zig").Common;
 const Application = @import("application.zig").Application;
diff --git a/src/apprt/gtk/class/inspector_widget.zig b/src/apprt/gtk/class/inspector_widget.zig
index 4321dcd57..046cd2174 100644
--- a/src/apprt/gtk/class/inspector_widget.zig
+++ b/src/apprt/gtk/class/inspector_widget.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 
-const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
diff --git a/src/apprt/gtk/class/inspector_window.zig b/src/apprt/gtk/class/inspector_window.zig
index 701718229..739e75691 100644
--- a/src/apprt/gtk/class/inspector_window.zig
+++ b/src/apprt/gtk/class/inspector_window.zig
@@ -2,15 +2,12 @@ const std = @import("std");
 const build_config = @import("../../../build_config.zig");
 
 const adw = @import("adw");
-const gdk = @import("gdk");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
 
-const key = @import("../key.zig");
 const Common = @import("../class.zig").Common;
-const Application = @import("application.zig").Application;
 const Surface = @import("surface.zig").Surface;
 const DebugWarning = @import("debug_warning.zig").DebugWarning;
 const InspectorWidget = @import("inspector_widget.zig").InspectorWidget;
diff --git a/src/apprt/gtk/class/resize_overlay.zig b/src/apprt/gtk/class/resize_overlay.zig
index e13dcbc5d..e14f15636 100644
--- a/src/apprt/gtk/class/resize_overlay.zig
+++ b/src/apprt/gtk/class/resize_overlay.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const glib = @import("glib");
 const gobject = @import("gobject");
diff --git a/src/apprt/gtk/class/split_tree.zig b/src/apprt/gtk/class/split_tree.zig
index 4fbf7a0c2..48656c951 100644
--- a/src/apprt/gtk/class/split_tree.zig
+++ b/src/apprt/gtk/class/split_tree.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const build_config = @import("../../../build_config.zig");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const adw = @import("adw");
@@ -8,17 +7,11 @@ const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
-const input = @import("../../../input.zig");
-const CoreSurface = @import("../../../Surface.zig");
-const gtk_version = @import("../gtk_version.zig");
-const adw_version = @import("../adw_version.zig");
 const ext = @import("../ext.zig");
 const gresource = @import("../build/gresource.zig");
 const Common = @import("../class.zig").Common;
 const WeakRef = @import("../weak_ref.zig").WeakRef;
-const Config = @import("config.zig").Config;
 const Application = @import("application.zig").Application;
 const CloseConfirmationDialog = @import("close_confirmation_dialog.zig").CloseConfirmationDialog;
 const Surface = @import("surface.zig").Surface;
diff --git a/src/apprt/gtk/class/surface.zig b/src/apprt/gtk/class/surface.zig
index 6dae08a79..9ba7ce0ab 100644
--- a/src/apprt/gtk/class/surface.zig
+++ b/src/apprt/gtk/class/surface.zig
@@ -19,7 +19,6 @@ const terminal = @import("../../../terminal/main.zig");
 const CoreSurface = @import("../../../Surface.zig");
 const gresource = @import("../build/gresource.zig");
 const ext = @import("../ext.zig");
-const adw_version = @import("../adw_version.zig");
 const gtk_key = @import("../key.zig");
 const ApprtSurface = @import("../Surface.zig");
 const Common = @import("../class.zig").Common;
@@ -30,7 +29,6 @@ const ChildExited = @import("surface_child_exited.zig").SurfaceChildExited;
 const ClipboardConfirmationDialog = @import("clipboard_confirmation_dialog.zig").ClipboardConfirmationDialog;
 const TitleDialog = @import("surface_title_dialog.zig").SurfaceTitleDialog;
 const Window = @import("window.zig").Window;
-const WeakRef = @import("../weak_ref.zig").WeakRef;
 const InspectorWindow = @import("inspector_window.zig").InspectorWindow;
 const i18n = @import("../../../os/i18n.zig");
 
diff --git a/src/apprt/gtk/class/surface_child_exited.zig b/src/apprt/gtk/class/surface_child_exited.zig
index 4e34f3340..d7dd41bcb 100644
--- a/src/apprt/gtk/class/surface_child_exited.zig
+++ b/src/apprt/gtk/class/surface_child_exited.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const glib = @import("glib");
 const gobject = @import("gobject");
diff --git a/src/apprt/gtk/class/surface_scrolled_window.zig b/src/apprt/gtk/class/surface_scrolled_window.zig
index 505b16dda..488fdb3f4 100644
--- a/src/apprt/gtk/class/surface_scrolled_window.zig
+++ b/src/apprt/gtk/class/surface_scrolled_window.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
diff --git a/src/apprt/gtk/class/surface_title_dialog.zig b/src/apprt/gtk/class/surface_title_dialog.zig
index 6d3bf33de..aa1d1a153 100644
--- a/src/apprt/gtk/class/surface_title_dialog.zig
+++ b/src/apprt/gtk/class/surface_title_dialog.zig
@@ -6,7 +6,6 @@ const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
-const adw_version = @import("../adw_version.zig");
 const ext = @import("../ext.zig");
 const Common = @import("../class.zig").Common;
 
diff --git a/src/apprt/gtk/class/tab.zig b/src/apprt/gtk/class/tab.zig
index d7a82b776..c8b5607a6 100644
--- a/src/apprt/gtk/class/tab.zig
+++ b/src/apprt/gtk/class/tab.zig
@@ -1,19 +1,13 @@
 const std = @import("std");
-const build_config = @import("../../../build_config.zig");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const gio = @import("gio");
 const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
-const input = @import("../../../input.zig");
 const CoreSurface = @import("../../../Surface.zig");
 const ext = @import("../ext.zig");
-const gtk_version = @import("../gtk_version.zig");
-const adw_version = @import("../adw_version.zig");
 const gresource = @import("../build/gresource.zig");
 const Common = @import("../class.zig").Common;
 const Config = @import("config.zig").Config;
diff --git a/src/apprt/gtk/class/window.zig b/src/apprt/gtk/class/window.zig
index dbcf0fcd1..c691b84a6 100644
--- a/src/apprt/gtk/class/window.zig
+++ b/src/apprt/gtk/class/window.zig
@@ -28,7 +28,6 @@ const Surface = @import("surface.zig").Surface;
 const Tab = @import("tab.zig").Tab;
 const DebugWarning = @import("debug_warning.zig").DebugWarning;
 const CommandPalette = @import("command_palette.zig").CommandPalette;
-const InspectorWindow = @import("inspector_window.zig").InspectorWindow;
 const WeakRef = @import("../weak_ref.zig").WeakRef;
 
 const log = std.log.scoped(.gtk_ghostty_window);
diff --git a/src/apprt/gtk/ext.zig b/src/apprt/gtk/ext.zig
index f832d1f90..9b1eeecc6 100644
--- a/src/apprt/gtk/ext.zig
+++ b/src/apprt/gtk/ext.zig
@@ -7,7 +7,6 @@ const std = @import("std");
 const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
 
-const gio = @import("gio");
 const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
diff --git a/src/apprt/gtk/key.zig b/src/apprt/gtk/key.zig
index bf0f0e2f6..19bdc8315 100644
--- a/src/apprt/gtk/key.zig
+++ b/src/apprt/gtk/key.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const build_options = @import("build_options");
 
 const gdk = @import("gdk");
 const glib = @import("glib");
diff --git a/src/apprt/gtk/winproto/wayland.zig b/src/apprt/gtk/winproto/wayland.zig
index 5837e3e5e..ec02fbee5 100644
--- a/src/apprt/gtk/winproto/wayland.zig
+++ b/src/apprt/gtk/winproto/wayland.zig
@@ -1,7 +1,6 @@
 //! Wayland protocol implementation for the Ghostty GTK apprt.
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const build_options = @import("build_options");
 
 const gdk = @import("gdk");
 const gdk_wayland = @import("gdk_wayland");
diff --git a/src/apprt/gtk/winproto/x11.zig b/src/apprt/gtk/winproto/x11.zig
index 8956a29ed..9dc273563 100644
--- a/src/apprt/gtk/winproto/x11.zig
+++ b/src/apprt/gtk/winproto/x11.zig
@@ -1,10 +1,8 @@
 //! X11 window protocol implementation for the Ghostty GTK apprt.
 const std = @import("std");
 const builtin = @import("builtin");
-const build_options = @import("build_options");
 const Allocator = std.mem.Allocator;
 
-const adw = @import("adw");
 const gdk = @import("gdk");
 const gdk_x11 = @import("gdk_x11");
 const glib = @import("glib");
diff --git a/src/benchmark/IsSymbol.zig b/src/benchmark/IsSymbol.zig
index 5ba2da907..4fbffd1ec 100644
--- a/src/benchmark/IsSymbol.zig
+++ b/src/benchmark/IsSymbol.zig
@@ -4,7 +4,6 @@
 const IsSymbol = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const Benchmark = @import("Benchmark.zig");
diff --git a/src/build/GhosttyBench.zig b/src/build/GhosttyBench.zig
index c9cd5dd33..27dda8809 100644
--- a/src/build/GhosttyBench.zig
+++ b/src/build/GhosttyBench.zig
@@ -2,7 +2,6 @@
 const GhosttyBench = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
 const SharedDeps = @import("SharedDeps.zig");
 
 steps: []*std.Build.Step.Compile,
diff --git a/src/build/GhosttyFrameData.zig b/src/build/GhosttyFrameData.zig
index 7193162bd..8469759f9 100644
--- a/src/build/GhosttyFrameData.zig
+++ b/src/build/GhosttyFrameData.zig
@@ -3,8 +3,6 @@
 const GhosttyFrameData = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
-const SharedDeps = @import("SharedDeps.zig");
 const DistResource = @import("GhosttyDist.zig").Resource;
 
 /// The output path for the compressed framedata zig file
diff --git a/src/build/GhosttyLibVt.zig b/src/build/GhosttyLibVt.zig
index d1ab5d1ba..aae8ace19 100644
--- a/src/build/GhosttyLibVt.zig
+++ b/src/build/GhosttyLibVt.zig
@@ -3,11 +3,7 @@ const GhosttyLibVt = @This();
 const std = @import("std");
 const assert = std.debug.assert;
 const RunStep = std.Build.Step.Run;
-const Config = @import("Config.zig");
 const GhosttyZig = @import("GhosttyZig.zig");
-const SharedDeps = @import("SharedDeps.zig");
-const LibtoolStep = @import("LibtoolStep.zig");
-const LipoStep = @import("LipoStep.zig");
 
 /// The step that generates the file.
 step: *std.Build.Step,
diff --git a/src/build/GhosttyResources.zig b/src/build/GhosttyResources.zig
index a1bbe2857..6f857655b 100644
--- a/src/build/GhosttyResources.zig
+++ b/src/build/GhosttyResources.zig
@@ -1,9 +1,7 @@
 const GhosttyResources = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = std.debug.assert;
-const buildpkg = @import("main.zig");
 const Config = @import("Config.zig");
 const RunStep = std.Build.Step.Run;
 const SharedDeps = @import("SharedDeps.zig");
diff --git a/src/build/GhosttyWebdata.zig b/src/build/GhosttyWebdata.zig
index 145bb91fa..e29b20c25 100644
--- a/src/build/GhosttyWebdata.zig
+++ b/src/build/GhosttyWebdata.zig
@@ -3,7 +3,6 @@
 const GhosttyWebdata = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
 const SharedDeps = @import("SharedDeps.zig");
 
 steps: []*std.Build.Step,
diff --git a/src/build/UnicodeTables.zig b/src/build/UnicodeTables.zig
index aba3e8f24..17a839eaf 100644
--- a/src/build/UnicodeTables.zig
+++ b/src/build/UnicodeTables.zig
@@ -1,7 +1,6 @@
 const UnicodeTables = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
 
 /// The exe.
 props_exe: *std.Build.Step.Compile,
diff --git a/src/build/webgen/main_actions.zig b/src/build/webgen/main_actions.zig
index 85357b972..b0de6537d 100644
--- a/src/build/webgen/main_actions.zig
+++ b/src/build/webgen/main_actions.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const help_strings = @import("help_strings");
 const helpgen_actions = @import("../../input/helpgen_actions.zig");
 
 pub fn main() !void {
diff --git a/src/build_config.zig b/src/build_config.zig
index 0d294c69e..c19f7372b 100644
--- a/src/build_config.zig
+++ b/src/build_config.zig
@@ -9,7 +9,6 @@ const assert = std.debug.assert;
 const apprt = @import("apprt.zig");
 const font = @import("font/main.zig");
 const rendererpkg = @import("renderer.zig");
-const WasmTarget = @import("os/wasm/target.zig").Target;
 const BuildConfig = @import("build/Config.zig");
 
 pub const ReleaseChannel = BuildConfig.ReleaseChannel;
diff --git a/src/cli/boo.zig b/src/cli/boo.zig
index f96fd6282..2834eadbd 100644
--- a/src/cli/boo.zig
+++ b/src/cli/boo.zig
@@ -3,7 +3,6 @@ const builtin = @import("builtin");
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 const Allocator = std.mem.Allocator;
-const help_strings = @import("help_strings");
 const vaxis = @import("vaxis");
 
 const framedata = @import("framedata").compressed;
diff --git a/src/cli/list_themes.zig b/src/cli/list_themes.zig
index 63184ddfb..1e301eb73 100644
--- a/src/cli/list_themes.zig
+++ b/src/cli/list_themes.zig
@@ -1,11 +1,9 @@
 const std = @import("std");
-const inputpkg = @import("../input.zig");
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 const Config = @import("../config/Config.zig");
 const themepkg = @import("../config/theme.zig");
 const tui = @import("tui.zig");
-const internal_os = @import("../os/main.zig");
 const global_state = &@import("../global.zig").state;
 
 const vaxis = @import("vaxis");
diff --git a/src/cli/ssh_cache.zig b/src/cli/ssh_cache.zig
index 9434e9771..d3ee658af 100644
--- a/src/cli/ssh_cache.zig
+++ b/src/cli/ssh_cache.zig
@@ -1,7 +1,6 @@
 const std = @import("std");
 const fs = std.fs;
 const Allocator = std.mem.Allocator;
-const xdg = @import("../os/xdg.zig");
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 pub const Entry = @import("ssh-cache/Entry.zig");
diff --git a/src/cli/validate_config.zig b/src/cli/validate_config.zig
index 55d861402..5586cf29f 100644
--- a/src/cli/validate_config.zig
+++ b/src/cli/validate_config.zig
@@ -3,7 +3,6 @@ const Allocator = std.mem.Allocator;
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 const Config = @import("../config.zig").Config;
-const cli = @import("../cli.zig");
 
 pub const Options = struct {
     /// The path of the config file to validate. If this isn't specified,
diff --git a/src/config/CApi.zig b/src/config/CApi.zig
index d3f714a45..a970a8d33 100644
--- a/src/config/CApi.zig
+++ b/src/config/CApi.zig
@@ -1,6 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
-const cli = @import("../cli.zig");
 const inputpkg = @import("../input.zig");
 const state = &@import("../global.zig").state;
 const c = @import("../main_c.zig");
diff --git a/src/config/Config.zig b/src/config/Config.zig
index 18412ff0e..bac7d3443 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -29,8 +29,6 @@ const formatterpkg = @import("formatter.zig");
 const themepkg = @import("theme.zig");
 const url = @import("url.zig");
 const Key = @import("key.zig").Key;
-const KeyValue = @import("key.zig").Value;
-const ErrorList = @import("ErrorList.zig");
 const MetricModifier = fontpkg.Metrics.Modifier;
 const help_strings = @import("help_strings");
 pub const Command = @import("command.zig").Command;
diff --git a/src/config/command.zig b/src/config/command.zig
index e0cdc641b..7e16ad5c7 100644
--- a/src/config/command.zig
+++ b/src/config/command.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const formatterpkg = @import("formatter.zig");
diff --git a/src/config/conditional.zig b/src/config/conditional.zig
index aabfeca1c..fdc285a22 100644
--- a/src/config/conditional.zig
+++ b/src/config/conditional.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 /// Conditionals in Ghostty configuration are based on a static, typed
diff --git a/src/config/edit.zig b/src/config/edit.zig
index 6c18abadc..8cedc47a5 100644
--- a/src/config/edit.zig
+++ b/src/config/edit.zig
@@ -3,7 +3,6 @@ const builtin = @import("builtin");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
-const internal_os = @import("../os/main.zig");
 const file_load = @import("file_load.zig");
 
 /// The path to the configuration that should be opened for editing.
diff --git a/src/config/theme.zig b/src/config/theme.zig
index 983ce647d..7ba6e5885 100644
--- a/src/config/theme.zig
+++ b/src/config/theme.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const global_state = &@import("../global.zig").state;
 const internal_os = @import("../os/main.zig");
diff --git a/src/datastruct/blocking_queue.zig b/src/datastruct/blocking_queue.zig
index 339007c3a..3185d98d1 100644
--- a/src/datastruct/blocking_queue.zig
+++ b/src/datastruct/blocking_queue.zig
@@ -2,8 +2,6 @@
 //! between threads.
 
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 /// Returns a blocking queue implementation for type T.
diff --git a/src/extra/sublime.zig b/src/extra/sublime.zig
index 4af589b4f..e0deb2fa9 100644
--- a/src/extra/sublime.zig
+++ b/src/extra/sublime.zig
@@ -1,4 +1,3 @@
-const std = @import("std");
 const Config = @import("../config/Config.zig");
 
 const Template = struct {
diff --git a/src/font/Collection.zig b/src/font/Collection.zig
index 6726fb64a..412098f10 100644
--- a/src/font/Collection.zig
+++ b/src/font/Collection.zig
@@ -16,7 +16,6 @@
 const Collection = @This();
 
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const config = @import("../config.zig");
 const comparison = @import("../datastruct/comparison.zig");
diff --git a/src/font/DeferredFace.zig b/src/font/DeferredFace.zig
index 61d0adf8b..e818cca30 100644
--- a/src/font/DeferredFace.zig
+++ b/src/font/DeferredFace.zig
@@ -7,7 +7,6 @@
 const DeferredFace = @This();
 
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const fontconfig = @import("fontconfig");
 const macos = @import("macos");
diff --git a/src/font/discovery.zig b/src/font/discovery.zig
index 45fc89ea9..c419d36a6 100644
--- a/src/font/discovery.zig
+++ b/src/font/discovery.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const assert = @import("../quirks.zig").inlineAssert;
 const fontconfig = @import("fontconfig");
diff --git a/src/font/face/freetype.zig b/src/font/face/freetype.zig
index fe3dcf707..a6ef52c39 100644
--- a/src/font/face/freetype.zig
+++ b/src/font/face/freetype.zig
@@ -16,7 +16,6 @@ const font = @import("../main.zig");
 const Glyph = font.Glyph;
 const Library = font.Library;
 const opentype = @import("../opentype.zig");
-const fastmem = @import("../../fastmem.zig");
 const quirks = @import("../../quirks.zig");
 const config = @import("../../config.zig");
 
diff --git a/src/font/face/web_canvas.zig b/src/font/face/web_canvas.zig
index d6a3ca449..b4f9f5d5d 100644
--- a/src/font/face/web_canvas.zig
+++ b/src/font/face/web_canvas.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
diff --git a/src/font/library.zig b/src/font/library.zig
index 43aa101b7..dce6dbd5a 100644
--- a/src/font/library.zig
+++ b/src/font/library.zig
@@ -2,7 +2,6 @@
 //! library implementation(s) require per-process.
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const builtin = @import("builtin");
 const options = @import("main.zig").options;
 const freetype = @import("freetype");
 const font = @import("main.zig");
diff --git a/src/font/opentype/head.zig b/src/font/opentype/head.zig
index 69b951821..38284d9cf 100644
--- a/src/font/opentype/head.zig
+++ b/src/font/opentype/head.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 /// Font Header Table
diff --git a/src/font/opentype/hhea.zig b/src/font/opentype/hhea.zig
index 2a86e5b82..b2b3f3e20 100644
--- a/src/font/opentype/hhea.zig
+++ b/src/font/opentype/hhea.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 /// Horizontal Header Table
diff --git a/src/font/opentype/os2.zig b/src/font/opentype/os2.zig
index 9bcec973d..1cd11f35e 100644
--- a/src/font/opentype/os2.zig
+++ b/src/font/opentype/os2.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 pub const FSSelection = packed struct(sfnt.uint16) {
diff --git a/src/font/opentype/post.zig b/src/font/opentype/post.zig
index b739bd224..8031a0a4d 100644
--- a/src/font/opentype/post.zig
+++ b/src/font/opentype/post.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 /// PostScript Table
diff --git a/src/font/opentype/svg.zig b/src/font/opentype/svg.zig
index 348a1dc5b..b4d9ccaa2 100644
--- a/src/font/opentype/svg.zig
+++ b/src/font/opentype/svg.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const font = @import("../main.zig");
 
 /// SVG glyphs description table.
diff --git a/src/font/shape.zig b/src/font/shape.zig
index 0d8a029bf..c96c8df7f 100644
--- a/src/font/shape.zig
+++ b/src/font/shape.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const options = @import("main.zig").options;
 const run = @import("shaper/run.zig");
 const feature = @import("shaper/feature.zig");
diff --git a/src/font/shaper/Cache.zig b/src/font/shaper/Cache.zig
index 70b49bb75..2696985a4 100644
--- a/src/font/shaper/Cache.zig
+++ b/src/font/shaper/Cache.zig
@@ -11,7 +11,6 @@
 pub const Cache = @This();
 
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const font = @import("../main.zig");
 const CacheTable = @import("../../datastruct/main.zig").CacheTable;
diff --git a/src/font/shaper/coretext.zig b/src/font/shaper/coretext.zig
index c1deec11d..97cb5cd89 100644
--- a/src/font/shaper/coretext.zig
+++ b/src/font/shaper/coretext.zig
@@ -3,11 +3,9 @@ const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const macos = @import("macos");
-const trace = @import("tracy").trace;
 const font = @import("../main.zig");
 const os = @import("../../os/main.zig");
 const terminal = @import("../../terminal/main.zig");
-const config = @import("../../config.zig");
 const Feature = font.shape.Feature;
 const FeatureList = font.shape.FeatureList;
 const default_features = font.shape.default_features;
diff --git a/src/font/shaper/feature.zig b/src/font/shaper/feature.zig
index b85d2867d..5bd73f97f 100644
--- a/src/font/shaper/feature.zig
+++ b/src/font/shaper/feature.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
diff --git a/src/font/shaper/harfbuzz.zig b/src/font/shaper/harfbuzz.zig
index 2911e1e77..e4a9301e8 100644
--- a/src/font/shaper/harfbuzz.zig
+++ b/src/font/shaper/harfbuzz.zig
@@ -4,7 +4,6 @@ const Allocator = std.mem.Allocator;
 const harfbuzz = @import("harfbuzz");
 const font = @import("../main.zig");
 const terminal = @import("../../terminal/main.zig");
-const config = @import("../../config.zig");
 const Feature = font.shape.Feature;
 const FeatureList = font.shape.FeatureList;
 const default_features = font.shape.default_features;
diff --git a/src/font/shaper/noop.zig b/src/font/shaper/noop.zig
index 5d2b1f54f..e5a08653f 100644
--- a/src/font/shaper/noop.zig
+++ b/src/font/shaper/noop.zig
@@ -1,7 +1,5 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const trace = @import("tracy").trace;
 const font = @import("../main.zig");
 const Face = font.Face;
 const Collection = font.Collection;
diff --git a/src/font/sprite/Face.zig b/src/font/sprite/Face.zig
index a1f87f889..94bfa2f0b 100644
--- a/src/font/sprite/Face.zig
+++ b/src/font/sprite/Face.zig
@@ -13,7 +13,6 @@
 const Face = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const wuffs = @import("wuffs");
diff --git a/src/font/sprite/draw/block.zig b/src/font/sprite/draw/block.zig
index 96910ce57..1731d2f50 100644
--- a/src/font/sprite/draw/block.zig
+++ b/src/font/sprite/draw/block.zig
@@ -6,11 +6,8 @@
 //!
 
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Shade = common.Shade;
 const Quads = common.Quads;
@@ -18,7 +15,6 @@ const Alignment = common.Alignment;
 const fill = common.fill;
 
 const font = @import("../../main.zig");
-const Sprite = @import("../../sprite.zig").Sprite;
 
 // Utility names for common fractions
 const one_eighth: f64 = 0.125;
diff --git a/src/font/sprite/draw/box.zig b/src/font/sprite/draw/box.zig
index ff6fa292e..cc6e694d4 100644
--- a/src/font/sprite/draw/box.zig
+++ b/src/font/sprite/draw/box.zig
@@ -15,8 +15,6 @@ const std = @import("std");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Shade = common.Shade;
@@ -30,7 +28,6 @@ const hlineMiddle = common.hlineMiddle;
 const vlineMiddle = common.vlineMiddle;
 
 const font = @import("../../main.zig");
-const Sprite = @import("../../sprite.zig").Sprite;
 
 /// Specification of a traditional intersection-style line/box-drawing char,
 /// which can have a different style of line from each edge to the center.
diff --git a/src/font/sprite/draw/branch.zig b/src/font/sprite/draw/branch.zig
index 3cca6b7ff..034f1e398 100644
--- a/src/font/sprite/draw/branch.zig
+++ b/src/font/sprite/draw/branch.zig
@@ -16,7 +16,6 @@
 //!
 
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 const common = @import("common.zig");
diff --git a/src/font/sprite/draw/common.zig b/src/font/sprite/draw/common.zig
index 18efe6c65..290c44965 100644
--- a/src/font/sprite/draw/common.zig
+++ b/src/font/sprite/draw/common.zig
@@ -4,13 +4,9 @@
 //! rather than being single-use.
 
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const font = @import("../../main.zig");
-const Sprite = @import("../../sprite.zig").Sprite;
 
 const log = std.log.scoped(.sprite_font);
 
diff --git a/src/font/sprite/draw/geometric_shapes.zig b/src/font/sprite/draw/geometric_shapes.zig
index d95a4fd2f..f6402cf05 100644
--- a/src/font/sprite/draw/geometric_shapes.zig
+++ b/src/font/sprite/draw/geometric_shapes.zig
@@ -15,8 +15,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Corner = common.Corner;
diff --git a/src/font/sprite/draw/powerline.zig b/src/font/sprite/draw/powerline.zig
index 24fce454b..8658d8553 100644
--- a/src/font/sprite/draw/powerline.zig
+++ b/src/font/sprite/draw/powerline.zig
@@ -11,8 +11,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Shade = common.Shade;
diff --git a/src/font/sprite/draw/special.zig b/src/font/sprite/draw/special.zig
index 22d8edb5c..8cad9ceba 100644
--- a/src/font/sprite/draw/special.zig
+++ b/src/font/sprite/draw/special.zig
@@ -6,8 +6,6 @@
 //! having names that exactly match the enum fields in Sprite.
 
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const font = @import("../../main.zig");
 const Sprite = font.sprite.Sprite;
diff --git a/src/font/sprite/draw/symbols_for_legacy_computing.zig b/src/font/sprite/draw/symbols_for_legacy_computing.zig
index 7abc179fe..d99fc8702 100644
--- a/src/font/sprite/draw/symbols_for_legacy_computing.zig
+++ b/src/font/sprite/draw/symbols_for_legacy_computing.zig
@@ -23,8 +23,6 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const assert = @import("../../../quirks.zig").inlineAssert;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Alignment = common.Alignment;
diff --git a/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig b/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig
index 45148ee76..bd91d3925 100644
--- a/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig
+++ b/src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig
@@ -51,8 +51,6 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const assert = @import("../../../quirks.zig").inlineAssert;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Fraction = common.Fraction;
diff --git a/src/input/KeymapDarwin.zig b/src/input/KeymapDarwin.zig
index 53c305ab1..a8702730e 100644
--- a/src/input/KeymapDarwin.zig
+++ b/src/input/KeymapDarwin.zig
@@ -17,7 +17,6 @@ const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const macos = @import("macos");
 const codes = @import("keycodes.zig").entries;
-const Key = @import("key.zig").Key;
 const Mods = @import("key.zig").Mods;
 
 /// The current input source that is selected for the keyboard. This can
diff --git a/src/input/command.zig b/src/input/command.zig
index 3879efc36..72fb7f4ee 100644
--- a/src/input/command.zig
+++ b/src/input/command.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const Action = @import("Binding.zig").Action;
diff --git a/src/input/kitty.zig b/src/input/kitty.zig
index 7ebbd7757..e5789cc40 100644
--- a/src/input/kitty.zig
+++ b/src/input/kitty.zig
@@ -1,4 +1,3 @@
-const std = @import("std");
 const key = @import("key.zig");
 
 /// A single entry in the kitty keymap data. There are only ~100 entries
diff --git a/src/input/paste.zig b/src/input/paste.zig
index 197386e89..111a783f3 100644
--- a/src/input/paste.zig
+++ b/src/input/paste.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Terminal = @import("../terminal/Terminal.zig");
 
 pub const Options = struct {
diff --git a/src/inspector/cursor.zig b/src/inspector/cursor.zig
index 37ec412e9..756898252 100644
--- a/src/inspector/cursor.zig
+++ b/src/inspector/cursor.zig
@@ -1,4 +1,3 @@
-const std = @import("std");
 const cimgui = @import("cimgui");
 const terminal = @import("../terminal/main.zig");
 
diff --git a/src/inspector/page.zig b/src/inspector/page.zig
index 2cc62772e..7da469e21 100644
--- a/src/inspector/page.zig
+++ b/src/inspector/page.zig
@@ -1,9 +1,7 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const cimgui = @import("cimgui");
 const terminal = @import("../terminal/main.zig");
-const inspector = @import("main.zig");
 const units = @import("units.zig");
 
 pub fn render(page: *const terminal.Page) void {
diff --git a/src/lib/union.zig b/src/lib/union.zig
index c1513fc79..924d0e864 100644
--- a/src/lib/union.zig
+++ b/src/lib/union.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Target = @import("target.zig").Target;
 
diff --git a/src/main_bench.zig b/src/main_bench.zig
index 2314dc2ed..9804f51ef 100644
--- a/src/main_bench.zig
+++ b/src/main_bench.zig
@@ -1,5 +1,3 @@
-const std = @import("std");
-const builtin = @import("builtin");
 const benchmark = @import("benchmark/main.zig");
 
 pub const main = benchmark.cli.main;
diff --git a/src/main_gen.zig b/src/main_gen.zig
index b988819f8..3342bc2e9 100644
--- a/src/main_gen.zig
+++ b/src/main_gen.zig
@@ -1,5 +1,3 @@
-const std = @import("std");
-const builtin = @import("builtin");
 const synthetic = @import("synthetic/main.zig");
 
 pub const main = synthetic.cli.main;
diff --git a/src/main_ghostty.zig b/src/main_ghostty.zig
index 77b7f3ef4..261e0ad7d 100644
--- a/src/main_ghostty.zig
+++ b/src/main_ghostty.zig
@@ -6,14 +6,8 @@ const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const posix = std.posix;
 const build_config = @import("build_config.zig");
-const options = @import("build_options");
-const glslang = @import("glslang");
 const macos = @import("macos");
-const oni = @import("oniguruma");
 const cli = @import("cli.zig");
-const internal_os = @import("os/main.zig");
-const fontconfig = @import("fontconfig");
-const harfbuzz = @import("harfbuzz");
 const renderer = @import("renderer.zig");
 const apprt = @import("apprt.zig");
 
diff --git a/src/os/TempDir.zig b/src/os/TempDir.zig
index f2e9992c4..2ddf18da3 100644
--- a/src/os/TempDir.zig
+++ b/src/os/TempDir.zig
@@ -3,7 +3,6 @@
 const TempDir = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const testing = std.testing;
 const Dir = std.fs.Dir;
 const allocTmpDir = @import("file.zig").allocTmpDir;
diff --git a/src/os/args.zig b/src/os/args.zig
index 871663504..9ef5bba40 100644
--- a/src/os/args.zig
+++ b/src/os/args.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const objc = @import("objc");
 const macos = @import("macos");
diff --git a/src/os/flatpak.zig b/src/os/flatpak.zig
index 1b517cd83..78692089e 100644
--- a/src/os/flatpak.zig
+++ b/src/os/flatpak.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const builtin = @import("builtin");
 const posix = std.posix;
diff --git a/src/os/homedir.zig b/src/os/homedir.zig
index 28b4a0f73..0868a4fa5 100644
--- a/src/os/homedir.zig
+++ b/src/os/homedir.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const passwd = @import("passwd.zig");
 const posix = std.posix;
 const objc = @import("objc");
diff --git a/src/os/mouse.zig b/src/os/mouse.zig
index b592bd94a..d68bb226f 100644
--- a/src/os/mouse.zig
+++ b/src/os/mouse.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const objc = @import("objc");
 
 const log = std.log.scoped(.os);
diff --git a/src/os/wasm/log.zig b/src/os/wasm/log.zig
index 1aac8c4e7..faa885c6e 100644
--- a/src/os/wasm/log.zig
+++ b/src/os/wasm/log.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const wasm = @import("../wasm.zig");
 
 // Use the correct implementation
diff --git a/src/os/xdg.zig b/src/os/xdg.zig
index 57ef075aa..a813b0a98 100644
--- a/src/os/xdg.zig
+++ b/src/os/xdg.zig
@@ -3,7 +3,6 @@
 
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const posix = std.posix;
 const homedir = @import("homedir.zig");
diff --git a/src/renderer.zig b/src/renderer.zig
index f09f717c4..2d37ddd4c 100644
--- a/src/renderer.zig
+++ b/src/renderer.zig
@@ -7,8 +7,6 @@
 //! APIs. The renderers in this package assume that the renderer is already
 //! setup (OpenGL has a context, Vulkan has a surface, etc.)
 
-const std = @import("std");
-const builtin = @import("builtin");
 const build_config = @import("build_config.zig");
 
 const cursor = @import("renderer/cursor.zig");
diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig
index efd98601c..da577f957 100644
--- a/src/renderer/OpenGL.zig
+++ b/src/renderer/OpenGL.zig
@@ -2,7 +2,6 @@
 pub const OpenGL = @This();
 
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const builtin = @import("builtin");
 const gl = @import("opengl");
diff --git a/src/renderer/Options.zig b/src/renderer/Options.zig
index 85ff8e310..948b31d2d 100644
--- a/src/renderer/Options.zig
+++ b/src/renderer/Options.zig
@@ -3,7 +3,6 @@
 const apprt = @import("../apprt.zig");
 const font = @import("../font/main.zig");
 const renderer = @import("../renderer.zig");
-const Config = @import("../config.zig").Config;
 
 /// The derived configuration for this renderer implementation.
 config: renderer.Renderer.DerivedConfig,
diff --git a/src/renderer/Thread.zig b/src/renderer/Thread.zig
index 7316ac51d..c1b377b3d 100644
--- a/src/renderer/Thread.zig
+++ b/src/renderer/Thread.zig
@@ -4,7 +4,6 @@ pub const Thread = @This();
 
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const xev = @import("../global.zig").xev;
 const crash = @import("../crash/main.zig");
 const internal_os = @import("../os/main.zig");
diff --git a/src/renderer/link.zig b/src/renderer/link.zig
index 8c09a3195..74df3e596 100644
--- a/src/renderer/link.zig
+++ b/src/renderer/link.zig
@@ -2,7 +2,6 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const oni = @import("oniguruma");
-const configpkg = @import("../config.zig");
 const inputpkg = @import("../input.zig");
 const terminal = @import("../terminal/main.zig");
 const point = terminal.point;
diff --git a/src/renderer/message.zig b/src/renderer/message.zig
index 8d4db32cd..a47b96080 100644
--- a/src/renderer/message.zig
+++ b/src/renderer/message.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const configpkg = @import("../config.zig");
diff --git a/src/renderer/metal/Frame.zig b/src/renderer/metal/Frame.zig
index e919a01ed..388b4f9ed 100644
--- a/src/renderer/metal/Frame.zig
+++ b/src/renderer/metal/Frame.zig
@@ -3,17 +3,13 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const objc = @import("objc");
 
 const mtl = @import("api.zig");
 const Renderer = @import("../generic.zig").Renderer(Metal);
 const Metal = @import("../Metal.zig");
 const Target = @import("Target.zig");
-const Pipeline = @import("Pipeline.zig");
 const RenderPass = @import("RenderPass.zig");
-const Buffer = @import("buffer.zig").Buffer;
 
 const Health = @import("../../renderer.zig").Health;
 
diff --git a/src/renderer/metal/IOSurfaceLayer.zig b/src/renderer/metal/IOSurfaceLayer.zig
index afee0953f..34fbfbed5 100644
--- a/src/renderer/metal/IOSurfaceLayer.zig
+++ b/src/renderer/metal/IOSurfaceLayer.zig
@@ -4,8 +4,6 @@ const IOSurfaceLayer = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const objc = @import("objc");
 const macos = @import("macos");
 
diff --git a/src/renderer/metal/Pipeline.zig b/src/renderer/metal/Pipeline.zig
index cf495edda..9ba25c350 100644
--- a/src/renderer/metal/Pipeline.zig
+++ b/src/renderer/metal/Pipeline.zig
@@ -3,14 +3,10 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const macos = @import("macos");
 const objc = @import("objc");
 
 const mtl = @import("api.zig");
-const Texture = @import("Texture.zig");
-const Metal = @import("../Metal.zig");
 
 const log = std.log.scoped(.metal);
 
diff --git a/src/renderer/metal/RenderPass.zig b/src/renderer/metal/RenderPass.zig
index eb458e054..f204e1770 100644
--- a/src/renderer/metal/RenderPass.zig
+++ b/src/renderer/metal/RenderPass.zig
@@ -3,8 +3,6 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const objc = @import("objc");
 
 const mtl = @import("api.zig");
@@ -12,8 +10,6 @@ const Pipeline = @import("Pipeline.zig");
 const Sampler = @import("Sampler.zig");
 const Texture = @import("Texture.zig");
 const Target = @import("Target.zig");
-const Metal = @import("../Metal.zig");
-const Buffer = @import("buffer.zig").Buffer;
 
 const log = std.log.scoped(.metal);
 
diff --git a/src/renderer/metal/Sampler.zig b/src/renderer/metal/Sampler.zig
index d1069948e..593f9a864 100644
--- a/src/renderer/metal/Sampler.zig
+++ b/src/renderer/metal/Sampler.zig
@@ -3,8 +3,6 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const objc = @import("objc");
 
 const mtl = @import("api.zig");
diff --git a/src/renderer/metal/Target.zig b/src/renderer/metal/Target.zig
index fe572a63b..f20bb0b7c 100644
--- a/src/renderer/metal/Target.zig
+++ b/src/renderer/metal/Target.zig
@@ -5,8 +5,6 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const objc = @import("objc");
 const macos = @import("macos");
 const graphics = macos.graphics;
diff --git a/src/renderer/metal/Texture.zig b/src/renderer/metal/Texture.zig
index c339277e8..5042919ac 100644
--- a/src/renderer/metal/Texture.zig
+++ b/src/renderer/metal/Texture.zig
@@ -4,7 +4,6 @@ const Self = @This();
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const objc = @import("objc");
 
 const mtl = @import("api.zig");
diff --git a/src/renderer/metal/buffer.zig b/src/renderer/metal/buffer.zig
index 8d2254640..f91f89e99 100644
--- a/src/renderer/metal/buffer.zig
+++ b/src/renderer/metal/buffer.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
 const objc = @import("objc");
 const macos = @import("macos");
 
diff --git a/src/renderer/metal/shaders.zig b/src/renderer/metal/shaders.zig
index 653c0dea2..0be023572 100644
--- a/src/renderer/metal/shaders.zig
+++ b/src/renderer/metal/shaders.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
 const macos = @import("macos");
 const objc = @import("objc");
 const math = @import("../../math.zig");
diff --git a/src/renderer/opengl/Frame.zig b/src/renderer/opengl/Frame.zig
index 3d0efbdfb..289413b0a 100644
--- a/src/renderer/opengl/Frame.zig
+++ b/src/renderer/opengl/Frame.zig
@@ -3,16 +3,12 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const gl = @import("opengl");
 
 const Renderer = @import("../generic.zig").Renderer(OpenGL);
 const OpenGL = @import("../OpenGL.zig");
 const Target = @import("Target.zig");
-const Pipeline = @import("Pipeline.zig");
 const RenderPass = @import("RenderPass.zig");
-const Buffer = @import("buffer.zig").Buffer;
 
 const Health = @import("../../renderer.zig").Health;
 
diff --git a/src/renderer/opengl/Pipeline.zig b/src/renderer/opengl/Pipeline.zig
index 04130752a..2469f45bc 100644
--- a/src/renderer/opengl/Pipeline.zig
+++ b/src/renderer/opengl/Pipeline.zig
@@ -3,14 +3,8 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const gl = @import("opengl");
 
-const OpenGL = @import("../OpenGL.zig");
-const Texture = @import("Texture.zig");
-const Buffer = @import("buffer.zig").Buffer;
-
 const log = std.log.scoped(.opengl);
 
 /// Options for initializing a render pipeline.
diff --git a/src/renderer/opengl/RenderPass.zig b/src/renderer/opengl/RenderPass.zig
index 1ef151c45..180664942 100644
--- a/src/renderer/opengl/RenderPass.zig
+++ b/src/renderer/opengl/RenderPass.zig
@@ -3,16 +3,12 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const gl = @import("opengl");
 
-const OpenGL = @import("../OpenGL.zig");
 const Sampler = @import("Sampler.zig");
 const Target = @import("Target.zig");
 const Texture = @import("Texture.zig");
 const Pipeline = @import("Pipeline.zig");
-const RenderPass = @import("RenderPass.zig");
 const Buffer = @import("buffer.zig").Buffer;
 
 /// Options for beginning a render pass.
diff --git a/src/renderer/opengl/Sampler.zig b/src/renderer/opengl/Sampler.zig
index 66f579221..f4013c686 100644
--- a/src/renderer/opengl/Sampler.zig
+++ b/src/renderer/opengl/Sampler.zig
@@ -3,8 +3,6 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const gl = @import("opengl");
 
 const OpenGL = @import("../OpenGL.zig");
diff --git a/src/renderer/opengl/Target.zig b/src/renderer/opengl/Target.zig
index e9de7216e..5c6d818f1 100644
--- a/src/renderer/opengl/Target.zig
+++ b/src/renderer/opengl/Target.zig
@@ -5,8 +5,6 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const gl = @import("opengl");
 
 const log = std.log.scoped(.opengl);
diff --git a/src/renderer/opengl/Texture.zig b/src/renderer/opengl/Texture.zig
index 71018d941..c37ec6866 100644
--- a/src/renderer/opengl/Texture.zig
+++ b/src/renderer/opengl/Texture.zig
@@ -3,8 +3,6 @@ const Self = @This();
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const gl = @import("opengl");
 
 const OpenGL = @import("../OpenGL.zig");
diff --git a/src/renderer/opengl/buffer.zig b/src/renderer/opengl/buffer.zig
index 17d34e500..f9cbbcebd 100644
--- a/src/renderer/opengl/buffer.zig
+++ b/src/renderer/opengl/buffer.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
 const gl = @import("opengl");
 
 const OpenGL = @import("../OpenGL.zig");
diff --git a/src/renderer/row.zig b/src/renderer/row.zig
index 157d22b54..933bb338b 100644
--- a/src/renderer/row.zig
+++ b/src/renderer/row.zig
@@ -1,4 +1,3 @@
-const std = @import("std");
 const terminal = @import("../terminal/main.zig");
 
 // TODO: Test neverExtendBg function
diff --git a/src/renderer/shadertoy.zig b/src/renderer/shadertoy.zig
index 38860932b..0d096c0fc 100644
--- a/src/renderer/shadertoy.zig
+++ b/src/renderer/shadertoy.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const glslang = @import("glslang");
diff --git a/src/simd/index_of.zig b/src/simd/index_of.zig
index cea549b95..7bf053b0d 100644
--- a/src/simd/index_of.zig
+++ b/src/simd/index_of.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const options = @import("build_options");
 
 extern "c" fn ghostty_simd_index_of(
diff --git a/src/surface_mouse.zig b/src/surface_mouse.zig
index a9702a8fe..691f1b23c 100644
--- a/src/surface_mouse.zig
+++ b/src/surface_mouse.zig
@@ -8,7 +8,6 @@ const SurfaceMouse = @This();
 const std = @import("std");
 const builtin = @import("builtin");
 const input = @import("input.zig");
-const apprt = @import("apprt.zig");
 const terminal = @import("terminal/main.zig");
 const MouseShape = @import("terminal/mouse_shape.zig").MouseShape;
 
diff --git a/src/terminal/PageList.zig b/src/terminal/PageList.zig
index 3673cf1f4..e7cb56da7 100644
--- a/src/terminal/PageList.zig
+++ b/src/terminal/PageList.zig
@@ -15,7 +15,6 @@ const point = @import("point.zig");
 const pagepkg = @import("page.zig");
 const stylepkg = @import("style.zig");
 const size = @import("size.zig");
-const Selection = @import("Selection.zig");
 const OffsetBuf = size.OffsetBuf;
 const Capacity = pagepkg.Capacity;
 const Page = pagepkg.Page;
diff --git a/src/terminal/Parser.zig b/src/terminal/Parser.zig
index 69f7e859f..980906e49 100644
--- a/src/terminal/Parser.zig
+++ b/src/terminal/Parser.zig
@@ -5,8 +5,6 @@
 const Parser = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const table = @import("parse_table.zig").table;
 const osc = @import("osc.zig");
diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig
index 68919107b..6c9db6a8d 100644
--- a/src/terminal/Terminal.zig
+++ b/src/terminal/Terminal.zig
@@ -5,7 +5,6 @@ const Terminal = @This();
 
 const std = @import("std");
 const build_options = @import("terminal_options");
-const builtin = @import("builtin");
 const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
diff --git a/src/terminal/apc.zig b/src/terminal/apc.zig
index 0585c78ba..3ebacbbff 100644
--- a/src/terminal/apc.zig
+++ b/src/terminal/apc.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const build_options = @import("terminal_options");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 const kitty_gfx = @import("kitty/graphics.zig");
diff --git a/src/terminal/c/key_encode.zig b/src/terminal/c/key_encode.zig
index 1e0367829..063cd8df7 100644
--- a/src/terminal/c/key_encode.zig
+++ b/src/terminal/c/key_encode.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
diff --git a/src/terminal/c/key_event.zig b/src/terminal/c/key_event.zig
index 6608c84b1..748b8799c 100644
--- a/src/terminal/c/key_event.zig
+++ b/src/terminal/c/key_event.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
diff --git a/src/terminal/c/osc.zig b/src/terminal/c/osc.zig
index 9c6286e6a..c4cdaad3b 100644
--- a/src/terminal/c/osc.zig
+++ b/src/terminal/c/osc.zig
@@ -1,6 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
-const builtin = @import("builtin");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const osc = @import("../osc.zig");
diff --git a/src/terminal/c/sgr.zig b/src/terminal/c/sgr.zig
index ec35ce608..53536417f 100644
--- a/src/terminal/c/sgr.zig
+++ b/src/terminal/c/sgr.zig
@@ -1,8 +1,6 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
-const builtin = @import("builtin");
 const lib_alloc = @import("../../lib/allocator.zig");
 const CAllocator = lib_alloc.Allocator;
 const sgr = @import("../sgr.zig");
diff --git a/src/terminal/hash_map.zig b/src/terminal/hash_map.zig
index a9d081782..e06050605 100644
--- a/src/terminal/hash_map.zig
+++ b/src/terminal/hash_map.zig
@@ -31,7 +31,6 @@
 //! bottleneck.
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../quirks.zig").inlineAssert;
 const autoHash = std.hash.autoHash;
 const math = std.math;
diff --git a/src/terminal/highlight.zig b/src/terminal/highlight.zig
index 4db5e31e7..582ef6f06 100644
--- a/src/terminal/highlight.zig
+++ b/src/terminal/highlight.zig
@@ -11,7 +11,6 @@
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../quirks.zig").inlineAssert;
 const size = @import("size.zig");
 const PageList = @import("PageList.zig");
 const PageChunk = PageList.PageIterator.Chunk;
diff --git a/src/terminal/hyperlink.zig b/src/terminal/hyperlink.zig
index b60ed795b..975e6f30e 100644
--- a/src/terminal/hyperlink.zig
+++ b/src/terminal/hyperlink.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../quirks.zig").inlineAssert;
 const hash_map = @import("hash_map.zig");
 const AutoOffsetHashMap = hash_map.AutoOffsetHashMap;
 const pagepkg = @import("page.zig");
diff --git a/src/terminal/kitty/color.zig b/src/terminal/kitty/color.zig
index dface5723..deeabcfb7 100644
--- a/src/terminal/kitty/color.zig
+++ b/src/terminal/kitty/color.zig
@@ -1,6 +1,4 @@
 const std = @import("std");
-const build_options = @import("terminal_options");
-const LibEnum = @import("../../lib/enum.zig").Enum;
 const terminal = @import("../main.zig");
 const RGB = terminal.color.RGB;
 const Terminator = terminal.osc.Terminator;
diff --git a/src/terminal/kitty/graphics_exec.zig b/src/terminal/kitty/graphics_exec.zig
index b5f8ad61b..5b3ab915d 100644
--- a/src/terminal/kitty/graphics_exec.zig
+++ b/src/terminal/kitty/graphics_exec.zig
@@ -2,8 +2,6 @@ const std = @import("std");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const renderer = @import("../../renderer.zig");
-const point = @import("../point.zig");
 const Terminal = @import("../Terminal.zig");
 const command = @import("graphics_command.zig");
 const image = @import("graphics_image.zig");
diff --git a/src/terminal/kitty/graphics_image.zig b/src/terminal/kitty/graphics_image.zig
index d5e0735a6..d2877cfc2 100644
--- a/src/terminal/kitty/graphics_image.zig
+++ b/src/terminal/kitty/graphics_image.zig
@@ -7,7 +7,6 @@ const posix = std.posix;
 
 const fastmem = @import("../../fastmem.zig");
 const command = @import("graphics_command.zig");
-const point = @import("../point.zig");
 const PageList = @import("../PageList.zig");
 const wuffs = @import("wuffs");
 
diff --git a/src/terminal/kitty/graphics_render.zig b/src/terminal/kitty/graphics_render.zig
index 4db9d1ab1..946b537a8 100644
--- a/src/terminal/kitty/graphics_render.zig
+++ b/src/terminal/kitty/graphics_render.zig
@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
 const terminal = @import("../main.zig");
 
diff --git a/src/terminal/main.zig b/src/terminal/main.zig
index fc7584c1a..06c930014 100644
--- a/src/terminal/main.zig
+++ b/src/terminal/main.zig
@@ -1,10 +1,7 @@
-const builtin = @import("builtin");
-
 const charsets = @import("charsets.zig");
 const stream = @import("stream.zig");
 const ansi = @import("ansi.zig");
 const csi = @import("csi.zig");
-const hyperlink = @import("hyperlink.zig");
 const render = @import("render.zig");
 const stream_readonly = @import("stream_readonly.zig");
 const style = @import("style.zig");
diff --git a/src/terminal/page.zig b/src/terminal/page.zig
index bf40d2353..124ff2545 100644
--- a/src/terminal/page.zig
+++ b/src/terminal/page.zig
@@ -10,7 +10,6 @@ const fastmem = @import("../fastmem.zig");
 const color = @import("color.zig");
 const hyperlink = @import("hyperlink.zig");
 const kitty = @import("kitty.zig");
-const sgr = @import("sgr.zig");
 const stylepkg = @import("style.zig");
 const Style = stylepkg.Style;
 const StyleId = stylepkg.Id;
diff --git a/src/terminal/parse_table.zig b/src/terminal/parse_table.zig
index 2c8ccf8fc..01bd569cb 100644
--- a/src/terminal/parse_table.zig
+++ b/src/terminal/parse_table.zig
@@ -10,7 +10,6 @@
 //!
 
 const std = @import("std");
-const builtin = @import("builtin");
 const parser = @import("Parser.zig");
 const State = parser.State;
 const Action = parser.TransitionAction;
diff --git a/src/terminal/point.zig b/src/terminal/point.zig
index fb44aae88..5a3d4a6f8 100644
--- a/src/terminal/point.zig
+++ b/src/terminal/point.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../quirks.zig").inlineAssert;
 const size = @import("size.zig");
 
 /// The possible reference locations for a point. When someone says "(42, 80)"
diff --git a/src/terminal/ref_counted_set.zig b/src/terminal/ref_counted_set.zig
index 3d0dd469a..e67682ff5 100644
--- a/src/terminal/ref_counted_set.zig
+++ b/src/terminal/ref_counted_set.zig
@@ -5,8 +5,6 @@ const size = @import("size.zig");
 const Offset = size.Offset;
 const OffsetBuf = size.OffsetBuf;
 
-const fastmem = @import("../fastmem.zig");
-
 /// A reference counted set.
 ///
 /// This set is created with some capacity in mind. You can determine
diff --git a/src/terminal/search/Thread.zig b/src/terminal/search/Thread.zig
index 8addd6ba9..8f2d73f16 100644
--- a/src/terminal/search/Thread.zig
+++ b/src/terminal/search/Thread.zig
@@ -21,8 +21,6 @@ const MessageData = @import("../../datastruct/main.zig").MessageData;
 const point = @import("../point.zig");
 const FlattenedHighlight = @import("../highlight.zig").Flattened;
 const UntrackedHighlight = @import("../highlight.zig").Untracked;
-const PageList = @import("../PageList.zig");
-const Screen = @import("../Screen.zig");
 const ScreenSet = @import("../ScreenSet.zig");
 const Selection = @import("../Selection.zig");
 const Terminal = @import("../Terminal.zig");
diff --git a/src/terminal/search/active.zig b/src/terminal/search/active.zig
index 2329c40b0..236f4c7a6 100644
--- a/src/terminal/search/active.zig
+++ b/src/terminal/search/active.zig
@@ -5,7 +5,6 @@ const point = @import("../point.zig");
 const size = @import("../size.zig");
 const FlattenedHighlight = @import("../highlight.zig").Flattened;
 const PageList = @import("../PageList.zig");
-const Selection = @import("../Selection.zig");
 const SlidingWindow = @import("sliding_window.zig").SlidingWindow;
 const Terminal = @import("../Terminal.zig");
 
diff --git a/src/terminal/search/pagelist.zig b/src/terminal/search/pagelist.zig
index 227bd03f9..4bfd241e7 100644
--- a/src/terminal/search/pagelist.zig
+++ b/src/terminal/search/pagelist.zig
@@ -1,8 +1,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
-const CircBuf = @import("../../datastruct/main.zig").CircBuf;
 const terminal = @import("../main.zig");
 const point = terminal.point;
 const FlattenedHighlight = @import("../highlight.zig").Flattened;
@@ -11,7 +9,6 @@ const PageList = terminal.PageList;
 const Pin = PageList.Pin;
 const Selection = terminal.Selection;
 const Screen = terminal.Screen;
-const PageFormatter = @import("../formatter.zig").PageFormatter;
 const Terminal = @import("../Terminal.zig");
 const SlidingWindow = @import("sliding_window.zig").SlidingWindow;
 
diff --git a/src/terminal/search/screen.zig b/src/terminal/search/screen.zig
index 97784e97e..0ae7f8a1f 100644
--- a/src/terminal/search/screen.zig
+++ b/src/terminal/search/screen.zig
@@ -10,7 +10,6 @@ const TrackedHighlight = highlight.Tracked;
 const PageList = @import("../PageList.zig");
 const Pin = PageList.Pin;
 const Screen = @import("../Screen.zig");
-const Selection = @import("../Selection.zig");
 const Terminal = @import("../Terminal.zig");
 const ActiveSearch = @import("active.zig").ActiveSearch;
 const PageListSearch = @import("pagelist.zig").PageListSearch;
diff --git a/src/terminal/search/viewport.zig b/src/terminal/search/viewport.zig
index 55eedb724..76deebcec 100644
--- a/src/terminal/search/viewport.zig
+++ b/src/terminal/search/viewport.zig
@@ -6,7 +6,6 @@ const point = @import("../point.zig");
 const size = @import("../size.zig");
 const FlattenedHighlight = @import("../highlight.zig").Flattened;
 const PageList = @import("../PageList.zig");
-const Selection = @import("../Selection.zig");
 const SlidingWindow = @import("sliding_window.zig").SlidingWindow;
 const Terminal = @import("../Terminal.zig");
 
diff --git a/src/termio/Options.zig b/src/termio/Options.zig
index 7484fd087..f41709f4a 100644
--- a/src/termio/Options.zig
+++ b/src/termio/Options.zig
@@ -1,10 +1,8 @@
 //! The options that are used to configure a terminal IO implementation.
 
-const builtin = @import("builtin");
 const xev = @import("../global.zig").xev;
 const apprt = @import("../apprt.zig");
 const renderer = @import("../renderer.zig");
-const Command = @import("../Command.zig");
 const Config = @import("../config.zig").Config;
 const termio = @import("../termio.zig");
 
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index e54c7ca61..53df00433 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -5,27 +5,20 @@
 pub const Termio = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
-const build_config = @import("../build_config.zig");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const EnvMap = std.process.EnvMap;
 const posix = std.posix;
 const termio = @import("../termio.zig");
-const Command = @import("../Command.zig");
-const Pty = @import("../pty.zig").Pty;
 const StreamHandler = @import("stream_handler.zig").StreamHandler;
 const terminalpkg = @import("../terminal/main.zig");
-const terminfo = @import("../terminfo/main.zig");
 const xev = @import("../global.zig").xev;
 const renderer = @import("../renderer.zig");
 const apprt = @import("../apprt.zig");
-const fastmem = @import("../fastmem.zig");
 const internal_os = @import("../os/main.zig");
 const windows = internal_os.windows;
 const configpkg = @import("../config.zig");
-const shell_integration = @import("shell_integration.zig");
 
 const log = std.log.scoped(.io_exec);
 
diff --git a/src/termio/Thread.zig b/src/termio/Thread.zig
index bb616e623..b111d5a52 100644
--- a/src/termio/Thread.zig
+++ b/src/termio/Thread.zig
@@ -19,7 +19,6 @@ const crash = @import("../crash/main.zig");
 const internal_os = @import("../os/main.zig");
 const termio = @import("../termio.zig");
 const renderer = @import("../renderer.zig");
-const BlockingQueue = @import("../datastruct/main.zig").BlockingQueue;
 
 const Allocator = std.mem.Allocator;
 const log = std.log.scoped(.io_thread);
diff --git a/src/termio/backend.zig b/src/termio/backend.zig
index ebd170079..ae0e2004f 100644
--- a/src/termio/backend.zig
+++ b/src/termio/backend.zig
@@ -1,18 +1,9 @@
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const posix = std.posix;
-const xev = @import("../global.zig").xev;
-const build_config = @import("../build_config.zig");
-const configpkg = @import("../config.zig");
-const internal_os = @import("../os/main.zig");
 const renderer = @import("../renderer.zig");
-const shell_integration = @import("shell_integration.zig");
 const terminal = @import("../terminal/main.zig");
 const termio = @import("../termio.zig");
-const Command = @import("../Command.zig");
-const Pty = @import("../pty.zig").Pty;
 
 // The preallocation size for the write request pool. This should be big
 // enough to satisfy most write requests. It must be a power of 2.
diff --git a/src/termio/mailbox.zig b/src/termio/mailbox.zig
index e91033180..2725d0241 100644
--- a/src/termio/mailbox.zig
+++ b/src/termio/mailbox.zig
@@ -1,6 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const xev = @import("../global.zig").xev;
 const renderer = @import("../renderer.zig");
diff --git a/src/termio/message.zig b/src/termio/message.zig
index 23b9f2545..f78da2058 100644
--- a/src/termio/message.zig
+++ b/src/termio/message.zig
@@ -1,7 +1,5 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const apprt = @import("../apprt.zig");
 const renderer = @import("../renderer.zig");
 const terminal = @import("../terminal/main.zig");
 const termio = @import("../termio.zig");