diff --git a/Cargo.lock b/Cargo.lock
index e64e7a7aca3739..61035e3d1bfa80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7586,8 +7586,6 @@ checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
 ]
 
@@ -7647,8 +7645,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4"
 dependencies = [
  "borsh 1.5.7",
- "serde",
- "serde_derive",
  "solana-instruction",
  "solana-sdk-ids",
 ]
@@ -8096,8 +8092,6 @@ checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-sdk-ids",
  "solana-sdk-macro",
@@ -8223,8 +8217,6 @@ dependencies = [
  "ahash 0.8.11",
  "lazy_static",
  "solana-epoch-schedule",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-pubkey",
  "solana-sha256-hasher",
@@ -8370,8 +8362,6 @@ dependencies = [
  "solana-cluster-type",
  "solana-epoch-schedule",
  "solana-fee-calculator",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-inflation",
  "solana-keypair",
@@ -8987,11 +8977,8 @@ dependencies = [
  "serde",
  "serde_derive",
  "solana-bincode",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-instruction",
- "solana-logger",
  "solana-pubkey",
  "solana-sanitize",
  "solana-sdk-ids",
@@ -9242,8 +9229,6 @@ checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
 ]
 
 [[package]]
@@ -9335,8 +9320,6 @@ dependencies = [
  "solana-example-mocks",
  "solana-feature-gate-interface",
  "solana-fee-calculator",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-instruction",
  "solana-instructions-sysvar",
@@ -9734,8 +9717,6 @@ checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
 ]
 
 [[package]]
@@ -10219,61 +10200,37 @@ dependencies = [
  "getrandom 0.1.16",
  "js-sys",
  "serde",
- "serde_json",
  "solana-account",
  "solana-bn254",
- "solana-client-traits",
- "solana-cluster-type",
- "solana-commitment-config",
- "solana-compute-budget-interface",
  "solana-decode-error",
  "solana-derivation-path",
- "solana-ed25519-program",
  "solana-epoch-info",
  "solana-epoch-rewards-hasher",
  "solana-feature-set",
  "solana-fee-structure",
- "solana-genesis-config",
- "solana-hard-forks",
  "solana-inflation",
  "solana-instruction",
- "solana-keypair",
  "solana-message",
  "solana-native-token",
  "solana-nonce-account",
- "solana-offchain-message",
  "solana-packet",
  "solana-poh-config",
- "solana-precompile-error",
- "solana-precompiles",
- "solana-presigner",
  "solana-program",
  "solana-program-memory",
  "solana-pubkey",
- "solana-quic-definitions",
- "solana-rent-collector",
  "solana-rent-debits",
  "solana-reserved-account-keys",
  "solana-reward-info",
  "solana-sanitize",
  "solana-sdk-ids",
  "solana-sdk-macro",
- "solana-secp256k1-program",
  "solana-secp256k1-recover",
  "solana-secp256r1-program",
- "solana-seed-derivable",
- "solana-seed-phrase",
  "solana-serde",
  "solana-serde-varint",
  "solana-short-vec",
- "solana-shred-version",
- "solana-signature",
- "solana-signer",
- "solana-system-transaction",
  "solana-time-utils",
- "solana-transaction",
  "solana-transaction-context 2.2.1",
- "solana-transaction-error",
  "solana-validator-exit",
  "thiserror 2.0.12",
  "wasm-bindgen",
@@ -10980,8 +10937,6 @@ dependencies = [
  "solana-epoch-rewards",
  "solana-epoch-schedule",
  "solana-fee-calculator",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-instruction",
  "solana-instructions-sysvar",
@@ -11264,12 +11219,9 @@ dependencies = [
  "serde_derive",
  "solana-bincode",
  "solana-feature-set",
- "solana-frozen-abi",
- "solana-frozen-abi-macro",
  "solana-hash",
  "solana-instruction",
  "solana-keypair",
- "solana-logger",
  "solana-message",
  "solana-precompiles",
  "solana-pubkey",
@@ -11296,7 +11248,6 @@ dependencies = [
  "solana-instruction",
  "solana-pubkey",
  "solana-rent",
- "solana-signature",
 ]
 
 [[package]]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4f46ffd94b51d5..e8ac95afca00b2 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -195,12 +195,15 @@ frozen-abi = [
     "solana-bloom/frozen-abi",
     "solana-compute-budget/frozen-abi",
     "solana-cost-model/frozen-abi",
+    "solana-frozen-abi/frozen-abi",
     "solana-gossip/frozen-abi",
     "solana-ledger/frozen-abi",
+    "solana-packet/frozen-abi",
     "solana-perf/frozen-abi",
     "solana-program-runtime/frozen-abi",
     "solana-runtime/frozen-abi",
     "solana-short-vec/frozen-abi",
+    "solana-signature/frozen-abi",
     "solana-svm/frozen-abi",
     "solana-vote/frozen-abi",
     "solana-vote-program/frozen-abi",
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 77c4fa465b676b..330a775cce527f 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -189,12 +189,21 @@ dev-context-only-utils = [
 frozen-abi = [
     "dep:solana-frozen-abi",
     "dep:solana-frozen-abi-macro",
+    "solana-account/frozen-abi",
     "solana-accounts-db/frozen-abi",
     "solana-compute-budget/frozen-abi",
     "solana-cost-model/frozen-abi",
+    "solana-epoch-schedule/frozen-abi",
+    "solana-hard-forks/frozen-abi",
+    "solana-inflation/frozen-abi",
+    "solana-instruction/frozen-abi",
     "solana-perf/frozen-abi",
     "solana-program-runtime/frozen-abi",
+    "solana-rent/frozen-abi",
+    "solana-rent-collector/frozen-abi",
+    "solana-stake-interface/frozen-abi",
     "solana-svm/frozen-abi",
+    "solana-transaction-error/frozen-abi",
     "solana-version/frozen-abi",
     "solana-vote/frozen-abi",
     "solana-vote-program/frozen-abi",