diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index bdec17b8589c2075f284a25991e22369122e8180..6affcd60ccb345d66068b89d6b44a60b833e4fe6 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -43,6 +43,7 @@ std = [
 	"pallet-beefy/std",
 	"pallet-mmr/std",
 	"pallet-session/std",
+	"scale-info/std",
 	"serde",
 	"sp-core/std",
 	"sp-io/std",
diff --git a/substrate/frame/benchmarking/Cargo.toml b/substrate/frame/benchmarking/Cargo.toml
index d1d835e0d1d351e3769e2a23127139729c01e263..c070e64d37b45cc5ad8a1428b9d126703a65c7df 100644
--- a/substrate/frame/benchmarking/Cargo.toml
+++ b/substrate/frame/benchmarking/Cargo.toml
@@ -44,8 +44,11 @@ std = [
 	"scale-info/std",
 	"serde",
 	"sp-api/std",
+	"sp-application-crypto/std",
+	"sp-io/std",
 	"sp-runtime-interface/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-storage/std",
 ]
 runtime-benchmarks = []
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index 8bc92f878c8cef43e3e89081018c7420575265e0..bfddd25a1fa3e3738c30eebb2512b4674ae15cb5 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -35,8 +35,10 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"scale-info/std",
 	"sp-arithmetic/std",
 	"sp-npos-elections/std",
+	"sp-runtime/std",
 	"sp-std/std",
 ]
 runtime-benchmarks = []
diff --git a/substrate/frame/election-provider-support/benchmarking/Cargo.toml b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
index 14afff1aeb055298b367ab151e9ac55534ae7e77..00037d460db17bbaa40db1dd1ef3ab0082d96e4d 100644
--- a/substrate/frame/election-provider-support/benchmarking/Cargo.toml
+++ b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
@@ -26,6 +26,7 @@ default = ["std"]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
+	"frame-election-provider-support/std",
 	"frame-system/std",
 	"sp-npos-elections/std",
 	"sp-runtime/std",
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index b60cffa478c7bb8b50f52ec34a124993e557a81c..ed3c5282fc81d0f27e414c0b8501d60362fcb2b1 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -43,6 +43,7 @@ std = [
 	"frame-system/std",
 	"scale-info/std",
 	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-tracing/std",
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index b1c2da09b53ff67234c17f87adb41e22ae82cdb4..ea1ec173d8f44d61f0f7b4c27d63de99bf30173e 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -55,6 +55,7 @@ std = [
 	"sp-application-crypto/std",
 	"sp-core/std",
 	"sp-finality-grandpa/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
diff --git a/substrate/frame/remark/Cargo.toml b/substrate/frame/remark/Cargo.toml
index 9759c37bfe92c6e1d5324b72bccf39957aad25d5..573502779c586b567f1587694e9fba88c730a733 100644
--- a/substrate/frame/remark/Cargo.toml
+++ b/substrate/frame/remark/Cargo.toml
@@ -36,6 +36,7 @@ std = [
 	"frame-system/std",
 	"scale-info/std",
 	"serde",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index 0449f3f6743797fa194aaa3ac36c7512d922ee95..1cce8fec023db53a20df529156e7fec8c10918d6 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -41,6 +41,7 @@ std = [
 	"frame-system/std",
 	"pallet-session/std",
 	"pallet-staking/std",
+	"rand/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index 47cf69cf73f8b9fc45be432f0f2f1ff03a4be05b..99bea1cd3688295022a152313380eb355f5923f7 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -45,4 +45,5 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-transaction-storage-proof/std",
 ]
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index 3f78df96b3517324f7177f4c8db63a2849823586..1e6ca2ce687dc8b9089405f8305d608d4eb502bc 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -35,6 +35,7 @@ std = [
 	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index 0c307020b521b3d9d047ffdef00c825f98e4d82d..066682e0e349e1b57b74d218b420728cced8a08e 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -34,6 +34,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index d8cb200caf062e064550bbdeb97977359b83721a..f73a7af9e6ae403dd8de69d25e0da11c98ba78ae 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -35,6 +35,7 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/substrate/primitives/core/hashing/Cargo.toml b/substrate/primitives/core/hashing/Cargo.toml
index b3ce080f7a7043f02cf00ff27ca6fa6bc7fbbad3..c83e48e56301073d7f97a5ee84b16a4646683f83 100644
--- a/substrate/primitives/core/hashing/Cargo.toml
+++ b/substrate/primitives/core/hashing/Cargo.toml
@@ -25,6 +25,7 @@ sp-std = { version = "4.0.0", default-features = false, path = "../../std" }
 default = ["std"]
 std = [
 	"blake2/std",
+	"byteorder/std",
 	"sha2/std",
 	"sha3/std",
 	"sp-std/std",
diff --git a/substrate/primitives/keystore/Cargo.toml b/substrate/primitives/keystore/Cargo.toml
index 551626adbc4e860d82e2254667054c831dad2a2c..3c3b7933c50daafce535150587f882c318d0a33b 100644
--- a/substrate/primitives/keystore/Cargo.toml
+++ b/substrate/primitives/keystore/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = { version = "0.12.0", default-features = false }
 schnorrkel = { version = "0.9.1", default-features = false, features = ["preaudit_deprecated", "u64_backend"] }
 serde = { version = "1.0", optional = true }
 thiserror = "1.0"
-sp-core = { version = "6.0.0", path = "../core" }
+sp-core = { version = "6.0.0", default-features = false, path = "../core" }
 sp-externalities = { version = "0.12.0", default-features = false, path = "../externalities" }
 
 [dev-dependencies]
@@ -31,6 +31,10 @@ rand_chacha = "0.2.2"
 [features]
 default = ["std"]
 std = [
+	"codec/std",
+	"merlin/std",
 	"schnorrkel/std",
 	"serde",
+	"sp-core/std",
+	"sp-externalities/std",
 ]
diff --git a/substrate/primitives/test-primitives/Cargo.toml b/substrate/primitives/test-primitives/Cargo.toml
index 1333c340a68a79729c69b5f84f1dc952f5f8b250..2a20addf66b2bb7b410c1dead27c6756b3cb5eb4 100644
--- a/substrate/primitives/test-primitives/Cargo.toml
+++ b/substrate/primitives/test-primitives/Cargo.toml
@@ -24,6 +24,10 @@ default = [
 	"std",
 ]
 std = [
+	"codec/std",
+	"parity-util-mem/std",
 	"serde",
 	"sp-application-crypto/std",
+	"sp-core/std",
+	"sp-runtime/std",
 ]