diff --git a/CMakeLists.txt b/CMakeLists.txt
index b53ab0a2b5..ceb5a83a0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,6 +508,7 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/unicode.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/Ast.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/zig/AstRlAnnotate.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/CrossTarget.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/c_builtins.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/Parse.zig"
@@ -521,7 +522,6 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/zig/tokenizer.zig"
     "${CMAKE_SOURCE_DIR}/src/Air.zig"
     "${CMAKE_SOURCE_DIR}/src/AstGen.zig"
-    "${CMAKE_SOURCE_DIR}/src/AstRlAnnotate.zig"
     "${CMAKE_SOURCE_DIR}/src/Compilation.zig"
     "${CMAKE_SOURCE_DIR}/src/Liveness.zig"
     "${CMAKE_SOURCE_DIR}/src/Module.zig"
diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index 85d1ae4868..2d2aaf17ba 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -17,6 +17,8 @@ pub const primitives = @import("zig/primitives.zig");
 pub const Ast = @import("zig/Ast.zig");
 pub const system = @import("zig/system.zig");
 pub const CrossTarget = @import("zig/CrossTarget.zig");
+pub const BuiltinFn = @import("zig/BuiltinFn.zig");
+pub const AstRlAnnotate = @import("zig/AstRlAnnotate.zig");
 
 // Character literal parsing
 pub const ParsedCharLiteral = string_literal.ParsedCharLiteral;
diff --git a/src/AstRlAnnotate.zig b/lib/std/zig/AstRlAnnotate.zig
similarity index 99%
rename from src/AstRlAnnotate.zig
rename to lib/std/zig/AstRlAnnotate.zig
index c751adea9d..a43de68951 100644
--- a/src/AstRlAnnotate.zig
+++ b/lib/std/zig/AstRlAnnotate.zig
@@ -18,7 +18,7 @@ const AstRlAnnotate = @This();
 const Ast = std.zig.Ast;
 const Allocator = std.mem.Allocator;
 const AutoHashMapUnmanaged = std.AutoHashMapUnmanaged;
-const BuiltinFn = @import("BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 const assert = std.debug.assert;
 
 gpa: Allocator,
diff --git a/src/BuiltinFn.zig b/lib/std/zig/BuiltinFn.zig
similarity index 100%
rename from src/BuiltinFn.zig
rename to lib/std/zig/BuiltinFn.zig
diff --git a/src/AstGen.zig b/src/AstGen.zig
index 0d1fa6c061..7bae5cafb0 100644
--- a/src/AstGen.zig
+++ b/src/AstGen.zig
@@ -13,9 +13,8 @@ const StringIndexContext = std.hash_map.StringIndexContext;
 const isPrimitive = std.zig.primitives.isPrimitive;
 
 const Zir = @import("Zir.zig");
-const trace = @import("tracy.zig").trace;
-const BuiltinFn = @import("BuiltinFn.zig");
-const AstRlAnnotate = @import("AstRlAnnotate.zig");
+const BuiltinFn = std.zig.BuiltinFn;
+const AstRlAnnotate = std.zig.AstRlAnnotate;
 
 gpa: Allocator,
 tree: *const Ast,
@@ -2265,9 +2264,6 @@ fn blockExpr(
     block_node: Ast.Node.Index,
     statements: []const Ast.Node.Index,
 ) InnerError!Zir.Inst.Ref {
-    const tracy = trace(@src());
-    defer tracy.end();
-
     const astgen = gz.astgen;
     const tree = astgen.tree;
     const main_tokens = tree.nodes.items(.main_token);
@@ -2349,9 +2345,6 @@ fn labeledBlockExpr(
     statements: []const Ast.Node.Index,
     force_comptime: bool,
 ) InnerError!Zir.Inst.Ref {
-    const tracy = trace(@src());
-    defer tracy.end();
-
     const astgen = gz.astgen;
     const tree = astgen.tree;
     const main_tokens = tree.nodes.items(.main_token);
@@ -7473,9 +7466,6 @@ fn identifier(
     ri: ResultInfo,
     ident: Ast.Node.Index,
 ) InnerError!Zir.Inst.Ref {
-    const tracy = trace(@src());
-    defer tracy.end();
-
     const astgen = gz.astgen;
     const tree = astgen.tree;
     const main_tokens = tree.nodes.items(.main_token);
diff --git a/src/Module.zig b/src/Module.zig
index 9112523d33..fd5bb5b5dc 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -34,7 +34,7 @@ const isUpDir = @import("introspect.zig").isUpDir;
 const clang = @import("clang.zig");
 const InternPool = @import("InternPool.zig");
 const Alignment = InternPool.Alignment;
-const BuiltinFn = @import("BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 
 comptime {
     @setEvalBranchQuota(4000);
diff --git a/src/reduce/Walk.zig b/src/reduce/Walk.zig
index a27d893c5d..572243d829 100644
--- a/src/reduce/Walk.zig
+++ b/src/reduce/Walk.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const Ast = std.zig.Ast;
 const Walk = @This();
 const assert = std.debug.assert;
-const BuiltinFn = @import("../BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 
 ast: *const Ast,
 transformations: *std.ArrayList(Transformation),