diff --git a/.envrc b/.envrc
index bfe33bb..7dd7e81 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,5 @@
-: ${XDG_CACHE_HOME:=$HOME/.cache}
+#!/usr/bin/env bash
+: "${XDG_CACHE_HOME:=$HOME/.cache}"
 
 hash_source() {
 	echo -n "$PWD"
diff --git a/build.zig b/build.zig
index ede29e9..49e9842 100644
--- a/build.zig
+++ b/build.zig
@@ -22,14 +22,25 @@ pub fn build(b: *std.Build) void {
         .unit = b.step("unit", "Run pgzx unit tests"),
     };
 
-    // pgzx_pgsys module: C bindings to Postgres
-    const pgzx_pgsys = blk: {
-        const module = b.addModule("pgzx_pgsys", .{
-            .root_source_file = b.path("./src/pgzx/c.zig"),
+    // c_translated module: C bindings to Postgres
+    const c_translated = blk: {
+        const translate_c = b.addTranslateC(.{
+            .root_source_file = b.path("./src/pgzx/c/include/headers.h"),
             .target = target,
             .optimize = optimize,
         });
 
+        translate_c.addIncludePath(b.path("./src/pgzx/c/include/"));
+
+        translate_c.addIncludePath(.{
+            .cwd_relative = pgbuild.getIncludeServerDir(),
+        });
+        translate_c.addIncludePath(.{
+            .cwd_relative = pgbuild.getIncludeDir(),
+        });
+
+        const module = translate_c.createModule();
+
         // Internal C headers
         module.addIncludePath(b.path("./src/pgzx/c/include/"));
 
@@ -56,38 +67,44 @@ pub fn build(b: *std.Build) void {
         });
         module.linkSystemLibrary("pq", .{});
 
+        b.modules.put(b.dupe("c_translated"), module) catch @panic("OOM");
+
         break :blk module;
     };
 
     // codegen
     // The codegen produces Zig files that are imported as modules by pgzx.
     const node_tags_src = blk: {
-        const tool = b.addExecutable(.{
-            .name = "gennodetags",
+        const tool_module = b.createModule(.{
             .root_source_file = b.path("./tools/gennodetags/main.zig"),
             .target = b.graph.host,
             .link_libc = true,
         });
-        tool.root_module.addIncludePath(.{ .cwd_relative = pgbuild.getIncludeServerDir() });
-        tool.root_module.addIncludePath(.{ .cwd_relative = pgbuild.getIncludeDir() });
+        tool_module.addIncludePath(.{ .cwd_relative = pgbuild.getIncludeServerDir() });
+        tool_module.addIncludePath(.{ .cwd_relative = pgbuild.getIncludeDir() });
+
+        const tool = b.addExecutable(.{
+            .name = "gennodetags",
+            .root_module = tool_module,
+        });
 
         const tool_step = b.addRunArtifact(tool);
         break :blk tool_step.addOutputFileArg("nodetags.zig");
     };
 
     // pgzx: main project module.
-    // This module re-exports pgzx_pgsys, other generated modules, and utility functions.
+    // This module re-exports c_translated, other generated modules, and utility functions.
     const pgzx = blk: {
         const module = b.addModule("pgzx", .{
             .root_source_file = b.path("./src/pgzx.zig"),
             .target = target,
             .optimize = optimize,
         });
-        module.addImport("pgzx_pgsys", pgzx_pgsys);
+        module.addImport("c_translated", c_translated);
         module.addAnonymousImport("gen_node_tags", .{
             .root_source_file = node_tags_src,
             .imports = &.{
-                .{ .name = "pgzx_pgsys", .module = pgzx_pgsys },
+                .{ .name = "c_translated", .module = c_translated },
             },
         });
 
@@ -145,12 +162,12 @@ pub fn build(b: *std.Build) void {
 
         tests.lib.root_module.addIncludePath(b.path("./src/pgzx/c/include/"));
 
-        tests.lib.root_module.addImport("pgzx_pgsys", pgzx_pgsys);
+        tests.lib.root_module.addImport("c_translated", c_translated);
         tests.lib.root_module.addImport("pgzx", pgzx);
         tests.lib.root_module.addAnonymousImport("gen_node_tags", .{
             .root_source_file = node_tags_src,
             .imports = &.{
-                .{ .name = "pgzx_pgsys", .module = pgzx_pgsys },
+                .{ .name = "c_translated", .module = c_translated },
             },
         });
 
diff --git a/dev/bin/pginit b/dev/bin/pginit
index cef7ec2..34063dc 100755
--- a/dev/bin/pginit
+++ b/dev/bin/pginit
@@ -88,8 +88,13 @@ log_file=$log_dir/server.log
 
 # create the database
 mkdir -p "$cluster_dir"
-mkdir -p "$data_dir"
 mkdir -p "$log_dir"
+
+if [ -d "$data_dir" ]; then
+	rm -rf "$data_dir"
+fi
+mkdir -p "$data_dir"
+
 "$PG_BIN"/pg_ctl initdb -D "$data_dir" -o "--encoding=UTF8"
 
 # create database user
diff --git a/dev/bin/pglocal b/dev/bin/pglocal
index 30f5a7c..03f8911 100755
--- a/dev/bin/pglocal
+++ b/dev/bin/pglocal
@@ -70,7 +70,8 @@ cp_direct_files() {
 
 	# create symlinks
 	find "$src_dir" -maxdepth 1 -type l | while read -r link; do
-		ln -s "$(realpath "$link")" "$dest_dir/$(basename "$link")" || return 1
+		target="$dest_dir/$(basename "$link")"
+		[ -e "$target" ] || ln -s "$(realpath "$link")" "$target" || return 1
 	done
 }
 
@@ -93,6 +94,13 @@ cp_recursive() {
 	find "$src_dir" -type f -printf '%P\n' | while read -r file; do
 		cp -r "$src_dir/$file" "$dest_dir/$file" || return 1
 	done
+
+	# copy symlinked files by dereferencing them
+	find "$src_dir" -type l -printf '%P\n' | while read -r link; do
+		# Skip directory symlinks - they should be handled separately
+		[ -d "$src_dir/$link" ] && continue
+		cp -L "$src_dir/$link" "$dest_dir/$link" || return 1
+	done
 }
 
 mkdir -p "$new_install_dir"
@@ -130,6 +138,7 @@ fi
 ) | sort -u | while read -r dir; do
 	cp_direct_files "$new_install_dir/lib" "$dir"
 done
+cp_recursive "$new_install_dir/lib/bitcode" "$($PG_CONFIG --pkglibdir)/bitcode"
 cp_recursive "$new_install_dir/lib/pkgconfig" "$($PG_CONFIG --pkglibdir)/pkgconfig"
 cp_recursive "$new_install_dir/lib/postgresql" "$($PG_CONFIG --pkglibdir)/postgresql"
 
diff --git a/devshell.nix b/devshell.nix
index c1efcaa..9483c85 100644
--- a/devshell.nix
+++ b/devshell.nix
@@ -32,6 +32,14 @@
       EOF
     '';
   };
+
+  postgresql_unified = pkgs.symlinkJoin {
+    name = "postgresql-unified";
+    paths = [
+      pkgs.postgresql_16_jit
+      pkgs.postgresql_16_jit.pg_config
+    ];
+  };
   # On darwin we expect command line tools to be installed.
   # It is possible to install clang/gcc as nix package, but linking
   # can be quite a pain.
@@ -48,7 +56,7 @@ in {
       pkgs.shellcheck
       pkgs.shfmt
 
-      pkgs.postgresql_16_jit
+      postgresql_unified
       pkgs.openssl
       pkgs.gss
       pkgs.krb5
diff --git a/docs/index.html b/docs/index.html
index b10024a..e60a3f9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,6 +6,9 @@
     <title>Zig Documentation</title>
     <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNTMgMTQwIj48ZyBmaWxsPSIjRjdBNDFEIj48Zz48cG9seWdvbiBwb2ludHM9IjQ2LDIyIDI4LDQ0IDE5LDMwIi8+PHBvbHlnb24gcG9pbnRzPSI0NiwyMiAzMywzMyAyOCw0NCAyMiw0NCAyMiw5NSAzMSw5NSAyMCwxMDAgMTIsMTE3IDAsMTE3IDAsMjIiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMzEsOTUgMTIsMTE3IDQsMTA2Ii8+PC9nPjxnPjxwb2x5Z29uIHBvaW50cz0iNTYsMjIgNjIsMzYgMzcsNDQiLz48cG9seWdvbiBwb2ludHM9IjU2LDIyIDExMSwyMiAxMTEsNDQgMzcsNDQgNTYsMzIiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMTE2LDk1IDk3LDExNyA5MCwxMDQiLz48cG9seWdvbiBwb2ludHM9IjExNiw5NSAxMDAsMTA0IDk3LDExNyA0MiwxMTcgNDIsOTUiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMTUwLDAgNTIsMTE3IDMsMTQwIDEwMSwyMiIvPjwvZz48Zz48cG9seWdvbiBwb2ludHM9IjE0MSwyMiAxNDAsNDAgMTIyLDQ1Ii8+PHBvbHlnb24gcG9pbnRzPSIxNTMsMjIgMTUzLDExNyAxMDYsMTE3IDEyMCwxMDUgMTI1LDk1IDEzMSw5NSAxMzEsNDUgMTIyLDQ1IDEzMiwzNiAxNDEsMjIiIHNoYXBlLXJlbmRlcmluZz0iY3Jpc3BFZGdlcyIvPjxwb2x5Z29uIHBvaW50cz0iMTI1LDk1IDEzMCwxMTAgMTA2LDExNyIvPjwvZz48L2c+PC9zdmc+">
     <style type="text/css">
+      *, *::before, *::after {
+        box-sizing: border-box;
+      }
       body {
         font-family: system-ui, -apple-system, Roboto, "Segoe UI", sans-serif;
         color: #000000;
@@ -157,6 +160,23 @@
         cursor: default;
       }
 
+      #errors {
+        background-color: #faa;
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        max-height: min(20em, 50vh);
+        padding: 0.5em;
+        overflow: auto;
+      }
+      #errors h1 {
+        font-size: 1.5em;
+      }
+      #errors pre {
+        background-color: #fcc;
+      }
+
       #listSearchResults li.selected {
         background-color: #93e196;
       }
@@ -252,6 +272,14 @@
         #listSearchResults li.selected a {
           color: #fff;
         }
+        #errors {
+          background-color: #800;
+          color: #fff;
+        }
+        #errors pre {
+          background-color: #a00;
+          color: #fff;
+        }
         dl > div {
           border-color: #373737;
         }
@@ -414,6 +442,10 @@ <h1>Keyboard Shortcuts</h1>
       <dl><dt><kbd>↓</kbd></dt><dd>Move down in search results</dd></dl>
       <dl><dt><kbd>⏎</kbd></dt><dd>Go to active search result</dd></dl>
     </div>
+    <div id="errors" class="hidden">
+      <h1>Errors</h1>
+      <pre id="errorsText"></pre>
+    </div>
     <script src="main.js"></script>
   </body>
 </html>
diff --git a/docs/main.js b/docs/main.js
index 49c277b..71a1451 100644
--- a/docs/main.js
+++ b/docs/main.js
@@ -11,6 +11,11 @@
     const CAT_type_type = 9;
     const CAT_type_function = 10;
 
+    const LOG_err = 0;
+    const LOG_warn = 1;
+    const LOG_info = 2;
+    const LOG_debug = 3;
+
     const domDocTestsCode = document.getElementById("docTestsCode");
     const domFnErrorsAnyError = document.getElementById("fnErrorsAnyError");
     const domFnProto = document.getElementById("fnProto");
@@ -48,6 +53,8 @@
     const domStatus = document.getElementById("status");
     const domTableFnErrors = document.getElementById("tableFnErrors");
     const domTldDocs = document.getElementById("tldDocs");
+    const domErrors = document.getElementById("errors");
+    const domErrorsText = document.getElementById("errorsText");
 
     var searchTimer = null;
 
@@ -84,13 +91,24 @@
 
     WebAssembly.instantiateStreaming(wasm_promise, {
       js: {
-        log: function(ptr, len) {
+        log: function(level, ptr, len) {
           const msg = decodeString(ptr, len);
-          console.log(msg);
-        },
-        panic: function (ptr, len) {
-            const msg = decodeString(ptr, len);
-            throw new Error("panic: " + msg);
+          switch (level) {
+            case LOG_err:
+              console.error(msg);
+              domErrorsText.textContent += msg + "\n";
+              domErrors.classList.remove("hidden");
+              break;
+            case LOG_warn:
+              console.warn(msg);
+              break;
+            case LOG_info:
+              console.info(msg);
+              break;
+            case LOG_debug:
+              console.debug(msg);
+              break;
+          }
         },
       },
     }).then(function(obj) {
@@ -111,6 +129,11 @@
         domSearch.addEventListener('input', onSearchChange, false);
         window.addEventListener('keydown', onWindowKeyDown, false);
         onHashChange(null);
+        if (domSearch.value) {
+          // user started typing a search query while the page was loading
+          curSearchIndex = -1;
+          startAsyncSearch();
+        }
       });
     });
 
@@ -625,6 +648,7 @@
     }
 
     function onHashChange(state) {
+      // Use a non-null state value to prevent the window scrolling if the user goes back to this history entry.
       history.replaceState({}, "");
       navigate(location.hash);
       if (state == null) window.scrollTo({top: 0});
@@ -632,13 +656,11 @@
 
     function onPopState(ev) {
       onHashChange(ev.state);
+      syncDomSearch();
     }
 
     function navigate(location_hash) {
       updateCurNav(location_hash);
-      if (domSearch.value !== curNavSearch) {
-          domSearch.value = curNavSearch;
-      }
       render();
       if (imFeelingLucky) {
           imFeelingLucky = false;
@@ -646,6 +668,12 @@
       }
     }
 
+    function syncDomSearch() {
+      if (domSearch.value !== curNavSearch) {
+        domSearch.value = curNavSearch;
+      }
+    }
+
     function activateSelectedResult() {
         if (domSectSearchResults.classList.contains("hidden")) {
             return;
diff --git a/docs/main.wasm b/docs/main.wasm
index 480b4cb..37e07c2 100755
Binary files a/docs/main.wasm and b/docs/main.wasm differ
diff --git a/docs/sources.tar b/docs/sources.tar
index 1d20e41..54aa2cf 100644
Binary files a/docs/sources.tar and b/docs/sources.tar differ
diff --git a/examples/pgaudit_zig/src/main.zig b/examples/pgaudit_zig/src/main.zig
index 2844e51..3437f8d 100644
--- a/examples/pgaudit_zig/src/main.zig
+++ b/examples/pgaudit_zig/src/main.zig
@@ -95,7 +95,7 @@ fn getAuditList() error{PGErrorStack}!*std.ArrayList(*AuditEvent) {
     global_memctx = pgzx.mem.createAllocSetContext("pgaudit_zig_context_global", .{ .parent = pg.TopMemoryContext }) catch |err| {
         return pgzx.elog.Error(@src(), "pgaudit_zig: failed to create memory context: {}\n", .{err});
     };
-    audit_events_list = std.ArrayList(*AuditEvent).init(global_memctx.allocator());
+    audit_events_list = std.ArrayList(*AuditEvent){};
     return &audit_events_list.?;
 }
 
@@ -113,7 +113,7 @@ fn executorStartHook(queryDesc: [*c]pg.QueryDesc, eflags: c_int) !void {
     };
 
     var audit_list = try getAuditList();
-    try audit_list.append(event);
+    try audit_list.append(allocator, event);
 
     if (prev_ExecutorStart_hook) |hook| {
         hook(queryDesc, eflags);
@@ -131,7 +131,7 @@ fn executorStartHook(queryDesc: [*c]pg.QueryDesc, eflags: c_int) !void {
     );
 }
 
-fn pgaudit_zig_ExecutorStart_hook(queryDesc: [*c]pg.QueryDesc, eflags: c_int) callconv(.C) void {
+fn pgaudit_zig_ExecutorStart_hook(queryDesc: [*c]pg.QueryDesc, eflags: c_int) callconv(.c) void {
     std.log.debug("pgaudit_zig: ExecutorStart_hook\n", .{});
 
     executorStartHook(queryDesc, eflags) catch |err| {
@@ -147,8 +147,8 @@ fn executorCheckPermsHook(rangeTables: [*c]pg.List, rtePermInfos: [*c]pg.List, v
     const event = list.getLast();
     var allocator = event.memctx.allocator();
 
-    var relList = std.ArrayList(RelEntry).init(allocator);
-    errdefer relList.deinit();
+    var relList = std.ArrayList(RelEntry){};
+    errdefer relList.deinit(allocator);
 
     var errctx = pgzx.err.Context.init();
     defer errctx.deinit();
@@ -171,7 +171,7 @@ fn executorCheckPermsHook(rangeTables: [*c]pg.List, rtePermInfos: [*c]pg.List, v
                 .rel_namespace_oid = relNamespaceOid,
                 .rel_namespace_name = try allocator.dupe(u8, std.mem.span(namespaceName)),
             };
-            try relList.append(relEntry);
+            try relList.append(allocator, relEntry);
 
             std.log.debug("pgaudit_zig: ExecutorCheckPerms_hook: relNamespaceOid: {}, relOid: {}\n", .{ relNamespaceOid, relOid });
             std.log.debug("pgaudit_zig: ExecutorCheckPerms_hook: namespace: {s}, rel: {s}\n", .{ namespaceName, relName });
@@ -184,7 +184,7 @@ fn executorCheckPermsHook(rangeTables: [*c]pg.List, rtePermInfos: [*c]pg.List, v
     return true;
 }
 
-pub fn pgaudit_zig_ExecutorCheckPerms_hook(rangeTables: [*c]pg.List, rtePermInfos: [*c]pg.List, violation: bool) callconv(.C) bool {
+pub fn pgaudit_zig_ExecutorCheckPerms_hook(rangeTables: [*c]pg.List, rtePermInfos: [*c]pg.List, violation: bool) callconv(.c) bool {
     std.log.debug("pgaudit_zig: ExecutorCheckPerms_hook\n", .{});
 
     return executorCheckPermsHook(rangeTables, rtePermInfos, violation) catch |err| {
@@ -194,7 +194,7 @@ pub fn pgaudit_zig_ExecutorCheckPerms_hook(rangeTables: [*c]pg.List, rtePermInfo
     };
 }
 
-fn pgaudit_zig_ExecutorFinish_hook(queryDesc: [*c]pg.QueryDesc) callconv(.C) void {
+fn pgaudit_zig_ExecutorFinish_hook(queryDesc: [*c]pg.QueryDesc) callconv(.c) void {
     std.log.debug("pgaudit_zig: ExecutorFinish_hook\n", .{});
 
     const queryContext = queryDesc.*.estate.*.es_query_cxt;
@@ -250,8 +250,9 @@ fn pgaudit_zig_MemoryContextCallback(memctx: pg.MemoryContext) void {
 }
 
 fn eventToJSON(event: *AuditEvent, writer: std.ArrayList(u8).Writer) !void {
-    _ = try writer.write("{\"operation\": ");
-    try std.json.encodeJsonString(@tagName(event.command), .{}, writer);
+    _ = try writer.write("{\"operation\": \"");
+    _ = try writer.write(@tagName(event.command));
+    _ = try writer.write("\"");
 
     if (event.relations) |relations| {
         _ = try writer.write(", \"relations\": [");
@@ -263,20 +264,23 @@ fn eventToJSON(event: *AuditEvent, writer: std.ArrayList(u8).Writer) !void {
             _ = try writer.write("{");
             _ = try writer.write("\"relOid\": ");
             try std.fmt.format(writer, "{d}", .{rel.rel_oid});
-            _ = try writer.write(", \"relname\": ");
-            try std.json.encodeJsonString(rel.rel_name, .{}, writer);
+            _ = try writer.write(", \"relname\": \"");
+            _ = try writer.write(rel.rel_name);
+            _ = try writer.write("\"");
             _ = try writer.write(", \"namespaceOid\": ");
             try std.fmt.format(writer, "{d}", .{rel.rel_namespace_oid});
-            _ = try writer.write(", \"relnamespaceName\": ");
-            try std.json.encodeJsonString(rel.rel_namespace_name, .{}, writer);
+            _ = try writer.write(", \"relnamespaceName\": \"");
+            _ = try writer.write(rel.rel_namespace_name);
+            _ = try writer.write("\"");
             _ = try writer.write("}");
         }
         _ = try writer.write("]");
     }
 
     if (settings.log_statement.value) {
-        _ = try writer.write(", \"commandText\": ");
-        try std.json.encodeJsonString(event.commandText, .{}, writer);
+        _ = try writer.write(", \"commandText\": \"");
+        _ = try writer.write(event.commandText);
+        _ = try writer.write("\"");
     }
     _ = try writer.write("}");
 }
@@ -284,9 +288,9 @@ fn eventToJSON(event: *AuditEvent, writer: std.ArrayList(u8).Writer) !void {
 fn logAuditEvent(event: *AuditEvent) !void {
     std.log.debug("pgaudit_zig: logAuditEvent\n", .{});
 
-    var string = std.ArrayList(u8).init(pgzx.mem.PGCurrentContextAllocator);
-    defer string.deinit();
-    const writer = string.writer();
+    var string = std.ArrayList(u8){};
+    defer string.deinit(pgzx.mem.PGCurrentContextAllocator);
+    const writer = string.writer(pgzx.mem.PGCurrentContextAllocator);
 
     try eventToJSON(event, writer);
 
@@ -312,7 +316,7 @@ const Tests = struct {
         };
 
         const list = try getAuditList();
-        try list.append(event);
+        try list.append(global_memctx.allocator(), event);
 
         const last = list.getLast();
         try std.testing.expectEqual(event, last);
@@ -327,7 +331,6 @@ const Tests = struct {
     pub fn testEventToJSON() !void {
         var memctx = try pgzx.mem.createAllocSetContext("pgaudit_zig_tests_context", .{ .parent = pg.CurrentMemoryContext });
         defer memctx.deinit();
-        const allocator = memctx.allocator();
 
         var event = AuditEvent{
             .command = Commands.CMD_SELECT,
@@ -335,9 +338,9 @@ const Tests = struct {
             .memctx = memctx,
         };
 
-        var string = std.ArrayList(u8).init(allocator);
-        defer string.deinit();
-        const writer = string.writer();
+        var string = std.ArrayList(u8){};
+        defer string.deinit(pgzx.mem.PGCurrentContextAllocator);
+        const writer = string.writer(pgzx.mem.PGCurrentContextAllocator);
 
         try eventToJSON(&event, writer);
 
diff --git a/examples/sqlfns/src/hello_world.zig b/examples/sqlfns/src/hello_world.zig
index f5bec91..dac4744 100644
--- a/examples/sqlfns/src/hello_world.zig
+++ b/examples/sqlfns/src/hello_world.zig
@@ -3,7 +3,7 @@ const pgzx = @import("pgzx");
 
 pub fn hello_world_file(name: ?[:0]const u8) ![:0]const u8 {
     return if (name) |n|
-        try std.fmt.allocPrintZ(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n})
+        try std.fmt.allocPrintSentinel(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n}, 0)
     else
         "Hello World";
 }
diff --git a/examples/sqlfns/src/main.zig b/examples/sqlfns/src/main.zig
index d1d7d9b..79cd2ad 100644
--- a/examples/sqlfns/src/main.zig
+++ b/examples/sqlfns/src/main.zig
@@ -18,11 +18,11 @@ comptime {
 // The functions accepts the FunctionCallInfoData struct and must return a Datum and no Zig errors.
 //
 
-export fn pg_finfo_hello_world_c() callconv(.C) [*c]const pg.Pg_finfo_record {
+export fn pg_finfo_hello_world_c() callconv(.c) [*c]const pg.Pg_finfo_record {
     return pgzx.fmgr.FunctionV1();
 }
 
-export fn hello_world_c(fcinfo: pg.FunctionCallInfo) callconv(.C) pg.Datum {
+export fn hello_world_c(fcinfo: pg.FunctionCallInfo) callconv(.c) pg.Datum {
     // When using the C interface we can not use any of the PG_RETURN or PG_GETARG macros directly.
     //
     // This function accepts a 'string' of type 'text' and returns a new string of type 'text'.
@@ -43,7 +43,7 @@ export fn hello_world_c(fcinfo: pg.FunctionCallInfo) callconv(.C) pg.Datum {
         };
 
         const allocator = pgzx.mem.PGCurrentContextAllocator;
-        const hello = std.fmt.allocPrintZ(allocator, "Hello, {s}!", .{name}) catch |e| {
+        const hello = std.fmt.allocPrintSentinel(allocator, "Hello, {s}!", .{name}, 0) catch |e| {
             pgzx.elog.throwAsPostgresError(@src(), e);
             unreachable;
         };
@@ -71,7 +71,7 @@ comptime {
 
 fn hello_world_zig(name: ?[:0]const u8) ![:0]const u8 {
     return if (name) |n|
-        try std.fmt.allocPrintZ(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n})
+        try std.fmt.allocPrintSentinel(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n}, 0)
     else
         "Hello World";
 }
@@ -84,7 +84,7 @@ comptime {
 
 fn hello_world_zig_null(name: ?[:0]const u8) !?[:0]const u8 {
     return if (name) |n|
-        try std.fmt.allocPrintZ(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n})
+        try std.fmt.allocPrintSentinel(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n}, 0)
     else
         null;
 }
@@ -110,7 +110,7 @@ fn hello_world_zig_datum(fcinfo: pg.FunctionCallInfo, arg: ?pg.Datum) !pg.Datum
     }
 
     const name = try pgzx.datum.getDatumTextSliceZ(arg.?);
-    const message = try std.fmt.allocPrintZ(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{name});
+    const message = try std.fmt.allocPrintSentinel(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{name}, 0);
     return try pgzx.datum.sliceToDatumTextZ(message);
 }
 
@@ -127,7 +127,7 @@ comptime {
     pgzx.PG_EXPORT(struct {
         pub fn hello_world_anon(name: ?[:0]const u8) ![:0]const u8 {
             return if (name) |n|
-                try std.fmt.allocPrintZ(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n})
+                try std.fmt.allocPrintSentinel(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n}, 0)
             else
                 "Hello World";
         }
@@ -143,7 +143,7 @@ comptime {
 const mod_hello_world = struct {
     pub fn hello_world_mod(name: ?[:0]const u8) ![:0]const u8 {
         return if (name) |n|
-            try std.fmt.allocPrintZ(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n})
+            try std.fmt.allocPrintSentinel(pgzx.mem.PGCurrentContextAllocator, "Hello, {s}!", .{n}, 0)
         else
             "Hello World";
     }
diff --git a/flake.lock b/flake.lock
index f2b5d48..2c6a0ad 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -36,24 +36,6 @@
       "inputs": {
         "systems": "systems"
       },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
       "locked": {
         "lastModified": 1705309234,
         "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@@ -76,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703887061,
-        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -112,43 +94,30 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728328465,
-        "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=",
-        "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
-        "revCount": 635732,
+        "lastModified": 1765838191,
+        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
+        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
+        "revCount": 903775,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.635732%2Brev-1bfbbbe5bbf888d675397c66bfdb275d0b99361c/01926e1f-f93c-780f-9732-bc9807fb6715/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.903775%2Brev-c6f52ebd45e5925c188d1a20119978aa4ffd5ef6/019b2d67-1e0c-7882-89c2-3b456e18a61b/source.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2405.635732.tar.gz"
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511.%2A.tar.gz"
       }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1738452942,
-        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1704874635,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
         "type": "github"
       }
     },
@@ -157,11 +126,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1738453229,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
@@ -173,19 +142,17 @@
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        ]
       },
       "locked": {
-        "lastModified": 1707297608,
-        "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=",
+        "lastModified": 1765911976,
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "0db2e67ee49910adfa13010e7f012149660af7f0",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -218,35 +185,20 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "zig-overlay": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1741825901,
-        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
+        "lastModified": 1764203689,
+        "narHash": "sha256-ivb0SqCptyIxx5g8ryRrUL0xrJhLrJPlvZbZjxVaui0=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
+        "rev": "8f7347545dea59b75e40247cc1ed55a42f64dbbf",
         "type": "github"
       },
       "original": {
@@ -266,15 +218,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1741485474,
-        "narHash": "sha256-ej8PBSH3n/JVn0W9iwL7nK6Pubq1Vw92ZtodAbtDFw8=",
+        "lastModified": 1756048867,
+        "narHash": "sha256-GFzSHUljcxy7sM1PaabbkQUdUnLwpherekPWJFxXtnk=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "fedbf31eb7d7cb55888e656501767cbe423061af",
+        "rev": "ce6c8f02c78e622421cfc2405c67c5222819ec03",
         "type": "github"
       },
       "original": {
         "owner": "zigtools",
+        "ref": "0.15.0",
         "repo": "zls",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 7b85ed2..63d94a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Description for the project";
 
   inputs = {
-    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2405.635732.tar.gz";
+    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2511.*.tar.gz";
 
     parts.url = "github:hercules-ci/flake-parts";
 
@@ -11,7 +11,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zls = {
-      url = "github:zigtools/zls";
+      url = "github:zigtools/zls/0.15.0";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.zig-overlay.follows = "zig-overlay";
     };
@@ -27,7 +27,7 @@
     nixpkgs,
     ...
   }: let
-    zig-stable = "0.14.0";
+    zig-stable = "0.15.2";
 
     zig-overlay = _final: prev: let
       orig = inputs.zig-overlay.packages.${prev.system};
@@ -177,10 +177,10 @@
                   pkgs.readline
                   pkgs.openssl
                   pkgs.libxml2
-                  pkgs.llvmPackages_17.llvm
-                  pkgs.llvmPackages_17.lld
-                  pkgs.llvmPackages_17.clang
-                  pkgs.llvmPackages_17.clang-unwrapped
+                  pkgs.llvmPackages_19.llvm
+                  pkgs.llvmPackages_19.lld
+                  pkgs.llvmPackages_19.clang
+                  pkgs.llvmPackages_19.clang-unwrapped
                   pkgs.lz4
                   pkgs.zstd
                   pkgs.libxslt
diff --git a/nix/modules/nixpkgs.nix b/nix/modules/nixpkgs.nix
index d529e43..7b15a67 100644
--- a/nix/modules/nixpkgs.nix
+++ b/nix/modules/nixpkgs.nix
@@ -1,5 +1,4 @@
 toplevel @ {
-  config,
   flake-parts-lib,
   inputs,
   lib,
@@ -72,7 +71,6 @@ in {
       config,
       system,
       lib,
-      pkgs,
       ...
     }: {
       _module.args.pkgs = lib.mkForce (import inputs.nixpkgs {
diff --git a/nix/templates/init/.envrc b/nix/templates/init/.envrc
index bfe33bb..7dd7e81 100644
--- a/nix/templates/init/.envrc
+++ b/nix/templates/init/.envrc
@@ -1,4 +1,5 @@
-: ${XDG_CACHE_HOME:=$HOME/.cache}
+#!/usr/bin/env bash
+: "${XDG_CACHE_HOME:=$HOME/.cache}"
 
 hash_source() {
 	echo -n "$PWD"
diff --git a/nix/templates/init/devshell.nix b/nix/templates/init/devshell.nix
index 3cc7b14..7bc72d1 100644
--- a/nix/templates/init/devshell.nix
+++ b/nix/templates/init/devshell.nix
@@ -40,6 +40,7 @@ in {
       # We also need a local postgres for pglocal that we install in the devshell.
       pkgs.pgzx_scripts
       pkgs.postgresql_16_jit
+      pkgs.postgresql_16_jit.pg_config
 
       # Additional Zig tools.
       pkgs.zls # Zig Language Server
diff --git a/src/pgzx.zig b/src/pgzx.zig
index f178660..c6896f9 100644
--- a/src/pgzx.zig
+++ b/src/pgzx.zig
@@ -6,8 +6,8 @@
 const std = @import("std");
 
 // Export common set of postgres headers.
-pub const c = @import("pgzx_pgsys"); // keep for backwards compatibility
-pub const pg = c;
+pub const pg = @import("c_translated");
+pub const c = pg; // keep for backwards compatibility
 
 // Utility functions for working with the PostgreSQL C API.
 pub const bgworker = @import("pgzx/bgworker.zig");
diff --git a/src/pgzx/bgworker.zig b/src/pgzx/bgworker.zig
index 9ecbfff..6833aa0 100644
--- a/src/pgzx/bgworker.zig
+++ b/src/pgzx/bgworker.zig
@@ -99,9 +99,9 @@ pub fn checkLen(comptime str: []const u8, into: anytype) void {
     }
 }
 
-pub inline fn sigFlagHandler(sig: *pgzx.intr.Signal) fn (c_int) callconv(.C) void {
+pub inline fn sigFlagHandler(sig: *pgzx.intr.Signal) fn (c_int) callconv(.c) void {
     return struct {
-        fn handler(num: c_int) callconv(.C) void {
+        fn handler(num: c_int) callconv(.c) void {
             sig.set(1);
             finalizeSignal(num);
         }
diff --git a/src/pgzx/build.zig b/src/pgzx/build.zig
index 4d3083c..4d01c5c 100644
--- a/src/pgzx/build.zig
+++ b/src/pgzx/build.zig
@@ -10,7 +10,7 @@ std_build: *std.Build,
 paths: Paths,
 options: struct {
     target: std.Build.ResolvedTarget,
-    optimize: std.builtin.Mode,
+    optimize: std.builtin.OptimizeMode,
 },
 debug: DebugOptions,
 
@@ -93,10 +93,10 @@ pub const Project = struct {
                 .pgzx = pgbuild.modules.pgzx(),
             },
             .config = proj_config,
-            .options = std.StringArrayHashMapUnmanaged(*Step.Options).init(b.allocator, &.{}, &.{}) catch unreachable,
-            .includePaths = std.ArrayList(LazyPath).init(b.allocator),
-            .libraryPaths = std.ArrayList(LazyPath).init(b.allocator),
-            .cSourcesFiles = std.ArrayList(AddCSourceFilesOptions).init(b.allocator),
+            .options = std.StringArrayHashMapUnmanaged(*Step.Options){},
+            .includePaths = std.ArrayList(LazyPath){},
+            .libraryPaths = std.ArrayList(LazyPath){},
+            .cSourcesFiles = std.ArrayList(AddCSourceFilesOptions){},
         };
     }
 
@@ -141,15 +141,15 @@ pub const Project = struct {
     }
 
     pub fn addIncludePath(proj: *Project, path: LazyPath) void {
-        proj.includePaths.append(path) catch unreachable;
+        proj.includePaths.append(proj.build.allocator, path) catch unreachable;
     }
 
     pub fn addLibraryPath(proj: *Project, path: LazyPath) void {
-        proj.libraryPaths.append(path) catch unreachable;
+        proj.libraryPaths.append(proj.build.allocator, path) catch unreachable;
     }
 
     pub fn addCSourceFiles(proj: *Project, options: AddCSourceFilesOptions) void {
-        proj.cSourcesFiles.append(options) catch unreachable;
+        proj.cSourcesFiles.append(proj.build.allocator, options) catch unreachable;
     }
 };
 
@@ -195,7 +195,7 @@ pub const InstallExtension = struct {
 
         // shared library options
         target: ?std.Build.ResolvedTarget = null,
-        optimize: ?std.builtin.Mode = null,
+        optimize: ?std.builtin.OptimizeMode = null,
         single_threaded: bool = true,
         link_libc: bool = true,
         link_allow_shlib_undefined: bool = true,
@@ -241,7 +241,7 @@ pub const RunExec = struct {
         var r = b.std_build.allocator.create(RunExec) catch @panic("OOM");
         r.* = .{
             .owner = b,
-            .argv = std.ArrayList([]const u8).init(b.std_build.allocator),
+            .argv = std.ArrayList([]const u8){},
             .step = Step.init(.{
                 .id = base_id,
                 .name = name,
@@ -249,12 +249,12 @@ pub const RunExec = struct {
                 .makeFn = make,
             }),
         };
-        r.argv.appendSlice(argv) catch @panic("OOM");
+        r.argv.appendSlice(b.std_build.allocator, argv) catch @panic("OOM");
         return r;
     }
 
     fn addArg(r: *RunExec, arg: []const u8) void {
-        r.argv.append(arg) catch @panic("OOM");
+        r.argv.append(r.owner.std_build.allocator, arg) catch @panic("OOM");
     }
 
     fn addArgOption(r: *RunExec, option: []const u8, arg: []const u8) void {
@@ -285,7 +285,13 @@ pub const RunExec = struct {
         child.stdin_behavior = .Ignore;
         child.stdout_behavior = .Inherit;
         child.stderr_behavior = .Inherit;
-        const term = child.spawnAndWait() catch @panic("failed to start process");
+        const term = child.spawnAndWait() catch |err| {
+            const cmd = r.argv.items[0];
+            std.debug.print("Failed to spawn process: {s}\n", .{cmd});
+            std.debug.print("Error: {}\n", .{err});
+            std.debug.print("Command: {any}\n", .{r.argv.items});
+            return step.fail("Failed to start process '{s}': {}", .{ cmd, err });
+        };
         const exit_code = switch (term) {
             .Exited => |code| code,
             else => @panic("process failed"),
@@ -298,7 +304,7 @@ pub const RunExec = struct {
 
 pub const InitOptions = struct {
     target: std.Build.ResolvedTarget,
-    optimize: std.builtin.Mode,
+    optimize: std.builtin.OptimizeMode,
     debug: DebugOptions = .{},
 };
 
@@ -351,9 +357,10 @@ pub fn getExtensionDir(b: *Build) []const u8 {
 
 pub fn getPGRegressPath(b: *Build) []const u8 {
     b.paths.pg_regress_path = b.paths.pg_regress_path orelse blk: {
-        const pkglib = b.getPackageLibDir();
-        const pg_regress = "pgxs/src/test/regress/pg_regress";
-        break :blk b.std_build.pathJoin(&[_][]const u8{ pkglib, pg_regress });
+        const include_server_dir = b.getIncludeServerDir();
+        const dev_root = std.fs.path.dirname(std.fs.path.dirname(include_server_dir).?).?;
+        const pg_regress = "lib/pgxs/src/test/regress/pg_regress";
+        break :blk b.std_build.pathJoin(&[_][]const u8{ dev_root, pg_regress });
     };
     return b.paths.pg_regress_path.?;
 }
@@ -378,20 +385,25 @@ pub fn addExtensionLib(b: *Build, options: ExtensionLibOptions) *Step.Compile {
     const root_dir = options.root_dir orelse
         b.std_build.pathJoin(&[_][]const u8{ "src/", options.name });
 
-    const lib = b.std_build.addSharedLibrary(.{
+    const lib_module = b.std_build.createModule(.{
+        .root_source_file = b.resolveLazyPath(root_dir, options.root_source_file, "main.zig"),
+        .target = b.options.target,
+        .optimize = b.options.optimize,
+        .link_libc = if (options.link_libc) true else null,
+    });
+    lib_module.addIncludePath(.{
+        .cwd_relative = b.getIncludeServerDir(),
+    });
+
+    const lib = b.std_build.addLibrary(.{
         .name = options.name,
+        .linkage = .dynamic,
         .version = .{
             .major = options.version.major,
             .minor = options.version.minor,
             .patch = 0,
         },
-        .root_source_file = b.resolveLazyPath(root_dir, options.root_source_file, "main.zig"),
-        .target = b.options.target,
-        .optimize = b.options.optimize,
-        .link_libc = options.link_libc,
-    });
-    lib.addIncludePath(.{
-        .cwd_relative = b.getIncludeServerDir(),
+        .root_module = lib_module,
     });
     lib.linker_allow_shlib_undefined = true;
     return lib;
@@ -619,7 +631,7 @@ pub fn runPGConfig(b: *Build, question: []const u8) []const u8 {
     };
 
     if (b.debug.pg_config) {
-        std.debug.print("Running pg_config: {s}\n", .{argv});
+        std.debug.print("Running pg_config: {s} {s}\n", .{ argv[0], argv[1] });
     }
 
     var child = std.process.Child.init(&argv, allocator);
diff --git a/src/pgzx/c.zig b/src/pgzx/c.zig
deleted file mode 100644
index b47ae08..0000000
--- a/src/pgzx/c.zig
+++ /dev/null
@@ -1,202 +0,0 @@
-const std = @import("std");
-
-const includes = @cImport({
-    @cInclude("postgres.h");
-    @cInclude("postgres_ext.h");
-
-    @cInclude("fmgr.h");
-    @cInclude("miscadmin.h");
-    @cInclude("varatt.h");
-
-    @cInclude("access/reloptions.h");
-    @cInclude("access/tsmapi.h");
-    @cInclude("access/xact.h");
-
-    @cInclude("commands/event_trigger.h");
-
-    @cInclude("catalog/binary_upgrade.h");
-    @cInclude("catalog/catalog.h");
-    @cInclude("catalog/catversion.h");
-    @cInclude("catalog/dependency.h");
-    @cInclude("catalog/genbki.h");
-    @cInclude("catalog/heap.h");
-    @cInclude("catalog/index.h");
-    @cInclude("catalog/indexing.h");
-    @cInclude("catalog/namespace.h");
-    @cInclude("catalog/objectaccess.h");
-    @cInclude("catalog/objectaddress.h");
-    @cInclude("catalog/partition.h");
-    @cInclude("catalog/pg_aggregate.h");
-    @cInclude("catalog/pg_am.h");
-    @cInclude("catalog/pg_amop.h");
-    @cInclude("catalog/pg_amproc.h");
-    @cInclude("catalog/pg_attrdef.h");
-    @cInclude("catalog/pg_attribute.h");
-    @cInclude("catalog/pg_auth_members.h");
-    @cInclude("catalog/pg_authid.h");
-    @cInclude("catalog/pg_cast.h");
-    @cInclude("catalog/pg_class.h");
-    @cInclude("catalog/pg_collation.h");
-    @cInclude("catalog/pg_constraint.h");
-    @cInclude("catalog/pg_control.h");
-    @cInclude("catalog/pg_conversion.h");
-    @cInclude("catalog/pg_database.h");
-    @cInclude("catalog/pg_db_role_setting.h");
-    @cInclude("catalog/pg_default_acl.h");
-    @cInclude("catalog/pg_depend.h");
-    @cInclude("catalog/pg_description.h");
-    @cInclude("catalog/pg_enum.h");
-    @cInclude("catalog/pg_event_trigger.h");
-    @cInclude("catalog/pg_extension.h");
-    @cInclude("catalog/pg_foreign_data_wrapper.h");
-    @cInclude("catalog/pg_foreign_server.h");
-    @cInclude("catalog/pg_foreign_table.h");
-    @cInclude("catalog/pg_index.h");
-    @cInclude("catalog/pg_inherits.h");
-    @cInclude("catalog/pg_init_privs.h");
-    @cInclude("catalog/pg_language.h");
-    @cInclude("catalog/pg_largeobject.h");
-    @cInclude("catalog/pg_largeobject_metadata.h");
-    @cInclude("catalog/pg_namespace.h");
-    @cInclude("catalog/pg_opclass.h");
-    @cInclude("catalog/pg_operator.h");
-    @cInclude("catalog/pg_opfamily.h");
-    @cInclude("catalog/pg_parameter_acl.h");
-    @cInclude("catalog/pg_partitioned_table.h");
-    @cInclude("catalog/pg_policy.h");
-    @cInclude("catalog/pg_proc.h");
-    @cInclude("catalog/pg_publication.h");
-    @cInclude("catalog/pg_publication_namespace.h");
-    @cInclude("catalog/pg_publication_rel.h");
-    @cInclude("catalog/pg_range.h");
-    @cInclude("catalog/pg_replication_origin.h");
-    @cInclude("catalog/pg_rewrite.h");
-    @cInclude("catalog/pg_seclabel.h");
-    @cInclude("catalog/pg_sequence.h");
-    @cInclude("catalog/pg_shdepend.h");
-    @cInclude("catalog/pg_shdescription.h");
-    @cInclude("catalog/pg_shseclabel.h");
-    @cInclude("catalog/pg_statistic.h");
-    @cInclude("catalog/pg_statistic_ext.h");
-    @cInclude("catalog/pg_statistic_ext_data.h");
-    @cInclude("catalog/pg_subscription.h");
-    @cInclude("catalog/pg_subscription_rel.h");
-    @cInclude("catalog/pg_tablespace.h");
-    @cInclude("catalog/pg_transform.h");
-    @cInclude("catalog/pg_trigger.h");
-    @cInclude("catalog/pg_ts_config.h");
-    @cInclude("catalog/pg_ts_config_map.h");
-    @cInclude("catalog/pg_ts_dict.h");
-    @cInclude("catalog/pg_ts_parser.h");
-    @cInclude("catalog/pg_ts_template.h");
-    @cInclude("catalog/pg_type.h");
-    @cInclude("catalog/pg_user_mapping.h");
-    @cInclude("catalog/storage.h");
-    @cInclude("catalog/storage_xlog.h");
-    @cInclude("catalog/toasting.h");
-
-    @cInclude("commands/defrem.h");
-
-    @cInclude("foreign/foreign.h");
-    @cInclude("foreign/fdwapi.h");
-
-    @cInclude("executor/spi.h");
-    @cInclude("executor/executor.h");
-    @cInclude("windowapi.h");
-
-    @cInclude("lib/ilist.h");
-
-    @cInclude("nodes/bitmapset.h");
-    @cInclude("nodes/execnodes.h");
-    @cInclude("nodes/extensible.h");
-    @cInclude("nodes/lockoptions.h");
-    @cInclude("nodes/makefuncs.h");
-    @cInclude("nodes/memnodes.h");
-    @cInclude("nodes/miscnodes.h");
-    @cInclude("nodes/multibitmapset.h");
-    @cInclude("nodes/nodeFuncs.h");
-    @cInclude("nodes/nodes.h");
-    @cInclude("nodes/params.h");
-    @cInclude("nodes/parsenodes.h");
-    @cInclude("nodes/pathnodes.h");
-    @cInclude("nodes/pg_list.h");
-    @cInclude("nodes/plannodes.h");
-    @cInclude("nodes/primnodes.h");
-    @cInclude("nodes/print.h");
-    @cInclude("nodes/queryjumble.h");
-    @cInclude("nodes/readfuncs.h");
-    @cInclude("nodes/replnodes.h");
-    @cInclude("nodes/subscripting.h");
-    @cInclude("nodes/supportnodes.h");
-    @cInclude("nodes/tidbitmap.h");
-    @cInclude("nodes/value.h");
-
-    @cInclude("optimizer/appendinfo.h");
-    @cInclude("optimizer/clauses.h");
-    @cInclude("optimizer/cost.h");
-    @cInclude("optimizer/geqo.h");
-    @cInclude("optimizer/geqo_copy.h");
-    @cInclude("optimizer/geqo_gene.h");
-    @cInclude("optimizer/geqo_misc.h");
-    @cInclude("optimizer/geqo_mutation.h");
-    @cInclude("optimizer/geqo_pool.h");
-    @cInclude("optimizer/geqo_random.h");
-    @cInclude("optimizer/geqo_recombination.h");
-    @cInclude("optimizer/geqo_selection.h");
-    @cInclude("optimizer/inherit.h");
-    @cInclude("optimizer/joininfo.h");
-    @cInclude("optimizer/optimizer.h");
-    @cInclude("optimizer/orclauses.h");
-    @cInclude("optimizer/paramassign.h");
-    @cInclude("optimizer/pathnode.h");
-    @cInclude("optimizer/paths.h");
-    @cInclude("optimizer/placeholder.h");
-    @cInclude("optimizer/plancat.h");
-    @cInclude("optimizer/planmain.h");
-    @cInclude("optimizer/planner.h");
-    @cInclude("optimizer/prep.h");
-    @cInclude("optimizer/restrictinfo.h");
-    @cInclude("optimizer/subselect.h");
-    @cInclude("optimizer/tlist.h");
-
-    @cInclude("parser/parser.h");
-    @cInclude("parser/parse_utilcmd.h");
-
-    @cInclude("postmaster/bgworker.h");
-    @cInclude("postmaster/interrupt.h");
-    @cInclude("port.h");
-
-    @cInclude("commands/extension.h");
-
-    @cInclude("storage/ipc.h");
-    @cInclude("storage/proc.h");
-    @cInclude("storage/latch.h");
-
-    @cInclude("utils/builtins.h");
-    @cInclude("utils/datum.h");
-    @cInclude("utils/datetime.h");
-    @cInclude("utils/guc.h");
-    @cInclude("utils/guc_hooks.h");
-    @cInclude("utils/guc_tables.h");
-    @cInclude("utils/memutils.h");
-    @cInclude("utils/wait_event.h");
-    @cInclude("utils/jsonb.h");
-    @cInclude("utils/syscache.h");
-    @cInclude("utils/lsyscache.h");
-    @cInclude("utils/varlena.h");
-    @cInclude("utils/regproc.h");
-    @cInclude("utils/queryenvironment.h");
-
-    @cInclude("tcop/cmdtag.h");
-    @cInclude("tcop/dest.h");
-    @cInclude("tcop/pquery.h");
-    @cInclude("tcop/tcopprot.h");
-    @cInclude("tcop/utility.h");
-
-    // libpq support
-    @cInclude("libpq-fe.h");
-    @cInclude("libpq/libpq-be.h");
-    @cInclude("libpqsrv.h");
-});
-
-pub usingnamespace includes;
diff --git a/src/pgzx/c/include/headers.h b/src/pgzx/c/include/headers.h
new file mode 100644
index 0000000..d83f332
--- /dev/null
+++ b/src/pgzx/c/include/headers.h
@@ -0,0 +1,193 @@
+#include "postgres.h"
+#include "postgres_ext.h"
+
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "varatt.h"
+
+#include "access/reloptions.h"
+#include "access/tsmapi.h"
+#include "access/xact.h"
+
+#include "commands/event_trigger.h"
+
+#include "catalog/binary_upgrade.h"
+#include "catalog/catalog.h"
+#include "catalog/catversion.h"
+#include "catalog/dependency.h"
+#include "catalog/genbki.h"
+#include "catalog/heap.h"
+#include "catalog/index.h"
+#include "catalog/indexing.h"
+#include "catalog/namespace.h"
+#include "catalog/objectaccess.h"
+#include "catalog/objectaddress.h"
+#include "catalog/partition.h"
+#include "catalog/pg_aggregate.h"
+#include "catalog/pg_am.h"
+#include "catalog/pg_amop.h"
+#include "catalog/pg_amproc.h"
+#include "catalog/pg_attrdef.h"
+#include "catalog/pg_attribute.h"
+#include "catalog/pg_auth_members.h"
+#include "catalog/pg_authid.h"
+#include "catalog/pg_cast.h"
+#include "catalog/pg_class.h"
+#include "catalog/pg_collation.h"
+#include "catalog/pg_constraint.h"
+#include "catalog/pg_control.h"
+#include "catalog/pg_conversion.h"
+#include "catalog/pg_database.h"
+#include "catalog/pg_db_role_setting.h"
+#include "catalog/pg_default_acl.h"
+#include "catalog/pg_depend.h"
+#include "catalog/pg_description.h"
+#include "catalog/pg_enum.h"
+#include "catalog/pg_event_trigger.h"
+#include "catalog/pg_extension.h"
+#include "catalog/pg_foreign_data_wrapper.h"
+#include "catalog/pg_foreign_server.h"
+#include "catalog/pg_foreign_table.h"
+#include "catalog/pg_index.h"
+#include "catalog/pg_inherits.h"
+#include "catalog/pg_init_privs.h"
+#include "catalog/pg_language.h"
+#include "catalog/pg_largeobject.h"
+#include "catalog/pg_largeobject_metadata.h"
+#include "catalog/pg_namespace.h"
+#include "catalog/pg_opclass.h"
+#include "catalog/pg_operator.h"
+#include "catalog/pg_opfamily.h"
+#include "catalog/pg_parameter_acl.h"
+#include "catalog/pg_partitioned_table.h"
+#include "catalog/pg_policy.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_publication.h"
+#include "catalog/pg_publication_namespace.h"
+#include "catalog/pg_publication_rel.h"
+#include "catalog/pg_range.h"
+#include "catalog/pg_replication_origin.h"
+#include "catalog/pg_rewrite.h"
+#include "catalog/pg_seclabel.h"
+#include "catalog/pg_sequence.h"
+#include "catalog/pg_shdepend.h"
+#include "catalog/pg_shdescription.h"
+#include "catalog/pg_shseclabel.h"
+#include "catalog/pg_statistic.h"
+#include "catalog/pg_statistic_ext.h"
+#include "catalog/pg_statistic_ext_data.h"
+#include "catalog/pg_subscription.h"
+#include "catalog/pg_subscription_rel.h"
+#include "catalog/pg_tablespace.h"
+#include "catalog/pg_transform.h"
+#include "catalog/pg_trigger.h"
+#include "catalog/pg_ts_config.h"
+#include "catalog/pg_ts_config_map.h"
+#include "catalog/pg_ts_dict.h"
+#include "catalog/pg_ts_parser.h"
+#include "catalog/pg_ts_template.h"
+#include "catalog/pg_type.h"
+#include "catalog/pg_user_mapping.h"
+#include "catalog/storage.h"
+#include "catalog/storage_xlog.h"
+#include "catalog/toasting.h"
+
+#include "commands/defrem.h"
+
+#include "foreign/foreign.h"
+#include "foreign/fdwapi.h"
+
+#include "executor/spi.h"
+#include "executor/executor.h"
+#include "windowapi.h"
+
+#include "lib/ilist.h"
+
+#include "nodes/bitmapset.h"
+#include "nodes/execnodes.h"
+#include "nodes/extensible.h"
+#include "nodes/lockoptions.h"
+#include "nodes/makefuncs.h"
+#include "nodes/memnodes.h"
+#include "nodes/miscnodes.h"
+#include "nodes/multibitmapset.h"
+#include "nodes/nodeFuncs.h"
+#include "nodes/nodes.h"
+#include "nodes/params.h"
+#include "nodes/parsenodes.h"
+#include "nodes/pathnodes.h"
+#include "nodes/pg_list.h"
+#include "nodes/plannodes.h"
+#include "nodes/primnodes.h"
+#include "nodes/print.h"
+#include "nodes/queryjumble.h"
+#include "nodes/readfuncs.h"
+#include "nodes/replnodes.h"
+#include "nodes/subscripting.h"
+#include "nodes/supportnodes.h"
+#include "nodes/tidbitmap.h"
+#include "nodes/value.h"
+
+#include "optimizer/appendinfo.h"
+#include "optimizer/clauses.h"
+#include "optimizer/cost.h"
+#include "optimizer/geqo.h"
+#include "optimizer/geqo_copy.h"
+#include "optimizer/geqo_gene.h"
+#include "optimizer/geqo_misc.h"
+#include "optimizer/geqo_mutation.h"
+#include "optimizer/geqo_pool.h"
+#include "optimizer/geqo_random.h"
+#include "optimizer/geqo_recombination.h"
+#include "optimizer/geqo_selection.h"
+#include "optimizer/inherit.h"
+#include "optimizer/joininfo.h"
+#include "optimizer/optimizer.h"
+#include "optimizer/orclauses.h"
+#include "optimizer/paramassign.h"
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
+#include "optimizer/placeholder.h"
+#include "optimizer/plancat.h"
+#include "optimizer/planmain.h"
+#include "optimizer/planner.h"
+#include "optimizer/prep.h"
+#include "optimizer/restrictinfo.h"
+#include "optimizer/subselect.h"
+#include "optimizer/tlist.h"
+
+#include "parser/parser.h"
+#include "parser/parse_utilcmd.h"
+
+#include "postmaster/bgworker.h"
+#include "postmaster/interrupt.h"
+#include "port.h"
+
+#include "commands/extension.h"
+
+#include "storage/ipc.h"
+#include "storage/proc.h"
+#include "storage/latch.h"
+
+#include "utils/builtins.h"
+#include "utils/datum.h"
+#include "utils/datetime.h"
+#include "utils/guc.h"
+#include "utils/guc_hooks.h"
+#include "utils/guc_tables.h"
+#include "utils/hsearch.h"
+#include "utils/memutils.h"
+#include "utils/palloc.h"
+#include "utils/wait_event.h"
+#include "utils/jsonb.h"
+#include "utils/syscache.h"
+#include "utils/lsyscache.h"
+#include "utils/varlena.h"
+#include "utils/regproc.h"
+#include "utils/queryenvironment.h"
+
+#include "tcop/cmdtag.h"
+#include "tcop/dest.h"
+#include "tcop/pquery.h"
+#include "tcop/tcopprot.h"
+#include "tcop/utility.h"
diff --git a/src/pgzx/collections/dlist.zig b/src/pgzx/collections/dlist.zig
index 4bb1af6..18bba58 100644
--- a/src/pgzx/collections/dlist.zig
+++ b/src/pgzx/collections/dlist.zig
@@ -1,7 +1,7 @@
 //! Postgres intrusive double linked list support.
 
 const std = @import("std");
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 fn initNode() pg.dlist_node {
     return .{ .prev = null, .next = null };
diff --git a/src/pgzx/collections/htab.zig b/src/pgzx/collections/htab.zig
index d31e28d..8822b18 100644
--- a/src/pgzx/collections/htab.zig
+++ b/src/pgzx/collections/htab.zig
@@ -6,7 +6,7 @@
 
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const err = @import("../err.zig");
 const meta = @import("../meta.zig");
@@ -217,7 +217,7 @@ pub fn HTab(comptime Context: type) type {
 
         fn keyPtr(k: ConstKeyPtr) ?*anyopaque {
             if (meta.isSlice(Key)) {
-                return @constCast(@ptrCast(k.ptr));
+                return @ptrCast(@constCast(k.ptr));
             }
             return @constCast(k);
         }
@@ -402,7 +402,7 @@ pub inline fn KeyPtr(comptime K: type) type {
 
 inline fn keyPtr(comptime K: type, k: KeyPtr(K)) ?*anyopaque {
     if (meta.isSlice(K)) {
-        return @constCast(@ptrCast(k.ptr));
+        return @ptrCast(@constCast(k.ptr));
     }
     return @constCast(k);
 }
@@ -493,7 +493,7 @@ pub const TestSuite_HTab = struct {
 
     pub fn testGetOrPutEntryStringWithCustomCallbacks() !void {
         const callbacks = struct {
-            fn strcmp(a: ?*const anyopaque, b: ?*const anyopaque, sz: usize) callconv(.C) c_int {
+            fn strcmp(a: ?*const anyopaque, b: ?*const anyopaque, sz: usize) callconv(.c) c_int {
                 const char_ptr_a: [*c]const u8 = @ptrCast(a);
                 const char_ptr_b: [*c]const u8 = @ptrCast(b);
                 const str_a = std.mem.span(char_ptr_a);
@@ -505,7 +505,7 @@ pub const TestSuite_HTab = struct {
                 return pg.strncmp(str_a, str_b, sz);
             }
 
-            fn strcpy(to: ?*anyopaque, from: ?*const anyopaque, sz: usize) callconv(.C) ?*anyopaque {
+            fn strcpy(to: ?*anyopaque, from: ?*const anyopaque, sz: usize) callconv(.c) ?*anyopaque {
                 const char_ptr_to: [*c]u8 = @ptrCast(to);
                 const char_ptr_from: [*c]const u8 = @ptrCast(from);
 
diff --git a/src/pgzx/collections/list.zig b/src/pgzx/collections/list.zig
index fa67b43..dd23639 100644
--- a/src/pgzx/collections/list.zig
+++ b/src/pgzx/collections/list.zig
@@ -1,4 +1,4 @@
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 // Wrapper for postgres lists.
 //
diff --git a/src/pgzx/collections/slist.zig b/src/pgzx/collections/slist.zig
index fd42b35..fbdbf12 100644
--- a/src/pgzx/collections/slist.zig
+++ b/src/pgzx/collections/slist.zig
@@ -2,7 +2,7 @@
 
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 fn initNode() pg.slist_node {
     return .{ .next = null };
@@ -13,10 +13,22 @@ pub fn SList(comptime T: type, comptime node_field: std.meta.FieldEnum(T)) type
         const Self = @This();
         const Iterator = SListIter(T, node_field);
 
-        usingnamespace SListMeta(T, node_field);
+        const meta = SListMeta(T, node_field);
 
         head: pg.slist_head,
 
+        inline fn nodePtr(v: *T) *pg.slist_node {
+            return meta.nodePtr(v);
+        }
+
+        inline fn nodeParentPtr(n: *pg.slist_node) ?*T {
+            return meta.nodeParentPtr(n);
+        }
+
+        inline fn optNodeParentPtr(n: ?*pg.slist_node) ?*T {
+            return meta.optNodeParentPtr(n);
+        }
+
         pub inline fn init() Self {
             var h = Self{ .head = undefined };
             pg.slist_init(&h.head);
@@ -86,10 +98,14 @@ pub fn SList(comptime T: type, comptime node_field: std.meta.FieldEnum(T)) type
 pub fn SListIter(comptime T: type, comptime node_field: std.meta.FieldEnum(T)) type {
     return struct {
         const Self = @This();
-        usingnamespace SListMeta(T, node_field);
+        const meta = SListMeta(T, node_field);
 
         iter: pg.slist_iter,
 
+        inline fn nodeParentPtr(n: *pg.slist_node) ?*T {
+            return meta.nodeParentPtr(n);
+        }
+
         pub inline fn next(self: *Self) ?*T {
             if (self.iter.cur == null) return null;
             const node_ptr = self.iter.cur;
diff --git a/src/pgzx/datum.zig b/src/pgzx/datum.zig
index af7fb62..d0ec7ba 100644
--- a/src/pgzx/datum.zig
+++ b/src/pgzx/datum.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const err = @import("err.zig");
 const mem = @import("mem.zig");
diff --git a/src/pgzx/elog.zig b/src/pgzx/elog.zig
index 4ee563c..2503d5d 100644
--- a/src/pgzx/elog.zig
+++ b/src/pgzx/elog.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const err = @import("err.zig");
 const mem = @import("mem.zig");
@@ -162,7 +162,7 @@ pub const api = struct {
 
                 //@compileLog("FmtMessage:", fmt, self.args);
 
-                const msg = std.fmt.allocPrintZ(memctx.allocator(), fmt, self.args) catch unreachable();
+                const msg = std.fmt.allocPrintSentinel(memctx.allocator(), fmt, self.args, 0) catch unreachable();
                 _ = msgtype(msg.ptr);
             }
         };
@@ -271,7 +271,13 @@ pub const api = struct {
     }
 };
 
-pub usingnamespace api;
+// In Zig 0.15+, usingnamespace was removed with no direct replacement.
+// Code that previously used items from this module directly must now either:
+// 1. Access through the api namespace: `const elog_mod = @import("elog.zig"); elog_mod.api.ereport(...)`
+// 2. Create local aliases: `const ereport = @import("elog.zig").api.ereport;`
+//
+// For now, we don't re-export at module level to avoid ambiguous references.
+// If needed, individual files can create their own local aliases.
 
 /// Turn the zig error into a postgres error. The errror will be send to
 /// Postgres and logged using the error level.
@@ -337,10 +343,10 @@ pub fn logFn(
     // We nede a temporary buffer for writing. Postgres will copy the message, so we should
     // clean up the buffer ourselvesi.
     var buf = std.ArrayList(u8).initCapacity(mem.PGCurrentContextAllocator, prefix.len + format.len + 1) catch return;
-    defer buf.deinit();
-    buf.writer().print(prefix, .{}) catch return;
-    buf.writer().print(format, args) catch return;
-    buf.append(0) catch return;
+    defer buf.deinit(mem.PGCurrentContextAllocator);
+    buf.writer(mem.PGCurrentContextAllocator).print(prefix, .{}) catch return;
+    buf.writer(mem.PGCurrentContextAllocator).print(format, args) catch return;
+    buf.append(mem.PGCurrentContextAllocator, 0) catch return;
     _ = pg.errmsg("%s", buf.items[0 .. buf.items.len - 1 :0].ptr);
 
     const src = std.mem.zeroInit(SourceLocation, .{});
@@ -566,10 +572,11 @@ fn sendElogWithCause(src: SourceLocation, comptime level: c_int, cause: anyerror
 
     var memctx = mem.getErrorContextThrowOOM();
     var buf = std.ArrayList(u8).initCapacity(memctx.allocator(), fmt.len + err_name.len + 20) catch unreachable;
-    buf.writer().print(fmt, args) catch unreachable;
-    buf.writer().writeAll(": ") catch unreachable;
-    buf.writer().writeAll(err_name) catch unreachable;
-    buf.writer().writeByte(0) catch unreachable;
+    const allocator = memctx.allocator();
+    buf.writer(allocator).print(fmt, args) catch unreachable;
+    buf.writer(allocator).writeAll(": ") catch unreachable;
+    buf.writer(allocator).writeAll(err_name) catch unreachable;
+    buf.writer(allocator).writeByte(0) catch unreachable;
 
     _ = pg.errmsg("%s", buf.items[0 .. buf.items.len - 1 :0].ptr);
 
diff --git a/src/pgzx/err.zig b/src/pgzx/err.zig
index 002e1b3..add6f3c 100644
--- a/src/pgzx/err.zig
+++ b/src/pgzx/err.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const mem = @import("mem.zig");
 
@@ -43,7 +43,7 @@ pub const ElogIndicator = error{
 /// Do not use PG_RE_THROW directly. Use `pg_re_throw` instead to ensure
 /// that the PostgreSQL error handlers find the correct error state and
 /// memory context it would expect.
-pub fn pgRethrow() callconv(.C) void {
+pub fn pgRethrow() callconv(.c) void {
     // Postgres error handling does set the active memory context to the
     // ErrorContext when calling longjmp.
     // Because we did restore the memory context we want to make sure that we
diff --git a/src/pgzx/fdw.zig b/src/pgzx/fdw.zig
index 500c448..9abd377 100644
--- a/src/pgzx/fdw.zig
+++ b/src/pgzx/fdw.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const elog = @import("elog.zig");
 const mem = @import("mem.zig");
diff --git a/src/pgzx/fmgr.zig b/src/pgzx/fmgr.zig
index f62c3b6..35cb667 100644
--- a/src/pgzx/fmgr.zig
+++ b/src/pgzx/fmgr.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const elog = @import("elog.zig");
 const datum = @import("datum.zig");
@@ -45,11 +45,11 @@ pub inline fn PG_MODULE_MAGIC() void {
     @export(&Pg_magic_func, .{ .name = "Pg_magic_func" });
 }
 
-fn Pg_magic_func() callconv(.C) [*c]const Pg_magic_struct {
+fn Pg_magic_func() callconv(.c) [*c]const Pg_magic_struct {
     return &PG_MAGIC;
 }
 
-pub fn FunctionV1() callconv(.C) [*c]const Pg_finfo_record {
+pub fn FunctionV1() callconv(.c) [*c]const Pg_finfo_record {
     return &PG_FINFO_V1_RECORD;
 }
 
@@ -84,7 +84,7 @@ pub inline fn PG_EXPORT(comptime mod: type) void {
 inline fn genFnCall(comptime f: anytype) type {
     return struct {
         const function: @TypeOf(f) = f;
-        fn call(fcinfo: pg.FunctionCallInfo) callconv(.C) pg.Datum {
+        fn call(fcinfo: pg.FunctionCallInfo) callconv(.c) pg.Datum {
             return pgCall(@src(), function, fcinfo);
         }
     };
@@ -112,8 +112,8 @@ pub inline fn pgCall(
     }
 
     const value = switch (@typeInfo(meta.fnReturnType(fnType))) {
-        .error_union, .error_set => @call(.no_async, impl, callArgs) catch |e| elog.throwAsPostgresError(src, e),
-        else => @call(.no_async, impl, callArgs),
+        .error_union, .error_set => @call(.no_suspend, impl, callArgs) catch |e| elog.throwAsPostgresError(src, e),
+        else => @call(.no_suspend, impl, callArgs),
     };
 
     const result_conv = datum.findConv(@TypeOf(value));
diff --git a/src/pgzx/fmgr/args.zig b/src/pgzx/fmgr/args.zig
index 66ca96b..03179bb 100644
--- a/src/pgzx/fmgr/args.zig
+++ b/src/pgzx/fmgr/args.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const err = @import("../err.zig");
 const datum = @import("../datum.zig");
diff --git a/src/pgzx/interrupts.zig b/src/pgzx/interrupts.zig
index 6067e77..ca3e419 100644
--- a/src/pgzx/interrupts.zig
+++ b/src/pgzx/interrupts.zig
@@ -1,4 +1,4 @@
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const err = @import("err.zig");
 
diff --git a/src/pgzx/lwlock.zig b/src/pgzx/lwlock.zig
index 8715701..57f7849 100644
--- a/src/pgzx/lwlock.zig
+++ b/src/pgzx/lwlock.zig
@@ -4,7 +4,7 @@
 //! The global locks like `AddinShmemInitLock` are not directly accessible from
 //! the generated C bindings. We provide wrapper functions for them here.
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 // access `MainLWLockArray`.
 //
diff --git a/src/pgzx/mem.zig b/src/pgzx/mem.zig
index f3b275a..6fba71f 100644
--- a/src/pgzx/mem.zig
+++ b/src/pgzx/mem.zig
@@ -5,7 +5,7 @@
 
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 const meta = @import("meta.zig");
 const err = @import("err.zig");
 
@@ -253,7 +253,7 @@ pub const MemoryContextAllocator = struct {
             @compileError("data must be a pointer");
         }
         try self.registerAllocResetCallbackFn(@ptrCast(data), struct {
-            fn wrapper(data_ptr: ?*anyopaque) callconv(.C) void {
+            fn wrapper(data_ptr: ?*anyopaque) callconv(.c) void {
                 f(@ptrCast(@alignCast(data_ptr)));
             }
         }.wrapper);
diff --git a/src/pgzx/node.zig b/src/pgzx/node.zig
index 899761f..dda82e0 100644
--- a/src/pgzx/node.zig
+++ b/src/pgzx/node.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 const collections = @import("collections.zig");
 const meta = @import("meta.zig");
 
@@ -39,7 +39,7 @@ pub inline fn boolVal(node: anytype) bool {
 }
 
 pub inline fn make(comptime T: type) *T {
-    const node: *pg.Node = @ptrCast(@alignCast(pg.palloc0fast(@sizeOf(T))));
+    const node: *pg.Node = @ptrCast(@alignCast(pg.palloc0(@sizeOf(T))));
     node.*.type = @intFromEnum(mustFindTag(T));
     return @ptrCast(@alignCast(node));
 }
diff --git a/src/pgzx/pq.zig b/src/pgzx/pq.zig
index 38f0f0b..9cee1b2 100644
--- a/src/pgzx/pq.zig
+++ b/src/pgzx/pq.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const intr = @import("interrupts.zig");
 const elog = @import("elog.zig");
diff --git a/src/pgzx/pq/conv.zig b/src/pgzx/pq/conv.zig
index c2cc300..650a8f6 100644
--- a/src/pgzx/pq/conv.zig
+++ b/src/pgzx/pq/conv.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 const meta = @import("../meta.zig");
 
 pub const Error = error{
diff --git a/src/pgzx/pq/params.zig b/src/pgzx/pq/params.zig
index ad62b55..19e5cee 100644
--- a/src/pgzx/pq/params.zig
+++ b/src/pgzx/pq/params.zig
@@ -1,6 +1,6 @@
 // const std = @import("std");
 // const conv = @import("conv.zig");
-// const c = @import("pgzx_pgsys");
+// const c = @import("c_translated");
 //
 // pub fn buildParams(allocator: std.mem.Allocator, params: anytype) !Params {
 //     return Builder.new(allocator).build(params);
diff --git a/src/pgzx/shmem.zig b/src/pgzx/shmem.zig
index 4808acd..d0afaaf 100644
--- a/src/pgzx/shmem.zig
+++ b/src/pgzx/shmem.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 pub inline fn registerHooks(comptime T: anytype) void {
     if (std.meta.hasFn(T, "requestHook")) {
@@ -47,7 +47,7 @@ pub inline fn registerStartupHook(f: anytype) void {
 inline fn registerHook(f: anytype, hook: anytype) void {
     const ctx = struct {
         var prev_hook: @TypeOf(hook.*) = undefined;
-        fn hook_fn() callconv(.C) void {
+        fn hook_fn() callconv(.c) void {
             if (prev_hook) |prev| {
                 prev();
             }
diff --git a/src/pgzx/spi.zig b/src/pgzx/spi.zig
index daa0f1b..95c1bf6 100644
--- a/src/pgzx/spi.zig
+++ b/src/pgzx/spi.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 const meta = @import("meta.zig");
 const mem = @import("mem.zig");
diff --git a/src/pgzx/testing.zig b/src/pgzx/testing.zig
index dd7a1d3..639f154 100644
--- a/src/pgzx/testing.zig
+++ b/src/pgzx/testing.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-pub const pg = @import("pgzx_pgsys");
+pub const pg = @import("c_translated");
 
 pub const err = @import("err.zig");
 pub const elog = @import("elog.zig");
diff --git a/src/pgzx/utils/guc.zig b/src/pgzx/utils/guc.zig
index 35c54ea..24f7e8f 100644
--- a/src/pgzx/utils/guc.zig
+++ b/src/pgzx/utils/guc.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 pub const CustomBoolVariable = struct {
     value: bool,
diff --git a/src/pgzx/varatt.zig b/src/pgzx/varatt.zig
index 60ead17..acb2c93 100644
--- a/src/pgzx/varatt.zig
+++ b/src/pgzx/varatt.zig
@@ -1,7 +1,7 @@
 //! varatt replaces the VA<...> macros from utils/varattr.h that Zig didn't
 //! compile correctly.
 
-const pg = @import("pgzx_pgsys");
+const pg = @import("c_translated");
 
 // WARNING:
 // Taken from translated C code and mostly untested.
diff --git a/tools/gennodetags/main.zig b/tools/gennodetags/main.zig
index 35c9cc4..a6a19c1 100644
--- a/tools/gennodetags/main.zig
+++ b/tools/gennodetags/main.zig
@@ -40,20 +40,20 @@ pub fn main() !void {
     try out.writeAll(
         \\pub const std = @import("std");
         \\
-        \\pub const pg = @import("pgzx_pgsys");
+        \\pub const pg = @import("c_translated");
         \\
         \\
     );
 
     // 1. collect all node tags into `node_tags` list using comptime reflection.
     @setEvalBranchQuota(50000);
-    var node_tags = std.ArrayList([]const u8).init(arena);
-    defer node_tags.deinit();
+    var node_tags = std.ArrayList([]const u8){};
+    defer node_tags.deinit(arena);
     const pg_mod = @typeInfo(pg).@"struct";
     inline for (pg_mod.decls) |decl| {
         const name = decl.name;
         if (std.mem.startsWith(u8, name, "T_")) {
-            node_tags.append(decl.name) catch |err| {
+            node_tags.append(arena, decl.name) catch |err| {
                 fatal("build node tags list: {}\n", .{err});
             };
         }
@@ -63,7 +63,8 @@ pub fn main() !void {
     try out.writeAll("pub const Tag = enum (pg.NodeTag) {\n");
     for (node_tags.items) |tag| {
         const name = tag[2..];
-        try out.writer().print("{s} = pg.{s},\n", .{ name, tag });
+        const line = try std.fmt.allocPrint(arena, "{s} = pg.{s},\n", .{ name, tag });
+        try out.writeAll(line);
     }
     try out.writeAll("};\n\n");
 
@@ -75,7 +76,8 @@ pub fn main() !void {
 
         const typeName = tag[2..];
         try out.writeAll(".{");
-        try out.writer().print("pg.{s}, pg.{s}", .{ tag, typeName });
+        const line = try std.fmt.allocPrint(arena, "pg.{s}, pg.{s}", .{ tag, typeName });
+        try out.writeAll(line);
         try out.writeAll("},\n");
     }
     try out.writeAll("};\n");