diff --git a/Cargo.toml b/Cargo.toml
index 89557683b528ce..44d738a37513d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,18 +1,3 @@
-[profile.release-with-debug]
-inherits = "release"
-debug = true
-strip = false
-split-debuginfo = "off"
-
-[profile.release]
-split-debuginfo = "unpacked"
-lto = "thin"
-
-[profile.release-with-lto]
-inherits = "release"
-split-debuginfo = "unpacked"
-lto = "thin"
-codegen-units = 1
 
 [workspace]
 members = [
@@ -172,6 +157,9 @@ homepage = "https://anza.xyz/"
 license = "Apache-2.0"
 edition = "2021"
 
+[workspace.lints.rust]
+warnings = "deny"
+
 [workspace.lints.rust.unexpected_cfgs]
 level = "warn"
 check-cfg = [
@@ -179,9 +167,6 @@ check-cfg = [
     'cfg(feature, values("frozen-abi", "no-entrypoint"))',
 ]
 
-[workspace.lints.rust]
-warnings = "deny"
-
 # Clippy lint configuration that can not be applied in clippy.toml
 [workspace.lints.clippy]
 arithmetic_side_effects = "deny"
@@ -191,18 +176,19 @@ used_underscore_binding = "deny"
 
 [workspace.dependencies]
 Inflector = "0.11.4"
-axum = "0.7.9"
-aya = "0.13"
+aes-gcm-siv = "0.11.1"
 agave-banking-stage-ingress-types = { path = "banking-stage-ingress-types", version = "=2.3.1" }
+agave-cargo-registry = { path = "cargo-registry", version = "=2.3.1" }
 agave-feature-set = { path = "feature-set", version = "=2.3.1" }
+agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.3.1" }
 agave-precompiles = { path = "precompiles", version = "=2.3.1" }
 agave-reserved-account-keys = { path = "reserved-account-keys", version = "=2.3.1" }
+agave-thread-manager = { path = "thread-manager", version = "=2.3.1" }
 agave-transaction-view = { path = "transaction-view", version = "=2.3.1" }
 agave-xdp = { path = "xdp", version = "=2.3.1" }
-aquamarine = "0.6.0"
-aes-gcm-siv = "0.11.1"
 ahash = "0.8.11"
 anyhow = "1.0.98"
+aquamarine = "0.6.0"
 arbitrary = "1.4.1"
 ark-bn254 = "0.4.0"
 ark-ec = "0.4.0"
@@ -217,6 +203,8 @@ async-channel = "1.9.0"
 async-lock = "3.4.0"
 async-trait = "0.1.88"
 atty = "0.2.11"
+axum = "0.7.9"
+aya = "0.13"
 backoff = "0.4.0"
 base64 = "0.22.1"
 bincode = "1.3.3"
@@ -233,18 +221,18 @@ bytes = "1.10"
 bzip2 = "0.4.4"
 caps = "0.5.5"
 cargo_metadata = "0.15.4"
-cfg_eval = "0.1.2"
 cfg-if = "1.0.0"
+cfg_eval = "0.1.2"
 chrono = { version = "0.4.41", default-features = false }
 chrono-humanize = "0.2.3"
 clap = "2.33.1"
+# Remove this dependency when procedural macros will support non-inline modules.
+conditional-mod = "0.1.0"
 console = "0.15.11"
 console_error_panic_hook = "0.1.7"
 console_log = "0.2.2"
 const_format = "0.2.34"
 core_affinity = "0.5.10"
-# Remove this dependency when procedural macros will support non-inline modules.
-conditional-mod = "0.1.0"
 criterion = "0.5.1"
 criterion-stats = "0.3.0"
 crossbeam-channel = "0.5.15"
@@ -269,8 +257,8 @@ env_logger = "0.9.3"
 etcd-client = "0.11.1"
 fast-math = "0.1"
 fd-lock = "3.0.13"
-flate2 = "1.0.31"
 five8_const = "0.1.4"
+flate2 = "1.0.31"
 fnv = "1.0.7"
 fs_extra = "1.3.0"
 futures = "0.3.31"
@@ -400,8 +388,6 @@ solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.3.1" }
 solana-bucket-map = { path = "bucket_map", version = "=2.3.1" }
 solana-builtins = { path = "builtins", version = "=2.3.1" }
 solana-builtins-default-costs = { path = "builtins-default-costs", version = "=2.3.1" }
-agave-cargo-registry = { path = "cargo-registry", version = "=2.3.1" }
-agave-thread-manager = { path = "thread-manager", version = "=2.3.1" }
 solana-clap-utils = { path = "clap-utils", version = "=2.3.1" }
 solana-clap-v3-utils = { path = "clap-v3-utils", version = "=2.3.1" }
 solana-cli = { path = "cli", version = "=2.3.1" }
@@ -428,7 +414,6 @@ solana-derivation-path = "2.2.1"
 solana-download-utils = { path = "download-utils", version = "=2.3.1" }
 solana-ed25519-program = "2.2.3"
 solana-entry = { path = "entry", version = "=2.3.1" }
-solana-program-entrypoint = "2.2.1"
 solana-epoch-info = "2.2.1"
 solana-epoch-rewards = "2.2.1"
 solana-epoch-rewards-hasher = "2.2.1"
@@ -437,17 +422,15 @@ solana-example-mocks = "2.2.1"
 solana-faucet = { path = "faucet", version = "=2.3.1" }
 solana-feature-gate-client = "0.0.2"
 solana-feature-gate-interface = "2.2.2"
-solana-fee-calculator = "2.2.1"
 solana-fee = { path = "fee", version = "=2.3.1" }
+solana-fee-calculator = "2.2.1"
 solana-fee-structure = "2.3.0"
+solana-file-download = "2.2.1"
 solana-frozen-abi = "2.2.2"
 solana-frozen-abi-macro = "2.2.1"
-solana-tps-client = { path = "tps-client", version = "=2.3.1" }
-solana-file-download = "2.2.1"
 solana-genesis = { path = "genesis", version = "=2.3.1" }
 solana-genesis-config = "2.2.1"
 solana-genesis-utils = { path = "genesis-utils", version = "=2.3.1" }
-agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.3.1" }
 solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.3.1" }
 solana-gossip = { path = "gossip", version = "=2.3.1" }
 solana-hard-forks = "2.2.1"
@@ -487,6 +470,7 @@ solana-poseidon = { path = "poseidon", version = "=2.3.1" }
 solana-precompile-error = "2.2.2"
 solana-presigner = "2.2.1"
 solana-program = { version = "2.2.1", default-features = false }
+solana-program-entrypoint = "2.2.1"
 solana-program-error = "2.2.1"
 solana-program-memory = "2.2.1"
 solana-program-option = "2.2.1"
@@ -503,37 +487,32 @@ solana-rent = "2.2.1"
 solana-rent-collector = "2.2.1"
 solana-rent-debits = "2.2.1"
 solana-reward-info = "2.2.1"
-solana-sanitize = "2.2.1"
-solana-secp256r1-program = "2.2.3"
-solana-seed-derivable = "2.2.1"
-solana-seed-phrase = "2.2.1"
-solana-serde = "2.2.1"
-solana-serde-varint = "2.2.2"
-solana-serialize-utils = "2.2.1"
-solana-sha256-hasher = "2.2.1"
-solana-signature = { version = "2.3.0", default-features = false }
-solana-signer = "2.2.1"
-solana-slot-hashes = "2.2.1"
-solana-slot-history = "2.2.1"
-solana-time-utils = "2.2.1"
-solana-timings = { path = "timings", version = "=2.3.1" }
-solana-tls-utils = { path = "tls-utils", version = "=2.3.1" }
-solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.3.1" }
-solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.3.1" }
 solana-rpc = { path = "rpc", version = "=2.3.1" }
 solana-rpc-client = { path = "rpc-client", version = "=2.3.1", default-features = false }
 solana-rpc-client-api = { path = "rpc-client-api", version = "=2.3.1" }
-solana-rpc-client-types = { path = "rpc-client-types", version = "=2.3.1" }
 solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.3.1" }
+solana-rpc-client-types = { path = "rpc-client-types", version = "=2.3.1" }
 solana-runtime = { path = "runtime", version = "=2.3.1" }
 solana-runtime-transaction = { path = "runtime-transaction", version = "=2.3.1" }
+solana-sanitize = "2.2.1"
 solana-sbpf = "=0.11.1"
 solana-sdk-ids = "2.2.1"
 solana-secp256k1-program = "2.2.1"
 solana-secp256k1-recover = "2.2.1"
+solana-secp256r1-program = "2.2.3"
+solana-seed-derivable = "2.2.1"
+solana-seed-phrase = "2.2.1"
 solana-send-transaction-service = { path = "send-transaction-service", version = "=2.3.1" }
+solana-serde = "2.2.1"
+solana-serde-varint = "2.2.2"
+solana-serialize-utils = "2.2.1"
+solana-sha256-hasher = "2.2.1"
 solana-short-vec = "2.2.1"
 solana-shred-version = "2.2.1"
+solana-signature = { version = "2.3.0", default-features = false }
+solana-signer = "2.2.1"
+solana-slot-hashes = "2.2.1"
+solana-slot-history = "2.2.1"
 solana-stable-layout = "2.2.1"
 solana-stake-interface = { version = "1.2.1" }
 solana-stake-program = { path = "programs/stake", version = "=2.3.1" }
@@ -553,17 +532,23 @@ solana-sysvar = "2.2.2"
 solana-sysvar-id = "2.2.1"
 solana-test-validator = { path = "test-validator", version = "=2.3.1" }
 solana-thin-client = { path = "thin-client", version = "=2.3.1" }
-solana-transaction = "2.2.2"
-solana-transaction-error = "2.2.1"
+solana-time-utils = "2.2.1"
+solana-timings = { path = "timings", version = "=2.3.1" }
+solana-tls-utils = { path = "tls-utils", version = "=2.3.1" }
+solana-tps-client = { path = "tps-client", version = "=2.3.1" }
 solana-tpu-client = { path = "tpu-client", version = "=2.3.1", default-features = false }
 solana-tpu-client-next = { path = "tpu-client-next", version = "=2.3.1" }
+solana-transaction = "2.2.2"
 solana-transaction-context = { path = "transaction-context", version = "=2.3.1", features = ["bincode", "debug-signature"] }
+solana-transaction-error = "2.2.1"
+solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.3.1" }
 solana-transaction-status = { path = "transaction-status", version = "=2.3.1" }
 solana-transaction-status-client-types = { path = "transaction-status-client-types", version = "=2.3.1" }
-solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.3.1" }
 solana-turbine = { path = "turbine", version = "=2.3.1" }
 solana-type-overrides = { path = "type-overrides", version = "=2.3.1" }
 solana-udp-client = { path = "udp-client", version = "=2.3.1" }
+solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.3.1" }
+solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.3.1" }
 solana-validator-exit = "2.2.1"
 solana-version = { path = "version", version = "=2.3.1" }
 solana-vortexor-receiver = { path = "vortexor-receiver", version = "=2.3.1" }
@@ -627,6 +612,21 @@ x509-parser = "0.14.0"
 # See "zeroize versioning issues" below if you are updating this version.
 zeroize = { version = "1.7", default-features = false }
 zstd = "0.13.3"
+[profile.release-with-debug]
+inherits = "release"
+debug = true
+strip = false
+split-debuginfo = "off"
+
+[profile.release]
+split-debuginfo = "unpacked"
+lto = "thin"
+
+[profile.release-with-lto]
+inherits = "release"
+split-debuginfo = "unpacked"
+lto = "thin"
+codegen-units = 1
 
 # curve25519-dalek uses the simd backend by default in v4 if possible,
 # which has very slow performance on some platforms with opt-level 0,
diff --git a/account-decoder-client-types/Cargo.toml b/account-decoder-client-types/Cargo.toml
index 93b8b922b6cd6d..433ecc37929e7c 100644
--- a/account-decoder-client-types/Cargo.toml
+++ b/account-decoder-client-types/Cargo.toml
@@ -9,6 +9,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]
+
+[features]
+zstd = ["dep:zstd"]
+
 [dependencies]
 base64 = { workspace = true }
 bs58 = { workspace = true, features = ["std"] }
@@ -18,11 +26,3 @@ serde_json = { workspace = true }
 solana-account = { workspace = true }
 solana-pubkey = { workspace = true }
 zstd = { workspace = true, optional = true }
-
-[features]
-zstd = ["dep:zstd"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-all-features = true
-rustdoc-args = ["--cfg=docsrs"]
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index 1fa09e52d80eee..eb8f97da89a49c 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 Inflector = { workspace = true }
 base64 = { workspace = true }
@@ -56,8 +59,5 @@ solana-hash = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 spl-pod = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints]
 workspace = true
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index 7b893ecce1647a..1cfe16a4052ba5 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -8,6 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 clap = { workspace = true }
 log = { workspace = true }
@@ -20,9 +26,3 @@ solana-measure = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-rent-collector = { workspace = true }
 solana-version = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 90058f4b885444..e0906f3c783d35 100644
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 clap = { workspace = true }
 log = { workspace = true }
@@ -50,6 +53,3 @@ solana-native-token = { workspace = true }
 solana-poh-config = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-test-validator = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
index 5cb4f291891739..012b56e7e45c73 100644
--- a/accounts-db/Cargo.toml
+++ b/accounts-db/Cargo.toml
@@ -9,6 +9,32 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_accounts_db"
+
+[features]
+dev-context-only-utils = [
+    "dep:qualifier_attr",
+    "dep:solana-keypair",
+    "dep:solana-rent",
+    "dep:solana-signer",
+    "dep:solana-stake-program",
+    "dep:solana-vote-program",
+    "solana-account/dev-context-only-utils",
+    "solana-pubkey/rand",
+    "solana-transaction/dev-context-only-utils",
+]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-fee-calculator/frozen-abi",
+    "solana-vote-program/frozen-abi",
+]
+
 [dependencies]
 ahash = { workspace = true }
 bincode = { workspace = true }
@@ -80,10 +106,6 @@ tar = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_accounts_db"
-
 [dev-dependencies]
 agave-reserved-account-keys = { workspace = true }
 assert_matches = { workspace = true }
@@ -105,28 +127,6 @@ strum = { workspace = true, features = ["derive"] }
 strum_macros = { workspace = true }
 test-case = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = [
-    "dep:qualifier_attr",
-    "dep:solana-keypair",
-    "dep:solana-rent",
-    "dep:solana-signer",
-    "dep:solana-stake-program",
-    "dep:solana-vote-program",
-    "solana-account/dev-context-only-utils",
-    "solana-pubkey/rand",
-    "solana-transaction/dev-context-only-utils",
-]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-fee-calculator/frozen-abi",
-    "solana-vote-program/frozen-abi",
-]
-
 [[bench]]
 name = "bench_accounts_file"
 harness = false
diff --git a/accounts-db/accounts-hash-cache-tool/Cargo.toml b/accounts-db/accounts-hash-cache-tool/Cargo.toml
index 525641902038b1..8413e5c5da492a 100644
--- a/accounts-db/accounts-hash-cache-tool/Cargo.toml
+++ b/accounts-db/accounts-hash-cache-tool/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 ahash = { workspace = true }
 anyhow = { workspace = true }
@@ -20,6 +23,3 @@ solana-accounts-db = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []
diff --git a/accounts-db/store-histogram/Cargo.toml b/accounts-db/store-histogram/Cargo.toml
index 75cdea3eb1f362..e762b25c087b2b 100644
--- a/accounts-db/store-histogram/Cargo.toml
+++ b/accounts-db/store-histogram/Cargo.toml
@@ -9,9 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 clap = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []
diff --git a/accounts-db/store-tool/Cargo.toml b/accounts-db/store-tool/Cargo.toml
index 506758e0c01a9e..7b2c8c2e79706d 100644
--- a/accounts-db/store-tool/Cargo.toml
+++ b/accounts-db/store-tool/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 ahash = { workspace = true }
 clap = { workspace = true }
@@ -18,6 +21,3 @@ solana-accounts-db = { workspace = true, features = ["dev-context-only-utils"] }
 solana-pubkey = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index aa9f23ae452163..318f8ce3e0ca66 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -8,6 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 agave-banking-stage-ingress-types = { workspace = true }
 assert_matches = { workspace = true }
@@ -39,9 +45,3 @@ solana-time-utils = { workspace = true }
 solana-tpu-client = { workspace = true }
 solana-transaction = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml
index 58d89aa98eec50..9749ef89482ea4 100644
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_banks_client"
+
 [dependencies]
 borsh = { workspace = true }
 futures = { workspace = true }
@@ -37,10 +44,3 @@ solana-pubkey = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-signer = { workspace = true }
 solana-system-interface = { workspace = true }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_banks_client"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml
index 0fda667526f6bd..a1178a7bfc54a9 100644
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_banks_interface"
+
 [dependencies]
 serde = { workspace = true }
 serde_derive = { workspace = true }
@@ -23,10 +30,3 @@ solana-transaction = { workspace = true, features = [ "serde" ] }
 solana-transaction-context = { workspace = true, features = [ "serde" ] }
 solana-transaction-error = { workspace = true, features = [ "serde" ] }
 tarpc = { workspace = true, features = ["full"] }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_banks_interface"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
index d5ad0ce8358dff..3cd5fc9ca75a47 100644
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_banks_server"
+
 [dependencies]
 agave-feature-set = { workspace = true }
 bincode = { workspace = true }
@@ -32,10 +39,3 @@ solana-transaction-error = { workspace = true }
 tarpc = { workspace = true, features = ["full"] }
 tokio = { workspace = true, features = ["full"] }
 tokio-serde = { workspace = true, features = ["bincode"] }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_banks_server"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 2af7ec8f39be94..70c97e1cf4ab6c 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -8,12 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 clap = { version = "3.1.5", features = ["cargo"] }
 crossbeam-channel = { workspace = true }
 solana-net-utils = { workspace = true }
 solana-streamer = { workspace = true }
 solana-version = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index ec8943227b4e24..6c7ee5fee062b5 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -8,6 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 chrono = { workspace = true }
 clap = { workspace = true }
@@ -74,9 +80,3 @@ solana-sdk-ids = { workspace = true }
 solana-test-validator = { workspace = true }
 solana-tps-client = { workspace = true, features = ["bank-client"] }
 tempfile = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []
diff --git a/bench-vote/Cargo.toml b/bench-vote/Cargo.toml
index 5241b029c7bc14..61b8bf6cbef9cb 100644
--- a/bench-vote/Cargo.toml
+++ b/bench-vote/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 bincode = { workspace = true }
 clap = { workspace = true }
@@ -26,6 +29,3 @@ solana-streamer = { workspace = true }
 solana-transaction = { workspace = true }
 solana-version = { workspace = true }
 solana-vote-program = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
index e7c33801d26aee..93f4520c747c0e 100644
--- a/bloom/Cargo.toml
+++ b/bloom/Cargo.toml
@@ -9,6 +9,20 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_bloom"
+
+[features]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-hash/frozen-abi",
+]
+
 [dependencies]
 bv = { workspace = true, features = ["serde"] }
 fnv = { workspace = true }
@@ -30,19 +44,5 @@ solana-hash = { workspace = true }
 solana-sha256-hasher = { workspace = true }
 solana-signature = { workspace = true, features = ["std"] }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_bloom"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-hash/frozen-abi",
-]
-
 [lints]
 workspace = true
diff --git a/bucket_map/Cargo.toml b/bucket_map/Cargo.toml
index a21ba0fedb6683..55bea8fafbbaec 100644
--- a/bucket_map/Cargo.toml
+++ b/bucket_map/Cargo.toml
@@ -10,6 +10,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["lib"]
+name = "solana_bucket_map"
+
 [dependencies]
 bv = { workspace = true, features = ["serde"] }
 bytemuck = { workspace = true }
@@ -29,9 +33,5 @@ rayon = { workspace = true }
 solana-logger = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_bucket_map"
-
 [[bench]]
 name = "bucket_map"
diff --git a/builtins-default-costs/Cargo.toml b/builtins-default-costs/Cargo.toml
index 159edf3c7ba549..f7f0e85cc02c56 100644
--- a/builtins-default-costs/Cargo.toml
+++ b/builtins-default-costs/Cargo.toml
@@ -9,6 +9,18 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+# Add additional builtin programs here
+
+[lib]
+crate-type = ["lib"]
+name = "solana_builtins_default_costs"
+
+[features]
+frozen-abi = ["dep:solana-frozen-abi", "solana-vote-program/frozen-abi"]
+dev-context-only-utils = []
+
 [dependencies]
 agave-feature-set = { workspace = true }
 ahash = { workspace = true }
@@ -24,25 +36,10 @@ solana-sdk-ids = { workspace = true }
 solana-stake-program = { workspace = true }
 solana-system-program = { workspace = true }
 solana-vote-program = { workspace = true }
-# Add additional builtin programs here
-
-[lib]
-crate-type = ["lib"]
-name = "solana_builtins_default_costs"
 
 [dev-dependencies]
 rand = "0.8.5"
 static_assertions = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "solana-vote-program/frozen-abi",
-]
-dev-context-only-utils = []
-
 [lints]
 workspace = true
diff --git a/cargo-registry/Cargo.toml b/cargo-registry/Cargo.toml
index d91148e1f2790d..907c49040c57ed 100644
--- a/cargo-registry/Cargo.toml
+++ b/cargo-registry/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 clap = { workspace = true }
 flate2 = { workspace = true }
@@ -38,9 +44,3 @@ tokio = { workspace = true, features = ["full"] }
 toml = { workspace = true }
 
 [dev-dependencies]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index 7d3fa3b8a0c1b4..514317b5ad72f7 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -82,7 +82,7 @@ RUN \
   # uncomment once the dcou-parition related patch is upstreamed...
   # cargo install cargo-hack && \
   cargo install --git https://github.com/anza-xyz/cargo-hack.git --rev 5e59c3ec6c661c02601487c0d4b2a2649fe06c9f cargo-hack && \
-  cargo install cargo-sort && \
+  cargo install cargo-sort@^2 && \
   cargo install mdbook && \
   cargo install mdbook-linkcheck && \
   cargo install svgbob_cli && \
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index da9298ca776777..a0e9f610816e4a 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_clap_utils"
+
 [dependencies]
 chrono = { workspace = true, features = ["default"] }
 clap = "2.33.0"
@@ -37,9 +43,3 @@ assert_matches = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-system-interface = { workspace = true, features = ["bincode"] }
 tempfile = { workspace = true }
-
-[lib]
-name = "solana_clap_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml
index 1a2d15ce5986d3..4dce300b4f38f2 100644
--- a/clap-v3-utils/Cargo.toml
+++ b/clap-v3-utils/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_clap_v3_utils"
+
 [dependencies]
 chrono = { workspace = true, features = ["default"] }
 clap = { version = "3.2.23", features = ["cargo"] }
@@ -40,9 +46,3 @@ assert_matches = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-system-interface = { workspace = true, features = ["bincode"] }
 tempfile = { workspace = true }
-
-[lib]
-name = "solana_clap_v3_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/cli-config/Cargo.toml b/cli-config/Cargo.toml
index 3a67a6ac35f045..dd322b07b68148 100644
--- a/cli-config/Cargo.toml
+++ b/cli-config/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 dirs-next = { workspace = true }
 serde = { workspace = true }
@@ -20,6 +23,3 @@ url = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index 17d0d6d23eff66..8af951f23c92b9 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 Inflector = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -51,6 +54,3 @@ ed25519-dalek = { workspace = true }
 solana-keypair = { workspace = true }
 solana-signer = { workspace = true }
 solana-transaction-context = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 6daf5d8dc42f64..6f4a775049b221 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "solana"
+path = "src/main.rs"
+
 [dependencies]
 agave-feature-set = { workspace = true }
 bincode = { workspace = true }
@@ -103,10 +110,3 @@ solana-streamer = { workspace = true }
 solana-test-validator = { workspace = true }
 tempfile = { workspace = true }
 test-case = { workspace = true }
-
-[[bin]]
-name = "solana"
-path = "src/main.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/client-test/Cargo.toml b/client-test/Cargo.toml
index 3368bb6b06ae99..f1551e8e9a95d0 100644
--- a/client-test/Cargo.toml
+++ b/client-test/Cargo.toml
@@ -10,6 +10,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 futures-util = { workspace = true }
 serde_json = { workspace = true }
@@ -46,6 +49,3 @@ solana-logger = { workspace = true }
 solana-net-utils = { workspace = true }
 solana-rpc = { workspace = true, features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 986a926fd87761..b9bf4f9604e658 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 async-trait = { workspace = true }
 bincode = { workspace = true }
@@ -52,6 +55,3 @@ tokio = { workspace = true, features = ["full"] }
 [dev-dependencies]
 crossbeam-channel = { workspace = true }
 solana-net-utils = { workspace = true, features = ["dev-context-only-utils"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/compute-budget-instruction/Cargo.toml b/compute-budget-instruction/Cargo.toml
index 37a9d2ff426c0e..8971b9b619c6bf 100644
--- a/compute-budget-instruction/Cargo.toml
+++ b/compute-budget-instruction/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_compute_budget_instruction"
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 agave-feature-set = { workspace = true }
 log = { workspace = true }
@@ -24,10 +34,6 @@ solana-svm-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_compute_budget_instruction"
-
 [dev-dependencies]
 bincode = { workspace = true }
 criterion = { workspace = true }
@@ -41,12 +47,6 @@ solana-stake-interface = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true, features = ["blake3"] }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []
-
 [[bench]]
 name = "process_compute_budget_instructions"
 harness = false
diff --git a/compute-budget/Cargo.toml b/compute-budget/Cargo.toml
index 2a9a1b3e9d41df..d5a93b4958b9e9 100644
--- a/compute-budget/Cargo.toml
+++ b/compute-budget/Cargo.toml
@@ -9,6 +9,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = ["dep:qualifier_attr"]
+frozen-abi = ["dep:solana-frozen-abi", "solana-fee-structure/frozen-abi"]
+
 [dependencies]
 qualifier_attr = { workspace = true, optional = true }
 solana-fee-structure = { workspace = true }
@@ -17,9 +21,5 @@ solana-frozen-abi = { workspace = true, optional = true, features = [
 ] }
 solana-program-runtime = { workspace = true }
 
-[features]
-dev-context-only-utils = ["dep:qualifier_attr"]
-frozen-abi = ["dep:solana-frozen-abi", "solana-fee-structure/frozen-abi"]
-
 [lints]
 workspace = true
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 64cf0389f48dbd..85a0b12fcee584 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -10,8 +10,35 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[badges]
-codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = [
+    "solana-perf/dev-context-only-utils",
+    "solana-runtime/dev-context-only-utils",
+    "solana-streamer/dev-context-only-utils",
+]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-accounts-db/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",
+]
 
 [dependencies]
 agave-banking-stage-ingress-types = { workspace = true }
@@ -136,7 +163,7 @@ solana-vortexor-receiver = { workspace = true }
 solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
 solana-wen-restart = { workspace = true }
-static_assertions ={ workspace = true }
+static_assertions = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
 strum_macros = { workspace = true }
 sys-info = { workspace = true }
@@ -146,6 +173,12 @@ tokio = { workspace = true, features = ["full"] }
 tokio-util = { workspace = true }
 trees = { workspace = true }
 
+[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
+jemallocator = { workspace = true }
+
+[target."cfg(unix)".dependencies]
+sysctl = { workspace = true }
+
 [dev-dependencies]
 agave-reserved-account-keys = { workspace = true }
 criterion = { workspace = true }
@@ -177,38 +210,8 @@ spl-memo = { workspace = true, features = ["no-entrypoint"] }
 static_assertions = { workspace = true }
 test-case = { workspace = true }
 
-[target."cfg(unix)".dependencies]
-sysctl = { workspace = true }
-
-[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
-jemallocator = { workspace = true }
-
-[features]
-dev-context-only-utils = [
-    "solana-perf/dev-context-only-utils",
-    "solana-runtime/dev-context-only-utils",
-    "solana-streamer/dev-context-only-utils",
-]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-accounts-db/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",
-]
+[badges]
+codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
 
 [[bench]]
 name = "banking_stage"
@@ -227,8 +230,5 @@ harness = false
 name = "scheduler"
 harness = false
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints]
 workspace = true
diff --git a/cost-model/Cargo.toml b/cost-model/Cargo.toml
index 265bd6ec7cccf9..ed7856f71f9147 100644
--- a/cost-model/Cargo.toml
+++ b/cost-model/Cargo.toml
@@ -9,6 +9,29 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_cost_model"
+
+[features]
+dev-context-only-utils = [
+    "dep:solana-hash",
+    "dep:solana-message",
+    "dep:solana-signature",
+    "dep:solana-transaction",
+    "solana-compute-budget-interface/dev-context-only-utils",
+]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-compute-budget/frozen-abi",
+    "solana-pubkey/frozen-abi",
+    "solana-vote-program/frozen-abi",
+]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 ahash = { workspace = true }
@@ -41,10 +64,6 @@ solana-transaction = { workspace = true, optional = true }
 solana-transaction-error = { workspace = true }
 solana-vote-program = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_cost_model"
-
 [dev-dependencies]
 agave-reserved-account-keys = { workspace = true }
 itertools = { workspace = true }
@@ -70,25 +89,6 @@ solana-vote = { workspace = true }
 static_assertions = { workspace = true }
 test-case = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = [
-    "dep:solana-hash",
-    "dep:solana-message",
-    "dep:solana-signature",
-    "dep:solana-transaction",
-    "solana-compute-budget-interface/dev-context-only-utils"
-]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-compute-budget/frozen-abi",
-    "solana-pubkey/frozen-abi",
-    "solana-vote-program/frozen-abi"
-]
-
 [[bench]]
 name = "cost_tracker"
 
diff --git a/curves/curve25519/Cargo.toml b/curves/curve25519/Cargo.toml
index 597e8f25603517..7beb5dc7499bbc 100644
--- a/curves/curve25519/Cargo.toml
+++ b/curves/curve25519/Cargo.toml
@@ -19,11 +19,11 @@ bytemuck_derive = { workspace = true }
 subtle = { workspace = true }
 thiserror = { workspace = true }
 
-[target.'cfg(target_os = "solana")'.dependencies]
-solana-define-syscall = { workspace = true }
-
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 curve25519-dalek = { workspace = true, features = ["serde"] }
 
+[target.'cfg(target_os = "solana")'.dependencies]
+solana-define-syscall = { workspace = true }
+
 [lints]
 workspace = true
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index d9420749e7ac60..dce537a837b429 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 bincode = { workspace = true }
 clap = { version = "3.1.5", features = ["derive", "cargo"] }
@@ -46,13 +52,7 @@ solana-tpu-client = { workspace = true }
 solana-transaction = { workspace = true }
 solana-version = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [dev-dependencies]
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
 solana-local-cluster = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[features]
-dev-context-only-utils = []
diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml
index 78a64d1e510cde..7d725cec277de5 100644
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_download_utils"
+
 [dependencies]
 log = { workspace = true }
 solana-clock = { workspace = true }
@@ -18,10 +25,3 @@ solana-runtime = { workspace = true }
 
 [dev-dependencies]
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_download_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/entry/Cargo.toml b/entry/Cargo.toml
index 7bca177c1c4b32..bf72e34fdf8ab8 100644
--- a/entry/Cargo.toml
+++ b/entry/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_entry"
+
 [dependencies]
 bincode = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -42,12 +49,5 @@ solana-signer = { workspace = true }
 solana-system-transaction = { workspace = true }
 solana-transaction = { workspace = true, features = ["verify"] }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_entry"
-
 [[bench]]
 name = "entry_sigverify"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 043d29289d42b6..b582e383db3d87 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -9,6 +9,17 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_faucet"
+
+[[bin]]
+name = "solana-faucet"
+path = "src/bin/faucet.rs"
+
 [dependencies]
 bincode = { workspace = true }
 clap = { workspace = true }
@@ -35,14 +46,3 @@ solana-version = { workspace = true }
 spl-memo = { version = "=6.0.0", features = ["no-entrypoint"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_faucet"
-
-[[bin]]
-name = "solana-faucet"
-path = "src/bin/faucet.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/feature-set/Cargo.toml b/feature-set/Cargo.toml
index 8a2a60e91471e4..8b29e823d9b602 100644
--- a/feature-set/Cargo.toml
+++ b/feature-set/Cargo.toml
@@ -9,6 +9,9 @@ license = { workspace = true }
 edition = { workspace = true }
 readme = false
 
+[features]
+frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
+
 [dependencies]
 ahash = { workspace = true }
 solana-epoch-schedule = { workspace = true }
@@ -23,8 +26,5 @@ solana-pubkey = { workspace = true, default-features = false }
 solana-sha256-hasher = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 
-[features]
-frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
-
 [lints]
 workspace = true
diff --git a/genesis-utils/Cargo.toml b/genesis-utils/Cargo.toml
index 6f11a8cad46d2a..f4040d34136bf0 100644
--- a/genesis-utils/Cargo.toml
+++ b/genesis-utils/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_genesis_utils"
+
 [dependencies]
 log = { workspace = true }
 solana-accounts-db = { workspace = true }
@@ -16,10 +23,3 @@ solana-download-utils = { workspace = true }
 solana-genesis-config = { workspace = true }
 solana-hash = { workspace = true }
 solana-rpc-client = { workspace = true }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_genesis_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 0f6ff8a923f7a9..6448e450bc9ba2 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_genesis"
+
+[[bin]]
+name = "solana-genesis"
+path = "src/main.rs"
+
 [dependencies]
 agave-feature-set = { workspace = true }
 base64 = { workspace = true }
@@ -54,13 +64,3 @@ tempfile = { workspace = true }
 solana-borsh = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[[bin]]
-name = "solana-genesis"
-path = "src/main.rs"
-
-[lib]
-name = "solana_genesis"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/geyser-plugin-interface/Cargo.toml b/geyser-plugin-interface/Cargo.toml
index 465eca2c8bb6a7..6a39745cab0c6c 100644
--- a/geyser-plugin-interface/Cargo.toml
+++ b/geyser-plugin-interface/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 log = { workspace = true, features = ["std"] }
 solana-clock = { workspace = true }
@@ -16,6 +19,3 @@ solana-signature = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-status = { workspace = true }
 thiserror = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/geyser-plugin-manager/Cargo.toml b/geyser-plugin-manager/Cargo.toml
index 54459d54aab829..2637384dc1a331 100644
--- a/geyser-plugin-manager/Cargo.toml
+++ b/geyser-plugin-manager/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 agave-geyser-plugin-interface = { workspace = true }
 bs58 = { workspace = true }
@@ -33,6 +36,3 @@ solana-transaction = { workspace = true }
 solana-transaction-status = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 7147ad10f4863c..c51c6fb22fa6f1 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -9,6 +9,27 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "solana-gossip"
+path = "src/main.rs"
+
+[features]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-bloom/frozen-abi",
+    "solana-ledger/frozen-abi",
+    "solana-perf/frozen-abi",
+    "solana-runtime/frozen-abi",
+    "solana-short-vec/frozen-abi",
+    "solana-version/frozen-abi",
+    "solana-vote/frozen-abi",
+    "solana-vote-program/frozen-abi",
+]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 arrayvec = { workspace = true }
@@ -92,20 +113,6 @@ solana-vote-interface = { workspace = true }
 static_assertions = { workspace = true }
 test-case = { workspace = true }
 
-[features]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-bloom/frozen-abi",
-    "solana-ledger/frozen-abi",
-    "solana-perf/frozen-abi",
-    "solana-runtime/frozen-abi",
-    "solana-short-vec/frozen-abi",
-    "solana-version/frozen-abi",
-    "solana-vote/frozen-abi",
-    "solana-vote-program/frozen-abi",
-]
-
 [[bench]]
 name = "crds"
 
@@ -119,12 +126,5 @@ name = "crds_shards"
 name = "weighted_shuffle"
 harness = false
 
-[[bin]]
-name = "solana-gossip"
-path = "src/main.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints]
 workspace = true
diff --git a/install/Cargo.toml b/install/Cargo.toml
index fc61f1a5e092c6..e01bd13fa885bc 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 atty = { workspace = true }
 bincode = { workspace = true }
@@ -48,6 +51,3 @@ url = { workspace = true }
 [target."cfg(windows)".dependencies]
 winapi = { workspace = true, features = ["minwindef", "winuser"] }
 winreg = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index 0848002a6ddd5e..540f857dc074ba 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "solana-keygen"
+path = "src/keygen.rs"
+
 [dependencies]
 bs58 = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo"] }
@@ -31,10 +38,3 @@ tiny-bip39 = { workspace = true }
 [dev-dependencies]
 solana-pubkey = { workspace = true, features = ["rand"] }
 tempfile = { workspace = true }
-
-[[bin]]
-name = "solana-keygen"
-path = "src/keygen.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 3e39c1b1874696..8fc22f13065d63 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -87,14 +93,8 @@ tokio = { workspace = true, features = ["full"] }
 [target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
 jemallocator = { workspace = true }
 
-[dev-dependencies]
-assert_cmd = { workspace = true }
-
-[features]
-dev-context-only-utils = []
-
 [target."cfg(unix)".dependencies]
 signal-hook = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[dev-dependencies]
+assert_cmd = { workspace = true }
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index 231ea6d52a8557..7e99d3146c75bb 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -9,6 +9,21 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_ledger"
+
+[features]
+dev-context-only-utils = []
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-runtime/frozen-abi",
+]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -131,18 +146,6 @@ spl-generic-token = { workspace = true }
 spl-pod = { workspace = true }
 test-case = { workspace = true }
 
-[features]
-dev-context-only-utils = []
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-runtime/frozen-abi",
-]
-
-[lib]
-crate-type = ["lib"]
-name = "solana_ledger"
-
 [[bench]]
 name = "blockstore"
 
@@ -150,8 +153,5 @@ name = "blockstore"
 name = "make_shreds_from_entries"
 harness = false
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints]
 workspace = true
diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
index cbb8ccc6d637dc..36911ac92946b0 100644
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 crossbeam-channel = { workspace = true }
 itertools = { workspace = true }
@@ -75,9 +81,3 @@ solana-download-utils = { workspace = true }
 solana-ledger = { workspace = true, features = ["dev-context-only-utils"] }
 solana-local-cluster = { path = ".", features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index c40cce53aea91f..27c95c9b7ed5ba 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "solana-log-analyzer"
+path = "src/main.rs"
+
 [dependencies]
 byte-unit = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo"] }
@@ -17,10 +24,3 @@ serde_derive = { workspace = true }
 serde_json = { workspace = true }
 solana-logger = "=2.3.1"
 solana-version = { workspace = true }
-
-[[bin]]
-name = "solana-log-analyzer"
-path = "src/main.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/log-collector/Cargo.toml b/log-collector/Cargo.toml
index e22c14c09f65e4..693d5fd6b4812f 100644
--- a/log-collector/Cargo.toml
+++ b/log-collector/Cargo.toml
@@ -9,8 +9,8 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[dependencies]
-log = { workspace = true }
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+log = { workspace = true }
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
index cbd11a0e65797c..7993e255807e12 100644
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_merkle_tree"
+
 [dependencies]
 fast-math = { workspace = true }
 solana-hash = { workspace = true }
@@ -16,10 +23,3 @@ solana-sha256-hasher = { workspace = true }
 
 [dev-dependencies]
 hex = { workspace = true }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_merkle_tree"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
index 716f4ee0ca041d..d81b5f61a73444 100644
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_metrics"
+
 [dependencies]
 crossbeam-channel = { workspace = true }
 gethostname = { workspace = true }
@@ -24,11 +30,5 @@ env_logger = { workspace = true }
 rand = { workspace = true }
 serial_test = { workspace = true }
 
-[lib]
-name = "solana_metrics"
-
 [[bench]]
 name = "metrics"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 33c4e303873462..ff047038c29beb 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "solana-net-shaper"
+path = "src/main.rs"
+
 [dependencies]
 clap = { version = "3.1.5", features = ["cargo"] }
 rand = { workspace = true }
@@ -16,10 +23,3 @@ serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
 solana-logger = "=2.3.1"
-
-[[bin]]
-name = "solana-net-shaper"
-path = "src/main.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index 89f91d22c740ce..f26dcbf7f7e207 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -10,8 +10,15 @@ license = { workspace = true }
 edition = { workspace = true }
 rust-version = "1.83.0"
 
-[lints]
-workspace = true
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_net_utils"
+
+[features]
+default = []
+dev-context-only-utils = ["dep:pcap-file", "dep:hxdmp"]
 
 [dependencies]
 anyhow = { workspace = true }
@@ -33,12 +40,5 @@ url = { workspace = true }
 [dev-dependencies]
 solana-logger = { workspace = true }
 
-[features]
-default = []
-dev-context-only-utils = ["dep:pcap-file", "dep:hxdmp"]
-
-[lib]
-name = "solana_net_utils"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[lints]
+workspace = true
diff --git a/notifier/Cargo.toml b/notifier/Cargo.toml
index 270ba43d9c696c..ba5dcb2a74e3a4 100644
--- a/notifier/Cargo.toml
+++ b/notifier/Cargo.toml
@@ -9,14 +9,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_notifier"
+
 [dependencies]
 log = { workspace = true }
 reqwest = { workspace = true, features = ["blocking", "brotli", "deflate", "gzip", "rustls-tls", "json"] }
 serde_json = { workspace = true }
 solana-hash = { workspace = true }
-
-[lib]
-name = "solana_notifier"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
index 05a46eceb9db92..aa43ba4ecd4c38 100644
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -9,6 +9,30 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_perf"
+
+[features]
+dev-context-only-utils = [
+    "dep:solana-clock",
+    "dep:solana-keypair",
+    "dep:solana-signer",
+    "dep:solana-system-interface",
+    "dep:solana-system-transaction",
+    "dep:solana-transaction",
+    "dep:solana-vote-program",
+    "dep:solana-vote",
+]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-short-vec/frozen-abi",
+    "solana-vote-program/frozen-abi",
+]
+
 [dependencies]
 ahash = { workspace = true }
 bincode = { workspace = true }
@@ -51,9 +75,6 @@ caps = { workspace = true }
 libc = { workspace = true }
 nix = { workspace = true, features = ["user"] }
 
-[lib]
-name = "solana_perf"
-
 [dev-dependencies]
 assert_matches = { workspace = true }
 rand_chacha = { workspace = true }
@@ -61,33 +82,12 @@ solana-logger = { workspace = true }
 solana-perf = { path = ".", features = ["dev-context-only-utils"] }
 test-case = { workspace = true }
 
-[features]
-dev-context-only-utils = [
-    "dep:solana-clock",
-    "dep:solana-keypair",
-    "dep:solana-signer",
-    "dep:solana-system-interface",
-    "dep:solana-system-transaction",
-    "dep:solana-transaction",
-    "dep:solana-vote-program",
-    "dep:solana-vote",
-]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-short-vec/frozen-abi",
-    "solana-vote-program/frozen-abi",
-]
-
 [[bench]]
 name = "sigverify"
 
 [[bench]]
 name = "discard"
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints.rust.unexpected_cfgs]
 level = "warn"
 check-cfg = ['cfg(build_target_feature_avx)', 'cfg(build_target_feature_avx2)']
diff --git a/platform-tools-sdk/cargo-build-sbf/Cargo.toml b/platform-tools-sdk/cargo-build-sbf/Cargo.toml
index 8c6ed2d2024bc7..e4b3c84bc8d9ec 100644
--- a/platform-tools-sdk/cargo-build-sbf/Cargo.toml
+++ b/platform-tools-sdk/cargo-build-sbf/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[[bin]]
+name = "cargo-build-sbf"
+path = "src/main.rs"
+
+[features]
+program = []
+
 [dependencies]
 bzip2 = { workspace = true }
 cargo_metadata = { workspace = true }
@@ -27,10 +34,3 @@ tar = { workspace = true }
 assert_cmd = { workspace = true }
 predicates = { workspace = true }
 serial_test = { workspace = true }
-
-[features]
-program = []
-
-[[bin]]
-name = "cargo-build-sbf"
-path = "src/main.rs"
diff --git a/platform-tools-sdk/cargo-test-sbf/Cargo.toml b/platform-tools-sdk/cargo-test-sbf/Cargo.toml
index 80594997613f00..fa0fb2fe2cbc7c 100644
--- a/platform-tools-sdk/cargo-test-sbf/Cargo.toml
+++ b/platform-tools-sdk/cargo-test-sbf/Cargo.toml
@@ -9,6 +9,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[[bin]]
+name = "cargo-test-sbf"
+path = "src/main.rs"
+
 [dependencies]
 cargo_metadata = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo"] }
@@ -16,7 +20,3 @@ itertools = { workspace = true }
 log = { workspace = true, features = ["std"] }
 regex = { workspace = true }
 solana-logger = "=2.3.1"
-
-[[bin]]
-name = "cargo-test-sbf"
-path = "src/main.rs"
diff --git a/platform-tools-sdk/gen-headers/Cargo.toml b/platform-tools-sdk/gen-headers/Cargo.toml
index 588bb11ee57c6d..35327f604fb828 100644
--- a/platform-tools-sdk/gen-headers/Cargo.toml
+++ b/platform-tools-sdk/gen-headers/Cargo.toml
@@ -8,10 +8,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[dependencies]
-log = { workspace = true, features = ["std"] }
-regex = { workspace = true }
-
 [[bin]]
 name = "gen-headers"
 path = "src/main.rs"
+
+[dependencies]
+log = { workspace = true, features = ["std"] }
+regex = { workspace = true }
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 77df7970107b91..e95e7a22a02cb4 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 clap = { version = "3.1.5", features = ["cargo"] }
 log = { workspace = true }
@@ -20,6 +23,3 @@ solana-perf = { workspace = true }
 solana-rayon-threadlimit = { workspace = true }
 solana-sha256-hasher = { workspace = true }
 solana-version = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/poh/Cargo.toml b/poh/Cargo.toml
index 482f42b1ec088f..96abb25ac66a3e 100644
--- a/poh/Cargo.toml
+++ b/poh/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_poh"
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 core_affinity = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -41,19 +51,9 @@ solana-sha256-hasher = { workspace = true }
 solana-signer = { workspace = true }
 solana-system-transaction = { workspace = true }
 
-[features]
-dev-context-only-utils = []
-
-[lib]
-crate-type = ["lib"]
-name = "solana_poh"
-
 [[bench]]
 name = "poh"
 
 [[bench]]
 name = "transaction_recorder"
 harness = false
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml
index 021bf76716d03a..7b41042855b9ec 100644
--- a/poseidon/Cargo.toml
+++ b/poseidon/Cargo.toml
@@ -9,18 +9,18 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 thiserror = { workspace = true }
 
-[target.'cfg(target_os = "solana")'.dependencies]
-solana-define-syscall = { workspace = true }
-
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 ark-bn254 = { workspace = true }
 light-poseidon = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[target.'cfg(target_os = "solana")'.dependencies]
+solana-define-syscall = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/precompiles/Cargo.toml b/precompiles/Cargo.toml
index aa30d02161ab8b..c2a5a854af7696 100644
--- a/precompiles/Cargo.toml
+++ b/precompiles/Cargo.toml
@@ -9,6 +9,11 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 bincode = { workspace = true }
@@ -34,10 +39,5 @@ solana-keccak-hasher = { workspace = true }
 solana-logger = { workspace = true }
 solana-secp256k1-program = { workspace = true, features = ["bincode"] }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-all-features = true
-rustdoc-args = ["--cfg=docsrs"]
-
 [lints]
 workspace = true
diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
index 72188a3e721cd4..aba0cc661f98bd 100644
--- a/program-runtime/Cargo.toml
+++ b/program-runtime/Cargo.toml
@@ -9,6 +9,20 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_program_runtime"
+
+[features]
+dev-context-only-utils = []
+dummy-for-ci-check = ["metrics"]
+frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
+metrics = ["dep:solana-metrics"]
+shuttle-test = ["solana-type-overrides/shuttle-test", "solana-sbpf/shuttle-test"]
+
 [dependencies]
 base64 = { workspace = true }
 bincode = { workspace = true }
@@ -63,25 +77,5 @@ solana-transaction-context = { workspace = true, features = [
 ] }
 test-case = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_program_runtime"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []
-dummy-for-ci-check = ["metrics"]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-]
-metrics = ["dep:solana-metrics"]
-shuttle-test = [
-    "solana-type-overrides/shuttle-test",
-    "solana-sbpf/shuttle-test",
-]
-
 [lints]
 workspace = true
diff --git a/programs/bpf-loader-tests/Cargo.toml b/programs/bpf-loader-tests/Cargo.toml
index f87a459f84e347..46e1def4e0d4cd 100644
--- a/programs/bpf-loader-tests/Cargo.toml
+++ b/programs/bpf-loader-tests/Cargo.toml
@@ -11,6 +11,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dev-dependencies]
 assert_matches = { workspace = true }
 bincode = { workspace = true }
@@ -26,6 +29,3 @@ solana-signer = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
index e100cb92aa6bc8..074374745db3ba 100644
--- a/programs/bpf_loader/Cargo.toml
+++ b/programs/bpf_loader/Cargo.toml
@@ -9,6 +9,23 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_bpf_loader_program"
+
+[features]
+default = ["metrics"]
+metrics = ["solana-program-runtime/metrics"]
+shuttle-test = [
+    "solana-type-overrides/shuttle-test",
+    "solana-program-runtime/shuttle-test",
+    "solana-sbpf/shuttle-test",
+]
+svm-internal = []
+
 [dependencies]
 bincode = { workspace = true }
 libsecp256k1 = { workspace = true }
@@ -69,10 +86,6 @@ solana-transaction-context = { workspace = true, features = ["dev-context-only-u
 static_assertions = { workspace = true }
 test-case = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_bpf_loader_program"
-
 [[bench]]
 name = "serialization"
 harness = false
@@ -80,16 +93,3 @@ harness = false
 [[bench]]
 name = "bpf_loader_upgradeable"
 harness = false
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-default = ["metrics"]
-metrics = ["solana-program-runtime/metrics"]
-shuttle-test = [
-    "solana-type-overrides/shuttle-test",
-    "solana-program-runtime/shuttle-test",
-    "solana-sbpf/shuttle-test"
-]
-svm-internal = []
diff --git a/programs/compute-budget-bench/Cargo.toml b/programs/compute-budget-bench/Cargo.toml
index 49232a5627944a..e072e16e8306a6 100644
--- a/programs/compute-budget-bench/Cargo.toml
+++ b/programs/compute-budget-bench/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 criterion = { workspace = true }
@@ -22,6 +25,3 @@ solana-svm-transaction = { workspace = true }
 [[bench]]
 name = "compute_budget"
 harness = false
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/compute-budget/Cargo.toml b/programs/compute-budget/Cargo.toml
index 4a69c15a017a93..b8262283f40afd 100644
--- a/programs/compute-budget/Cargo.toml
+++ b/programs/compute-budget/Cargo.toml
@@ -9,12 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[dependencies]
-solana-program-runtime = { workspace = true }
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
 
 [lib]
 crate-type = ["lib"]
 name = "solana_compute_budget_program"
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[dependencies]
+solana-program-runtime = { workspace = true }
diff --git a/programs/ed25519-tests/Cargo.toml b/programs/ed25519-tests/Cargo.toml
index 930ca7424ddbbc..07d5eebb592976 100644
--- a/programs/ed25519-tests/Cargo.toml
+++ b/programs/ed25519-tests/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dev-dependencies]
 assert_matches = { workspace = true }
 ed25519-dalek = { workspace = true }
@@ -19,6 +22,3 @@ solana-program-test = { workspace = true }
 solana-signer = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/loader-v4/Cargo.toml b/programs/loader-v4/Cargo.toml
index 8e1935e9bde57f..5aaaa6b012d567 100644
--- a/programs/loader-v4/Cargo.toml
+++ b/programs/loader-v4/Cargo.toml
@@ -8,6 +8,22 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_loader_v4_program"
+
+[features]
+agave-unstable-api = []
+shuttle-test = [
+    "solana-type-overrides/shuttle-test",
+    "solana-program-runtime/shuttle-test",
+    "solana-sbpf/shuttle-test",
+]
+svm-internal = []
+
 [dependencies]
 log = { workspace = true }
 qualifier_attr = { workspace = true }
@@ -31,19 +47,3 @@ solana-type-overrides = { workspace = true }
 bincode = { workspace = true }
 solana-clock = { workspace = true }
 solana-sysvar = { workspace = true }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_loader_v4_program"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-agave-unstable-api = []
-shuttle-test = [
-    "solana-type-overrides/shuttle-test",
-    "solana-program-runtime/shuttle-test",
-    "solana-sbpf/shuttle-test"
-]
-svm-internal = []
diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml
index 374d50fa09c50c..8dff9efc45be27 100644
--- a/programs/sbf/Cargo.toml
+++ b/programs/sbf/Cargo.toml
@@ -1,3 +1,77 @@
+
+[package]
+name = "solana-sbf-programs"
+description = "Blockchain, Rebuilt for Scale"
+documentation = "https://docs.rs/solana"
+readme = "README.md"
+publish = false
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[workspace]
+members = [
+    "rust/128bit",
+    "rust/128bit_dep",
+    "rust/account_mem",
+    "rust/account_mem_deprecated",
+    "rust/alloc",
+    "rust/alt_bn128",
+    "rust/alt_bn128_compression",
+    "rust/big_mod_exp",
+    "rust/call_args",
+    "rust/call_depth",
+    "rust/caller_access",
+    "rust/curve25519",
+    "rust/custom_heap",
+    "rust/dep_crate",
+    "rust/deprecated_loader",
+    "rust/divide_by_zero",
+    "rust/dup_accounts",
+    "rust/error_handling",
+    "rust/external_spend",
+    "rust/get_minimum_delegation",
+    "rust/inner_instruction_alignment_check",
+    "rust/instruction_introspection",
+    "rust/invoke",
+    "rust/invoke_and_error",
+    "rust/invoke_and_ok",
+    "rust/invoke_and_return",
+    "rust/invoked",
+    "rust/iter",
+    "rust/log_data",
+    "rust/many_args",
+    "rust/many_args_dep",
+    "rust/mem",
+    "rust/mem_dep",
+    "rust/membuiltins",
+    "rust/noop",
+    "rust/panic",
+    "rust/param_passing",
+    "rust/param_passing_dep",
+    "rust/poseidon",
+    "rust/rand",
+    "rust/realloc",
+    "rust/realloc_invoke",
+    "rust/remaining_compute_units",
+    "rust/ro_account_modify",
+    "rust/ro_modify",
+    "rust/sanity",
+    "rust/secp256k1_recover",
+    "rust/sha",
+    "rust/sibling_inner_instructions",
+    "rust/sibling_instructions",
+    "rust/simulation",
+    "rust/spoof1",
+    "rust/spoof1_system",
+    "rust/syscall-get-epoch-stake",
+    "rust/sysvar",
+    "rust/upgradeable",
+    "rust/upgraded",
+]
 [workspace.package]
 version = "2.3.1"
 description = "Solana SBF test program written in Rust"
@@ -12,12 +86,13 @@ level = "warn"
 check-cfg = [
     'cfg(target_os, values("solana"))',
     'cfg(feature, values("custom-panic", "custom-heap"))',
-    'cfg(target_feature, values("dynamic-frames"))'
+    'cfg(target_feature, values("dynamic-frames"))',
 ]
 
 [workspace.dependencies]
 agave-feature-set = { path = "../../feature-set", version = "=2.3.1" }
 agave-reserved-account-keys = { path = "../../reserved-account-keys", version = "=2.3.1" }
+agave-validator = { path = "../../validator", version = "=2.3.1" }
 array-bytes = "=1.4.1"
 bincode = { version = "1.1.4", default-features = false }
 blake3 = "1.0.0"
@@ -39,16 +114,22 @@ serde_json = "1.0.56"
 solana-account-decoder = { path = "../../account-decoder", version = "=2.3.1" }
 solana-account-info = "=2.2.1"
 solana-accounts-db = { path = "../../accounts-db", version = "=2.3.1" }
+solana-big-mod-exp = "=2.2.1"
+solana-blake3-hasher = { version = "=2.2.1", features = ["blake3"] }
 solana-bn254 = "=2.2.2"
 solana-bpf-loader-program = { path = "../bpf_loader", version = "=2.3.1" }
 solana-cli-output = { path = "../../cli-output", version = "=2.3.1" }
+solana-clock = { version = "=2.2.2", features = ["serde", "sysvar"] }
 solana-compute-budget = { path = "../../compute-budget", version = "=2.3.1" }
 solana-compute-budget-instruction = { path = "../../compute-budget-instruction", version = "=2.3.1" }
 solana-curve25519 = { path = "../../curves/curve25519", version = "=2.3.1" }
 solana-decode-error = "=2.2.1"
 solana-define-syscall = "=2.3.0"
 solana-fee = { path = "../../fee", version = "=2.3.1" }
+solana-hash = { version = "=2.3.0", features = ["bytemuck", "serde", "std"] }
 solana-instruction = "=2.3.0"
+solana-instructions-sysvar = "=2.2.2"
+solana-keccak-hasher = { version = "=2.2.1", features = ["sha3"] }
 solana-ledger = { path = "../../ledger", version = "=2.3.1" }
 solana-log-collector = { path = "../../log-collector", version = "=2.3.1" }
 solana-logger = "=2.3.1"
@@ -72,11 +153,15 @@ solana-sbf-rust-param-passing-dep = { path = "rust/param_passing_dep", version =
 solana-sbf-rust-realloc-dep = { path = "rust/realloc_dep", version = "=2.3.1" }
 solana-sbf-rust-realloc-invoke-dep = { path = "rust/realloc_invoke_dep", version = "=2.3.1" }
 solana-sbpf = "=0.11.1"
+solana-sdk-ids = "=2.2.1"
 solana-secp256k1-recover = "=2.2.1"
+solana-sha256-hasher = { version = "=2.2.1", features = ["sha2"] }
+solana-stake-interface = { version = "=1.2.1", features = ["bincode"] }
 solana-svm = { path = "../../svm", version = "=2.3.1" }
 solana-svm-callback = { path = "../../svm-callback", version = "=2.3.1" }
 solana-svm-feature-set = { path = "../../svm-feature-set", version = "=2.3.1" }
 solana-svm-transaction = { path = "../../svm-transaction", version = "=2.3.1" }
+solana-system-interface = { version = "=1.0", features = ["bincode"] }
 solana-sysvar = "=2.2.2"
 solana-timings = { path = "../../timings", version = "=2.3.1" }
 solana-transaction-context = { path = "../../transaction-context", version = "=2.3.1" }
@@ -84,37 +169,8 @@ solana-transaction-status = { path = "../../transaction-status", version = "=2.3
 solana-type-overrides = { path = "../../type-overrides", version = "=2.3.1" }
 solana-vote = { path = "../../vote", version = "=2.3.1" }
 solana-vote-program = { path = "../../programs/vote", version = "=2.3.1" }
-agave-validator = { path = "../../validator", version = "=2.3.1" }
 solana-zk-sdk = "=2.2.1"
 thiserror = "1.0"
-solana-stake-interface = { version = "=1.2.1", features = ["bincode"] }
-solana-clock = { version = "=2.2.2", features = ["serde", "sysvar"] }
-solana-system-interface = { version = "=1.0", features = ["bincode"] }
-solana-big-mod-exp = "=2.2.1"
-solana-blake3-hasher = { version = "=2.2.1", features = ["blake3"] }
-solana-hash = { version = "=2.3.0", features = ["bytemuck", "serde", "std"] }
-solana-keccak-hasher = { version = "=2.2.1", features = ["sha3"] }
-solana-sha256-hasher = { version = "=2.2.1", features = ["sha2"] }
-solana-instructions-sysvar = "=2.2.2"
-solana-sdk-ids = "=2.2.1"
-
-[package]
-name = "solana-sbf-programs"
-description = "Blockchain, Rebuilt for Scale"
-documentation = "https://docs.rs/solana"
-readme = "README.md"
-publish = false
-version = { workspace = true }
-authors = { workspace = true }
-repository = { workspace = true }
-homepage = { workspace = true }
-license = { workspace = true }
-edition = { workspace = true }
-
-[profile.release]
-# The test programs are build in release mode
-# Minimize their file size so that they fit into the account size limit
-strip = true
 
 [features]
 sbf_c = []
@@ -194,70 +250,14 @@ solana-type-overrides = { workspace = true }
 solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
 
+[profile.release]
+# The test programs are build in release mode
+# Minimize their file size so that they fit into the account size limit
+strip = true
+
 [[bench]]
 name = "bpf_loader"
 
-[workspace]
-members = [
-    "rust/128bit",
-    "rust/128bit_dep",
-    "rust/account_mem",
-    "rust/account_mem_deprecated",
-    "rust/alloc",
-    "rust/alt_bn128",
-    "rust/alt_bn128_compression",
-    "rust/big_mod_exp",
-    "rust/call_args",
-    "rust/call_depth",
-    "rust/caller_access",
-    "rust/curve25519",
-    "rust/custom_heap",
-    "rust/dep_crate",
-    "rust/deprecated_loader",
-    "rust/divide_by_zero",
-    "rust/dup_accounts",
-    "rust/error_handling",
-    "rust/external_spend",
-    "rust/get_minimum_delegation",
-    "rust/inner_instruction_alignment_check",
-    "rust/instruction_introspection",
-    "rust/invoke",
-    "rust/invoke_and_error",
-    "rust/invoke_and_ok",
-    "rust/invoke_and_return",
-    "rust/invoked",
-    "rust/iter",
-    "rust/log_data",
-    "rust/many_args",
-    "rust/many_args_dep",
-    "rust/mem",
-    "rust/mem_dep",
-    "rust/membuiltins",
-    "rust/noop",
-    "rust/panic",
-    "rust/param_passing",
-    "rust/param_passing_dep",
-    "rust/poseidon",
-    "rust/rand",
-    "rust/realloc",
-    "rust/realloc_invoke",
-    "rust/remaining_compute_units",
-    "rust/ro_account_modify",
-    "rust/ro_modify",
-    "rust/sanity",
-    "rust/secp256k1_recover",
-    "rust/sha",
-    "rust/sibling_inner_instructions",
-    "rust/sibling_instructions",
-    "rust/simulation",
-    "rust/spoof1",
-    "rust/spoof1_system",
-    "rust/syscall-get-epoch-stake",
-    "rust/sysvar",
-    "rust/upgradeable",
-    "rust/upgraded",
-]
-
 [patch.crates-io]
 # We include the following crates as our dependencies from crates.io:
 #
diff --git a/programs/sbf/rust/128bit/Cargo.toml b/programs/sbf/rust/128bit/Cargo.toml
index 556899d5287a24..1540bc8fb94265 100644
--- a/programs/sbf/rust/128bit/Cargo.toml
+++ b/programs/sbf/rust/128bit/Cargo.toml
@@ -8,12 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-program-entrypoint = { workspace = true }
 solana-sbf-rust-128bit-dep = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/account_mem/Cargo.toml b/programs/sbf/rust/account_mem/Cargo.toml
index 084d392eb8e422..606647aafd8e71 100644
--- a/programs/sbf/rust/account_mem/Cargo.toml
+++ b/programs/sbf/rust/account_mem/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program-entrypoint = { workspace = true }
@@ -15,8 +18,5 @@ solana-program-error = { workspace = true }
 solana-program-memory = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/account_mem_deprecated/Cargo.toml b/programs/sbf/rust/account_mem_deprecated/Cargo.toml
index 5a9c5569cf59e9..ad85d55141a723 100644
--- a/programs/sbf/rust/account_mem_deprecated/Cargo.toml
+++ b/programs/sbf/rust/account_mem_deprecated/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program = { workspace = true }
@@ -15,8 +18,5 @@ solana-program-error = { workspace = true }
 solana-program-memory = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/alloc/Cargo.toml b/programs/sbf/rust/alloc/Cargo.toml
index 1d7bb51d3a41ae..ef99134990530e 100644
--- a/programs/sbf/rust/alloc/Cargo.toml
+++ b/programs/sbf/rust/alloc/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-msg = { workspace = true }
 solana-program = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/alt_bn128/Cargo.toml b/programs/sbf/rust/alt_bn128/Cargo.toml
index 45d415ce0af37b..eb41b8ca8ea296 100644
--- a/programs/sbf/rust/alt_bn128/Cargo.toml
+++ b/programs/sbf/rust/alt_bn128/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 array-bytes = { workspace = true }
 solana-bn254 = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/alt_bn128_compression/Cargo.toml b/programs/sbf/rust/alt_bn128_compression/Cargo.toml
index f367a9d267b711..1f1bd6166633a9 100644
--- a/programs/sbf/rust/alt_bn128_compression/Cargo.toml
+++ b/programs/sbf/rust/alt_bn128_compression/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 array-bytes = { workspace = true }
 solana-bn254 = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/big_mod_exp/Cargo.toml b/programs/sbf/rust/big_mod_exp/Cargo.toml
index 7aab4107394c68..20a6c1b01ad7e9 100644
--- a/programs/sbf/rust/big_mod_exp/Cargo.toml
+++ b/programs/sbf/rust/big_mod_exp/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 array-bytes = { workspace = true }
 serde = { workspace = true }
@@ -17,8 +20,5 @@ solana-big-mod-exp = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/call_args/Cargo.toml b/programs/sbf/rust/call_args/Cargo.toml
index 8395b9db21f3cd..b2241b24058544 100644
--- a/programs/sbf/rust/call_args/Cargo.toml
+++ b/programs/sbf/rust/call_args/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 borsh = { workspace = true }
 solana-account-info = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/call_depth/Cargo.toml b/programs/sbf/rust/call_depth/Cargo.toml
index 43de27f3258c81..7f755402e2b513 100644
--- a/programs/sbf/rust/call_depth/Cargo.toml
+++ b/programs/sbf/rust/call_depth/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-msg = { workspace = true }
 solana-program = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/caller_access/Cargo.toml b/programs/sbf/rust/caller_access/Cargo.toml
index 3fbfe678468999..f871a2be728cd5 100644
--- a/programs/sbf/rust/caller_access/Cargo.toml
+++ b/programs/sbf/rust/caller_access/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/curve25519/Cargo.toml b/programs/sbf/rust/curve25519/Cargo.toml
index 55a42b86ac150c..85523ead8e7f98 100644
--- a/programs/sbf/rust/curve25519/Cargo.toml
+++ b/programs/sbf/rust/curve25519/Cargo.toml
@@ -8,13 +8,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-curve25519 = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/custom_heap/Cargo.toml b/programs/sbf/rust/custom_heap/Cargo.toml
index e40570f0c14662..7c0363db70821b 100644
--- a/programs/sbf/rust/custom_heap/Cargo.toml
+++ b/programs/sbf/rust/custom_heap/Cargo.toml
@@ -8,6 +8,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
+[features]
+default = ["custom-heap"]
+custom-heap = []
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -15,12 +22,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[features]
-default = ["custom-heap"]
-custom-heap = []
-
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/dep_crate/Cargo.toml b/programs/sbf/rust/dep_crate/Cargo.toml
index e941a23b98b1ef..6902b2fd5ee802 100644
--- a/programs/sbf/rust/dep_crate/Cargo.toml
+++ b/programs/sbf/rust/dep_crate/Cargo.toml
@@ -8,9 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 byteorder = { workspace = true }
 solana-program-entrypoint = { workspace = true }
-
-[lib]
-crate-type = ["cdylib"]
diff --git a/programs/sbf/rust/deprecated_loader/Cargo.toml b/programs/sbf/rust/deprecated_loader/Cargo.toml
index c740d6814fe3bc..2b13a127bcfa35 100644
--- a/programs/sbf/rust/deprecated_loader/Cargo.toml
+++ b/programs/sbf/rust/deprecated_loader/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -20,8 +23,5 @@ solana-sbf-rust-invoke-dep = { workspace = true }
 solana-sbf-rust-realloc-dep = { workspace = true }
 solana-sdk-ids = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/divide_by_zero/Cargo.toml b/programs/sbf/rust/divide_by_zero/Cargo.toml
index 031da4f97b7e0f..88ec81dce4c2cb 100644
--- a/programs/sbf/rust/divide_by_zero/Cargo.toml
+++ b/programs/sbf/rust/divide_by_zero/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/dup_accounts/Cargo.toml b/programs/sbf/rust/dup_accounts/Cargo.toml
index 57cb8f016bac18..514767f1e5192d 100644
--- a/programs/sbf/rust/dup_accounts/Cargo.toml
+++ b/programs/sbf/rust/dup_accounts/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/error_handling/Cargo.toml b/programs/sbf/rust/error_handling/Cargo.toml
index dfe14263d1e00f..885639dc5481f7 100644
--- a/programs/sbf/rust/error_handling/Cargo.toml
+++ b/programs/sbf/rust/error_handling/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 num-derive = { workspace = true }
 num-traits = { workspace = true }
@@ -19,8 +22,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 thiserror = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/external_spend/Cargo.toml b/programs/sbf/rust/external_spend/Cargo.toml
index a0b86dcb6d6276..893ea8944ab45d 100644
--- a/programs/sbf/rust/external_spend/Cargo.toml
+++ b/programs/sbf/rust/external_spend/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/get_minimum_delegation/Cargo.toml b/programs/sbf/rust/get_minimum_delegation/Cargo.toml
index 2d0e3a9e15d021..bfac975625cf53 100644
--- a/programs/sbf/rust/get_minimum_delegation/Cargo.toml
+++ b/programs/sbf/rust/get_minimum_delegation/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-stake-interface = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml b/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml
index 749c01655d2db0..2f8c0cad3705ac 100644
--- a/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml
+++ b/programs/sbf/rust/inner_instruction_alignment_check/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/instruction_introspection/Cargo.toml b/programs/sbf/rust/instruction_introspection/Cargo.toml
index dae85af74c4da3..df3ad3d576da3e 100644
--- a/programs/sbf/rust/instruction_introspection/Cargo.toml
+++ b/programs/sbf/rust/instruction_introspection/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -19,8 +22,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/invoke/Cargo.toml b/programs/sbf/rust/invoke/Cargo.toml
index fa089121665a1f..6fde6cec5bab6c 100644
--- a/programs/sbf/rust/invoke/Cargo.toml
+++ b/programs/sbf/rust/invoke/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -23,8 +26,5 @@ solana-sbf-rust-realloc-dep = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-system-interface = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/invoke_and_error/Cargo.toml b/programs/sbf/rust/invoke_and_error/Cargo.toml
index 9a375bee36fd8d..a7938fc328c65f 100644
--- a/programs/sbf/rust/invoke_and_error/Cargo.toml
+++ b/programs/sbf/rust/invoke_and_error/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/invoke_and_ok/Cargo.toml b/programs/sbf/rust/invoke_and_ok/Cargo.toml
index 82fa78d4600313..5b3f076e3c5ab6 100644
--- a/programs/sbf/rust/invoke_and_ok/Cargo.toml
+++ b/programs/sbf/rust/invoke_and_ok/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/invoke_and_return/Cargo.toml b/programs/sbf/rust/invoke_and_return/Cargo.toml
index 99a76641e9ad74..d0fb4bc66db0f3 100644
--- a/programs/sbf/rust/invoke_and_return/Cargo.toml
+++ b/programs/sbf/rust/invoke_and_return/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/invoked/Cargo.toml b/programs/sbf/rust/invoked/Cargo.toml
index 8df50a59ce1eb3..3209c02d29b80a 100644
--- a/programs/sbf/rust/invoked/Cargo.toml
+++ b/programs/sbf/rust/invoked/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -20,8 +23,5 @@ solana-sdk-ids = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/iter/Cargo.toml b/programs/sbf/rust/iter/Cargo.toml
index 19444569f3ff64..3b47da1d7e8fec 100644
--- a/programs/sbf/rust/iter/Cargo.toml
+++ b/programs/sbf/rust/iter/Cargo.toml
@@ -8,12 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-program = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/log_data/Cargo.toml b/programs/sbf/rust/log_data/Cargo.toml
index 8a55f5750d9760..0b909621d0e3df 100644
--- a/programs/sbf/rust/log_data/Cargo.toml
+++ b/programs/sbf/rust/log_data/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/many_args/Cargo.toml b/programs/sbf/rust/many_args/Cargo.toml
index dec8a6e2084ffc..539eb64b5ab36e 100644
--- a/programs/sbf/rust/many_args/Cargo.toml
+++ b/programs/sbf/rust/many_args/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-msg = { workspace = true }
 solana-program = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-sbf-rust-many-args-dep = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/mem/Cargo.toml b/programs/sbf/rust/mem/Cargo.toml
index 47e084845c183b..35dc8a90b74cf7 100644
--- a/programs/sbf/rust/mem/Cargo.toml
+++ b/programs/sbf/rust/mem/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program-entrypoint = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-memory = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sbf-rust-mem-dep = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/mem_dep/Cargo.toml b/programs/sbf/rust/mem_dep/Cargo.toml
index 7fb169f1a3fec7..8b0ef1caed90a4 100644
--- a/programs/sbf/rust/mem_dep/Cargo.toml
+++ b/programs/sbf/rust/mem_dep/Cargo.toml
@@ -8,7 +8,7 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[dependencies]
-
 [lib]
 crate-type = ["lib"]
+
+[dependencies]
diff --git a/programs/sbf/rust/membuiltins/Cargo.toml b/programs/sbf/rust/membuiltins/Cargo.toml
index c1f1e8539155a8..5d45b7c61f06f3 100644
--- a/programs/sbf/rust/membuiltins/Cargo.toml
+++ b/programs/sbf/rust/membuiltins/Cargo.toml
@@ -8,12 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-program-entrypoint = { workspace = true }
 solana-sbf-rust-mem-dep = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/noop/Cargo.toml b/programs/sbf/rust/noop/Cargo.toml
index 49b8ff4d3cc551..81c9864775efe8 100644
--- a/programs/sbf/rust/noop/Cargo.toml
+++ b/programs/sbf/rust/noop/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/panic/Cargo.toml b/programs/sbf/rust/panic/Cargo.toml
index fb590ca6d868e4..abebc7e317bdbd 100644
--- a/programs/sbf/rust/panic/Cargo.toml
+++ b/programs/sbf/rust/panic/Cargo.toml
@@ -8,6 +8,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
+[features]
+default = ["custom-panic"]
+custom-panic = []
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -15,12 +22,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[features]
-default = ["custom-panic"]
-custom-panic = []
-
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/param_passing/Cargo.toml b/programs/sbf/rust/param_passing/Cargo.toml
index ca9b7650af27f7..7a77418e2bbd16 100644
--- a/programs/sbf/rust/param_passing/Cargo.toml
+++ b/programs/sbf/rust/param_passing/Cargo.toml
@@ -8,13 +8,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-program = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-sbf-rust-param-passing-dep = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/poseidon/Cargo.toml b/programs/sbf/rust/poseidon/Cargo.toml
index 13500b547e107d..d84a9572ee8144 100644
--- a/programs/sbf/rust/poseidon/Cargo.toml
+++ b/programs/sbf/rust/poseidon/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 array-bytes = { workspace = true }
 solana-msg = { workspace = true }
 solana-poseidon = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/rand/Cargo.toml b/programs/sbf/rust/rand/Cargo.toml
index c253fd92cc0b01..ffc21817f422fe 100644
--- a/programs/sbf/rust/rand/Cargo.toml
+++ b/programs/sbf/rust/rand/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 getrandom = { workspace = true, features = ["custom"] }
 rand = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/realloc/Cargo.toml b/programs/sbf/rust/realloc/Cargo.toml
index b49f35d6c0dd3b..c493bc806505ca 100644
--- a/programs/sbf/rust/realloc/Cargo.toml
+++ b/programs/sbf/rust/realloc/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -18,8 +21,5 @@ solana-pubkey = { workspace = true }
 solana-sbf-rust-realloc-dep = { workspace = true }
 solana-system-interface = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/realloc_invoke/Cargo.toml b/programs/sbf/rust/realloc_invoke/Cargo.toml
index 958f5090ee6c9b..61342677b4734e 100644
--- a/programs/sbf/rust/realloc_invoke/Cargo.toml
+++ b/programs/sbf/rust/realloc_invoke/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -20,8 +23,5 @@ solana-sbf-rust-realloc-dep = { workspace = true }
 solana-sbf-rust-realloc-invoke-dep = { workspace = true }
 solana-system-interface = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/remaining_compute_units/Cargo.toml b/programs/sbf/rust/remaining_compute_units/Cargo.toml
index 8b697119545e2d..7cc32b4a8e5769 100644
--- a/programs/sbf/rust/remaining_compute_units/Cargo.toml
+++ b/programs/sbf/rust/remaining_compute_units/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/ro_account_modify/Cargo.toml b/programs/sbf/rust/ro_account_modify/Cargo.toml
index a761d3549f8be3..a22e0bde5adc6f 100644
--- a/programs/sbf/rust/ro_account_modify/Cargo.toml
+++ b/programs/sbf/rust/ro_account_modify/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/ro_modify/Cargo.toml b/programs/sbf/rust/ro_modify/Cargo.toml
index 173de0ac9eaa52..ac66c703881c1c 100644
--- a/programs/sbf/rust/ro_modify/Cargo.toml
+++ b/programs/sbf/rust/ro_modify/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-system-interface = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/sanity/Cargo.toml b/programs/sbf/rust/sanity/Cargo.toml
index 4b69d911b72123..5c99b006e46317 100644
--- a/programs/sbf/rust/sanity/Cargo.toml
+++ b/programs/sbf/rust/sanity/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sdk-ids = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/secp256k1_recover/Cargo.toml b/programs/sbf/rust/secp256k1_recover/Cargo.toml
index 91981bc3e39d85..6615cfb4b290cb 100644
--- a/programs/sbf/rust/secp256k1_recover/Cargo.toml
+++ b/programs/sbf/rust/secp256k1_recover/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 libsecp256k1 = { workspace = true }
 solana-keccak-hasher = { workspace = true }
@@ -15,8 +18,5 @@ solana-msg = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-secp256k1-recover = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/sha/Cargo.toml b/programs/sbf/rust/sha/Cargo.toml
index aa477926d01bed..16fd6658852c2f 100644
--- a/programs/sbf/rust/sha/Cargo.toml
+++ b/programs/sbf/rust/sha/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 blake3 = { workspace = true }
 solana-blake3-hasher = { workspace = true }
@@ -16,8 +19,5 @@ solana-msg = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-sha256-hasher = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/sibling_inner_instructions/Cargo.toml b/programs/sbf/rust/sibling_inner_instructions/Cargo.toml
index b94be85268690f..de135369ba4c18 100644
--- a/programs/sbf/rust/sibling_inner_instructions/Cargo.toml
+++ b/programs/sbf/rust/sibling_inner_instructions/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true, features = ["syscalls"] }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/sibling_instructions/Cargo.toml b/programs/sbf/rust/sibling_instructions/Cargo.toml
index 87d7cee3422c3c..78cdfd15d61912 100644
--- a/programs/sbf/rust/sibling_instructions/Cargo.toml
+++ b/programs/sbf/rust/sibling_instructions/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/simulation/Cargo.toml b/programs/sbf/rust/simulation/Cargo.toml
index e9b4f03839833e..70cc990023d17e 100644
--- a/programs/sbf/rust/simulation/Cargo.toml
+++ b/programs/sbf/rust/simulation/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-clock = { workspace = true }
@@ -17,8 +20,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/spoof1/Cargo.toml b/programs/sbf/rust/spoof1/Cargo.toml
index 536e2a6a11de96..b0e984824c1c8e 100644
--- a/programs/sbf/rust/spoof1/Cargo.toml
+++ b/programs/sbf/rust/spoof1/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-instruction = { workspace = true }
@@ -18,8 +21,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-system-interface = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/spoof1_system/Cargo.toml b/programs/sbf/rust/spoof1_system/Cargo.toml
index 4f3d5a077f4a15..3b1d4fbe763035 100644
--- a/programs/sbf/rust/spoof1_system/Cargo.toml
+++ b/programs/sbf/rust/spoof1_system/Cargo.toml
@@ -8,14 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/syscall-get-epoch-stake/Cargo.toml b/programs/sbf/rust/syscall-get-epoch-stake/Cargo.toml
index bfeea0a3944114..0ad802cf2b8715 100644
--- a/programs/sbf/rust/syscall-get-epoch-stake/Cargo.toml
+++ b/programs/sbf/rust/syscall-get-epoch-stake/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -16,8 +19,5 @@ solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/sysvar/Cargo.toml b/programs/sbf/rust/sysvar/Cargo.toml
index b09944e95f61e3..f7c9b9cd384a6e 100644
--- a/programs/sbf/rust/sysvar/Cargo.toml
+++ b/programs/sbf/rust/sysvar/Cargo.toml
@@ -8,8 +8,11 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
-bincode =  { workspace = true }
+bincode = { workspace = true }
 solana-account-info = { workspace = true }
 solana-define-syscall = { workspace = true }
 solana-instruction = { workspace = true }
@@ -21,8 +24,5 @@ solana-pubkey = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/upgradeable/Cargo.toml b/programs/sbf/rust/upgradeable/Cargo.toml
index f4c5643a2c7592..ba8624ce90c8cf 100644
--- a/programs/sbf/rust/upgradeable/Cargo.toml
+++ b/programs/sbf/rust/upgradeable/Cargo.toml
@@ -8,6 +8,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+name = "solana_sbf_rust_upgradeable"
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -16,9 +20,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-name = "solana_sbf_rust_upgradeable"
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/sbf/rust/upgraded/Cargo.toml b/programs/sbf/rust/upgraded/Cargo.toml
index 2c668fc24a3042..f1d1e7fd0c3528 100644
--- a/programs/sbf/rust/upgraded/Cargo.toml
+++ b/programs/sbf/rust/upgraded/Cargo.toml
@@ -8,6 +8,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+name = "solana_sbf_rust_upgraded"
+crate-type = ["cdylib"]
+
 [dependencies]
 solana-account-info = { workspace = true }
 solana-msg = { workspace = true }
@@ -16,9 +20,5 @@ solana-program-error = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[lib]
-name = "solana_sbf_rust_upgraded"
-crate-type = ["cdylib"]
-
 [lints]
 workspace = true
diff --git a/programs/stake-tests/Cargo.toml b/programs/stake-tests/Cargo.toml
index 1b16150cff1ffc..a37e91f80a0a7c 100644
--- a/programs/stake-tests/Cargo.toml
+++ b/programs/stake-tests/Cargo.toml
@@ -11,6 +11,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dev-dependencies]
 agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
@@ -29,6 +32,3 @@ solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 solana-vote-program = { workspace = true }
 test-case = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml
index 061409476c0fcd..0fdbff3e923b68 100644
--- a/programs/stake/Cargo.toml
+++ b/programs/stake/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_stake_program"
+
 [dependencies]
 agave-feature-set = { workspace = true }
 bincode = { workspace = true }
@@ -47,13 +54,6 @@ solana-sysvar-id = { workspace = true }
 solana-vote-program = { workspace = true, default-features = false }
 test-case = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_stake_program"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [[bench]]
 name = "stake"
 harness = false
diff --git a/programs/system/Cargo.toml b/programs/system/Cargo.toml
index 0095b1a07d8a4f..efdbb17443c831 100644
--- a/programs/system/Cargo.toml
+++ b/programs/system/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_system_program"
+
 [dependencies]
 bincode = { workspace = true }
 log = { workspace = true }
@@ -42,13 +49,6 @@ solana-sha256-hasher = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_system_program"
-
 [[bench]]
 name = "system"
 harness = false
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml
index 7a506f33bea306..cbacb867fc1087 100644
--- a/programs/vote/Cargo.toml
+++ b/programs/vote/Cargo.toml
@@ -9,6 +9,23 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_vote_program"
+
+[features]
+default = ["metrics"]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-program-runtime/frozen-abi",
+    "solana-vote-interface/frozen-abi",
+]
+metrics = ["dep:solana-metrics"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 bincode = { workspace = true }
@@ -62,22 +79,5 @@ test-case = { workspace = true }
 name = "vote_instructions"
 harness = false
 
-[lib]
-crate-type = ["lib"]
-name = "solana_vote_program"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-default = ["metrics"]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-program-runtime/frozen-abi",
-    "solana-vote-interface/frozen-abi"
-]
-metrics = ["dep:solana-metrics"]
-
 [lints]
 workspace = true
diff --git a/pubsub-client/Cargo.toml b/pubsub-client/Cargo.toml
index 769268dbcb4429..3d82b5440ee75b 100644
--- a/pubsub-client/Cargo.toml
+++ b/pubsub-client/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 crossbeam-channel = { workspace = true }
 futures-util = { workspace = true }
@@ -34,6 +37,3 @@ url = { workspace = true }
 anyhow = { workspace = true }
 solana-commitment-config = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rayon-threadlimit/Cargo.toml b/rayon-threadlimit/Cargo.toml
index 375b43e1142845..b2f433492e5679 100644
--- a/rayon-threadlimit/Cargo.toml
+++ b/rayon-threadlimit/Cargo.toml
@@ -10,8 +10,8 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[dependencies]
-num_cpus = { workspace = true }
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+num_cpus = { workspace = true }
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
index 75a8691f3cad10..01698749762f57 100644
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+default = ["linux-static-hidraw", "hidapi"]
+linux-shared-hidraw = ["hidapi/linux-shared-hidraw"]
+linux-shared-libusb = ["hidapi/linux-shared-libusb"]
+linux-static-hidraw = ["hidapi/linux-static-hidraw"]
+linux-static-libusb = ["hidapi/linux-static-libusb"]
+
 [dependencies]
 console = { workspace = true }
 dialoguer = { workspace = true }
@@ -30,13 +40,3 @@ uriparse = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
-
-[features]
-default = ["linux-static-hidraw", "hidapi"]
-linux-shared-hidraw = ["hidapi/linux-shared-hidraw"]
-linux-shared-libusb = ["hidapi/linux-shared-libusb"]
-linux-static-hidraw = ["hidapi/linux-static-hidraw"]
-linux-static-libusb = ["hidapi/linux-static-libusb"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/reserved-account-keys/Cargo.toml b/reserved-account-keys/Cargo.toml
index 0fb5d92b36e9b7..ac1ad6f443d9d7 100644
--- a/reserved-account-keys/Cargo.toml
+++ b/reserved-account-keys/Cargo.toml
@@ -9,6 +9,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]
+
+[features]
+frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
@@ -24,13 +32,5 @@ solana-sdk-ids = { workspace = true }
 solana-message = { workspace = true }
 solana-sysvar = { workspace = true }
 
-[features]
-frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-all-features = true
-rustdoc-args = ["--cfg=docsrs"]
-
 [lints]
 workspace = true
diff --git a/rpc-client-api/Cargo.toml b/rpc-client-api/Cargo.toml
index ba021ed19b3e0c..0ba5f76a88aac7 100644
--- a/rpc-client-api/Cargo.toml
+++ b/rpc-client-api/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 anyhow = { workspace = true }
 jsonrpc-core = { workspace = true }
@@ -24,6 +27,3 @@ solana-signer = { workspace = true }
 solana-transaction-error = { workspace = true }
 solana-transaction-status-client-types = { workspace = true }
 thiserror = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-client-nonce-utils/Cargo.toml b/rpc-client-nonce-utils/Cargo.toml
index e3ebdfea412735..955a14300777da 100644
--- a/rpc-client-nonce-utils/Cargo.toml
+++ b/rpc-client-nonce-utils/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+default = []
+clap = ["dep:clap", "dep:solana-clap-utils"]
+
 [dependencies]
 clap = { version = "2.33.0", optional = true }
 solana-account = { workspace = true, features = ["bincode"] }
@@ -35,10 +42,3 @@ solana-signer = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-
-[features]
-default = []
-clap = ["dep:clap", "dep:solana-clap-utils"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-client-types/Cargo.toml b/rpc-client-types/Cargo.toml
index b50d48c67354a8..8fb008655cd346 100644
--- a/rpc-client-types/Cargo.toml
+++ b/rpc-client-types/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 base64 = { workspace = true }
 bs58 = { workspace = true, features = ["std"] }
@@ -32,6 +35,3 @@ thiserror = { workspace = true }
 [dev-dependencies]
 const_format = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-client/Cargo.toml b/rpc-client/Cargo.toml
index 19d2520d486d36..9db6b57706e833 100644
--- a/rpc-client/Cargo.toml
+++ b/rpc-client/Cargo.toml
@@ -9,6 +9,15 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+default = ["spinner"]
+# Support rpc-client methods that feature a spinner progress bar for
+# command-line interfaces
+spinner = ["dep:indicatif"]
+
 [dependencies]
 async-trait = { workspace = true }
 base64 = { workspace = true }
@@ -55,12 +64,3 @@ solana-pubkey = { workspace = true, features = ["rand"] }
 solana-signer = { workspace = true }
 solana-system-transaction = { workspace = true }
 static_assertions = { workspace = true }
-
-[features]
-default = ["spinner"]
-# Support rpc-client methods that feature a spinner progress bar for
-# command-line interfaces
-spinner = ["dep:indicatif"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc-test/Cargo.toml b/rpc-test/Cargo.toml
index 7e2bdf0bfc4904..7d7ebb8e6311d8 100644
--- a/rpc-test/Cargo.toml
+++ b/rpc-test/Cargo.toml
@@ -10,6 +10,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 bincode = { workspace = true }
 bs58 = { workspace = true }
@@ -45,6 +48,3 @@ solana-signature = { workspace = true }
 solana-signer = { workspace = true }
 solana-system-transaction = { workspace = true }
 solana-transaction = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index b48c44fd9dcb61..93748850d8a779 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_rpc"
+
+[features]
+dev-context-only-utils = ["solana-rpc/dev-context-only-utils"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 base64 = { workspace = true }
@@ -119,15 +129,3 @@ solana-vote-interface = { workspace = true }
 spl-pod = { workspace = true }
 symlink = { workspace = true }
 test-case = { workspace = true }
-
-[features]
-dev-context-only-utils = [
-    "solana-rpc/dev-context-only-utils",
-]
-
-[lib]
-crate-type = ["lib"]
-name = "solana_rpc"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/runtime-transaction/Cargo.toml b/runtime-transaction/Cargo.toml
index 67c6cc82a15b4d..3e3542baa1a357 100644
--- a/runtime-transaction/Cargo.toml
+++ b/runtime-transaction/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_runtime_transaction"
+
+[features]
+dev-context-only-utils = ["solana-compute-budget-instruction/dev-context-only-utils"]
+
 [dependencies]
 agave-transaction-view = { workspace = true }
 log = { workspace = true }
@@ -24,10 +34,6 @@ solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_runtime_transaction"
-
 [dev-dependencies]
 agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -45,12 +51,6 @@ solana-system-transaction = { workspace = true }
 solana-transaction = { workspace = true, features = ["blake3"] }
 solana-vote-interface = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = ["solana-compute-budget-instruction/dev-context-only-utils"]
-
 [[bench]]
 name = "get_signature_details"
 harness = false
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 4779d11b8b45e8..965d139752a46f 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -9,6 +9,43 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_runtime"
+
+[features]
+dev-context-only-utils = [
+    "dep:solana-system-program",
+    "solana-svm/dev-context-only-utils",
+    "solana-runtime-transaction/dev-context-only-utils",
+    "solana-vote/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",
+]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 agave-precompiles = { workspace = true }
@@ -147,10 +184,6 @@ tempfile = { workspace = true }
 thiserror = { workspace = true }
 zstd = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_runtime"
-
 [dev-dependencies]
 agave-transaction-view = { workspace = true }
 ed25519-dalek = { workspace = true }
@@ -174,39 +207,6 @@ solana-transaction-context = { workspace = true, features = ["dev-context-only-u
 static_assertions = { workspace = true }
 test-case = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = [
-    "dep:solana-system-program",
-    "solana-svm/dev-context-only-utils",
-    "solana-runtime-transaction/dev-context-only-utils",
-    "solana-vote/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",
-]
-
 [[bench]]
 name = "prioritization_fee_cache"
 
diff --git a/send-transaction-service/Cargo.toml b/send-transaction-service/Cargo.toml
index 80afe59d2ec85a..5d23109806f354 100644
--- a/send-transaction-service/Cargo.toml
+++ b/send-transaction-service/Cargo.toml
@@ -9,6 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = ["solana-net-utils"]
+
 [dependencies]
 async-trait = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -43,9 +49,3 @@ solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-signer = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-system-transaction = { workspace = true }
-
-[features]
-dev-context-only-utils = ["solana-net-utils"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index 996c6c02e1f8c4..6513c5f05d2e44 100644
--- a/stake-accounts/Cargo.toml
+++ b/stake-accounts/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 clap = { workspace = true }
 solana-account = { workspace = true }
@@ -35,6 +38,3 @@ solana-version = { workspace = true }
 [dev-dependencies]
 solana-client-traits = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
index ab10bf2590f384..eb1cce510b3d20 100644
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_storage_bigtable"
+
 [dependencies]
 agave-reserved-account-keys = { workspace = true }
 backoff = { workspace = true, features = ["tokio"] }
@@ -53,10 +60,3 @@ solana-keypair = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-system-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_storage_bigtable"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml
index acecf3aebf37d5..e617cddcb82c96 100644
--- a/storage-proto/Cargo.toml
+++ b/storage-proto/Cargo.toml
@@ -9,6 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_storage_proto"
+
 [dependencies]
 bincode = { workspace = true }
 bs58 = { workspace = true }
@@ -26,16 +33,6 @@ solana-transaction-context = { workspace = true, features = ["serde"] }
 solana-transaction-error = { workspace = true }
 solana-transaction-status = { workspace = true }
 
-[dev-dependencies]
-enum-iterator = { workspace = true }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_storage_proto"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [build-dependencies]
 tonic-build = { workspace = true }
 
@@ -43,3 +40,6 @@ tonic-build = { workspace = true }
 # envar to point to the installed binary
 [target."cfg(not(windows))".build-dependencies]
 protobuf-src = { workspace = true }
+
+[dev-dependencies]
+enum-iterator = { workspace = true }
diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml
index 74bcfb777d1895..761881e9816280 100644
--- a/streamer/Cargo.toml
+++ b/streamer/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_streamer"
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 async-channel = { workspace = true }
 bytes = { workspace = true }
@@ -55,13 +65,3 @@ assert_matches = { workspace = true }
 solana-logger = { workspace = true }
 solana-net-utils = { workspace = true, features = ["dev-context-only-utils"] }
 solana-streamer = { path = ".", features = ["dev-context-only-utils"] }
-
-[features]
-dev-context-only-utils = []
-
-[lib]
-crate-type = ["lib"]
-name = "solana_streamer"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/svm-conformance/Cargo.toml b/svm-conformance/Cargo.toml
index 2958a425f64276..78a2a3d8d870ea 100644
--- a/svm-conformance/Cargo.toml
+++ b/svm-conformance/Cargo.toml
@@ -9,12 +9,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 prost = { workspace = true }
 prost-types = { workspace = true }
 
 [build-dependencies]
 prost-build = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/svm/Cargo.toml b/svm/Cargo.toml
index da9398c423d747..a3888b5f9bb80f 100644
--- a/svm/Cargo.toml
+++ b/svm/Cargo.toml
@@ -9,6 +9,28 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_svm"
+
+[features]
+dev-context-only-utils = ["dep:qualifier_attr"]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-program-runtime/frozen-abi",
+]
+shuttle-test = [
+    "solana-type-overrides/shuttle-test",
+    "solana-program-runtime/shuttle-test",
+    "solana-bpf-loader-program/shuttle-test",
+    "solana-loader-v4-program/shuttle-test",
+]
+svm-internal = []
+
 [dependencies]
 ahash = { workspace = true }
 itertools = { workspace = true }
@@ -62,10 +84,6 @@ thiserror = { workspace = true }
 [target.'cfg(debug_assertions)'.dependencies]
 solana-transaction-context = { workspace = true, features = ["debug-signature"] }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_svm"
-
 [dev-dependencies]
 agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -108,23 +126,5 @@ solana-transaction-context = { workspace = true, features = ["dev-context-only-u
 spl-token = { workspace = true }
 test-case = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = ["dep:qualifier_attr"]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-program-runtime/frozen-abi",
-]
-shuttle-test = [
-    "solana-type-overrides/shuttle-test",
-    "solana-program-runtime/shuttle-test",
-    "solana-bpf-loader-program/shuttle-test",
-    "solana-loader-v4-program/shuttle-test",
-]
-svm-internal = []
-
 [lints]
 workspace = true
diff --git a/svm/examples/Cargo.toml b/svm/examples/Cargo.toml
index bcb63edf04a693..14e9679cf33b0e 100644
--- a/svm/examples/Cargo.toml
+++ b/svm/examples/Cargo.toml
@@ -29,22 +29,44 @@ jsonrpc-http-server = "18.0.0"
 log = "0.4.22"
 serde = "1.0.214"
 serde_json = "1.0.132"
+solana-account = "2.2.1"
 solana-account-decoder = { path = "../../account-decoder" }
 solana-bpf-loader-program = { path = "../../programs/bpf_loader" }
 solana-client = { path = "../../client" }
+solana-clock = "2.2.1"
+solana-commitment-config = "2.2.1"
 solana-compute-budget = { path = "../../compute-budget" }
+solana-compute-budget-interface = "2.2.2"
+solana-epoch-schedule = "2.2.1"
+solana-hash = "2.2.1"
+solana-instruction = "2.2.1"
+solana-keypair = "2.2.1"
 solana-logger = "=2.3.1"
+solana-message = "2.3.0"
+solana-nonce = "2.2.1"
 solana-perf = { path = "../../perf" }
+solana-program-pack = "2.2.1"
 solana-program-runtime = { path = "../../program-runtime" }
+solana-pubkey = "2.3.0"
+solana-rent-collector = "2.2.1"
 solana-rpc-client-api = { path = "../../rpc-client-api" }
+solana-sdk-ids = "2.2.1"
+solana-signature = "2.2.1"
+solana-signer = "2.2.1"
 solana-svm = { path = "../" }
 solana-svm-callback = { path = "../../svm-callback" }
 solana-svm-feature-set = { path = "../../svm-feature-set" }
+solana-system-interface = "1.0"
 solana-system-program = { path = "../../programs/system" }
-solana-version = { path = "../../version" }
+solana-sysvar = "2.2.1"
+solana-sysvar-id = "2.2.1"
 solana-test-validator = { path = "../../test-validator" }
+solana-transaction = "2.2.2"
 solana-transaction-context = { path = "../../transaction-context" }
+solana-transaction-error = "2.2.1"
 solana-transaction-status = { path = "../../transaction-status" }
+solana-validator-exit = "2.2.1"
+solana-version = { path = "../../version" }
 spl-associated-token-account = "7.0.0"
 spl-token = "8.0.0"
 spl-token-2022 = "8.0.0"
@@ -53,28 +75,6 @@ thiserror = "1.0.68"
 tokio = "1.29.1"
 tokio-util = "0.7"
 yaml-rust = "0.4"
-solana-account = "2.2.1"
-solana-clock = "2.2.1"
-solana-commitment-config = "2.2.1"
-solana-compute-budget-interface = "2.2.2"
-solana-message = "2.3.0"
-solana-nonce = "2.2.1"
-solana-pubkey = "2.3.0"
-solana-sdk-ids = "2.2.1"
-solana-signature = "2.2.1"
-solana-system-interface = "1.0"
-solana-sysvar = "2.2.1"
-solana-sysvar-id = "2.2.1"
-solana-transaction = "2.2.2"
-solana-transaction-error = "2.2.1"
-solana-validator-exit = "2.2.1"
-solana-instruction = "2.2.1"
-solana-keypair = "2.2.1"
-solana-signer = "2.2.1"
-solana-hash = "2.2.1"
-solana-rent-collector = "2.2.1"
-solana-epoch-schedule = "2.2.1"
-solana-program-pack = "2.2.1"
 
 [patch.crates-io]
 crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
diff --git a/svm/examples/json-rpc/client/Cargo.toml b/svm/examples/json-rpc/client/Cargo.toml
index 3a5207e7155ce7..4a59f7ce81233b 100644
--- a/svm/examples/json-rpc/client/Cargo.toml
+++ b/svm/examples/json-rpc/client/Cargo.toml
@@ -5,6 +5,10 @@ version = { workspace = true }
 edition = { workspace = true }
 publish = false
 
+[features]
+dummy-for-ci-check = []
+frozen-abi = []
+
 [dependencies]
 borsh = { workspace = true }
 clap = { workspace = true }
@@ -19,7 +23,3 @@ solana-signer = { workspace = true }
 solana-transaction = { workspace = true }
 thiserror = { workspace = true }
 yaml-rust = { workspace = true }
-
-[features]
-dummy-for-ci-check = []
-frozen-abi = []
diff --git a/svm/examples/json-rpc/server/Cargo.toml b/svm/examples/json-rpc/server/Cargo.toml
index 25b78e31c26458..0db261047239e9 100644
--- a/svm/examples/json-rpc/server/Cargo.toml
+++ b/svm/examples/json-rpc/server/Cargo.toml
@@ -5,6 +5,10 @@ version = { workspace = true }
 edition = { workspace = true }
 publish = false
 
+[features]
+dummy-for-ci-check = []
+frozen-abi = []
+
 [dependencies]
 agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -52,7 +56,3 @@ solana-version = { workspace = true }
 spl-token-2022 = { workspace = true, features = ["no-entrypoint"] }
 tokio = { workspace = true, features = ["full"] }
 tokio-util = { workspace = true, features = ["codec", "compat"] }
-
-[features]
-dummy-for-ci-check = []
-frozen-abi = []
diff --git a/svm/examples/paytube/Cargo.toml b/svm/examples/paytube/Cargo.toml
index 75f71701bc6a38..6cd4c0056a39a3 100644
--- a/svm/examples/paytube/Cargo.toml
+++ b/svm/examples/paytube/Cargo.toml
@@ -5,6 +5,10 @@ version = { workspace = true }
 edition = { workspace = true }
 publish = false
 
+[features]
+dummy-for-ci-check = []
+frozen-abi = []
+
 [dependencies]
 agave-feature-set = { workspace = true }
 solana-account = { workspace = true }
@@ -38,7 +42,3 @@ termcolor = { workspace = true }
 
 [dev-dependencies]
 solana-test-validator = { workspace = true }
-
-[features]
-dummy-for-ci-check = []
-frozen-abi = []
diff --git a/test-validator/Cargo.toml b/test-validator/Cargo.toml
index d9264d2fff9bd8..513445e3a3ef66 100644
--- a/test-validator/Cargo.toml
+++ b/test-validator/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 base64 = { workspace = true }
@@ -54,6 +57,3 @@ tokio = { workspace = true, features = ["full"] }
 
 [dev-dependencies]
 solana-sdk-ids = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/thin-client/Cargo.toml b/thin-client/Cargo.toml
index ef982440b26e0f..b3b5e0eaca9391 100644
--- a/thin-client/Cargo.toml
+++ b/thin-client/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 bincode = { workspace = true }
 log = { workspace = true }
@@ -34,6 +37,3 @@ solana-transaction-error = { workspace = true }
 
 [dev-dependencies]
 solana-logger = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/thread-manager/Cargo.toml b/thread-manager/Cargo.toml
index 195bb4203e5e3a..1482012b578bfd 100644
--- a/thread-manager/Cargo.toml
+++ b/thread-manager/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 anyhow = { workspace = true }
 cfg-if = { workspace = true }
@@ -31,6 +34,3 @@ hyper = { workspace = true, features = ["http1", "client", "stream", "tcp"] }
 serde_json = { workspace = true }
 toml = { workspace = true }
 tower = { workspace = true }
-
-[features]
-dev-context-only-utils = []
diff --git a/timings/Cargo.toml b/timings/Cargo.toml
index 2f16de53426f30..5d66b66cde6b6f 100644
--- a/timings/Cargo.toml
+++ b/timings/Cargo.toml
@@ -9,10 +9,10 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 eager = { workspace = true }
 enum-iterator = { workspace = true }
 solana-pubkey = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/tps-client/Cargo.toml b/tps-client/Cargo.toml
index b27f0d19e4ab35..201ede15561bc3 100644
--- a/tps-client/Cargo.toml
+++ b/tps-client/Cargo.toml
@@ -8,6 +8,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]
+
+[features]
+bank-client = ["dep:solana-client-traits", "dep:solana-runtime"]
+
 [dependencies]
 log = { workspace = true }
 solana-account = { workspace = true }
@@ -37,11 +45,3 @@ thiserror = { workspace = true }
 [dev-dependencies]
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 tempfile = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-all-features = true
-rustdoc-args = ["--cfg=docsrs"]
-
-[features]
-bank-client = ["dep:solana-client-traits", "dep:solana-runtime"]
diff --git a/tpu-client-next/Cargo.toml b/tpu-client-next/Cargo.toml
index d5c922acc966aa..d2d2bdc459d635 100644
--- a/tpu-client-next/Cargo.toml
+++ b/tpu-client-next/Cargo.toml
@@ -8,6 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+metrics = ["dep:solana-metrics"]
+
 [dependencies]
 async-trait = { workspace = true }
 log = { workspace = true }
@@ -18,7 +24,7 @@ solana-clock = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-keypair = { workspace = true }
 solana-measure = { workspace = true }
-solana-metrics ={ workspace = true, optional = true }
+solana-metrics = { workspace = true, optional = true }
 solana-quic-definitions = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-streamer = { workspace = true }
@@ -38,9 +44,3 @@ solana-net-utils = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-signer = { workspace = true }
 solana-streamer = { workspace = true, features = ["dev-context-only-utils"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-metrics =["dep:solana-metrics"]
diff --git a/tpu-client/Cargo.toml b/tpu-client/Cargo.toml
index 846c7207dee587..96fdc2f26288a2 100644
--- a/tpu-client/Cargo.toml
+++ b/tpu-client/Cargo.toml
@@ -9,6 +9,19 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+default = ["spinner"]
+# Support tpu-client methods that feature a spinner progress bar for
+# command-line interfaces
+spinner = [
+    "dep:indicatif",
+    "dep:solana-message",
+    "solana-rpc-client/spinner",
+]
+
 [dependencies]
 async-trait = { workspace = true }
 bincode = { workspace = true }
@@ -36,16 +49,3 @@ solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-
-[features]
-default = ["spinner"]
-# Support tpu-client methods that feature a spinner progress bar for
-# command-line interfaces
-spinner = [
-    "dep:indicatif",
-    "dep:solana-message",
-    "solana-rpc-client/spinner"
-]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/transaction-context/Cargo.toml b/transaction-context/Cargo.toml
index 790c93c7f555c5..9a76f58ae22c17 100644
--- a/transaction-context/Cargo.toml
+++ b/transaction-context/Cargo.toml
@@ -9,6 +9,21 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]
+
+[features]
+bincode = ["dep:bincode", "serde", "solana-account/bincode"]
+debug-signature = ["dep:solana-signature"]
+dev-context-only-utils = [
+    "bincode",
+    "debug-signature",
+    "solana-account/dev-context-only-utils",
+]
+serde = ["dep:serde", "dep:serde_derive"]
+
 [dependencies]
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
@@ -17,11 +32,6 @@ solana-instruction = { workspace = true, features = ["std"] }
 solana-instructions-sysvar = { workspace = true }
 solana-pubkey = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-all-features = true
-rustdoc-args = ["--cfg=docsrs"]
-
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 bincode = { workspace = true, optional = true }
 solana-rent = { workspace = true }
@@ -36,15 +46,5 @@ solana-transaction-context = { path = ".", features = [
 ] }
 static_assertions = { workspace = true }
 
-[features]
-bincode = ["dep:bincode", "serde", "solana-account/bincode"]
-debug-signature = ["dep:solana-signature"]
-dev-context-only-utils = [
-    "bincode",
-    "debug-signature",
-    "solana-account/dev-context-only-utils"
-]
-serde = ["dep:serde", "dep:serde_derive"]
-
 [lints]
 workspace = true
diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml
index efc1affdbb6595..dae57acdd5fcdb 100644
--- a/transaction-dos/Cargo.toml
+++ b/transaction-dos/Cargo.toml
@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 bincode = { workspace = true }
 clap = { workspace = true }
@@ -43,6 +46,3 @@ solana-hash = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-poh-config = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/transaction-metrics-tracker/Cargo.toml b/transaction-metrics-tracker/Cargo.toml
index e52c64c3f81dc3..74c897122a38dd 100644
--- a/transaction-metrics-tracker/Cargo.toml
+++ b/transaction-metrics-tracker/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 base64 = { workspace = true }
 bincode = { workspace = true }
@@ -27,6 +30,3 @@ solana-packet = { workspace = true, features = ["dev-context-only-utils"] }
 solana-perf = { workspace = true, features = ["dev-context-only-utils"] }
 solana-pubkey = { workspace = true, features = ["rand"] }
 solana-system-transaction = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/transaction-status-client-types/Cargo.toml b/transaction-status-client-types/Cargo.toml
index 7c1fec2a45b2b9..d67ad700d692c4 100644
--- a/transaction-status-client-types/Cargo.toml
+++ b/transaction-status-client-types/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 base64 = { workspace = true }
 bincode = { workspace = true }
@@ -25,6 +28,3 @@ solana-transaction = { workspace = true, features = ["serde"] }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true, features = ["serde"] }
 thiserror = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
index cbac0c960a9c1b..129f547db604b1 100644
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 Inflector = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
@@ -51,6 +54,3 @@ thiserror = { workspace = true }
 bytemuck = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
 spl-token-confidential-transfer-proof-extraction = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/transaction-view/Cargo.toml b/transaction-view/Cargo.toml
index 575e2022139d50..256136558ea661 100644
--- a/transaction-view/Cargo.toml
+++ b/transaction-view/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 solana-hash = { workspace = true }
 solana-message = { workspace = true }
@@ -32,9 +35,6 @@ solana-signer = { workspace = true }
 solana-system-interface = { workspace = true, features = ["bincode"] }
 solana-transaction = { workspace = true, features = ["bincode"] }
 
-[features]
-dev-context-only-utils = []
-
 [[bench]]
 name = "bytes"
 harness = false
diff --git a/type-overrides/Cargo.toml b/type-overrides/Cargo.toml
index c0378bebbd9013..8acf34abdfc1a7 100644
--- a/type-overrides/Cargo.toml
+++ b/type-overrides/Cargo.toml
@@ -8,11 +8,11 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+shuttle-test = ["dep:shuttle"]
+executor = ["dep:futures"]
+
 [dependencies]
 futures = { workspace = true, optional = true }
 rand = { workspace = true }
 shuttle = { workspace = true, optional = true }
-
-[features]
-shuttle-test = ["dep:shuttle"]
-executor = ["dep:futures"]
diff --git a/unified-scheduler-pool/Cargo.toml b/unified-scheduler-pool/Cargo.toml
index 478afcf5caa339..179b422d5580fe 100644
--- a/unified-scheduler-pool/Cargo.toml
+++ b/unified-scheduler-pool/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 agave-banking-stage-ingress-types = { workspace = true }
 aquamarine = { workspace = true }
@@ -48,6 +51,3 @@ solana-logger = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-system-transaction = { workspace = true }
 test-case = { workspace = true }
-
-[features]
-dev-context-only-utils = []
diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml
index cceca061d37f70..544acc55c76f20 100644
--- a/upload-perf/Cargo.toml
+++ b/upload-perf/Cargo.toml
@@ -9,13 +9,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
-[dependencies]
-serde_json = { workspace = true }
-solana-metrics = { workspace = true }
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
 
 [[bin]]
 name = "solana-upload-perf"
 path = "src/upload-perf.rs"
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[dependencies]
+serde_json = { workspace = true }
+solana-metrics = { workspace = true }
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 9a396eb357a7ba..c7d01f78545072 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -10,6 +10,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 agave-geyser-plugin-interface = { workspace = true }
 chrono = { workspace = true, features = ["default", "serde"] }
@@ -82,6 +85,13 @@ symlink = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 
+[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
+jemallocator = { workspace = true }
+
+[target."cfg(unix)".dependencies]
+libc = { workspace = true }
+signal-hook = { workspace = true }
+
 [dev-dependencies]
 assert_cmd = { workspace = true }
 predicates = { workspace = true }
@@ -93,13 +103,3 @@ solana-time-utils = { workspace = true }
 spl-generic-token = { workspace = true }
 spl-token-2022 = { workspace = true, features = ["no-entrypoint"] }
 tempfile = { workspace = true }
-
-[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
-jemallocator = { workspace = true }
-
-[target."cfg(unix)".dependencies]
-libc = { workspace = true }
-signal-hook = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/version/Cargo.toml b/version/Cargo.toml
index 812995cd1f33db..d1762073c4084e 100644
--- a/version/Cargo.toml
+++ b/version/Cargo.toml
@@ -9,6 +9,16 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_version"
+
+[features]
+dummy-for-ci-check = []
+frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
+
 [dependencies]
 agave-feature-set = { workspace = true }
 rand = { workspace = true }
@@ -24,18 +34,5 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [
 solana-sanitize = { workspace = true }
 solana-serde-varint = { workspace = true }
 
-[features]
-dummy-for-ci-check = []
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-]
-
-[lib]
-name = "solana_version"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints]
 workspace = true
diff --git a/vortexor-receiver/Cargo.toml b/vortexor-receiver/Cargo.toml
index c8843c9ab86c71..372886b745c81c 100644
--- a/vortexor-receiver/Cargo.toml
+++ b/vortexor-receiver/Cargo.toml
@@ -10,6 +10,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_vortexor_receiver"
+
 [dependencies]
 solana-perf = { workspace = true }
 solana-streamer = { workspace = true }
@@ -17,10 +24,3 @@ solana-streamer = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 solana-streamer = { workspace = true, features = ["dev-context-only-utils"] }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_vortexor_receiver"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/vortexor/Cargo.toml b/vortexor/Cargo.toml
index 1afdc32d232340..de3ea9a62c24b9 100644
--- a/vortexor/Cargo.toml
+++ b/vortexor/Cargo.toml
@@ -11,6 +11,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_vortexor"
+
 [dependencies]
 agave-banking-stage-ingress-types = { workspace = true }
 async-channel = { workspace = true }
@@ -63,10 +70,3 @@ assert_matches = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-native-token = { workspace = true }
 solana-streamer = { workspace = true, features = ["dev-context-only-utils"] }
-
-[lib]
-crate-type = ["lib"]
-name = "solana_vortexor"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/vote/Cargo.toml b/vote/Cargo.toml
index dc8253e1b0a5e9..00ddcb095a37f1 100644
--- a/vote/Cargo.toml
+++ b/vote/Cargo.toml
@@ -9,6 +9,17 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_vote"
+
+[features]
+dev-context-only-utils = ["dep:rand", "dep:bincode"]
+frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
+
 [dependencies]
 bincode = { workspace = true, optional = true }
 itertools = { workspace = true }
@@ -39,10 +50,6 @@ solana-transaction = { workspace = true, features = ["bincode"] }
 solana-vote-interface = { workspace = true, features = ["bincode"] }
 thiserror = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_vote"
-
 [dev-dependencies]
 arbitrary = { workspace = true }
 bincode = { workspace = true }
@@ -55,12 +62,5 @@ solana-transaction = { workspace = true, features = ["bincode"] }
 solana-vote-interface = { workspace = true, features = ["bincode", "dev-context-only-utils"] }
 static_assertions = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = ["dep:rand", "dep:bincode"]
-frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
-
 [lints]
 workspace = true
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index acc5eb1a199f10..3b4518197c1de9 100644
--- a/watchtower/Cargo.toml
+++ b/watchtower/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 clap = { workspace = true }
 humantime = { workspace = true }
@@ -25,6 +28,3 @@ solana-pubkey = { version = "=2.4.0", default-features = false }
 solana-rpc-client = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-version = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/wen-restart/Cargo.toml b/wen-restart/Cargo.toml
index 4cff455b476687..b7e4b4455dd878 100644
--- a/wen-restart/Cargo.toml
+++ b/wen-restart/Cargo.toml
@@ -10,6 +10,12 @@ license = { workspace = true }
 edition = { workspace = true }
 publish = true
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+name = "solana_wen_restart"
+
 [dependencies]
 anyhow = { workspace = true }
 log = { workspace = true }
@@ -30,6 +36,14 @@ solana-vote = { workspace = true }
 solana-vote-interface = { workspace = true }
 solana-vote-program = { workspace = true }
 
+[build-dependencies]
+prost-build = { workspace = true }
+
+# windows users should install the protobuf compiler manually and set the PROTOC
+# envar to point to the installed binary
+[target."cfg(not(windows))".build-dependencies]
+protobuf-src = { workspace = true }
+
 [dev-dependencies]
 assert_matches = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -43,17 +57,3 @@ solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-signer = { workspace = true }
 solana-streamer = { workspace = true }
 tempfile = { workspace = true }
-
-[build-dependencies]
-prost-build = { workspace = true }
-
-# windows users should install the protobuf compiler manually and set the PROTOC
-# envar to point to the installed binary
-[target."cfg(not(windows))".build-dependencies]
-protobuf-src = { workspace = true }
-
-[lib]
-name = "solana_wen_restart"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/zk-keygen/Cargo.toml b/zk-keygen/Cargo.toml
index b7ab25493709bb..4465c17219c4d7 100644
--- a/zk-keygen/Cargo.toml
+++ b/zk-keygen/Cargo.toml
@@ -15,6 +15,13 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[[bin]]
+name = "solana-zk-keygen"
+path = "src/main.rs"
+
 [dependencies]
 bs58 = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo", "derive"] }
@@ -31,10 +38,3 @@ tiny-bip39 = { workspace = true }
 [dev-dependencies]
 solana-pubkey = { workspace = true, features = ["rand"] }
 tempfile = { workspace = true }
-
-[[bin]]
-name = "solana-zk-keygen"
-path = "src/main.rs"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
diff --git a/zk-sdk/Cargo.toml b/zk-sdk/Cargo.toml
index e0fb4ed118c960..22b02e6a67090a 100644
--- a/zk-sdk/Cargo.toml
+++ b/zk-sdk/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [dependencies]
 base64 = { workspace = true }
 bytemuck = { workspace = true }
@@ -21,9 +24,8 @@ solana-pubkey = { workspace = true, features = ["bytemuck"] }
 solana-sdk-ids = { workspace = true }
 thiserror = { workspace = true }
 
-[dev-dependencies]
-solana-keypair = { workspace = true }
-tiny-bip39 = { workspace = true }
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+solana-pubkey = { workspace = true, features = ["bytemuck"] }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 aes-gcm-siv = { workspace = true }
@@ -43,15 +45,13 @@ solana-signer = { workspace = true }
 subtle = { workspace = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-solana-pubkey = { workspace = true, features = ["bytemuck"] }
-
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = { workspace = true }
 wasm-bindgen = { workspace = true }
 
-[lib]
-crate-type = ["cdylib", "rlib"]
+[dev-dependencies]
+solana-keypair = { workspace = true }
+tiny-bip39 = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml
index 430222911f7c68..c7329cb5be4686 100644
--- a/zk-token-sdk/Cargo.toml
+++ b/zk-token-sdk/Cargo.toml
@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [dependencies]
 base64 = { workspace = true }
 bytemuck = { workspace = true }
@@ -21,10 +24,6 @@ solana-pubkey = { workspace = true, features = ["bytemuck"] }
 solana-sdk-ids = { workspace = true }
 thiserror = { workspace = true }
 
-[dev-dependencies]
-solana-keypair = { workspace = true }
-tiny-bip39 = { workspace = true }
-
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 aes-gcm-siv = { workspace = true }
 bincode = { workspace = true }
@@ -44,8 +43,9 @@ solana-signer = { workspace = true }
 subtle = { workspace = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 
-[lib]
-crate-type = ["cdylib", "rlib"]
+[dev-dependencies]
+solana-keypair = { workspace = true }
+tiny-bip39 = { workspace = true }
 
 [lints]
 workspace = true