diff --git a/docs/ExtensibleContextProposal-ColdPrompt.md b/docs/ExtensibleContextProposal-ColdPrompt.md
new file mode 100644
index 0000000000..707d2248c2
--- /dev/null
+++ b/docs/ExtensibleContextProposal-ColdPrompt.md
@@ -0,0 +1,76 @@
+# Cold Prompt: Extensible Context Hash Maintenance
+
+Use this prompt in a new Copilot session to extend the existing size-tolerant context hash implementation.
+
+Before editing code, read these files first:
+- docs/ExtensibleContextProposal.md for the design intent and compatibility rules.
+- docs/ExtensibleContextRunbook.md for the implementation pattern, validation flow, and extension notes.
+
+---
+
+## Prompt
+
+```
+I need to extend the existing "Size-Tolerant Context Hash" implementation described in docs/ExtensibleContextProposal.md.
+Read docs/ExtensibleContextProposal.md and docs/ExtensibleContextRunbook.md first.
+
+Current implementation state:
+
+- bpf2c hashes the context descriptor shape fields only, not the full ebpf_ctx_descriptor_t.
+- bpf2c records the compile-time context size in the generated native metadata.
+- ebpfcore supports both the legacy hash mode and the extensible hash mode.
+- Runtime loading still rejects programs if the compile-time context size exceeds the runtime context size.
+
+When extending this feature, keep the hash inputs identical in tools/bpf2c/bpf2c.cpp and libs/execution_context/ebpf_program.c, update the generated metadata plumbing, and refresh the expected bpf2c outputs whenever codegen changes.
+
+Summary of extension work that may be needed:
+
+## 1. bpf2c hash computation — tools/bpf2c/bpf2c.cpp
+
+Keep get_program_info_type_hash() aligned with ebpfcore by hashing only the three offset fields (data, end, meta), not the full ebpf_ctx_descriptor_t.
+
+## 2. Hash mode constant — tools/bpf2c/bpf_code_generator.h
+
+If a hash-mode constant or version gate is used, keep it synchronized between the generator and loader paths.
+
+## 3. program_entry_t struct — include/bpf2c.h
+
+Keep the size_t bpf2c_context_size field at the end of program_entry_t. This is compatibility metadata that records sizeof(context_struct) at bpf2c compile time.
+
+## 4. bpf2c code emission — tools/bpf2c/bpf_code_generator.cpp
+
+Emit the bpf2c_context_size value in the generated program_entry_t initialization from program_info->program_type_descriptor->context_descriptor->size.
+
+## 5. Program parameters — libs/execution_context/ebpf_program.h
+
+Keep size_t bpf2c_context_size in ebpf_program_parameters_t so the loader can distinguish legacy and extensible-context modules.
+
+## 6. Native loading — libs/execution_context/ebpf_native.c
+
+In _ebpf_native_load_programs(), copy bpf2c_context_size from the program_entry_t into the program parameters.
+
+## 7. Hash computation in ebpfcore — libs/execution_context/ebpf_program.c
+
+In _ebpf_program_compute_program_information_hash():
+- Keep the hash-mode decision in sync with the metadata coming from the native module.
+- For the extensible-context path: hash only data/end/meta, not the full context_descriptor.
+- For the legacy path: hash the full context_descriptor as before.
+
+In ebpf_program_set_program_info_hash():
+- Determine the hash mode from program->parameters.program_info_hash_type and the presence of bpf2c_context_size.
+- After hash comparison succeeds for the extensible-context path, verify:
+  program->parameters.bpf2c_context_size <= runtime_context_descriptor->size
+- If compile-time size is greater than runtime size, fail with EBPF_INVALID_ARGUMENT.
+
+Also update _ebpf_program_type_specific_program_information_attach_provider() with the same hash-mode and size-check logic.
+
+## Key requirements:
+- Old programs must continue to work via the legacy code path.
+- Both bpf2c and ebpfcore must produce identical hashes for the same inputs.
+- All existing tests must continue to pass.
+- Add test cases for same-version load, forward-compatible extension load, shrunk context rejection, and backward compatibility with the old hash.
+
+## 8. Required Follow-Up for Generated Output Changes
+
+If the change affects bpf2c output formatting or emitted metadata, update the expected files under tests/bpf2c_tests/expected/ and rerun the relevant generator tests. The second commit in this branch is the example to follow.
+```
diff --git a/docs/ExtensibleContextProposal.md b/docs/ExtensibleContextProposal.md
new file mode 100644
index 0000000000..52e785eef1
--- /dev/null
+++ b/docs/ExtensibleContextProposal.md
@@ -0,0 +1,303 @@
+# Extensible Context for Native eBPF Programs
+
+**Status:** Proposal  
+**Date:** 2026-06-12  
+**Goal:** Allow extensions to append new fields to program context structs without breaking previously compiled native eBPF programs.
+
+---
+
+## 1. Problem Statement
+
+The current design for native modules does not allow extending the context for a program type (i.e., adding new fields at the end of the context struct). This is because:
+
+1. **bpf2c** computes a SHA-256 hash of the program info (including the full `ebpf_ctx_descriptor_t`) and embeds it in the native driver.
+2. **ebpfcore** recomputes the hash at load time using the live extension's program info and rejects the program if the hashes don't match.
+3. The `ebpf_ctx_descriptor_t.size` field reflects `sizeof(context_struct)`, so appending a field changes the size, changes the hash, and breaks loading.
+
+This differs from Linux, where a new field can be added at the end of a context struct and older programs continue to work on newer kernels.
+
+**Goal:** Achieve the same for Windows — if an extension adds a new field at the end of the context, a native BPF program verified against an older version of the extension should still load.
+
+---
+
+## 2. Current System Analysis
+
+### 2.1 The Context Descriptor
+
+Defined in `external/ebpf-verifier/src/spec/ebpf_base.h`:
+
+```c
+typedef struct _ebpf_context_descriptor {
+    int size; // Size of ctx struct.
+    int data; // Offset into ctx struct of pointer to data.
+    int end;  // Offset into ctx struct of pointer to end of data.
+    int meta; // Offset into ctx struct of pointer to metadata.
+} ebpf_context_descriptor_t;
+```
+
+Each program type defines one of these. For example, the BIND program type in `netebpfext/net_ebpf_ext_program_info.h`:
+
+```c
+static const ebpf_ctx_descriptor_t _ebpf_bind_context_descriptor = {
+    sizeof(bind_md_t),
+    EBPF_OFFSET_OF(bind_md_t, app_id_start),
+    EBPF_OFFSET_OF(bind_md_t, app_id_end),
+    -1};
+```
+
+### 2.2 Data Flow: Extension → ebpfcore
+
+The context descriptor is embedded in a chain of structs:
+
+```
+ebpf_ctx_descriptor_t
+    ↑ (pointer)
+ebpf_program_type_descriptor_t   (.context_descriptor)
+    ↑ (pointer)
+ebpf_program_info_t              (.program_type_descriptor)
+    ↑ (pointer)
+ebpf_program_data_t              (.program_info)
+    │
+    └── Passed via NMR (NpiSpecificCharacteristics) ──→ ebpfcore
+```
+
+Extensions register via `NmrRegisterProvider()` with `EBPF_PROGRAM_INFO_EXTENSION_IID`. ebpfcore registers as an NMR client and receives the `ebpf_program_data_t` in its attach callback (`_ebpf_program_type_specific_program_information_attach_provider`).
+
+### 2.3 How bpf2c Computes the Hash
+
+`get_program_info_type_hash()` in `tools/bpf2c/bpf2c.cpp` computes a **SHA-256** over the following fields, in order:
+
+1. Program type name (string, e.g., `"bind"`)
+2. **`ebpf_ctx_descriptor_t`** — the entire 16-byte struct (size, data, end, meta)
+3. Program type GUID
+4. `bpf_prog_type` enum value
+5. `is_privileged` flag
+6. Count of helpers actually called by the program
+7. Per-helper (sorted by helper ID): id, name, return type, 5 argument types, optional flags
+
+The context descriptor is hashed as raw bytes:
+```cpp
+hash_t::append_byte_range(byte_range, *program_info->program_type_descriptor->context_descriptor);
+```
+
+The resulting hash is embedded in the native driver as a `static const uint8_t[]` array inside a `program_entry_t` struct in the `"programs"` PE section.
+
+### 2.4 How ebpfcore Compares the Hash
+
+At load time, `ebpf_program_set_program_info_hash()` in `libs/execution_context/ebpf_program.c` recomputes the hash using `_ebpf_program_compute_program_information_hash()` with the **live** `ebpf_program_data_t` from the extension. It then does:
+
+```c
+if ((program->parameters.program_info_hash_length != hash_length) ||
+    (memcmp(program->parameters.program_info_hash, hash, hash_length) != 0)) {
+    result = EBPF_INVALID_ARGUMENT;  // REJECT
+}
+```
+
+This is also re-checked on extension re-attach in `_ebpf_program_type_specific_program_information_attach_provider()`.
+
+### 2.5 How Context Access Works at Runtime
+
+Native programs use **hardcoded offsets from compile time**. bpf2c emits direct memory reads:
+
+```c
+READ_ONCE_64(r0, r1, OFFSET(0));  // ctx->data at offset 0
+```
+
+There is no indirection. The `ebpf_ctx_descriptor_t` is used by the PREVAIL verifier for bounds-checking during offline verification, not at execution time. This means **as long as existing field offsets don't change, old programs are safe at runtime**.
+
+### 2.6 Why Appending Fields Breaks Loading
+
+```
+Extension v1: bind_md_t = { app_id_start, app_id_end, protocol, ... }
+              context_descriptor = { .size = 48, .data = 0, .end = 8, .meta = -1 }
+              → hash: 0xABCD...
+
+Extension v2: bind_md_t = { app_id_start, app_id_end, protocol, ..., new_field }
+              context_descriptor = { .size = 56, .data = 0, .end = 8, .meta = -1 }
+              → hash: 0x1234...  ← DIFFERENT (only .size changed)
+
+Native program compiled against v1 → hash 0xABCD → REJECTED on v2
+```
+
+The program never accesses `new_field` and all existing fields are at the same offsets, but the hash changes because `context_descriptor.size` changed.
+
+---
+
+## 3. Review of Existing Proposal (extensible_context.md)
+
+The existing `docs/extensible_context.md` proposes a full CO-RE (Compile Once – Run Everywhere) relocation system:
+
+- bpf2c emits offset variables in a `.ebpf_reloc` PE section
+- Extensions expose a `GetFieldOffset(struct_name, field_name)` callback
+- ebpfcore patches offsets at load time and freezes the section as read-only
+
+**Assessment:** This is over-engineered for the stated requirement.
+
+| Concern | Details |
+|---------|---------|
+| **Scope** | Redesigns the entire context access model |
+| **Breaking change** | New bpf2c output format; all native programs must be recompiled |
+| **Extension changes** | Every extension must implement a string-based field lookup callback |
+| **Verification changes** | PREVAIL needs to understand sentinel offsets |
+| **Unnecessary capability** | Supports field reordering, which isn't needed — Linux doesn't do this either |
+
+---
+
+## 4. Proposed Design: Size-Tolerant Context Hash
+
+### 4.1 Core Insight
+
+When a field is appended to the end of a context struct:
+- `context_descriptor.size` increases
+- `data`, `end`, and `meta` offsets **don't change**
+- All existing field offsets **don't change**
+
+A program verified against context size `N` that only accesses offsets `[0, N)` is safe on a context of size `M >= N`. We can solve this by:
+
+1. **Excluding `context_descriptor.size` from the hash** — hash the shape (data/end/meta offsets) but not the total size.
+2. **Storing the compile-time context size alongside the hash** — so ebpfcore can verify `runtime_size >= compile_time_size`.
+
+### 4.2 Detailed Changes
+
+#### Change 1: Modify Hash Computation to Exclude `context_descriptor.size`
+
+**In bpf2c** (`tools/bpf2c/bpf2c.cpp`, `get_program_info_type_hash()`):
+
+```cpp
+// BEFORE
+hash_t::append_byte_range(byte_range, *program_info->program_type_descriptor->context_descriptor);
+
+// AFTER
+hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->context_descriptor->data);
+hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->context_descriptor->end);
+hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->context_descriptor->meta);
+```
+
+**In ebpfcore** (`libs/execution_context/ebpf_program.c`, `_ebpf_program_compute_program_information_hash()`):
+
+```c
+// BEFORE
+EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(hash, *context_descriptor);
+
+// AFTER
+EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(hash, context_descriptor->data);
+EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(hash, context_descriptor->end);
+EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(hash, context_descriptor->meta);
+```
+
+This must be done **identically** in both places.
+
+#### Change 2: Embed Compile-Time Context Size in Native Module
+
+Add a new field to `program_entry_t` in `include/bpf2c.h`:
+
+```c
+typedef struct _program_entry {
+    // ... existing fields ...
+    const uint8_t* program_info_hash;
+    size_t program_info_hash_length;
+    const char* program_info_hash_type;
+    size_t bpf2c_context_size;   // NEW: sizeof(context_struct) at bpf2c compile time
+} program_entry_t;
+```
+
+bpf2c emits this value from the context descriptor it sees at compile time.
+
+#### Change 3: Context Size Check in ebpfcore at Load Time
+
+After the hash matches, verify the context size is compatible:
+
+```c
+size_t runtime_context_size =
+    extension_program_data->program_info->program_type_descriptor->context_descriptor->size;
+size_t compile_time_context_size = program->parameters.bpf2c_context_size;
+
+if (compile_time_context_size > runtime_context_size) {
+    // Program was compiled against a LARGER context than available.
+    // Unsafe — program could access fields that don't exist.
+    result = EBPF_INVALID_ARGUMENT;
+    goto Exit;
+}
+// compile_time_context_size <= runtime_context_size → SAFE
+```
+
+#### Change 4: Hash Algorithm Version Bump for Backward Compatibility
+
+Bump the hash algorithm identifier to distinguish old vs. new hashing:
+
+```c
+#define EBPF_HASH_ALGORITHM "SHA256v2"  // was "SHA256"
+```
+
+ebpfcore supports both:
+
+```c
+if (hash_type == "SHA256") {
+    // Legacy path: compute hash the old way (including context_descriptor.size)
+    // Exact match required — existing behavior, no regression.
+} else if (hash_type == "SHA256v2") {
+    // New path: compute hash excluding context_descriptor.size
+    // + verify compile_time_context_size <= runtime_context_size
+}
+```
+
+### 4.3 Files Changed
+
+| File | Change |
+|------|--------|
+| `include/bpf2c.h` | Add `bpf2c_context_size` field to `program_entry_t` |
+| `tools/bpf2c/bpf2c.cpp` | Hash only data/end/meta offsets; use `SHA256v2` |
+| `tools/bpf2c/bpf_code_generator.cpp` | Emit `bpf2c_context_size` value in generated code |
+| `tools/bpf2c/bpf_code_generator.h` | Update `EBPF_HASH_ALGORITHM` constant |
+| `libs/execution_context/ebpf_program.c` | Support both hash modes; add context size check |
+| `libs/execution_context/ebpf_native.c` | Pass `bpf2c_context_size` through parameters |
+| `libs/execution_context/ebpf_program.h` | Add `bpf2c_context_size` to `ebpf_program_parameters_t` |
+
+### 4.4 Compatibility Matrix
+
+| Program compiled with | Running on old ebpfcore | Running on new ebpfcore |
+|---|---|---|
+| **Old bpf2c** (`SHA256`) | Works (unchanged) | Works (legacy path) |
+| **New bpf2c** (`SHA256v2`) | Fails (unknown hash algo) | Works (new path) |
+| **New bpf2c**, newer extension (appended fields) | N/A | Works (size-tolerant) |
+
+The only incompatible case (new bpf2c on old ebpfcore) is expected — a new kernel is needed to support the new feature. Critically, **old native programs continue to work without recompilation**.
+
+### 4.5 Comparison With CO-RE Proposal
+
+| Aspect | Size-Tolerant Hash (this proposal) | CO-RE Relocation (extensible_context.md) |
+|--------|-----------------------------------|----------------------------------------|
+| **Lines changed** | ~200 | ~2000+ across codegen, NMR, loader |
+| **Breaking changes** | None (version-gated) | Yes (new bpf2c output format) |
+| **Runtime overhead** | Zero (one comparison at load) | Zero (after one-time relocation) |
+| **Extension changes** | None | New `GetFieldOffset` callback per extension |
+| **Verification changes** | None | Mock allocation / sentinel offset support |
+| **Covers append-at-end** | Yes | Yes |
+| **Covers field reordering** | No (not needed) | Yes (overkill) |
+
+---
+
+## 5. Constraints & Limitations
+
+1. **Append-only** — Fields can only be added at the end of the context struct. Reordering or removing fields still breaks the hash (data/end/meta offsets would change).
+2. **data/end/meta offsets are immutable** — If an extension needs to move these pointer fields, it's a breaking change regardless.
+3. **Old programs cannot access new fields** — An older program won't know about new fields. This matches Linux behavior.
+
+---
+
+## 6. Security Considerations
+
+- The verifier proved the program only accesses `[0, compile_time_size)`. The runtime context is `>= compile_time_size`. No out-of-bounds access is possible.
+- The hash still covers all structural aspects (offsets, helpers, types) — only the total size is decoupled.
+- The hash algorithm version prevents downgrade attacks (old ebpfcore won't accept new-format programs and vice versa).
+
+---
+
+## 7. Test Plan
+
+1. **Backward compatibility:** Compile a native program with old bpf2c (`SHA256`), load on new ebpfcore → must succeed.
+2. **Same-version:** Compile with new bpf2c (`SHA256v2`), load on matching extension version → must succeed.
+3. **Forward-compatible extension:** Compile with new bpf2c against extension v1, load on extension v2 (appended fields) → must succeed.
+4. **Shrunk context rejection:** Compile against extension v2, load on extension v1 (smaller context) → must fail.
+5. **Modified offsets rejection:** Change data/end/meta offsets between compile and load → must fail.
+6. **Helper changes rejection:** Change helper signatures between compile and load → must fail.
diff --git a/docs/ExtensibleContextRunbook.md b/docs/ExtensibleContextRunbook.md
new file mode 100644
index 0000000000..05a053c66c
--- /dev/null
+++ b/docs/ExtensibleContextRunbook.md
@@ -0,0 +1,98 @@
+# Extensible Context Runbook
+
+**Purpose:** Capture the implementation pattern behind the size-tolerant context hash change so future work can extend it safely without re-deriving the entire design.
+
+**Branch history anchor:**
+- `b3206ed4f8a19dac1c983a541452cbd441d9b13d` introduced the size-tolerant hash path and the `bpf2c_context_size` plumbing.
+- `2c0f14ea83ff73edf666f1903b1efa84c6d70329` refreshed the bpf2c expected outputs after the generator changed.
+
+---
+
+## 1. What Changed
+
+The implementation decouples native program compatibility from the full `ebpf_ctx_descriptor_t` size while keeping the existing safety model intact.
+
+The practical result is:
+- The hash now treats the context descriptor as shape data, not a strict `sizeof(...)` match.
+- `bpf2c` records the compile-time context size in generated native metadata.
+- `ebpfcore` accepts the legacy hash path and the extensible hash path side by side.
+- Runtime loading still rejects programs if the compile-time context was larger than the live context.
+
+---
+
+## 2. Files To Touch When Extending This Feature
+
+Use these as the primary surfaces for future changes:
+
+- `tools/bpf2c/bpf2c.cpp` for hash input changes.
+- `tools/bpf2c/bpf_code_generator.cpp` and `tools/bpf2c/bpf_code_generator.h` for generated metadata and constants.
+- `include/bpf2c.h` for native program entry versioning and layout.
+- `libs/execution_context/ebpf_program.h` and `libs/execution_context/ebpf_native.c` for loader parameter plumbing.
+- `libs/execution_context/ebpf_program.c` for hash computation and runtime compatibility checks.
+- `libs/shared/shared_common.c` for supported native program entry sizes.
+- `tests/bpf2c_tests/expected/*.c` for regenerated output baselines.
+
+If a future change touches the hash shape, update both sides of the comparison path together:
+- bpf2c emission
+- ebpfcore verification
+
+If they diverge, the branch will load programs inconsistently.
+
+---
+
+## 3. Change Pattern
+
+When extending the compatibility model, follow this order:
+
+1. Change the data model first.
+   Add or extend the metadata in the generated native program entry and the runtime loader parameters before changing hash behavior.
+
+2. Update the hash inputs in both places.
+   Keep `tools/bpf2c/bpf2c.cpp` and `libs/execution_context/ebpf_program.c` aligned. Any field included or excluded from the hash must match exactly.
+
+3. Preserve legacy compatibility.
+   Keep the old hash mode working for existing native modules. New behavior should be version-gated or inferred from metadata presence, not a silent replacement.
+
+4. Add the runtime safety gate.
+   The loader must continue checking that the compile-time context size does not exceed the live runtime context size.
+
+5. Regenerate bpf2c expected files.
+   The second commit in this branch shows the normal follow-up: generator output changes usually require updating `tests/bpf2c_tests/expected/*`.
+
+6. Rebuild and rerun the focused tests.
+   Verify both code generation and load-time compatibility paths.
+
+---
+
+## 4. Invariants To Preserve
+
+These are the rules that should not change unless the whole feature is being redesigned:
+
+- Older native programs must continue to load on a new runtime.
+- A program compiled against a larger context must still be rejected on a smaller runtime context.
+- Hash inputs in `bpf2c` and `ebpfcore` must stay identical for the same compatibility mode.
+- The context-size check must happen after hash verification and before the program is accepted.
+- The generated native metadata must remain backward-compatible with older loaders through the program entry versioning path.
+
+---
+
+## 5. Validation Checklist
+
+Use a narrow validation loop after any extension:
+
+1. Build the affected bpf2c and execution-context targets.
+2. Run the bpf2c expected-output tests for any changed sample.
+3. Run the native loading or unit tests that cover program info hash handling.
+4. Confirm the legacy hash path still accepts old modules.
+5. Confirm the extensible path rejects a smaller runtime context.
+
+If the change only affects code generation, regenerate the expected files before rerunning tests.
+
+---
+
+## 6. Practical Notes
+
+- The feature is append-only at the context level; field reordering is still a breaking change.
+- `bpf2c_context_size` is compatibility metadata, not runtime access data.
+- The second commit in this branch is mostly baseline churn, so future changes that alter generated output should expect the same kind of expected-file refresh.
+- Keep documentation and the cold prompt in sync with the implementation pattern so future sessions do not reintroduce the old full-struct hash behavior.
diff --git a/docs/extensible_context.md b/docs/extensible_context.md
new file mode 100644
index 0000000000..02827bcac3
--- /dev/null
+++ b/docs/extensible_context.md
@@ -0,0 +1,354 @@
+Markdown
+
+\# Architectural Design Specification: Zero-Overhead Context Relocation (Windows CO-RE) for ebpf-for-windows
+
+
+
+This document defines the architectural specification to implement a \*\*Compile Once – Run Everywhere (CO-RE)\*\* relocation mechanism for `ebpf-for-windows`. This design eliminates the rigid cryptographic context-hash validation blocking backward compatibility, enabling eBPF programs to remain compatible across different OS versions without sacrificing runtime performance or violating the offline verification model.
+
+
+
+\---
+
+
+
+\## 1. Executive Summary \& Problem Statement
+
+
+
+In the current `ebpf-for-windows` architecture, the `bpf2c` tool translates eBPF bytecode into native C code, which is then compiled into a standard Windows driver (`.sys` binary). During this translation, context structure offsets (e.g., `struct bpf\_sock\_ops`) are hardcoded into the instruction stream as explicit pointer-arithmetic constants based on compilation-time headers.
+
+
+
+To ensure type and memory safety, `bpf2c` embeds a cryptographic hash of the verification-time context structure layout into the binary. When the driver attempts to load, `ebpfcore` validates this hash against the hosting extension's layout hash via the Network Module Registrar (NMR) interface. If any field is appended or shifted in a newer OS version, the hashes mismatch, and the driver fails to load.
+
+
+
+\### Target Constraints
+
+\* \*\*Zero Runtime Performance Overhead:\*\* Context accesses must not introduce dynamic lookups, hash-map queries, or pointer-indirection overhead during hot-path execution (e.g., networking packet processing).
+
+\* \*\*Preservation of Offline Verification:\*\* The pipeline must still mathematically prove memory isolation and safety using the PREVAIL verifier during the offline build phase, where no live Windows kernel or extensions are present.
+
+
+
+\---
+
+
+
+\## 2. Solution Architecture: Context Access Virtualization
+
+
+
+The proposed design shifts context layout resolution from \*\*Compile-Time Hardcoding\*\* to \*\*Load-Time Relocation Patching\*\*. Instead of hardcoding offsets, `bpf2c` emits relocatable global variables located in a dedicated, page-aligned memory section. These variables are patched exactly \*once\* by the eBPF kernel framework during the driver initialization phase and subsequently frozen as read-only.
+
+
+
+The process is split cleanly across two execution timelines:
+
+1\. \*\*Build Time (Offline):\*\* Proves memory boundaries against an abstract baseline context structure layout.
+
+2\. \*\*Run Time (Kernel Load):\*\* Intercepts the loading driver, queries the active environment's NMR extension for true offsets, patches the variables, and locks the memory section.
+
+
+
+\---
+
+
+
+\## 3. Detailed Component Specifications
+
+
+
+\### Phase A: `bpf2c` Code Generation Changes
+
+
+
+`bpf2c` must be updated to replace explicit pointer offsets with descriptive, external relocation variables. These variables must reside within a dedicated memory section (`.ebpf\_reloc`).
+
+
+
+\#### 1. Generated Dynamic Context Reference
+
+Instead of emitting:
+
+```c
+
+// Legacy Code Generation
+
+uint32\_t port = \*(uint32\_t\*)((char\*)ctx + 24);
+
+bpf2c must generate:
+
+
+
+C
+
+\#include <ntddk.h>
+
+
+
+// Declare the relocation variable within a dedicated tracking section
+
+\#pragma section(".ebpf\_reloc", read, write)
+
+\_\_declspec(allocate(".ebpf\_reloc")) \_\_declspec(selectany) 
+
+ULONG32\_OFF\_struct\_bpf\_sock\_ops\_remote\_port = 0xFFFFFFFF; // Sentinel default
+
+
+
+void bpf\_program\_entry(void\* ctx) {
+
+&#x20;   // Zero-overhead dynamic offset evaluation
+
+&#x20;   ULONG32 offset = ULONG32\_OFF\_struct\_bpf\_sock\_ops\_remote\_port;
+
+&#x20;   uint32\_t port = \*(uint32\_t\*)((char\*)ctx + offset);
+
+&#x20;   // ... rest of program logic
+
+}
+
+2\. Relocation Metadata Table
+
+bpf2c must append an exported structure array at the end of the generated C source code. This acts as the manifest allowing the kernel loader to discover and map the placeholder variables.
+
+
+
+C
+
+typedef struct \_EBPF\_CONTEXT\_RELOCATION\_ENTRY {
+
+&#x20;   const char\* struct\_name;
+
+&#x20;   const char\* field\_name;
+
+&#x20;   ULONG32\* offset\_variable\_ptr;
+
+&#x20;   ULONG32     fallback\_offset;      // Derived from build-time headers
+
+&#x20;   ULONG32     field\_size;           // Size of the data type being read
+
+} EBPF\_CONTEXT\_RELOCATION\_ENTRY;
+
+
+
+\_\_declspec(allocate(".ebpf\_reloc"))
+
+EBPF\_CONTEXT\_RELOCATION\_ENTRY ContextRelocationTable\[] = {
+
+&#x20;   { "bpf\_sock\_ops", "remote\_port", \&ULONG32\_OFF\_struct\_bpf\_sock\_ops\_remote\_port, 24, sizeof(uint32\_t) },
+
+&#x20;   { NULL, NULL, NULL, 0, 0 } // Null terminator
+
+};
+
+Phase B: Offline Verification Modification
+
+Because the PREVAIL verifier executes completely offline without access to a running Windows environment or active extensions, it cannot resolve variables initialized to a sentinel value (0xFFFFFFFF).
+
+
+
+The Isolation Strategy
+
+Mock Allocation: Before invoking the PREVAIL verifier library, bpf2c mocks the relocation variables in its internal state, assigning them their local compilation-time fallback\_offset values.
+
+
+
+Boundary Assertions: PREVAIL runs its mathematical validation under the assumption that the context structure matches this local definition.
+
+
+
+The Validation Constraint: PREVAIL enforces that all memory reads must reside inside the total allocated size boundary of the compilation-time structure (e.g., sizeof(struct bpf\_sock\_ops) as defined in the local headers). If a program attempts to access an offset past this boundary, the verifier rejects the binary offline.
+
+
+
+Phase C: NMR Interface Modifications
+
+To pass dynamic offset layouts instead of a rigid cryptographic layout hash, the Network Module Registrar (NMR) contract between ebpfcore (the registrar) and the context-specific extensions (the providers) must be expanded.
+
+
+
+1\. Provider Characteristics Update
+
+Modify the core registration contract passed during NmrRegisterProvider to expose an offset-resolution callback:
+
+
+
+C
+
+typedef struct \_EBPF\_PROGRAM\_PROVIDER\_CHARACTERISTICS\_V2 {
+
+&#x20;   GUID ProgramType;
+
+&#x20;   size\_t ContextSize;
+
+&#x20;   
+
+&#x20;   // Schema Resolution Callback
+
+&#x20;   NTSTATUS (\*GetFieldOffset)(
+
+&#x20;       \_In\_ const char\* struct\_name,
+
+&#x20;       \_In\_ const char\* field\_name,
+
+&#x20;       \_Out\_ ULONG32\* resolved\_offset
+
+&#x20;   );
+
+} EBPF\_PROGRAM\_PROVIDER\_CHARACTERISTICS\_V2;
+
+2\. Extension Side Implementation (e.g., Network Extension Driver)
+
+The extension utilizes standard compile-time offsetof() calls matching its target OS environment to answer queries dynamically:
+
+
+
+C
+
+NTSTATUS Extension\_GetFieldOffset(
+
+&#x20;   \_In\_ const char\* struct\_name,
+
+&#x20;   \_In\_ const char\* field\_name,
+
+&#x20;   \_Out\_ ULONG32\* resolved\_offset
+
+) {
+
+&#x20;   if (strcmp(struct\_name, "bpf\_sock\_ops") == 0) {
+
+&#x20;       if (strcmp(field\_name, "remote\_port") == 0) {
+
+&#x20;           \*resolved\_offset = (ULONG32)offsetof(struct bpf\_sock\_ops, remote\_port);
+
+&#x20;           return STATUS\_SUCCESS;
+
+&#x20;       }
+
+&#x20;       if (strcmp(field\_name, "local\_port") == 0) {
+
+&#x20;           \*resolved\_offset = (ULONG32)offsetof(struct bpf\_sock\_ops, local\_port);
+
+&#x20;           return STATUS\_SUCCESS;
+
+&#x20;       }
+
+&#x20;   }
+
+&#x20;   return STATUS\_NOT\_FOUND;
+
+}
+
+Phase D: Kernel Loader Fix-up Engine (ebpfcore)
+
+When a compiled native eBPF .sys driver is registered into the Windows kernel, ebpfcore intercepts initialization to perform the single-pass fix-up routine.
+
+
+
+The Fix-up Loop Blueprint
+
+C
+
+NTSTATUS ResolveContextRelocations(PROV\_HANDLE ebpf\_driver\_handle, EBPF\_PROGRAM\_PROVIDER\_CHARACTERISTICS\_V2\* provider) {
+
+&#x20;   // 1. Locate the exported metadata table symbol from the loaded image
+
+&#x20;   EBPF\_CONTEXT\_RELOCATION\_ENTRY\* table = FetchSymbol(ebpf\_driver\_handle, "ContextRelocationTable");
+
+&#x20;   if (!table) return STATUS\_SUCCESS; 
+
+
+
+&#x20;   // 2. Elevate section protection temporarily to allow patching
+
+&#x20;   SetSectionProtection(ebpf\_driver\_handle, ".ebpf\_reloc", PAGE\_READWRITE);
+
+
+
+&#x20;   for (int i = 0; table\[i].struct\_name != NULL; i++) {
+
+&#x20;       ULONG32 actual\_offset = 0;
+
+&#x20;       
+
+&#x20;       // 3. Query the active extension via the modified NMR callback
+
+&#x20;       NTSTATUS status = provider->GetFieldOffset(table\[i].struct\_name, table\[i].field\_name, \&actual\_offset);
+
+&#x20;       
+
+&#x20;       if (!NT\_SUCCESS(status)) {
+
+&#x20;           // Fallback to compilation-time offset if field is missing on this OS version
+
+&#x20;           actual\_offset = table\[i].fallback\_offset;
+
+&#x20;       }
+
+
+
+&#x20;       // 4. CRITICAL SAFETY GUARD: Verify the runtime layout doesn't violate 
+
+&#x20;       // the boundary math originally proved during offline verification.
+
+&#x20;       if (actual\_offset + table\[i].field\_size > provider->ContextSize) {
+
+&#x20;           // Overwriting this would cause an out-of-bounds kernel panic
+
+&#x20;           SetSectionProtection(ebpf\_driver\_handle, ".ebpf\_reloc", PAGE\_ONLY);
+
+&#x20;           return STATUS\_EBPF\_CORRUPTED\_CONTEXT\_BOUNDS;
+
+&#x20;       }
+
+
+
+&#x20;       // 5. Patch the variable location
+
+&#x20;       \*(table\[i].offset\_variable\_ptr) = actual\_offset;
+
+&#x20;   }
+
+
+
+&#x20;   // 6. Freeze the memory section permanently into PAGE\_READONLY
+
+&#x20;   SetSectionProtection(ebpf\_driver\_handle, ".ebpf\_reloc", PAGE\_READONLY);
+
+
+
+&#x20;   return STATUS\_SUCCESS;
+
+}
+
+4\. Performance \& Security Analysis
+
+Execution Performance Verification
+
+This architecture introduces zero execution overhead on the runtime hot-path.
+
+
+
+Register-relative addressing (char\* ctx + offset) compiles down to a basic native assembly sequence.
+
+
+
+Because the .ebpf\_reloc memory section is modified exactly once and permanently frozen as PAGE\_READONLY, these variables remain highly optimized within CPU L1/L2 caches across subsequent execution loops.
+
+
+
+No memory allocations, marshalling, or "thunking" steps occur during hot-path execution.
+
+
+
+Security Assertions
+
+Accidental/Malicious Tampering Prevention: Forcing the .ebpf\_reloc section to a read-only state via PAGE\_READONLY prevents any user-mode or compromised kernel component from rewriting offsets post-initialization.
+
+
+
+Out-of-Bounds Protection: The explicit ContextSize validation step inside the runtime fix-up engine blocks the driver from loading if a structural shift on a modified OS would result in data access beyond the boundary verified by PREVAIL.
+
diff --git a/include/bpf2c.h b/include/bpf2c.h
index 845039ec25..06a7628e08 100644
--- a/include/bpf2c.h
+++ b/include/bpf2c.h
@@ -31,8 +31,8 @@ extern "C"
 
 #define UBPF_STACK_SIZE 512
 
-#define IMMEDIATE(X) (int32_t)X
-#define OFFSET(X) (int16_t)X
+#define IMMEDIATE(X) (int32_t) X
+#define OFFSET(X) (int16_t) X
 #define POINTER(X) (uint64_t)(X)
 
 #define READ_ONCE_64(destination, source, offset) \
@@ -180,6 +180,7 @@ extern "C"
         const uint8_t* program_info_hash;         ///< Hash of the program info.
         size_t program_info_hash_length;          ///< Length of the program info hash.
         const char* program_info_hash_type;       ///< Type of the program info hash
+        size_t bpf2c_context_size;                ///< Size of context struct at bpf2c compile time.
     } program_entry_t;
 
     /**
@@ -290,8 +291,7 @@ extern "C"
      EBPF_NATIVE_MAP_DATA_CURRENT_VERSION_TOTAL_SIZE}
 
 #define EBPF_NATIVE_PROGRAM_ENTRY_CURRENT_VERSION 1
-#define EBPF_NATIVE_PROGRAM_ENTRY_CURRENT_VERSION_SIZE \
-    EBPF_SIZE_INCLUDING_FIELD(program_entry_t, program_info_hash_type)
+#define EBPF_NATIVE_PROGRAM_ENTRY_CURRENT_VERSION_SIZE EBPF_SIZE_INCLUDING_FIELD(program_entry_t, bpf2c_context_size)
 #define EBPF_NATIVE_PROGRAM_ENTRY_CURRENT_VERSION_TOTAL_SIZE sizeof(program_entry_t)
 #define EBPF_NATIVE_PROGRAM_ENTRY_HEADER             \
     {EBPF_NATIVE_PROGRAM_ENTRY_CURRENT_VERSION,      \
diff --git a/libs/execution_context/ebpf_native.c b/libs/execution_context/ebpf_native.c
index 8dc71199c8..7d9dce77ef 100644
--- a/libs/execution_context/ebpf_native.c
+++ b/libs/execution_context/ebpf_native.c
@@ -1970,6 +1970,13 @@ _ebpf_native_load_programs(_Inout_ ebpf_native_module_instance_t* instance)
         parameters.program_info_hash_type.value = hash_type_name;
         parameters.program_info_hash_type.length = hash_type_length;
 
+        // Set the compile-time context size if the program entry includes it (version with bpf2c_context_size field).
+        // For old native modules that don't have this field, the value remains 0 (zero-initialized by allocator).
+        if (native_program->program_entry.header.size >=
+            EBPF_SIZE_INCLUDING_FIELD(program_entry_t, bpf2c_context_size)) {
+            parameters.bpf2c_context_size = native_program->program_entry.bpf2c_context_size;
+        }
+
         result = ebpf_program_create_and_initialize(&parameters, &native_program->handle);
         if (result != EBPF_SUCCESS) {
             goto Done;
diff --git a/libs/execution_context/ebpf_program.c b/libs/execution_context/ebpf_program.c
index a6ca012824..4c88f12b2b 100644
--- a/libs/execution_context/ebpf_program.c
+++ b/libs/execution_context/ebpf_program.c
@@ -211,6 +211,7 @@ _IRQL_requires_max_(PASSIVE_LEVEL) static ebpf_result_t _ebpf_program_compute_pr
     _In_ const ebpf_program_data_t* general_program_information_data,
     _In_ const ebpf_program_data_t* extension_program_data,
     _In_ const cxplat_utf8_string_t* hash_algorithm,
+    bool extensible_context_hash,
     _Outptr_ uint8_t** hash,
     _Out_ size_t* hash_length);
 
@@ -415,6 +416,7 @@ _ebpf_program_type_specific_program_information_attach_provider(
     uint32_t* actual_helper_function_ids = NULL;
     size_t actual_helper_function_count = 0;
     bool actual_helper_ids_set = false;
+    size_t bpf2c_context_size = 0;
 
     void* provider_binding_context;
     void* provider_dispatch;
@@ -480,6 +482,7 @@ _ebpf_program_type_specific_program_information_attach_provider(
     actual_helper_function_ids = program->helper_function_ids;
     actual_helper_function_count = program->helper_function_count;
     actual_helper_ids_set = program->helper_ids_set;
+    bpf2c_context_size = program->parameters.bpf2c_context_size;
 
     ebpf_lock_unlock(&program->lock, state);
     lock_held = false;
@@ -494,6 +497,7 @@ _ebpf_program_type_specific_program_information_attach_provider(
                 general_program_information_data,
                 extension_program_data,
                 &hash_algorithm,
+                bpf2c_context_size > 0,
                 &hash,
                 &hash_length) != EBPF_SUCCESS) {
             status = STATUS_NO_MEMORY;
@@ -527,6 +531,23 @@ _ebpf_program_type_specific_program_information_attach_provider(
             status = STATUS_INVALID_PARAMETER;
             goto Done;
         }
+
+        // For programs with extensible context hash, verify the runtime context is at least as large
+        // as the compile-time context. This ensures the program cannot access fields beyond the
+        // runtime context boundary.
+        if (bpf2c_context_size > 0) {
+            int runtime_context_size =
+                extension_program_data->program_info->program_type_descriptor->context_descriptor->size;
+            if ((int)bpf2c_context_size > runtime_context_size) {
+                EBPF_LOG_MESSAGE_GUID(
+                    EBPF_TRACELOG_LEVEL_ERROR,
+                    EBPF_TRACELOG_KEYWORD_PROGRAM,
+                    "Program context size exceeds runtime context size.",
+                    &program->parameters.program_type);
+                status = STATUS_INVALID_PARAMETER;
+                goto Done;
+            }
+        }
     }
 
     // This should be done after the call to NmrClientAttachProvider, but _ebpf_program_update_helpers requires
@@ -1887,6 +1908,7 @@ ebpf_program_set_program_info_hash(_Inout_ ebpf_program_t* program)
     cxplat_utf8_string_t hash_algorithm = {0};
     uint32_t* actual_helper_function_ids = NULL;
     size_t actual_helper_function_count = 0;
+    size_t bpf2c_context_size = 0;
     uint8_t* hash = NULL;
     size_t hash_length = 0;
     ebpf_lock_state_t state = 0;
@@ -1916,6 +1938,7 @@ ebpf_program_set_program_info_hash(_Inout_ ebpf_program_t* program)
     extension_program_data = program->extension_program_data;
     actual_helper_function_ids = program->helper_function_ids;
     actual_helper_function_count = program->helper_function_count;
+    bpf2c_context_size = program->parameters.bpf2c_context_size;
 
     ebpf_lock_unlock(&program->lock, state);
     lock_held = false;
@@ -1927,6 +1950,7 @@ ebpf_program_set_program_info_hash(_Inout_ ebpf_program_t* program)
         general_program_information_data,
         extension_program_data,
         &hash_algorithm,
+        bpf2c_context_size > 0,
         &hash,
         &hash_length);
     if (result != EBPF_SUCCESS) {
@@ -1945,6 +1969,23 @@ ebpf_program_set_program_info_hash(_Inout_ ebpf_program_t* program)
             result = EBPF_INVALID_ARGUMENT;
             goto Exit;
         }
+
+        // For programs with extensible context hash (bpf2c_context_size > 0), verify the runtime
+        // context is at least as large as the compile-time context. This ensures the program cannot
+        // access fields beyond the runtime context boundary.
+        if (bpf2c_context_size > 0) {
+            int runtime_context_size =
+                extension_program_data->program_info->program_type_descriptor->context_descriptor->size;
+            if ((int)bpf2c_context_size > runtime_context_size) {
+                EBPF_LOG_MESSAGE_GUID(
+                    EBPF_TRACELOG_LEVEL_ERROR,
+                    EBPF_TRACELOG_KEYWORD_PROGRAM,
+                    "Program context size exceeds runtime context size.",
+                    &program->parameters.program_type);
+                result = EBPF_INVALID_ARGUMENT;
+                goto Exit;
+            }
+        }
     } else {
         // Set the program info hash.
         program->parameters.program_info_hash_length = hash_length;
@@ -2264,6 +2305,7 @@ _IRQL_requires_max_(PASSIVE_LEVEL) static ebpf_result_t _ebpf_program_compute_pr
     _In_ const ebpf_program_data_t* general_program_information_data,
     _In_ const ebpf_program_data_t* extension_program_data,
     _In_ const cxplat_utf8_string_t* hash_algorithm,
+    bool extensible_context_hash,
     _Outptr_ uint8_t** hash,
     _Out_ size_t* hash_length)
 {
@@ -2337,7 +2379,7 @@ _IRQL_requires_max_(PASSIVE_LEVEL) static ebpf_result_t _ebpf_program_compute_pr
 
     // Hash is performed over the following fields:
     // 1. Program type name.
-    // 2. Context descriptor.
+    // 2. Context descriptor (offsets only for extensible context hash, full struct for legacy).
     // 3. Program type.
     // 4. BPF program type.
     // 5. Is_privileged flag.
@@ -2360,10 +2402,32 @@ _IRQL_requires_max_(PASSIVE_LEVEL) static ebpf_result_t _ebpf_program_compute_pr
         goto Exit;
     }
 
-    result = EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(
-        cryptographic_hash, *type_specific_program_info->program_type_descriptor->context_descriptor);
-    if (result != EBPF_SUCCESS) {
-        goto Exit;
+    if (extensible_context_hash) {
+        // Extensible context hash: hash only the offset fields (data, end, meta) of the context descriptor,
+        // excluding the size field. This allows extensions to append new fields to the context struct
+        // without breaking previously compiled native programs.
+        result = EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(
+            cryptographic_hash, type_specific_program_info->program_type_descriptor->context_descriptor->data);
+        if (result != EBPF_SUCCESS) {
+            goto Exit;
+        }
+        result = EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(
+            cryptographic_hash, type_specific_program_info->program_type_descriptor->context_descriptor->end);
+        if (result != EBPF_SUCCESS) {
+            goto Exit;
+        }
+        result = EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(
+            cryptographic_hash, type_specific_program_info->program_type_descriptor->context_descriptor->meta);
+        if (result != EBPF_SUCCESS) {
+            goto Exit;
+        }
+    } else {
+        // Legacy hash: hash the full context descriptor struct including the size field.
+        result = EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(
+            cryptographic_hash, *type_specific_program_info->program_type_descriptor->context_descriptor);
+        if (result != EBPF_SUCCESS) {
+            goto Exit;
+        }
     }
 
     result = EBPF_CRYPTOGRAPHIC_HASH_APPEND_VALUE(
diff --git a/libs/execution_context/ebpf_program.h b/libs/execution_context/ebpf_program.h
index bf812382d1..96e6fb7a88 100644
--- a/libs/execution_context/ebpf_program.h
+++ b/libs/execution_context/ebpf_program.h
@@ -41,6 +41,7 @@ extern "C"
         const uint8_t* program_info_hash;
         size_t program_info_hash_length;
         cxplat_utf8_string_t program_info_hash_type;
+        size_t bpf2c_context_size;
     } ebpf_program_parameters_t;
 
     typedef struct _ebpf_native_code_context
diff --git a/libs/shared/shared_common.c b/libs/shared/shared_common.c
index 66be3d1136..78a0b8fad4 100644
--- a/libs/shared/shared_common.c
+++ b/libs/shared/shared_common.c
@@ -106,7 +106,9 @@ size_t _ebpf_native_map_entry_supported_size[] = {EBPF_NATIVE_MAP_ENTRY_SIZE_0};
 size_t _ebpf_native_map_data_supported_size[] = {EBPF_NATIVE_MAP_DATA_SIZE_0};
 
 #define EBPF_NATIVE_PROGRAM_ENTRY_SIZE_0 EBPF_SIZE_INCLUDING_FIELD(program_entry_t, program_info_hash_type)
-size_t _ebpf_native_program_entry_supported_size[] = {EBPF_NATIVE_PROGRAM_ENTRY_SIZE_0};
+#define EBPF_NATIVE_PROGRAM_ENTRY_SIZE_1 EBPF_SIZE_INCLUDING_FIELD(program_entry_t, bpf2c_context_size)
+size_t _ebpf_native_program_entry_supported_size[] = {
+    EBPF_NATIVE_PROGRAM_ENTRY_SIZE_0, EBPF_NATIVE_PROGRAM_ENTRY_SIZE_1};
 
 #define EBPF_NATIVE_PROGRAM_RUNTIME_CONTEXT_SIZE_0 \
     EBPF_SIZE_INCLUDING_FIELD(program_runtime_context_t, global_variable_section_data)
diff --git a/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_dll.c b/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_dll.c
index 7cef629cdc..94a9826ec0 100644
--- a/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_dll.c
+++ b/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_dll.c
@@ -172,7 +172,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_raw.c b/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_raw.c
index 3deba8a099..b31d4e694e 100644
--- a/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_raw.c
+++ b/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_raw.c
@@ -142,7 +142,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_sys.c b/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_sys.c
index 8d90886548..313f9f6ab9 100644
--- a/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_sys.c
+++ b/tests/bpf2c_tests/expected/atomic_instruction_fetch_add_sys.c
@@ -297,7 +297,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bad_map_name_dll.c b/tests/bpf2c_tests/expected/bad_map_name_dll.c
index 63410260b0..30ec3d3cc2 100644
--- a/tests/bpf2c_tests/expected/bad_map_name_dll.c
+++ b/tests/bpf2c_tests/expected/bad_map_name_dll.c
@@ -172,7 +172,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bad_map_name_raw.c b/tests/bpf2c_tests/expected/bad_map_name_raw.c
index 0a1d6c0ea5..85d159292e 100644
--- a/tests/bpf2c_tests/expected/bad_map_name_raw.c
+++ b/tests/bpf2c_tests/expected/bad_map_name_raw.c
@@ -142,7 +142,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bad_map_name_sys.c b/tests/bpf2c_tests/expected/bad_map_name_sys.c
index 1a68e91139..fd31e3f3b2 100644
--- a/tests/bpf2c_tests/expected/bad_map_name_sys.c
+++ b/tests/bpf2c_tests/expected/bad_map_name_sys.c
@@ -297,7 +297,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bind_policy_dll.c b/tests/bpf2c_tests/expected/bind_policy_dll.c
index f1aaf59073..b8c458c25d 100644
--- a/tests/bpf2c_tests/expected/bind_policy_dll.c
+++ b/tests/bpf2c_tests/expected/bind_policy_dll.c
@@ -545,7 +545,7 @@ authorize_bind(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bind_policy_raw.c b/tests/bpf2c_tests/expected/bind_policy_raw.c
index f0e0281c21..eb85728253 100644
--- a/tests/bpf2c_tests/expected/bind_policy_raw.c
+++ b/tests/bpf2c_tests/expected/bind_policy_raw.c
@@ -515,7 +515,7 @@ authorize_bind(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bind_policy_sys.c b/tests/bpf2c_tests/expected/bind_policy_sys.c
index 400997d7e5..00f4912229 100644
--- a/tests/bpf2c_tests/expected/bind_policy_sys.c
+++ b/tests/bpf2c_tests/expected/bind_policy_sys.c
@@ -670,7 +670,7 @@ authorize_bind(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_dll.c b/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_dll.c
index 55a6462cec..fb8fafb8ce 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_dll.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_dll.c
@@ -496,7 +496,7 @@ BindMonitor_Callee7(uint64_t r1, uint64_t r2, uint64_t r3, uint64_t r4, uint64_t
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_raw.c b/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_raw.c
index 2794d5ff6c..67e2d6b40f 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_raw.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_raw.c
@@ -466,7 +466,7 @@ BindMonitor_Callee7(uint64_t r1, uint64_t r2, uint64_t r3, uint64_t r4, uint64_t
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_sys.c b/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_sys.c
index fa9e4a47e1..34724abc1e 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_sys.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_bpf2bpf_sys.c
@@ -621,7 +621,7 @@ BindMonitor_Callee7(uint64_t r1, uint64_t r2, uint64_t r3, uint64_t r4, uint64_t
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_dll.c b/tests/bpf2c_tests/expected/bindmonitor_dll.c
index 5204c29ef8..a4d2805daf 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_dll.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_dll.c
@@ -561,7 +561,7 @@ BindMonitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_dll.c b/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_dll.c
index d15da1417e..92e4e3698d 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_dll.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_dll.c
@@ -5729,7 +5729,7 @@ BindMonitor_Caller(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee0,
         "bind/0",
         "bind/0",
@@ -5744,7 +5744,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee1,
         "bind/1",
         "bind/1",
@@ -5759,7 +5759,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee10,
         "bind/10",
         "bind/10",
@@ -5774,7 +5774,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee11,
         "bind/11",
         "bind/11",
@@ -5789,7 +5789,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee12,
         "bind/12",
         "bind/12",
@@ -5804,7 +5804,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee13,
         "bind/13",
         "bind/13",
@@ -5819,7 +5819,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee14,
         "bind/14",
         "bind/14",
@@ -5834,7 +5834,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee15,
         "bind/15",
         "bind/15",
@@ -5849,7 +5849,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee16,
         "bind/16",
         "bind/16",
@@ -5864,7 +5864,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee17,
         "bind/17",
         "bind/17",
@@ -5879,7 +5879,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee18,
         "bind/18",
         "bind/18",
@@ -5894,7 +5894,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee19,
         "bind/19",
         "bind/19",
@@ -5909,7 +5909,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee2,
         "bind/2",
         "bind/2",
@@ -5924,7 +5924,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee20,
         "bind/20",
         "bind/20",
@@ -5939,7 +5939,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee21,
         "bind/21",
         "bind/21",
@@ -5954,7 +5954,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee22,
         "bind/22",
         "bind/22",
@@ -5969,7 +5969,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee23,
         "bind/23",
         "bind/23",
@@ -5984,7 +5984,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee24,
         "bind/24",
         "bind/24",
@@ -5999,7 +5999,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee25,
         "bind/25",
         "bind/25",
@@ -6014,7 +6014,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee26,
         "bind/26",
         "bind/26",
@@ -6029,7 +6029,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee27,
         "bind/27",
         "bind/27",
@@ -6044,7 +6044,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee28,
         "bind/28",
         "bind/28",
@@ -6059,7 +6059,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee29,
         "bind/29",
         "bind/29",
@@ -6074,7 +6074,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee3,
         "bind/3",
         "bind/3",
@@ -6089,7 +6089,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee30,
         "bind/30",
         "bind/30",
@@ -6104,7 +6104,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee31,
         "bind/31",
         "bind/31",
@@ -6119,7 +6119,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee32,
         "bind/32",
         "bind/32",
@@ -6134,7 +6134,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee4,
         "bind/4",
         "bind/4",
@@ -6149,7 +6149,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee5,
         "bind/5",
         "bind/5",
@@ -6164,7 +6164,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee6,
         "bind/6",
         "bind/6",
@@ -6179,7 +6179,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee7,
         "bind/7",
         "bind/7",
@@ -6194,7 +6194,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee8,
         "bind/8",
         "bind/8",
@@ -6209,7 +6209,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee9,
         "bind/9",
         "bind/9",
@@ -6224,7 +6224,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_raw.c b/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_raw.c
index 479d90b105..14aac4587c 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_raw.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_raw.c
@@ -5699,7 +5699,7 @@ BindMonitor_Caller(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee0,
         "bind/0",
         "bind/0",
@@ -5714,7 +5714,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee1,
         "bind/1",
         "bind/1",
@@ -5729,7 +5729,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee10,
         "bind/10",
         "bind/10",
@@ -5744,7 +5744,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee11,
         "bind/11",
         "bind/11",
@@ -5759,7 +5759,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee12,
         "bind/12",
         "bind/12",
@@ -5774,7 +5774,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee13,
         "bind/13",
         "bind/13",
@@ -5789,7 +5789,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee14,
         "bind/14",
         "bind/14",
@@ -5804,7 +5804,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee15,
         "bind/15",
         "bind/15",
@@ -5819,7 +5819,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee16,
         "bind/16",
         "bind/16",
@@ -5834,7 +5834,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee17,
         "bind/17",
         "bind/17",
@@ -5849,7 +5849,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee18,
         "bind/18",
         "bind/18",
@@ -5864,7 +5864,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee19,
         "bind/19",
         "bind/19",
@@ -5879,7 +5879,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee2,
         "bind/2",
         "bind/2",
@@ -5894,7 +5894,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee20,
         "bind/20",
         "bind/20",
@@ -5909,7 +5909,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee21,
         "bind/21",
         "bind/21",
@@ -5924,7 +5924,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee22,
         "bind/22",
         "bind/22",
@@ -5939,7 +5939,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee23,
         "bind/23",
         "bind/23",
@@ -5954,7 +5954,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee24,
         "bind/24",
         "bind/24",
@@ -5969,7 +5969,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee25,
         "bind/25",
         "bind/25",
@@ -5984,7 +5984,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee26,
         "bind/26",
         "bind/26",
@@ -5999,7 +5999,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee27,
         "bind/27",
         "bind/27",
@@ -6014,7 +6014,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee28,
         "bind/28",
         "bind/28",
@@ -6029,7 +6029,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee29,
         "bind/29",
         "bind/29",
@@ -6044,7 +6044,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee3,
         "bind/3",
         "bind/3",
@@ -6059,7 +6059,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee30,
         "bind/30",
         "bind/30",
@@ -6074,7 +6074,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee31,
         "bind/31",
         "bind/31",
@@ -6089,7 +6089,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee32,
         "bind/32",
         "bind/32",
@@ -6104,7 +6104,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee4,
         "bind/4",
         "bind/4",
@@ -6119,7 +6119,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee5,
         "bind/5",
         "bind/5",
@@ -6134,7 +6134,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee6,
         "bind/6",
         "bind/6",
@@ -6149,7 +6149,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee7,
         "bind/7",
         "bind/7",
@@ -6164,7 +6164,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee8,
         "bind/8",
         "bind/8",
@@ -6179,7 +6179,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee9,
         "bind/9",
         "bind/9",
@@ -6194,7 +6194,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_sys.c b/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_sys.c
index 473e377f0d..4adcd19e0e 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_sys.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_mt_tailcall_sys.c
@@ -5854,7 +5854,7 @@ BindMonitor_Caller(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee0,
         "bind/0",
         "bind/0",
@@ -5869,7 +5869,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee1,
         "bind/1",
         "bind/1",
@@ -5884,7 +5884,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee10,
         "bind/10",
         "bind/10",
@@ -5899,7 +5899,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee11,
         "bind/11",
         "bind/11",
@@ -5914,7 +5914,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee12,
         "bind/12",
         "bind/12",
@@ -5929,7 +5929,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee13,
         "bind/13",
         "bind/13",
@@ -5944,7 +5944,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee14,
         "bind/14",
         "bind/14",
@@ -5959,7 +5959,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee15,
         "bind/15",
         "bind/15",
@@ -5974,7 +5974,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee16,
         "bind/16",
         "bind/16",
@@ -5989,7 +5989,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee17,
         "bind/17",
         "bind/17",
@@ -6004,7 +6004,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee18,
         "bind/18",
         "bind/18",
@@ -6019,7 +6019,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee19,
         "bind/19",
         "bind/19",
@@ -6034,7 +6034,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee2,
         "bind/2",
         "bind/2",
@@ -6049,7 +6049,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee20,
         "bind/20",
         "bind/20",
@@ -6064,7 +6064,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee21,
         "bind/21",
         "bind/21",
@@ -6079,7 +6079,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee22,
         "bind/22",
         "bind/22",
@@ -6094,7 +6094,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee23,
         "bind/23",
         "bind/23",
@@ -6109,7 +6109,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee24,
         "bind/24",
         "bind/24",
@@ -6124,7 +6124,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee25,
         "bind/25",
         "bind/25",
@@ -6139,7 +6139,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee26,
         "bind/26",
         "bind/26",
@@ -6154,7 +6154,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee27,
         "bind/27",
         "bind/27",
@@ -6169,7 +6169,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee28,
         "bind/28",
         "bind/28",
@@ -6184,7 +6184,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee29,
         "bind/29",
         "bind/29",
@@ -6199,7 +6199,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee3,
         "bind/3",
         "bind/3",
@@ -6214,7 +6214,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee30,
         "bind/30",
         "bind/30",
@@ -6229,7 +6229,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee31,
         "bind/31",
         "bind/31",
@@ -6244,7 +6244,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee32,
         "bind/32",
         "bind/32",
@@ -6259,7 +6259,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee4,
         "bind/4",
         "bind/4",
@@ -6274,7 +6274,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee5,
         "bind/5",
         "bind/5",
@@ -6289,7 +6289,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee6,
         "bind/6",
         "bind/6",
@@ -6304,7 +6304,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee7,
         "bind/7",
         "bind/7",
@@ -6319,7 +6319,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee8,
         "bind/8",
         "bind/8",
@@ -6334,7 +6334,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee9,
         "bind/9",
         "bind/9",
@@ -6349,7 +6349,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_dll.c b/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_dll.c
index a2b2789548..fff1e3ac6f 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_dll.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_dll.c
@@ -187,7 +187,7 @@ bind_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_monitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_raw.c b/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_raw.c
index 6d4e1bfd99..af0935a5a0 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_raw.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_raw.c
@@ -157,7 +157,7 @@ bind_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_monitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_sys.c b/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_sys.c
index 0159ac2e54..0d342a4cac 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_sys.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_perf_event_array_sys.c
@@ -312,7 +312,7 @@ bind_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_monitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_raw.c b/tests/bpf2c_tests/expected/bindmonitor_raw.c
index 9acbcfff27..4712a433d7 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_raw.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_raw.c
@@ -531,7 +531,7 @@ BindMonitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_ringbuf_dll.c b/tests/bpf2c_tests/expected/bindmonitor_ringbuf_dll.c
index dfa8036f79..280e92dee9 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_ringbuf_dll.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_ringbuf_dll.c
@@ -178,7 +178,7 @@ bind_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_monitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_ringbuf_raw.c b/tests/bpf2c_tests/expected/bindmonitor_ringbuf_raw.c
index d3ea07cf72..5529700be8 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_ringbuf_raw.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_ringbuf_raw.c
@@ -148,7 +148,7 @@ bind_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_monitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_ringbuf_sys.c b/tests/bpf2c_tests/expected/bindmonitor_ringbuf_sys.c
index 6347d53065..1e98fddb25 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_ringbuf_sys.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_ringbuf_sys.c
@@ -303,7 +303,7 @@ bind_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_monitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_sys.c b/tests/bpf2c_tests/expected/bindmonitor_sys.c
index 881d7f5e95..54429b081b 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_sys.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_sys.c
@@ -686,7 +686,7 @@ BindMonitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_tailcall_dll.c b/tests/bpf2c_tests/expected/bindmonitor_tailcall_dll.c
index 50cd237b42..293f61c5b6 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_tailcall_dll.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_tailcall_dll.c
@@ -787,7 +787,7 @@ BindMonitor_Callee1(void* context, const program_runtime_context_t* runtime_cont
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor,
         "bind",
         "bind",
@@ -802,7 +802,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee0,
         "bind/0",
         "bind/0",
@@ -817,7 +817,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee1,
         "bind/1",
         "bind/1",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_tailcall_raw.c b/tests/bpf2c_tests/expected/bindmonitor_tailcall_raw.c
index 608768c4c4..08121e5439 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_tailcall_raw.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_tailcall_raw.c
@@ -757,7 +757,7 @@ BindMonitor_Callee1(void* context, const program_runtime_context_t* runtime_cont
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor,
         "bind",
         "bind",
@@ -772,7 +772,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee0,
         "bind/0",
         "bind/0",
@@ -787,7 +787,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee1,
         "bind/1",
         "bind/1",
diff --git a/tests/bpf2c_tests/expected/bindmonitor_tailcall_sys.c b/tests/bpf2c_tests/expected/bindmonitor_tailcall_sys.c
index b95cc7187a..d7a7f33d59 100644
--- a/tests/bpf2c_tests/expected/bindmonitor_tailcall_sys.c
+++ b/tests/bpf2c_tests/expected/bindmonitor_tailcall_sys.c
@@ -912,7 +912,7 @@ BindMonitor_Callee1(void* context, const program_runtime_context_t* runtime_cont
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor,
         "bind",
         "bind",
@@ -927,7 +927,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee0,
         "bind/0",
         "bind/0",
@@ -942,7 +942,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         BindMonitor_Callee1,
         "bind/1",
         "bind/1",
diff --git a/tests/bpf2c_tests/expected/bpf_call_dll.c b/tests/bpf2c_tests/expected/bpf_call_dll.c
index 5f80367332..7d87ec9ba6 100644
--- a/tests/bpf2c_tests/expected/bpf_call_dll.c
+++ b/tests/bpf2c_tests/expected/bpf_call_dll.c
@@ -170,7 +170,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bpf_call_raw.c b/tests/bpf2c_tests/expected/bpf_call_raw.c
index ff22988999..6735ed4786 100644
--- a/tests/bpf2c_tests/expected/bpf_call_raw.c
+++ b/tests/bpf2c_tests/expected/bpf_call_raw.c
@@ -140,7 +140,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bpf_call_sys.c b/tests/bpf2c_tests/expected/bpf_call_sys.c
index 900c0c5a0b..a539ff2b6a 100644
--- a/tests/bpf2c_tests/expected/bpf_call_sys.c
+++ b/tests/bpf2c_tests/expected/bpf_call_sys.c
@@ -295,7 +295,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/bpf_dll.c b/tests/bpf2c_tests/expected/bpf_dll.c
index 4106ca7186..2c097c756b 100644
--- a/tests/bpf2c_tests/expected/bpf_dll.c
+++ b/tests/bpf2c_tests/expected/bpf_dll.c
@@ -99,7 +99,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         ".text",
         ".text",
diff --git a/tests/bpf2c_tests/expected/bpf_raw.c b/tests/bpf2c_tests/expected/bpf_raw.c
index 240a6abf4b..7472e6b6e3 100644
--- a/tests/bpf2c_tests/expected/bpf_raw.c
+++ b/tests/bpf2c_tests/expected/bpf_raw.c
@@ -69,7 +69,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         ".text",
         ".text",
diff --git a/tests/bpf2c_tests/expected/bpf_sys.c b/tests/bpf2c_tests/expected/bpf_sys.c
index 629cfff039..ce61c6323d 100644
--- a/tests/bpf2c_tests/expected/bpf_sys.c
+++ b/tests/bpf2c_tests/expected/bpf_sys.c
@@ -224,7 +224,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         ".text",
         ".text",
diff --git a/tests/bpf2c_tests/expected/callgraph_bpf2bpf_dll.c b/tests/bpf2c_tests/expected/callgraph_bpf2bpf_dll.c
index 5a14994fb7..d7aea2c120 100644
--- a/tests/bpf2c_tests/expected/callgraph_bpf2bpf_dll.c
+++ b/tests/bpf2c_tests/expected/callgraph_bpf2bpf_dll.c
@@ -745,7 +745,7 @@ entry_program3(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program1,
         "bind/1",
         "bind/1",
@@ -760,7 +760,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program2,
         "bind/2",
         "bind/2",
@@ -775,7 +775,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program3,
         "bind/3",
         "bind/3",
diff --git a/tests/bpf2c_tests/expected/callgraph_bpf2bpf_raw.c b/tests/bpf2c_tests/expected/callgraph_bpf2bpf_raw.c
index d348fee586..e53e824f9b 100644
--- a/tests/bpf2c_tests/expected/callgraph_bpf2bpf_raw.c
+++ b/tests/bpf2c_tests/expected/callgraph_bpf2bpf_raw.c
@@ -715,7 +715,7 @@ entry_program3(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program1,
         "bind/1",
         "bind/1",
@@ -730,7 +730,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program2,
         "bind/2",
         "bind/2",
@@ -745,7 +745,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program3,
         "bind/3",
         "bind/3",
diff --git a/tests/bpf2c_tests/expected/callgraph_bpf2bpf_sys.c b/tests/bpf2c_tests/expected/callgraph_bpf2bpf_sys.c
index 37c32f0ed1..3039a84938 100644
--- a/tests/bpf2c_tests/expected/callgraph_bpf2bpf_sys.c
+++ b/tests/bpf2c_tests/expected/callgraph_bpf2bpf_sys.c
@@ -870,7 +870,7 @@ entry_program3(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program1,
         "bind/1",
         "bind/1",
@@ -885,7 +885,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program2,
         "bind/2",
         "bind/2",
@@ -900,7 +900,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         entry_program3,
         "bind/3",
         "bind/3",
diff --git a/tests/bpf2c_tests/expected/cgroup_connect_authorization6_dll.c b/tests/bpf2c_tests/expected/cgroup_connect_authorization6_dll.c
index 39e8e3f43e..b6f8546c38 100644
--- a/tests/bpf2c_tests/expected/cgroup_connect_authorization6_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_connect_authorization6_dll.c
@@ -249,7 +249,7 @@ count_tcp_connect_authorization6(void* context, const program_runtime_context_t*
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_connect_authorization6_raw.c b/tests/bpf2c_tests/expected/cgroup_connect_authorization6_raw.c
index b9f0e4c055..301850fced 100644
--- a/tests/bpf2c_tests/expected/cgroup_connect_authorization6_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_connect_authorization6_raw.c
@@ -219,7 +219,7 @@ count_tcp_connect_authorization6(void* context, const program_runtime_context_t*
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_connect_authorization6_sys.c b/tests/bpf2c_tests/expected/cgroup_connect_authorization6_sys.c
index 62609e1ddf..48534d3e08 100644
--- a/tests/bpf2c_tests/expected/cgroup_connect_authorization6_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_connect_authorization6_sys.c
@@ -374,7 +374,7 @@ count_tcp_connect_authorization6(void* context, const program_runtime_context_t*
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_dll.c b/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_dll.c
index 51bccc834c..5b7e66fc03 100644
--- a/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_dll.c
@@ -219,7 +219,7 @@ mutate_connect_authorization6(void* context, const program_runtime_context_t* ru
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         mutate_connect_authorization4,
         "cgroup~2",
         "cgroup/connect_authorization4",
@@ -234,7 +234,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         mutate_connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_raw.c b/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_raw.c
index 76fad0b8f1..2199fb600d 100644
--- a/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_raw.c
@@ -189,7 +189,7 @@ mutate_connect_authorization6(void* context, const program_runtime_context_t* ru
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         mutate_connect_authorization4,
         "cgroup~2",
         "cgroup/connect_authorization4",
@@ -204,7 +204,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         mutate_connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_sys.c b/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_sys.c
index a5c9551941..69ae8892b4 100644
--- a/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_connect_authorization_readonly_sys.c
@@ -344,7 +344,7 @@ mutate_connect_authorization6(void* context, const program_runtime_context_t* ru
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         mutate_connect_authorization4,
         "cgroup~2",
         "cgroup/connect_authorization4",
@@ -359,7 +359,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         mutate_connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_count_connect4_dll.c b/tests/bpf2c_tests/expected/cgroup_count_connect4_dll.c
index 75772d2f45..78eabd987e 100644
--- a/tests/bpf2c_tests/expected/cgroup_count_connect4_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_count_connect4_dll.c
@@ -237,7 +237,7 @@ count_tcp_connect4(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect4,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/cgroup_count_connect4_raw.c b/tests/bpf2c_tests/expected/cgroup_count_connect4_raw.c
index 0f9deea187..d481804218 100644
--- a/tests/bpf2c_tests/expected/cgroup_count_connect4_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_count_connect4_raw.c
@@ -207,7 +207,7 @@ count_tcp_connect4(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect4,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/cgroup_count_connect4_sys.c b/tests/bpf2c_tests/expected/cgroup_count_connect4_sys.c
index aa5fc119aa..e6a05ca745 100644
--- a/tests/bpf2c_tests/expected/cgroup_count_connect4_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_count_connect4_sys.c
@@ -362,7 +362,7 @@ count_tcp_connect4(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect4,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/cgroup_count_connect6_dll.c b/tests/bpf2c_tests/expected/cgroup_count_connect6_dll.c
index afbaa965b9..8690a3fcea 100644
--- a/tests/bpf2c_tests/expected/cgroup_count_connect6_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_count_connect6_dll.c
@@ -237,7 +237,7 @@ count_tcp_connect6(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_count_connect6_raw.c b/tests/bpf2c_tests/expected/cgroup_count_connect6_raw.c
index 45b1987f62..d365b4cb10 100644
--- a/tests/bpf2c_tests/expected/cgroup_count_connect6_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_count_connect6_raw.c
@@ -207,7 +207,7 @@ count_tcp_connect6(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_count_connect6_sys.c b/tests/bpf2c_tests/expected/cgroup_count_connect6_sys.c
index f2217ef61b..04d2a6c173 100644
--- a/tests/bpf2c_tests/expected/cgroup_count_connect6_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_count_connect6_sys.c
@@ -362,7 +362,7 @@ count_tcp_connect6(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         count_tcp_connect6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_mt_connect4_dll.c b/tests/bpf2c_tests/expected/cgroup_mt_connect4_dll.c
index b15bb9ab2c..67847388cd 100644
--- a/tests/bpf2c_tests/expected/cgroup_mt_connect4_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_mt_connect4_dll.c
@@ -174,7 +174,7 @@ tcp_mt_connect4(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         tcp_mt_connect4,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/cgroup_mt_connect4_raw.c b/tests/bpf2c_tests/expected/cgroup_mt_connect4_raw.c
index 6f7a8c910b..1c908cbb16 100644
--- a/tests/bpf2c_tests/expected/cgroup_mt_connect4_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_mt_connect4_raw.c
@@ -144,7 +144,7 @@ tcp_mt_connect4(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         tcp_mt_connect4,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/cgroup_mt_connect4_sys.c b/tests/bpf2c_tests/expected/cgroup_mt_connect4_sys.c
index b4725be1bb..4a9efd368a 100644
--- a/tests/bpf2c_tests/expected/cgroup_mt_connect4_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_mt_connect4_sys.c
@@ -299,7 +299,7 @@ tcp_mt_connect4(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         tcp_mt_connect4,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/cgroup_mt_connect6_dll.c b/tests/bpf2c_tests/expected/cgroup_mt_connect6_dll.c
index 40d80f08db..3dd522003a 100644
--- a/tests/bpf2c_tests/expected/cgroup_mt_connect6_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_mt_connect6_dll.c
@@ -174,7 +174,7 @@ tcp_mt_connect6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         tcp_mt_connect6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_mt_connect6_raw.c b/tests/bpf2c_tests/expected/cgroup_mt_connect6_raw.c
index ad67c5cf6e..e914bb7cc6 100644
--- a/tests/bpf2c_tests/expected/cgroup_mt_connect6_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_mt_connect6_raw.c
@@ -144,7 +144,7 @@ tcp_mt_connect6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         tcp_mt_connect6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_mt_connect6_sys.c b/tests/bpf2c_tests/expected/cgroup_mt_connect6_sys.c
index 0fffd0ff59..a1006bda8c 100644
--- a/tests/bpf2c_tests/expected/cgroup_mt_connect6_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_mt_connect6_sys.c
@@ -299,7 +299,7 @@ tcp_mt_connect6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         tcp_mt_connect6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr2_dll.c b/tests/bpf2c_tests/expected/cgroup_sock_addr2_dll.c
index 8bc273fe6d..4fadf54ad7 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr2_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr2_dll.c
@@ -1236,7 +1236,7 @@ connect_redirect6(void* context, const program_runtime_context_t* runtime_contex
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization4,
         "cgroup~2",
         "cgroup/connect_authorization4",
@@ -1251,7 +1251,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
@@ -1266,7 +1266,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_redirect4,
         "cgroup~4",
         "cgroup/connect4",
@@ -1281,7 +1281,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_redirect6,
         "cgroup~3",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr2_raw.c b/tests/bpf2c_tests/expected/cgroup_sock_addr2_raw.c
index 985a1d644a..dc83b75f33 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr2_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr2_raw.c
@@ -1206,7 +1206,7 @@ connect_redirect6(void* context, const program_runtime_context_t* runtime_contex
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization4,
         "cgroup~2",
         "cgroup/connect_authorization4",
@@ -1221,7 +1221,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
@@ -1236,7 +1236,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_redirect4,
         "cgroup~4",
         "cgroup/connect4",
@@ -1251,7 +1251,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_redirect6,
         "cgroup~3",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr2_sys.c b/tests/bpf2c_tests/expected/cgroup_sock_addr2_sys.c
index 3dd2604a5c..827bc08029 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr2_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr2_sys.c
@@ -1361,7 +1361,7 @@ connect_redirect6(void* context, const program_runtime_context_t* runtime_contex
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization4,
         "cgroup~2",
         "cgroup/connect_authorization4",
@@ -1376,7 +1376,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization6,
         "cgroup~1",
         "cgroup/connect_authorization6",
@@ -1391,7 +1391,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_redirect4,
         "cgroup~4",
         "cgroup/connect4",
@@ -1406,7 +1406,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_redirect6,
         "cgroup~3",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_dll.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_dll.c
index 71407f1817..79f6de5f7a 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_dll.c
@@ -286,7 +286,7 @@ authorize_bind6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind4,
         "cgroup~2",
         "cgroup/bind4",
@@ -301,7 +301,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind6,
         "cgroup~1",
         "cgroup/bind6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_raw.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_raw.c
index 39c54f6ac0..46127f68fe 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_raw.c
@@ -256,7 +256,7 @@ authorize_bind6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind4,
         "cgroup~2",
         "cgroup/bind4",
@@ -271,7 +271,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind6,
         "cgroup~1",
         "cgroup/bind6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_sys.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_sys.c
index 68243180bf..9cbab0d019 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_bind_sys.c
@@ -411,7 +411,7 @@ authorize_bind6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind4,
         "cgroup~2",
         "cgroup/bind4",
@@ -426,7 +426,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_bind6,
         "cgroup~1",
         "cgroup/bind6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_dll.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_dll.c
index f28455070b..233554a0f9 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_dll.c
@@ -1450,7 +1450,7 @@ connect_authorization6(void* context, const program_runtime_context_t* runtime_c
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_connect4,
         "cgroup~8",
         "cgroup/connect4",
@@ -1465,7 +1465,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_connect6,
         "cgroup~7",
         "cgroup/connect6",
@@ -1480,7 +1480,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_listen4,
         "cgroup~2",
         "cgroup/listen4",
@@ -1495,7 +1495,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_listen6,
         "cgroup~1",
         "cgroup/listen6",
@@ -1510,7 +1510,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_recv_accept4,
         "cgroup~6",
         "cgroup/recv_accept4",
@@ -1525,7 +1525,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_recv_accept6,
         "cgroup~5",
         "cgroup/recv_accept6",
@@ -1540,7 +1540,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization4,
         "cgroup~4",
         "cgroup/connect_authorization4",
@@ -1555,7 +1555,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization6,
         "cgroup~3",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_dll.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_dll.c
index f0cb48353d..1afdfc8232 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_dll.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_dll.c
@@ -2315,7 +2315,7 @@ test_sock_addr_helpers_v6(void* context, const program_runtime_context_t* runtim
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         conditional_authorization_v4,
         "cgroup~7",
         "cgroup/connect_authorization4",
@@ -2330,7 +2330,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_bind_helpers_v4,
         "cgroup~4",
         "cgroup/bind4",
@@ -2345,7 +2345,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_bind_helpers_v6,
         "cgroup~2",
         "cgroup/bind6",
@@ -2360,7 +2360,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_listen_helpers_v4,
         "cgroup~3",
         "cgroup/listen4",
@@ -2375,7 +2375,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_listen_helpers_v6,
         "cgroup~1",
         "cgroup/listen6",
@@ -2390,7 +2390,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_recv_accept_helpers_v4,
         "cgroup~5",
         "cgroup/recv_accept4",
@@ -2405,7 +2405,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sock_addr_helpers_v4,
         "cgroup~8",
         "cgroup/connect_authorization4",
@@ -2420,7 +2420,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sock_addr_helpers_v6,
         "cgroup~6",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_raw.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_raw.c
index 08ad69e5af..d1e3426f61 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_raw.c
@@ -2285,7 +2285,7 @@ test_sock_addr_helpers_v6(void* context, const program_runtime_context_t* runtim
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         conditional_authorization_v4,
         "cgroup~7",
         "cgroup/connect_authorization4",
@@ -2300,7 +2300,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_bind_helpers_v4,
         "cgroup~4",
         "cgroup/bind4",
@@ -2315,7 +2315,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_bind_helpers_v6,
         "cgroup~2",
         "cgroup/bind6",
@@ -2330,7 +2330,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_listen_helpers_v4,
         "cgroup~3",
         "cgroup/listen4",
@@ -2345,7 +2345,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_listen_helpers_v6,
         "cgroup~1",
         "cgroup/listen6",
@@ -2360,7 +2360,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_recv_accept_helpers_v4,
         "cgroup~5",
         "cgroup/recv_accept4",
@@ -2375,7 +2375,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sock_addr_helpers_v4,
         "cgroup~8",
         "cgroup/connect_authorization4",
@@ -2390,7 +2390,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sock_addr_helpers_v6,
         "cgroup~6",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_sys.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_sys.c
index 5b11e42a51..084db9cfc5 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_helpers_sys.c
@@ -2440,7 +2440,7 @@ test_sock_addr_helpers_v6(void* context, const program_runtime_context_t* runtim
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         conditional_authorization_v4,
         "cgroup~7",
         "cgroup/connect_authorization4",
@@ -2455,7 +2455,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_bind_helpers_v4,
         "cgroup~4",
         "cgroup/bind4",
@@ -2470,7 +2470,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_bind_helpers_v6,
         "cgroup~2",
         "cgroup/bind6",
@@ -2485,7 +2485,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_listen_helpers_v4,
         "cgroup~3",
         "cgroup/listen4",
@@ -2500,7 +2500,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_listen_helpers_v6,
         "cgroup~1",
         "cgroup/listen6",
@@ -2515,7 +2515,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_recv_accept_helpers_v4,
         "cgroup~5",
         "cgroup/recv_accept4",
@@ -2530,7 +2530,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sock_addr_helpers_v4,
         "cgroup~8",
         "cgroup/connect_authorization4",
@@ -2545,7 +2545,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sock_addr_helpers_v6,
         "cgroup~6",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_raw.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_raw.c
index 50b827e393..007e6f6ce6 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_raw.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_raw.c
@@ -1420,7 +1420,7 @@ connect_authorization6(void* context, const program_runtime_context_t* runtime_c
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_connect4,
         "cgroup~8",
         "cgroup/connect4",
@@ -1435,7 +1435,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_connect6,
         "cgroup~7",
         "cgroup/connect6",
@@ -1450,7 +1450,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_listen4,
         "cgroup~2",
         "cgroup/listen4",
@@ -1465,7 +1465,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_listen6,
         "cgroup~1",
         "cgroup/listen6",
@@ -1480,7 +1480,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_recv_accept4,
         "cgroup~6",
         "cgroup/recv_accept4",
@@ -1495,7 +1495,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_recv_accept6,
         "cgroup~5",
         "cgroup/recv_accept6",
@@ -1510,7 +1510,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization4,
         "cgroup~4",
         "cgroup/connect_authorization4",
@@ -1525,7 +1525,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization6,
         "cgroup~3",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/cgroup_sock_addr_sys.c b/tests/bpf2c_tests/expected/cgroup_sock_addr_sys.c
index 563c7c6a28..0cc70fe35f 100644
--- a/tests/bpf2c_tests/expected/cgroup_sock_addr_sys.c
+++ b/tests/bpf2c_tests/expected/cgroup_sock_addr_sys.c
@@ -1575,7 +1575,7 @@ connect_authorization6(void* context, const program_runtime_context_t* runtime_c
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_connect4,
         "cgroup~8",
         "cgroup/connect4",
@@ -1590,7 +1590,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_connect6,
         "cgroup~7",
         "cgroup/connect6",
@@ -1605,7 +1605,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_listen4,
         "cgroup~2",
         "cgroup/listen4",
@@ -1620,7 +1620,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_listen6,
         "cgroup~1",
         "cgroup/listen6",
@@ -1635,7 +1635,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_recv_accept4,
         "cgroup~6",
         "cgroup/recv_accept4",
@@ -1650,7 +1650,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         authorize_recv_accept6,
         "cgroup~5",
         "cgroup/recv_accept6",
@@ -1665,7 +1665,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization4,
         "cgroup~4",
         "cgroup/connect_authorization4",
@@ -1680,7 +1680,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connect_authorization6,
         "cgroup~3",
         "cgroup/connect_authorization6",
diff --git a/tests/bpf2c_tests/expected/custom_map_basic_dll.c b/tests/bpf2c_tests/expected/custom_map_basic_dll.c
index 0b29158069..e0888017e6 100644
--- a/tests/bpf2c_tests/expected/custom_map_basic_dll.c
+++ b/tests/bpf2c_tests/expected/custom_map_basic_dll.c
@@ -1977,7 +1977,7 @@ test_map_update_element(void* context, const program_runtime_context_t* runtime_
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_delete_element,
         "sample~5",
         "sample_ext",
@@ -1992,7 +1992,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_find_and_delete_element,
         "sample~4",
         "sample_ext",
@@ -2007,7 +2007,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_peek_elem,
         "sample~1",
         "sample_ext",
@@ -2022,7 +2022,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_pop_elem,
         "sample~2",
         "sample_ext",
@@ -2037,7 +2037,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_push_elem,
         "sample~3",
         "sample_ext",
@@ -2052,7 +2052,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_increment,
         "sample~9",
         "sample_ext",
@@ -2067,7 +2067,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_increment_invalid,
         "sample~7",
         "sample_ext",
@@ -2082,7 +2082,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_value,
         "sample~8",
         "sample_ext",
@@ -2097,7 +2097,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_increment,
         "sampl~10",
         "sample_ext",
@@ -2112,7 +2112,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_update_element,
         "sample~6",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/custom_map_basic_raw.c b/tests/bpf2c_tests/expected/custom_map_basic_raw.c
index b0ac902bd3..82511edfbe 100644
--- a/tests/bpf2c_tests/expected/custom_map_basic_raw.c
+++ b/tests/bpf2c_tests/expected/custom_map_basic_raw.c
@@ -1947,7 +1947,7 @@ test_map_update_element(void* context, const program_runtime_context_t* runtime_
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_delete_element,
         "sample~5",
         "sample_ext",
@@ -1962,7 +1962,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_find_and_delete_element,
         "sample~4",
         "sample_ext",
@@ -1977,7 +1977,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_peek_elem,
         "sample~1",
         "sample_ext",
@@ -1992,7 +1992,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_pop_elem,
         "sample~2",
         "sample_ext",
@@ -2007,7 +2007,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_push_elem,
         "sample~3",
         "sample_ext",
@@ -2022,7 +2022,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_increment,
         "sample~9",
         "sample_ext",
@@ -2037,7 +2037,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_increment_invalid,
         "sample~7",
         "sample_ext",
@@ -2052,7 +2052,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_value,
         "sample~8",
         "sample_ext",
@@ -2067,7 +2067,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_increment,
         "sampl~10",
         "sample_ext",
@@ -2082,7 +2082,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_update_element,
         "sample~6",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/custom_map_basic_sys.c b/tests/bpf2c_tests/expected/custom_map_basic_sys.c
index 0568f5baa0..ca6dfb0195 100644
--- a/tests/bpf2c_tests/expected/custom_map_basic_sys.c
+++ b/tests/bpf2c_tests/expected/custom_map_basic_sys.c
@@ -2102,7 +2102,7 @@ test_map_update_element(void* context, const program_runtime_context_t* runtime_
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_delete_element,
         "sample~5",
         "sample_ext",
@@ -2117,7 +2117,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_find_and_delete_element,
         "sample~4",
         "sample_ext",
@@ -2132,7 +2132,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_peek_elem,
         "sample~1",
         "sample_ext",
@@ -2147,7 +2147,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_pop_elem,
         "sample~2",
         "sample_ext",
@@ -2162,7 +2162,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_push_elem,
         "sample~3",
         "sample_ext",
@@ -2177,7 +2177,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_increment,
         "sample~9",
         "sample_ext",
@@ -2192,7 +2192,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_increment_invalid,
         "sample~7",
         "sample_ext",
@@ -2207,7 +2207,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_helper_value,
         "sample~8",
         "sample_ext",
@@ -2222,7 +2222,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_read_increment,
         "sampl~10",
         "sample_ext",
@@ -2237,7 +2237,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_map_update_element,
         "sample~6",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/custom_map_invalid_dll.c b/tests/bpf2c_tests/expected/custom_map_invalid_dll.c
index fd9ed9050a..4633d9bb31 100644
--- a/tests/bpf2c_tests/expected/custom_map_invalid_dll.c
+++ b/tests/bpf2c_tests/expected/custom_map_invalid_dll.c
@@ -177,7 +177,7 @@ access_map(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         access_map,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/custom_map_invalid_raw.c b/tests/bpf2c_tests/expected/custom_map_invalid_raw.c
index 35740eee29..1843b5a9e6 100644
--- a/tests/bpf2c_tests/expected/custom_map_invalid_raw.c
+++ b/tests/bpf2c_tests/expected/custom_map_invalid_raw.c
@@ -147,7 +147,7 @@ access_map(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         access_map,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/custom_map_invalid_sys.c b/tests/bpf2c_tests/expected/custom_map_invalid_sys.c
index dc71285f08..f91cd21299 100644
--- a/tests/bpf2c_tests/expected/custom_map_invalid_sys.c
+++ b/tests/bpf2c_tests/expected/custom_map_invalid_sys.c
@@ -302,7 +302,7 @@ access_map(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         access_map,
         "cgroup~1",
         "cgroup/connect4",
diff --git a/tests/bpf2c_tests/expected/divide_by_zero_dll.c b/tests/bpf2c_tests/expected/divide_by_zero_dll.c
index 52e13e5432..408aefc128 100644
--- a/tests/bpf2c_tests/expected/divide_by_zero_dll.c
+++ b/tests/bpf2c_tests/expected/divide_by_zero_dll.c
@@ -179,7 +179,7 @@ divide_by_zero(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         divide_by_zero,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/divide_by_zero_raw.c b/tests/bpf2c_tests/expected/divide_by_zero_raw.c
index 79d762f01b..2f8d00090d 100644
--- a/tests/bpf2c_tests/expected/divide_by_zero_raw.c
+++ b/tests/bpf2c_tests/expected/divide_by_zero_raw.c
@@ -149,7 +149,7 @@ divide_by_zero(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         divide_by_zero,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/divide_by_zero_sys.c b/tests/bpf2c_tests/expected/divide_by_zero_sys.c
index f835ef09b6..9c1ba2ea5c 100644
--- a/tests/bpf2c_tests/expected/divide_by_zero_sys.c
+++ b/tests/bpf2c_tests/expected/divide_by_zero_sys.c
@@ -304,7 +304,7 @@ divide_by_zero(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         divide_by_zero,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/droppacket_dll.c b/tests/bpf2c_tests/expected/droppacket_dll.c
index d85b5f9601..fcd151bb0e 100644
--- a/tests/bpf2c_tests/expected/droppacket_dll.c
+++ b/tests/bpf2c_tests/expected/droppacket_dll.c
@@ -328,7 +328,7 @@ DropPacket(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         DropPacket,
         "xdp",
         "xdp",
diff --git a/tests/bpf2c_tests/expected/droppacket_raw.c b/tests/bpf2c_tests/expected/droppacket_raw.c
index 4eb721c9b0..194aa37a2e 100644
--- a/tests/bpf2c_tests/expected/droppacket_raw.c
+++ b/tests/bpf2c_tests/expected/droppacket_raw.c
@@ -298,7 +298,7 @@ DropPacket(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         DropPacket,
         "xdp",
         "xdp",
diff --git a/tests/bpf2c_tests/expected/droppacket_sys.c b/tests/bpf2c_tests/expected/droppacket_sys.c
index f78c6b9437..c7ba315cf5 100644
--- a/tests/bpf2c_tests/expected/droppacket_sys.c
+++ b/tests/bpf2c_tests/expected/droppacket_sys.c
@@ -453,7 +453,7 @@ DropPacket(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         DropPacket,
         "xdp",
         "xdp",
diff --git a/tests/bpf2c_tests/expected/global_vars_and_map_dll.c b/tests/bpf2c_tests/expected/global_vars_and_map_dll.c
index 1cc4af404f..fae80107ef 100644
--- a/tests/bpf2c_tests/expected/global_vars_and_map_dll.c
+++ b/tests/bpf2c_tests/expected/global_vars_and_map_dll.c
@@ -226,7 +226,7 @@ GlobalVariableAndMapTest(void* context, const program_runtime_context_t* runtime
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         GlobalVariableAndMapTest,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/global_vars_and_map_raw.c b/tests/bpf2c_tests/expected/global_vars_and_map_raw.c
index 6a715bdb9b..a2de417d7d 100644
--- a/tests/bpf2c_tests/expected/global_vars_and_map_raw.c
+++ b/tests/bpf2c_tests/expected/global_vars_and_map_raw.c
@@ -196,7 +196,7 @@ GlobalVariableAndMapTest(void* context, const program_runtime_context_t* runtime
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         GlobalVariableAndMapTest,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/global_vars_and_map_sys.c b/tests/bpf2c_tests/expected/global_vars_and_map_sys.c
index 80ade31f6a..75eb6913a4 100644
--- a/tests/bpf2c_tests/expected/global_vars_and_map_sys.c
+++ b/tests/bpf2c_tests/expected/global_vars_and_map_sys.c
@@ -351,7 +351,7 @@ GlobalVariableAndMapTest(void* context, const program_runtime_context_t* runtime
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         GlobalVariableAndMapTest,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/global_vars_dll.c b/tests/bpf2c_tests/expected/global_vars_dll.c
index 3283dba160..de65169db7 100644
--- a/tests/bpf2c_tests/expected/global_vars_dll.c
+++ b/tests/bpf2c_tests/expected/global_vars_dll.c
@@ -233,7 +233,7 @@ GlobalVariableTest(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         GlobalVariableTest,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/global_vars_raw.c b/tests/bpf2c_tests/expected/global_vars_raw.c
index 6a924044cc..8bedab05a5 100644
--- a/tests/bpf2c_tests/expected/global_vars_raw.c
+++ b/tests/bpf2c_tests/expected/global_vars_raw.c
@@ -203,7 +203,7 @@ GlobalVariableTest(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         GlobalVariableTest,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/global_vars_sys.c b/tests/bpf2c_tests/expected/global_vars_sys.c
index 2dbc5a1eb0..f7511a6f17 100644
--- a/tests/bpf2c_tests/expected/global_vars_sys.c
+++ b/tests/bpf2c_tests/expected/global_vars_sys.c
@@ -358,7 +358,7 @@ GlobalVariableTest(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         GlobalVariableTest,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/hash_of_map_dll.c b/tests/bpf2c_tests/expected/hash_of_map_dll.c
index c9eeb7fa93..8c0de90796 100644
--- a/tests/bpf2c_tests/expected/hash_of_map_dll.c
+++ b/tests/bpf2c_tests/expected/hash_of_map_dll.c
@@ -215,7 +215,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/hash_of_map_raw.c b/tests/bpf2c_tests/expected/hash_of_map_raw.c
index 137228f97e..e7b18762fe 100644
--- a/tests/bpf2c_tests/expected/hash_of_map_raw.c
+++ b/tests/bpf2c_tests/expected/hash_of_map_raw.c
@@ -185,7 +185,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/hash_of_map_sys.c b/tests/bpf2c_tests/expected/hash_of_map_sys.c
index 15da8aa6b8..bb3c4b711c 100644
--- a/tests/bpf2c_tests/expected/hash_of_map_sys.c
+++ b/tests/bpf2c_tests/expected/hash_of_map_sys.c
@@ -340,7 +340,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/inner_map_dll.c b/tests/bpf2c_tests/expected/inner_map_dll.c
index de45a522aa..b7cda19482 100644
--- a/tests/bpf2c_tests/expected/inner_map_dll.c
+++ b/tests/bpf2c_tests/expected/inner_map_dll.c
@@ -323,7 +323,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/inner_map_raw.c b/tests/bpf2c_tests/expected/inner_map_raw.c
index 5cef92dfec..0b56260360 100644
--- a/tests/bpf2c_tests/expected/inner_map_raw.c
+++ b/tests/bpf2c_tests/expected/inner_map_raw.c
@@ -293,7 +293,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/inner_map_sys.c b/tests/bpf2c_tests/expected/inner_map_sys.c
index 9c0aba2891..4d12173623 100644
--- a/tests/bpf2c_tests/expected/inner_map_sys.c
+++ b/tests/bpf2c_tests/expected/inner_map_sys.c
@@ -448,7 +448,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/lru_map_test_dll.c b/tests/bpf2c_tests/expected/lru_map_test_dll.c
index e26c4f9ced..75af017884 100644
--- a/tests/bpf2c_tests/expected/lru_map_test_dll.c
+++ b/tests/bpf2c_tests/expected/lru_map_test_dll.c
@@ -236,7 +236,7 @@ lru_lookup_program(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lru_lookup_program,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/lru_map_test_raw.c b/tests/bpf2c_tests/expected/lru_map_test_raw.c
index 25de471e51..81f92c4867 100644
--- a/tests/bpf2c_tests/expected/lru_map_test_raw.c
+++ b/tests/bpf2c_tests/expected/lru_map_test_raw.c
@@ -206,7 +206,7 @@ lru_lookup_program(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lru_lookup_program,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/lru_map_test_sys.c b/tests/bpf2c_tests/expected/lru_map_test_sys.c
index 160b79f7b3..b4d55dd3c3 100644
--- a/tests/bpf2c_tests/expected/lru_map_test_sys.c
+++ b/tests/bpf2c_tests/expected/lru_map_test_sys.c
@@ -361,7 +361,7 @@ lru_lookup_program(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lru_lookup_program,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_dll.c b/tests/bpf2c_tests/expected/map_dll.c
index 4fcfe9dcc2..c005d8173a 100644
--- a/tests/bpf2c_tests/expected/map_dll.c
+++ b/tests/bpf2c_tests/expected/map_dll.c
@@ -5068,7 +5068,7 @@ test_maps(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_maps,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_btf_dll.c b/tests/bpf2c_tests/expected/map_in_map_btf_dll.c
index 742a6e2ea8..3764ad2673 100644
--- a/tests/bpf2c_tests/expected/map_in_map_btf_dll.c
+++ b/tests/bpf2c_tests/expected/map_in_map_btf_dll.c
@@ -215,7 +215,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_btf_raw.c b/tests/bpf2c_tests/expected/map_in_map_btf_raw.c
index 806d644d43..e3ce004504 100644
--- a/tests/bpf2c_tests/expected/map_in_map_btf_raw.c
+++ b/tests/bpf2c_tests/expected/map_in_map_btf_raw.c
@@ -185,7 +185,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_btf_sys.c b/tests/bpf2c_tests/expected/map_in_map_btf_sys.c
index 7826461d4f..aca53742be 100644
--- a/tests/bpf2c_tests/expected/map_in_map_btf_sys.c
+++ b/tests/bpf2c_tests/expected/map_in_map_btf_sys.c
@@ -340,7 +340,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_legacy_id_dll.c b/tests/bpf2c_tests/expected/map_in_map_legacy_id_dll.c
index 3a4df39320..c1b5ba6073 100644
--- a/tests/bpf2c_tests/expected/map_in_map_legacy_id_dll.c
+++ b/tests/bpf2c_tests/expected/map_in_map_legacy_id_dll.c
@@ -215,7 +215,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_legacy_id_raw.c b/tests/bpf2c_tests/expected/map_in_map_legacy_id_raw.c
index 4709ad5813..04ce77ffeb 100644
--- a/tests/bpf2c_tests/expected/map_in_map_legacy_id_raw.c
+++ b/tests/bpf2c_tests/expected/map_in_map_legacy_id_raw.c
@@ -185,7 +185,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_legacy_id_sys.c b/tests/bpf2c_tests/expected/map_in_map_legacy_id_sys.c
index 1e57f8f98e..1f33f06b68 100644
--- a/tests/bpf2c_tests/expected/map_in_map_legacy_id_sys.c
+++ b/tests/bpf2c_tests/expected/map_in_map_legacy_id_sys.c
@@ -340,7 +340,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_legacy_idx_dll.c b/tests/bpf2c_tests/expected/map_in_map_legacy_idx_dll.c
index afb06d8b1a..02adf8e48a 100644
--- a/tests/bpf2c_tests/expected/map_in_map_legacy_idx_dll.c
+++ b/tests/bpf2c_tests/expected/map_in_map_legacy_idx_dll.c
@@ -215,7 +215,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_legacy_idx_raw.c b/tests/bpf2c_tests/expected/map_in_map_legacy_idx_raw.c
index 6f08950148..56542fda25 100644
--- a/tests/bpf2c_tests/expected/map_in_map_legacy_idx_raw.c
+++ b/tests/bpf2c_tests/expected/map_in_map_legacy_idx_raw.c
@@ -185,7 +185,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_in_map_legacy_idx_sys.c b/tests/bpf2c_tests/expected/map_in_map_legacy_idx_sys.c
index cfcfbc5624..38086fb14d 100644
--- a/tests/bpf2c_tests/expected/map_in_map_legacy_idx_sys.c
+++ b/tests/bpf2c_tests/expected/map_in_map_legacy_idx_sys.c
@@ -340,7 +340,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_raw.c b/tests/bpf2c_tests/expected/map_raw.c
index c9f066d249..94ede5ea75 100644
--- a/tests/bpf2c_tests/expected/map_raw.c
+++ b/tests/bpf2c_tests/expected/map_raw.c
@@ -5038,7 +5038,7 @@ test_maps(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_maps,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_reuse_2_dll.c b/tests/bpf2c_tests/expected/map_reuse_2_dll.c
index e82fb03865..7e268ae7a1 100644
--- a/tests/bpf2c_tests/expected/map_reuse_2_dll.c
+++ b/tests/bpf2c_tests/expected/map_reuse_2_dll.c
@@ -274,7 +274,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_reuse_2_raw.c b/tests/bpf2c_tests/expected/map_reuse_2_raw.c
index dbfba034f2..57b668a434 100644
--- a/tests/bpf2c_tests/expected/map_reuse_2_raw.c
+++ b/tests/bpf2c_tests/expected/map_reuse_2_raw.c
@@ -244,7 +244,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_reuse_2_sys.c b/tests/bpf2c_tests/expected/map_reuse_2_sys.c
index ac212f3f50..a754e7442f 100644
--- a/tests/bpf2c_tests/expected/map_reuse_2_sys.c
+++ b/tests/bpf2c_tests/expected/map_reuse_2_sys.c
@@ -399,7 +399,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_reuse_dll.c b/tests/bpf2c_tests/expected/map_reuse_dll.c
index f8cd0399fa..d0f8484bbf 100644
--- a/tests/bpf2c_tests/expected/map_reuse_dll.c
+++ b/tests/bpf2c_tests/expected/map_reuse_dll.c
@@ -274,7 +274,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_reuse_raw.c b/tests/bpf2c_tests/expected/map_reuse_raw.c
index babd8e2369..0d1c045bf3 100644
--- a/tests/bpf2c_tests/expected/map_reuse_raw.c
+++ b/tests/bpf2c_tests/expected/map_reuse_raw.c
@@ -244,7 +244,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_reuse_sys.c b/tests/bpf2c_tests/expected/map_reuse_sys.c
index 1509453a6f..150e4adc47 100644
--- a/tests/bpf2c_tests/expected/map_reuse_sys.c
+++ b/tests/bpf2c_tests/expected/map_reuse_sys.c
@@ -399,7 +399,7 @@ lookup_update(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup_update,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_synchronized_update_dll.c b/tests/bpf2c_tests/expected/map_synchronized_update_dll.c
index 1087fd37f9..00a0a277ed 100644
--- a/tests/bpf2c_tests/expected/map_synchronized_update_dll.c
+++ b/tests/bpf2c_tests/expected/map_synchronized_update_dll.c
@@ -287,7 +287,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_synchronized_update_raw.c b/tests/bpf2c_tests/expected/map_synchronized_update_raw.c
index 7c8ef95323..d252abd459 100644
--- a/tests/bpf2c_tests/expected/map_synchronized_update_raw.c
+++ b/tests/bpf2c_tests/expected/map_synchronized_update_raw.c
@@ -257,7 +257,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_synchronized_update_sys.c b/tests/bpf2c_tests/expected/map_synchronized_update_sys.c
index 9cd5115116..5eea7c8780 100644
--- a/tests/bpf2c_tests/expected/map_synchronized_update_sys.c
+++ b/tests/bpf2c_tests/expected/map_synchronized_update_sys.c
@@ -412,7 +412,7 @@ lookup(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         lookup,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/map_sys.c b/tests/bpf2c_tests/expected/map_sys.c
index 2bcfc4dc5e..24d8168ea6 100644
--- a/tests/bpf2c_tests/expected/map_sys.c
+++ b/tests/bpf2c_tests/expected/map_sys.c
@@ -5193,7 +5193,7 @@ test_maps(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_maps,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/multi_prog_same_section_dll.c b/tests/bpf2c_tests/expected/multi_prog_same_section_dll.c
index adda564c9c..bdde6b3f10 100644
--- a/tests/bpf2c_tests/expected/multi_prog_same_section_dll.c
+++ b/tests/bpf2c_tests/expected/multi_prog_same_section_dll.c
@@ -135,7 +135,7 @@ prog2(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         prog1,
         "bind",
         "bind",
@@ -150,7 +150,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         prog2,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/multi_prog_same_section_raw.c b/tests/bpf2c_tests/expected/multi_prog_same_section_raw.c
index 00fd90ae3c..f274a38e2b 100644
--- a/tests/bpf2c_tests/expected/multi_prog_same_section_raw.c
+++ b/tests/bpf2c_tests/expected/multi_prog_same_section_raw.c
@@ -105,7 +105,7 @@ prog2(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         prog1,
         "bind",
         "bind",
@@ -120,7 +120,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         prog2,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/multi_prog_same_section_sys.c b/tests/bpf2c_tests/expected/multi_prog_same_section_sys.c
index 9b0799737c..8f68111aef 100644
--- a/tests/bpf2c_tests/expected/multi_prog_same_section_sys.c
+++ b/tests/bpf2c_tests/expected/multi_prog_same_section_sys.c
@@ -260,7 +260,7 @@ prog2(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         prog1,
         "bind",
         "bind",
@@ -275,7 +275,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         prog2,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/multiple_programs_dll.c b/tests/bpf2c_tests/expected/multiple_programs_dll.c
index a23d76f13d..c7f7c8a75b 100644
--- a/tests/bpf2c_tests/expected/multiple_programs_dll.c
+++ b/tests/bpf2c_tests/expected/multiple_programs_dll.c
@@ -207,7 +207,7 @@ program4(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program1,
         "bind_4",
         "bind_4",
@@ -222,7 +222,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program2,
         "bind_3",
         "bind_3",
@@ -237,7 +237,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program3,
         "bind_2",
         "bind_2",
@@ -252,7 +252,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program4,
         "bind_1",
         "bind_1",
diff --git a/tests/bpf2c_tests/expected/multiple_programs_raw.c b/tests/bpf2c_tests/expected/multiple_programs_raw.c
index c650f21345..3912b92a74 100644
--- a/tests/bpf2c_tests/expected/multiple_programs_raw.c
+++ b/tests/bpf2c_tests/expected/multiple_programs_raw.c
@@ -177,7 +177,7 @@ program4(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program1,
         "bind_4",
         "bind_4",
@@ -192,7 +192,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program2,
         "bind_3",
         "bind_3",
@@ -207,7 +207,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program3,
         "bind_2",
         "bind_2",
@@ -222,7 +222,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program4,
         "bind_1",
         "bind_1",
diff --git a/tests/bpf2c_tests/expected/multiple_programs_sys.c b/tests/bpf2c_tests/expected/multiple_programs_sys.c
index e6824afeb2..bb1c9d5345 100644
--- a/tests/bpf2c_tests/expected/multiple_programs_sys.c
+++ b/tests/bpf2c_tests/expected/multiple_programs_sys.c
@@ -332,7 +332,7 @@ program4(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program1,
         "bind_4",
         "bind_4",
@@ -347,7 +347,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program2,
         "bind_3",
         "bind_3",
@@ -362,7 +362,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program3,
         "bind_2",
         "bind_2",
@@ -377,7 +377,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         program4,
         "bind_1",
         "bind_1",
diff --git a/tests/bpf2c_tests/expected/perf_event_burst_dll.c b/tests/bpf2c_tests/expected/perf_event_burst_dll.c
index b6af2c4075..b79c7376b2 100644
--- a/tests/bpf2c_tests/expected/perf_event_burst_dll.c
+++ b/tests/bpf2c_tests/expected/perf_event_burst_dll.c
@@ -293,7 +293,7 @@ perf_event_burst(void* context, const program_runtime_context_t* runtime_context
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         perf_event_burst,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/perf_event_burst_raw.c b/tests/bpf2c_tests/expected/perf_event_burst_raw.c
index 2ce66933ae..43c912546c 100644
--- a/tests/bpf2c_tests/expected/perf_event_burst_raw.c
+++ b/tests/bpf2c_tests/expected/perf_event_burst_raw.c
@@ -263,7 +263,7 @@ perf_event_burst(void* context, const program_runtime_context_t* runtime_context
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         perf_event_burst,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/perf_event_burst_sys.c b/tests/bpf2c_tests/expected/perf_event_burst_sys.c
index 6766d15870..920acc65d9 100644
--- a/tests/bpf2c_tests/expected/perf_event_burst_sys.c
+++ b/tests/bpf2c_tests/expected/perf_event_burst_sys.c
@@ -418,7 +418,7 @@ perf_event_burst(void* context, const program_runtime_context_t* runtime_context
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         perf_event_burst,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/perf_event_cpu_target_dll.c b/tests/bpf2c_tests/expected/perf_event_cpu_target_dll.c
index b92931e311..e8d8e4822f 100644
--- a/tests/bpf2c_tests/expected/perf_event_cpu_target_dll.c
+++ b/tests/bpf2c_tests/expected/perf_event_cpu_target_dll.c
@@ -189,7 +189,7 @@ perf_event_cpu_target(void* context, const program_runtime_context_t* runtime_co
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         perf_event_cpu_target,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/perf_event_cpu_target_raw.c b/tests/bpf2c_tests/expected/perf_event_cpu_target_raw.c
index 62a657c54d..62e1cc5a55 100644
--- a/tests/bpf2c_tests/expected/perf_event_cpu_target_raw.c
+++ b/tests/bpf2c_tests/expected/perf_event_cpu_target_raw.c
@@ -159,7 +159,7 @@ perf_event_cpu_target(void* context, const program_runtime_context_t* runtime_co
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         perf_event_cpu_target,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/perf_event_cpu_target_sys.c b/tests/bpf2c_tests/expected/perf_event_cpu_target_sys.c
index 06a805a958..17ffe242f9 100644
--- a/tests/bpf2c_tests/expected/perf_event_cpu_target_sys.c
+++ b/tests/bpf2c_tests/expected/perf_event_cpu_target_sys.c
@@ -314,7 +314,7 @@ perf_event_cpu_target(void* context, const program_runtime_context_t* runtime_co
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         perf_event_cpu_target,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/pidtgid_dll.c b/tests/bpf2c_tests/expected/pidtgid_dll.c
index ad9e15d276..352151b674 100644
--- a/tests/bpf2c_tests/expected/pidtgid_dll.c
+++ b/tests/bpf2c_tests/expected/pidtgid_dll.c
@@ -252,7 +252,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/pidtgid_raw.c b/tests/bpf2c_tests/expected/pidtgid_raw.c
index d8938b3716..0d06724e68 100644
--- a/tests/bpf2c_tests/expected/pidtgid_raw.c
+++ b/tests/bpf2c_tests/expected/pidtgid_raw.c
@@ -222,7 +222,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/pidtgid_sys.c b/tests/bpf2c_tests/expected/pidtgid_sys.c
index 7623efd516..ab19bc0fd1 100644
--- a/tests/bpf2c_tests/expected/pidtgid_sys.c
+++ b/tests/bpf2c_tests/expected/pidtgid_sys.c
@@ -377,7 +377,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/printk_dll.c b/tests/bpf2c_tests/expected/printk_dll.c
index 566c7c1b81..4ae09c0324 100644
--- a/tests/bpf2c_tests/expected/printk_dll.c
+++ b/tests/bpf2c_tests/expected/printk_dll.c
@@ -600,7 +600,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/printk_legacy_dll.c b/tests/bpf2c_tests/expected/printk_legacy_dll.c
index 19df2177a7..05c9d0d2cb 100644
--- a/tests/bpf2c_tests/expected/printk_legacy_dll.c
+++ b/tests/bpf2c_tests/expected/printk_legacy_dll.c
@@ -499,7 +499,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/printk_legacy_raw.c b/tests/bpf2c_tests/expected/printk_legacy_raw.c
index ebecd7a620..308865422d 100644
--- a/tests/bpf2c_tests/expected/printk_legacy_raw.c
+++ b/tests/bpf2c_tests/expected/printk_legacy_raw.c
@@ -469,7 +469,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/printk_legacy_sys.c b/tests/bpf2c_tests/expected/printk_legacy_sys.c
index b37c9af6b8..c910ebb5f8 100644
--- a/tests/bpf2c_tests/expected/printk_legacy_sys.c
+++ b/tests/bpf2c_tests/expected/printk_legacy_sys.c
@@ -624,7 +624,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/printk_raw.c b/tests/bpf2c_tests/expected/printk_raw.c
index 4fe68d869c..201f227f8a 100644
--- a/tests/bpf2c_tests/expected/printk_raw.c
+++ b/tests/bpf2c_tests/expected/printk_raw.c
@@ -570,7 +570,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/printk_sys.c b/tests/bpf2c_tests/expected/printk_sys.c
index 279e49b9c7..bd85c9dab5 100644
--- a/tests/bpf2c_tests/expected/printk_sys.c
+++ b/tests/bpf2c_tests/expected/printk_sys.c
@@ -725,7 +725,7 @@ func(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         func,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/process_start_key_dll.c b/tests/bpf2c_tests/expected/process_start_key_dll.c
index f5d4177cdf..4085f12212 100644
--- a/tests/bpf2c_tests/expected/process_start_key_dll.c
+++ b/tests/bpf2c_tests/expected/process_start_key_dll.c
@@ -326,7 +326,7 @@ function_v6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v4,
         "cgroup~2",
         "cgroup/connect4",
@@ -341,7 +341,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/process_start_key_raw.c b/tests/bpf2c_tests/expected/process_start_key_raw.c
index ad81d388f6..2302deb482 100644
--- a/tests/bpf2c_tests/expected/process_start_key_raw.c
+++ b/tests/bpf2c_tests/expected/process_start_key_raw.c
@@ -296,7 +296,7 @@ function_v6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v4,
         "cgroup~2",
         "cgroup/connect4",
@@ -311,7 +311,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/process_start_key_sys.c b/tests/bpf2c_tests/expected/process_start_key_sys.c
index 5f863b60d8..8c2a3ba7b6 100644
--- a/tests/bpf2c_tests/expected/process_start_key_sys.c
+++ b/tests/bpf2c_tests/expected/process_start_key_sys.c
@@ -451,7 +451,7 @@ function_v6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v4,
         "cgroup~2",
         "cgroup/connect4",
@@ -466,7 +466,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/sockops_dll.c b/tests/bpf2c_tests/expected/sockops_dll.c
index bff6db9e80..8a473640a6 100644
--- a/tests/bpf2c_tests/expected/sockops_dll.c
+++ b/tests/bpf2c_tests/expected/sockops_dll.c
@@ -719,7 +719,7 @@ connection_monitor(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connection_monitor,
         "sockops",
         "sockops",
diff --git a/tests/bpf2c_tests/expected/sockops_flow_id_dll.c b/tests/bpf2c_tests/expected/sockops_flow_id_dll.c
index e58550939a..a50d0818d4 100644
--- a/tests/bpf2c_tests/expected/sockops_flow_id_dll.c
+++ b/tests/bpf2c_tests/expected/sockops_flow_id_dll.c
@@ -852,7 +852,7 @@ flow_id_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         flow_id_monitor,
         "sockops",
         "sockops",
diff --git a/tests/bpf2c_tests/expected/sockops_flow_id_raw.c b/tests/bpf2c_tests/expected/sockops_flow_id_raw.c
index 3bad31b72f..882720f563 100644
--- a/tests/bpf2c_tests/expected/sockops_flow_id_raw.c
+++ b/tests/bpf2c_tests/expected/sockops_flow_id_raw.c
@@ -822,7 +822,7 @@ flow_id_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         flow_id_monitor,
         "sockops",
         "sockops",
diff --git a/tests/bpf2c_tests/expected/sockops_flow_id_sys.c b/tests/bpf2c_tests/expected/sockops_flow_id_sys.c
index 1aaf552da8..4e8a0727e6 100644
--- a/tests/bpf2c_tests/expected/sockops_flow_id_sys.c
+++ b/tests/bpf2c_tests/expected/sockops_flow_id_sys.c
@@ -977,7 +977,7 @@ flow_id_monitor(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         flow_id_monitor,
         "sockops",
         "sockops",
diff --git a/tests/bpf2c_tests/expected/sockops_raw.c b/tests/bpf2c_tests/expected/sockops_raw.c
index 4283ff5434..6cae773cbc 100644
--- a/tests/bpf2c_tests/expected/sockops_raw.c
+++ b/tests/bpf2c_tests/expected/sockops_raw.c
@@ -689,7 +689,7 @@ connection_monitor(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connection_monitor,
         "sockops",
         "sockops",
diff --git a/tests/bpf2c_tests/expected/sockops_sys.c b/tests/bpf2c_tests/expected/sockops_sys.c
index 0b0d242484..06d92943ec 100644
--- a/tests/bpf2c_tests/expected/sockops_sys.c
+++ b/tests/bpf2c_tests/expected/sockops_sys.c
@@ -844,7 +844,7 @@ connection_monitor(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         connection_monitor,
         "sockops",
         "sockops",
diff --git a/tests/bpf2c_tests/expected/strings_dll.c b/tests/bpf2c_tests/expected/strings_dll.c
index b057fbd51b..f2a894410c 100644
--- a/tests/bpf2c_tests/expected/strings_dll.c
+++ b/tests/bpf2c_tests/expected/strings_dll.c
@@ -455,7 +455,7 @@ StringOpsTest(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         StringOpsTest,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/strings_raw.c b/tests/bpf2c_tests/expected/strings_raw.c
index a0dad78fe5..b8df990a54 100644
--- a/tests/bpf2c_tests/expected/strings_raw.c
+++ b/tests/bpf2c_tests/expected/strings_raw.c
@@ -425,7 +425,7 @@ StringOpsTest(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         StringOpsTest,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/strings_sys.c b/tests/bpf2c_tests/expected/strings_sys.c
index 66627e8985..feb1551c48 100644
--- a/tests/bpf2c_tests/expected/strings_sys.c
+++ b/tests/bpf2c_tests/expected/strings_sys.c
@@ -580,7 +580,7 @@ StringOpsTest(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         StringOpsTest,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/tail_call_bad_dll.c b/tests/bpf2c_tests/expected/tail_call_bad_dll.c
index 17186b1e66..1bff3ea52e 100644
--- a/tests/bpf2c_tests/expected/tail_call_bad_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_bad_dll.c
@@ -254,7 +254,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext/0",
@@ -269,7 +269,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_bad_raw.c b/tests/bpf2c_tests/expected/tail_call_bad_raw.c
index f54cb6d448..9604ad3302 100644
--- a/tests/bpf2c_tests/expected/tail_call_bad_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_bad_raw.c
@@ -224,7 +224,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext/0",
@@ -239,7 +239,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_bad_sys.c b/tests/bpf2c_tests/expected/tail_call_bad_sys.c
index 4ac79fc36a..d33bb8cee9 100644
--- a/tests/bpf2c_tests/expected/tail_call_bad_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_bad_sys.c
@@ -379,7 +379,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext/0",
@@ -394,7 +394,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_dll.c b/tests/bpf2c_tests/expected/tail_call_dll.c
index d30ec87274..e9ce5e57bc 100644
--- a/tests/bpf2c_tests/expected/tail_call_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_dll.c
@@ -249,7 +249,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext/0",
@@ -264,7 +264,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_map_dll.c b/tests/bpf2c_tests/expected/tail_call_map_dll.c
index e4c5ad18b0..c1574658bb 100644
--- a/tests/bpf2c_tests/expected/tail_call_map_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_map_dll.c
@@ -240,7 +240,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~2",
         "sample_ext/0",
@@ -255,7 +255,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_map_raw.c b/tests/bpf2c_tests/expected/tail_call_map_raw.c
index be2c50d00d..8038981056 100644
--- a/tests/bpf2c_tests/expected/tail_call_map_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_map_raw.c
@@ -210,7 +210,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~2",
         "sample_ext/0",
@@ -225,7 +225,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_map_sys.c b/tests/bpf2c_tests/expected/tail_call_map_sys.c
index a0f335676b..6638ff0978 100644
--- a/tests/bpf2c_tests/expected/tail_call_map_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_map_sys.c
@@ -365,7 +365,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~2",
         "sample_ext/0",
@@ -380,7 +380,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_max_exceed_dll.c b/tests/bpf2c_tests/expected/tail_call_max_exceed_dll.c
index 85016921cf..ed88c143d3 100644
--- a/tests/bpf2c_tests/expected/tail_call_max_exceed_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_max_exceed_dll.c
@@ -7282,7 +7282,7 @@ bind_test_caller(void* context, const program_runtime_context_t* runtime_context
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee0,
         "bind/0",
         "bind/0",
@@ -7297,7 +7297,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee1,
         "bind/1",
         "bind/1",
@@ -7312,7 +7312,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee10,
         "bind/10",
         "bind/10",
@@ -7327,7 +7327,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee11,
         "bind/11",
         "bind/11",
@@ -7342,7 +7342,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee12,
         "bind/12",
         "bind/12",
@@ -7357,7 +7357,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee13,
         "bind/13",
         "bind/13",
@@ -7372,7 +7372,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee14,
         "bind/14",
         "bind/14",
@@ -7387,7 +7387,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee15,
         "bind/15",
         "bind/15",
@@ -7402,7 +7402,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee16,
         "bind/16",
         "bind/16",
@@ -7417,7 +7417,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee17,
         "bind/17",
         "bind/17",
@@ -7432,7 +7432,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee18,
         "bind/18",
         "bind/18",
@@ -7447,7 +7447,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee19,
         "bind/19",
         "bind/19",
@@ -7462,7 +7462,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee2,
         "bind/2",
         "bind/2",
@@ -7477,7 +7477,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee20,
         "bind/20",
         "bind/20",
@@ -7492,7 +7492,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee21,
         "bind/21",
         "bind/21",
@@ -7507,7 +7507,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee22,
         "bind/22",
         "bind/22",
@@ -7522,7 +7522,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee23,
         "bind/23",
         "bind/23",
@@ -7537,7 +7537,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee24,
         "bind/24",
         "bind/24",
@@ -7552,7 +7552,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee25,
         "bind/25",
         "bind/25",
@@ -7567,7 +7567,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee26,
         "bind/26",
         "bind/26",
@@ -7582,7 +7582,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee27,
         "bind/27",
         "bind/27",
@@ -7597,7 +7597,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee28,
         "bind/28",
         "bind/28",
@@ -7612,7 +7612,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee29,
         "bind/29",
         "bind/29",
@@ -7627,7 +7627,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee3,
         "bind/3",
         "bind/3",
@@ -7642,7 +7642,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee30,
         "bind/30",
         "bind/30",
@@ -7657,7 +7657,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee31,
         "bind/31",
         "bind/31",
@@ -7672,7 +7672,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee32,
         "bind/32",
         "bind/32",
@@ -7687,7 +7687,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee33,
         "bind/33",
         "bind/33",
@@ -7702,7 +7702,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee34,
         "bind/34",
         "bind/34",
@@ -7717,7 +7717,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee4,
         "bind/4",
         "bind/4",
@@ -7732,7 +7732,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee5,
         "bind/5",
         "bind/5",
@@ -7747,7 +7747,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee6,
         "bind/6",
         "bind/6",
@@ -7762,7 +7762,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee7,
         "bind/7",
         "bind/7",
@@ -7777,7 +7777,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee8,
         "bind/8",
         "bind/8",
@@ -7792,7 +7792,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee9,
         "bind/9",
         "bind/9",
@@ -7807,7 +7807,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/tail_call_max_exceed_raw.c b/tests/bpf2c_tests/expected/tail_call_max_exceed_raw.c
index 78af43f1a6..991785780e 100644
--- a/tests/bpf2c_tests/expected/tail_call_max_exceed_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_max_exceed_raw.c
@@ -7252,7 +7252,7 @@ bind_test_caller(void* context, const program_runtime_context_t* runtime_context
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee0,
         "bind/0",
         "bind/0",
@@ -7267,7 +7267,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee1,
         "bind/1",
         "bind/1",
@@ -7282,7 +7282,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee10,
         "bind/10",
         "bind/10",
@@ -7297,7 +7297,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee11,
         "bind/11",
         "bind/11",
@@ -7312,7 +7312,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee12,
         "bind/12",
         "bind/12",
@@ -7327,7 +7327,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee13,
         "bind/13",
         "bind/13",
@@ -7342,7 +7342,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee14,
         "bind/14",
         "bind/14",
@@ -7357,7 +7357,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee15,
         "bind/15",
         "bind/15",
@@ -7372,7 +7372,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee16,
         "bind/16",
         "bind/16",
@@ -7387,7 +7387,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee17,
         "bind/17",
         "bind/17",
@@ -7402,7 +7402,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee18,
         "bind/18",
         "bind/18",
@@ -7417,7 +7417,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee19,
         "bind/19",
         "bind/19",
@@ -7432,7 +7432,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee2,
         "bind/2",
         "bind/2",
@@ -7447,7 +7447,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee20,
         "bind/20",
         "bind/20",
@@ -7462,7 +7462,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee21,
         "bind/21",
         "bind/21",
@@ -7477,7 +7477,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee22,
         "bind/22",
         "bind/22",
@@ -7492,7 +7492,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee23,
         "bind/23",
         "bind/23",
@@ -7507,7 +7507,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee24,
         "bind/24",
         "bind/24",
@@ -7522,7 +7522,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee25,
         "bind/25",
         "bind/25",
@@ -7537,7 +7537,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee26,
         "bind/26",
         "bind/26",
@@ -7552,7 +7552,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee27,
         "bind/27",
         "bind/27",
@@ -7567,7 +7567,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee28,
         "bind/28",
         "bind/28",
@@ -7582,7 +7582,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee29,
         "bind/29",
         "bind/29",
@@ -7597,7 +7597,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee3,
         "bind/3",
         "bind/3",
@@ -7612,7 +7612,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee30,
         "bind/30",
         "bind/30",
@@ -7627,7 +7627,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee31,
         "bind/31",
         "bind/31",
@@ -7642,7 +7642,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee32,
         "bind/32",
         "bind/32",
@@ -7657,7 +7657,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee33,
         "bind/33",
         "bind/33",
@@ -7672,7 +7672,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee34,
         "bind/34",
         "bind/34",
@@ -7687,7 +7687,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee4,
         "bind/4",
         "bind/4",
@@ -7702,7 +7702,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee5,
         "bind/5",
         "bind/5",
@@ -7717,7 +7717,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee6,
         "bind/6",
         "bind/6",
@@ -7732,7 +7732,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee7,
         "bind/7",
         "bind/7",
@@ -7747,7 +7747,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee8,
         "bind/8",
         "bind/8",
@@ -7762,7 +7762,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee9,
         "bind/9",
         "bind/9",
@@ -7777,7 +7777,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/tail_call_max_exceed_sys.c b/tests/bpf2c_tests/expected/tail_call_max_exceed_sys.c
index e8ae55ea13..86d5363df6 100644
--- a/tests/bpf2c_tests/expected/tail_call_max_exceed_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_max_exceed_sys.c
@@ -7407,7 +7407,7 @@ bind_test_caller(void* context, const program_runtime_context_t* runtime_context
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee0,
         "bind/0",
         "bind/0",
@@ -7422,7 +7422,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee1,
         "bind/1",
         "bind/1",
@@ -7437,7 +7437,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee10,
         "bind/10",
         "bind/10",
@@ -7452,7 +7452,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee11,
         "bind/11",
         "bind/11",
@@ -7467,7 +7467,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee12,
         "bind/12",
         "bind/12",
@@ -7482,7 +7482,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee13,
         "bind/13",
         "bind/13",
@@ -7497,7 +7497,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee14,
         "bind/14",
         "bind/14",
@@ -7512,7 +7512,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee15,
         "bind/15",
         "bind/15",
@@ -7527,7 +7527,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee16,
         "bind/16",
         "bind/16",
@@ -7542,7 +7542,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee17,
         "bind/17",
         "bind/17",
@@ -7557,7 +7557,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee18,
         "bind/18",
         "bind/18",
@@ -7572,7 +7572,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee19,
         "bind/19",
         "bind/19",
@@ -7587,7 +7587,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee2,
         "bind/2",
         "bind/2",
@@ -7602,7 +7602,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee20,
         "bind/20",
         "bind/20",
@@ -7617,7 +7617,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee21,
         "bind/21",
         "bind/21",
@@ -7632,7 +7632,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee22,
         "bind/22",
         "bind/22",
@@ -7647,7 +7647,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee23,
         "bind/23",
         "bind/23",
@@ -7662,7 +7662,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee24,
         "bind/24",
         "bind/24",
@@ -7677,7 +7677,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee25,
         "bind/25",
         "bind/25",
@@ -7692,7 +7692,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee26,
         "bind/26",
         "bind/26",
@@ -7707,7 +7707,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee27,
         "bind/27",
         "bind/27",
@@ -7722,7 +7722,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee28,
         "bind/28",
         "bind/28",
@@ -7737,7 +7737,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee29,
         "bind/29",
         "bind/29",
@@ -7752,7 +7752,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee3,
         "bind/3",
         "bind/3",
@@ -7767,7 +7767,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee30,
         "bind/30",
         "bind/30",
@@ -7782,7 +7782,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee31,
         "bind/31",
         "bind/31",
@@ -7797,7 +7797,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee32,
         "bind/32",
         "bind/32",
@@ -7812,7 +7812,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee33,
         "bind/33",
         "bind/33",
@@ -7827,7 +7827,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee34,
         "bind/34",
         "bind/34",
@@ -7842,7 +7842,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee4,
         "bind/4",
         "bind/4",
@@ -7857,7 +7857,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee5,
         "bind/5",
         "bind/5",
@@ -7872,7 +7872,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee6,
         "bind/6",
         "bind/6",
@@ -7887,7 +7887,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee7,
         "bind/7",
         "bind/7",
@@ -7902,7 +7902,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee8,
         "bind/8",
         "bind/8",
@@ -7917,7 +7917,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_callee9,
         "bind/9",
         "bind/9",
@@ -7932,7 +7932,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         bind_test_caller,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/tail_call_multiple_dll.c b/tests/bpf2c_tests/expected/tail_call_multiple_dll.c
index af52c9aba9..26eedc1c4e 100644
--- a/tests/bpf2c_tests/expected/tail_call_multiple_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_multiple_dll.c
@@ -260,7 +260,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee0,
         "sample~2",
         "sample_ext/0",
@@ -275,7 +275,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee1,
         "sample~1",
         "sample_ext/1",
@@ -290,7 +290,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~3",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_multiple_raw.c b/tests/bpf2c_tests/expected/tail_call_multiple_raw.c
index b9607d3c50..6b64a3ad2d 100644
--- a/tests/bpf2c_tests/expected/tail_call_multiple_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_multiple_raw.c
@@ -230,7 +230,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee0,
         "sample~2",
         "sample_ext/0",
@@ -245,7 +245,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee1,
         "sample~1",
         "sample_ext/1",
@@ -260,7 +260,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~3",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_multiple_sys.c b/tests/bpf2c_tests/expected/tail_call_multiple_sys.c
index 6ea7a471e4..c6dda851bc 100644
--- a/tests/bpf2c_tests/expected/tail_call_multiple_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_multiple_sys.c
@@ -385,7 +385,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee0,
         "sample~2",
         "sample_ext/0",
@@ -400,7 +400,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee1,
         "sample~1",
         "sample_ext/1",
@@ -415,7 +415,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~3",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_raw.c b/tests/bpf2c_tests/expected/tail_call_raw.c
index ba290afe50..b3e6f60d2b 100644
--- a/tests/bpf2c_tests/expected/tail_call_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_raw.c
@@ -219,7 +219,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext/0",
@@ -234,7 +234,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_recursive_dll.c b/tests/bpf2c_tests/expected/tail_call_recursive_dll.c
index 99945a4bad..34aafbebb7 100644
--- a/tests/bpf2c_tests/expected/tail_call_recursive_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_recursive_dll.c
@@ -270,7 +270,7 @@ recurse(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         recurse,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_recursive_raw.c b/tests/bpf2c_tests/expected/tail_call_recursive_raw.c
index e035812e3d..ea9f980a2f 100644
--- a/tests/bpf2c_tests/expected/tail_call_recursive_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_recursive_raw.c
@@ -240,7 +240,7 @@ recurse(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         recurse,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_recursive_sys.c b/tests/bpf2c_tests/expected/tail_call_recursive_sys.c
index a57dd2cf31..d0a9ae77ad 100644
--- a/tests/bpf2c_tests/expected/tail_call_recursive_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_recursive_sys.c
@@ -395,7 +395,7 @@ recurse(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         recurse,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_same_section_dll.c b/tests/bpf2c_tests/expected/tail_call_same_section_dll.c
index 91b7265e62..083c474164 100644
--- a/tests/bpf2c_tests/expected/tail_call_same_section_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_same_section_dll.c
@@ -299,7 +299,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext",
@@ -314,7 +314,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_same_section_raw.c b/tests/bpf2c_tests/expected/tail_call_same_section_raw.c
index 5f7e578076..f47b741e81 100644
--- a/tests/bpf2c_tests/expected/tail_call_same_section_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_same_section_raw.c
@@ -269,7 +269,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext",
@@ -284,7 +284,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_same_section_sys.c b/tests/bpf2c_tests/expected/tail_call_same_section_sys.c
index ad86f37d7c..ac93afd78e 100644
--- a/tests/bpf2c_tests/expected/tail_call_same_section_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_same_section_sys.c
@@ -424,7 +424,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext",
@@ -439,7 +439,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/tail_call_sequential_dll.c b/tests/bpf2c_tests/expected/tail_call_sequential_dll.c
index f2170485ec..ba1e2f7780 100644
--- a/tests/bpf2c_tests/expected/tail_call_sequential_dll.c
+++ b/tests/bpf2c_tests/expected/tail_call_sequential_dll.c
@@ -6459,7 +6459,7 @@ sequential9(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential0,
         "sampl~35",
         "sample_ext0",
@@ -6474,7 +6474,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential1,
         "sampl~34",
         "sample_ext1",
@@ -6489,7 +6489,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential10,
         "sampl~25",
         "sample_ext10",
@@ -6504,7 +6504,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential11,
         "sampl~24",
         "sample_ext11",
@@ -6519,7 +6519,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential12,
         "sampl~23",
         "sample_ext12",
@@ -6534,7 +6534,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential13,
         "sampl~22",
         "sample_ext13",
@@ -6549,7 +6549,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential14,
         "sampl~21",
         "sample_ext14",
@@ -6564,7 +6564,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential15,
         "sampl~20",
         "sample_ext15",
@@ -6579,7 +6579,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential16,
         "sampl~19",
         "sample_ext16",
@@ -6594,7 +6594,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential17,
         "sampl~18",
         "sample_ext17",
@@ -6609,7 +6609,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential18,
         "sampl~17",
         "sample_ext18",
@@ -6624,7 +6624,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential19,
         "sampl~16",
         "sample_ext19",
@@ -6639,7 +6639,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential2,
         "sampl~33",
         "sample_ext2",
@@ -6654,7 +6654,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential20,
         "sampl~15",
         "sample_ext20",
@@ -6669,7 +6669,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential21,
         "sampl~14",
         "sample_ext21",
@@ -6684,7 +6684,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential22,
         "sampl~13",
         "sample_ext22",
@@ -6699,7 +6699,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential23,
         "sampl~12",
         "sample_ext23",
@@ -6714,7 +6714,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential24,
         "sampl~11",
         "sample_ext24",
@@ -6729,7 +6729,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential25,
         "sampl~10",
         "sample_ext25",
@@ -6744,7 +6744,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential26,
         "sample~9",
         "sample_ext26",
@@ -6759,7 +6759,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential27,
         "sample~8",
         "sample_ext27",
@@ -6774,7 +6774,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential28,
         "sample~7",
         "sample_ext28",
@@ -6789,7 +6789,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential29,
         "sample~6",
         "sample_ext29",
@@ -6804,7 +6804,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential3,
         "sampl~32",
         "sample_ext3",
@@ -6819,7 +6819,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential30,
         "sample~5",
         "sample_ext30",
@@ -6834,7 +6834,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential31,
         "sample~4",
         "sample_ext31",
@@ -6849,7 +6849,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential32,
         "sample~3",
         "sample_ext32",
@@ -6864,7 +6864,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential33,
         "sample~2",
         "sample_ext33",
@@ -6879,7 +6879,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential34,
         "sample~1",
         "sample_ext34",
@@ -6894,7 +6894,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential4,
         "sampl~31",
         "sample_ext4",
@@ -6909,7 +6909,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential5,
         "sampl~30",
         "sample_ext5",
@@ -6924,7 +6924,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential6,
         "sampl~29",
         "sample_ext6",
@@ -6939,7 +6939,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential7,
         "sampl~28",
         "sample_ext7",
@@ -6954,7 +6954,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential8,
         "sampl~27",
         "sample_ext8",
@@ -6969,7 +6969,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential9,
         "sampl~26",
         "sample_ext9",
diff --git a/tests/bpf2c_tests/expected/tail_call_sequential_raw.c b/tests/bpf2c_tests/expected/tail_call_sequential_raw.c
index 289e25f205..9625937334 100644
--- a/tests/bpf2c_tests/expected/tail_call_sequential_raw.c
+++ b/tests/bpf2c_tests/expected/tail_call_sequential_raw.c
@@ -6429,7 +6429,7 @@ sequential9(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential0,
         "sampl~35",
         "sample_ext0",
@@ -6444,7 +6444,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential1,
         "sampl~34",
         "sample_ext1",
@@ -6459,7 +6459,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential10,
         "sampl~25",
         "sample_ext10",
@@ -6474,7 +6474,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential11,
         "sampl~24",
         "sample_ext11",
@@ -6489,7 +6489,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential12,
         "sampl~23",
         "sample_ext12",
@@ -6504,7 +6504,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential13,
         "sampl~22",
         "sample_ext13",
@@ -6519,7 +6519,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential14,
         "sampl~21",
         "sample_ext14",
@@ -6534,7 +6534,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential15,
         "sampl~20",
         "sample_ext15",
@@ -6549,7 +6549,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential16,
         "sampl~19",
         "sample_ext16",
@@ -6564,7 +6564,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential17,
         "sampl~18",
         "sample_ext17",
@@ -6579,7 +6579,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential18,
         "sampl~17",
         "sample_ext18",
@@ -6594,7 +6594,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential19,
         "sampl~16",
         "sample_ext19",
@@ -6609,7 +6609,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential2,
         "sampl~33",
         "sample_ext2",
@@ -6624,7 +6624,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential20,
         "sampl~15",
         "sample_ext20",
@@ -6639,7 +6639,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential21,
         "sampl~14",
         "sample_ext21",
@@ -6654,7 +6654,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential22,
         "sampl~13",
         "sample_ext22",
@@ -6669,7 +6669,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential23,
         "sampl~12",
         "sample_ext23",
@@ -6684,7 +6684,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential24,
         "sampl~11",
         "sample_ext24",
@@ -6699,7 +6699,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential25,
         "sampl~10",
         "sample_ext25",
@@ -6714,7 +6714,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential26,
         "sample~9",
         "sample_ext26",
@@ -6729,7 +6729,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential27,
         "sample~8",
         "sample_ext27",
@@ -6744,7 +6744,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential28,
         "sample~7",
         "sample_ext28",
@@ -6759,7 +6759,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential29,
         "sample~6",
         "sample_ext29",
@@ -6774,7 +6774,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential3,
         "sampl~32",
         "sample_ext3",
@@ -6789,7 +6789,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential30,
         "sample~5",
         "sample_ext30",
@@ -6804,7 +6804,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential31,
         "sample~4",
         "sample_ext31",
@@ -6819,7 +6819,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential32,
         "sample~3",
         "sample_ext32",
@@ -6834,7 +6834,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential33,
         "sample~2",
         "sample_ext33",
@@ -6849,7 +6849,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential34,
         "sample~1",
         "sample_ext34",
@@ -6864,7 +6864,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential4,
         "sampl~31",
         "sample_ext4",
@@ -6879,7 +6879,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential5,
         "sampl~30",
         "sample_ext5",
@@ -6894,7 +6894,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential6,
         "sampl~29",
         "sample_ext6",
@@ -6909,7 +6909,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential7,
         "sampl~28",
         "sample_ext7",
@@ -6924,7 +6924,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential8,
         "sampl~27",
         "sample_ext8",
@@ -6939,7 +6939,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential9,
         "sampl~26",
         "sample_ext9",
diff --git a/tests/bpf2c_tests/expected/tail_call_sequential_sys.c b/tests/bpf2c_tests/expected/tail_call_sequential_sys.c
index c8800b32f6..8c3439a7ef 100644
--- a/tests/bpf2c_tests/expected/tail_call_sequential_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_sequential_sys.c
@@ -6584,7 +6584,7 @@ sequential9(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential0,
         "sampl~35",
         "sample_ext0",
@@ -6599,7 +6599,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential1,
         "sampl~34",
         "sample_ext1",
@@ -6614,7 +6614,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential10,
         "sampl~25",
         "sample_ext10",
@@ -6629,7 +6629,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential11,
         "sampl~24",
         "sample_ext11",
@@ -6644,7 +6644,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential12,
         "sampl~23",
         "sample_ext12",
@@ -6659,7 +6659,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential13,
         "sampl~22",
         "sample_ext13",
@@ -6674,7 +6674,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential14,
         "sampl~21",
         "sample_ext14",
@@ -6689,7 +6689,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential15,
         "sampl~20",
         "sample_ext15",
@@ -6704,7 +6704,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential16,
         "sampl~19",
         "sample_ext16",
@@ -6719,7 +6719,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential17,
         "sampl~18",
         "sample_ext17",
@@ -6734,7 +6734,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential18,
         "sampl~17",
         "sample_ext18",
@@ -6749,7 +6749,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential19,
         "sampl~16",
         "sample_ext19",
@@ -6764,7 +6764,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential2,
         "sampl~33",
         "sample_ext2",
@@ -6779,7 +6779,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential20,
         "sampl~15",
         "sample_ext20",
@@ -6794,7 +6794,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential21,
         "sampl~14",
         "sample_ext21",
@@ -6809,7 +6809,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential22,
         "sampl~13",
         "sample_ext22",
@@ -6824,7 +6824,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential23,
         "sampl~12",
         "sample_ext23",
@@ -6839,7 +6839,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential24,
         "sampl~11",
         "sample_ext24",
@@ -6854,7 +6854,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential25,
         "sampl~10",
         "sample_ext25",
@@ -6869,7 +6869,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential26,
         "sample~9",
         "sample_ext26",
@@ -6884,7 +6884,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential27,
         "sample~8",
         "sample_ext27",
@@ -6899,7 +6899,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential28,
         "sample~7",
         "sample_ext28",
@@ -6914,7 +6914,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential29,
         "sample~6",
         "sample_ext29",
@@ -6929,7 +6929,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential3,
         "sampl~32",
         "sample_ext3",
@@ -6944,7 +6944,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential30,
         "sample~5",
         "sample_ext30",
@@ -6959,7 +6959,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential31,
         "sample~4",
         "sample_ext31",
@@ -6974,7 +6974,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential32,
         "sample~3",
         "sample_ext32",
@@ -6989,7 +6989,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential33,
         "sample~2",
         "sample_ext33",
@@ -7004,7 +7004,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential34,
         "sample~1",
         "sample_ext34",
@@ -7019,7 +7019,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential4,
         "sampl~31",
         "sample_ext4",
@@ -7034,7 +7034,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential5,
         "sampl~30",
         "sample_ext5",
@@ -7049,7 +7049,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential6,
         "sampl~29",
         "sample_ext6",
@@ -7064,7 +7064,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential7,
         "sampl~28",
         "sample_ext7",
@@ -7079,7 +7079,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential8,
         "sampl~27",
         "sample_ext8",
@@ -7094,7 +7094,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         sequential9,
         "sampl~26",
         "sample_ext9",
diff --git a/tests/bpf2c_tests/expected/tail_call_sys.c b/tests/bpf2c_tests/expected/tail_call_sys.c
index cda9fb0dc9..722146d1f6 100644
--- a/tests/bpf2c_tests/expected/tail_call_sys.c
+++ b/tests/bpf2c_tests/expected/tail_call_sys.c
@@ -374,7 +374,7 @@ caller(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         callee,
         "sample~1",
         "sample_ext/0",
@@ -389,7 +389,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         caller,
         "sample~2",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_ebpf_dll.c b/tests/bpf2c_tests/expected/test_sample_ebpf_dll.c
index 7249954ef9..001d1a823c 100644
--- a/tests/bpf2c_tests/expected/test_sample_ebpf_dll.c
+++ b/tests/bpf2c_tests/expected/test_sample_ebpf_dll.c
@@ -292,7 +292,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_ebpf_raw.c b/tests/bpf2c_tests/expected/test_sample_ebpf_raw.c
index 39ccee5417..f80be8f3a6 100644
--- a/tests/bpf2c_tests/expected/test_sample_ebpf_raw.c
+++ b/tests/bpf2c_tests/expected/test_sample_ebpf_raw.c
@@ -262,7 +262,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_ebpf_sys.c b/tests/bpf2c_tests/expected/test_sample_ebpf_sys.c
index efb4ae2d09..54e5ad0e32 100644
--- a/tests/bpf2c_tests/expected/test_sample_ebpf_sys.c
+++ b/tests/bpf2c_tests/expected/test_sample_ebpf_sys.c
@@ -417,7 +417,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_implicit_helpers_dll.c b/tests/bpf2c_tests/expected/test_sample_implicit_helpers_dll.c
index 5e8e7deb77..0a1e9534e3 100644
--- a/tests/bpf2c_tests/expected/test_sample_implicit_helpers_dll.c
+++ b/tests/bpf2c_tests/expected/test_sample_implicit_helpers_dll.c
@@ -364,7 +364,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_implicit_helpers_raw.c b/tests/bpf2c_tests/expected/test_sample_implicit_helpers_raw.c
index 366ae9c7dd..c225e8a2ef 100644
--- a/tests/bpf2c_tests/expected/test_sample_implicit_helpers_raw.c
+++ b/tests/bpf2c_tests/expected/test_sample_implicit_helpers_raw.c
@@ -334,7 +334,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_implicit_helpers_sys.c b/tests/bpf2c_tests/expected/test_sample_implicit_helpers_sys.c
index 992d6a4dff..bbcf2e3796 100644
--- a/tests/bpf2c_tests/expected/test_sample_implicit_helpers_sys.c
+++ b/tests/bpf2c_tests/expected/test_sample_implicit_helpers_sys.c
@@ -489,7 +489,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_dll.c b/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_dll.c
index 580107bc80..eb0724ad97 100644
--- a/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_dll.c
+++ b/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_dll.c
@@ -162,7 +162,7 @@ test_sample_invalid_socket_cookie(void* context, const program_runtime_context_t
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sample_invalid_socket_cookie,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_raw.c b/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_raw.c
index 38e54c0341..8c2af645ce 100644
--- a/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_raw.c
+++ b/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_raw.c
@@ -132,7 +132,7 @@ test_sample_invalid_socket_cookie(void* context, const program_runtime_context_t
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sample_invalid_socket_cookie,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_sys.c b/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_sys.c
index b286d3fa13..14b48d4e73 100644
--- a/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_sys.c
+++ b/tests/bpf2c_tests/expected/test_sample_invalid_socket_cookie_sys.c
@@ -287,7 +287,7 @@ test_sample_invalid_socket_cookie(void* context, const program_runtime_context_t
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_sample_invalid_socket_cookie,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_perf_event_array_dll.c b/tests/bpf2c_tests/expected/test_sample_perf_event_array_dll.c
index ce801fcc26..974969d66e 100644
--- a/tests/bpf2c_tests/expected/test_sample_perf_event_array_dll.c
+++ b/tests/bpf2c_tests/expected/test_sample_perf_event_array_dll.c
@@ -177,7 +177,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_perf_event_array_raw.c b/tests/bpf2c_tests/expected/test_sample_perf_event_array_raw.c
index 39c7183b5a..52df931b9a 100644
--- a/tests/bpf2c_tests/expected/test_sample_perf_event_array_raw.c
+++ b/tests/bpf2c_tests/expected/test_sample_perf_event_array_raw.c
@@ -147,7 +147,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_sample_perf_event_array_sys.c b/tests/bpf2c_tests/expected/test_sample_perf_event_array_sys.c
index 5381477639..5d811b9655 100644
--- a/tests/bpf2c_tests/expected/test_sample_perf_event_array_sys.c
+++ b/tests/bpf2c_tests/expected/test_sample_perf_event_array_sys.c
@@ -302,7 +302,7 @@ test_program_entry(void* context, const program_runtime_context_t* runtime_conte
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_program_entry,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_utility_helpers_dll.c b/tests/bpf2c_tests/expected/test_utility_helpers_dll.c
index 724c61d405..5f9eb0ea62 100644
--- a/tests/bpf2c_tests/expected/test_utility_helpers_dll.c
+++ b/tests/bpf2c_tests/expected/test_utility_helpers_dll.c
@@ -324,7 +324,7 @@ test_utility_helpers(void* context, const program_runtime_context_t* runtime_con
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_utility_helpers,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_utility_helpers_raw.c b/tests/bpf2c_tests/expected/test_utility_helpers_raw.c
index 42d069b858..1a45020fd5 100644
--- a/tests/bpf2c_tests/expected/test_utility_helpers_raw.c
+++ b/tests/bpf2c_tests/expected/test_utility_helpers_raw.c
@@ -294,7 +294,7 @@ test_utility_helpers(void* context, const program_runtime_context_t* runtime_con
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_utility_helpers,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/test_utility_helpers_sys.c b/tests/bpf2c_tests/expected/test_utility_helpers_sys.c
index edd9f8c279..6a2ca1dae6 100644
--- a/tests/bpf2c_tests/expected/test_utility_helpers_sys.c
+++ b/tests/bpf2c_tests/expected/test_utility_helpers_sys.c
@@ -449,7 +449,7 @@ test_utility_helpers(void* context, const program_runtime_context_t* runtime_con
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         test_utility_helpers,
         "sample~1",
         "sample_ext",
diff --git a/tests/bpf2c_tests/expected/thread_start_time_dll.c b/tests/bpf2c_tests/expected/thread_start_time_dll.c
index 994f143b15..082b384601 100644
--- a/tests/bpf2c_tests/expected/thread_start_time_dll.c
+++ b/tests/bpf2c_tests/expected/thread_start_time_dll.c
@@ -320,7 +320,7 @@ function_v6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v4,
         "cgroup~2",
         "cgroup/connect4",
@@ -335,7 +335,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/thread_start_time_raw.c b/tests/bpf2c_tests/expected/thread_start_time_raw.c
index 55f4b6ddb5..0253437926 100644
--- a/tests/bpf2c_tests/expected/thread_start_time_raw.c
+++ b/tests/bpf2c_tests/expected/thread_start_time_raw.c
@@ -290,7 +290,7 @@ function_v6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v4,
         "cgroup~2",
         "cgroup/connect4",
@@ -305,7 +305,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/thread_start_time_sys.c b/tests/bpf2c_tests/expected/thread_start_time_sys.c
index 21ef5bce05..c8696fef08 100644
--- a/tests/bpf2c_tests/expected/thread_start_time_sys.c
+++ b/tests/bpf2c_tests/expected/thread_start_time_sys.c
@@ -445,7 +445,7 @@ function_v6(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v4,
         "cgroup~2",
         "cgroup/connect4",
@@ -460,7 +460,7 @@ static program_entry_t _programs[] = {
     },
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         function_v6,
         "cgroup~1",
         "cgroup/connect6",
diff --git a/tests/bpf2c_tests/expected/utility_dll.c b/tests/bpf2c_tests/expected/utility_dll.c
index 1e54610069..f704c3cd9b 100644
--- a/tests/bpf2c_tests/expected/utility_dll.c
+++ b/tests/bpf2c_tests/expected/utility_dll.c
@@ -527,7 +527,7 @@ UtilityTest(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         UtilityTest,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/utility_raw.c b/tests/bpf2c_tests/expected/utility_raw.c
index 4fadb5a031..b2784e7532 100644
--- a/tests/bpf2c_tests/expected/utility_raw.c
+++ b/tests/bpf2c_tests/expected/utility_raw.c
@@ -497,7 +497,7 @@ UtilityTest(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         UtilityTest,
         "bind",
         "bind",
diff --git a/tests/bpf2c_tests/expected/utility_sys.c b/tests/bpf2c_tests/expected/utility_sys.c
index 60395f0502..e41528e4fa 100644
--- a/tests/bpf2c_tests/expected/utility_sys.c
+++ b/tests/bpf2c_tests/expected/utility_sys.c
@@ -652,7 +652,7 @@ UtilityTest(void* context, const program_runtime_context_t* runtime_context)
 static program_entry_t _programs[] = {
     {
         0,
-        {1, 144, 144}, // Version header.
+        {1, 152, 152}, // Version header.
         UtilityTest,
         "bind",
         "bind",
diff --git a/tools/bpf2c/bpf2c.cpp b/tools/bpf2c/bpf2c.cpp
index a560a203d5..750e66b532 100644
--- a/tools/bpf2c/bpf2c.cpp
+++ b/tools/bpf2c/bpf2c.cpp
@@ -88,7 +88,12 @@ get_program_info_type_hash(const std::vector<int32_t>& actual_helper_ids, const
     // hash must be updated to include the new fields, both here and in _ebpf_program_verify_program_info_hash.
     hash_t::byte_range_t byte_range;
     hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->name);
-    hash_t::append_byte_range(byte_range, *program_info->program_type_descriptor->context_descriptor);
+    // Hash only the offset fields of the context descriptor (not size) to allow
+    // extensions to append new fields to the context struct without breaking
+    // previously compiled native programs.
+    hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->context_descriptor->data);
+    hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->context_descriptor->end);
+    hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->context_descriptor->meta);
     hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->program_type);
     hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->bpf_prog_type);
     hash_t::append_byte_range(byte_range, program_info->program_type_descriptor->is_privileged);
diff --git a/tools/bpf2c/bpf_code_generator.cpp b/tools/bpf2c/bpf_code_generator.cpp
index 6255c01a35..85e2f9700f 100644
--- a/tools/bpf2c/bpf_code_generator.cpp
+++ b/tools/bpf2c/bpf_code_generator.cpp
@@ -341,6 +341,12 @@ bpf_code_generator::parse(
     bpf_code_generator_program& current_program = programs[program->program_name];
 
     current_program.program_info = program_info;
+    // Capture context size now since program_info pointer may become dangling
+    // after subsequent verifier calls for other programs in multi-program ELFs.
+    if (program_info != nullptr && program_info->program_type_descriptor != nullptr &&
+        program_info->program_type_descriptor->context_descriptor != nullptr) {
+        current_program.bpf2c_context_size = program_info->program_type_descriptor->context_descriptor->size;
+    }
     current_program.elf_section_name = program->section_name;
     current_program.program_name = program->program_name;
     current_program.offset_in_section = program->offset_in_section;
@@ -2373,6 +2379,9 @@ bpf_code_generator::emit_c_code(std::ostream& output_stream)
                 }
                 output_stream << INDENT INDENT << "\"" << hash_string << "\""
                               << "," << std::endl;
+                // Emit the context size captured at parse time.
+                output_stream << INDENT INDENT << program.bpf2c_context_size << ","
+                              << " // bpf2c_context_size." << std::endl;
             }
             output_stream << INDENT "}," << std::endl;
         }
diff --git a/tools/bpf2c/bpf_code_generator.h b/tools/bpf2c/bpf_code_generator.h
index 6a5f52d2b5..c53ffa4646 100644
--- a/tools/bpf2c/bpf_code_generator.h
+++ b/tools/bpf2c/bpf_code_generator.h
@@ -360,6 +360,7 @@ class bpf_code_generator
         std::map<unsafe_string, helper_function_t> helper_functions;
         std::string program_info_hash_type{};
         const ebpf_program_info_t* program_info = nullptr;
+        size_t bpf2c_context_size{0};
 
         /**
          * @brief Assign a label to each jump target.