diff --git a/src/Surface.zig b/src/Surface.zig
index 466cfffe4..04bd2b4cd 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -20,7 +20,6 @@ const builtin = @import("builtin");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
-const Inspector = @import("Inspector.zig");
 const renderer = @import("renderer.zig");
 const termio = @import("termio.zig");
 const objc = @import("objc");
@@ -77,7 +76,7 @@ io_thread: termio.Thread,
 io_thr: std.Thread,
 
 /// Terminal inspector
-inspector: ?*Inspector = null,
+inspector: ?*inspector.Inspector = null,
 
 /// All the cached sizes since we need them at various times.
 screen_size: renderer.ScreenSize,
@@ -579,9 +578,9 @@ pub fn activateInspector(self: *Surface) !void {
     if (self.inspector != null) return;
 
     // Setup the inspector
-    var ptr = try self.alloc.create(Inspector);
+    var ptr = try self.alloc.create(inspector.Inspector);
     errdefer self.alloc.destroy(ptr);
-    ptr.* = try Inspector.init(self);
+    ptr.* = try inspector.Inspector.init(self);
     self.inspector = ptr;
 
     // Put the inspector onto the render state
diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index ce5413f1f..bb5826594 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -13,7 +13,7 @@ const apprt = @import("../apprt.zig");
 const input = @import("../input.zig");
 const terminal = @import("../terminal/main.zig");
 const CoreApp = @import("../App.zig");
-const CoreInspector = @import("../Inspector.zig");
+const CoreInspector = @import("../inspector/main.zig").Inspector;
 const CoreSurface = @import("../Surface.zig");
 const configpkg = @import("../config.zig");
 const Config = configpkg.Config;
diff --git a/src/apprt/gtk/inspector.zig b/src/apprt/gtk/inspector.zig
index e18007bfb..8eee7a540 100644
--- a/src/apprt/gtk/inspector.zig
+++ b/src/apprt/gtk/inspector.zig
@@ -8,7 +8,7 @@ const TerminalWindow = @import("Window.zig");
 const ImguiWidget = @import("ImguiWidget.zig");
 const c = @import("c.zig");
 const icon = @import("icon.zig");
-const CoreInspector = @import("../../Inspector.zig");
+const CoreInspector = @import("../../inspector/main.zig").Inspector;
 
 const log = std.log.scoped(.inspector);
 
diff --git a/src/Inspector.zig b/src/inspector/Inspector.zig
similarity index 99%
rename from src/Inspector.zig
rename to src/inspector/Inspector.zig
index ffd87876d..9142f7bc8 100644
--- a/src/Inspector.zig
+++ b/src/inspector/Inspector.zig
@@ -7,11 +7,10 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const builtin = @import("builtin");
 const cimgui = @import("cimgui");
-const CircBuf = @import("circ_buf.zig").CircBuf;
-const Surface = @import("Surface.zig");
-const input = @import("input.zig");
-const terminal = @import("terminal/main.zig");
-const inspector = @import("inspector/main.zig");
+const Surface = @import("../Surface.zig");
+const input = @import("../input.zig");
+const terminal = @import("../terminal/main.zig");
+const inspector = @import("main.zig");
 
 /// The window names. These are used with docking so we need to have access.
 const window_cell = "Cell";
diff --git a/src/inspector/main.zig b/src/inspector/main.zig
index 628f543e1..91192f62c 100644
--- a/src/inspector/main.zig
+++ b/src/inspector/main.zig
@@ -1,4 +1,5 @@
 pub const key = @import("key.zig");
+pub const Inspector = @import("Inspector.zig");
 
 test {
     @import("std").testing.refAllDecls(@This());
diff --git a/src/renderer/State.zig b/src/renderer/State.zig
index e5128b10c..aebc43fce 100644
--- a/src/renderer/State.zig
+++ b/src/renderer/State.zig
@@ -2,7 +2,7 @@
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const Inspector = @import("../Inspector.zig");
+const Inspector = @import("../inspector/main.zig").Inspector;
 const terminal = @import("../terminal/main.zig");
 const renderer = @import("../renderer.zig");