diff --git a/src/objcopy.zig b/lib/compiler/objcopy.zig
similarity index 98%
rename from src/objcopy.zig
rename to lib/compiler/objcopy.zig
index 81638d4af05f..67926be3354f 100644
--- a/src/objcopy.zig
+++ b/lib/compiler/objcopy.zig
@@ -1,3 +1,4 @@
+const builtin = @import("builtin");
 const std = @import("std");
 const mem = std.mem;
 const fs = std.fs;
@@ -6,12 +7,22 @@ const Allocator = std.mem.Allocator;
 const File = std.fs.File;
 const assert = std.debug.assert;
 
-const main = @import("main.zig");
-const fatal = main.fatal;
+const fatal = std.zig.fatal;
 const Server = std.zig.Server;
-const build_options = @import("build_options");
 
-pub fn cmdObjCopy(
+pub fn main() !void {
+    var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);
+    defer arena_instance.deinit();
+    const arena = arena_instance.allocator();
+
+    var general_purpose_allocator: std.heap.GeneralPurposeAllocator(.{}) = .{};
+    const gpa = general_purpose_allocator.allocator();
+
+    const args = try std.process.argsAlloc(arena);
+    return cmdObjCopy(gpa, arena, args[1..]);
+}
+
+fn cmdObjCopy(
     gpa: Allocator,
     arena: Allocator,
     args: []const []const u8,
@@ -148,7 +159,7 @@ pub fn cmdObjCopy(
             });
         },
         .elf => {
-            if (elf_hdr.endian != @import("builtin").target.cpu.arch.endian())
+            if (elf_hdr.endian != builtin.target.cpu.arch.endian())
                 fatal("zig objcopy: ELF to ELF copying only supports native endian", .{});
             if (elf_hdr.phoff == 0) // no program header
                 fatal("zig objcopy: ELF to ELF copying only supports programs", .{});
@@ -175,7 +186,7 @@ pub fn cmdObjCopy(
             .gpa = gpa,
             .in = std.io.getStdIn(),
             .out = std.io.getStdOut(),
-            .zig_version = build_options.version,
+            .zig_version = builtin.zig_version_string,
         });
         defer server.deinit();
 
diff --git a/src/main.zig b/src/main.zig
index 32f1dddf64d5..6f084c933a8e 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -297,7 +297,10 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
             .root_src_path = "fmt.zig",
         });
     } else if (mem.eql(u8, cmd, "objcopy")) {
-        return @import("objcopy.zig").cmdObjCopy(gpa, arena, cmd_args);
+        return jitCmd(gpa, arena, cmd_args, .{
+            .cmd_name = "objcopy",
+            .root_src_path = "objcopy.zig",
+        });
     } else if (mem.eql(u8, cmd, "fetch")) {
         return cmdFetch(gpa, arena, cmd_args);
     } else if (mem.eql(u8, cmd, "libc")) {