diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a62cbe9c0..7b7c120ab2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -505,6 +505,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/AstGen.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/AstRlAnnotate.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/c_builtins.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/Parse.zig"
@@ -517,7 +518,6 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/zig/tokenizer.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig/Zir.zig"
     "${CMAKE_SOURCE_DIR}/src/Air.zig"
-    "${CMAKE_SOURCE_DIR}/src/AstGen.zig"
     "${CMAKE_SOURCE_DIR}/src/Compilation.zig"
     "${CMAKE_SOURCE_DIR}/src/Compilation/Config.zig"
     "${CMAKE_SOURCE_DIR}/src/Liveness.zig"
diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index c5da47d5d8..9085b23de1 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -10,6 +10,7 @@ pub const string_literal = @import("zig/string_literal.zig");
 pub const number_literal = @import("zig/number_literal.zig");
 pub const primitives = @import("zig/primitives.zig");
 pub const Ast = @import("zig/Ast.zig");
+pub const AstGen = @import("zig/AstGen.zig");
 pub const Zir = @import("zig/Zir.zig");
 pub const system = @import("zig/system.zig");
 /// Deprecated: use `std.Target.Query`.
diff --git a/src/AstGen.zig b/lib/std/zig/AstGen.zig
similarity index 100%
rename from src/AstGen.zig
rename to lib/std/zig/AstGen.zig
diff --git a/src/Builtin.zig b/src/Builtin.zig
index fb0c1e9490..5c8577f4cb 100644
--- a/src/Builtin.zig
+++ b/src/Builtin.zig
@@ -296,7 +296,7 @@ const Allocator = std.mem.Allocator;
 const build_options = @import("build_options");
 const Module = @import("Package/Module.zig");
 const assert = std.debug.assert;
-const AstGen = @import("AstGen.zig");
+const AstGen = std.zig.AstGen;
 const File = @import("Module.zig").File;
 const Compilation = @import("Compilation.zig");
 const log = std.log.scoped(.builtin);
diff --git a/src/Module.zig b/src/Module.zig
index 6316979f4c..e3e97bb291 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -28,7 +28,7 @@ const link = @import("link.zig");
 const Air = @import("Air.zig");
 const Zir = std.zig.Zir;
 const trace = @import("tracy.zig").trace;
-const AstGen = @import("AstGen.zig");
+const AstGen = std.zig.AstGen;
 const Sema = @import("Sema.zig");
 const target_util = @import("target.zig");
 const build_options = @import("build_options");
diff --git a/src/main.zig b/src/main.zig
index 9522734dea..278a3939fc 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -25,7 +25,7 @@ const Cache = std.Build.Cache;
 const target_util = @import("target.zig");
 const crash_report = @import("crash_report.zig");
 const Module = @import("Module.zig");
-const AstGen = @import("AstGen.zig");
+const AstGen = std.zig.AstGen;
 const mingw = @import("mingw.zig");
 const Server = std.zig.Server;
 
diff --git a/src/reduce.zig b/src/reduce.zig
index 35456fe7c3..0a52814ac1 100644
--- a/src/reduce.zig
+++ b/src/reduce.zig
@@ -5,7 +5,7 @@ const assert = std.debug.assert;
 const fatal = @import("./main.zig").fatal;
 const Ast = std.zig.Ast;
 const Walk = @import("reduce/Walk.zig");
-const AstGen = @import("AstGen.zig");
+const AstGen = std.zig.AstGen;
 const Zir = std.zig.Zir;
 
 const usage =