diff --git a/bin/node-template/pallets/template/src/mock.rs b/bin/node-template/pallets/template/src/mock.rs
index b4d6905378a5d..317de54ca2bca 100644
--- a/bin/node-template/pallets/template/src/mock.rs
+++ b/bin/node-template/pallets/template/src/mock.rs
@@ -1,20 +1,13 @@
 use crate as pallet_template;
 use frame_support::traits::{ConstU16, ConstU64};
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		TemplateModule: pallet_template,
@@ -29,12 +22,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
index 22fb01b62d0f0..248b335ff60c1 100644
--- a/bin/node-template/runtime/src/lib.rs
+++ b/bin/node-template/runtime/src/lib.rs
@@ -13,7 +13,8 @@ use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, NumberFor, One, Verify,
+		AccountIdLookup, BlakeTwo256, Block as BlockT, HeaderProvider, IdentifyAccount, NumberFor,
+		One, Verify,
 	},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, MultiSignature,
@@ -155,6 +156,8 @@ parameter_types! {
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = frame_support::traits::Everything;
+	/// The block type for the runtime.
+	type Block = Block;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = BlockWeights;
 	/// The maximum length of a block (in bytes).
@@ -167,14 +170,10 @@ impl frame_system::Config for Runtime {
 	type Lookup = AccountIdLookup<AccountId, ()>;
 	/// The index type for storing how many extrinsics an account has signed.
 	type Index = Index;
-	/// The index type for blocks.
-	type BlockNumber = BlockNumber;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The hashing algorithm used.
 	type Hashing = BlakeTwo256;
-	/// The header type.
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
@@ -278,12 +277,7 @@ impl pallet_template::Config for Runtime {
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub struct Runtime {
 		System: frame_system,
 		Timestamp: pallet_timestamp,
 		Aura: pallet_aura,
@@ -354,7 +348,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as HeaderProvider>::Header) {
 			Executive::initialize_block(header)
 		}
 	}
@@ -378,7 +372,7 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalize_block() -> <Block as BlockT>::Header {
+		fn finalize_block() -> <Block as HeaderProvider>::Header {
 			Executive::finalize_block()
 		}
 
@@ -398,14 +392,14 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
+			block_hash: <Block as HeaderProvider>::Hash,
 		) -> TransactionValidity {
 			Executive::validate_transaction(source, tx, block_hash)
 		}
 	}
 
 	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
+		fn offchain_worker(header: &<Block as HeaderProvider>::Header) {
 			Executive::offchain_worker(header)
 		}
 	}
@@ -443,7 +437,7 @@ impl_runtime_apis! {
 
 		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: sp_consensus_grandpa::EquivocationProof<
-				<Block as BlockT>::Hash,
+				<Block as HeaderProvider>::Hash,
 				NumberFor<Block>,
 			>,
 			_key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof,
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 8fc44c7c5eddf..d4f17c69dc850 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -39,7 +39,7 @@ use sc_statement_store::Store as StatementStore;
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
-use sp_runtime::{generic, traits::Block as BlockT, SaturatedConversion};
+use sp_runtime::{generic, traits::HeaderProvider, SaturatedConversion};
 use std::sync::Arc;
 
 /// The full client type definition.
@@ -305,7 +305,7 @@ pub struct NewFullBase {
 	/// The client instance of the node.
 	pub client: Arc<FullClient>,
 	/// The networking service of the node.
-	pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+	pub network: Arc<NetworkService<Block, <Block as HeaderProvider>::Hash>>,
 	/// The syncing service of the node.
 	pub sync: Arc<SyncingService<Block>>,
 	/// The transaction pool of the node.
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index 5ab96bf1c7064..3869ba375566b 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -107,7 +107,11 @@ where
 		+ Send
 		+ 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
-	C::Api: mmr_rpc::MmrRuntimeApi<Block, <Block as sp_runtime::traits::Block>::Hash, BlockNumber>,
+	C::Api: mmr_rpc::MmrRuntimeApi<
+		Block,
+		<Block as sp_runtime::traits::HeaderProvider>::Hash,
+		BlockNumber,
+	>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BabeApi<Block>,
 	C::Api: BlockBuilder<Block>,
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
index 7d16a1afa1f2d..e62a89fa28732 100644
--- a/bin/node/runtime/src/lib.rs
+++ b/bin/node/runtime/src/lib.rs
@@ -74,8 +74,8 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	generic, impl_opaque_keys,
 	traits::{
-		self, AccountIdConversion, BlakeTwo256, Block as BlockT, Bounded, ConvertInto, NumberFor,
-		OpaqueKeys, SaturatedConversion, StaticLookup,
+		self, AccountIdConversion, BlakeTwo256, Block as BlockT, Bounded, ConvertInto,
+		HeaderProvider, NumberFor, OpaqueKeys, SaturatedConversion, StaticLookup,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Percent, Permill, Perquintill,
@@ -227,12 +227,11 @@ impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = Index;
-	type BlockNumber = BlockNumber;
 	type Hash = Hash;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = Indices;
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = Version;
@@ -1860,10 +1859,7 @@ impl pallet_statement::Config for Runtime {
 }
 
 construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = node_primitives::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system,
 		Utility: pallet_utility,
@@ -2076,7 +2072,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as HeaderProvider>::Header) {
 			Executive::initialize_block(header)
 		}
 	}
@@ -2100,7 +2096,7 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalize_block() -> <Block as BlockT>::Header {
+		fn finalize_block() -> <Block as HeaderProvider>::Header {
 			Executive::finalize_block()
 		}
 
@@ -2117,7 +2113,7 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
+			block_hash: <Block as HeaderProvider>::Hash,
 		) -> TransactionValidity {
 			Executive::validate_transaction(source, tx, block_hash)
 		}
@@ -2133,7 +2129,7 @@ impl_runtime_apis! {
 	}
 
 	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
+		fn offchain_worker(header: &<Block as HeaderProvider>::Header) {
 			Executive::offchain_worker(header)
 		}
 	}
@@ -2149,7 +2145,7 @@ impl_runtime_apis! {
 
 		fn submit_report_equivocation_unsigned_extrinsic(
 			equivocation_proof: sp_consensus_grandpa::EquivocationProof<
-				<Block as BlockT>::Hash,
+				<Block as HeaderProvider>::Hash,
 				NumberFor<Block>,
 			>,
 			key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof,
@@ -2231,7 +2227,7 @@ impl_runtime_apis! {
 		}
 
 		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: sp_consensus_babe::EquivocationProof<<Block as BlockT>::Header>,
+			equivocation_proof: sp_consensus_babe::EquivocationProof<<Block as HeaderProvider>::Header>,
 			key_owner_proof: sp_consensus_babe::OpaqueKeyOwnershipProof,
 		) -> Option<()> {
 			let key_owner_proof = key_owner_proof.decode()?;
diff --git a/client/api/src/backend.rs b/client/api/src/backend.rs
index b88feafb6ca3a..c3d668805baa3 100644
--- a/client/api/src/backend.rs
+++ b/client/api/src/backend.rs
@@ -25,7 +25,7 @@ use parking_lot::RwLock;
 use sp_consensus::BlockOrigin;
 use sp_core::offchain::OffchainStorage;
 use sp_runtime::{
-	traits::{Block as BlockT, HashFor, NumberFor},
+	traits::{Block as BlockT, HashFor, HeaderProvider, NumberFor},
 	Justification, Justifications, StateVersion, Storage,
 };
 use sp_state_machine::{
@@ -444,7 +444,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 	/// values in that block.
 	fn storage_pairs(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		prefix: Option<&StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<PairsIter<B::State, Block>>;
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index e334f2f9fb4f6..f3ca6cee9ff66 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -22,7 +22,7 @@ use sp_consensus::BlockOrigin;
 use sp_core::storage::StorageKey;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as BlockT, NumberFor},
+	traits::{Block as BlockT, HeaderProvider, NumberFor},
 	Justifications,
 };
 use std::{collections::HashSet, fmt, sync::Arc};
@@ -44,12 +44,12 @@ pub type FinalityNotifications<Block> = TracingUnboundedReceiver<FinalityNotific
 /// This may be used as chain spec extension to set trusted checkpoints, i.e.
 /// the client will refuse to import a block with a different hash at the given
 /// height.
-pub type ForkBlocks<Block> = Option<Vec<(NumberFor<Block>, <Block as BlockT>::Hash)>>;
+pub type ForkBlocks<Block> = Option<Vec<(NumberFor<Block>, <Block as HeaderProvider>::Hash)>>;
 
 /// Known bad block hashes.
 ///
 /// This may be used as chain spec extension to filter out known, unwanted forks.
-pub type BadBlocks<Block> = Option<HashSet<<Block as BlockT>::Hash>>;
+pub type BadBlocks<Block> = Option<HashSet<<Block as HeaderProvider>::Hash>>;
 
 /// Figure out the block type for a given type (for now, just a `Client`).
 pub trait BlockOf {
diff --git a/client/api/src/in_mem.rs b/client/api/src/in_mem.rs
index 9ea5169d78832..8d492fd569e2d 100644
--- a/client/api/src/in_mem.rs
+++ b/client/api/src/in_mem.rs
@@ -25,7 +25,7 @@ use sp_core::{
 };
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT, NumberFor, Zero},
+	traits::{Block as BlockT, HashFor, Header as HeaderT, HeaderProvider, NumberFor, Zero},
 	Justification, Justifications, StateVersion, Storage,
 };
 use sp_state_machine::{
@@ -155,7 +155,7 @@ impl<Block: BlockT> Blockchain<Block> {
 	pub fn insert(
 		&self,
 		hash: Block::Hash,
-		header: <Block as BlockT>::Header,
+		header: <Block as HeaderProvider>::Header,
 		justifications: Option<Justifications>,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		new_state: NewBlockState,
@@ -225,7 +225,7 @@ impl<Block: BlockT> Blockchain<Block> {
 		self.apply_head(&header)
 	}
 
-	fn apply_head(&self, header: &<Block as BlockT>::Header) -> sp_blockchain::Result<()> {
+	fn apply_head(&self, header: &<Block as HeaderProvider>::Header) -> sp_blockchain::Result<()> {
 		let hash = header.hash();
 		let number = header.number();
 
@@ -331,7 +331,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 	fn header(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+	) -> sp_blockchain::Result<Option<<Block as HeaderProvider>::Header>> {
 		Ok(self.storage.read().blocks.get(&hash).map(|b| b.header().clone()))
 	}
 
@@ -366,7 +366,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 
 	fn hash(
 		&self,
-		number: <<Block as BlockT>::Header as HeaderT>::Number,
+		number: <<Block as HeaderProvider>::Header as HeaderT>::Number,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		Ok(self.id(BlockId::Number(number)))
 	}
@@ -525,7 +525,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 
 	fn set_block_data(
 		&mut self,
-		header: <Block as BlockT>::Header,
+		header: <Block as HeaderProvider>::Header,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		_indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
@@ -632,7 +632,7 @@ impl<Block: BlockT> Backend<Block> {
 	/// # Warning
 	///
 	/// For testing purposes only!
-	pub fn pin_refs(&self, hash: &<Block as BlockT>::Hash) -> Option<i64> {
+	pub fn pin_refs(&self, hash: &<Block as HeaderProvider>::Hash) -> Option<i64> {
 		let blocks = self.pinned_blocks.read();
 		blocks.get(hash).map(|value| *value)
 	}
@@ -779,13 +779,13 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> {
 		false
 	}
 
-	fn pin_block(&self, hash: <Block as BlockT>::Hash) -> blockchain::Result<()> {
+	fn pin_block(&self, hash: <Block as HeaderProvider>::Hash) -> blockchain::Result<()> {
 		let mut blocks = self.pinned_blocks.write();
 		*blocks.entry(hash).or_default() += 1;
 		Ok(())
 	}
 
-	fn unpin_block(&self, hash: <Block as BlockT>::Hash) {
+	fn unpin_block(&self, hash: <Block as HeaderProvider>::Hash) {
 		let mut blocks = self.pinned_blocks.write();
 		blocks.entry(hash).and_modify(|counter| *counter -= 1).or_insert(-1);
 	}
diff --git a/client/basic-authorship/src/basic_authorship.rs b/client/basic-authorship/src/basic_authorship.rs
index d1921b3413cbc..9840263e837c4 100644
--- a/client/basic-authorship/src/basic_authorship.rs
+++ b/client/basic-authorship/src/basic_authorship.rs
@@ -38,7 +38,7 @@ use sp_consensus::{DisableProofRecording, EnableProofRecording, ProofRecording,
 use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
 use sp_runtime::{
-	traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as HeaderT},
+	traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as HeaderT, HeaderProvider},
 	Digest, Percent, SaturatedConversion,
 };
 use std::{marker::PhantomData, pin::Pin, sync::Arc, time};
@@ -192,7 +192,7 @@ where
 {
 	fn init_with_now(
 		&mut self,
-		parent_header: &<Block as BlockT>::Header,
+		parent_header: &<Block as HeaderProvider>::Header,
 		now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	) -> Proposer<B, Block, C, A, PR> {
 		let parent_hash = parent_header.hash();
@@ -237,7 +237,7 @@ where
 	type Proposer = Proposer<B, Block, C, A, PR>;
 	type Error = sp_blockchain::Error;
 
-	fn init(&mut self, parent_header: &<Block as BlockT>::Header) -> Self::CreateProposer {
+	fn init(&mut self, parent_header: &<Block as HeaderProvider>::Header) -> Self::CreateProposer {
 		future::ready(Ok(self.init_with_now(parent_header, Box::new(time::Instant::now))))
 	}
 }
@@ -247,7 +247,7 @@ pub struct Proposer<B, Block: BlockT, C, A: TransactionPool, PR> {
 	spawn_handle: Box<dyn SpawnNamed>,
 	client: Arc<C>,
 	parent_hash: Block::Hash,
-	parent_number: <<Block as BlockT>::Header as HeaderT>::Number,
+	parent_number: <<Block as HeaderProvider>::Header as HeaderT>::Number,
 	transaction_pool: Arc<A>,
 	now: Box<dyn Fn() -> time::Instant + Send + Sync>,
 	metrics: PrometheusMetrics,
@@ -561,7 +561,7 @@ where
 			"🎁 Prepared block for proposing at {} ({} ms) [hash: {:?}; parent_hash: {}; {extrinsics_summary}",
 			block.header().number(),
 			block_took.as_millis(),
-			<Block as BlockT>::Hash::from(block.header().hash()),
+			<Block as HeaderProvider>::Hash::from(block.header().hash()),
 			block.header().parent_hash(),
 		);
 		telemetry!(
@@ -569,7 +569,7 @@ where
 			CONSENSUS_INFO;
 			"prepared_block_for_proposing";
 			"number" => ?block.header().number(),
-			"hash" => ?<Block as BlockT>::Hash::from(block.header().hash()),
+			"hash" => ?<Block as HeaderProvider>::Hash::from(block.header().hash()),
 		);
 	}
 }
diff --git a/client/block-builder/src/lib.rs b/client/block-builder/src/lib.rs
index f055d4688822a..ed4ec5a8928eb 100644
--- a/client/block-builder/src/lib.rs
+++ b/client/block-builder/src/lib.rs
@@ -162,7 +162,7 @@ where
 		inherent_digests: Digest,
 		backend: &'a B,
 	) -> Result<Self, Error> {
-		let header = <<Block as BlockT>::Header as HeaderT>::new(
+		let header = <<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::new(
 			parent_number + One::one(),
 			Default::default(),
 			Default::default(),
diff --git a/client/chain-spec/src/genesis.rs b/client/chain-spec/src/genesis.rs
index 6aa156a620a79..015bbe7185485 100644
--- a/client/chain-spec/src/genesis.rs
+++ b/client/chain-spec/src/genesis.rs
@@ -65,13 +65,13 @@ pub fn construct_genesis_block<Block: BlockT>(
 	state_root: Block::Hash,
 	state_version: StateVersion,
 ) -> Block {
-	let extrinsics_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+	let extrinsics_root = <<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Hashing as HashT>::trie_root(
 		Vec::new(),
 		state_version,
 	);
 
 	Block::new(
-		<<Block as BlockT>::Header as HeaderT>::new(
+		<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::new(
 			Zero::zero(),
 			extrinsics_root,
 			state_root,
diff --git a/client/cli/src/commands/chain_info_cmd.rs b/client/cli/src/commands/chain_info_cmd.rs
index 002d7893d9f35..9ef5e3373b826 100644
--- a/client/cli/src/commands/chain_info_cmd.rs
+++ b/client/cli/src/commands/chain_info_cmd.rs
@@ -45,13 +45,13 @@ struct ChainInfo<B: BlockT> {
 	/// Best block hash.
 	best_hash: B::Hash,
 	/// Best block number.
-	best_number: <<B as BlockT>::Header as HeaderT>::Number,
+	best_number: <<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	/// Genesis block hash.
 	genesis_hash: B::Hash,
 	/// The head of the finalized chain.
 	finalized_hash: B::Hash,
 	/// Last finalized block number.
-	finalized_number: <<B as BlockT>::Header as HeaderT>::Number,
+	finalized_number: <<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 }
 
 impl<B: BlockT> From<Info<B>> for ChainInfo<B> {
diff --git a/client/cli/src/commands/revert_cmd.rs b/client/cli/src/commands/revert_cmd.rs
index 34e8c1036c59f..c3f21503d9c34 100644
--- a/client/cli/src/commands/revert_cmd.rs
+++ b/client/cli/src/commands/revert_cmd.rs
@@ -63,7 +63,8 @@ impl RevertCmd {
 		B: BlockT,
 		BA: Backend<B>,
 		C: UsageProvider<B>,
-		<<<B as BlockT>::Header as HeaderT>::Number as FromStr>::Err: Debug,
+		<<<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number as FromStr>::Err:
+			Debug,
 	{
 		let blocks = self.num.parse()?;
 		if let Some(aux_revert) = aux_revert {
diff --git a/client/consensus/aura/src/lib.rs b/client/consensus/aura/src/lib.rs
index 1dc364283d5b6..41b19fa16b471 100644
--- a/client/consensus/aura/src/lib.rs
+++ b/client/consensus/aura/src/lib.rs
@@ -590,7 +590,10 @@ mod tests {
 		type CreateProposer = futures::future::Ready<Result<DummyProposer, Error>>;
 		type Error = Error;
 
-		fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
+		fn init(
+			&mut self,
+			parent_header: &<TestBlock as sp_runtime::traits::HeaderProvider>::Header,
+		) -> Self::CreateProposer {
 			futures::future::ready(Ok(DummyProposer(parent_header.number + 1, self.0.clone())))
 		}
 	}
diff --git a/client/consensus/babe/src/lib.rs b/client/consensus/babe/src/lib.rs
index 219b52294952a..a7b1e3b3cc678 100644
--- a/client/consensus/babe/src/lib.rs
+++ b/client/consensus/babe/src/lib.rs
@@ -698,7 +698,18 @@ impl<B: BlockT> Future for BabeWorker<B> {
 
 /// Slot notification sinks.
 type SlotNotificationSinks<B> = Arc<
-	Mutex<Vec<Sender<(Slot, ViableEpochDescriptor<<B as BlockT>::Hash, NumberFor<B>, Epoch>)>>>,
+	Mutex<
+		Vec<
+			Sender<(
+				Slot,
+				ViableEpochDescriptor<
+					<B as sp_runtime::traits::HeaderProvider>::Hash,
+					NumberFor<B>,
+					Epoch,
+				>,
+			)>,
+		>,
+	>,
 >;
 
 struct BabeSlotWorker<B: BlockT, C, E, I, SO, L, BS> {
diff --git a/client/consensus/babe/src/tests.rs b/client/consensus/babe/src/tests.rs
index 59b4076e2fd01..978ff27b757b9 100644
--- a/client/consensus/babe/src/tests.rs
+++ b/client/consensus/babe/src/tests.rs
@@ -36,10 +36,7 @@ use sp_consensus_slots::SlotDuration;
 use sp_core::crypto::Pair;
 use sp_keyring::Sr25519Keyring;
 use sp_keystore::{testing::MemoryKeystore, Keystore};
-use sp_runtime::{
-	generic::{Digest, DigestItem},
-	traits::Block as BlockT,
-};
+use sp_runtime::generic::{Digest, DigestItem};
 use sp_timestamp::Timestamp;
 use std::{cell::RefCell, task::Poll, time::Duration};
 
@@ -84,7 +81,10 @@ impl Environment<TestBlock> for DummyFactory {
 	type Proposer = DummyProposer;
 	type Error = Error;
 
-	fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
+	fn init(
+		&mut self,
+		parent_header: &<TestBlock as sp_runtime::traits::HeaderProvider>::Header,
+	) -> Self::CreateProposer {
 		future::ready(Ok(DummyProposer {
 			factory: self.clone(),
 			parent_hash: parent_header.hash(),
@@ -178,7 +178,7 @@ pub struct BabeTestNet {
 	peers: Vec<BabePeer>,
 }
 
-type TestHeader = <TestBlock as BlockT>::Header;
+type TestHeader = <TestBlock as sp_runtime::traits::HeaderProvider>::Header;
 
 type TestSelectChain =
 	substrate_test_runtime_client::LongestChain<substrate_test_runtime_client::Backend, TestBlock>;
diff --git a/client/consensus/beefy/src/communication/notification.rs b/client/consensus/beefy/src/communication/notification.rs
index a4486e523c301..e3e221f38b3b7 100644
--- a/client/consensus/beefy/src/communication/notification.rs
+++ b/client/consensus/beefy/src/communication/notification.rs
@@ -17,18 +17,18 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use sc_utils::notification::{NotificationSender, NotificationStream, TracingKeyStr};
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::HeaderProvider;
 
 use crate::justification::BeefyVersionedFinalityProof;
 
 /// The sending half of the notifications channel(s) used to send
 /// notifications about best BEEFY block from the gadget side.
-pub type BeefyBestBlockSender<Block> = NotificationSender<<Block as BlockT>::Hash>;
+pub type BeefyBestBlockSender<Block> = NotificationSender<<Block as HeaderProvider>::Hash>;
 
 /// The receiving half of a notifications channel used to receive
 /// notifications about best BEEFY blocks determined on the gadget side.
 pub type BeefyBestBlockStream<Block> =
-	NotificationStream<<Block as BlockT>::Hash, BeefyBestBlockTracingKey>;
+	NotificationStream<<Block as HeaderProvider>::Hash, BeefyBestBlockTracingKey>;
 
 /// The sending half of the notifications channel(s) used to send notifications
 /// about versioned finality proof generated at the end of a BEEFY round.
diff --git a/client/consensus/beefy/src/import.rs b/client/consensus/beefy/src/import.rs
index bda8169d95013..c41520ef9f0fc 100644
--- a/client/consensus/beefy/src/import.rs
+++ b/client/consensus/beefy/src/import.rs
@@ -24,7 +24,7 @@ use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_consensus::Error as ConsensusError;
 use sp_consensus_beefy::{BeefyApi, BEEFY_ENGINE_ID};
 use sp_runtime::{
-	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+	traits::{Block as BlockT, Header as HeaderT, HeaderProvider, NumberFor},
 	EncodedJustification,
 };
 
@@ -89,7 +89,7 @@ where
 		&self,
 		encoded: &EncodedJustification,
 		number: NumberFor<Block>,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 	) -> Result<BeefyVersionedFinalityProof<Block>, ConsensusError> {
 		use ConsensusError::ClientImport as ImportError;
 		let beefy_genesis = self
diff --git a/client/consensus/beefy/src/lib.rs b/client/consensus/beefy/src/lib.rs
index c55849ff7722c..c759b94cab286 100644
--- a/client/consensus/beefy/src/lib.rs
+++ b/client/consensus/beefy/src/lib.rs
@@ -50,7 +50,7 @@ use sp_consensus_beefy::{
 };
 use sp_keystore::KeystorePtr;
 use sp_mmr_primitives::MmrApi;
-use sp_runtime::traits::{Block, Zero};
+use sp_runtime::traits::{Block, HeaderProvider, Zero};
 use std::{
 	collections::{BTreeMap, VecDeque},
 	marker::PhantomData,
@@ -332,7 +332,7 @@ fn load_or_init_voter_state<B, BE, R>(
 	backend: &BE,
 	runtime: &R,
 	beefy_genesis: NumberFor<B>,
-	best_grandpa: <B as Block>::Header,
+	best_grandpa: <B as HeaderProvider>::Header,
 	min_block_delta: u32,
 ) -> ClientResult<PersistedState<B>>
 where
@@ -367,7 +367,7 @@ fn initialize_voter_state<B, BE, R>(
 	backend: &BE,
 	runtime: &R,
 	beefy_genesis: NumberFor<B>,
-	best_grandpa: <B as Block>::Header,
+	best_grandpa: <B as HeaderProvider>::Header,
 	min_block_delta: u32,
 ) -> ClientResult<PersistedState<B>>
 where
@@ -474,7 +474,7 @@ async fn wait_for_runtime_pallet<B, R>(
 	runtime: &R,
 	mut gossip_engine: &mut GossipEngine<B>,
 	finality: &mut Fuse<FinalityNotifications<B>>,
-) -> ClientResult<(NumberFor<B>, <B as Block>::Header)>
+) -> ClientResult<(NumberFor<B>, <B as HeaderProvider>::Header)>
 where
 	B: Block,
 	R: ProvideRuntimeApi<B>,
diff --git a/client/consensus/beefy/src/worker.rs b/client/consensus/beefy/src/worker.rs
index cbf58e56b2cdf..1b5e08e3eb02f 100644
--- a/client/consensus/beefy/src/worker.rs
+++ b/client/consensus/beefy/src/worker.rs
@@ -47,7 +47,7 @@ use sp_consensus_beefy::{
 };
 use sp_runtime::{
 	generic::OpaqueDigestItemId,
-	traits::{Block, Header, NumberFor, Zero},
+	traits::{Block, Header, HeaderProvider, NumberFor, Zero},
 	SaturatedConversion,
 };
 use std::{
@@ -87,7 +87,7 @@ pub(crate) struct VoterOracle<B: Block> {
 	/// Min delta in block numbers between two blocks, BEEFY should vote on.
 	min_block_delta: u32,
 	/// Best block we received a GRANDPA finality for.
-	best_grandpa_block_header: <B as Block>::Header,
+	best_grandpa_block_header: <B as HeaderProvider>::Header,
 	/// Best block a BEEFY voting round has been concluded for.
 	best_beefy_block: NumberFor<B>,
 }
@@ -97,7 +97,7 @@ impl<B: Block> VoterOracle<B> {
 	pub fn checked_new(
 		sessions: VecDeque<Rounds<B>>,
 		min_block_delta: u32,
-		grandpa_header: <B as Block>::Header,
+		grandpa_header: <B as HeaderProvider>::Header,
 		best_beefy: NumberFor<B>,
 	) -> Option<Self> {
 		let mut prev_start = Zero::zero();
@@ -275,7 +275,7 @@ pub(crate) struct PersistedState<B: Block> {
 
 impl<B: Block> PersistedState<B> {
 	pub fn checked_new(
-		grandpa_header: <B as Block>::Header,
+		grandpa_header: <B as HeaderProvider>::Header,
 		best_beefy: NumberFor<B>,
 		sessions: VecDeque<Rounds<B>>,
 		min_block_delta: u32,
@@ -302,7 +302,7 @@ impl<B: Block> PersistedState<B> {
 		self.voting_oracle.best_beefy_block = best_beefy;
 	}
 
-	pub(crate) fn set_best_grandpa(&mut self, best_grandpa: <B as Block>::Header) {
+	pub(crate) fn set_best_grandpa(&mut self, best_grandpa: <B as HeaderProvider>::Header) {
 		self.voting_oracle.best_grandpa_block_header = best_grandpa;
 	}
 
diff --git a/client/consensus/common/src/import_queue.rs b/client/consensus/common/src/import_queue.rs
index 11ebbd4036a20..335459a38587e 100644
--- a/client/consensus/common/src/import_queue.rs
+++ b/client/consensus/common/src/import_queue.rs
@@ -72,9 +72,9 @@ pub type RuntimeOrigin = libp2p_identity::PeerId;
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct IncomingBlock<B: BlockT> {
 	/// Block header hash.
-	pub hash: <B as BlockT>::Hash,
+	pub hash: <B as sp_runtime::traits::HeaderProvider>::Hash,
 	/// Block header if requested.
-	pub header: Option<<B as BlockT>::Header>,
+	pub header: Option<<B as sp_runtime::traits::HeaderProvider>::Header>,
 	/// Block body if requested.
 	pub body: Option<Vec<<B as BlockT>::Extrinsic>>,
 	/// Indexed block body if requested.
diff --git a/client/consensus/common/src/longest_chain.rs b/client/consensus/common/src/longest_chain.rs
index f27cde4982def..7c65e4b87c1eb 100644
--- a/client/consensus/common/src/longest_chain.rs
+++ b/client/consensus/common/src/longest_chain.rs
@@ -21,7 +21,7 @@
 use sc_client_api::backend;
 use sp_blockchain::{Backend, HeaderBackend};
 use sp_consensus::{Error as ConsensusError, SelectChain};
-use sp_runtime::traits::{Block as BlockT, Header, NumberFor};
+use sp_runtime::traits::{Block as BlockT, Header, HeaderProvider, NumberFor};
 use std::{marker::PhantomData, sync::Arc};
 
 /// Implement Longest Chain Select implementation
@@ -48,7 +48,7 @@ where
 		LongestChain { backend, _phantom: Default::default() }
 	}
 
-	fn best_hash(&self) -> sp_blockchain::Result<<Block as BlockT>::Hash> {
+	fn best_hash(&self) -> sp_blockchain::Result<<Block as HeaderProvider>::Hash> {
 		let info = self.backend.blockchain().info();
 		let import_lock = self.backend.get_import_lock();
 		let best_hash = self
@@ -59,7 +59,7 @@ where
 		Ok(best_hash)
 	}
 
-	fn best_header(&self) -> sp_blockchain::Result<<Block as BlockT>::Header> {
+	fn best_header(&self) -> sp_blockchain::Result<<Block as HeaderProvider>::Header> {
 		let best_hash = self.best_hash()?;
 		Ok(self
 			.backend
@@ -127,7 +127,7 @@ where
 		Ok(best_hash)
 	}
 
-	fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, sp_blockchain::Error> {
+	fn leaves(&self) -> Result<Vec<<Block as HeaderProvider>::Hash>, sp_blockchain::Error> {
 		self.backend.blockchain().leaves()
 	}
 }
@@ -138,11 +138,11 @@ where
 	B: backend::Backend<Block>,
 	Block: BlockT,
 {
-	async fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, ConsensusError> {
+	async fn leaves(&self) -> Result<Vec<<Block as HeaderProvider>::Hash>, ConsensusError> {
 		LongestChain::leaves(self).map_err(|e| ConsensusError::ChainLookup(e.to_string()))
 	}
 
-	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, ConsensusError> {
+	async fn best_chain(&self) -> Result<<Block as HeaderProvider>::Header, ConsensusError> {
 		LongestChain::best_header(self).map_err(|e| ConsensusError::ChainLookup(e.to_string()))
 	}
 
diff --git a/client/consensus/epochs/src/lib.rs b/client/consensus/epochs/src/lib.rs
index 29bb18e147c2b..9972c7254e07b 100644
--- a/client/consensus/epochs/src/lib.rs
+++ b/client/consensus/epochs/src/lib.rs
@@ -24,7 +24,7 @@ use codec::{Decode, Encode};
 use fork_tree::{FilterAction, ForkTree};
 use sc_client_api::utils::is_descendent_of;
 use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
-use sp_runtime::traits::{Block as BlockT, NumberFor, One, Zero};
+use sp_runtime::traits::{Block as BlockT, HeaderProvider, NumberFor, One, Zero};
 use std::{
 	borrow::{Borrow, BorrowMut},
 	collections::BTreeMap,
@@ -692,7 +692,7 @@ where
 
 /// Type alias to produce the epoch-changes tree from a block type.
 pub type EpochChangesFor<Block, Epoch> =
-	EpochChanges<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
+	EpochChanges<<Block as HeaderProvider>::Hash, NumberFor<Block>, Epoch>;
 
 /// A shared epoch changes tree.
 pub type SharedEpochChanges<Block, Epoch> =
diff --git a/client/consensus/epochs/src/migration.rs b/client/consensus/epochs/src/migration.rs
index 8838dbb4605b7..2122593a06866 100644
--- a/client/consensus/epochs/src/migration.rs
+++ b/client/consensus/epochs/src/migration.rs
@@ -21,7 +21,7 @@
 use crate::{Epoch, EpochChanges, PersistedEpoch, PersistedEpochHeader};
 use codec::{Decode, Encode};
 use fork_tree::ForkTree;
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_runtime::traits::{HeaderProvider, NumberFor};
 use std::collections::BTreeMap;
 
 /// Legacy definition of epoch changes.
@@ -39,10 +39,10 @@ pub struct EpochChangesV1<Hash, Number, E: Epoch> {
 
 /// Type alias for v0 definition of epoch changes.
 pub type EpochChangesV0For<Block, Epoch> =
-	EpochChangesV0<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
+	EpochChangesV0<<Block as HeaderProvider>::Hash, NumberFor<Block>, Epoch>;
 /// Type alias for v1 and v2 definition of epoch changes.
 pub type EpochChangesV1For<Block, Epoch> =
-	EpochChangesV1<<Block as BlockT>::Hash, NumberFor<Block>, Epoch>;
+	EpochChangesV1<<Block as HeaderProvider>::Hash, NumberFor<Block>, Epoch>;
 
 impl<Hash, Number, E: Epoch> EpochChangesV0<Hash, Number, E>
 where
diff --git a/client/consensus/grandpa/src/environment.rs b/client/consensus/grandpa/src/environment.rs
index 67820a59cc943..4f91f7f8e298d 100644
--- a/client/consensus/grandpa/src/environment.rs
+++ b/client/consensus/grandpa/src/environment.rs
@@ -61,7 +61,7 @@ use crate::{
 };
 
 type HistoricalVotes<Block> = finality_grandpa::HistoricalVotes<
-	<Block as BlockT>::Hash,
+	<Block as sp_runtime::traits::HeaderProvider>::Hash,
 	NumberFor<Block>,
 	AuthoritySignature,
 	AuthorityId,
@@ -167,7 +167,8 @@ impl<Block: BlockT> CompletedRounds<Block> {
 
 /// A map with voter status information for currently live rounds,
 /// which votes have we cast and what are they.
-pub type CurrentRounds<Block> = BTreeMap<RoundNumber, HasVoted<<Block as BlockT>::Header>>;
+pub type CurrentRounds<Block> =
+	BTreeMap<RoundNumber, HasVoted<<Block as sp_runtime::traits::HeaderProvider>::Header>>;
 
 /// The state of the current voter set, whether it is currently active or not
 /// and information related to the previously completed rounds. Current round
diff --git a/client/consensus/grandpa/src/lib.rs b/client/consensus/grandpa/src/lib.rs
index 9c0aa60c24e1b..5f9eab4fac8d1 100644
--- a/client/consensus/grandpa/src/lib.rs
+++ b/client/consensus/grandpa/src/lib.rs
@@ -159,7 +159,7 @@ mod tests;
 /// exposed publicly, used internally to simplify types in the communication
 /// layer.
 type CommunicationIn<Block> = voter::CommunicationIn<
-	<Block as BlockT>::Hash,
+	<Block as sp_runtime::traits::HeaderProvider>::Hash,
 	NumberFor<Block>,
 	AuthoritySignature,
 	AuthorityId,
diff --git a/client/consensus/grandpa/src/tests.rs b/client/consensus/grandpa/src/tests.rs
index c46e249be485c..434f2136f8162 100644
--- a/client/consensus/grandpa/src/tests.rs
+++ b/client/consensus/grandpa/src/tests.rs
@@ -212,12 +212,12 @@ impl GenesisAuthoritySetProvider<Block> for TestApi {
 #[derive(Clone, Default)]
 struct MockSelectChain {
 	leaves: Arc<Mutex<Option<Vec<Hash>>>>,
-	best_chain: Arc<Mutex<Option<<Block as BlockT>::Header>>>,
+	best_chain: Arc<Mutex<Option<<Block as sp_runtime::traits::HeaderProvider>::Header>>>,
 	finality_target: Arc<Mutex<Option<Hash>>>,
 }
 
 impl MockSelectChain {
-	fn set_best_chain(&self, best: <Block as BlockT>::Header) {
+	fn set_best_chain(&self, best: <Block as sp_runtime::traits::HeaderProvider>::Header) {
 		*self.best_chain.lock() = Some(best);
 	}
 
@@ -232,7 +232,9 @@ impl SelectChain<Block> for MockSelectChain {
 		Ok(self.leaves.lock().take().unwrap())
 	}
 
-	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, ConsensusError> {
+	async fn best_chain(
+		&self,
+	) -> Result<<Block as sp_runtime::traits::HeaderProvider>::Header, ConsensusError> {
 		Ok(self.best_chain.lock().take().unwrap())
 	}
 
@@ -256,9 +258,9 @@ where
 	fn restrict_vote(
 		&self,
 		_backend: Arc<B>,
-		_base: &<Block as BlockT>::Header,
-		best_target: &<Block as BlockT>::Header,
-		_current_target: &<Block as BlockT>::Header,
+		_base: &<Block as sp_runtime::traits::HeaderProvider>::Header,
+		best_target: &<Block as sp_runtime::traits::HeaderProvider>::Header,
+		_current_target: &<Block as sp_runtime::traits::HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		if let Some(expected) = *self.0.lock() {
 			assert_eq!(best_target.hash(), expected);
diff --git a/client/consensus/grandpa/src/until_imported.rs b/client/consensus/grandpa/src/until_imported.rs
index 14f32ecc88366..ac9acf9fff1a4 100644
--- a/client/consensus/grandpa/src/until_imported.rs
+++ b/client/consensus/grandpa/src/until_imported.rs
@@ -394,7 +394,7 @@ pub(crate) type UntilVoteTargetImported<Block, BlockStatus, BlockSyncRequester,
 	BlockStatus,
 	BlockSyncRequester,
 	I,
-	SignedMessage<<Block as BlockT>::Header>,
+	SignedMessage<<Block as sp_runtime::traits::HeaderProvider>::Header>,
 >;
 
 /// This blocks a global message import, i.e. a commit or catch up messages,
diff --git a/client/consensus/grandpa/src/voting_rule.rs b/client/consensus/grandpa/src/voting_rule.rs
index 27a91d5478370..4b8bebd5130a6 100644
--- a/client/consensus/grandpa/src/voting_rule.rs
+++ b/client/consensus/grandpa/src/voting_rule.rs
@@ -27,11 +27,12 @@ use std::{future::Future, pin::Pin, sync::Arc};
 use dyn_clone::DynClone;
 
 use sc_client_api::blockchain::HeaderBackend;
-use sp_runtime::traits::{Block as BlockT, Header, NumberFor, One, Zero};
+use sp_runtime::traits::{Block as BlockT, Header, HeaderProvider, NumberFor, One, Zero};
 
 /// A future returned by a `VotingRule` to restrict a given vote, if any restriction is necessary.
-pub type VotingRuleResult<Block> =
-	Pin<Box<dyn Future<Output = Option<(<Block as BlockT>::Hash, NumberFor<Block>)>> + Send>>;
+pub type VotingRuleResult<Block> = Pin<
+	Box<dyn Future<Output = Option<(<Block as HeaderProvider>::Hash, NumberFor<Block>)>> + Send>,
+>;
 
 /// A trait for custom voting rules in GRANDPA.
 pub trait VotingRule<Block, B>: DynClone + Send + Sync
@@ -54,9 +55,9 @@ where
 	fn restrict_vote(
 		&self,
 		backend: Arc<B>,
-		base: &Block::Header,
-		best_target: &Block::Header,
-		current_target: &Block::Header,
+		base: &<Block as HeaderProvider>::Header,
+		best_target: &<Block as HeaderProvider>::Header,
+		current_target: &<Block as HeaderProvider>::Header,
 	) -> VotingRuleResult<Block>;
 }
 
@@ -68,9 +69,9 @@ where
 	fn restrict_vote(
 		&self,
 		_backend: Arc<B>,
-		_base: &Block::Header,
-		_best_target: &Block::Header,
-		_current_target: &Block::Header,
+		_base: &<Block as HeaderProvider>::Header,
+		_best_target: &<Block as HeaderProvider>::Header,
+		_current_target: &<Block as HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		Box::pin(async { None })
 	}
@@ -95,9 +96,9 @@ where
 	fn restrict_vote(
 		&self,
 		backend: Arc<B>,
-		base: &Block::Header,
-		best_target: &Block::Header,
-		current_target: &Block::Header,
+		base: &<Block as HeaderProvider>::Header,
+		best_target: &<Block as HeaderProvider>::Header,
+		current_target: &<Block as HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		use sp_arithmetic::traits::Saturating;
 
@@ -140,9 +141,9 @@ where
 	fn restrict_vote(
 		&self,
 		backend: Arc<B>,
-		base: &Block::Header,
-		best_target: &Block::Header,
-		current_target: &Block::Header,
+		base: &<Block as HeaderProvider>::Header,
+		best_target: &<Block as HeaderProvider>::Header,
+		current_target: &<Block as HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		// target a vote towards 3/4 of the unfinalized chain (rounding up)
 		let target_number = {
@@ -170,7 +171,7 @@ where
 fn find_target<Block, B>(
 	backend: &B,
 	target_number: NumberFor<Block>,
-	current_header: &Block::Header,
+	current_header: &<Block as HeaderProvider>::Header,
 ) -> Option<(Block::Hash, NumberFor<Block>)>
 where
 	Block: BlockT,
@@ -218,9 +219,9 @@ where
 	fn restrict_vote(
 		&self,
 		backend: Arc<B>,
-		base: &Block::Header,
-		best_target: &Block::Header,
-		current_target: &Block::Header,
+		base: &<Block as HeaderProvider>::Header,
+		best_target: &<Block as HeaderProvider>::Header,
+		current_target: &<Block as HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		let rules = self.rules.clone();
 		let base = base.clone();
@@ -319,9 +320,9 @@ where
 	fn restrict_vote(
 		&self,
 		backend: Arc<B>,
-		base: &Block::Header,
-		best_target: &Block::Header,
-		current_target: &Block::Header,
+		base: &<Block as HeaderProvider>::Header,
+		best_target: &<Block as HeaderProvider>::Header,
+		current_target: &<Block as HeaderProvider>::Header,
 	) -> VotingRuleResult<Block> {
 		(**self).restrict_vote(backend, base, best_target, current_target)
 	}
diff --git a/client/consensus/manual-seal/src/finalize_block.rs b/client/consensus/manual-seal/src/finalize_block.rs
index 06883b2291bd2..9a4e6df67f2c3 100644
--- a/client/consensus/manual-seal/src/finalize_block.rs
+++ b/client/consensus/manual-seal/src/finalize_block.rs
@@ -26,7 +26,7 @@ use std::{marker::PhantomData, sync::Arc};
 /// params for block finalization.
 pub struct FinalizeBlockParams<B: BlockT, F, CB> {
 	/// hash of the block
-	pub hash: <B as BlockT>::Hash,
+	pub hash: <B as sp_runtime::traits::HeaderProvider>::Hash,
 	/// sender to report errors/success to the rpc.
 	pub sender: rpc::Sender<()>,
 	/// finalization justification
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 03c9418b5c560..6552223d47c8a 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -175,7 +175,9 @@ pub async fn run_manual_seal<B, BI, CB, E, C, TP, SC, CS, CIDP, P>(
 	CB: ClientBackend<B> + 'static,
 	E: Environment<B> + 'static,
 	E::Proposer: Proposer<B, Proof = P, Transaction = TransactionFor<C, B>>,
-	CS: Stream<Item = EngineCommand<<B as BlockT>::Hash>> + Unpin + 'static,
+	CS: Stream<Item = EngineCommand<<B as sp_runtime::traits::HeaderProvider>::Hash>>
+		+ Unpin
+		+ 'static,
 	SC: SelectChain<B> + 'static,
 	TransactionFor<C, B>: 'static,
 	TP: TransactionPool<Block = B>,
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index e6133bccae885..4e4cb81059953 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -40,9 +40,9 @@ pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, TP
 	/// instantly finalize this block?
 	pub finalize: bool,
 	/// specify the parent hash of the about-to-created block
-	pub parent_hash: Option<<B as BlockT>::Hash>,
+	pub parent_hash: Option<<B as sp_runtime::traits::HeaderProvider>::Hash>,
 	/// sender to report errors/success to the rpc.
-	pub sender: rpc::Sender<CreatedBlock<<B as BlockT>::Hash>>,
+	pub sender: rpc::Sender<CreatedBlock<<B as sp_runtime::traits::HeaderProvider>::Hash>>,
 	/// transaction pool
 	pub pool: Arc<TP>,
 	/// header backend
@@ -154,8 +154,10 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP, P>(
 		post_header.digest_mut().logs.extend(params.post_digests.iter().cloned());
 
 		match block_import.import_block(params).await? {
-			ImportResult::Imported(aux) =>
-				Ok(CreatedBlock { hash: <B as BlockT>::Header::hash(&post_header), aux }),
+			ImportResult::Imported(aux) => Ok(CreatedBlock {
+				hash: <B as sp_runtime::traits::HeaderProvider>::Header::hash(&post_header),
+				aux,
+			}),
 			other => Err(other.into()),
 		}
 	};
diff --git a/client/consensus/pow/src/lib.rs b/client/consensus/pow/src/lib.rs
index 913686b7bf36d..72679d8d4b4e1 100644
--- a/client/consensus/pow/src/lib.rs
+++ b/client/consensus/pow/src/lib.rs
@@ -217,7 +217,7 @@ pub struct PowBlockImport<B: BlockT, I, C, S, Algorithm, CIDP> {
 	select_chain: S,
 	client: Arc<C>,
 	create_inherent_data_providers: Arc<CIDP>,
-	check_inherents_after: <<B as BlockT>::Header as HeaderT>::Number,
+	check_inherents_after: <<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 }
 
 impl<B: BlockT, I: Clone, C, S: Clone, Algorithm: Clone, CIDP> Clone
@@ -250,7 +250,7 @@ where
 		inner: I,
 		client: Arc<C>,
 		algorithm: Algorithm,
-		check_inherents_after: <<B as BlockT>::Header as HeaderT>::Number,
+		check_inherents_after: <<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 		select_chain: S,
 		create_inherent_data_providers: CIDP,
 	) -> Self {
diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
index 69d8d8cfc3229..b8670d9fb4f04 100644
--- a/client/db/src/lib.rs
+++ b/client/db/src/lib.rs
@@ -79,8 +79,8 @@ use sp_database::Transaction;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{
-		Block as BlockT, Hash, HashFor, Header as HeaderT, NumberFor, One, SaturatedConversion,
-		Zero,
+		Block as BlockT, Hash, HashFor, Header as HeaderT, HeaderProvider, NumberFor, One,
+		SaturatedConversion, Zero,
 	},
 	Justification, Justifications, StateVersion, Storage,
 };
@@ -2473,7 +2473,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		)
 	}
 
-	fn pin_block(&self, hash: <Block as BlockT>::Hash) -> sp_blockchain::Result<()> {
+	fn pin_block(&self, hash: <Block as HeaderProvider>::Hash) -> sp_blockchain::Result<()> {
 		let hint = || {
 			let header_metadata = self.blockchain.header_metadata(hash);
 			header_metadata
@@ -2508,7 +2508,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 		Ok(())
 	}
 
-	fn unpin_block(&self, hash: <Block as BlockT>::Hash) {
+	fn unpin_block(&self, hash: <Block as HeaderProvider>::Hash) {
 		self.storage.state_db.unpin(&hash);
 
 		if self.blocks_pruning != BlocksPruning::KeepAll {
diff --git a/client/db/src/utils.rs b/client/db/src/utils.rs
index abf9c4629cee4..343dd0d66e32c 100644
--- a/client/db/src/utils.rs
+++ b/client/db/src/utils.rs
@@ -469,7 +469,10 @@ pub fn read_header<Block: BlockT>(
 pub fn read_meta<Block>(
 	db: &dyn Database<DbHash>,
 	col_header: u32,
-) -> Result<Meta<<<Block as BlockT>::Header as HeaderT>::Number, Block::Hash>, sp_blockchain::Error>
+) -> Result<
+	Meta<<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number, Block::Hash>,
+	sp_blockchain::Error,
+>
 where
 	Block: BlockT,
 {
diff --git a/client/merkle-mountain-range/rpc/src/lib.rs b/client/merkle-mountain-range/rpc/src/lib.rs
index daf2cd1ec298b..3c938831417a3 100644
--- a/client/merkle-mountain-range/rpc/src/lib.rs
+++ b/client/merkle-mountain-range/rpc/src/lib.rs
@@ -34,7 +34,7 @@ use sp_api::{NumberFor, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_mmr_primitives::{Error as MmrError, Proof};
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::{Block as BlockT, HeaderProvider};
 
 pub use sp_mmr_primitives::MmrApi as MmrRuntimeApi;
 
@@ -140,7 +140,8 @@ impl<C, B> Mmr<C, B> {
 }
 
 #[async_trait]
-impl<Client, Block, MmrHash> MmrApiServer<<Block as BlockT>::Hash, NumberFor<Block>, MmrHash>
+impl<Client, Block, MmrHash>
+	MmrApiServer<<Block as HeaderProvider>::Hash, NumberFor<Block>, MmrHash>
 	for Mmr<Client, (Block, MmrHash)>
 where
 	Block: BlockT,
@@ -148,7 +149,7 @@ where
 	Client::Api: MmrRuntimeApi<Block, MmrHash, NumberFor<Block>>,
 	MmrHash: Codec + Send + Sync + 'static,
 {
-	fn mmr_root(&self, at: Option<<Block as BlockT>::Hash>) -> RpcResult<MmrHash> {
+	fn mmr_root(&self, at: Option<<Block as HeaderProvider>::Hash>) -> RpcResult<MmrHash> {
 		let block_hash = at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
 			self.client.info().best_hash);
@@ -164,8 +165,8 @@ where
 		&self,
 		block_numbers: Vec<NumberFor<Block>>,
 		best_known_block_number: Option<NumberFor<Block>>,
-		at: Option<<Block as BlockT>::Hash>,
-	) -> RpcResult<LeavesProof<<Block as BlockT>::Hash>> {
+		at: Option<<Block as HeaderProvider>::Hash>,
+	) -> RpcResult<LeavesProof<<Block as HeaderProvider>::Hash>> {
 		let api = self.client.runtime_api();
 		let block_hash = at.unwrap_or_else(||
 			// If the block hash is not supplied assume the best block.
@@ -184,7 +185,7 @@ where
 		Ok(LeavesProof::new(block_hash, leaves, proof))
 	}
 
-	fn verify_proof(&self, proof: LeavesProof<<Block as BlockT>::Hash>) -> RpcResult<bool> {
+	fn verify_proof(&self, proof: LeavesProof<<Block as HeaderProvider>::Hash>) -> RpcResult<bool> {
 		let api = self.client.runtime_api();
 
 		let leaves = Decode::decode(&mut &proof.leaves.0[..])
@@ -208,7 +209,7 @@ where
 	fn verify_proof_stateless(
 		&self,
 		mmr_root: MmrHash,
-		proof: LeavesProof<<Block as BlockT>::Hash>,
+		proof: LeavesProof<<Block as HeaderProvider>::Hash>,
 	) -> RpcResult<bool> {
 		let api = self.client.runtime_api();
 
diff --git a/client/merkle-mountain-range/src/offchain_mmr.rs b/client/merkle-mountain-range/src/offchain_mmr.rs
index 3c3f0beb6c6a9..a92753e001515 100644
--- a/client/merkle-mountain-range/src/offchain_mmr.rs
+++ b/client/merkle-mountain-range/src/offchain_mmr.rs
@@ -30,7 +30,7 @@ use sp_consensus_beefy::MmrRootHash;
 use sp_core::offchain::{DbExternalities, StorageKind};
 use sp_mmr_primitives::{utils, utils::NodesUtils, MmrApi, NodeIndex};
 use sp_runtime::{
-	traits::{Block, Header, NumberFor, One},
+	traits::{Block, Header, HeaderProvider, NumberFor, One},
 	Saturating,
 };
 use std::{collections::VecDeque, sync::Arc};
@@ -223,7 +223,7 @@ where
 	pub fn canonicalize_catch_up(&mut self, notification: &FinalityNotification<B>) {
 		let first = notification.tree_route.first().unwrap_or(&notification.hash);
 		if let Some(mut header) = self.header_metadata_or_log(*first, "canonicalize") {
-			let mut to_canon = VecDeque::<<B as Block>::Hash>::new();
+			let mut to_canon = VecDeque::<<B as HeaderProvider>::Hash>::new();
 			// Walk up the chain adding all blocks newer than `self.best_canonicalized`.
 			loop {
 				header = match self.header_metadata_or_log(header.parent, "canonicalize") {
diff --git a/client/network-gossip/src/bridge.rs b/client/network-gossip/src/bridge.rs
index 2cd4e18171568..e4b3420a5d992 100644
--- a/client/network-gossip/src/bridge.rs
+++ b/client/network-gossip/src/bridge.rs
@@ -344,7 +344,7 @@ mod tests {
 	use sc_network_common::{role::ObservedRole, sync::SyncEventStream};
 	use sp_runtime::{
 		testing::H256,
-		traits::{Block as BlockT, NumberFor},
+		traits::{HeaderProvider, NumberFor},
 	};
 	use std::{
 		collections::HashSet,
@@ -447,14 +447,14 @@ mod tests {
 		}
 	}
 
-	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>> for TestNetwork {
-		fn announce_block(&self, _hash: <Block as BlockT>::Hash, _data: Option<Vec<u8>>) {
+	impl NetworkBlock<<Block as HeaderProvider>::Hash, NumberFor<Block>> for TestNetwork {
+		fn announce_block(&self, _hash: <Block as HeaderProvider>::Hash, _data: Option<Vec<u8>>) {
 			unimplemented!();
 		}
 
 		fn new_best_block_imported(
 			&self,
-			_hash: <Block as BlockT>::Hash,
+			_hash: <Block as HeaderProvider>::Hash,
 			_number: NumberFor<Block>,
 		) {
 			unimplemented!();
@@ -483,14 +483,14 @@ mod tests {
 		}
 	}
 
-	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>> for TestSync {
-		fn announce_block(&self, _hash: <Block as BlockT>::Hash, _data: Option<Vec<u8>>) {
+	impl NetworkBlock<<Block as HeaderProvider>::Hash, NumberFor<Block>> for TestSync {
+		fn announce_block(&self, _hash: <Block as HeaderProvider>::Hash, _data: Option<Vec<u8>>) {
 			unimplemented!();
 		}
 
 		fn new_best_block_imported(
 			&self,
-			_hash: <Block as BlockT>::Hash,
+			_hash: <Block as HeaderProvider>::Hash,
 			_number: NumberFor<Block>,
 		) {
 			unimplemented!();
diff --git a/client/network-gossip/src/state_machine.rs b/client/network-gossip/src/state_machine.rs
index 24373cd402513..d4502db6d9c6b 100644
--- a/client/network-gossip/src/state_machine.rs
+++ b/client/network-gossip/src/state_machine.rs
@@ -533,7 +533,7 @@ mod tests {
 	};
 	use sp_runtime::{
 		testing::{Block as RawBlock, ExtrinsicWrapper, H256},
-		traits::NumberFor,
+		traits::{HeaderProvider, NumberFor},
 	};
 	use std::{
 		collections::HashSet,
@@ -674,14 +674,14 @@ mod tests {
 		}
 	}
 
-	impl NetworkBlock<<Block as BlockT>::Hash, NumberFor<Block>> for NoOpNetwork {
-		fn announce_block(&self, _hash: <Block as BlockT>::Hash, _data: Option<Vec<u8>>) {
+	impl NetworkBlock<<Block as HeaderProvider>::Hash, NumberFor<Block>> for NoOpNetwork {
+		fn announce_block(&self, _hash: <Block as HeaderProvider>::Hash, _data: Option<Vec<u8>>) {
 			unimplemented!();
 		}
 
 		fn new_best_block_imported(
 			&self,
-			_hash: <Block as BlockT>::Hash,
+			_hash: <Block as HeaderProvider>::Hash,
 			_number: NumberFor<Block>,
 		) {
 			unimplemented!();
diff --git a/client/network/common/src/sync/message.rs b/client/network/common/src/sync/message.rs
index 7cdb14172885e..7b9c691579998 100644
--- a/client/network/common/src/sync/message.rs
+++ b/client/network/common/src/sync/message.rs
@@ -27,16 +27,24 @@ pub use generic::{BlockAnnounce, FromBlock};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 
 /// Type alias for using the block request type using block type parameters.
-pub type BlockRequest<B> =
-	generic::BlockRequest<<B as BlockT>::Hash, <<B as BlockT>::Header as HeaderT>::Number>;
+pub type BlockRequest<B> = generic::BlockRequest<
+	<B as sp_runtime::traits::HeaderProvider>::Hash,
+	<<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
+>;
 
 /// Type alias for using the BlockData type using block type parameters.
-pub type BlockData<B> =
-	generic::BlockData<<B as BlockT>::Header, <B as BlockT>::Hash, <B as BlockT>::Extrinsic>;
+pub type BlockData<B> = generic::BlockData<
+	<B as sp_runtime::traits::HeaderProvider>::Header,
+	<B as sp_runtime::traits::HeaderProvider>::Hash,
+	<B as BlockT>::Extrinsic,
+>;
 
 /// Type alias for using the BlockResponse type using block type parameters.
-pub type BlockResponse<B> =
-	generic::BlockResponse<<B as BlockT>::Header, <B as BlockT>::Hash, <B as BlockT>::Extrinsic>;
+pub type BlockResponse<B> = generic::BlockResponse<
+	<B as sp_runtime::traits::HeaderProvider>::Header,
+	<B as sp_runtime::traits::HeaderProvider>::Hash,
+	<B as BlockT>::Extrinsic,
+>;
 
 // Bits of block data and associated artifacts to request.
 bitflags! {
diff --git a/client/network/common/src/sync/warp.rs b/client/network/common/src/sync/warp.rs
index 37a6e62c53b4e..51a8573e1d972 100644
--- a/client/network/common/src/sync/warp.rs
+++ b/client/network/common/src/sync/warp.rs
@@ -37,7 +37,7 @@ pub enum WarpSyncParams<Block: BlockT> {
 	/// Skip downloading proofs and wait for a header of the state that should be downloaded.
 	///
 	/// It is expected that the header provider ensures that the header is trusted.
-	WaitForTarget(oneshot::Receiver<<Block as BlockT>::Header>),
+	WaitForTarget(oneshot::Receiver<<Block as sp_runtime::traits::HeaderProvider>::Header>),
 }
 
 /// Proof verification result.
diff --git a/client/network/src/protocol/message.rs b/client/network/src/protocol/message.rs
index 66dca2975375f..605fa9256f5bb 100644
--- a/client/network/src/protocol/message.rs
+++ b/client/network/src/protocol/message.rs
@@ -30,9 +30,9 @@ use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
 /// Type alias for using the message type using block type parameters.
 pub type Message<B> = generic::Message<
-	<B as BlockT>::Header,
-	<B as BlockT>::Hash,
-	<<B as BlockT>::Header as HeaderT>::Number,
+	<B as sp_runtime::traits::HeaderProvider>::Header,
+	<B as sp_runtime::traits::HeaderProvider>::Hash,
+	<<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	<B as BlockT>::Extrinsic,
 >;
 
diff --git a/client/network/sync/src/extra_requests.rs b/client/network/sync/src/extra_requests.rs
index 09e6bdb57399f..c1525adbf9362 100644
--- a/client/network/sync/src/extra_requests.rs
+++ b/client/network/sync/src/extra_requests.rs
@@ -32,7 +32,7 @@ use std::{
 const EXTRA_RETRY_WAIT: Duration = Duration::from_secs(10);
 
 /// Pending extra data request for the given block (hash and number).
-type ExtraRequest<B> = (<B as BlockT>::Hash, NumberFor<B>);
+type ExtraRequest<B> = (<B as sp_runtime::traits::HeaderProvider>::Hash, NumberFor<B>);
 
 /// Manages pending block extra data (e.g. justification) requests.
 ///
diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
index a9ff38e4ea608..419cac91befb7 100644
--- a/client/network/test/src/lib.rs
+++ b/client/network/test/src/lib.rs
@@ -83,7 +83,7 @@ use sp_core::H256;
 use sp_runtime::{
 	codec::{Decode, Encode},
 	generic::BlockId,
-	traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero},
+	traits::{Block as BlockT, Header as HeaderT, HeaderProvider, NumberFor, Zero},
 	Justification, Justifications,
 };
 use substrate_test_runtime_client::AccountKeyring;
@@ -160,8 +160,8 @@ impl PeersClient {
 
 	pub fn header(
 		&self,
-		hash: <Block as BlockT>::Hash,
-	) -> ClientResult<Option<<Block as BlockT>::Header>> {
+		hash: <Block as HeaderProvider>::Hash,
+	) -> ClientResult<Option<<Block as HeaderProvider>::Header>> {
 		self.client.header(hash)
 	}
 
@@ -181,7 +181,7 @@ impl PeersClient {
 
 	pub fn justifications(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 	) -> ClientResult<Option<Justifications>> {
 		self.client.justifications(hash)
 	}
@@ -196,7 +196,7 @@ impl PeersClient {
 
 	pub fn finalize_block(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		justification: Option<Justification>,
 		notify: bool,
 	) -> ClientResult<()> {
@@ -235,7 +235,7 @@ pub struct Peer<D, BlockImport> {
 	block_import: BlockImportAdapter<BlockImport>,
 	select_chain: Option<LongestChain<substrate_test_runtime_client::Backend, Block>>,
 	backend: Option<Arc<substrate_test_runtime_client::Backend>>,
-	network: NetworkWorker<Block, <Block as BlockT>::Hash>,
+	network: NetworkWorker<Block, <Block as HeaderProvider>::Hash>,
 	sync_service: Arc<SyncingService<Block>>,
 	imported_blocks_stream: Pin<Box<dyn Stream<Item = BlockImportNotification<Block>> + Send>>,
 	finality_notification_stream: Pin<Box<dyn Stream<Item = FinalityNotification<Block>> + Send>>,
@@ -280,12 +280,16 @@ where
 	}
 
 	/// Request a justification for the given block.
-	pub fn request_justification(&self, hash: &<Block as BlockT>::Hash, number: NumberFor<Block>) {
+	pub fn request_justification(
+		&self,
+		hash: &<Block as HeaderProvider>::Hash,
+		number: NumberFor<Block>,
+	) {
 		self.sync_service.request_justification(hash, number);
 	}
 
 	/// Announces an important block on the network.
-	pub fn announce_block(&self, hash: <Block as BlockT>::Hash, data: Option<Vec<u8>>) {
+	pub fn announce_block(&self, hash: <Block as HeaderProvider>::Hash, data: Option<Vec<u8>>) {
 		self.sync_service.announce_block(hash, data);
 	}
 
@@ -293,7 +297,7 @@ where
 	pub fn set_sync_fork_request(
 		&self,
 		peers: Vec<PeerId>,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		number: NumberFor<Block>,
 	) {
 		self.sync_service.set_sync_fork_request(peers, hash, number);
@@ -501,7 +505,7 @@ where
 	}
 
 	/// Get a reference to the network service.
-	pub fn network_service(&self) -> &Arc<NetworkService<Block, <Block as BlockT>::Hash>> {
+	pub fn network_service(&self) -> &Arc<NetworkService<Block, <Block as HeaderProvider>::Hash>> {
 		self.network.service()
 	}
 
@@ -510,7 +514,7 @@ where
 	}
 
 	/// Get a reference to the network worker.
-	pub fn network(&self) -> &NetworkWorker<Block, <Block as BlockT>::Hash> {
+	pub fn network(&self) -> &NetworkWorker<Block, <Block as HeaderProvider>::Hash> {
 		&self.network
 	}
 
@@ -533,7 +537,7 @@ where
 	}
 
 	/// Return a collection of block hashes that failed verification
-	pub fn failed_verifications(&self) -> HashMap<<Block as BlockT>::Hash, String> {
+	pub fn failed_verifications(&self) -> HashMap<<Block as HeaderProvider>::Hash, String> {
 		self.verifier.failed_verifications.lock().clone()
 	}
 
@@ -707,7 +711,7 @@ pub struct FullPeerConfig {
 	/// Enable transaction indexing.
 	pub storage_chain: bool,
 	/// Optional target block header to sync to
-	pub target_block: Option<<Block as BlockT>::Header>,
+	pub target_block: Option<<Block as HeaderProvider>::Header>,
 }
 
 #[async_trait::async_trait]
@@ -843,7 +847,7 @@ where
 
 		let warp_sync_params = match config.target_block {
 			Some(target_block) => {
-				let (sender, receiver) = oneshot::channel::<<Block as BlockT>::Header>();
+				let (sender, receiver) = oneshot::channel::<<Block as HeaderProvider>::Header>();
 				let _ = sender.send(target_block);
 				WarpSyncParams::WaitForTarget(receiver)
 			},
diff --git a/client/rpc-spec-v2/src/chain_head/test_utils.rs b/client/rpc-spec-v2/src/chain_head/test_utils.rs
index ee563debb4502..837df4fd9ed7e 100644
--- a/client/rpc-spec-v2/src/chain_head/test_utils.rs
+++ b/client/rpc-spec-v2/src/chain_head/test_utils.rs
@@ -29,7 +29,7 @@ use sp_blockchain::{BlockStatus, CachedHeaderMetadata, HeaderBackend, HeaderMeta
 use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as BlockT, Header as HeaderT},
+	traits::{Block as BlockT, Header as HeaderT, HeaderProvider},
 	Justifications,
 };
 use std::sync::Arc;
@@ -164,7 +164,7 @@ impl<
 
 	fn storage_pairs(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		prefix: Option<&StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<PairsIter<BE::State, Block>> {
@@ -292,7 +292,7 @@ impl<Block: BlockT, Client: HeaderBackend<Block> + Send + Sync> HeaderBackend<Bl
 	fn header(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+	) -> sp_blockchain::Result<Option<<Block as HeaderProvider>::Header>> {
 		self.client.header(hash)
 	}
 
@@ -307,13 +307,15 @@ impl<Block: BlockT, Client: HeaderBackend<Block> + Send + Sync> HeaderBackend<Bl
 	fn number(
 		&self,
 		hash: Block::Hash,
-	) -> sc_client_api::blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
+	) -> sc_client_api::blockchain::Result<
+		Option<<<Block as HeaderProvider>::Header as HeaderT>::Number>,
+	> {
 		self.client.number(hash)
 	}
 
 	fn hash(
 		&self,
-		number: <<Block as BlockT>::Header as HeaderT>::Number,
+		number: <<Block as HeaderProvider>::Header as HeaderT>::Number,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		self.client.hash(number)
 	}
diff --git a/client/rpc-spec-v2/src/transaction/transaction.rs b/client/rpc-spec-v2/src/transaction/transaction.rs
index 44f4bd36c8b8b..dd09ee57fc691 100644
--- a/client/rpc-spec-v2/src/transaction/transaction.rs
+++ b/client/rpc-spec-v2/src/transaction/transaction.rs
@@ -46,7 +46,7 @@ use std::sync::Arc;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
-use sp_runtime::{generic, traits::Block as BlockT};
+use sp_runtime::generic;
 
 use codec::Decode;
 use futures::{FutureExt, StreamExt, TryFutureExt};
@@ -87,7 +87,7 @@ impl<Pool, Client> TransactionApiServer<BlockHash<Pool>> for Transaction<Pool, C
 where
 	Pool: TransactionPool + Sync + Send + 'static,
 	Pool::Hash: Unpin,
-	<Pool::Block as BlockT>::Hash: Unpin,
+	<Pool::Block as sp_runtime::traits::HeaderProvider>::Hash: Unpin,
 	Client: HeaderBackend<Pool::Block> + ProvideRuntimeApi<Pool::Block> + Send + Sync + 'static,
 {
 	fn submit_and_watch(&self, mut sink: SubscriptionSink, xt: Bytes) -> SubscriptionResult {
@@ -132,7 +132,9 @@ where
 				Err(err) => {
 					// We have not created an `Watcher` for the tx. Make sure the
 					// error is still propagated as an event.
-					let event: TransactionEvent<<Pool::Block as BlockT>::Hash> = err.into();
+					let event: TransactionEvent<
+						<Pool::Block as sp_runtime::traits::HeaderProvider>::Hash,
+					> = err.into();
 					sink.pipe_from_stream(futures::stream::once(async { event }).boxed()).await;
 				},
 			};
diff --git a/client/rpc/src/author/mod.rs b/client/rpc/src/author/mod.rs
index 00a126500e26d..d240c14b648a0 100644
--- a/client/rpc/src/author/mod.rs
+++ b/client/rpc/src/author/mod.rs
@@ -41,7 +41,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_keystore::KeystorePtr;
-use sp_runtime::{generic, traits::Block as BlockT};
+use sp_runtime::generic;
 use sp_session::SessionKeys;
 
 use self::error::{Error, Result};
@@ -89,7 +89,7 @@ where
 	Client: HeaderBackend<P::Block> + ProvideRuntimeApi<P::Block> + Send + Sync + 'static,
 	Client::Api: SessionKeys<P::Block>,
 	P::Hash: Unpin,
-	<P::Block as BlockT>::Hash: Unpin,
+	<P::Block as sp_runtime::traits::HeaderProvider>::Hash: Unpin,
 {
 	async fn submit_extrinsic(&self, ext: Bytes) -> RpcResult<TxHash<P>> {
 		let xt = match Decode::decode(&mut &ext[..]) {
diff --git a/client/rpc/src/dev/mod.rs b/client/rpc/src/dev/mod.rs
index 4d2e8618d553a..300e968a146bc 100644
--- a/client/rpc/src/dev/mod.rs
+++ b/client/rpc/src/dev/mod.rs
@@ -38,7 +38,7 @@ use std::{
 
 pub use sc_rpc_api::dev::{BlockStats, DevApiServer};
 
-type HasherOf<Block> = <<Block as BlockT>::Header as Header>::Hashing;
+type HasherOf<Block> = <<Block as sp_runtime::traits::HeaderProvider>::Header as Header>::Hashing;
 
 /// The Dev API. All methods are unsafe.
 pub struct Dev<Block: BlockT, Client> {
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index fe71e11945bb2..4aced889c14db 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -72,7 +72,7 @@ use sp_consensus::block_validation::{
 };
 use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_keystore::KeystorePtr;
-use sp_runtime::traits::{Block as BlockT, BlockIdTo, NumberFor, Zero};
+use sp_runtime::traits::{Block as BlockT, BlockIdTo, HeaderProvider, NumberFor, Zero};
 use std::{
 	str::FromStr,
 	sync::Arc,
@@ -360,8 +360,9 @@ pub struct SpawnTasksParams<'a, TBl: BlockT, TCl, TExPool, TRpc, Backend> {
 	/// A Sender for RPC requests.
 	pub system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
 	/// Controller for transactions handlers
-	pub tx_handler_controller:
-		sc_network_transactions::TransactionsHandlerController<<TBl as BlockT>::Hash>,
+	pub tx_handler_controller: sc_network_transactions::TransactionsHandlerController<
+		<TBl as sp_runtime::traits::HeaderProvider>::Hash,
+	>,
 	/// Syncing service.
 	pub sync_service: Arc<SyncingService<TBl>>,
 	/// Telemetry instance for this node.
@@ -428,7 +429,10 @@ where
 	TBl::Hash: Unpin,
 	TBl::Header: Unpin,
 	TBackend: 'static + sc_client_api::backend::Backend<TBl> + Send,
-	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash> + 'static,
+	TExPool: MaintainedTransactionPool<
+			Block = TBl,
+			Hash = <TBl as sp_runtime::traits::HeaderProvider>::Hash,
+		> + 'static,
 {
 	let SpawnTasksParams {
 		mut config,
@@ -552,12 +556,12 @@ where
 async fn transaction_notifications<Block, ExPool>(
 	transaction_pool: Arc<ExPool>,
 	tx_handler_controller: sc_network_transactions::TransactionsHandlerController<
-		<Block as BlockT>::Hash,
+		<Block as HeaderProvider>::Hash,
 	>,
 	telemetry: Option<TelemetryHandle>,
 ) where
 	Block: BlockT,
-	ExPool: MaintainedTransactionPool<Block = Block, Hash = <Block as BlockT>::Hash>,
+	ExPool: MaintainedTransactionPool<Block = Block, Hash = <Block as HeaderProvider>::Hash>,
 {
 	// transaction notifications
 	transaction_pool
@@ -642,7 +646,10 @@ where
 		+ 'static,
 	TBackend: sc_client_api::backend::Backend<TBl> + 'static,
 	<TCl as ProvideRuntimeApi<TBl>>::Api: sp_session::SessionKeys<TBl> + sp_api::Metadata<TBl>,
-	TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash> + 'static,
+	TExPool: MaintainedTransactionPool<
+			Block = TBl,
+			Hash = <TBl as sp_runtime::traits::HeaderProvider>::Hash,
+		> + 'static,
 	TBl::Hash: Unpin,
 	TBl::Header: Unpin,
 {
@@ -755,9 +762,11 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 	params: BuildNetworkParams<TBl, TExPool, TImpQu, TCl>,
 ) -> Result<
 	(
-		Arc<NetworkService<TBl, <TBl as BlockT>::Hash>>,
+		Arc<NetworkService<TBl, <TBl as sp_runtime::traits::HeaderProvider>::Hash>>,
 		TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
-		sc_network_transactions::TransactionsHandlerController<<TBl as BlockT>::Hash>,
+		sc_network_transactions::TransactionsHandlerController<
+			<TBl as sp_runtime::traits::HeaderProvider>::Hash,
+		>,
 		NetworkStarter,
 		Arc<SyncingService<TBl>>,
 	),
@@ -774,7 +783,8 @@ where
 		+ HeaderBackend<TBl>
 		+ BlockchainEvents<TBl>
 		+ 'static,
-	TExPool: TransactionPool<Block = TBl, Hash = <TBl as BlockT>::Hash> + 'static,
+	TExPool: TransactionPool<Block = TBl, Hash = <TBl as sp_runtime::traits::HeaderProvider>::Hash>
+		+ 'static,
 	TImpQu: ImportQueue<TBl> + 'static,
 {
 	let BuildNetworkParams {
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index 3b1a526154d74..d843106fa8d34 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -69,7 +69,7 @@ use sp_keystore::KeystorePtr;
 use sp_runtime::{
 	generic::{BlockId, SignedBlock},
 	traits::{
-		Block as BlockT, BlockIdTo, HashFor, Header as HeaderT, NumberFor, One,
+		Block as BlockT, BlockIdTo, HashFor, Header as HeaderT, HeaderProvider, NumberFor, One,
 		SaturatedConversion, Zero,
 	},
 	Digest, Justification, Justifications, StateVersion,
@@ -1165,7 +1165,7 @@ where
 	pub fn header(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+	) -> sp_blockchain::Result<Option<<Block as HeaderProvider>::Header>> {
 		self.backend.blockchain().header(hash)
 	}
 
@@ -1488,7 +1488,7 @@ where
 {
 	fn storage_keys(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		prefix: Option<&StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<KeysIter<B::State, Block>> {
@@ -1499,7 +1499,7 @@ where
 
 	fn child_storage_keys(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		child_info: ChildInfo,
 		prefix: Option<&StorageKey>,
 		start_key: Option<&StorageKey>,
@@ -1511,7 +1511,7 @@ where
 
 	fn storage_pairs(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		prefix: Option<&StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<PairsIter<B::State, Block>> {
@@ -1534,7 +1534,7 @@ where
 
 	fn storage_hash(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		self.state_at(hash)?
@@ -1544,7 +1544,7 @@ where
 
 	fn child_storage(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		child_info: &ChildInfo,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<StorageData>> {
@@ -1557,7 +1557,7 @@ where
 
 	fn child_storage_hash(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		child_info: &ChildInfo,
 		key: &StorageKey,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
@@ -1631,7 +1631,7 @@ where
 	fn number(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
+	) -> sp_blockchain::Result<Option<<<Block as HeaderProvider>::Header as HeaderT>::Number>> {
 		self.backend.blockchain().number(hash)
 	}
 
@@ -1683,7 +1683,7 @@ where
 	fn number(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
+	) -> sp_blockchain::Result<Option<<<Block as HeaderProvider>::Header as HeaderT>::Number>> {
 		(**self).number(hash)
 	}
 
diff --git a/client/service/src/client/wasm_substitutes.rs b/client/service/src/client/wasm_substitutes.rs
index a792ab87e771b..088ec0bc60766 100644
--- a/client/service/src/client/wasm_substitutes.rs
+++ b/client/service/src/client/wasm_substitutes.rs
@@ -22,7 +22,7 @@ use sc_client_api::backend;
 use sc_executor::RuntimeVersionOf;
 use sp_blockchain::{HeaderBackend, Result};
 use sp_core::traits::{FetchRuntimeCode, RuntimeCode, WrappedRuntimeCode};
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_runtime::traits::{Block as BlockT, HeaderProvider, NumberFor};
 use sp_state_machine::BasicExternalities;
 use sp_version::RuntimeVersion;
 use std::{
@@ -54,7 +54,7 @@ impl<Block: BlockT> WasmSubstitute<Block> {
 	/// Returns `true` when the substitute matches for the given `hash`.
 	fn matches(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		backend: &impl backend::Backend<Block>,
 	) -> bool {
 		let requested_block_number = backend.blockchain().number(hash).ok().flatten();
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index ece5758be7718..b54ec17e2f16c 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -28,7 +28,9 @@ use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::{MaintainedTransactionPool, PoolStatus};
 use sc_utils::metrics::register_globals;
 use sp_api::ProvideRuntimeApi;
-use sp_runtime::traits::{Block, NumberFor, SaturatedConversion, UniqueSaturatedInto};
+use sp_runtime::traits::{
+	Block, HeaderProvider, NumberFor, SaturatedConversion, UniqueSaturatedInto,
+};
 use std::{
 	sync::Arc,
 	time::{Duration, Instant},
@@ -184,7 +186,7 @@ impl MetricsService {
 	) where
 		TBl: Block,
 		TCl: ProvideRuntimeApi<TBl> + UsageProvider<TBl>,
-		TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as Block>::Hash>,
+		TExPool: MaintainedTransactionPool<Block = TBl, Hash = <TBl as HeaderProvider>::Hash>,
 		TNet: NetworkStatusProvider,
 		TSync: SyncStatusProvider<TBl>,
 	{
diff --git a/client/service/test/src/lib.rs b/client/service/test/src/lib.rs
index 11c672db8cb90..96b8aba1618f5 100644
--- a/client/service/test/src/lib.rs
+++ b/client/service/test/src/lib.rs
@@ -76,7 +76,12 @@ pub trait TestNetNode: Clone + Future<Output = Result<(), Error>> + Send + 'stat
 	fn transaction_pool(&self) -> Arc<Self::TransactionPool>;
 	fn network(
 		&self,
-	) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>>;
+	) -> Arc<
+		sc_network::NetworkService<
+			Self::Block,
+			<Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		>,
+	>;
 	fn sync(&self) -> &Arc<SyncingService<Self::Block>>;
 	fn spawn_handle(&self) -> SpawnTaskHandle;
 }
@@ -85,7 +90,8 @@ pub struct TestNetComponents<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> {
 	task_manager: Arc<Mutex<TaskManager>>,
 	client: Arc<Client<TBackend, TExec, TBl, TRtApi>>,
 	transaction_pool: Arc<TExPool>,
-	network: Arc<sc_network::NetworkService<TBl, <TBl as BlockT>::Hash>>,
+	network:
+		Arc<sc_network::NetworkService<TBl, <TBl as sp_runtime::traits::HeaderProvider>::Hash>>,
 	sync: Arc<SyncingService<TBl>>,
 }
 
@@ -95,7 +101,9 @@ impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool>
 	pub fn new(
 		task_manager: TaskManager,
 		client: Arc<Client<TBackend, TExec, TBl, TRtApi>>,
-		network: Arc<sc_network::NetworkService<TBl, <TBl as BlockT>::Hash>>,
+		network: Arc<
+			sc_network::NetworkService<TBl, <TBl as sp_runtime::traits::HeaderProvider>::Hash>,
+		>,
 		sync: Arc<SyncingService<TBl>>,
 		transaction_pool: Arc<TExPool>,
 	) -> Self {
@@ -156,7 +164,12 @@ where
 	}
 	fn network(
 		&self,
-	) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>> {
+	) -> Arc<
+		sc_network::NetworkService<
+			Self::Block,
+			<Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		>,
+	> {
 		self.network.clone()
 	}
 	fn sync(&self) -> &Arc<SyncingService<Self::Block>> {
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index dda8a7edfa9bb..aad3e553d7682 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -52,10 +52,12 @@ use jsonrpsee::{
 use sc_client_api::StorageData;
 use sc_consensus_babe::{BabeWorkerHandle, Error as BabeError};
 use sp_blockchain::HeaderBackend;
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_runtime::traits::{Block as BlockT, HeaderProvider, NumberFor};
 
-type SharedAuthoritySet<TBl> =
-	sc_consensus_grandpa::SharedAuthoritySet<<TBl as BlockT>::Hash, NumberFor<TBl>>;
+type SharedAuthoritySet<TBl> = sc_consensus_grandpa::SharedAuthoritySet<
+	<TBl as sp_runtime::traits::HeaderProvider>::Hash,
+	NumberFor<TBl>,
+>;
 
 /// Error type used by this crate.
 #[derive(Debug, thiserror::Error)]
@@ -112,7 +114,7 @@ pub type LightSyncStateExtension = Option<serde_json::Value>;
 pub struct LightSyncState<Block: BlockT> {
 	/// The header of the best finalized block.
 	#[serde(serialize_with = "serialize_encoded")]
-	pub finalized_block_header: <Block as BlockT>::Header,
+	pub finalized_block_header: <Block as sp_runtime::traits::HeaderProvider>::Header,
 	/// The epoch changes tree for babe.
 	#[serde(serialize_with = "serialize_encoded")]
 	pub babe_epoch_changes: sc_consensus_epochs::EpochChangesFor<Block, sc_consensus_babe::Epoch>,
@@ -121,7 +123,7 @@ pub struct LightSyncState<Block: BlockT> {
 	/// The authority set for grandpa.
 	#[serde(serialize_with = "serialize_encoded")]
 	pub grandpa_authority_set:
-		sc_consensus_grandpa::AuthoritySet<<Block as BlockT>::Hash, NumberFor<Block>>,
+		sc_consensus_grandpa::AuthoritySet<<Block as HeaderProvider>::Hash, NumberFor<Block>>,
 }
 
 /// An api for sync state RPC calls.
diff --git a/client/transaction-pool/api/src/lib.rs b/client/transaction-pool/api/src/lib.rs
index e7b3a9c5e16f8..7cfb595888ed5 100644
--- a/client/transaction-pool/api/src/lib.rs
+++ b/client/transaction-pool/api/src/lib.rs
@@ -148,7 +148,7 @@ pub type ImportNotificationStream<H> = futures::channel::mpsc::Receiver<H>;
 /// Transaction hash type for a pool.
 pub type TxHash<P> = <P as TransactionPool>::Hash;
 /// Block hash type for a pool.
-pub type BlockHash<P> = <<P as TransactionPool>::Block as BlockT>::Hash;
+pub type BlockHash<P> = <<P as TransactionPool>::Block as sp_runtime::traits::HeaderProvider>::Hash;
 /// Transaction type for a pool.
 pub type TransactionFor<P> = <<P as TransactionPool>::Block as BlockT>::Extrinsic;
 /// Type of transactions event stream for a pool.
@@ -349,7 +349,7 @@ pub trait LocalTransactionPool: Send + Sync {
 	/// `TransactionSource::Local`.
 	fn submit_local(
 		&self,
-		at: <Self::Block as BlockT>::Hash,
+		at: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
 		xt: LocalTransactionFor<Self>,
 	) -> Result<Self::Hash, Self::Error>;
 }
@@ -369,7 +369,7 @@ trait OffchainSubmitTransaction<Block: BlockT>: Send + Sync {
 impl<TPool: LocalTransactionPool> OffchainSubmitTransaction<TPool::Block> for TPool {
 	fn submit_at(
 		&self,
-		at: <TPool::Block as BlockT>::Hash,
+		at: <TPool::Block as sp_runtime::traits::HeaderProvider>::Hash,
 		extrinsic: <TPool::Block as BlockT>::Extrinsic,
 	) -> Result<(), ()> {
 		log::debug!(
diff --git a/client/transaction-pool/benches/basics.rs b/client/transaction-pool/benches/basics.rs
index d114acc343d50..31163226d6221 100644
--- a/client/transaction-pool/benches/basics.rs
+++ b/client/transaction-pool/benches/basics.rs
@@ -101,7 +101,7 @@ impl ChainApi for TestApi {
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<<Self::Block as BlockT>::Hash>, Self::Error> {
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Hash>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(H256::from_low_u64_be(*num)).into(),
 			BlockId::Hash(_) => None,
@@ -113,21 +113,24 @@ impl ChainApi for TestApi {
 		(blake2_256(&encoded).into(), encoded.len())
 	}
 
-	fn block_body(&self, _id: <Self::Block as BlockT>::Hash) -> Self::BodyFuture {
+	fn block_body(
+		&self,
+		_id: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Self::BodyFuture {
 		ready(Ok(None))
 	}
 
 	fn block_header(
 		&self,
-		_: <Self::Block as BlockT>::Hash,
-	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		_: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Header>, Self::Error> {
 		Ok(None)
 	}
 
 	fn tree_route(
 		&self,
-		_from: <Self::Block as BlockT>::Hash,
-		_to: <Self::Block as BlockT>::Hash,
+		_from: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		_to: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
 	) -> Result<sp_blockchain::TreeRoute<Self::Block>, Self::Error> {
 		unimplemented!()
 	}
diff --git a/client/transaction-pool/src/api.rs b/client/transaction-pool/src/api.rs
index f9d79ee429e6c..75734403550dd 100644
--- a/client/transaction-pool/src/api.rs
+++ b/client/transaction-pool/src/api.rs
@@ -191,15 +191,15 @@ where
 
 	fn block_header(
 		&self,
-		hash: <Self::Block as BlockT>::Hash,
-	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		hash: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Header>, Self::Error> {
 		self.client.header(hash).map_err(Into::into)
 	}
 
 	fn tree_route(
 		&self,
-		from: <Self::Block as BlockT>::Hash,
-		to: <Self::Block as BlockT>::Hash,
+		from: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		to: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
 	) -> Result<TreeRoute<Self::Block>, Self::Error> {
 		sp_blockchain::tree_route::<Block, Client>(&*self.client, from, to).map_err(Into::into)
 	}
diff --git a/client/transaction-pool/src/graph/pool.rs b/client/transaction-pool/src/graph/pool.rs
index 4d34737a7ba70..01a6476ba378b 100644
--- a/client/transaction-pool/src/graph/pool.rs
+++ b/client/transaction-pool/src/graph/pool.rs
@@ -41,9 +41,9 @@ use super::{
 pub type EventStream<H> = Receiver<H>;
 
 /// Block hash type for a pool.
-pub type BlockHash<A> = <<A as ChainApi>::Block as traits::Block>::Hash;
+pub type BlockHash<A> = <<A as ChainApi>::Block as traits::HeaderProvider>::Hash;
 /// Extrinsic hash type for a pool.
-pub type ExtrinsicHash<A> = <<A as ChainApi>::Block as traits::Block>::Hash;
+pub type ExtrinsicHash<A> = <<A as ChainApi>::Block as traits::HeaderProvider>::Hash;
 /// Extrinsic type for a pool.
 pub type ExtrinsicFor<A> = <<A as ChainApi>::Block as traits::Block>::Extrinsic;
 /// Block number type for the ChainApi
@@ -86,25 +86,28 @@ pub trait ChainApi: Send + Sync {
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<<Self::Block as BlockT>::Hash>, Self::Error>;
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Hash>, Self::Error>;
 
 	/// Returns hash and encoding length of the extrinsic.
 	fn hash_and_length(&self, uxt: &ExtrinsicFor<Self>) -> (ExtrinsicHash<Self>, usize);
 
 	/// Returns a block body given the block.
-	fn block_body(&self, at: <Self::Block as BlockT>::Hash) -> Self::BodyFuture;
+	fn block_body(
+		&self,
+		at: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Self::BodyFuture;
 
 	/// Returns a block header given the block id.
 	fn block_header(
 		&self,
-		at: <Self::Block as BlockT>::Hash,
-	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error>;
+		at: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Header>, Self::Error>;
 
 	/// Compute a tree-route between two blocks. See [`TreeRoute`] for more details.
 	fn tree_route(
 		&self,
-		from: <Self::Block as BlockT>::Hash,
-		to: <Self::Block as BlockT>::Hash,
+		from: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		to: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
 	) -> Result<TreeRoute<Self::Block>, Self::Error>;
 }
 
diff --git a/client/transaction-pool/src/tests.rs b/client/transaction-pool/src/tests.rs
index 62911d5cbb471..b8585677c4237 100644
--- a/client/transaction-pool/src/tests.rs
+++ b/client/transaction-pool/src/tests.rs
@@ -25,7 +25,7 @@ use sc_transaction_pool_api::error;
 use sp_blockchain::TreeRoute;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, Hash},
+	traits::Hash,
 	transaction_validity::{
 		InvalidTransaction, TransactionSource, TransactionValidity, ValidTransaction,
 	},
@@ -161,7 +161,7 @@ impl ChainApi for TestApi {
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<<Self::Block as BlockT>::Hash>, Self::Error> {
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Hash>, Self::Error> {
 		Ok(match at {
 			BlockId::Number(num) => Some(H256::from_low_u64_be(*num)).into(),
 			BlockId::Hash(_) => None,
@@ -175,21 +175,24 @@ impl ChainApi for TestApi {
 		(Hashing::hash(&encoded), len)
 	}
 
-	fn block_body(&self, _id: <Self::Block as BlockT>::Hash) -> Self::BodyFuture {
+	fn block_body(
+		&self,
+		_id: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Self::BodyFuture {
 		futures::future::ready(Ok(None))
 	}
 
 	fn block_header(
 		&self,
-		_: <Self::Block as BlockT>::Hash,
-	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		_: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Header>, Self::Error> {
 		Ok(None)
 	}
 
 	fn tree_route(
 		&self,
-		_from: <Self::Block as BlockT>::Hash,
-		_to: <Self::Block as BlockT>::Hash,
+		_from: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		_to: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
 	) -> Result<TreeRoute<Self::Block>, Self::Error> {
 		unimplemented!()
 	}
diff --git a/docs/README.adoc b/docs/README.adoc
index 8e43757d10fb2..525feb132ddc0 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -67,7 +67,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block)
 		}
 
-		fn initialize_block(header: <Block as BlockT>::Header) {
+		fn initialize_block(header: <Block as sp_runtime::traits::HeaderProvider>::Header) {
 			Executive::initialize_block(&header)
 		}
 	}
diff --git a/docs/Upgrading-2.0-to-3.0.md b/docs/Upgrading-2.0-to-3.0.md
index 906018db9a707..3ae6afd520940 100644
--- a/docs/Upgrading-2.0-to-3.0.md
+++ b/docs/Upgrading-2.0-to-3.0.md
@@ -811,7 +811,7 @@ Altogether this accumulates to the following diff for `node/cli/src/service.rs`.
 -	TaskManager, RpcHandlers, Arc<LightClient>,
 +pub fn new_light_base(mut config: Configuration) -> Result<(
 +	TaskManager, RpcHandlers, Option<TelemetryConnectionNotifier>, Arc<LightClient>,
- 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+ 	Arc<NetworkService<Block, <Block as HeaderProvider>::Hash>>,
  	Arc<sc_transaction_pool::LightPool<Block, LightClient, sc_network::config::OnDemand<Block>>>
  ), ServiceError> {
 -	let (client, backend, keystore, mut task_manager, on_demand) =
diff --git a/frame/alliance/src/benchmarking.rs b/frame/alliance/src/benchmarking.rs
index 92bf1ae4468df..3d715363ec063 100644
--- a/frame/alliance/src/benchmarking.rs
+++ b/frame/alliance/src/benchmarking.rs
@@ -432,7 +432,7 @@ benchmarks_instance_pallet! {
 			false,
 		)?;
 
-		System::<T>::set_block_number(T::BlockNumber::max_value());
+		System::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 
 	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
 	verify {
@@ -504,7 +504,7 @@ benchmarks_instance_pallet! {
 		}
 
 		// caller is prime, prime already votes aye by creating the proposal
-		System::<T>::set_block_number(T::BlockNumber::max_value());
+		System::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 
 	}: close(SystemOrigin::Signed(voter), last_hash.clone(), index, Weight::MAX, bytes_in_storage)
 	verify {
diff --git a/frame/alliance/src/lib.rs b/frame/alliance/src/lib.rs
index 6c034454cf7c0..e55ccdee7c924 100644
--- a/frame/alliance/src/lib.rs
+++ b/frame/alliance/src/lib.rs
@@ -309,7 +309,7 @@ pub mod pallet {
 
 		/// The number of blocks a member must wait between giving a retirement notice and retiring.
 		/// Supposed to be greater than time required to `kick_member`.
-		type RetirementPeriod: Get<Self::BlockNumber>;
+		type RetirementPeriod: Get<frame_system::BlockNumberOf<Self>>;
 	}
 
 	#[pallet::error]
@@ -476,7 +476,7 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::getter(fn retiring_members)]
 	pub type RetiringMembers<T: Config<I>, I: 'static = ()> =
-		StorageMap<_, Blake2_128Concat, T::AccountId, T::BlockNumber, OptionQuery>;
+		StorageMap<_, Blake2_128Concat, T::AccountId, frame_system::BlockNumberOf<T>, OptionQuery>;
 
 	/// The current list of accounts deemed unscrupulous. These accounts non grata cannot submit
 	/// candidacy.
diff --git a/frame/alliance/src/mock.rs b/frame/alliance/src/mock.rs
index e1da028f44576..58a31fdef5562 100644
--- a/frame/alliance/src/mock.rs
+++ b/frame/alliance/src/mock.rs
@@ -20,7 +20,6 @@
 pub use sp_core::H256;
 use sp_runtime::traits::Hash;
 pub use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
@@ -53,12 +52,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = BlockNumber;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = ();
@@ -238,14 +236,10 @@ impl Config for Test {
 	type RetirementPeriod = RetirementPeriod;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances,
diff --git a/frame/asset-conversion/src/mock.rs b/frame/asset-conversion/src/mock.rs
index 34d2eeb273ca8..9b372c8875cc0 100644
--- a/frame/asset-conversion/src/mock.rs
+++ b/frame/asset-conversion/src/mock.rs
@@ -30,19 +30,12 @@ use frame_support::{
 use frame_system::{EnsureSigned, EnsureSignedBy};
 use sp_arithmetic::Permill;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{AccountIdConversion, BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{AccountIdConversion, BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances,
@@ -59,12 +52,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/asset-rate/src/mock.rs b/frame/asset-rate/src/mock.rs
index 2d90fcfecd79e..6c0a3a4be29e7 100644
--- a/frame/asset-rate/src/mock.rs
+++ b/frame/asset-rate/src/mock.rs
@@ -20,19 +20,12 @@
 use crate as pallet_asset_rate;
 use frame_support::traits::{ConstU16, ConstU64};
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		AssetRate: pallet_asset_rate,
@@ -48,12 +41,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/assets/src/mock.rs b/frame/assets/src/mock.rs
index 09d2bd2296088..4db698096503c 100644
--- a/frame/assets/src/mock.rs
+++ b/frame/assets/src/mock.rs
@@ -27,19 +27,12 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_io::storage;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -57,12 +50,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs
index 2d93887b82596..61ba4cf1456e5 100644
--- a/frame/atomic-swap/src/lib.rs
+++ b/frame/atomic-swap/src/lib.rs
@@ -69,7 +69,7 @@ pub struct PendingSwap<T: Config> {
 	/// Action of this swap.
 	pub action: T::SwapAction,
 	/// End block of the lock.
-	pub end_block: T::BlockNumber,
+	pub end_block: frame_system::BlockNumberOf<T>,
 }
 
 /// Hashed proof type.
@@ -249,7 +249,7 @@ pub mod pallet {
 			target: T::AccountId,
 			hashed_proof: HashedProof,
 			action: T::SwapAction,
-			duration: T::BlockNumber,
+			duration: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			let source = ensure_signed(origin)?;
 			ensure!(
diff --git a/frame/atomic-swap/src/tests.rs b/frame/atomic-swap/src/tests.rs
index 53ccd64bb2731..42b9e8073b072 100644
--- a/frame/atomic-swap/src/tests.rs
+++ b/frame/atomic-swap/src/tests.rs
@@ -5,19 +5,12 @@ use crate as pallet_atomic_swap;
 
 use frame_support::traits::{ConstU32, ConstU64};
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -32,13 +25,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/aura/src/lib.rs b/frame/aura/src/lib.rs
index 3cd0e9ec2e6cc..60acd60cf5241 100644
--- a/frame/aura/src/lib.rs
+++ b/frame/aura/src/lib.rs
@@ -102,7 +102,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(_: T::BlockNumber) -> Weight {
+		fn on_initialize(_: frame_system::BlockNumberOf<T>) -> Weight {
 			if let Some(new_slot) = Self::current_slot_from_digests() {
 				let current_slot = CurrentSlot::<T>::get();
 
diff --git a/frame/aura/src/mock.rs b/frame/aura/src/mock.rs
index c95b7451d0bd4..31c416b27165d 100644
--- a/frame/aura/src/mock.rs
+++ b/frame/aura/src/mock.rs
@@ -26,19 +26,12 @@ use frame_support::{
 };
 use sp_consensus_aura::{ed25519::AuthorityId, AuthorityIndex};
 use sp_core::H256;
-use sp_runtime::{
-	testing::{Header, UintAuthorityId},
-	traits::IdentityLookup,
-};
+use sp_runtime::{testing::UintAuthorityId, traits::IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
@@ -53,13 +46,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs
index 6365c95359472..c6b7656311fdd 100644
--- a/frame/authority-discovery/src/lib.rs
+++ b/frame/authority-discovery/src/lib.rs
@@ -175,19 +175,15 @@ mod tests {
 	use sp_core::{crypto::key_types, H256};
 	use sp_io::TestExternalities;
 	use sp_runtime::{
-		testing::{Header, UintAuthorityId},
+		testing::UintAuthorityId,
 		traits::{ConvertInto, IdentityLookup, OpaqueKeys},
 		KeyTypeId, Perbill,
 	};
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
@@ -234,13 +230,12 @@ mod tests {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
-		type BlockNumber = BlockNumber;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;
 		type AccountId = AuthorityId;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = ();
diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs
index 4bb8ba587ac8b..66a0917acac17 100644
--- a/frame/authorship/src/lib.rs
+++ b/frame/authorship/src/lib.rs
@@ -45,7 +45,7 @@ pub mod pallet {
 		/// Find the author of a block.
 		type FindAuthor: FindAuthor<Self::AccountId>;
 		/// An event handler for authored blocks.
-		type EventHandler: EventHandler<Self::AccountId, Self::BlockNumber>;
+		type EventHandler: EventHandler<Self::AccountId, frame_system::BlockNumberOf<Self>>;
 	}
 
 	#[pallet::pallet]
@@ -53,7 +53,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(_: T::BlockNumber) -> Weight {
+		fn on_initialize(_: frame_system::BlockNumberOf<T>) -> Weight {
 			if let Some(author) = Self::author() {
 				T::EventHandler::note_author(author);
 			}
@@ -61,7 +61,7 @@ pub mod pallet {
 			Weight::zero()
 		}
 
-		fn on_finalize(_: T::BlockNumber) {
+		fn on_finalize(_: frame_system::BlockNumberOf<T>) {
 			// ensure we never go to trie with these values.
 			<Author<T>>::kill();
 		}
@@ -108,14 +108,10 @@ mod tests {
 		traits::{BlakeTwo256, Header as HeaderT, IdentityLookup},
 	};
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Authorship: pallet_authorship::{Pallet, Storage},
@@ -129,13 +125,12 @@ mod tests {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
-		type BlockNumber = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = ();
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
index 3a14cacc905d2..83aea435bbca4 100644
--- a/frame/babe/src/equivocation.rs
+++ b/frame/babe/src/equivocation.rs
@@ -106,8 +106,10 @@ impl<Offender: Clone> Offence<Offender> for EquivocationOffence<Offender> {
 pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T, R, P, L)>);
 
 impl<T, R, P, L>
-	OffenceReportSystem<Option<T::AccountId>, (EquivocationProof<T::Header>, T::KeyOwnerProof)>
-	for EquivocationReportSystem<T, R, P, L>
+	OffenceReportSystem<
+		Option<T::AccountId>,
+		(EquivocationProof<frame_system::HeaderOf<T>>, T::KeyOwnerProof),
+	> for EquivocationReportSystem<T, R, P, L>
 where
 	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
 	R: ReportOffence<
@@ -122,7 +124,7 @@ where
 	type Longevity = L;
 
 	fn publish_evidence(
-		evidence: (EquivocationProof<T::Header>, T::KeyOwnerProof),
+		evidence: (EquivocationProof<frame_system::HeaderOf<T>>, T::KeyOwnerProof),
 	) -> Result<(), ()> {
 		use frame_system::offchain::SubmitTransaction;
 		let (equivocation_proof, key_owner_proof) = evidence;
@@ -140,7 +142,7 @@ where
 	}
 
 	fn check_evidence(
-		evidence: (EquivocationProof<T::Header>, T::KeyOwnerProof),
+		evidence: (EquivocationProof<frame_system::HeaderOf<T>>, T::KeyOwnerProof),
 	) -> Result<(), TransactionValidityError> {
 		let (equivocation_proof, key_owner_proof) = evidence;
 
@@ -159,7 +161,7 @@ where
 
 	fn process_evidence(
 		reporter: Option<T::AccountId>,
-		evidence: (EquivocationProof<T::Header>, T::KeyOwnerProof),
+		evidence: (EquivocationProof<frame_system::HeaderOf<T>>, T::KeyOwnerProof),
 	) -> Result<(), DispatchError> {
 		let (equivocation_proof, key_owner_proof) = evidence;
 		let reporter = reporter.or_else(|| <pallet_authorship::Pallet<T>>::author());
diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
index 8001450b43583..731683613c693 100644
--- a/frame/babe/src/lib.rs
+++ b/frame/babe/src/lib.rs
@@ -78,7 +78,7 @@ pub trait WeightInfo {
 pub trait EpochChangeTrigger {
 	/// Trigger an epoch change, if any should take place. This should be called
 	/// during every block, after initialization is done.
-	fn trigger<T: Config>(now: T::BlockNumber);
+	fn trigger<T: Config>(now: frame_system::BlockNumberOf<T>);
 }
 
 /// A type signifying to BABE that an external trigger
@@ -86,7 +86,7 @@ pub trait EpochChangeTrigger {
 pub struct ExternalTrigger;
 
 impl EpochChangeTrigger for ExternalTrigger {
-	fn trigger<T: Config>(_: T::BlockNumber) {} // nothing - trigger is external.
+	fn trigger<T: Config>(_: frame_system::BlockNumberOf<T>) {} // nothing - trigger is external.
 }
 
 /// A type signifying to BABE that it should perform epoch changes
@@ -94,7 +94,7 @@ impl EpochChangeTrigger for ExternalTrigger {
 pub struct SameAuthoritiesForever;
 
 impl EpochChangeTrigger for SameAuthoritiesForever {
-	fn trigger<T: Config>(now: T::BlockNumber) {
+	fn trigger<T: Config>(now: frame_system::BlockNumberOf<T>) {
 		if <Pallet<T>>::should_epoch_change(now) {
 			let authorities = <Pallet<T>>::authorities();
 			let next_authorities = authorities.clone();
@@ -162,7 +162,7 @@ pub mod pallet {
 		/// (from an offchain context).
 		type EquivocationReportSystem: OffenceReportSystem<
 			Option<Self::AccountId>,
-			(EquivocationProof<Self::Header>, Self::KeyOwnerProof),
+			(EquivocationProof<frame_system::HeaderOf<Self>>, Self::KeyOwnerProof),
 		>;
 	}
 
@@ -278,8 +278,11 @@ pub mod pallet {
 	/// entropy was fixed (i.e. it was known to chain observers). Since epochs are defined in
 	/// slots, which may be skipped, the block numbers may not line up with the slot numbers.
 	#[pallet::storage]
-	pub(super) type EpochStart<T: Config> =
-		StorageValue<_, (T::BlockNumber, T::BlockNumber), ValueQuery>;
+	pub(super) type EpochStart<T: Config> = StorageValue<
+		_,
+		(frame_system::BlockNumberOf<T>, frame_system::BlockNumberOf<T>),
+		ValueQuery,
+	>;
 
 	/// How late the current block is compared to its parent.
 	///
@@ -288,7 +291,8 @@ pub mod pallet {
 	/// execution context should always yield zero.
 	#[pallet::storage]
 	#[pallet::getter(fn lateness)]
-	pub(super) type Lateness<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub(super) type Lateness<T: Config> =
+		StorageValue<_, frame_system::BlockNumberOf<T>, ValueQuery>;
 
 	/// The configuration for the current epoch. Should never be `None` as it is initialized in
 	/// genesis.
@@ -407,7 +411,7 @@ pub mod pallet {
 		))]
 		pub fn report_equivocation(
 			origin: OriginFor<T>,
-			equivocation_proof: Box<EquivocationProof<T::Header>>,
+			equivocation_proof: Box<EquivocationProof<frame_system::HeaderOf<T>>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			let reporter = ensure_signed(origin)?;
@@ -433,7 +437,7 @@ pub mod pallet {
 		))]
 		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
-			equivocation_proof: Box<EquivocationProof<T::Header>>,
+			equivocation_proof: Box<EquivocationProof<frame_system::HeaderOf<T>>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
@@ -503,8 +507,8 @@ impl<T: Config> IsMember<AuthorityId> for Pallet<T> {
 	}
 }
 
-impl<T: Config> pallet_session::ShouldEndSession<T::BlockNumber> for Pallet<T> {
-	fn should_end_session(now: T::BlockNumber) -> bool {
+impl<T: Config> pallet_session::ShouldEndSession<frame_system::BlockNumberOf<T>> for Pallet<T> {
+	fn should_end_session(now: frame_system::BlockNumberOf<T>) -> bool {
 		// it might be (and it is in current implementation) that session module is calling
 		// `should_end_session` from it's own `on_initialize` handler, in which case it's
 		// possible that babe's own `on_initialize` has not run yet, so let's ensure that we
@@ -524,7 +528,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Determine whether an epoch change should take place at this block.
 	/// Assumes that initialization has already taken place.
-	pub fn should_epoch_change(now: T::BlockNumber) -> bool {
+	pub fn should_epoch_change(now: frame_system::BlockNumberOf<T>) -> bool {
 		// The epoch has technically ended during the passage of time
 		// between this block and the last, but we have to "end" the epoch now,
 		// since there is no earlier possible block we could have done it.
@@ -554,11 +558,13 @@ impl<T: Config> Pallet<T> {
 	//
 	// WEIGHT NOTE: This function is tied to the weight of `EstimateNextSessionRotation`. If you
 	// update this function, you must also update the corresponding weight.
-	pub fn next_expected_epoch_change(now: T::BlockNumber) -> Option<T::BlockNumber> {
+	pub fn next_expected_epoch_change(
+		now: frame_system::BlockNumberOf<T>,
+	) -> Option<frame_system::BlockNumberOf<T>> {
 		let next_slot = Self::current_epoch_start().saturating_add(T::EpochDuration::get());
 		next_slot.checked_sub(*CurrentSlot::<T>::get()).map(|slots_remaining| {
 			// This is a best effort guess. Drifts in the slot/block ratio will cause errors here.
-			let blocks_remaining: T::BlockNumber = slots_remaining.saturated_into();
+			let blocks_remaining: frame_system::BlockNumberOf<T> = slots_remaining.saturated_into();
 			now.saturating_add(blocks_remaining)
 		})
 	}
@@ -776,7 +782,7 @@ impl<T: Config> Pallet<T> {
 		Self::deposit_consensus(ConsensusLog::NextEpochData(next));
 	}
 
-	fn initialize(now: T::BlockNumber) {
+	fn initialize(now: frame_system::BlockNumberOf<T>) {
 		// since `initialize` can be called twice (e.g. if session module is present)
 		// let's ensure that we only do the initialization once per block
 		let initialized = Self::initialized().is_some();
@@ -811,7 +817,7 @@ impl<T: Config> Pallet<T> {
 
 			// how many slots were skipped between current and last block
 			let lateness = current_slot.saturating_sub(CurrentSlot::<T>::get() + 1);
-			let lateness = T::BlockNumber::from(*lateness as u32);
+			let lateness = frame_system::BlockNumberOf::<T>::from(*lateness as u32);
 
 			Lateness::<T>::put(lateness);
 			CurrentSlot::<T>::put(current_slot);
@@ -877,7 +883,7 @@ impl<T: Config> Pallet<T> {
 	/// will push the transaction to the pool. Only useful in an offchain
 	/// context.
 	pub fn submit_unsigned_equivocation_report(
-		equivocation_proof: EquivocationProof<T::Header>,
+		equivocation_proof: EquivocationProof<frame_system::HeaderOf<T>>,
 		key_owner_proof: T::KeyOwnerProof,
 	) -> Option<()> {
 		T::EquivocationReportSystem::publish_evidence((equivocation_proof, key_owner_proof)).ok()
@@ -899,12 +905,16 @@ impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 	}
 }
 
-impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumber> for Pallet<T> {
-	fn average_session_length() -> T::BlockNumber {
+impl<T: Config> frame_support::traits::EstimateNextSessionRotation<frame_system::BlockNumberOf<T>>
+	for Pallet<T>
+{
+	fn average_session_length() -> frame_system::BlockNumberOf<T> {
 		T::EpochDuration::get().saturated_into()
 	}
 
-	fn estimate_current_session_progress(_now: T::BlockNumber) -> (Option<Permill>, Weight) {
+	fn estimate_current_session_progress(
+		_now: frame_system::BlockNumberOf<T>,
+	) -> (Option<Permill>, Weight) {
 		let elapsed = CurrentSlot::<T>::get().saturating_sub(Self::current_epoch_start()) + 1;
 
 		(
@@ -914,7 +924,9 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 		)
 	}
 
-	fn estimate_next_session_rotation(now: T::BlockNumber) -> (Option<T::BlockNumber>, Weight) {
+	fn estimate_next_session_rotation(
+		now: frame_system::BlockNumberOf<T>,
+	) -> (Option<frame_system::BlockNumberOf<T>>, Weight) {
 		(
 			Self::next_expected_epoch_change(now),
 			// Read: Current Slot, Epoch Index, Genesis Slot
@@ -923,8 +935,8 @@ impl<T: Config> frame_support::traits::EstimateNextSessionRotation<T::BlockNumbe
 	}
 }
 
-impl<T: Config> frame_support::traits::Lateness<T::BlockNumber> for Pallet<T> {
-	fn lateness(&self) -> T::BlockNumber {
+impl<T: Config> frame_support::traits::Lateness<frame_system::BlockNumberOf<T>> for Pallet<T> {
+	fn lateness(&self) -> frame_system::BlockNumberOf<T> {
 		Self::lateness()
 	}
 }
diff --git a/frame/babe/src/mock.rs b/frame/babe/src/mock.rs
index c0ccc9a8acd32..fe2fe92fbc196 100644
--- a/frame/babe/src/mock.rs
+++ b/frame/babe/src/mock.rs
@@ -42,14 +42,10 @@ use sp_staking::{EraIndex, SessionIndex};
 
 type DummyValidatorId = u64;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Authorship: pallet_authorship,
@@ -70,14 +66,13 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Version = ();
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = DummyValidatorId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type PalletInfo = PalletInfo;
diff --git a/frame/babe/src/randomness.rs b/frame/babe/src/randomness.rs
index b9b24786b7a74..c89acfda8fdf1 100644
--- a/frame/babe/src/randomness.rs
+++ b/frame/babe/src/randomness.rs
@@ -129,8 +129,10 @@ pub struct ParentBlockRandomness<T>(sp_std::marker::PhantomData<T>);
 					 Please use `ParentBlockRandomness` instead.")]
 pub struct CurrentBlockRandomness<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromTwoEpochsAgo<T> {
-	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
+impl<T: Config> RandomnessT<T::Hash, frame_system::BlockNumberOf<T>>
+	for RandomnessFromTwoEpochsAgo<T>
+{
+	fn random(subject: &[u8]) -> (T::Hash, frame_system::BlockNumberOf<T>) {
 		let mut subject = subject.to_vec();
 		subject.reserve(RANDOMNESS_LENGTH);
 		subject.extend_from_slice(&Randomness::<T>::get()[..]);
@@ -139,8 +141,10 @@ impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromTwoEpochs
 	}
 }
 
-impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromOneEpochAgo<T> {
-	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
+impl<T: Config> RandomnessT<T::Hash, frame_system::BlockNumberOf<T>>
+	for RandomnessFromOneEpochAgo<T>
+{
+	fn random(subject: &[u8]) -> (T::Hash, frame_system::BlockNumberOf<T>) {
 		let mut subject = subject.to_vec();
 		subject.reserve(RANDOMNESS_LENGTH);
 		subject.extend_from_slice(&NextRandomness::<T>::get()[..]);
@@ -149,8 +153,10 @@ impl<T: Config> RandomnessT<T::Hash, T::BlockNumber> for RandomnessFromOneEpochA
 	}
 }
 
-impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for ParentBlockRandomness<T> {
-	fn random(subject: &[u8]) -> (Option<T::Hash>, T::BlockNumber) {
+impl<T: Config> RandomnessT<Option<T::Hash>, frame_system::BlockNumberOf<T>>
+	for ParentBlockRandomness<T>
+{
+	fn random(subject: &[u8]) -> (Option<T::Hash>, frame_system::BlockNumberOf<T>) {
 		let random = AuthorVrfRandomness::<T>::get().map(|random| {
 			let mut subject = subject.to_vec();
 			subject.reserve(RANDOMNESS_LENGTH);
@@ -164,8 +170,10 @@ impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for ParentBlockRand
 }
 
 #[allow(deprecated)]
-impl<T: Config> RandomnessT<Option<T::Hash>, T::BlockNumber> for CurrentBlockRandomness<T> {
-	fn random(subject: &[u8]) -> (Option<T::Hash>, T::BlockNumber) {
+impl<T: Config> RandomnessT<Option<T::Hash>, frame_system::BlockNumberOf<T>>
+	for CurrentBlockRandomness<T>
+{
+	fn random(subject: &[u8]) -> (Option<T::Hash>, frame_system::BlockNumberOf<T>) {
 		let (random, _) = ParentBlockRandomness::<T>::random(subject);
 		(random, <frame_system::Pallet<T>>::block_number())
 	}
diff --git a/frame/bags-list/src/mock.rs b/frame/bags-list/src/mock.rs
index efbb2ed94c49f..3fd66d50d12e1 100644
--- a/frame/bags-list/src/mock.rs
+++ b/frame/bags-list/src/mock.rs
@@ -52,13 +52,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type DbWeight = ();
@@ -86,13 +85,9 @@ impl bags_list::Config for Runtime {
 	type Score = VoteWeight;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Event<T>, Config},
 		BagsList: bags_list::{Pallet, Call, Storage, Event<T>},
diff --git a/frame/balances/README.md b/frame/balances/README.md
index dd56ab3fadfb5..311c419352ff2 100644
--- a/frame/balances/README.md
+++ b/frame/balances/README.md
@@ -94,7 +94,7 @@ The Staking module uses the `LockableCurrency` trait to lock a stash account's f
 use frame_support::traits::{WithdrawReasons, LockableCurrency};
 use sp_runtime::traits::Bounded;
 pub trait Config: frame_system::Config {
-	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
+	type Currency: LockableCurrency<Self::AccountId, Moment=frame_system::BlockNumberOf<Self>>;
 }
 
 fn update_ledger<T: Config>(
diff --git a/frame/balances/src/impl_currency.rs b/frame/balances/src/impl_currency.rs
index baa153c119b20..7893ffaf21bc0 100644
--- a/frame/balances/src/impl_currency.rs
+++ b/frame/balances/src/impl_currency.rs
@@ -842,7 +842,7 @@ impl<T: Config<I>, I: 'static> LockableCurrency<T::AccountId> for Pallet<T, I>
 where
 	T::Balance: MaybeSerializeDeserialize + Debug,
 {
-	type Moment = T::BlockNumber;
+	type Moment = frame_system::BlockNumberOf<T>;
 
 	type MaxLocks = T::MaxLocks;
 
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 33a336e7c94e5..57c0dfbd62d3a 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -120,7 +120,7 @@
 //! use frame_support::traits::{WithdrawReasons, LockableCurrency};
 //! use sp_runtime::traits::Bounded;
 //! pub trait Config: frame_system::Config {
-//! 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
+//! 	type Currency: LockableCurrency<Self::AccountId, Moment=frame_system::BlockNumberOf<Self>>;
 //! }
 //! # struct StakingLedger<T: Config> {
 //! # 	stash: <T as frame_system::Config>::AccountId,
@@ -517,7 +517,7 @@ pub mod pallet {
 	}
 
 	#[pallet::hooks]
-	impl<T: Config<I>, I: 'static> Hooks<T::BlockNumber> for Pallet<T, I> {
+	impl<T: Config<I>, I: 'static> Hooks<frame_system::BlockNumberOf<T>> for Pallet<T, I> {
 		#[cfg(not(feature = "insecure_zero_ed"))]
 		fn integrity_test() {
 			assert!(
diff --git a/frame/balances/src/tests/mod.rs b/frame/balances/src/tests/mod.rs
index 6deb9885b79e5..76ec74a2882b0 100644
--- a/frame/balances/src/tests/mod.rs
+++ b/frame/balances/src/tests/mod.rs
@@ -38,7 +38,6 @@ use scale_info::TypeInfo;
 use sp_core::{hexdisplay::HexDisplay, H256};
 use sp_io;
 use sp_runtime::{
-	testing::Header,
 	traits::{BadOrigin, IdentityLookup, SignedExtension, Zero},
 	ArithmeticError, DispatchError, DispatchResult, FixedPointNumber, TokenError,
 };
@@ -50,7 +49,6 @@ mod fungible_conformance_tests;
 mod fungible_tests;
 mod reentrancy_tests;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 #[derive(
@@ -73,10 +71,7 @@ pub enum TestId {
 }
 
 frame_support::construct_runtime!(
-	pub struct Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -98,13 +93,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/beefy-mmr/src/lib.rs b/frame/beefy-mmr/src/lib.rs
index ba416922e2563..72d9106fa3127 100644
--- a/frame/beefy-mmr/src/lib.rs
+++ b/frame/beefy-mmr/src/lib.rs
@@ -139,7 +139,7 @@ pub mod pallet {
 
 impl<T: Config> LeafDataProvider for Pallet<T> {
 	type LeafData = MmrLeaf<
-		<T as frame_system::Config>::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		<T as frame_system::Config>::Hash,
 		MerkleRootOf<T>,
 		T::LeafExtra,
diff --git a/frame/beefy-mmr/src/mock.rs b/frame/beefy-mmr/src/mock.rs
index 31484aaa6be70..075393cc4044c 100644
--- a/frame/beefy-mmr/src/mock.rs
+++ b/frame/beefy-mmr/src/mock.rs
@@ -29,7 +29,6 @@ use sp_core::H256;
 use sp_runtime::{
 	app_crypto::ecdsa::Public,
 	impl_opaque_keys,
-	testing::Header,
 	traits::{BlakeTwo256, ConvertInto, IdentityLookup, Keccak256, OpaqueKeys},
 };
 
@@ -45,14 +44,10 @@ impl_opaque_keys! {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
@@ -69,13 +64,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
@@ -102,7 +96,7 @@ impl pallet_session::Config for Test {
 }
 
 pub type MmrLeaf = sp_consensus_beefy::mmr::MmrLeaf<
-	<Test as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<Test>,
 	<Test as frame_system::Config>::Hash,
 	crate::MerkleRootOf<Test>,
 	Vec<u8>,
diff --git a/frame/beefy/src/equivocation.rs b/frame/beefy/src/equivocation.rs
index f83b037dcd26e..adea8d719d737 100644
--- a/frame/beefy/src/equivocation.rs
+++ b/frame/beefy/src/equivocation.rs
@@ -126,7 +126,7 @@ pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T,
 /// Equivocation evidence convenience alias.
 pub type EquivocationEvidenceFor<T> = (
 	EquivocationProof<
-		<T as frame_system::Config>::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		<T as Config>::BeefyId,
 		<<T as Config>::BeefyId as RuntimeAppPublic>::Signature,
 	>,
@@ -140,7 +140,7 @@ where
 	R: ReportOffence<
 		T::AccountId,
 		P::IdentificationTuple,
-		EquivocationOffence<P::IdentificationTuple, T::BlockNumber>,
+		EquivocationOffence<P::IdentificationTuple, frame_system::BlockNumberOf<T>>,
 	>,
 	P: KeyOwnerProofSystem<(KeyTypeId, T::BeefyId), Proof = T::KeyOwnerProof>,
 	P::IdentificationTuple: Clone,
diff --git a/frame/beefy/src/mock.rs b/frame/beefy/src/mock.rs
index 7edf4d339758c..406cafb87a7e5 100644
--- a/frame/beefy/src/mock.rs
+++ b/frame/beefy/src/mock.rs
@@ -32,7 +32,7 @@ use sp_runtime::{
 	app_crypto::ecdsa::Public,
 	curve::PiecewiseLinear,
 	impl_opaque_keys,
-	testing::{Header, TestXt},
+	testing::TestXt,
 	traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},
 	Perbill,
 };
@@ -51,14 +51,10 @@ impl_opaque_keys! {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Authorship: pallet_authorship,
@@ -79,13 +75,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/benchmarking/pov/src/benchmarking.rs b/frame/benchmarking/pov/src/benchmarking.rs
index 27191e37219fd..7460f8aaaa46d 100644
--- a/frame/benchmarking/pov/src/benchmarking.rs
+++ b/frame/benchmarking/pov/src/benchmarking.rs
@@ -343,16 +343,11 @@ mod mock {
 
 	type AccountId = u64;
 	type AccountIndex = u32;
-	type BlockNumber = u64;
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Baseline: crate::{Pallet, Call, Storage, Event<T>},
@@ -366,13 +361,12 @@ mod mock {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = AccountIndex;
-		type BlockNumber = BlockNumber;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;
 		type AccountId = AccountId;
 		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-		type Header = sp_runtime::testing::Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ();
 		type Version = ();
diff --git a/frame/benchmarking/pov/src/tests.rs b/frame/benchmarking/pov/src/tests.rs
index b908925cccd8e..39af1c48703d7 100644
--- a/frame/benchmarking/pov/src/tests.rs
+++ b/frame/benchmarking/pov/src/tests.rs
@@ -164,14 +164,10 @@ fn noop_is_free() {
 mod mock {
 	use sp_runtime::testing::H256;
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Baseline: crate::{Pallet, Call, Storage, Event<T>},
@@ -185,13 +181,12 @@ mod mock {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u32;
-		type BlockNumber = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;
 		type AccountId = u32;
 		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-		type Header = sp_runtime::testing::Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ();
 		type Version = ();
diff --git a/frame/benchmarking/src/baseline.rs b/frame/benchmarking/src/baseline.rs
index 25336b6974d9f..347ca5b3d1325 100644
--- a/frame/benchmarking/src/baseline.rs
+++ b/frame/benchmarking/src/baseline.rs
@@ -115,16 +115,11 @@ pub mod mock {
 
 	type AccountId = u64;
 	type AccountIndex = u32;
-	type BlockNumber = u64;
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		}
@@ -137,13 +132,12 @@ pub mod mock {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = AccountIndex;
-		type BlockNumber = BlockNumber;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;
 		type AccountId = AccountId;
 		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-		type Header = sp_runtime::testing::Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ();
 		type Version = ();
diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
index c3f51aeb53d5a..b7cd78cc89d4e 100644
--- a/frame/benchmarking/src/tests.rs
+++ b/frame/benchmarking/src/tests.rs
@@ -22,7 +22,7 @@
 use super::*;
 use frame_support::{parameter_types, traits::ConstU32};
 use sp_runtime::{
-	testing::{Header, H256},
+	testing::H256,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
@@ -66,14 +66,10 @@ mod pallet_test {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		TestPallet: pallet_test::{Pallet, Call, Storage},
@@ -87,13 +83,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
diff --git a/frame/benchmarking/src/tests_instance.rs b/frame/benchmarking/src/tests_instance.rs
index 7e02cbf834d08..1b675c5e577d1 100644
--- a/frame/benchmarking/src/tests_instance.rs
+++ b/frame/benchmarking/src/tests_instance.rs
@@ -22,7 +22,7 @@
 use super::*;
 use frame_support::traits::ConstU32;
 use sp_runtime::{
-	testing::{Header, H256},
+	testing::H256,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
@@ -76,14 +76,10 @@ mod pallet_test {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		TestPallet: pallet_test::{Pallet, Call, Storage, Event<T>},
@@ -97,12 +93,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type DbWeight = ();
diff --git a/frame/bounties/src/benchmarking.rs b/frame/bounties/src/benchmarking.rs
index 0675328c3d3c2..64cf63c5f05b4 100644
--- a/frame/bounties/src/benchmarking.rs
+++ b/frame/bounties/src/benchmarking.rs
@@ -77,7 +77,7 @@ fn create_bounty<T: Config<I>, I: 'static>(
 	let approve_origin =
 		T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 	Bounties::<T, I>::approve_bounty(approve_origin.clone(), bounty_id)?;
-	Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+	Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 	Bounties::<T, I>::propose_curator(approve_origin, bounty_id, curator_lookup.clone(), fee)?;
 	Bounties::<T, I>::accept_curator(RawOrigin::Signed(curator).into(), bounty_id)?;
 	Ok((curator_lookup, bounty_id))
@@ -115,14 +115,14 @@ benchmarks_instance_pallet! {
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		let approve_origin = T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		Bounties::<T, I>::approve_bounty(approve_origin.clone(), bounty_id)?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 	}: _<T::RuntimeOrigin>(approve_origin, bounty_id, curator_lookup, fee)
 
 	// Worst case when curator is inactive and any sender unassigns the curator.
 	unassign_curator {
 		setup_pot_account::<T, I>();
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		frame_system::Pallet::<T>::set_block_number(T::BountyUpdatePeriod::get() + 2u32.into());
 		let caller = whitelisted_caller();
@@ -136,14 +136,14 @@ benchmarks_instance_pallet! {
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		let approve_origin = T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		Bounties::<T, I>::approve_bounty(approve_origin.clone(), bounty_id)?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 		Bounties::<T, I>::propose_curator(approve_origin, bounty_id, curator_lookup, fee)?;
 	}: _(RawOrigin::Signed(curator), bounty_id)
 
 	award_bounty {
 		setup_pot_account::<T, I>();
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
@@ -154,7 +154,7 @@ benchmarks_instance_pallet! {
 	claim_bounty {
 		setup_pot_account::<T, I>();
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
@@ -183,7 +183,7 @@ benchmarks_instance_pallet! {
 	close_bounty_active {
 		setup_pot_account::<T, I>();
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		let approve_origin =
 			T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
@@ -195,7 +195,7 @@ benchmarks_instance_pallet! {
 	extend_bounty_expiry {
 		setup_pot_account::<T, I>();
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
-		Treasury::<T, I>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, I>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 
 		let bounty_id = BountyCount::<T, I>::get() - 1;
 		let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs
index 07ac23a9d8010..dff12d12d1fb3 100644
--- a/frame/bounties/src/lib.rs
+++ b/frame/bounties/src/lib.rs
@@ -201,11 +201,11 @@ pub mod pallet {
 
 		/// The delay period for which a bounty beneficiary need to wait before claim the payout.
 		#[pallet::constant]
-		type BountyDepositPayoutDelay: Get<Self::BlockNumber>;
+		type BountyDepositPayoutDelay: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// Bounty duration in blocks.
 		#[pallet::constant]
-		type BountyUpdatePeriod: Get<Self::BlockNumber>;
+		type BountyUpdatePeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The curator deposit is calculated as a percentage of the curator fee.
 		///
@@ -305,7 +305,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		BountyIndex,
-		Bounty<T::AccountId, BalanceOf<T, I>, T::BlockNumber>,
+		Bounty<T::AccountId, BalanceOf<T, I>, frame_system::BlockNumberOf<T>>,
 	>;
 
 	/// The description of each bounty.
diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs
index 9fe34b16029cb..c0bb44b409379 100644
--- a/frame/bounties/src/tests.rs
+++ b/frame/bounties/src/tests.rs
@@ -32,21 +32,16 @@ use frame_support::{
 
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	BuildStorage, Perbill, Storage,
 };
 
 use super::Event as BountiesEvent;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -70,13 +65,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/child-bounties/src/benchmarking.rs b/frame/child-bounties/src/benchmarking.rs
index e49d9c836125d..7027adaea5276 100644
--- a/frame/child-bounties/src/benchmarking.rs
+++ b/frame/child-bounties/src/benchmarking.rs
@@ -114,7 +114,7 @@ fn activate_bounty<T: Config>(
 	let approve_origin =
 		T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 	Bounties::<T>::approve_bounty(approve_origin, child_bounty_setup.bounty_id)?;
-	Treasury::<T>::on_initialize(T::BlockNumber::zero());
+	Treasury::<T>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 	Bounties::<T>::propose_curator(
 		RawOrigin::Root.into(),
 		child_bounty_setup.bounty_id,
@@ -229,7 +229,7 @@ benchmarks! {
 	unassign_curator {
 		setup_pot_account::<T>();
 		let bounty_setup = activate_child_bounty::<T>(0, T::MaximumReasonLength::get())?;
-		Treasury::<T>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 		frame_system::Pallet::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), bounty_setup.bounty_id,
@@ -303,7 +303,7 @@ benchmarks! {
 	close_child_bounty_active {
 		setup_pot_account::<T>();
 		let bounty_setup = activate_child_bounty::<T>(0, T::MaximumReasonLength::get())?;
-		Treasury::<T>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 	}: close_child_bounty(RawOrigin::Root, bounty_setup.bounty_id, bounty_setup.child_bounty_id)
 	verify {
 		assert_last_event::<T>(Event::Canceled {
diff --git a/frame/child-bounties/src/lib.rs b/frame/child-bounties/src/lib.rs
index 14c1907af2c46..6b8d69cb11ac6 100644
--- a/frame/child-bounties/src/lib.rs
+++ b/frame/child-bounties/src/lib.rs
@@ -200,7 +200,7 @@ pub mod pallet {
 		BountyIndex,
 		Twox64Concat,
 		BountyIndex,
-		ChildBounty<T::AccountId, BalanceOf<T>, T::BlockNumber>,
+		ChildBounty<T::AccountId, BalanceOf<T>, frame_system::BlockNumberOf<T>>,
 	>;
 
 	/// The description of each child-bounty.
@@ -816,7 +816,7 @@ impl<T: Config> Pallet<T> {
 
 	fn ensure_bounty_active(
 		bounty_id: BountyIndex,
-	) -> Result<(T::AccountId, T::BlockNumber), DispatchError> {
+	) -> Result<(T::AccountId, frame_system::BlockNumberOf<T>), DispatchError> {
 		let parent_bounty = pallet_bounties::Pallet::<T>::bounties(bounty_id)
 			.ok_or(BountiesError::<T>::InvalidIndex)?;
 		if let BountyStatus::Active { curator, update_due } = parent_bounty.get_status() {
diff --git a/frame/child-bounties/src/tests.rs b/frame/child-bounties/src/tests.rs
index a8f0e16ea2136..11c3a30251816 100644
--- a/frame/child-bounties/src/tests.rs
+++ b/frame/child-bounties/src/tests.rs
@@ -33,22 +33,17 @@ use frame_support::{
 
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	Perbill, Permill, TokenError,
 };
 
 use super::Event as ChildBountiesEvent;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 type BountiesError = pallet_bounties::Error<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -73,13 +68,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/collective/src/benchmarking.rs b/frame/collective/src/benchmarking.rs
index 8a4495ef4095b..9d7fb0c9b15bc 100644
--- a/frame/collective/src/benchmarking.rs
+++ b/frame/collective/src/benchmarking.rs
@@ -516,7 +516,7 @@ benchmarks_instance_pallet! {
 			false,
 		)?;
 
-		System::<T>::set_block_number(T::BlockNumber::max_value());
+		System::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Prime nay will close it as disapproved
@@ -588,7 +588,7 @@ benchmarks_instance_pallet! {
 		}
 
 		// caller is prime, prime already votes aye by creating the proposal
-		System::<T>::set_block_number(T::BlockNumber::max_value());
+		System::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 		// Prime aye will close it as approved
@@ -637,7 +637,7 @@ benchmarks_instance_pallet! {
 			last_hash = T::Hashing::hash_of(&proposal);
 		}
 
-		System::<T>::set_block_number(T::BlockNumber::max_value());
+		System::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 		assert_eq!(Collective::<T, I>::proposals().len(), p as usize);
 
 	}: _(SystemOrigin::Root, last_hash)
diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs
index fc4ab0c4f1bbd..b377b3583eee9 100644
--- a/frame/collective/src/lib.rs
+++ b/frame/collective/src/lib.rs
@@ -201,7 +201,7 @@ pub mod pallet {
 			+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// The time-out for council motions.
-		type MotionDuration: Get<Self::BlockNumber>;
+		type MotionDuration: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// Maximum number of proposals allowed to be active in parallel.
 		type MaxProposals: Get<ProposalIndex>;
@@ -272,8 +272,13 @@ pub mod pallet {
 	/// Votes on a given proposal, if it is ongoing.
 	#[pallet::storage]
 	#[pallet::getter(fn voting)]
-	pub type Voting<T: Config<I>, I: 'static = ()> =
-		StorageMap<_, Identity, T::Hash, Votes<T::AccountId, T::BlockNumber>, OptionQuery>;
+	pub type Voting<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Identity,
+		T::Hash,
+		Votes<T::AccountId, frame_system::BlockNumberOf<T>>,
+		OptionQuery,
+	>;
 
 	/// Proposals so far.
 	#[pallet::storage]
diff --git a/frame/collective/src/tests.rs b/frame/collective/src/tests.rs
index 8d4e0a4a82cd7..ae96ae7deca49 100644
--- a/frame/collective/src/tests.rs
+++ b/frame/collective/src/tests.rs
@@ -36,10 +36,7 @@ pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64, RuntimeCall, ()>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Event<T>},
 		Collective: pallet_collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
@@ -100,13 +97,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index a81a633f740ab..d154e1064875d 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -48,7 +48,7 @@ use sp_std::{marker::PhantomData, mem, prelude::*, vec::Vec};
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
 pub type SeedOf<T> = <T as frame_system::Config>::Hash;
-pub type BlockNumberOf<T> = <T as frame_system::Config>::BlockNumber;
+pub type BlockNumberOf<T> = frame_system::BlockNumberOf<T>;
 pub type ExecResult = Result<ExecReturnValue, ExecError>;
 
 /// A type that represents a topic of an event. At the moment a hash is used.
@@ -394,7 +394,7 @@ pub struct Stack<'a, T: Config, E> {
 	/// The timestamp at the point of call stack instantiation.
 	timestamp: MomentOf<T>,
 	/// The block number at the time of call stack instantiation.
-	block_number: T::BlockNumber,
+	block_number: frame_system::BlockNumberOf<T>,
 	/// The nonce is cached here when accessed. It is written back when the call stack
 	/// finishes executing. Please refer to [`Nonce`] to a description of
 	/// the nonce itself.
@@ -1356,7 +1356,7 @@ where
 		);
 	}
 
-	fn block_number(&self) -> T::BlockNumber {
+	fn block_number(&self) -> frame_system::BlockNumberOf<T> {
 		self.block_number
 	}
 
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 0b765a2e89956..4390f94bec248 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -207,7 +207,7 @@ pub mod pallet {
 		/// be instantiated from existing codes that use this deprecated functionality. It will
 		/// be removed eventually. Hence for new `pallet-contracts` deployments it is okay
 		/// to supply a dummy implementation for this type (because it is never used).
-		type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
+		type Randomness: Randomness<Self::Hash, frame_system::BlockNumberOf<Self>>;
 
 		/// The currency in which fees are paid and contract balances are held.
 		type Currency: ReservableCurrency<Self::AccountId> // TODO: Move to fungible traits
@@ -341,7 +341,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_idle(_block: T::BlockNumber, mut remaining_weight: Weight) -> Weight {
+		fn on_idle(_block: frame_system::BlockNumberOf<T>, mut remaining_weight: Weight) -> Weight {
 			use migration::MigrateResult::*;
 
 			loop {
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 48b56128d5298..78d208989d070 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -50,20 +50,16 @@ use sp_core::ByteArray;
 use sp_io::hashing::blake2_256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
-	testing::{Header, H256},
+	testing::H256,
 	traits::{BlakeTwo256, Convert, Hash, IdentityLookup},
 	AccountId32, TokenError,
 };
 use std::ops::Deref;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -291,13 +287,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index ae02e5badbf39..ae58235246991 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -2093,7 +2093,7 @@ pub mod env {
 	/// `out_ptr`. This call overwrites it with the size of the value. If the available
 	/// space at `out_ptr` is less than the size of the value a trap is triggered.
 	///
-	/// The data is encoded as (T::Hash, T::BlockNumber).
+	/// The data is encoded as (T::Hash, frame_system::BlockNumberOf<T>).
 	///
 	/// # Changes from v0
 	///
diff --git a/frame/conviction-voting/src/lib.rs b/frame/conviction-voting/src/lib.rs
index 3ad81486ed26d..0a63a935d5fd6 100644
--- a/frame/conviction-voting/src/lib.rs
+++ b/frame/conviction-voting/src/lib.rs
@@ -68,7 +68,7 @@ type BalanceOf<T, I = ()> =
 type VotingOf<T, I = ()> = Voting<
 	BalanceOf<T, I>,
 	<T as frame_system::Config>::AccountId,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	PollIndexOf<T, I>,
 	<T as Config<I>>::MaxVotes,
 >;
@@ -76,7 +76,7 @@ type VotingOf<T, I = ()> = Voting<
 type DelegatingOf<T, I = ()> = Delegating<
 	BalanceOf<T, I>,
 	<T as frame_system::Config>::AccountId,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 >;
 pub type TallyOf<T, I = ()> = Tally<BalanceOf<T, I>, <T as Config<I>>::MaxTurnout>;
 pub type VotesOf<T, I = ()> = BalanceOf<T, I>;
@@ -103,14 +103,14 @@ pub mod pallet {
 		type WeightInfo: WeightInfo;
 		/// Currency type with which voting happens.
 		type Currency: ReservableCurrency<Self::AccountId>
-			+ LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>
+			+ LockableCurrency<Self::AccountId, Moment = frame_system::BlockNumberOf<Self>>
 			+ fungible::Inspect<Self::AccountId>;
 
 		/// The implementation of the logic which conducts polls.
 		type Polls: Polling<
 			TallyOf<Self, I>,
 			Votes = BalanceOf<Self, I>,
-			Moment = Self::BlockNumber,
+			Moment = frame_system::BlockNumberOf<Self>,
 		>;
 
 		/// The maximum amount of tokens which may be used for voting. May just be
@@ -130,7 +130,7 @@ pub mod pallet {
 		/// It should be no shorter than enactment period to ensure that in the case of an approval,
 		/// those successful voters are locked into the consequences that their votes entail.
 		#[pallet::constant]
-		type VoteLockingPeriod: Get<Self::BlockNumber>;
+		type VoteLockingPeriod: Get<frame_system::BlockNumberOf<Self>>;
 	}
 
 	/// All voting for a particular voter in a particular voting class. We store the balance for the
diff --git a/frame/conviction-voting/src/tests.rs b/frame/conviction-voting/src/tests.rs
index 1ea3a56adacb7..423db6b3d55a3 100644
--- a/frame/conviction-voting/src/tests.rs
+++ b/frame/conviction-voting/src/tests.rs
@@ -24,22 +24,15 @@ use frame_support::{
 	traits::{ConstU32, ConstU64, Contains, Polling, VoteTally},
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
 use super::*;
 use crate as pallet_conviction_voting;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -62,13 +55,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/core-fellowship/src/benchmarking.rs b/frame/core-fellowship/src/benchmarking.rs
index c49f50d4cc115..acdf4edfd0663 100644
--- a/frame/core-fellowship/src/benchmarking.rs
+++ b/frame/core-fellowship/src/benchmarking.rs
@@ -75,7 +75,7 @@ mod benchmarks {
 		let member = make_member::<T, I>(0)?;
 
 		// Set it to the max value to ensure that any possible auto-demotion period has passed.
-		frame_system::Pallet::<T>::set_block_number(T::BlockNumber::max_value());
+		frame_system::Pallet::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 		ensure_evidence::<T, I>(&member)?;
 		assert!(Member::<T, I>::contains_key(&member));
 
@@ -92,7 +92,7 @@ mod benchmarks {
 		let member = make_member::<T, I>(2)?;
 
 		// Set it to the max value to ensure that any possible auto-demotion period has passed.
-		frame_system::Pallet::<T>::set_block_number(T::BlockNumber::max_value());
+		frame_system::Pallet::<T>::set_block_number(frame_system::BlockNumberOf::<T>::max_value());
 		ensure_evidence::<T, I>(&member)?;
 		assert!(Member::<T, I>::contains_key(&member));
 		assert_eq!(T::Members::rank_of(&member), Some(2));
diff --git a/frame/core-fellowship/src/lib.rs b/frame/core-fellowship/src/lib.rs
index ba02627ec11b9..7e2ef10f86e24 100644
--- a/frame/core-fellowship/src/lib.rs
+++ b/frame/core-fellowship/src/lib.rs
@@ -194,8 +194,8 @@ pub mod pallet {
 	}
 
 	pub type ParamsOf<T, I> =
-		ParamsType<<T as Config<I>>::Balance, <T as frame_system::Config>::BlockNumber, RANK_COUNT>;
-	pub type MemberStatusOf<T> = MemberStatus<<T as frame_system::Config>::BlockNumber>;
+		ParamsType<<T as Config<I>>::Balance, frame_system::BlockNumberOf<T>, RANK_COUNT>;
+	pub type MemberStatusOf<T> = MemberStatus<frame_system::BlockNumberOf<T>>;
 	pub type RankOf<T, I> = <<T as Config<I>>::Members as RankedMembers>::Rank;
 
 	/// The overall status of the system.
diff --git a/frame/core-fellowship/src/tests.rs b/frame/core-fellowship/src/tests.rs
index 87c0de112ac33..1df0c328b3eef 100644
--- a/frame/core-fellowship/src/tests.rs
+++ b/frame/core-fellowship/src/tests.rs
@@ -28,7 +28,6 @@ use frame_support::{
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup, TryMorphInto},
 	DispatchError, DispatchResult,
 };
@@ -37,14 +36,10 @@ use sp_std::cell::RefCell;
 use super::*;
 use crate as pallet_core_fellowship;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		CoreFellowship: pallet_core_fellowship::{Pallet, Call, Storage, Event<T>},
@@ -62,13 +57,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 9a67ba698a662..80f58d1691c40 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -258,7 +258,7 @@ benchmarks! {
 			.collect::<Vec<_>>()
 			.try_into()
 			.unwrap();
-		Blacklist::<T>::insert(proposal.hash(), (T::BlockNumber::zero(), addresses));
+		Blacklist::<T>::insert(proposal.hash(), (frame_system::BlockNumberOf::<T>::zero(), addresses));
 	}: _<T::RuntimeOrigin>(origin, proposal)
 	verify {
 		// External proposal created
@@ -332,7 +332,7 @@ benchmarks! {
 			vetoers.try_push(account::<T::AccountId>("vetoer", i, SEED)).unwrap();
 		}
 		vetoers.sort();
-		Blacklist::<T>::insert(proposal_hash, (T::BlockNumber::zero(), vetoers));
+		Blacklist::<T>::insert(proposal_hash, (frame_system::BlockNumberOf::<T>::zero(), vetoers));
 
 		let origin = T::VetoOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		ensure!(NextExternal::<T>::get().is_some(), "no external proposal");
@@ -816,7 +816,7 @@ benchmarks! {
 		// create not ongoing referendum.
 		ReferendumInfoOf::<T>::insert(
 			0,
-			ReferendumInfo::Finished { end: T::BlockNumber::zero(), approved: true },
+			ReferendumInfo::Finished { end: frame_system::BlockNumberOf::<T>::zero(), approved: true },
 		);
 		let owner = MetadataOwner::Referendum(0);
 		let caller = funded_account::<T>("caller", 0);
@@ -833,7 +833,7 @@ benchmarks! {
 		// create not ongoing referendum.
 		ReferendumInfoOf::<T>::insert(
 			0,
-			ReferendumInfo::Finished { end: T::BlockNumber::zero(), approved: true },
+			ReferendumInfo::Finished { end: frame_system::BlockNumberOf::<T>::zero(), approved: true },
 		);
 		let owner = MetadataOwner::Referendum(0);
 		let hash = note_preimage::<T>();
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 7ce3bb5611915..2fb118e0885fe 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -226,14 +226,18 @@ pub mod pallet {
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// The Scheduler.
-		type Scheduler: ScheduleNamed<Self::BlockNumber, CallOf<Self>, Self::PalletsOrigin>;
+		type Scheduler: ScheduleNamed<
+			frame_system::BlockNumberOf<Self>,
+			CallOf<Self>,
+			Self::PalletsOrigin,
+		>;
 
 		/// The Preimage provider.
 		type Preimages: QueryPreimage + StorePreimage;
 
 		/// Currency type for this pallet.
 		type Currency: ReservableCurrency<Self::AccountId>
-			+ LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
+			+ LockableCurrency<Self::AccountId, Moment = frame_system::BlockNumberOf<Self>>;
 
 		/// The period between a proposal being approved and enacted.
 		///
@@ -241,22 +245,22 @@ pub mod pallet {
 		/// voting stakers have an opportunity to remove themselves from the system in the case
 		/// where they are on the losing side of a vote.
 		#[pallet::constant]
-		type EnactmentPeriod: Get<Self::BlockNumber>;
+		type EnactmentPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// How often (in blocks) new public referenda are launched.
 		#[pallet::constant]
-		type LaunchPeriod: Get<Self::BlockNumber>;
+		type LaunchPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// How often (in blocks) to check for new votes.
 		#[pallet::constant]
-		type VotingPeriod: Get<Self::BlockNumber>;
+		type VotingPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The minimum period of vote locking.
 		///
 		/// It should be no shorter than enactment period to ensure that in the case of an approval,
 		/// those successful voters are locked into the consequences that their votes entail.
 		#[pallet::constant]
-		type VoteLockingPeriod: Get<Self::BlockNumber>;
+		type VoteLockingPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The minimum amount to be used as a deposit for a public referendum proposal.
 		#[pallet::constant]
@@ -270,11 +274,11 @@ pub mod pallet {
 
 		/// Minimum voting period allowed for a fast-track referendum.
 		#[pallet::constant]
-		type FastTrackVotingPeriod: Get<Self::BlockNumber>;
+		type FastTrackVotingPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// Period in blocks where an external proposal may not be re-submitted after being vetoed.
 		#[pallet::constant]
-		type CooloffPeriod: Get<Self::BlockNumber>;
+		type CooloffPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum number of votes for an account.
 		///
@@ -387,7 +391,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		ReferendumIndex,
-		ReferendumInfo<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>,
+		ReferendumInfo<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
 	>;
 
 	/// All votes for a particular voter. We store the balance for the number of votes that we
@@ -399,7 +403,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		Voting<BalanceOf<T>, T::AccountId, T::BlockNumber, T::MaxVotes>,
+		Voting<BalanceOf<T>, T::AccountId, frame_system::BlockNumberOf<T>, T::MaxVotes>,
 		ValueQuery,
 	>;
 
@@ -422,7 +426,7 @@ pub mod pallet {
 		_,
 		Identity,
 		H256,
-		(T::BlockNumber, BoundedVec<T::AccountId, T::MaxBlacklisted>),
+		(frame_system::BlockNumberOf<T>, BoundedVec<T::AccountId, T::MaxBlacklisted>),
 	>;
 
 	/// Record of all proposals that have been subject to emergency cancellation.
@@ -475,7 +479,7 @@ pub mod pallet {
 		/// An account has cancelled a previous delegation operation.
 		Undelegated { account: T::AccountId },
 		/// An external proposal has been vetoed.
-		Vetoed { who: T::AccountId, proposal_hash: H256, until: T::BlockNumber },
+		Vetoed { who: T::AccountId, proposal_hash: H256, until: frame_system::BlockNumberOf<T> },
 		/// A proposal_hash has been blacklisted permanently.
 		Blacklisted { proposal_hash: H256 },
 		/// An account has voted in a referendum
@@ -565,7 +569,7 @@ pub mod pallet {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Weight: see `begin_block`
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			Self::begin_block(n)
 		}
 	}
@@ -775,8 +779,8 @@ pub mod pallet {
 		pub fn fast_track(
 			origin: OriginFor<T>,
 			proposal_hash: H256,
-			voting_period: T::BlockNumber,
-			delay: T::BlockNumber,
+			voting_period: frame_system::BlockNumberOf<T>,
+			delay: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			// Rather complicated bit of code to ensure that either:
 			// - `voting_period` is at least `FastTrackVotingPeriod` and `origin` is
@@ -794,7 +798,10 @@ pub mod pallet {
 				ensure!(T::InstantAllowed::get(), Error::<T>::InstantNotAllowed);
 			}
 
-			ensure!(voting_period > T::BlockNumber::zero(), Error::<T>::VotingPeriodLow);
+			ensure!(
+				voting_period > frame_system::BlockNumberOf::<T>::zero(),
+				Error::<T>::VotingPeriodLow
+			);
 			let (ext_proposal, threshold) =
 				<NextExternal<T>>::get().ok_or(Error::<T>::ProposalMissing)?;
 			ensure!(
@@ -1047,7 +1054,10 @@ pub mod pallet {
 			T::BlacklistOrigin::ensure_origin(origin)?;
 
 			// Insert the proposal into the blacklist.
-			let permanent = (T::BlockNumber::max_value(), BoundedVec::<T::AccountId, _>::default());
+			let permanent = (
+				frame_system::BlockNumberOf::<T>::max_value(),
+				BoundedVec::<T::AccountId, _>::default(),
+			);
 			Blacklist::<T>::insert(&proposal_hash, permanent);
 
 			// Remove the queued proposal, if it's there.
@@ -1200,17 +1210,23 @@ impl<T: Config> Pallet<T> {
 
 	/// Get all referenda ready for tally at block `n`.
 	pub fn maturing_referenda_at(
-		n: T::BlockNumber,
-	) -> Vec<(ReferendumIndex, ReferendumStatus<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>)> {
+		n: frame_system::BlockNumberOf<T>,
+	) -> Vec<(
+		ReferendumIndex,
+		ReferendumStatus<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
+	)> {
 		let next = Self::lowest_unbaked();
 		let last = Self::referendum_count();
 		Self::maturing_referenda_at_inner(n, next..last)
 	}
 
 	fn maturing_referenda_at_inner(
-		n: T::BlockNumber,
+		n: frame_system::BlockNumberOf<T>,
 		range: core::ops::Range<PropIndex>,
-	) -> Vec<(ReferendumIndex, ReferendumStatus<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>)> {
+	) -> Vec<(
+		ReferendumIndex,
+		ReferendumStatus<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
+	)> {
 		range
 			.into_iter()
 			.map(|i| (i, Self::referendum_info(i)))
@@ -1228,7 +1244,7 @@ impl<T: Config> Pallet<T> {
 	pub fn internal_start_referendum(
 		proposal: BoundedCallOf<T>,
 		threshold: VoteThreshold,
-		delay: T::BlockNumber,
+		delay: frame_system::BlockNumberOf<T>,
 	) -> ReferendumIndex {
 		<Pallet<T>>::inject_referendum(
 			<frame_system::Pallet<T>>::block_number().saturating_add(T::VotingPeriod::get()),
@@ -1249,8 +1265,11 @@ impl<T: Config> Pallet<T> {
 
 	/// Ok if the given referendum is active, Err otherwise
 	fn ensure_ongoing(
-		r: ReferendumInfo<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>,
-	) -> Result<ReferendumStatus<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>, DispatchError> {
+		r: ReferendumInfo<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
+	) -> Result<
+		ReferendumStatus<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
+		DispatchError,
+	> {
 		match r {
 			ReferendumInfo::Ongoing(s) => Ok(s),
 			_ => Err(Error::<T>::ReferendumInvalid.into()),
@@ -1259,7 +1278,10 @@ impl<T: Config> Pallet<T> {
 
 	fn referendum_status(
 		ref_index: ReferendumIndex,
-	) -> Result<ReferendumStatus<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>, DispatchError> {
+	) -> Result<
+		ReferendumStatus<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
+		DispatchError,
+	> {
 		let info = ReferendumInfoOf::<T>::get(ref_index).ok_or(Error::<T>::ReferendumInvalid)?;
 		Self::ensure_ongoing(info)
 	}
@@ -1514,10 +1536,10 @@ impl<T: Config> Pallet<T> {
 
 	/// Start a referendum
 	fn inject_referendum(
-		end: T::BlockNumber,
+		end: frame_system::BlockNumberOf<T>,
 		proposal: BoundedCallOf<T>,
 		threshold: VoteThreshold,
-		delay: T::BlockNumber,
+		delay: frame_system::BlockNumberOf<T>,
 	) -> ReferendumIndex {
 		let ref_index = Self::referendum_count();
 		ReferendumCount::<T>::put(ref_index + 1);
@@ -1530,7 +1552,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Table the next waiting proposal for a vote.
-	fn launch_next(now: T::BlockNumber) -> DispatchResult {
+	fn launch_next(now: frame_system::BlockNumberOf<T>) -> DispatchResult {
 		if LastTabledWasExternal::<T>::take() {
 			Self::launch_public(now).or_else(|_| Self::launch_external(now))
 		} else {
@@ -1540,7 +1562,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Table the waiting external proposal for a vote, if there is one.
-	fn launch_external(now: T::BlockNumber) -> DispatchResult {
+	fn launch_external(now: frame_system::BlockNumberOf<T>) -> DispatchResult {
 		if let Some((proposal, threshold)) = <NextExternal<T>>::take() {
 			LastTabledWasExternal::<T>::put(true);
 			Self::deposit_event(Event::<T>::ExternalTabled);
@@ -1558,7 +1580,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Table the waiting public proposal with the highest backing for a vote.
-	fn launch_public(now: T::BlockNumber) -> DispatchResult {
+	fn launch_public(now: frame_system::BlockNumberOf<T>) -> DispatchResult {
 		let mut public_props = Self::public_props();
 		if let Some((winner_index, _)) = public_props.iter().enumerate().max_by_key(
 			// defensive only: All current public proposals have an amount locked
@@ -1591,9 +1613,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn bake_referendum(
-		now: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
 		index: ReferendumIndex,
-		status: ReferendumStatus<T::BlockNumber, BoundedCallOf<T>, BalanceOf<T>>,
+		status: ReferendumStatus<frame_system::BlockNumberOf<T>, BoundedCallOf<T>, BalanceOf<T>>,
 	) -> bool {
 		let total_issuance = T::Currency::total_issuance();
 		let approved = status.threshold.approved(status.tally, total_issuance);
@@ -1628,7 +1650,7 @@ impl<T: Config> Pallet<T> {
 	/// ## Complexity:
 	/// If a referendum is launched or maturing, this will take full block weight if queue is not
 	/// empty. Otherwise, `O(R)` where `R` is the number of unbaked referenda.
-	fn begin_block(now: T::BlockNumber) -> Weight {
+	fn begin_block(now: frame_system::BlockNumberOf<T>) -> Weight {
 		let max_block_weight = T::BlockWeights::get().max_block;
 		let mut weight = Weight::zero();
 
diff --git a/frame/democracy/src/migrations/v1.rs b/frame/democracy/src/migrations/v1.rs
index f3d29511ff659..dfbd787c70e1f 100644
--- a/frame/democracy/src/migrations/v1.rs
+++ b/frame/democracy/src/migrations/v1.rs
@@ -46,7 +46,7 @@ mod v0 {
 		frame_support::Twox64Concat,
 		ReferendumIndex,
 		ReferendumInfo<
-			<T as frame_system::Config>::BlockNumber,
+			frame_system::BlockNumberOf<T>,
 			<T as frame_system::Config>::Hash,
 			BalanceOf<T>,
 		>,
@@ -87,7 +87,8 @@ pub mod v1 {
 			}
 
 			ReferendumInfoOf::<T>::translate(
-				|index, old: ReferendumInfo<T::BlockNumber, T::Hash, BalanceOf<T>>| {
+				|index,
+				 old: ReferendumInfo<frame_system::BlockNumberOf<T>, T::Hash, BalanceOf<T>>| {
 					weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
 					log::info!(target: TARGET, "migrating referendum #{:?}", &index);
 					Some(match old {
diff --git a/frame/democracy/src/tests.rs b/frame/democracy/src/tests.rs
index dd726004648ef..278e7dac038cf 100644
--- a/frame/democracy/src/tests.rs
+++ b/frame/democracy/src/tests.rs
@@ -31,7 +31,6 @@ use frame_system::{EnsureRoot, EnsureSigned, EnsureSignedBy};
 use pallet_balances::{BalanceLock, Error as BalancesError};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BadOrigin, BlakeTwo256, Hash, IdentityLookup},
 	Perbill,
 };
@@ -51,14 +50,10 @@ const NAY: Vote = Vote { aye: false, conviction: Conviction::None };
 const BIG_AYE: Vote = Vote { aye: true, conviction: Conviction::Locked1x };
 const BIG_NAY: Vote = Vote { aye: false, conviction: Conviction::Locked1x };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -89,13 +84,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/election-provider-multi-phase/src/benchmarking.rs b/frame/election-provider-multi-phase/src/benchmarking.rs
index a5946c6a1d3c1..80edb8f1fc1cd 100644
--- a/frame/election-provider-multi-phase/src/benchmarking.rs
+++ b/frame/election-provider-multi-phase/src/benchmarking.rs
@@ -313,7 +313,7 @@ frame_benchmarking::benchmarks! {
 		assert!(<DesiredTargets<T>>::get().is_none());
 		assert!(<Snapshot<T>>::get().is_none());
 		assert!(<SnapshotMetadata<T>>::get().is_none());
-		assert_eq!(<CurrentPhase<T>>::get(), <Phase<T::BlockNumber>>::Off);
+		assert_eq!(<CurrentPhase<T>>::get(), <Phase<frame_system::BlockNumberOf<T>>>::Off);
 	}
 
 	submit {
diff --git a/frame/election-provider-multi-phase/src/lib.rs b/frame/election-provider-multi-phase/src/lib.rs
index 1960c458b983e..8ef609c2b9217 100644
--- a/frame/election-provider-multi-phase/src/lib.rs
+++ b/frame/election-provider-multi-phase/src/lib.rs
@@ -585,10 +585,10 @@ pub mod pallet {
 
 		/// Duration of the unsigned phase.
 		#[pallet::constant]
-		type UnsignedPhase: Get<Self::BlockNumber>;
+		type UnsignedPhase: Get<frame_system::BlockNumberOf<Self>>;
 		/// Duration of the signed phase.
 		#[pallet::constant]
-		type SignedPhase: Get<Self::BlockNumber>;
+		type SignedPhase: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The minimum amount of improvement to the solution score that defines a solution as
 		/// "better" in the Signed phase.
@@ -605,7 +605,7 @@ pub mod pallet {
 		/// For example, if it is 5, that means that at least 5 blocks will elapse between attempts
 		/// to submit the worker's solution.
 		#[pallet::constant]
-		type OffchainRepeat: Get<Self::BlockNumber>;
+		type OffchainRepeat: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The priority of the unsigned transaction submitted in the unsigned-phase
 		#[pallet::constant]
@@ -685,13 +685,13 @@ pub mod pallet {
 		/// Something that will provide the election data.
 		type DataProvider: ElectionDataProvider<
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = frame_system::BlockNumberOf<Self>,
 		>;
 
 		/// Configuration for the fallback.
 		type Fallback: InstantElectionProvider<
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = frame_system::BlockNumberOf<Self>,
 			DataProvider = Self::DataProvider,
 			MaxWinners = Self::MaxWinners,
 		>;
@@ -702,7 +702,7 @@ pub mod pallet {
 		/// BoundedExecution<_>` if the test-net is not expected to have thousands of nominators.
 		type GovernanceFallback: InstantElectionProvider<
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = frame_system::BlockNumberOf<Self>,
 			DataProvider = Self::DataProvider,
 			MaxWinners = Self::MaxWinners,
 		>;
@@ -747,7 +747,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(now: T::BlockNumber) -> Weight {
+		fn on_initialize(now: frame_system::BlockNumberOf<T>) -> Weight {
 			let next_election = T::DataProvider::next_election_prediction(now).max(now);
 
 			let signed_deadline = T::SignedPhase::get() + T::UnsignedPhase::get();
@@ -824,7 +824,7 @@ pub mod pallet {
 			}
 		}
 
-		fn offchain_worker(now: T::BlockNumber) {
+		fn offchain_worker(now: frame_system::BlockNumberOf<T>) {
 			use sp_runtime::offchain::storage_lock::{BlockAndTime, StorageLock};
 
 			// Create a lock with the maximum deadline of number of blocks in the unsigned phase.
@@ -886,7 +886,7 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_n: T::BlockNumber) -> Result<(), TryRuntimeError> {
+		fn try_state(_n: frame_system::BlockNumberOf<T>) -> Result<(), TryRuntimeError> {
 			Self::do_try_state()
 		}
 	}
@@ -1155,7 +1155,11 @@ pub mod pallet {
 		/// An account has been slashed for submitting an invalid signed submission.
 		Slashed { account: <T as frame_system::Config>::AccountId, value: BalanceOf<T> },
 		/// There was a phase transition in a given round.
-		PhaseTransitioned { from: Phase<T::BlockNumber>, to: Phase<T::BlockNumber>, round: u32 },
+		PhaseTransitioned {
+			from: Phase<frame_system::BlockNumberOf<T>>,
+			to: Phase<frame_system::BlockNumberOf<T>>,
+			round: u32,
+		},
 	}
 
 	/// Error of the pallet that can be returned in response to dispatches.
@@ -1257,7 +1261,8 @@ pub mod pallet {
 	/// Current phase.
 	#[pallet::storage]
 	#[pallet::getter(fn current_phase)]
-	pub type CurrentPhase<T: Config> = StorageValue<_, Phase<T::BlockNumber>, ValueQuery>;
+	pub type CurrentPhase<T: Config> =
+		StorageValue<_, Phase<frame_system::BlockNumberOf<T>>, ValueQuery>;
 
 	/// Current best solution, signed or unsigned, queued to be returned upon `elect`.
 	///
@@ -1349,7 +1354,7 @@ pub mod pallet {
 impl<T: Config> Pallet<T> {
 	/// Internal logic of the offchain worker, to be executed only when the offchain lock is
 	/// acquired with success.
-	fn do_synchronized_offchain_worker(now: T::BlockNumber) {
+	fn do_synchronized_offchain_worker(now: frame_system::BlockNumberOf<T>) {
 		let current_phase = Self::current_phase();
 		log!(trace, "lock for offchain worker acquired. Phase = {:?}", current_phase);
 		match current_phase {
@@ -1375,7 +1380,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Phase transition helper.
-	pub(crate) fn phase_transition(to: Phase<T::BlockNumber>) {
+	pub(crate) fn phase_transition(to: Phase<frame_system::BlockNumberOf<T>>) {
 		log!(info, "Starting phase {:?}, round {}.", to, Self::round());
 		Self::deposit_event(Event::PhaseTransitioned {
 			from: <CurrentPhase<T>>::get(),
@@ -1672,7 +1677,7 @@ impl<T: Config> Pallet<T> {
 
 impl<T: Config> ElectionProviderBase for Pallet<T> {
 	type AccountId = T::AccountId;
-	type BlockNumber = T::BlockNumber;
+	type BlockNumber = frame_system::BlockNumberOf<T>;
 	type Error = ElectionError<T>;
 	type MaxWinners = T::MaxWinners;
 	type DataProvider = T::DataProvider;
diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
index cf797aea845f4..440950a606761 100644
--- a/frame/election-provider-multi-phase/src/mock.rs
+++ b/frame/election-provider-multi-phase/src/mock.rs
@@ -54,10 +54,7 @@ pub type UncheckedExtrinsic =
 	sp_runtime::generic::UncheckedExtrinsic<AccountId, RuntimeCall, (), ()>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Event<T>, Config},
 		Balances: pallet_balances::{Pallet, Call, Event<T>, Config<T>},
@@ -212,13 +209,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type DbWeight = ();
diff --git a/frame/election-provider-multi-phase/src/signed.rs b/frame/election-provider-multi-phase/src/signed.rs
index bde985518d53e..103836a9fa878 100644
--- a/frame/election-provider-multi-phase/src/signed.rs
+++ b/frame/election-provider-multi-phase/src/signed.rs
@@ -101,7 +101,7 @@ pub type SignedSubmissionOf<T> = SignedSubmission<
 /// Always sorted vector of a score, submitted at the given block number, which can be found at the
 /// given index (`u32`) of the `SignedSubmissionsMap`.
 pub type SubmissionIndicesOf<T> = BoundedVec<
-	(ElectionScore, <T as frame_system::Config>::BlockNumber, u32),
+	(ElectionScore, frame_system::BlockNumberOf<T>, u32),
 	<T as Config>::SignedMaxSubmissions,
 >;
 
@@ -216,7 +216,7 @@ impl<T: Config> SignedSubmissions<T> {
 	fn swap_out_submission(
 		&mut self,
 		remove_pos: usize,
-		insert: Option<(ElectionScore, T::BlockNumber, u32)>,
+		insert: Option<(ElectionScore, frame_system::BlockNumberOf<T>, u32)>,
 	) -> Option<SignedSubmissionOf<T>> {
 		if remove_pos >= self.indices.len() {
 			return None
diff --git a/frame/election-provider-multi-phase/src/unsigned.rs b/frame/election-provider-multi-phase/src/unsigned.rs
index 9c09cb48c7c05..3545e2b55a951 100644
--- a/frame/election-provider-multi-phase/src/unsigned.rs
+++ b/frame/election-provider-multi-phase/src/unsigned.rs
@@ -298,12 +298,14 @@ impl<T: Config> Pallet<T> {
 	///
 	/// Returns `Ok(())` if offchain worker limit is respected, `Err(reason)` otherwise. If `Ok()`
 	/// is returned, `now` is written in storage and will be used in further calls as the baseline.
-	pub fn ensure_offchain_repeat_frequency(now: T::BlockNumber) -> Result<(), MinerError> {
+	pub fn ensure_offchain_repeat_frequency(
+		now: frame_system::BlockNumberOf<T>,
+	) -> Result<(), MinerError> {
 		let threshold = T::OffchainRepeat::get();
 		let last_block = StorageValueRef::persistent(OFFCHAIN_LAST_BLOCK);
 
 		let mutate_stat = last_block.mutate::<_, &'static str, _>(
-			|maybe_head: Result<Option<T::BlockNumber>, _>| {
+			|maybe_head: Result<Option<frame_system::BlockNumberOf<T>>, _>| {
 				match maybe_head {
 					Ok(Some(head)) if now < head => Err("fork."),
 					Ok(Some(head)) if now >= head && now <= head + threshold =>
diff --git a/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
index da7ccf6dce9ce..b9a8db5da806b 100644
--- a/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
+++ b/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -50,14 +50,11 @@ pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;
 
 type Block = frame_system::mocking::MockBlock<Runtime>;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+
 type Extrinsic = testing::TestXt<RuntimeCall, ()>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub enum Runtime
 	{
 		System: frame_system,
 		ElectionProviderMultiPhase: pallet_election_provider_multi_phase,
@@ -85,13 +82,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
index a312562d4944c..60378d4dac589 100644
--- a/frame/election-provider-support/src/onchain.rs
+++ b/frame/election-provider-support/src/onchain.rs
@@ -73,7 +73,7 @@ pub trait Config {
 	/// Something that provides the data for election.
 	type DataProvider: ElectionDataProvider<
 		AccountId = <Self::System as frame_system::Config>::AccountId,
-		BlockNumber = <Self::System as frame_system::Config>::BlockNumber,
+		BlockNumber = frame_system::BlockNumberOf<Self::System>,
 	>;
 
 	/// Weight information for extrinsics in this pallet.
@@ -151,7 +151,7 @@ fn elect_with_input_bounds<T: Config>(
 
 impl<T: Config> ElectionProviderBase for OnChainExecution<T> {
 	type AccountId = <T::System as frame_system::Config>::AccountId;
-	type BlockNumber = <T::System as frame_system::Config>::BlockNumber;
+	type BlockNumber = frame_system::BlockNumberOf<T::System>;
 	type Error = Error;
 	type MaxWinners = T::MaxWinners;
 	type DataProvider = T::DataProvider;
@@ -197,10 +197,7 @@ mod tests {
 	pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 
 	frame_support::construct_runtime!(
-		pub struct Runtime where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic
+		pub struct Runtime
 		{
 			System: frame_system::{Pallet, Call, Event<T>},
 		}
@@ -211,13 +208,12 @@ mod tests {
 		type BaseCallFilter = frame_support::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = AccountId;
-		type BlockNumber = BlockNumber;
 		type RuntimeCall = RuntimeCall;
 		type Hash = sp_core::H256;
 		type Hashing = sp_runtime::traits::BlakeTwo256;
 		type AccountId = AccountId;
 		type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-		type Header = sp_runtime::testing::Header;
+		type Block = Block;
 		type RuntimeEvent = ();
 		type BlockHashCount = ();
 		type DbWeight = ();
diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs
index ee8bcc1de50a4..52e581e0f3670 100644
--- a/frame/elections-phragmen/src/lib.rs
+++ b/frame/elections-phragmen/src/lib.rs
@@ -203,7 +203,7 @@ pub mod pallet {
 		type PalletId: Get<LockIdentifier>;
 
 		/// The currency that people are electing with.
-		type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>
+		type Currency: LockableCurrency<Self::AccountId, Moment = frame_system::BlockNumberOf<Self>>
 			+ ReservableCurrency<Self::AccountId>;
 
 		/// What to do when the members change.
@@ -249,7 +249,7 @@ pub mod pallet {
 		/// round will happen. If set to zero, no elections are ever triggered and the module will
 		/// be in passive mode.
 		#[pallet::constant]
-		type TermDuration: Get<Self::BlockNumber>;
+		type TermDuration: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum number of candidates in a phragmen election.
 		///
@@ -285,7 +285,7 @@ pub mod pallet {
 		/// What to do at the end of each block.
 		///
 		/// Checks if an election needs to happen or not.
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			let term_duration = T::TermDuration::get();
 			if !term_duration.is_zero() && (n % term_duration).is_zero() {
 				Self::do_phragmen()
@@ -330,7 +330,7 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_n: T::BlockNumber) -> Result<(), TryRuntimeError> {
+		fn try_state(_n: frame_system::BlockNumberOf<T>) -> Result<(), TryRuntimeError> {
 			Self::do_try_state()
 		}
 	}
@@ -1323,13 +1323,12 @@ mod tests {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
-		type BlockNumber = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = ();
@@ -1446,10 +1445,7 @@ mod tests {
 		sp_runtime::generic::UncheckedExtrinsic<u32, u64, RuntimeCall, ()>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Event<T>, Config<T>},
diff --git a/frame/examples/basic/src/lib.rs b/frame/examples/basic/src/lib.rs
index af159c0f4bc98..327c55fe4c6bb 100644
--- a/frame/examples/basic/src/lib.rs
+++ b/frame/examples/basic/src/lib.rs
@@ -388,21 +388,21 @@ pub mod pallet {
 		// dispatched.
 		//
 		// This function must return the weight consumed by `on_initialize` and `on_finalize`.
-		fn on_initialize(_n: T::BlockNumber) -> Weight {
+		fn on_initialize(_n: frame_system::BlockNumberOf<T>) -> Weight {
 			// Anything that needs to be done at the start of the block.
 			// We don't do anything here.
 			Weight::zero()
 		}
 
 		// `on_finalize` is executed at the end of block after all extrinsic are dispatched.
-		fn on_finalize(_n: T::BlockNumber) {
+		fn on_finalize(_n: frame_system::BlockNumberOf<T>) {
 			// Perform necessary data/state clean up here.
 		}
 
 		// A runtime code run after every block and have access to extended set of APIs.
 		//
 		// For instance you can generate extrinsics for the upcoming produced block.
-		fn offchain_worker(_n: T::BlockNumber) {
+		fn offchain_worker(_n: frame_system::BlockNumberOf<T>) {
 			// We don't do anything here.
 			// but we could dispatch extrinsic (transaction/unsigned/inherent) using
 			// sp_io::submit_extrinsic.
diff --git a/frame/examples/basic/src/tests.rs b/frame/examples/basic/src/tests.rs
index 621d93b97cd01..fb5f192dbf85e 100644
--- a/frame/examples/basic/src/tests.rs
+++ b/frame/examples/basic/src/tests.rs
@@ -27,22 +27,17 @@ use sp_core::H256;
 // The testing primitives are very useful for avoiding having to work with signatures
 // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
 // Reexport crate as its pallet name for construct_runtime.
 use crate as pallet_example_basic;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // For testing the pallet, we construct a mock runtime.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -57,13 +52,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/examples/default-config/src/lib.rs b/frame/examples/default-config/src/lib.rs
index 5112f3d72d59e..62ec64574ad23 100644
--- a/frame/examples/default-config/src/lib.rs
+++ b/frame/examples/default-config/src/lib.rs
@@ -107,17 +107,14 @@ pub mod pallet {
 pub mod tests {
 	use super::*;
 	use frame_support::derive_impl;
+	use sp_runtime::traits::ConstU64;
 
 	use super::pallet as pallet_default_config_example;
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system,
 			DefaultPallet: pallet_default_config_example,
@@ -135,17 +132,16 @@ pub mod tests {
 		type RuntimeEvent = RuntimeEvent;
 		type PalletInfo = PalletInfo;
 		type OnSetCode = ();
+		type Block = Block;
+		type BlockHashCount = ConstU64<10>;
 
 		// all of this is coming from `frame_system::config_preludes::TestDefaultConfig`.
 
 		// type Index = u32;
-		// type BlockNumber = u32;
-		// type Header = sp_runtime::generic::Header<Self::BlockNumber, Self::Hashing>;
 		// type Hash = sp_core::hash::H256;
 		// type Hashing = sp_runtime::traits::BlakeTwo256;
 		// type AccountId = u64;
 		// type Lookup = sp_runtime::traits::IdentityLookup<u64>;
-		// type BlockHashCount = frame_support::traits::ConstU32<10>;
 		// type MaxConsumers = frame_support::traits::ConstU32<16>;
 		// type AccountData = ();
 		// type OnNewAccount = ();
diff --git a/frame/examples/dev-mode/src/tests.rs b/frame/examples/dev-mode/src/tests.rs
index 8a1ca6628b91c..49326610dd419 100644
--- a/frame/examples/dev-mode/src/tests.rs
+++ b/frame/examples/dev-mode/src/tests.rs
@@ -21,22 +21,17 @@ use crate::*;
 use frame_support::{assert_ok, traits::ConstU64};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
 // Reexport crate as its pallet name for construct_runtime.
 use crate as pallet_dev_mode;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // For testing the pallet, we construct a mock runtime.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -51,13 +46,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/examples/kitchensink/src/lib.rs b/frame/examples/kitchensink/src/lib.rs
index c60e126181a95..ef740b1d8a528 100644
--- a/frame/examples/kitchensink/src/lib.rs
+++ b/frame/examples/kitchensink/src/lib.rs
@@ -183,7 +183,7 @@ pub mod pallet {
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
 		pub foo: u32,
-		pub bar: T::BlockNumber,
+		pub bar: frame_system::BlockNumberOf<T>,
 	}
 
 	impl<T: Config> Default for GenesisConfig<T> {
@@ -249,22 +249,22 @@ pub mod pallet {
 	/// All the possible hooks that a pallet can have. See [`frame_support::traits::Hooks`] for more
 	/// info.
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
+	impl<T: Config> Hooks<frame_system::BlockNumberOf<T>> for Pallet<T> {
 		fn integrity_test() {}
 
-		fn offchain_worker(_n: T::BlockNumber) {
+		fn offchain_worker(_n: frame_system::BlockNumberOf<T>) {
 			unimplemented!()
 		}
 
-		fn on_initialize(_n: T::BlockNumber) -> Weight {
+		fn on_initialize(_n: frame_system::BlockNumberOf<T>) -> Weight {
 			unimplemented!()
 		}
 
-		fn on_finalize(_n: T::BlockNumber) {
+		fn on_finalize(_n: frame_system::BlockNumberOf<T>) {
 			unimplemented!()
 		}
 
-		fn on_idle(_n: T::BlockNumber, _remaining_weight: Weight) -> Weight {
+		fn on_idle(_n: frame_system::BlockNumberOf<T>, _remaining_weight: Weight) -> Weight {
 			unimplemented!()
 		}
 
@@ -283,7 +283,7 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_n: T::BlockNumber) -> Result<(), TryRuntimeError> {
+		fn try_state(_n: frame_system::BlockNumberOf<T>) -> Result<(), TryRuntimeError> {
 			unimplemented!()
 		}
 	}
diff --git a/frame/examples/kitchensink/src/tests.rs b/frame/examples/kitchensink/src/tests.rs
index a8645bedcb7e1..6f07793c05b1e 100644
--- a/frame/examples/kitchensink/src/tests.rs
+++ b/frame/examples/kitchensink/src/tests.rs
@@ -23,15 +23,11 @@ use sp_runtime::BuildStorage;
 // Reexport crate as its pallet name for construct_runtime.
 use crate as pallet_example_kitchensink;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // For testing the pallet, we construct a mock runtime.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -48,8 +44,9 @@ impl frame_system::Config for Test {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
+	type Block = Block;
+	type BlockHashCount = ConstU64<10>;
 	type OnSetCode = ();
-
 	type AccountData = pallet_balances::AccountData<u64>;
 }
 
diff --git a/frame/examples/offchain-worker/src/lib.rs b/frame/examples/offchain-worker/src/lib.rs
index 6ce8524174200..28611ddf5b11c 100644
--- a/frame/examples/offchain-worker/src/lib.rs
+++ b/frame/examples/offchain-worker/src/lib.rs
@@ -136,14 +136,14 @@ pub mod pallet {
 		/// every `GRACE_PERIOD` blocks. We use Local Storage to coordinate
 		/// sending between distinct runs of this offchain worker.
 		#[pallet::constant]
-		type GracePeriod: Get<Self::BlockNumber>;
+		type GracePeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// Number of blocks of cooldown after unsigned transaction is included.
 		///
 		/// This ensures that we only accept unsigned transactions once, every `UnsignedInterval`
 		/// blocks.
 		#[pallet::constant]
-		type UnsignedInterval: Get<Self::BlockNumber>;
+		type UnsignedInterval: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// A configuration for base priority of unsigned transactions.
 		///
@@ -171,7 +171,7 @@ pub mod pallet {
 		/// be cases where some blocks are skipped, or for some the worker runs twice (re-orgs),
 		/// so the code should be able to handle that.
 		/// You can use `Local Storage` API to coordinate runs of the worker.
-		fn offchain_worker(block_number: T::BlockNumber) {
+		fn offchain_worker(block_number: frame_system::BlockNumberOf<T>) {
 			// Note that having logs compiled to WASM may cause the size of the blob to increase
 			// significantly. You can use `RuntimeDebug` custom derive to hide details of the types
 			// in WASM. The `sp-api` crate also provides a feature `disable-logging` to disable
@@ -258,7 +258,7 @@ pub mod pallet {
 		#[pallet::weight({0})]
 		pub fn submit_price_unsigned(
 			origin: OriginFor<T>,
-			_block_number: T::BlockNumber,
+			_block_number: frame_system::BlockNumberOf<T>,
 			price: u32,
 		) -> DispatchResultWithPostInfo {
 			// This ensures that the function can only be called via unsigned transaction.
@@ -275,7 +275,7 @@ pub mod pallet {
 		#[pallet::weight({0})]
 		pub fn submit_price_unsigned_with_signed_payload(
 			origin: OriginFor<T>,
-			price_payload: PricePayload<T::Public, T::BlockNumber>,
+			price_payload: PricePayload<T::Public, frame_system::BlockNumberOf<T>>,
 			_signature: T::Signature,
 		) -> DispatchResultWithPostInfo {
 			// This ensures that the function can only be called via unsigned transaction.
@@ -341,7 +341,8 @@ pub mod pallet {
 	/// This storage entry defines when new transaction is going to be accepted.
 	#[pallet::storage]
 	#[pallet::getter(fn next_unsigned_at)]
-	pub(super) type NextUnsignedAt<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub(super) type NextUnsignedAt<T: Config> =
+		StorageValue<_, frame_system::BlockNumberOf<T>, ValueQuery>;
 }
 
 /// Payload used by this example crate to hold price
@@ -353,7 +354,7 @@ pub struct PricePayload<Public, BlockNumber> {
 	public: Public,
 }
 
-impl<T: SigningTypes> SignedPayload<T> for PricePayload<T::Public, T::BlockNumber> {
+impl<T: SigningTypes> SignedPayload<T> for PricePayload<T::Public, frame_system::BlockNumberOf<T>> {
 	fn public(&self) -> T::Public {
 		self.public.clone()
 	}
@@ -374,7 +375,7 @@ impl<T: Config> Pallet<T> {
 	/// and local storage usage.
 	///
 	/// Returns a type of transaction that should be produced in current run.
-	fn choose_transaction_type(block_number: T::BlockNumber) -> TransactionType {
+	fn choose_transaction_type(block_number: frame_system::BlockNumberOf<T>) -> TransactionType {
 		/// A friendlier name for the error that is going to be returned in case we are in the grace
 		/// period.
 		const RECENTLY_SENT: () = ();
@@ -389,16 +390,18 @@ impl<T: Config> Pallet<T> {
 		// low-level method of local storage API, which means that only one worker
 		// will be able to "acquire a lock" and send a transaction if multiple workers
 		// happen to be executed concurrently.
-		let res = val.mutate(|last_send: Result<Option<T::BlockNumber>, StorageRetrievalError>| {
-			match last_send {
-				// If we already have a value in storage and the block number is recent enough
-				// we avoid sending another transaction at this time.
-				Ok(Some(block)) if block_number < block + T::GracePeriod::get() =>
-					Err(RECENTLY_SENT),
-				// In every other case we attempt to acquire the lock and send a transaction.
-				_ => Ok(block_number),
-			}
-		});
+		let res = val.mutate(
+			|last_send: Result<Option<frame_system::BlockNumberOf<T>>, StorageRetrievalError>| {
+				match last_send {
+					// If we already have a value in storage and the block number is recent enough
+					// we avoid sending another transaction at this time.
+					Ok(Some(block)) if block_number < block + T::GracePeriod::get() =>
+						Err(RECENTLY_SENT),
+					// In every other case we attempt to acquire the lock and send a transaction.
+					_ => Ok(block_number),
+				}
+			},
+		);
 
 		// The result of `mutate` call will give us a nested `Result` type.
 		// The first one matches the return of the closure passed to `mutate`, i.e.
@@ -419,9 +422,9 @@ impl<T: Config> Pallet<T> {
 				let transaction_type = block_number % 4u32.into();
 				if transaction_type == Zero::zero() {
 					TransactionType::Signed
-				} else if transaction_type == T::BlockNumber::from(1u32) {
+				} else if transaction_type == frame_system::BlockNumberOf::<T>::from(1u32) {
 					TransactionType::UnsignedForAny
-				} else if transaction_type == T::BlockNumber::from(2u32) {
+				} else if transaction_type == frame_system::BlockNumberOf::<T>::from(2u32) {
 					TransactionType::UnsignedForAll
 				} else {
 					TransactionType::Raw
@@ -472,7 +475,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// A helper function to fetch the price and send a raw unsigned transaction.
-	fn fetch_price_and_send_raw_unsigned(block_number: T::BlockNumber) -> Result<(), &'static str> {
+	fn fetch_price_and_send_raw_unsigned(
+		block_number: frame_system::BlockNumberOf<T>,
+	) -> Result<(), &'static str> {
 		// Make sure we don't fetch the price if unsigned transaction is going to be rejected
 		// anyway.
 		let next_unsigned_at = <NextUnsignedAt<T>>::get();
@@ -505,7 +510,7 @@ impl<T: Config> Pallet<T> {
 
 	/// A helper function to fetch the price, sign payload and send an unsigned transaction
 	fn fetch_price_and_send_unsigned_for_any_account(
-		block_number: T::BlockNumber,
+		block_number: frame_system::BlockNumberOf<T>,
 	) -> Result<(), &'static str> {
 		// Make sure we don't fetch the price if unsigned transaction is going to be rejected
 		// anyway.
@@ -535,7 +540,7 @@ impl<T: Config> Pallet<T> {
 
 	/// A helper function to fetch the price, sign payload and send an unsigned transaction
 	fn fetch_price_and_send_unsigned_for_all_accounts(
-		block_number: T::BlockNumber,
+		block_number: frame_system::BlockNumberOf<T>,
 	) -> Result<(), &'static str> {
 		// Make sure we don't fetch the price if unsigned transaction is going to be rejected
 		// anyway.
@@ -669,7 +674,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn validate_transaction_parameters(
-		block_number: &T::BlockNumber,
+		block_number: &frame_system::BlockNumberOf<T>,
 		new_price: &u32,
 	) -> TransactionValidity {
 		// Now let's check if the transaction has any chance to succeed.
diff --git a/frame/examples/offchain-worker/src/tests.rs b/frame/examples/offchain-worker/src/tests.rs
index 3df7f4a8d5439..4c53b9cab24ee 100644
--- a/frame/examples/offchain-worker/src/tests.rs
+++ b/frame/examples/offchain-worker/src/tests.rs
@@ -30,20 +30,16 @@ use sp_core::{
 
 use sp_keystore::{testing::MemoryKeystore, Keystore, KeystoreExt};
 use sp_runtime::{
-	testing::{Header, TestXt},
+	testing::TestXt,
 	traits::{BlakeTwo256, Extrinsic as ExtrinsicT, IdentifyAccount, IdentityLookup, Verify},
 	RuntimeAppPublic,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // For testing the module, we construct a mock runtime.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Example: example_offchain_worker::{Pallet, Call, Storage, Event<T>, ValidateUnsigned},
@@ -58,12 +54,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = sp_core::sr25519::Public;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
@@ -271,11 +266,12 @@ fn should_submit_unsigned_transaction_on_chain_for_any_account() {
 		{
 			assert_eq!(body, price_payload);
 
-			let signature_valid =
-				<PricePayload<
-					<Test as SigningTypes>::Public,
-					<Test as frame_system::Config>::BlockNumber,
-				> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
+			let signature_valid = <PricePayload<
+				<Test as SigningTypes>::Public,
+				frame_system::BlockNumberOf<Test>,
+			> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(
+				&price_payload, signature
+			);
 
 			assert!(signature_valid);
 		}
@@ -325,11 +321,12 @@ fn should_submit_unsigned_transaction_on_chain_for_all_accounts() {
 		{
 			assert_eq!(body, price_payload);
 
-			let signature_valid =
-				<PricePayload<
-					<Test as SigningTypes>::Public,
-					<Test as frame_system::Config>::BlockNumber,
-				> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(&price_payload, signature);
+			let signature_valid = <PricePayload<
+				<Test as SigningTypes>::Public,
+				frame_system::BlockNumberOf<Test>,
+			> as SignedPayload<Test>>::verify::<crypto::TestAuthId>(
+				&price_payload, signature
+			);
 
 			assert!(signature_valid);
 		}
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
index 31cbb0ee7ba0d..dfc774b49bac1 100644
--- a/frame/executive/src/lib.rs
+++ b/frame/executive/src/lib.rs
@@ -178,14 +178,14 @@ pub struct Executive<
 
 impl<
 		System: frame_system::Config + EnsureInherentsAreFirst<Block>,
-		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
+		Block: traits::Block<Header = frame_system::HeaderOf<System>, Hash = System::Hash>,
 		Context: Default,
 		UnsignedValidator,
 		AllPalletsWithSystem: OnRuntimeUpgrade
-			+ OnInitialize<System::BlockNumber>
-			+ OnIdle<System::BlockNumber>
-			+ OnFinalize<System::BlockNumber>
-			+ OffchainWorker<System::BlockNumber>,
+			+ OnInitialize<frame_system::BlockNumberOf<System>>
+			+ OnIdle<frame_system::BlockNumberOf<System>>
+			+ OnFinalize<frame_system::BlockNumberOf<System>>
+			+ OffchainWorker<frame_system::BlockNumberOf<System>>,
 		COnRuntimeUpgrade: OnRuntimeUpgrade,
 	> ExecuteBlock<Block>
 	for Executive<System, Block, Context, UnsignedValidator, AllPalletsWithSystem, COnRuntimeUpgrade>
@@ -212,15 +212,15 @@ where
 #[cfg(feature = "try-runtime")]
 impl<
 		System: frame_system::Config + EnsureInherentsAreFirst<Block>,
-		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
+		Block: traits::Block<Header = frame_system::HeaderOf<System>, Hash = System::Hash>,
 		Context: Default,
 		UnsignedValidator,
 		AllPalletsWithSystem: OnRuntimeUpgrade
-			+ OnInitialize<System::BlockNumber>
-			+ OnIdle<System::BlockNumber>
-			+ OnFinalize<System::BlockNumber>
-			+ OffchainWorker<System::BlockNumber>
-			+ frame_support::traits::TryState<System::BlockNumber>,
+			+ OnInitialize<frame_system::BlockNumberOf<System>>
+			+ OnIdle<frame_system::BlockNumberOf<System>>
+			+ OnFinalize<frame_system::BlockNumberOf<System>>
+			+ OffchainWorker<frame_system::BlockNumberOf<System>>
+			+ frame_support::traits::TryState<frame_system::BlockNumberOf<System>>,
 		COnRuntimeUpgrade: OnRuntimeUpgrade,
 	> Executive<System, Block, Context, UnsignedValidator, AllPalletsWithSystem, COnRuntimeUpgrade>
 where
@@ -297,10 +297,9 @@ where
 
 		// run the try-state checks of all pallets, ensuring they don't alter any state.
 		let _guard = frame_support::StorageNoopGuard::default();
-		<AllPalletsWithSystem as frame_support::traits::TryState<System::BlockNumber>>::try_state(
-			*header.number(),
-			select,
-		)
+		<AllPalletsWithSystem as frame_support::traits::TryState<
+			frame_system::BlockNumberOf<System>,
+		>>::try_state(*header.number(), select)
 		.map_err(|e| {
 			frame_support::log::error!(target: LOG_TARGET, "failure: {:?}", e);
 			e
@@ -344,7 +343,9 @@ where
 	) -> Result<Weight, TryRuntimeError> {
 		if checks.try_state() {
 			let _guard = frame_support::StorageNoopGuard::default();
-			<AllPalletsWithSystem as frame_support::traits::TryState<System::BlockNumber>>::try_state(
+			<AllPalletsWithSystem as frame_support::traits::TryState<
+				frame_system::BlockNumberOf<System>,
+			>>::try_state(
 				frame_system::Pallet::<System>::block_number(),
 				frame_try_runtime::TryStateSelect::All,
 			)?;
@@ -357,7 +358,9 @@ where
 
 		if checks.try_state() {
 			let _guard = frame_support::StorageNoopGuard::default();
-			<AllPalletsWithSystem as frame_support::traits::TryState<System::BlockNumber>>::try_state(
+			<AllPalletsWithSystem as frame_support::traits::TryState<
+				frame_system::BlockNumberOf<System>,
+			>>::try_state(
 				frame_system::Pallet::<System>::block_number(),
 				frame_try_runtime::TryStateSelect::All,
 			)?;
@@ -369,14 +372,14 @@ where
 
 impl<
 		System: frame_system::Config + EnsureInherentsAreFirst<Block>,
-		Block: traits::Block<Header = System::Header, Hash = System::Hash>,
+		Block: traits::Block<Header = frame_system::HeaderOf<System>, Hash = System::Hash>,
 		Context: Default,
 		UnsignedValidator,
 		AllPalletsWithSystem: OnRuntimeUpgrade
-			+ OnInitialize<System::BlockNumber>
-			+ OnIdle<System::BlockNumber>
-			+ OnFinalize<System::BlockNumber>
-			+ OffchainWorker<System::BlockNumber>,
+			+ OnInitialize<frame_system::BlockNumberOf<System>>
+			+ OnIdle<frame_system::BlockNumberOf<System>>
+			+ OnFinalize<frame_system::BlockNumberOf<System>>
+			+ OffchainWorker<frame_system::BlockNumberOf<System>>,
 		COnRuntimeUpgrade: OnRuntimeUpgrade,
 	> Executive<System, Block, Context, UnsignedValidator, AllPalletsWithSystem, COnRuntimeUpgrade>
 where
@@ -393,14 +396,14 @@ where
 	}
 
 	/// Start the execution of a particular block.
-	pub fn initialize_block(header: &System::Header) {
+	pub fn initialize_block(header: &frame_system::HeaderOf<System>) {
 		sp_io::init_tracing();
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "init_block");
 		let digests = Self::extract_pre_digest(header);
 		Self::initialize_block_impl(header.number(), header.parent_hash(), &digests);
 	}
 
-	fn extract_pre_digest(header: &System::Header) -> Digest {
+	fn extract_pre_digest(header: &frame_system::HeaderOf<System>) -> Digest {
 		let mut digest = <Digest>::default();
 		header.digest().logs().iter().for_each(|d| {
 			if d.as_pre_runtime().is_some() {
@@ -411,7 +414,7 @@ where
 	}
 
 	fn initialize_block_impl(
-		block_number: &System::BlockNumber,
+		block_number: &frame_system::BlockNumberOf<System>,
 		parent_hash: &System::Hash,
 		digest: &Digest,
 	) {
@@ -426,7 +429,7 @@ where
 		}
 		<frame_system::Pallet<System>>::initialize(block_number, parent_hash, digest);
 		weight = weight.saturating_add(<AllPalletsWithSystem as OnInitialize<
-			System::BlockNumber,
+			frame_system::BlockNumberOf<System>,
 		>>::on_initialize(*block_number));
 		weight = weight.saturating_add(
 			<System::BlockWeights as frame_support::traits::Get<_>>::get().base_block,
@@ -461,9 +464,10 @@ where
 		// Check that `parent_hash` is correct.
 		let n = *header.number();
 		assert!(
-			n > System::BlockNumber::zero() &&
-				<frame_system::Pallet<System>>::block_hash(n - System::BlockNumber::one()) ==
-					*header.parent_hash(),
+			n > frame_system::BlockNumberOf::<System>::zero() &&
+				<frame_system::Pallet<System>>::block_hash(
+					n - frame_system::BlockNumberOf::<System>::one()
+				) == *header.parent_hash(),
 			"Parent hash should be valid.",
 		);
 
@@ -512,7 +516,7 @@ where
 
 	/// Finalize the block - it is up the caller to ensure that all header fields are valid
 	/// except state-root.
-	pub fn finalize_block() -> System::Header {
+	pub fn finalize_block() -> frame_system::HeaderOf<System> {
 		sp_io::init_tracing();
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "finalize_block");
 		<frame_system::Pallet<System>>::note_finished_extrinsics();
@@ -529,17 +533,18 @@ where
 		let remaining_weight = max_weight.saturating_sub(weight.total());
 
 		if remaining_weight.all_gt(Weight::zero()) {
-			let used_weight = <AllPalletsWithSystem as OnIdle<System::BlockNumber>>::on_idle(
-				block_number,
-				remaining_weight,
-			);
+			let used_weight = <AllPalletsWithSystem as OnIdle<
+				frame_system::BlockNumberOf<System>,
+			>>::on_idle(block_number, remaining_weight);
 			<frame_system::Pallet<System>>::register_extra_weight_unchecked(
 				used_weight,
 				DispatchClass::Mandatory,
 			);
 		}
 
-		<AllPalletsWithSystem as OnFinalize<System::BlockNumber>>::on_finalize(block_number);
+		<AllPalletsWithSystem as OnFinalize<frame_system::BlockNumberOf<System>>>::on_finalize(
+			block_number,
+		);
 	}
 
 	/// Apply extrinsic outside of the block execution function.
@@ -579,7 +584,7 @@ where
 		Ok(r.map(|_| ()).map_err(|e| e.error))
 	}
 
-	fn final_checks(header: &System::Header) {
+	fn final_checks(header: &frame_system::HeaderOf<System>) {
 		sp_tracing::enter_span!(sp_tracing::Level::TRACE, "final_checks");
 		// remove temporaries
 		let new_header = <frame_system::Pallet<System>>::finalize();
@@ -651,7 +656,7 @@ where
 	}
 
 	/// Start an offchain worker and generate extrinsics.
-	pub fn offchain_worker(header: &System::Header) {
+	pub fn offchain_worker(header: &frame_system::HeaderOf<System>) {
 		sp_io::init_tracing();
 		// We need to keep events available for offchain workers,
 		// hence we initialize the block manually.
@@ -665,7 +670,7 @@ where
 		// as well.
 		frame_system::BlockHash::<System>::insert(header.number(), header.hash());
 
-		<AllPalletsWithSystem as OffchainWorker<System::BlockNumber>>::offchain_worker(
+		<AllPalletsWithSystem as OffchainWorker<frame_system::BlockNumberOf<System>>>::offchain_worker(
 			*header.number(),
 		)
 	}
@@ -712,17 +717,17 @@ mod tests {
 		impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 			// module hooks.
 			// one with block number arg and one without
-			fn on_initialize(n: T::BlockNumber) -> Weight {
+			fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 				println!("on_initialize({})", n);
 				Weight::from_parts(175, 0)
 			}
 
-			fn on_idle(n: T::BlockNumber, remaining_weight: Weight) -> Weight {
+			fn on_idle(n: frame_system::BlockNumberOf<T>, remaining_weight: Weight) -> Weight {
 				println!("on_idle{}, {})", n, remaining_weight);
 				Weight::from_parts(175, 0)
 			}
 
-			fn on_finalize(n: T::BlockNumber) {
+			fn on_finalize(n: frame_system::BlockNumberOf<T>) {
 				println!("on_finalize({})", n);
 			}
 
@@ -731,8 +736,8 @@ mod tests {
 				Weight::from_parts(200, 0)
 			}
 
-			fn offchain_worker(n: T::BlockNumber) {
-				assert_eq!(T::BlockNumber::from(1u32), n);
+			fn offchain_worker(n: frame_system::BlockNumberOf<T>) {
+				assert_eq!(frame_system::BlockNumberOf::<T>::from(1u32), n);
 			}
 		}
 
@@ -822,10 +827,7 @@ mod tests {
 	}
 
 	frame_support::construct_runtime!(
-		pub struct Runtime where
-			Block = TestBlock,
-			NodeBlock = TestBlock,
-			UncheckedExtrinsic = TestUncheckedExtrinsic
+		pub struct Runtime
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -854,12 +856,11 @@ mod tests {
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
 		type RuntimeCall = RuntimeCall;
-		type BlockNumber = u64;
 		type Hash = sp_core::H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<u64>;
-		type Header = Header;
+		type Block = TestBlock;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = RuntimeVersion;
@@ -923,7 +924,6 @@ mod tests {
 	);
 	type TestXt = sp_runtime::testing::TestXt<RuntimeCall, SignedExtra>;
 	type TestBlock = Block<TestXt>;
-	type TestUncheckedExtrinsic = TestXt;
 
 	// Will contain `true` when the custom runtime logic was called.
 	const CUSTOM_ON_RUNTIME_KEY: &[u8] = b":custom:on_runtime";
diff --git a/frame/fast-unstake/src/lib.rs b/frame/fast-unstake/src/lib.rs
index 9be5878f2e199..f08a4d35d3ace 100644
--- a/frame/fast-unstake/src/lib.rs
+++ b/frame/fast-unstake/src/lib.rs
@@ -272,8 +272,8 @@ pub mod pallet {
 	}
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-		fn on_idle(_: T::BlockNumber, remaining_weight: Weight) -> Weight {
+	impl<T: Config> Hooks<frame_system::BlockNumberOf<T>> for Pallet<T> {
+		fn on_idle(_: frame_system::BlockNumberOf<T>, remaining_weight: Weight) -> Weight {
 			if remaining_weight.any_lt(T::DbWeight::get().reads(2)) {
 				return Weight::from_parts(0, 0)
 			}
@@ -295,7 +295,7 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_n: T::BlockNumber) -> Result<(), TryRuntimeError> {
+		fn try_state(_n: frame_system::BlockNumberOf<T>) -> Result<(), TryRuntimeError> {
 			// ensure that the value of `ErasToCheckPerBlock` is less than
 			// `T::MaxErasToCheckPerBlock`.
 			ensure!(
diff --git a/frame/fast-unstake/src/mock.rs b/frame/fast-unstake/src/mock.rs
index 101ad90881171..6808df73cf321 100644
--- a/frame/fast-unstake/src/mock.rs
+++ b/frame/fast-unstake/src/mock.rs
@@ -48,13 +48,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
@@ -195,14 +194,9 @@ impl fast_unstake::Config for Runtime {
 }
 
 type Block = frame_system::mocking::MockBlock<Runtime>;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+
 frame_support::construct_runtime!(
-	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub struct Runtime {
 		System: frame_system,
 		Timestamp: pallet_timestamp,
 		Balances: pallet_balances,
diff --git a/frame/glutton/src/mock.rs b/frame/glutton/src/mock.rs
index f2ce53b206fa8..7bd66e6a577ba 100644
--- a/frame/glutton/src/mock.rs
+++ b/frame/glutton/src/mock.rs
@@ -23,19 +23,12 @@ use frame_support::{
 	traits::{ConstU32, ConstU64},
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Glutton: pallet_glutton::{Pallet, Event},
@@ -49,13 +42,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
index 44d0266375230..54cc70b5f011a 100644
--- a/frame/grandpa/src/equivocation.rs
+++ b/frame/grandpa/src/equivocation.rs
@@ -118,7 +118,7 @@ pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T,
 impl<T, R, P, L>
 	OffenceReportSystem<
 		Option<T::AccountId>,
-		(EquivocationProof<T::Hash, T::BlockNumber>, T::KeyOwnerProof),
+		(EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>, T::KeyOwnerProof),
 	> for EquivocationReportSystem<T, R, P, L>
 where
 	T: Config + pallet_authorship::Config + frame_system::offchain::SendTransactionTypes<Call<T>>,
@@ -134,7 +134,7 @@ where
 	type Longevity = L;
 
 	fn publish_evidence(
-		evidence: (EquivocationProof<T::Hash, T::BlockNumber>, T::KeyOwnerProof),
+		evidence: (EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>, T::KeyOwnerProof),
 	) -> Result<(), ()> {
 		use frame_system::offchain::SubmitTransaction;
 		let (equivocation_proof, key_owner_proof) = evidence;
@@ -152,7 +152,7 @@ where
 	}
 
 	fn check_evidence(
-		evidence: (EquivocationProof<T::Hash, T::BlockNumber>, T::KeyOwnerProof),
+		evidence: (EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>, T::KeyOwnerProof),
 	) -> Result<(), TransactionValidityError> {
 		let (equivocation_proof, key_owner_proof) = evidence;
 
@@ -172,7 +172,7 @@ where
 
 	fn process_evidence(
 		reporter: Option<T::AccountId>,
-		evidence: (EquivocationProof<T::Hash, T::BlockNumber>, T::KeyOwnerProof),
+		evidence: (EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>, T::KeyOwnerProof),
 	) -> Result<(), DispatchError> {
 		let (equivocation_proof, key_owner_proof) = evidence;
 		let reporter = reporter.or_else(|| <pallet_authorship::Pallet<T>>::author());
diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
index 8311131e97347..5c6ed68432a6b 100644
--- a/frame/grandpa/src/lib.rs
+++ b/frame/grandpa/src/lib.rs
@@ -113,13 +113,13 @@ pub mod pallet {
 		/// (from an offchain context).
 		type EquivocationReportSystem: OffenceReportSystem<
 			Option<Self::AccountId>,
-			(EquivocationProof<Self::Hash, Self::BlockNumber>, Self::KeyOwnerProof),
+			(EquivocationProof<Self::Hash, frame_system::BlockNumberOf<Self>>, Self::KeyOwnerProof),
 		>;
 	}
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_finalize(block_number: T::BlockNumber) {
+		fn on_finalize(block_number: frame_system::BlockNumberOf<T>) {
 			// check for scheduled pending authority set changes
 			if let Some(pending_change) = <PendingChange<T>>::get() {
 				// emit signal if we're at the block that scheduled the change
@@ -191,7 +191,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		pub fn report_equivocation(
 			origin: OriginFor<T>,
-			equivocation_proof: Box<EquivocationProof<T::Hash, T::BlockNumber>>,
+			equivocation_proof: Box<EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			let reporter = ensure_signed(origin)?;
@@ -217,7 +217,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
-			equivocation_proof: Box<EquivocationProof<T::Hash, T::BlockNumber>>,
+			equivocation_proof: Box<EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
@@ -245,8 +245,8 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::note_stalled())]
 		pub fn note_stalled(
 			origin: OriginFor<T>,
-			delay: T::BlockNumber,
-			best_finalized_block_number: T::BlockNumber,
+			delay: frame_system::BlockNumberOf<T>,
+			best_finalized_block_number: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			ensure_root(origin)?;
 
@@ -287,31 +287,36 @@ pub mod pallet {
 	}
 
 	#[pallet::type_value]
-	pub(super) fn DefaultForState<T: Config>() -> StoredState<T::BlockNumber> {
+	pub(super) fn DefaultForState<T: Config>() -> StoredState<frame_system::BlockNumberOf<T>> {
 		StoredState::Live
 	}
 
 	/// State of the current authority set.
 	#[pallet::storage]
 	#[pallet::getter(fn state)]
-	pub(super) type State<T: Config> =
-		StorageValue<_, StoredState<T::BlockNumber>, ValueQuery, DefaultForState<T>>;
+	pub(super) type State<T: Config> = StorageValue<
+		_,
+		StoredState<frame_system::BlockNumberOf<T>>,
+		ValueQuery,
+		DefaultForState<T>,
+	>;
 
 	/// Pending change: (signaled at, scheduled change).
 	#[pallet::storage]
 	#[pallet::getter(fn pending_change)]
 	pub(super) type PendingChange<T: Config> =
-		StorageValue<_, StoredPendingChange<T::BlockNumber, T::MaxAuthorities>>;
+		StorageValue<_, StoredPendingChange<frame_system::BlockNumberOf<T>, T::MaxAuthorities>>;
 
 	/// next block number where we can force a change.
 	#[pallet::storage]
 	#[pallet::getter(fn next_forced)]
-	pub(super) type NextForced<T: Config> = StorageValue<_, T::BlockNumber>;
+	pub(super) type NextForced<T: Config> = StorageValue<_, frame_system::BlockNumberOf<T>>;
 
 	/// `true` if we are currently stalled.
 	#[pallet::storage]
 	#[pallet::getter(fn stalled)]
-	pub(super) type Stalled<T: Config> = StorageValue<_, (T::BlockNumber, T::BlockNumber)>;
+	pub(super) type Stalled<T: Config> =
+		StorageValue<_, (frame_system::BlockNumberOf<T>, frame_system::BlockNumberOf<T>)>;
 
 	/// The number of changes (both in terms of keys and underlying economic responsibilities)
 	/// in the "set" of Grandpa validators from genesis.
@@ -427,7 +432,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Schedule GRANDPA to pause starting in the given number of blocks.
 	/// Cannot be done when already paused.
-	pub fn schedule_pause(in_blocks: T::BlockNumber) -> DispatchResult {
+	pub fn schedule_pause(in_blocks: frame_system::BlockNumberOf<T>) -> DispatchResult {
 		if let StoredState::Live = <State<T>>::get() {
 			let scheduled_at = <frame_system::Pallet<T>>::block_number();
 			<State<T>>::put(StoredState::PendingPause { delay: in_blocks, scheduled_at });
@@ -439,7 +444,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Schedule a resume of GRANDPA after pausing.
-	pub fn schedule_resume(in_blocks: T::BlockNumber) -> DispatchResult {
+	pub fn schedule_resume(in_blocks: frame_system::BlockNumberOf<T>) -> DispatchResult {
 		if let StoredState::Paused = <State<T>>::get() {
 			let scheduled_at = <frame_system::Pallet<T>>::block_number();
 			<State<T>>::put(StoredState::PendingResume { delay: in_blocks, scheduled_at });
@@ -466,8 +471,8 @@ impl<T: Config> Pallet<T> {
 	/// an error if a change is already pending.
 	pub fn schedule_change(
 		next_authorities: AuthorityList,
-		in_blocks: T::BlockNumber,
-		forced: Option<T::BlockNumber>,
+		in_blocks: frame_system::BlockNumberOf<T>,
+		forced: Option<frame_system::BlockNumberOf<T>>,
 	) -> DispatchResult {
 		if !<PendingChange<T>>::exists() {
 			let scheduled_at = <frame_system::Pallet<T>>::block_number();
@@ -504,7 +509,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Deposit one of this module's logs.
-	fn deposit_log(log: ConsensusLog<T::BlockNumber>) {
+	fn deposit_log(log: ConsensusLog<frame_system::BlockNumberOf<T>>) {
 		let log = DigestItem::Consensus(GRANDPA_ENGINE_ID, log.encode());
 		<frame_system::Pallet<T>>::deposit_log(log);
 	}
@@ -528,13 +533,16 @@ impl<T: Config> Pallet<T> {
 	/// will push the transaction to the pool. Only useful in an offchain
 	/// context.
 	pub fn submit_unsigned_equivocation_report(
-		equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
+		equivocation_proof: EquivocationProof<T::Hash, frame_system::BlockNumberOf<T>>,
 		key_owner_proof: T::KeyOwnerProof,
 	) -> Option<()> {
 		T::EquivocationReportSystem::publish_evidence((equivocation_proof, key_owner_proof)).ok()
 	}
 
-	fn on_stalled(further_wait: T::BlockNumber, median: T::BlockNumber) {
+	fn on_stalled(
+		further_wait: frame_system::BlockNumberOf<T>,
+		median: frame_system::BlockNumberOf<T>,
+	) {
 		// when we record old authority sets we could try to figure out _who_
 		// failed. until then, we can't meaningfully guard against
 		// `next == last` the way that normal session changes do.
diff --git a/frame/grandpa/src/mock.rs b/frame/grandpa/src/mock.rs
index df012ab9dc6e8..ecd39307396db 100644
--- a/frame/grandpa/src/mock.rs
+++ b/frame/grandpa/src/mock.rs
@@ -36,20 +36,16 @@ use sp_keyring::Ed25519Keyring;
 use sp_runtime::{
 	curve::PiecewiseLinear,
 	impl_opaque_keys,
-	testing::{Header, TestXt, UintAuthorityId},
+	testing::{TestXt, UintAuthorityId},
 	traits::{IdentityLookup, OpaqueKeys},
 	DigestItem, Perbill,
 };
 use sp_staking::{EraIndex, SessionIndex};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Authorship: pallet_authorship,
@@ -76,13 +72,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/identity/src/tests.rs b/frame/identity/src/tests.rs
index 83035c402a7dc..a283d77e65575 100644
--- a/frame/identity/src/tests.rs
+++ b/frame/identity/src/tests.rs
@@ -28,19 +28,12 @@ use frame_support::{
 };
 use frame_system::{EnsureRoot, EnsureSignedBy};
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BadOrigin, BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -54,13 +47,12 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/im-online/src/benchmarking.rs b/frame/im-online/src/benchmarking.rs
index 4766e5edaadcf..87701541ac072 100644
--- a/frame/im-online/src/benchmarking.rs
+++ b/frame/im-online/src/benchmarking.rs
@@ -36,7 +36,10 @@ const MAX_KEYS: u32 = 1000;
 pub fn create_heartbeat<T: Config>(
 	k: u32,
 ) -> Result<
-	(crate::Heartbeat<T::BlockNumber>, <T::AuthorityId as RuntimeAppPublic>::Signature),
+	(
+		crate::Heartbeat<frame_system::BlockNumberOf<T>>,
+		<T::AuthorityId as RuntimeAppPublic>::Signature,
+	),
 	&'static str,
 > {
 	let mut keys = Vec::new();
@@ -48,7 +51,7 @@ pub fn create_heartbeat<T: Config>(
 	Keys::<T>::put(bounded_keys);
 
 	let input_heartbeat = Heartbeat {
-		block_number: T::BlockNumber::zero(),
+		block_number: frame_system::BlockNumberOf::<T>::zero(),
 		session_index: 0,
 		authority_index: k - 1,
 		validators_len: keys.len() as u32,
diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs
index 1f9557a427293..2b2248d45de01 100644
--- a/frame/im-online/src/lib.rs
+++ b/frame/im-online/src/lib.rs
@@ -245,7 +245,7 @@ pub type IdentificationTuple<T> = (
 	>>::Identification,
 );
 
-type OffchainResult<T, A> = Result<A, OffchainErr<<T as frame_system::Config>::BlockNumber>>;
+type OffchainResult<T, A> = Result<A, OffchainErr<frame_system::BlockNumberOf<T>>>;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -287,7 +287,7 @@ pub mod pallet {
 		/// rough time when we should start considering sending heartbeats, since the workers
 		/// avoids sending them at the very beginning of the session, assuming there is a
 		/// chance the authority will produce a block and they won't be necessary.
-		type NextSessionRotation: EstimateNextSessionRotation<Self::BlockNumber>;
+		type NextSessionRotation: EstimateNextSessionRotation<frame_system::BlockNumberOf<Self>>;
 
 		/// A type that gives us the ability to submit unresponsiveness offence reports.
 		type ReportUnresponsiveness: ReportOffence<
@@ -339,7 +339,8 @@ pub mod pallet {
 	/// more accurate then the value we calculate for `HeartbeatAfter`.
 	#[pallet::storage]
 	#[pallet::getter(fn heartbeat_after)]
-	pub(super) type HeartbeatAfter<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub(crate) type HeartbeatAfter<T: Config> =
+		StorageValue<_, frame_system::BlockNumberOf<T>, ValueQuery>;
 
 	/// The current set of keys that may issue a heartbeat.
 	#[pallet::storage]
@@ -393,7 +394,7 @@ pub mod pallet {
 		))]
 		pub fn heartbeat(
 			origin: OriginFor<T>,
-			heartbeat: Heartbeat<T::BlockNumber>,
+			heartbeat: Heartbeat<frame_system::BlockNumberOf<T>>,
 			// since signature verification is done in `validate_unsigned`
 			// we can skip doing it here again.
 			_signature: <T::AuthorityId as RuntimeAppPublic>::Signature,
@@ -505,7 +506,7 @@ pub mod pallet {
 /// Keep track of number of authored blocks per authority, uncles are counted as
 /// well since they're a valid proof of being online.
 impl<T: Config + pallet_authorship::Config>
-	pallet_authorship::EventHandler<ValidatorId<T>, T::BlockNumber> for Pallet<T>
+	pallet_authorship::EventHandler<ValidatorId<T>, frame_system::BlockNumberOf<T>> for Pallet<T>
 {
 	fn note_author(author: ValidatorId<T>) {
 		Self::note_authorship(author);
@@ -551,7 +552,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub(crate) fn send_heartbeats(
-		block_number: T::BlockNumber,
+		block_number: frame_system::BlockNumberOf<T>,
 	) -> OffchainResult<T, impl Iterator<Item = OffchainResult<T, ()>>> {
 		const START_HEARTBEAT_RANDOM_PERIOD: Permill = Permill::from_percent(10);
 		const START_HEARTBEAT_FINAL_PERIOD: Permill = Permill::from_percent(80);
@@ -614,7 +615,7 @@ impl<T: Config> Pallet<T> {
 		authority_index: u32,
 		key: T::AuthorityId,
 		session_index: SessionIndex,
-		block_number: T::BlockNumber,
+		block_number: frame_system::BlockNumberOf<T>,
 		validators_len: u32,
 	) -> OffchainResult<T, ()> {
 		// A helper function to prepare heartbeat call.
@@ -677,7 +678,7 @@ impl<T: Config> Pallet<T> {
 	fn with_heartbeat_lock<R>(
 		authority_index: u32,
 		session_index: SessionIndex,
-		now: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
 		f: impl FnOnce() -> OffchainResult<T, R>,
 	) -> OffchainResult<T, R> {
 		let key = {
@@ -687,7 +688,10 @@ impl<T: Config> Pallet<T> {
 		};
 		let storage = StorageValueRef::persistent(&key);
 		let res = storage.mutate(
-			|status: Result<Option<HeartbeatStatus<T::BlockNumber>>, StorageRetrievalError>| {
+			|status: Result<
+				Option<HeartbeatStatus<frame_system::BlockNumberOf<T>>>,
+				StorageRetrievalError,
+			>| {
 				// Check if there is already a lock for that particular block.
 				// This means that the heartbeat has already been sent, and we are just waiting
 				// for it to be included. However if it doesn't get included for INCLUDE_THRESHOLD
diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
index 78a86edf54598..6a2b27e6ece0a 100644
--- a/frame/im-online/src/mock.rs
+++ b/frame/im-online/src/mock.rs
@@ -27,7 +27,7 @@ use frame_support::{
 use pallet_session::historical as pallet_session_historical;
 use sp_core::H256;
 use sp_runtime::{
-	testing::{Header, TestXt, UintAuthorityId},
+	testing::{TestXt, UintAuthorityId},
 	traits::{BlakeTwo256, ConvertInto, IdentityLookup},
 	Permill,
 };
@@ -39,14 +39,10 @@ use sp_staking::{
 use crate as imonline;
 use crate::Config;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
@@ -124,13 +120,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/indices/src/mock.rs b/frame/indices/src/mock.rs
index f54e4dfa088dc..52e6d7d836be6 100644
--- a/frame/indices/src/mock.rs
+++ b/frame/indices/src/mock.rs
@@ -22,16 +22,11 @@
 use crate::{self as pallet_indices, Config};
 use frame_support::traits::{ConstU32, ConstU64};
 use sp_core::H256;
-use sp_runtime::testing::Header;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -47,12 +42,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = Indices;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/insecure-randomness-collective-flip/src/lib.rs b/frame/insecure-randomness-collective-flip/src/lib.rs
index ad39c4c4fd885..cbc22f05714a7 100644
--- a/frame/insecure-randomness-collective-flip/src/lib.rs
+++ b/frame/insecure-randomness-collective-flip/src/lib.rs
@@ -78,7 +78,7 @@ use sp_runtime::traits::{Hash, Saturating};
 
 const RANDOM_MATERIAL_LEN: u32 = 81;
 
-fn block_number_to_index<T: Config>(block_number: T::BlockNumber) -> usize {
+fn block_number_to_index<T: Config>(block_number: frame_system::BlockNumberOf<T>) -> usize {
 	// on_initialize is called on the first block after genesis
 	let index = (block_number - 1u32.into()) % RANDOM_MATERIAL_LEN.into();
 	index.try_into().ok().expect("Something % 81 is always smaller than usize; qed")
@@ -100,7 +100,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(block_number: T::BlockNumber) -> Weight {
+		fn on_initialize(block_number: frame_system::BlockNumberOf<T>) -> Weight {
 			let parent_hash = <frame_system::Pallet<T>>::parent_hash();
 
 			<RandomMaterial<T>>::mutate(|ref mut values| {
@@ -123,7 +123,7 @@ pub mod pallet {
 		StorageValue<_, BoundedVec<T::Hash, ConstU32<RANDOM_MATERIAL_LEN>>, ValueQuery>;
 }
 
-impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Pallet<T> {
+impl<T: Config> Randomness<T::Hash, frame_system::BlockNumberOf<T>> for Pallet<T> {
 	/// This randomness uses a low-influence function, drawing upon the block hashes from the
 	/// previous 81 blocks. Its result for any given subject will be known far in advance by anyone
 	/// observing the chain. Any block producer has significant influence over their block hashes
@@ -134,7 +134,7 @@ impl<T: Config> Randomness<T::Hash, T::BlockNumber> for Pallet<T> {
 	/// WARNING: Hashing the result of this function will remove any low-influence properties it has
 	/// and mean that all bits of the resulting value are entirely manipulatable by the author of
 	/// the parent block, who can determine the value of `parent_hash`.
-	fn random(subject: &[u8]) -> (T::Hash, T::BlockNumber) {
+	fn random(subject: &[u8]) -> (T::Hash, frame_system::BlockNumberOf<T>) {
 		let block_number = <frame_system::Pallet<T>>::block_number();
 		let index = block_number_to_index::<T>(block_number);
 
@@ -163,10 +163,7 @@ mod tests {
 	use crate as pallet_insecure_randomness_collective_flip;
 
 	use sp_core::H256;
-	use sp_runtime::{
-		testing::Header,
-		traits::{BlakeTwo256, Header as _, IdentityLookup},
-	};
+	use sp_runtime::traits::{BlakeTwo256, Header as _, IdentityLookup};
 
 	use frame_support::{
 		parameter_types,
@@ -174,14 +171,10 @@ mod tests {
 	};
 	use frame_system::limits;
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			CollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage},
@@ -200,13 +193,12 @@ mod tests {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
-		type BlockNumber = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = ();
diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs
index 178f221a8946f..43a43fba352ce 100644
--- a/frame/lottery/src/lib.rs
+++ b/frame/lottery/src/lib.rs
@@ -142,7 +142,7 @@ pub mod pallet {
 		type Currency: ReservableCurrency<Self::AccountId>;
 
 		/// Something that provides randomness in the runtime.
-		type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
+		type Randomness: Randomness<Self::Hash, frame_system::BlockNumberOf<Self>>;
 
 		/// The overarching event type.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
@@ -208,7 +208,7 @@ pub mod pallet {
 	/// The configuration for the current lottery.
 	#[pallet::storage]
 	pub(crate) type Lottery<T: Config> =
-		StorageValue<_, LotteryConfig<T::BlockNumber, BalanceOf<T>>>;
+		StorageValue<_, LotteryConfig<frame_system::BlockNumberOf<T>, BalanceOf<T>>>;
 
 	/// Users who have purchased a ticket. (Lottery Index, Tickets Purchased)
 	#[pallet::storage]
@@ -239,7 +239,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			Lottery::<T>::mutate(|mut lottery| -> Weight {
 				if let Some(config) = &mut lottery {
 					let payout_block =
@@ -350,8 +350,8 @@ pub mod pallet {
 		pub fn start_lottery(
 			origin: OriginFor<T>,
 			price: BalanceOf<T>,
-			length: T::BlockNumber,
-			delay: T::BlockNumber,
+			length: frame_system::BlockNumberOf<T>,
+			delay: frame_system::BlockNumberOf<T>,
 			repeat: bool,
 		) -> DispatchResult {
 			T::ManagerOrigin::ensure_origin(origin)?;
diff --git a/frame/lottery/src/mock.rs b/frame/lottery/src/mock.rs
index d89c9d6890ee2..c200a8ff40ba4 100644
--- a/frame/lottery/src/mock.rs
+++ b/frame/lottery/src/mock.rs
@@ -28,19 +28,14 @@ use frame_support_test::TestRandomness;
 use frame_system::EnsureRoot;
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	Perbill,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -60,12 +55,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
 	type RuntimeCall = RuntimeCall;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs
index 74891186a4e22..f87da5f93858d 100644
--- a/frame/membership/src/lib.rs
+++ b/frame/membership/src/lib.rs
@@ -523,10 +523,7 @@ mod tests {
 	use crate as pallet_membership;
 
 	use sp_core::H256;
-	use sp_runtime::{
-		testing::Header,
-		traits::{BadOrigin, BlakeTwo256, IdentityLookup},
-	};
+	use sp_runtime::traits::{BadOrigin, BlakeTwo256, IdentityLookup};
 
 	use frame_support::{
 		assert_noop, assert_ok, bounded_vec, ord_parameter_types, parameter_types,
@@ -534,14 +531,10 @@ mod tests {
 	};
 	use frame_system::EnsureSignedBy;
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Membership: pallet_membership::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -560,13 +553,12 @@ mod tests {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
-		type BlockNumber = u64;
 		type Hash = H256;
 		type RuntimeCall = RuntimeCall;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = ();
diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs
index 3adad1e955481..890d00256bfd8 100644
--- a/frame/merkle-mountain-range/src/lib.rs
+++ b/frame/merkle-mountain-range/src/lib.rs
@@ -91,7 +91,7 @@ pub struct ParentNumberAndHash<T: frame_system::Config> {
 }
 
 impl<T: frame_system::Config> LeafDataProvider for ParentNumberAndHash<T> {
-	type LeafData = (<T as frame_system::Config>::BlockNumber, <T as frame_system::Config>::Hash);
+	type LeafData = (frame_system::BlockNumberOf<T>, <T as frame_system::Config>::Hash);
 
 	fn leaf_data() -> Self::LeafData {
 		(
@@ -201,7 +201,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
-		fn on_initialize(_n: T::BlockNumber) -> Weight {
+		fn on_initialize(_n: frame_system::BlockNumberOf<T>) -> Weight {
 			use primitives::LeafDataProvider;
 			let leaves = Self::mmr_leaves();
 			let peaks_before = sp_mmr_primitives::utils::NodesUtils::new(leaves).number_of_peaks();
@@ -266,7 +266,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		pos: NodeIndex,
 		parent_hash: <T as frame_system::Config>::Hash,
 	) -> sp_std::prelude::Vec<u8> {
-		NodesUtils::node_temp_offchain_key::<<T as frame_system::Config>::Header>(
+		NodesUtils::node_temp_offchain_key::<frame_system::HeaderOf<T>>(
 			&T::INDEXING_PREFIX,
 			pos,
 			parent_hash,
@@ -286,7 +286,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn leaf_index_to_parent_block_num(
 		leaf_index: LeafIndex,
 		leaves_count: LeafIndex,
-	) -> <T as frame_system::Config>::BlockNumber {
+	) -> frame_system::BlockNumberOf<T> {
 		// leaves are zero-indexed and were added one per block since pallet activation,
 		// while block numbers are one-indexed, so block number that added `leaf_idx` is:
 		// `block_num = block_num_when_pallet_activated + leaf_idx + 1`
@@ -298,16 +298,18 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	}
 
 	/// Convert a block number into a leaf index.
-	fn block_num_to_leaf_index(block_num: T::BlockNumber) -> Result<LeafIndex, Error>
+	fn block_num_to_leaf_index(
+		block_num: frame_system::BlockNumberOf<T>,
+	) -> Result<LeafIndex, Error>
 	where
 		T: frame_system::Config,
 	{
-		let first_mmr_block = utils::first_mmr_block_num::<T::Header>(
+		let first_mmr_block = utils::first_mmr_block_num::<frame_system::HeaderOf<T>>(
 			<frame_system::Pallet<T>>::block_number(),
 			Self::mmr_leaves(),
 		)?;
 
-		utils::block_num_to_leaf_index::<T::Header>(block_num, first_mmr_block)
+		utils::block_num_to_leaf_index::<frame_system::HeaderOf<T>>(block_num, first_mmr_block)
 	}
 
 	/// Generate an MMR proof for the given `block_numbers`.
@@ -320,8 +322,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// all the leaves to be present.
 	/// It may return an error or panic if used incorrectly.
 	pub fn generate_proof(
-		block_numbers: Vec<T::BlockNumber>,
-		best_known_block_number: Option<T::BlockNumber>,
+		block_numbers: Vec<frame_system::BlockNumberOf<T>>,
+		best_known_block_number: Option<frame_system::BlockNumberOf<T>>,
 	) -> Result<(Vec<LeafOf<T, I>>, primitives::Proof<HashOf<T, I>>), primitives::Error> {
 		// check whether best_known_block_number provided, else use current best block
 		let best_known_block_number =
diff --git a/frame/merkle-mountain-range/src/mock.rs b/frame/merkle-mountain-range/src/mock.rs
index cea426368c35c..ffc4b147ae5b1 100644
--- a/frame/merkle-mountain-range/src/mock.rs
+++ b/frame/merkle-mountain-range/src/mock.rs
@@ -25,19 +25,12 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_mmr_primitives::{Compact, LeafDataProvider};
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, Keccak256},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup, Keccak256};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		MMR: pallet_mmr::{Pallet, Storage},
@@ -49,12 +42,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = sp_core::sr25519::Public;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/merkle-mountain-range/src/tests.rs b/frame/merkle-mountain-range/src/tests.rs
index b628b51d2938b..ac608d459b1ff 100644
--- a/frame/merkle-mountain-range/src/tests.rs
+++ b/frame/merkle-mountain-range/src/tests.rs
@@ -53,7 +53,7 @@ pub(crate) fn hex(s: &str) -> H256 {
 	s.parse().unwrap()
 }
 
-type BlockNumber = <Test as frame_system::Config>::BlockNumber;
+type BlockNumber = frame_system::BlockNumberOf<Test>;
 
 fn decode_node(
 	v: Vec<u8>,
diff --git a/frame/message-queue/src/integration_test.rs b/frame/message-queue/src/integration_test.rs
index 255098b3b1415..172b1b4a7351f 100644
--- a/frame/message-queue/src/integration_test.rs
+++ b/frame/message-queue/src/integration_test.rs
@@ -37,20 +37,13 @@ use frame_support::{
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use rand_distr::Pareto;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 use std::collections::{BTreeMap, BTreeSet};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>},
@@ -64,13 +57,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/message-queue/src/mock.rs b/frame/message-queue/src/mock.rs
index 71f0b0fa20e30..f6fca3bbe3a97 100644
--- a/frame/message-queue/src/mock.rs
+++ b/frame/message-queue/src/mock.rs
@@ -28,20 +28,13 @@ use frame_support::{
 	traits::{ConstU32, ConstU64},
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 use sp_std::collections::btree_map::BTreeMap;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>},
@@ -54,13 +47,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
@@ -275,7 +267,7 @@ impl OnQueueChanged<MessageOrigin> for RecordingQueueChangeHandler {
 /// Is generic since it is used by the unit test, integration tests and benchmarks.
 pub fn new_test_ext<T: Config>() -> sp_io::TestExternalities
 where
-	<T as frame_system::Config>::BlockNumber: From<u32>,
+	frame_system::BlockNumberOf<T>: From<u32>,
 {
 	sp_tracing::try_init_simple();
 	WeightForCall::take();
diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs
index 64058be9c8fbf..504343a76cff9 100644
--- a/frame/multisig/src/lib.rs
+++ b/frame/multisig/src/lib.rs
@@ -183,7 +183,7 @@ pub mod pallet {
 		T::AccountId,
 		Blake2_128Concat,
 		[u8; 32],
-		Multisig<T::BlockNumber, BalanceOf<T>, T::AccountId, T::MaxSignatories>,
+		Multisig<frame_system::BlockNumberOf<T>, BalanceOf<T>, T::AccountId, T::MaxSignatories>,
 	>;
 
 	#[pallet::error]
@@ -226,14 +226,14 @@ pub mod pallet {
 		/// A multisig operation has been approved by someone.
 		MultisigApproval {
 			approving: T::AccountId,
-			timepoint: Timepoint<T::BlockNumber>,
+			timepoint: Timepoint<frame_system::BlockNumberOf<T>>,
 			multisig: T::AccountId,
 			call_hash: CallHash,
 		},
 		/// A multisig operation has been executed.
 		MultisigExecuted {
 			approving: T::AccountId,
-			timepoint: Timepoint<T::BlockNumber>,
+			timepoint: Timepoint<frame_system::BlockNumberOf<T>>,
 			multisig: T::AccountId,
 			call_hash: CallHash,
 			result: DispatchResult,
@@ -241,7 +241,7 @@ pub mod pallet {
 		/// A multisig operation has been cancelled.
 		MultisigCancelled {
 			cancelling: T::AccountId,
-			timepoint: Timepoint<T::BlockNumber>,
+			timepoint: Timepoint<frame_system::BlockNumberOf<T>>,
 			multisig: T::AccountId,
 			call_hash: CallHash,
 		},
@@ -366,7 +366,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
-			maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
+			maybe_timepoint: Option<Timepoint<frame_system::BlockNumberOf<T>>>,
 			call: Box<<T as Config>::RuntimeCall>,
 			max_weight: Weight,
 		) -> DispatchResultWithPostInfo {
@@ -423,7 +423,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
-			maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
+			maybe_timepoint: Option<Timepoint<frame_system::BlockNumberOf<T>>>,
 			call_hash: [u8; 32],
 			max_weight: Weight,
 		) -> DispatchResultWithPostInfo {
@@ -465,7 +465,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			threshold: u16,
 			other_signatories: Vec<T::AccountId>,
-			timepoint: Timepoint<T::BlockNumber>,
+			timepoint: Timepoint<frame_system::BlockNumberOf<T>>,
 			call_hash: [u8; 32],
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -511,7 +511,7 @@ impl<T: Config> Pallet<T> {
 		who: T::AccountId,
 		threshold: u16,
 		other_signatories: Vec<T::AccountId>,
-		maybe_timepoint: Option<Timepoint<T::BlockNumber>>,
+		maybe_timepoint: Option<Timepoint<frame_system::BlockNumberOf<T>>>,
 		call_or_hash: CallOrHash<T>,
 		max_weight: Weight,
 	) -> DispatchResultWithPostInfo {
@@ -637,7 +637,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// The current `Timepoint`.
-	pub fn timepoint() -> Timepoint<T::BlockNumber> {
+	pub fn timepoint() -> Timepoint<frame_system::BlockNumberOf<T>> {
 		Timepoint {
 			height: <system::Pallet<T>>::block_number(),
 			index: <system::Pallet<T>>::extrinsic_index().unwrap_or_default(),
diff --git a/frame/multisig/src/tests.rs b/frame/multisig/src/tests.rs
index cc0fbc8098936..bdb5ae5a18210 100644
--- a/frame/multisig/src/tests.rs
+++ b/frame/multisig/src/tests.rs
@@ -28,19 +28,14 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	TokenError,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -55,13 +50,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/nft-fractionalization/src/benchmarking.rs b/frame/nft-fractionalization/src/benchmarking.rs
index 50bb6039eb6ec..09567f676bbfd 100644
--- a/frame/nft-fractionalization/src/benchmarking.rs
+++ b/frame/nft-fractionalization/src/benchmarking.rs
@@ -39,11 +39,8 @@ use crate::Pallet as NftFractionalization;
 type BalanceOf<T> =
 	<<T as Config>::Currency as InspectFungible<<T as SystemConfig>::AccountId>>::Balance;
 
-type CollectionConfigOf<T> = CollectionConfig<
-	BalanceOf<T>,
-	<T as SystemConfig>::BlockNumber,
-	<T as Config>::NftCollectionId,
->;
+type CollectionConfigOf<T> =
+	CollectionConfig<BalanceOf<T>, frame_system::BlockNumberOf<T>, <T as Config>::NftCollectionId>;
 
 fn default_collection_config<T: Config>() -> CollectionConfigOf<T>
 where
@@ -58,8 +55,10 @@ where
 
 fn mint_nft<T: Config>(nft_id: T::NftId) -> (T::AccountId, AccountIdLookupOf<T>)
 where
-	T::Nfts: Create<T::AccountId, CollectionConfig<BalanceOf<T>, T::BlockNumber, T::NftCollectionId>>
-		+ Mutate<T::AccountId, ItemConfig>,
+	T::Nfts: Create<
+			T::AccountId,
+			CollectionConfig<BalanceOf<T>, frame_system::BlockNumberOf<T>, T::NftCollectionId>,
+		> + Mutate<T::AccountId, ItemConfig>,
 {
 	let caller: T::AccountId = whitelisted_caller();
 	let caller_lookup = T::Lookup::unlookup(caller.clone());
@@ -84,7 +83,7 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 benchmarks! {
 	where_clause {
 		where
-			T::Nfts: Create<T::AccountId, CollectionConfig<BalanceOf<T>, T::BlockNumber, T::NftCollectionId>>
+			T::Nfts: Create<T::AccountId, CollectionConfig<BalanceOf<T>, frame_system::BlockNumberOf<T>, T::NftCollectionId>>
 				+ Mutate<T::AccountId, ItemConfig>,
 	}
 
diff --git a/frame/nft-fractionalization/src/mock.rs b/frame/nft-fractionalization/src/mock.rs
index 62ff3df5b1a0f..e68852b24c190 100644
--- a/frame/nft-fractionalization/src/mock.rs
+++ b/frame/nft-fractionalization/src/mock.rs
@@ -29,12 +29,10 @@ use frame_system::EnsureSigned;
 use pallet_nfts::PalletFeatures;
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify},
 	MultiSignature,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 type Signature = MultiSignature;
 type AccountPublic = <Signature as Verify>::Signer;
@@ -42,10 +40,7 @@ type AccountId = <AccountPublic as IdentifyAccount>::AccountId;
 
 // Configure a mock runtime to test the pallet.
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		NftFractionalization: pallet_nft_fractionalization,
@@ -61,12 +56,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/nfts/src/benchmarking.rs b/frame/nfts/src/benchmarking.rs
index 2be115f17a474..a4de0fc70ba37 100644
--- a/frame/nfts/src/benchmarking.rs
+++ b/frame/nfts/src/benchmarking.rs
@@ -589,7 +589,7 @@ benchmarks_instance_pallet! {
 		let (item, ..) = mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-		let deadline = T::BlockNumber::max_value();
+		let deadline = frame_system::BlockNumberOf::<T>::max_value();
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item, delegate_lookup, Some(deadline))
 	verify {
 		assert_last_event::<T, I>(Event::TransferApproved { collection, item, owner: caller, delegate, deadline: Some(deadline) }.into());
@@ -601,7 +601,7 @@ benchmarks_instance_pallet! {
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		let deadline = T::BlockNumber::max_value();
+		let deadline = frame_system::BlockNumberOf::<T>::max_value();
 		Nfts::<T, I>::approve_transfer(origin, collection, item, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item, delegate_lookup)
 	verify {
@@ -614,7 +614,7 @@ benchmarks_instance_pallet! {
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		let deadline = T::BlockNumber::max_value();
+		let deadline = frame_system::BlockNumberOf::<T>::max_value();
 		Nfts::<T, I>::approve_transfer(origin, collection, item, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item)
 	verify {
diff --git a/frame/nfts/src/features/approvals.rs b/frame/nfts/src/features/approvals.rs
index 634436a8562d8..ff28553fa295d 100644
--- a/frame/nfts/src/features/approvals.rs
+++ b/frame/nfts/src/features/approvals.rs
@@ -24,7 +24,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		collection: T::CollectionId,
 		item: T::ItemId,
 		delegate: T::AccountId,
-		maybe_deadline: Option<<T as SystemConfig>::BlockNumber>,
+		maybe_deadline: Option<frame_system::BlockNumberOf<T>>,
 	) -> DispatchResult {
 		ensure!(
 			Self::is_pallet_feature_enabled(PalletFeature::Approvals),
diff --git a/frame/nfts/src/features/atomic_swap.rs b/frame/nfts/src/features/atomic_swap.rs
index 505056be95353..e10a00995e1e6 100644
--- a/frame/nfts/src/features/atomic_swap.rs
+++ b/frame/nfts/src/features/atomic_swap.rs
@@ -29,7 +29,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		desired_collection_id: T::CollectionId,
 		maybe_desired_item_id: Option<T::ItemId>,
 		maybe_price: Option<PriceWithDirection<ItemPrice<T, I>>>,
-		duration: <T as SystemConfig>::BlockNumber,
+		duration: frame_system::BlockNumberOf<T>,
 	) -> DispatchResult {
 		ensure!(
 			Self::is_pallet_feature_enabled(PalletFeature::Swaps),
diff --git a/frame/nfts/src/features/settings.rs b/frame/nfts/src/features/settings.rs
index 080d7b97f13b1..cb5527c7e7e11 100644
--- a/frame/nfts/src/features/settings.rs
+++ b/frame/nfts/src/features/settings.rs
@@ -61,7 +61,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		collection: T::CollectionId,
 		mint_settings: MintSettings<
 			BalanceOf<T, I>,
-			<T as SystemConfig>::BlockNumber,
+			frame_system::BlockNumberOf<T>,
 			T::CollectionId,
 		>,
 	) -> DispatchResult {
diff --git a/frame/nfts/src/lib.rs b/frame/nfts/src/lib.rs
index f2812674a5408..bb0e554cd383f 100644
--- a/frame/nfts/src/lib.rs
+++ b/frame/nfts/src/lib.rs
@@ -171,7 +171,7 @@ pub mod pallet {
 
 		/// The max duration in blocks for deadlines.
 		#[pallet::constant]
-		type MaxDeadlineDuration: Get<<Self as SystemConfig>::BlockNumber>;
+		type MaxDeadlineDuration: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The max number of attributes a user could set per call.
 		#[pallet::constant]
@@ -343,7 +343,7 @@ pub mod pallet {
 			T::CollectionId,
 			T::ItemId,
 			PriceWithDirection<ItemPrice<T, I>>,
-			<T as SystemConfig>::BlockNumber,
+			frame_system::BlockNumberOf<T>,
 		>,
 		OptionQuery,
 	>;
@@ -414,7 +414,7 @@ pub mod pallet {
 			item: T::ItemId,
 			owner: T::AccountId,
 			delegate: T::AccountId,
-			deadline: Option<<T as SystemConfig>::BlockNumber>,
+			deadline: Option<frame_system::BlockNumberOf<T>>,
 		},
 		/// An approval for a `delegate` account to transfer the `item` of an item
 		/// `collection` was cancelled by its `owner`.
@@ -509,7 +509,7 @@ pub mod pallet {
 			desired_collection: T::CollectionId,
 			desired_item: Option<T::ItemId>,
 			price: Option<PriceWithDirection<ItemPrice<T, I>>>,
-			deadline: <T as SystemConfig>::BlockNumber,
+			deadline: frame_system::BlockNumberOf<T>,
 		},
 		/// The swap was cancelled.
 		SwapCancelled {
@@ -518,7 +518,7 @@ pub mod pallet {
 			desired_collection: T::CollectionId,
 			desired_item: Option<T::ItemId>,
 			price: Option<PriceWithDirection<ItemPrice<T, I>>>,
-			deadline: <T as SystemConfig>::BlockNumber,
+			deadline: frame_system::BlockNumberOf<T>,
 		},
 		/// The swap has been claimed.
 		SwapClaimed {
@@ -529,7 +529,7 @@ pub mod pallet {
 			received_item: T::ItemId,
 			received_item_owner: T::AccountId,
 			price: Option<PriceWithDirection<ItemPrice<T, I>>>,
-			deadline: <T as SystemConfig>::BlockNumber,
+			deadline: frame_system::BlockNumberOf<T>,
 		},
 		/// New attributes have been set for an `item` of the `collection`.
 		PreSignedAttributesSet {
@@ -1236,7 +1236,7 @@ pub mod pallet {
 			collection: T::CollectionId,
 			item: T::ItemId,
 			delegate: AccountIdLookupOf<T>,
-			maybe_deadline: Option<<T as SystemConfig>::BlockNumber>,
+			maybe_deadline: Option<frame_system::BlockNumberOf<T>>,
 		) -> DispatchResult {
 			let maybe_check_origin = T::ForceOrigin::try_origin(origin)
 				.map(|_| None)
@@ -1661,7 +1661,7 @@ pub mod pallet {
 			collection: T::CollectionId,
 			mint_settings: MintSettings<
 				BalanceOf<T, I>,
-				<T as SystemConfig>::BlockNumber,
+				frame_system::BlockNumberOf<T>,
 				T::CollectionId,
 			>,
 		) -> DispatchResult {
@@ -1759,7 +1759,7 @@ pub mod pallet {
 			desired_collection: T::CollectionId,
 			maybe_desired_item: Option<T::ItemId>,
 			maybe_price: Option<PriceWithDirection<ItemPrice<T, I>>>,
-			duration: <T as SystemConfig>::BlockNumber,
+			duration: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
 			Self::do_create_swap(
diff --git a/frame/nfts/src/mock.rs b/frame/nfts/src/mock.rs
index 79f0b341e9fd3..7a96654366df4 100644
--- a/frame/nfts/src/mock.rs
+++ b/frame/nfts/src/mock.rs
@@ -27,19 +27,14 @@ use frame_support::{
 use sp_core::H256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify},
 	MultiSignature,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -58,12 +53,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/nfts/src/types.rs b/frame/nfts/src/types.rs
index ab966f0d73828..8737df50b0475 100644
--- a/frame/nfts/src/types.rs
+++ b/frame/nfts/src/types.rs
@@ -34,7 +34,7 @@ pub(super) type CollectionDetailsFor<T, I> =
 	CollectionDetails<<T as SystemConfig>::AccountId, DepositBalanceOf<T, I>>;
 pub(super) type ApprovalsOf<T, I = ()> = BoundedBTreeMap<
 	<T as SystemConfig>::AccountId,
-	Option<<T as SystemConfig>::BlockNumber>,
+	Option<frame_system::BlockNumberOf<T>>,
 	<T as Config<I>>::ApprovalsLimit,
 >;
 pub(super) type ItemAttributesApprovals<T, I = ()> =
@@ -58,21 +58,21 @@ pub(super) type ItemTipOf<T, I = ()> = ItemTip<
 >;
 pub(super) type CollectionConfigFor<T, I = ()> = CollectionConfig<
 	BalanceOf<T, I>,
-	<T as SystemConfig>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	<T as Config<I>>::CollectionId,
 >;
 pub(super) type PreSignedMintOf<T, I = ()> = PreSignedMint<
 	<T as Config<I>>::CollectionId,
 	<T as Config<I>>::ItemId,
 	<T as SystemConfig>::AccountId,
-	<T as SystemConfig>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	BalanceOf<T, I>,
 >;
 pub(super) type PreSignedAttributesOf<T, I = ()> = PreSignedAttributes<
 	<T as Config<I>>::CollectionId,
 	<T as Config<I>>::ItemId,
 	<T as SystemConfig>::AccountId,
-	<T as SystemConfig>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 >;
 
 /// Information about a collection.
diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs
index 7a7b33051b22e..5f17c79f322dd 100644
--- a/frame/nicks/src/lib.rs
+++ b/frame/nicks/src/lib.rs
@@ -238,19 +238,12 @@ mod tests {
 	};
 	use frame_system::EnsureSignedBy;
 	use sp_core::H256;
-	use sp_runtime::{
-		testing::Header,
-		traits::{BadOrigin, BlakeTwo256, IdentityLookup},
-	};
+	use sp_runtime::traits::{BadOrigin, BlakeTwo256, IdentityLookup};
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system,
 			Balances: pallet_balances,
@@ -265,13 +258,12 @@ mod tests {
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type Index = u64;
-		type BlockNumber = u64;
 		type Hash = H256;
 		type RuntimeCall = RuntimeCall;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = Header;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
 		type BlockHashCount = ConstU64<250>;
 		type Version = ();
diff --git a/frame/nis/src/lib.rs b/frame/nis/src/lib.rs
index 48d322545a635..6937e1215f792 100644
--- a/frame/nis/src/lib.rs
+++ b/frame/nis/src/lib.rs
@@ -188,11 +188,11 @@ pub mod pallet {
 		fungible::Debt<<T as frame_system::Config>::AccountId, <T as Config>::Currency>;
 	type ReceiptRecordOf<T> = ReceiptRecord<
 		<T as frame_system::Config>::AccountId,
-		<T as frame_system::Config>::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		BalanceOf<T>,
 	>;
 	type IssuanceInfoOf<T> = IssuanceInfo<BalanceOf<T>>;
-	type SummaryRecordOf<T> = SummaryRecord<<T as frame_system::Config>::BlockNumber, BalanceOf<T>>;
+	type SummaryRecordOf<T> = SummaryRecord<frame_system::BlockNumberOf<T>, BalanceOf<T>>;
 	type BidOf<T> = Bid<BalanceOf<T>, <T as frame_system::Config>::AccountId>;
 	type QueueTotalsTypeOf<T> = BoundedVec<(u32, BalanceOf<T>), <T as Config>::QueueCount>;
 
@@ -275,7 +275,7 @@ pub mod pallet {
 		/// The base period for the duration queues. This is the common multiple across all
 		/// supported freezing durations that can be bid upon.
 		#[pallet::constant]
-		type BasePeriod: Get<Self::BlockNumber>;
+		type BasePeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The minimum amount of funds that may be placed in a bid. Note that this
 		/// does not actually limit the amount which may be represented in a receipt since bids may
@@ -296,7 +296,7 @@ pub mod pallet {
 		/// A larger value results in fewer storage hits each block, but a slower period to get to
 		/// the target.
 		#[pallet::constant]
-		type IntakePeriod: Get<Self::BlockNumber>;
+		type IntakePeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum amount of bids that can consolidated into receipts in a single intake. A
 		/// larger value here means less of the block available for transactions should there be a
@@ -306,7 +306,7 @@ pub mod pallet {
 
 		/// The maximum proportion which may be thawed and the period over which it is reset.
 		#[pallet::constant]
-		type ThawThrottle: Get<(Perquintill, Self::BlockNumber)>;
+		type ThawThrottle: Get<(Perquintill, frame_system::BlockNumberOf<Self>)>;
 	}
 
 	#[pallet::pallet]
@@ -413,7 +413,7 @@ pub mod pallet {
 			/// The identity of the receipt.
 			index: ReceiptIndex,
 			/// The block number at which the receipt may be thawed.
-			expiry: T::BlockNumber,
+			expiry: frame_system::BlockNumberOf<T>,
 			/// The owner of the receipt.
 			who: T::AccountId,
 			/// The proportion of the effective total issuance which the receipt represents.
@@ -508,7 +508,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			let mut weight_counter =
 				WeightCounter { used: Weight::zero(), limit: T::MaxIntakeWeight::get() };
 			if T::IntakePeriod::get().is_zero() || (n % T::IntakePeriod::get()).is_zero() {
@@ -1062,7 +1062,7 @@ pub mod pallet {
 
 		pub(crate) fn process_queue(
 			duration: u32,
-			now: T::BlockNumber,
+			now: frame_system::BlockNumberOf<T>,
 			our_account: &T::AccountId,
 			issuance: &IssuanceInfo<BalanceOf<T>>,
 			max_bids: u32,
@@ -1106,7 +1106,7 @@ pub mod pallet {
 
 		pub(crate) fn process_bid(
 			mut bid: BidOf<T>,
-			expiry: T::BlockNumber,
+			expiry: frame_system::BlockNumberOf<T>,
 			_our_account: &T::AccountId,
 			issuance: &IssuanceInfo<BalanceOf<T>>,
 			remaining: &mut BalanceOf<T>,
diff --git a/frame/nis/src/mock.rs b/frame/nis/src/mock.rs
index 60aa0f756e9c6..30128bbfe0dcc 100644
--- a/frame/nis/src/mock.rs
+++ b/frame/nis/src/mock.rs
@@ -30,22 +30,15 @@ use frame_support::{
 };
 use pallet_balances::{Instance1, Instance2};
 use sp_core::{ConstU128, H256};
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 pub type Balance = u64;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances::<Instance1>,
@@ -61,12 +54,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs
index 6ccc142431e61..55dbb64bb65e7 100644
--- a/frame/node-authorization/src/lib.rs
+++ b/frame/node-authorization/src/lib.rs
@@ -169,7 +169,7 @@ pub mod pallet {
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Set reserved node every block. It may not be enabled depends on the offchain
 		/// worker settings when starting the node.
-		fn offchain_worker(now: T::BlockNumber) {
+		fn offchain_worker(now: frame_system::BlockNumberOf<T>) {
 			let network_state = sp_io::offchain::network_state();
 			match network_state {
 				Err(_) => log::error!(
diff --git a/frame/node-authorization/src/mock.rs b/frame/node-authorization/src/mock.rs
index b7c5957e15dee..6d915c2b7e048 100644
--- a/frame/node-authorization/src/mock.rs
+++ b/frame/node-authorization/src/mock.rs
@@ -26,19 +26,12 @@ use frame_support::{
 };
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		NodeAuthorization: pallet_node_authorization::{
@@ -54,13 +47,12 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/nomination-pools/benchmarking/src/mock.rs b/frame/nomination-pools/benchmarking/src/mock.rs
index d94c63d1bf5b5..7f7703c795b25 100644
--- a/frame/nomination-pools/benchmarking/src/mock.rs
+++ b/frame/nomination-pools/benchmarking/src/mock.rs
@@ -35,13 +35,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
@@ -175,12 +174,9 @@ impl pallet_nomination_pools::Config for Runtime {
 impl crate::Config for Runtime {}
 
 type Block = frame_system::mocking::MockBlock<Runtime>;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
diff --git a/frame/nomination-pools/src/lib.rs b/frame/nomination-pools/src/lib.rs
index 66c5f786f1e25..803d8ed7532a3 100644
--- a/frame/nomination-pools/src/lib.rs
+++ b/frame/nomination-pools/src/lib.rs
@@ -676,10 +676,10 @@ pub struct Commission<T: Config> {
 	pub max: Option<Perbill>,
 	/// Optional configuration around how often commission can be updated, and when the last
 	/// commission update took place.
-	pub change_rate: Option<CommissionChangeRate<T::BlockNumber>>,
+	pub change_rate: Option<CommissionChangeRate<frame_system::BlockNumberOf<T>>>,
 	/// The block from where throttling should be checked from. This value will be updated on all
 	/// commission updates and when setting an initial `change_rate`.
-	pub throttle_from: Option<T::BlockNumber>,
+	pub throttle_from: Option<frame_system::BlockNumberOf<T>>,
 }
 
 impl<T: Config> Commission<T> {
@@ -813,7 +813,7 @@ impl<T: Config> Commission<T> {
 	/// throttling can be checked from this block.
 	fn try_update_change_rate(
 		&mut self,
-		change_rate: CommissionChangeRate<T::BlockNumber>,
+		change_rate: CommissionChangeRate<frame_system::BlockNumberOf<T>>,
 	) -> DispatchResult {
 		ensure!(!&self.less_restrictive(&change_rate), Error::<T>::CommissionChangeRateNotAllowed);
 
@@ -833,7 +833,7 @@ impl<T: Config> Commission<T> {
 	///
 	/// No change rate will always be less restrictive than some change rate, so where no
 	/// `change_rate` is currently set, `false` is returned.
-	fn less_restrictive(&self, new: &CommissionChangeRate<T::BlockNumber>) -> bool {
+	fn less_restrictive(&self, new: &CommissionChangeRate<frame_system::BlockNumberOf<T>>) -> bool {
 		self.change_rate
 			.as_ref()
 			.map(|c| new.max_increase > c.max_increase || new.min_delay < c.min_delay)
@@ -1761,7 +1761,7 @@ pub mod pallet {
 		/// A pool's commission `change_rate` has been changed.
 		PoolCommissionChangeRateUpdated {
 			pool_id: PoolId,
-			change_rate: CommissionChangeRate<T::BlockNumber>,
+			change_rate: CommissionChangeRate<frame_system::BlockNumberOf<T>>,
 		},
 		/// Pool commission has been claimed.
 		PoolCommissionClaimed { pool_id: PoolId, commission: BalanceOf<T> },
@@ -2597,7 +2597,7 @@ pub mod pallet {
 		pub fn set_commission_change_rate(
 			origin: OriginFor<T>,
 			pool_id: PoolId,
-			change_rate: CommissionChangeRate<T::BlockNumber>,
+			change_rate: CommissionChangeRate<frame_system::BlockNumberOf<T>>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let mut bonded_pool = BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
diff --git a/frame/nomination-pools/src/mock.rs b/frame/nomination-pools/src/mock.rs
index f0b73bbea28da..84812c0b3dd83 100644
--- a/frame/nomination-pools/src/mock.rs
+++ b/frame/nomination-pools/src/mock.rs
@@ -168,13 +168,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type DbWeight = ();
@@ -245,13 +244,9 @@ impl pools::Config for Runtime {
 	type MaxPointsToBalance = frame_support::traits::ConstU8<10>;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Event<T>, Config},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
diff --git a/frame/nomination-pools/test-staking/src/mock.rs b/frame/nomination-pools/test-staking/src/mock.rs
index a9c64508564cd..b2eb804266d59 100644
--- a/frame/nomination-pools/test-staking/src/mock.rs
+++ b/frame/nomination-pools/test-staking/src/mock.rs
@@ -45,13 +45,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
@@ -187,13 +186,9 @@ impl pallet_nomination_pools::Config for Runtime {
 }
 
 type Block = frame_system::mocking::MockBlock<Runtime>;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
diff --git a/frame/offences/benchmarking/src/mock.rs b/frame/offences/benchmarking/src/mock.rs
index 6bb3b9d7f4ee8..c875f2ff0011e 100644
--- a/frame/offences/benchmarking/src/mock.rs
+++ b/frame/offences/benchmarking/src/mock.rs
@@ -34,7 +34,6 @@ use sp_runtime::{
 
 type AccountId = u64;
 type AccountIndex = u32;
-type BlockNumber = u64;
 type Balance = u64;
 
 impl frame_system::Config for Test {
@@ -44,13 +43,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
@@ -219,10 +217,7 @@ pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, u64, ()>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub enum Test
 	{
 		System: system::{Pallet, Call, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
index 17480be76c1d8..c7ac8f908bd01 100644
--- a/frame/offences/src/mock.rs
+++ b/frame/offences/src/mock.rs
@@ -29,7 +29,6 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	Perbill,
 };
@@ -66,14 +65,10 @@ pub fn with_on_offence_fractions<R, F: FnOnce(&mut Vec<Perbill>) -> R>(f: F) ->
 	OnOffencePerbill::mutate(|fractions| f(fractions))
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Offences: offences::{Pallet, Storage, Event},
@@ -87,13 +82,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/preimage/src/mock.rs b/frame/preimage/src/mock.rs
index 7c645da2c51d8..90b66b16d2ece 100644
--- a/frame/preimage/src/mock.rs
+++ b/frame/preimage/src/mock.rs
@@ -27,19 +27,12 @@ use frame_support::{
 };
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances,
@@ -55,12 +48,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/proxy/src/benchmarking.rs b/frame/proxy/src/benchmarking.rs
index 7244dd5f17472..6349d2ee48eec 100644
--- a/frame/proxy/src/benchmarking.rs
+++ b/frame/proxy/src/benchmarking.rs
@@ -41,7 +41,7 @@ fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(),
 			RawOrigin::Signed(caller.clone()).into(),
 			real,
 			T::ProxyType::default(),
-			T::BlockNumber::zero(),
+			frame_system::BlockNumberOf::<T>::zero(),
 		)?;
 	}
 	Ok(())
@@ -64,7 +64,7 @@ fn add_announcements<T: Config>(
 			RawOrigin::Signed(real.clone()).into(),
 			caller_lookup,
 			T::ProxyType::default(),
-			T::BlockNumber::zero(),
+			frame_system::BlockNumberOf::<T>::zero(),
 		)?;
 		real
 	};
@@ -187,7 +187,7 @@ benchmarks! {
 		RawOrigin::Signed(caller.clone()),
 		real,
 		T::ProxyType::default(),
-		T::BlockNumber::zero()
+		frame_system::BlockNumberOf::<T>::zero()
 	)
 	verify {
 		let (proxies, _) = Proxies::<T>::get(caller);
@@ -202,7 +202,7 @@ benchmarks! {
 		RawOrigin::Signed(caller.clone()),
 		delegate,
 		T::ProxyType::default(),
-		T::BlockNumber::zero()
+		frame_system::BlockNumberOf::<T>::zero()
 	)
 	verify {
 		let (proxies, _) = Proxies::<T>::get(caller);
@@ -224,7 +224,7 @@ benchmarks! {
 	}: _(
 		RawOrigin::Signed(caller.clone()),
 		T::ProxyType::default(),
-		T::BlockNumber::zero(),
+		frame_system::BlockNumberOf::<T>::zero(),
 		0
 	)
 	verify {
@@ -246,7 +246,7 @@ benchmarks! {
 		Pallet::<T>::create_pure(
 			RawOrigin::Signed(whitelisted_caller()).into(),
 			T::ProxyType::default(),
-			T::BlockNumber::zero(),
+			frame_system::BlockNumberOf::<T>::zero(),
 			0
 		)?;
 		let height = system::Pallet::<T>::block_number();
diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs
index 76ff2662bd0f4..1fa0adf0cb6d6 100644
--- a/frame/proxy/src/lib.rs
+++ b/frame/proxy/src/lib.rs
@@ -227,7 +227,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			delegate: AccountIdLookupOf<T>,
 			proxy_type: T::ProxyType,
-			delay: T::BlockNumber,
+			delay: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
@@ -247,7 +247,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			delegate: AccountIdLookupOf<T>,
 			proxy_type: T::ProxyType,
-			delay: T::BlockNumber,
+			delay: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			let delegate = T::Lookup::lookup(delegate)?;
@@ -291,7 +291,7 @@ pub mod pallet {
 		pub fn create_pure(
 			origin: OriginFor<T>,
 			proxy_type: T::ProxyType,
-			delay: T::BlockNumber,
+			delay: frame_system::BlockNumberOf<T>,
 			index: u16,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -341,7 +341,7 @@ pub mod pallet {
 			spawner: AccountIdLookupOf<T>,
 			proxy_type: T::ProxyType,
 			index: u16,
-			#[pallet::compact] height: T::BlockNumber,
+			#[pallet::compact] height: frame_system::BlockNumberOf<T>,
 			#[pallet::compact] ext_index: u32,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -535,14 +535,14 @@ pub mod pallet {
 			delegator: T::AccountId,
 			delegatee: T::AccountId,
 			proxy_type: T::ProxyType,
-			delay: T::BlockNumber,
+			delay: frame_system::BlockNumberOf<T>,
 		},
 		/// A proxy was removed.
 		ProxyRemoved {
 			delegator: T::AccountId,
 			delegatee: T::AccountId,
 			proxy_type: T::ProxyType,
-			delay: T::BlockNumber,
+			delay: frame_system::BlockNumberOf<T>,
 		},
 	}
 
@@ -575,7 +575,10 @@ pub mod pallet {
 		Twox64Concat,
 		T::AccountId,
 		(
-			BoundedVec<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>, T::MaxProxies>,
+			BoundedVec<
+				ProxyDefinition<T::AccountId, T::ProxyType, frame_system::BlockNumberOf<T>>,
+				T::MaxProxies,
+			>,
 			BalanceOf<T>,
 		),
 		ValueQuery,
@@ -589,7 +592,10 @@ pub mod pallet {
 		Twox64Concat,
 		T::AccountId,
 		(
-			BoundedVec<Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>, T::MaxPending>,
+			BoundedVec<
+				Announcement<T::AccountId, CallHashOf<T>, frame_system::BlockNumberOf<T>>,
+				T::MaxPending,
+			>,
 			BalanceOf<T>,
 		),
 		ValueQuery,
@@ -612,7 +618,7 @@ impl<T: Config> Pallet<T> {
 		who: &T::AccountId,
 		proxy_type: &T::ProxyType,
 		index: u16,
-		maybe_when: Option<(T::BlockNumber, u32)>,
+		maybe_when: Option<(frame_system::BlockNumberOf<T>, u32)>,
 	) -> T::AccountId {
 		let (height, ext_index) = maybe_when.unwrap_or_else(|| {
 			(
@@ -638,7 +644,7 @@ impl<T: Config> Pallet<T> {
 		delegator: &T::AccountId,
 		delegatee: T::AccountId,
 		proxy_type: T::ProxyType,
-		delay: T::BlockNumber,
+		delay: frame_system::BlockNumberOf<T>,
 	) -> DispatchResult {
 		ensure!(delegator != &delegatee, Error::<T>::NoSelfProxy);
 		Proxies::<T>::try_mutate(delegator, |(ref mut proxies, ref mut deposit)| {
@@ -678,7 +684,7 @@ impl<T: Config> Pallet<T> {
 		delegator: &T::AccountId,
 		delegatee: T::AccountId,
 		proxy_type: T::ProxyType,
-		delay: T::BlockNumber,
+		delay: frame_system::BlockNumberOf<T>,
 	) -> DispatchResult {
 		Proxies::<T>::try_mutate_exists(delegator, |x| {
 			let (mut proxies, old_deposit) = x.take().ok_or(Error::<T>::NotFound)?;
@@ -734,7 +740,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn edit_announcements<
-		F: FnMut(&Announcement<T::AccountId, CallHashOf<T>, T::BlockNumber>) -> bool,
+		F: FnMut(&Announcement<T::AccountId, CallHashOf<T>, frame_system::BlockNumberOf<T>>) -> bool,
 	>(
 		delegate: &T::AccountId,
 		f: F,
@@ -760,8 +766,16 @@ impl<T: Config> Pallet<T> {
 		real: &T::AccountId,
 		delegate: &T::AccountId,
 		force_proxy_type: Option<T::ProxyType>,
-	) -> Result<ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>, DispatchError> {
-		let f = |x: &ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>| -> bool {
+	) -> Result<
+		ProxyDefinition<T::AccountId, T::ProxyType, frame_system::BlockNumberOf<T>>,
+		DispatchError,
+	> {
+		let f = |x: &ProxyDefinition<
+			T::AccountId,
+			T::ProxyType,
+			frame_system::BlockNumberOf<T>,
+		>|
+		 -> bool {
 			&x.delegate == delegate &&
 				force_proxy_type.as_ref().map_or(true, |y| &x.proxy_type == y)
 		};
@@ -769,7 +783,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn do_proxy(
-		def: ProxyDefinition<T::AccountId, T::ProxyType, T::BlockNumber>,
+		def: ProxyDefinition<T::AccountId, T::ProxyType, frame_system::BlockNumberOf<T>>,
 		real: T::AccountId,
 		call: <T as Config>::RuntimeCall,
 	) {
diff --git a/frame/proxy/src/tests.rs b/frame/proxy/src/tests.rs
index 54b76413bcff4..f3ddcba38d1a1 100644
--- a/frame/proxy/src/tests.rs
+++ b/frame/proxy/src/tests.rs
@@ -30,19 +30,12 @@ use frame_support::{
 	RuntimeDebug,
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -58,13 +51,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/ranked-collective/src/lib.rs b/frame/ranked-collective/src/lib.rs
index 6fe9fc221a7df..caa8b0fe84f65 100644
--- a/frame/ranked-collective/src/lib.rs
+++ b/frame/ranked-collective/src/lib.rs
@@ -391,7 +391,11 @@ pub mod pallet {
 		type DemoteOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = Rank>;
 
 		/// The polling system used for our voting.
-		type Polls: Polling<TallyOf<Self, I>, Votes = Votes, Moment = Self::BlockNumber>;
+		type Polls: Polling<
+			TallyOf<Self, I>,
+			Votes = Votes,
+			Moment = frame_system::BlockNumberOf<Self>,
+		>;
 
 		/// Convert the tally class into the minimum rank required to vote on the poll. If
 		/// `Polls::Class` is the same type as `Rank`, then `Identity` can be used here to mean
diff --git a/frame/ranked-collective/src/tests.rs b/frame/ranked-collective/src/tests.rs
index 338dcaacedcf7..7a728cb535447 100644
--- a/frame/ranked-collective/src/tests.rs
+++ b/frame/ranked-collective/src/tests.rs
@@ -26,23 +26,16 @@ use frame_support::{
 	traits::{ConstU16, ConstU32, ConstU64, EitherOf, Everything, MapSuccess, Polling},
 };
 use sp_core::{Get, H256};
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup, ReduceBy},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup, ReduceBy};
 
 use super::*;
 use crate as pallet_ranked_collective;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 type Class = Rank;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Club: pallet_ranked_collective::{Pallet, Call, Storage, Event<T>},
@@ -56,13 +49,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs
index d66b5725fd4f7..50850f4604fbb 100644
--- a/frame/recovery/src/lib.rs
+++ b/frame/recovery/src/lib.rs
@@ -338,7 +338,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::AccountId,
-		RecoveryConfig<T::BlockNumber, BalanceOf<T>, FriendsOf<T>>,
+		RecoveryConfig<frame_system::BlockNumberOf<T>, BalanceOf<T>, FriendsOf<T>>,
 	>;
 
 	/// Active recovery attempts.
@@ -353,7 +353,7 @@ pub mod pallet {
 		T::AccountId,
 		Twox64Concat,
 		T::AccountId,
-		ActiveRecovery<T::BlockNumber, BalanceOf<T>, FriendsOf<T>>,
+		ActiveRecovery<frame_system::BlockNumberOf<T>, BalanceOf<T>, FriendsOf<T>>,
 	>;
 
 	/// The list of allowed proxy accounts.
@@ -444,7 +444,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			friends: Vec<T::AccountId>,
 			threshold: u16,
-			delay_period: T::BlockNumber,
+			delay_period: frame_system::BlockNumberOf<T>,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// Check account is not already set up for recovery
diff --git a/frame/recovery/src/mock.rs b/frame/recovery/src/mock.rs
index 523dd3aa3e8dc..2d41a850b64c8 100644
--- a/frame/recovery/src/mock.rs
+++ b/frame/recovery/src/mock.rs
@@ -25,19 +25,12 @@ use frame_support::{
 	traits::{ConstU32, ConstU64, OnFinalize, OnInitialize},
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -53,12 +46,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/referenda/src/benchmarking.rs b/frame/referenda/src/benchmarking.rs
index 4c332a3048d0b..a18ad2b18c8ca 100644
--- a/frame/referenda/src/benchmarking.rs
+++ b/frame/referenda/src/benchmarking.rs
@@ -172,7 +172,7 @@ fn skip_timeout_period<T: Config<I>, I: 'static>(index: ReferendumIndex) {
 	frame_system::Pallet::<T>::set_block_number(timeout_period_over);
 }
 
-fn alarm_time<T: Config<I>, I: 'static>(index: ReferendumIndex) -> T::BlockNumber {
+fn alarm_time<T: Config<I>, I: 'static>(index: ReferendumIndex) -> frame_system::BlockNumberOf<T> {
 	let status = Referenda::<T, I>::ensure_ongoing(index).unwrap();
 	status.alarm.unwrap().0
 }
diff --git a/frame/referenda/src/lib.rs b/frame/referenda/src/lib.rs
index 3756257c33fe5..ba2de8f96e9a7 100644
--- a/frame/referenda/src/lib.rs
+++ b/frame/referenda/src/lib.rs
@@ -161,8 +161,8 @@ pub mod pallet {
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 		/// The Scheduler.
-		type Scheduler: ScheduleAnon<Self::BlockNumber, CallOf<Self, I>, PalletsOriginOf<Self>>
-			+ ScheduleNamed<Self::BlockNumber, CallOf<Self, I>, PalletsOriginOf<Self>>;
+		type Scheduler: ScheduleAnon<frame_system::BlockNumberOf<Self>, CallOf<Self, I>, PalletsOriginOf<Self>>
+			+ ScheduleNamed<frame_system::BlockNumberOf<Self>, CallOf<Self, I>, PalletsOriginOf<Self>>;
 		/// Currency type for this pallet.
 		type Currency: ReservableCurrency<Self::AccountId>;
 		// Origins and unbalances.
@@ -201,25 +201,28 @@ pub mod pallet {
 		/// The number of blocks after submission that a referendum must begin being decided by.
 		/// Once this passes, then anyone may cancel the referendum.
 		#[pallet::constant]
-		type UndecidingTimeout: Get<Self::BlockNumber>;
+		type UndecidingTimeout: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// Quantization level for the referendum wakeup scheduler. A higher number will result in
 		/// fewer storage reads/writes needed for smaller voters, but also result in delays to the
 		/// automatic referendum status changes. Explicit servicing instructions are unaffected.
 		#[pallet::constant]
-		type AlarmInterval: Get<Self::BlockNumber>;
+		type AlarmInterval: Get<frame_system::BlockNumberOf<Self>>;
 
 		// The other stuff.
 		/// Information concerning the different referendum tracks.
 		#[pallet::constant]
 		type Tracks: Get<
 				Vec<(
-					<Self::Tracks as TracksInfo<BalanceOf<Self, I>, Self::BlockNumber>>::Id,
-					TrackInfo<BalanceOf<Self, I>, Self::BlockNumber>,
+					<Self::Tracks as TracksInfo<
+						BalanceOf<Self, I>,
+						frame_system::BlockNumberOf<Self>,
+					>>::Id,
+					TrackInfo<BalanceOf<Self, I>, frame_system::BlockNumberOf<Self>>,
 				)>,
 			> + TracksInfo<
 				BalanceOf<Self, I>,
-				Self::BlockNumber,
+				frame_system::BlockNumberOf<Self>,
 				RuntimeOrigin = <Self::RuntimeOrigin as OriginTrait>::PalletsOrigin,
 			>;
 
@@ -432,7 +435,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			proposal_origin: Box<PalletsOriginOf<T>>,
 			proposal: BoundedCallOf<T, I>,
-			enactment_moment: DispatchTime<T::BlockNumber>,
+			enactment_moment: DispatchTime<frame_system::BlockNumberOf<T>>,
 		) -> DispatchResult {
 			let proposal_origin = *proposal_origin;
 			let who = T::SubmitOrigin::ensure_origin(origin, &proposal_origin)?;
@@ -704,7 +707,7 @@ pub mod pallet {
 impl<T: Config<I>, I: 'static> Polling<T::Tally> for Pallet<T, I> {
 	type Index = ReferendumIndex;
 	type Votes = VotesOf<T, I>;
-	type Moment = T::BlockNumber;
+	type Moment = frame_system::BlockNumberOf<T>;
 	type Class = TrackIdOf<T, I>;
 
 	fn classes() -> Vec<Self::Class> {
@@ -713,7 +716,7 @@ impl<T: Config<I>, I: 'static> Polling<T::Tally> for Pallet<T, I> {
 
 	fn access_poll<R>(
 		index: Self::Index,
-		f: impl FnOnce(PollStatus<&mut T::Tally, T::BlockNumber, TrackIdOf<T, I>>) -> R,
+		f: impl FnOnce(PollStatus<&mut T::Tally, frame_system::BlockNumberOf<T>, TrackIdOf<T, I>>) -> R,
 	) -> R {
 		match ReferendumInfoFor::<T, I>::get(index) {
 			Some(ReferendumInfo::Ongoing(mut status)) => {
@@ -732,7 +735,7 @@ impl<T: Config<I>, I: 'static> Polling<T::Tally> for Pallet<T, I> {
 	fn try_access_poll<R>(
 		index: Self::Index,
 		f: impl FnOnce(
-			PollStatus<&mut T::Tally, T::BlockNumber, TrackIdOf<T, I>>,
+			PollStatus<&mut T::Tally, frame_system::BlockNumberOf<T>, TrackIdOf<T, I>>,
 		) -> Result<R, DispatchError>,
 	) -> Result<R, DispatchError> {
 		match ReferendumInfoFor::<T, I>::get(index) {
@@ -849,7 +852,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn schedule_enactment(
 		index: ReferendumIndex,
 		track: &TrackInfoOf<T, I>,
-		desired: DispatchTime<T::BlockNumber>,
+		desired: DispatchTime<frame_system::BlockNumberOf<T>>,
 		origin: PalletsOriginOf<T>,
 		call: BoundedCallOf<T, I>,
 	) {
@@ -871,8 +874,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Set an alarm to dispatch `call` at block number `when`.
 	fn set_alarm(
 		call: BoundedCallOf<T, I>,
-		when: T::BlockNumber,
-	) -> Option<(T::BlockNumber, ScheduleAddressOf<T, I>)> {
+		when: frame_system::BlockNumberOf<T>,
+	) -> Option<(frame_system::BlockNumberOf<T>, ScheduleAddressOf<T, I>)> {
 		let alarm_interval = T::AlarmInterval::get().max(One::one());
 		// Alarm must go off no earlier than `when`.
 		// This rounds `when` upwards to the next multiple of `alarm_interval`.
@@ -905,9 +908,9 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn begin_deciding(
 		status: &mut ReferendumStatusOf<T, I>,
 		index: ReferendumIndex,
-		now: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
 		track: &TrackInfoOf<T, I>,
-	) -> (Option<T::BlockNumber>, BeginDecidingBranch) {
+	) -> (Option<frame_system::BlockNumberOf<T>>, BeginDecidingBranch) {
 		let is_passing = Self::is_passing(
 			&status.tally,
 			Zero::zero(),
@@ -943,11 +946,11 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	///
 	/// If `None`, then it is queued and should be nudged automatically as the queue gets drained.
 	fn ready_for_deciding(
-		now: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
 		track: &TrackInfoOf<T, I>,
 		index: ReferendumIndex,
 		status: &mut ReferendumStatusOf<T, I>,
-	) -> (Option<T::BlockNumber>, ServiceBranch) {
+	) -> (Option<frame_system::BlockNumberOf<T>>, ServiceBranch) {
 		let deciding_count = DecidingCount::<T, I>::get(status.track);
 		if deciding_count < track.max_deciding {
 			// Begin deciding.
@@ -1004,7 +1007,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	fn ensure_alarm_at(
 		status: &mut ReferendumStatusOf<T, I>,
 		index: ReferendumIndex,
-		alarm: T::BlockNumber,
+		alarm: frame_system::BlockNumberOf<T>,
 	) -> bool {
 		if status.alarm.as_ref().map_or(true, |&(when, _)| when != alarm) {
 			// Either no alarm or one that was different
@@ -1049,7 +1052,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// `TrackQueue`. Basically this happens when a referendum is in the deciding queue and receives
 	/// a vote, or when it moves into the deciding queue.
 	fn service_referendum(
-		now: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
 		index: ReferendumIndex,
 		mut status: ReferendumStatusOf<T, I>,
 	) -> (ReferendumInfoOf<T, I>, bool, ServiceBranch) {
@@ -1061,7 +1064,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		};
 		// Default the alarm to the end of the world.
 		let timeout = status.submitted + T::UndecidingTimeout::get();
-		let mut alarm = T::BlockNumber::max_value();
+		let mut alarm = frame_system::BlockNumberOf::<T>::max_value();
 		let branch;
 		match &mut status.deciding {
 			None => {
@@ -1192,7 +1195,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			},
 		}
 
-		let dirty_alarm = if alarm < T::BlockNumber::max_value() {
+		let dirty_alarm = if alarm < frame_system::BlockNumberOf::<T>::max_value() {
 			Self::ensure_alarm_at(&mut status, index, alarm)
 		} else {
 			Self::ensure_no_alarm(&mut status)
@@ -1207,7 +1210,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		tally: &T::Tally,
 		track_id: TrackIdOf<T, I>,
 		track: &TrackInfoOf<T, I>,
-	) -> T::BlockNumber {
+	) -> frame_system::BlockNumberOf<T> {
 		deciding.confirming.unwrap_or_else(|| {
 			// Set alarm to the point where the current voting would make it pass.
 			let approval = tally.approval(track_id);
@@ -1266,8 +1269,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// `approval_needed`.
 	fn is_passing(
 		tally: &T::Tally,
-		elapsed: T::BlockNumber,
-		period: T::BlockNumber,
+		elapsed: frame_system::BlockNumberOf<T>,
+		period: frame_system::BlockNumberOf<T>,
 		support_needed: &Curve,
 		approval_needed: &Curve,
 		id: TrackIdOf<T, I>,
diff --git a/frame/referenda/src/migration.rs b/frame/referenda/src/migration.rs
index 6f796ca40d9be..7b0cec243a5bb 100644
--- a/frame/referenda/src/migration.rs
+++ b/frame/referenda/src/migration.rs
@@ -37,7 +37,7 @@ pub mod v0 {
 	pub type ReferendumInfoOf<T, I> = ReferendumInfo<
 		TrackIdOf<T, I>,
 		PalletsOriginOf<T>,
-		<T as frame_system::Config>::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		BoundedCallOf<T, I>,
 		BalanceOf<T, I>,
 		TallyOf<T, I>,
diff --git a/frame/referenda/src/mock.rs b/frame/referenda/src/mock.rs
index 1a43257cb94e1..00c976a8fe5af 100644
--- a/frame/referenda/src/mock.rs
+++ b/frame/referenda/src/mock.rs
@@ -31,19 +31,14 @@ use frame_support::{
 use frame_system::{EnsureRoot, EnsureSignedBy};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, Hash, IdentityLookup},
 	DispatchResult, Perbill,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances,
@@ -71,13 +66,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/referenda/src/types.rs b/frame/referenda/src/types.rs
index d61b8955443c2..88caaec9b6d3c 100644
--- a/frame/referenda/src/types.rs
+++ b/frame/referenda/src/types.rs
@@ -42,7 +42,7 @@ pub type PalletsOriginOf<T> =
 pub type ReferendumInfoOf<T, I> = ReferendumInfo<
 	TrackIdOf<T, I>,
 	PalletsOriginOf<T>,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	BoundedCallOf<T, I>,
 	BalanceOf<T, I>,
 	TallyOf<T, I>,
@@ -52,22 +52,19 @@ pub type ReferendumInfoOf<T, I> = ReferendumInfo<
 pub type ReferendumStatusOf<T, I> = ReferendumStatus<
 	TrackIdOf<T, I>,
 	PalletsOriginOf<T>,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	BoundedCallOf<T, I>,
 	BalanceOf<T, I>,
 	TallyOf<T, I>,
 	<T as frame_system::Config>::AccountId,
 	ScheduleAddressOf<T, I>,
 >;
-pub type DecidingStatusOf<T> = DecidingStatus<<T as frame_system::Config>::BlockNumber>;
-pub type TrackInfoOf<T, I = ()> =
-	TrackInfo<BalanceOf<T, I>, <T as frame_system::Config>::BlockNumber>;
-pub type TrackIdOf<T, I> = <<T as Config<I>>::Tracks as TracksInfo<
-	BalanceOf<T, I>,
-	<T as frame_system::Config>::BlockNumber,
->>::Id;
+pub type DecidingStatusOf<T> = DecidingStatus<frame_system::BlockNumberOf<T>>;
+pub type TrackInfoOf<T, I = ()> = TrackInfo<BalanceOf<T, I>, frame_system::BlockNumberOf<T>>;
+pub type TrackIdOf<T, I> =
+	<<T as Config<I>>::Tracks as TracksInfo<BalanceOf<T, I>, frame_system::BlockNumberOf<T>>>::Id;
 pub type ScheduleAddressOf<T, I> = <<T as Config<I>>::Scheduler as Anon<
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	CallOf<T, I>,
 	PalletsOriginOf<T>,
 >>::Address;
diff --git a/frame/remark/src/mock.rs b/frame/remark/src/mock.rs
index 569c383928189..11b7dac1130e4 100644
--- a/frame/remark/src/mock.rs
+++ b/frame/remark/src/mock.rs
@@ -21,20 +21,15 @@ use crate as pallet_remark;
 use frame_support::traits::{ConstU16, ConstU32, ConstU64};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 pub type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Remark: pallet_remark::{ Pallet, Call, Event<T> },
@@ -48,12 +43,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/root-offences/src/mock.rs b/frame/root-offences/src/mock.rs
index 8c48e34e4e04a..e5e5da061bd1f 100644
--- a/frame/root-offences/src/mock.rs
+++ b/frame/root-offences/src/mock.rs
@@ -27,13 +27,12 @@ use pallet_staking::StakerStatus;
 use sp_core::H256;
 use sp_runtime::{
 	curve::PiecewiseLinear,
-	testing::{Header, UintAuthorityId},
+	testing::UintAuthorityId,
 	traits::{BlakeTwo256, IdentityLookup, Zero},
 };
 use sp_staking::{EraIndex, SessionIndex};
 use sp_std::collections::btree_map::BTreeMap;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 type AccountId = u64;
 type Balance = u64;
@@ -43,10 +42,7 @@ pub const INIT_TIMESTAMP: u64 = 30_000;
 pub const BLOCK_TIME: u64 = 1000;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
@@ -91,13 +87,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/salary/src/lib.rs b/frame/salary/src/lib.rs
index 1279a30717752..507bc2a638594 100644
--- a/frame/salary/src/lib.rs
+++ b/frame/salary/src/lib.rs
@@ -126,14 +126,14 @@ pub mod pallet {
 		/// The number of blocks between sequential payout cycles is the sum of this and
 		/// `PayoutPeriod`.
 		#[pallet::constant]
-		type RegistrationPeriod: Get<Self::BlockNumber>;
+		type RegistrationPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The number of blocks within a cycle which accounts have to claim the payout.
 		///
 		/// The number of blocks between sequential payout cycles is the sum of this and
 		/// `RegistrationPeriod`.
 		#[pallet::constant]
-		type PayoutPeriod: Get<Self::BlockNumber>;
+		type PayoutPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The total budget per cycle.
 		///
@@ -142,11 +142,11 @@ pub mod pallet {
 		type Budget: Get<BalanceOf<Self, I>>;
 	}
 
-	pub type CycleIndexOf<T> = <T as frame_system::Config>::BlockNumber;
+	pub type CycleIndexOf<T> = frame_system::BlockNumberOf<T>;
 	pub type BalanceOf<T, I> = <<T as Config<I>>::Paymaster as Pay>::Balance;
 	pub type IdOf<T, I> = <<T as Config<I>>::Paymaster as Pay>::Id;
 	pub type StatusOf<T, I> =
-		StatusType<CycleIndexOf<T>, <T as frame_system::Config>::BlockNumber, BalanceOf<T, I>>;
+		StatusType<CycleIndexOf<T>, frame_system::BlockNumberOf<T>, BalanceOf<T, I>>;
 	pub type ClaimantStatusOf<T, I> = ClaimantStatus<CycleIndexOf<T>, BalanceOf<T, I>, IdOf<T, I>>;
 
 	/// The overall status of the system.
@@ -389,7 +389,7 @@ pub mod pallet {
 		pub fn last_active(who: &T::AccountId) -> Result<CycleIndexOf<T>, DispatchError> {
 			Ok(Claimant::<T, I>::get(&who).ok_or(Error::<T, I>::NotInducted)?.last_active)
 		}
-		pub fn cycle_period() -> T::BlockNumber {
+		pub fn cycle_period() -> frame_system::BlockNumberOf<T> {
 			T::RegistrationPeriod::get() + T::PayoutPeriod::get()
 		}
 		fn do_payout(who: T::AccountId, beneficiary: T::AccountId) -> DispatchResult {
diff --git a/frame/salary/src/tests.rs b/frame/salary/src/tests.rs
index 7bad2cf77ace5..8f501bac4e38f 100644
--- a/frame/salary/src/tests.rs
+++ b/frame/salary/src/tests.rs
@@ -27,7 +27,6 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, Identity, IdentityLookup},
 	DispatchResult,
 };
@@ -36,14 +35,10 @@ use sp_std::cell::RefCell;
 use super::*;
 use crate as pallet_salary;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Salary: pallet_salary::{Pallet, Call, Storage, Event<T>},
@@ -61,13 +56,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/scheduler/src/benchmarking.rs b/frame/scheduler/src/benchmarking.rs
index d56e007ec9a2a..13cf1d8d21f77 100644
--- a/frame/scheduler/src/benchmarking.rs
+++ b/frame/scheduler/src/benchmarking.rs
@@ -42,7 +42,10 @@ type SystemOrigin<T> = <T as frame_system::Config>::RuntimeOrigin;
 /// - `None`: aborted (hash without preimage)
 /// - `Some(true)`: hash resolves into call if possible, plain call otherwise
 /// - `Some(false)`: plain call
-fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
+fn fill_schedule<T: Config>(
+	when: frame_system::BlockNumberOf<T>,
+	n: u32,
+) -> Result<(), &'static str> {
 	let t = DispatchTime::At(when);
 	let origin: <T as Config>::PalletsOrigin = frame_system::RawOrigin::Root.into();
 	for i in 0..n {
@@ -125,7 +128,7 @@ fn make_origin<T: Config>(signed: bool) -> <T as Config>::PalletsOrigin {
 benchmarks! {
 	// `service_agendas` when no work is done.
 	service_agendas_base {
-		let now = T::BlockNumber::from(BLOCK_NUMBER);
+		let now = frame_system::BlockNumberOf::<T>::from(BLOCK_NUMBER);
 		IncompleteSince::<T>::put(now - One::one());
 	}: {
 		Scheduler::<T>::service_agendas(&mut WeightMeter::max_limit(), now, 0);
@@ -224,7 +227,7 @@ benchmarks! {
 	schedule {
 		let s in 0 .. (T::MaxScheduledPerBlock::get() - 1);
 		let when = BLOCK_NUMBER.into();
-		let periodic = Some((T::BlockNumber::one(), 100));
+		let periodic = Some((frame_system::BlockNumberOf::<T>::one(), 100));
 		let priority = 0;
 		// Essentially a no-op call.
 		let call = Box::new(SystemCall::set_storage { items: vec![] }.into());
@@ -267,7 +270,7 @@ benchmarks! {
 		let s in 0 .. (T::MaxScheduledPerBlock::get() - 1);
 		let id = u32_to_name(s);
 		let when = BLOCK_NUMBER.into();
-		let periodic = Some((T::BlockNumber::one(), 100));
+		let periodic = Some((frame_system::BlockNumberOf::<T>::one(), 100));
 		let priority = 0;
 		// Essentially a no-op call.
 		let call = Box::new(SystemCall::set_storage { items: vec![] }.into());
diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs
index 8194f286c8323..143a8c0f14d8f 100644
--- a/frame/scheduler/src/lib.rs
+++ b/frame/scheduler/src/lib.rs
@@ -123,7 +123,7 @@ use crate::{Scheduled as ScheduledV3, Scheduled as ScheduledV2};
 pub type ScheduledV2Of<T> = ScheduledV2<
 	Vec<u8>,
 	<T as Config>::RuntimeCall,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	<T as Config>::PalletsOrigin,
 	<T as frame_system::Config>::AccountId,
 >;
@@ -131,7 +131,7 @@ pub type ScheduledV2Of<T> = ScheduledV2<
 pub type ScheduledV3Of<T> = ScheduledV3<
 	Vec<u8>,
 	CallOrHashOf<T>,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	<T as Config>::PalletsOrigin,
 	<T as frame_system::Config>::AccountId,
 >;
@@ -139,7 +139,7 @@ pub type ScheduledV3Of<T> = ScheduledV3<
 pub type ScheduledOf<T> = Scheduled<
 	TaskName,
 	Bounded<<T as Config>::RuntimeCall>,
-	<T as frame_system::Config>::BlockNumber,
+	frame_system::BlockNumberOf<T>,
 	<T as Config>::PalletsOrigin,
 	<T as frame_system::Config>::AccountId,
 >;
@@ -231,14 +231,14 @@ pub mod pallet {
 	}
 
 	#[pallet::storage]
-	pub type IncompleteSince<T: Config> = StorageValue<_, T::BlockNumber>;
+	pub type IncompleteSince<T: Config> = StorageValue<_, frame_system::BlockNumberOf<T>>;
 
 	/// Items to be executed, indexed by the block number that they should be executed on.
 	#[pallet::storage]
 	pub type Agenda<T: Config> = StorageMap<
 		_,
 		Twox64Concat,
-		T::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		BoundedVec<Option<ScheduledOf<T>>, T::MaxScheduledPerBlock>,
 		ValueQuery,
 	>;
@@ -249,28 +249,31 @@ pub mod pallet {
 	/// identities.
 	#[pallet::storage]
 	pub(crate) type Lookup<T: Config> =
-		StorageMap<_, Twox64Concat, TaskName, TaskAddress<T::BlockNumber>>;
+		StorageMap<_, Twox64Concat, TaskName, TaskAddress<frame_system::BlockNumberOf<T>>>;
 
 	/// Events type.
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Scheduled some task.
-		Scheduled { when: T::BlockNumber, index: u32 },
+		Scheduled { when: frame_system::BlockNumberOf<T>, index: u32 },
 		/// Canceled some task.
-		Canceled { when: T::BlockNumber, index: u32 },
+		Canceled { when: frame_system::BlockNumberOf<T>, index: u32 },
 		/// Dispatched some task.
 		Dispatched {
-			task: TaskAddress<T::BlockNumber>,
+			task: TaskAddress<frame_system::BlockNumberOf<T>>,
 			id: Option<TaskName>,
 			result: DispatchResult,
 		},
 		/// The call for the provided hash was not found so the task has been aborted.
-		CallUnavailable { task: TaskAddress<T::BlockNumber>, id: Option<TaskName> },
+		CallUnavailable { task: TaskAddress<frame_system::BlockNumberOf<T>>, id: Option<TaskName> },
 		/// The given task was unable to be renewed since the agenda is full at that block.
-		PeriodicFailed { task: TaskAddress<T::BlockNumber>, id: Option<TaskName> },
+		PeriodicFailed { task: TaskAddress<frame_system::BlockNumberOf<T>>, id: Option<TaskName> },
 		/// The given task can never be executed since it is overweight.
-		PermanentlyOverweight { task: TaskAddress<T::BlockNumber>, id: Option<TaskName> },
+		PermanentlyOverweight {
+			task: TaskAddress<frame_system::BlockNumberOf<T>>,
+			id: Option<TaskName>,
+		},
 	}
 
 	#[pallet::error]
@@ -290,7 +293,7 @@ pub mod pallet {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Execute the scheduled calls
-		fn on_initialize(now: T::BlockNumber) -> Weight {
+		fn on_initialize(now: frame_system::BlockNumberOf<T>) -> Weight {
 			let mut weight_counter = WeightMeter::from_limit(T::MaximumWeight::get());
 			Self::service_agendas(&mut weight_counter, now, u32::max_value());
 			weight_counter.consumed
@@ -304,8 +307,8 @@ pub mod pallet {
 		#[pallet::weight(<T as Config>::WeightInfo::schedule(T::MaxScheduledPerBlock::get()))]
 		pub fn schedule(
 			origin: OriginFor<T>,
-			when: T::BlockNumber,
-			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+			when: frame_system::BlockNumberOf<T>,
+			maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
@@ -324,7 +327,11 @@ pub mod pallet {
 		/// Cancel an anonymously scheduled task.
 		#[pallet::call_index(1)]
 		#[pallet::weight(<T as Config>::WeightInfo::cancel(T::MaxScheduledPerBlock::get()))]
-		pub fn cancel(origin: OriginFor<T>, when: T::BlockNumber, index: u32) -> DispatchResult {
+		pub fn cancel(
+			origin: OriginFor<T>,
+			when: frame_system::BlockNumberOf<T>,
+			index: u32,
+		) -> DispatchResult {
 			T::ScheduleOrigin::ensure_origin(origin.clone())?;
 			let origin = <T as Config>::RuntimeOrigin::from(origin);
 			Self::do_cancel(Some(origin.caller().clone()), (when, index))?;
@@ -337,8 +344,8 @@ pub mod pallet {
 		pub fn schedule_named(
 			origin: OriginFor<T>,
 			id: TaskName,
-			when: T::BlockNumber,
-			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+			when: frame_system::BlockNumberOf<T>,
+			maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
@@ -370,8 +377,8 @@ pub mod pallet {
 		#[pallet::weight(<T as Config>::WeightInfo::schedule(T::MaxScheduledPerBlock::get()))]
 		pub fn schedule_after(
 			origin: OriginFor<T>,
-			after: T::BlockNumber,
-			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+			after: frame_system::BlockNumberOf<T>,
+			maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
@@ -393,8 +400,8 @@ pub mod pallet {
 		pub fn schedule_named_after(
 			origin: OriginFor<T>,
 			id: TaskName,
-			after: T::BlockNumber,
-			maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+			after: frame_system::BlockNumberOf<T>,
+			maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 			priority: schedule::Priority,
 			call: Box<<T as Config>::RuntimeCall>,
 		) -> DispatchResult {
@@ -434,7 +441,7 @@ impl<T: Config<Hash = PreimageHash>> Pallet<T> {
 		}
 
 		Agenda::<T>::translate::<
-			Vec<Option<ScheduledV1<<T as Config>::RuntimeCall, T::BlockNumber>>>,
+			Vec<Option<ScheduledV1<<T as Config>::RuntimeCall, frame_system::BlockNumberOf<T>>>>,
 			_,
 		>(|_, agenda| {
 			Some(BoundedVec::truncate_from(
@@ -669,7 +676,7 @@ impl<T: Config> Pallet<T> {
 					Scheduled<
 						TaskName,
 						Bounded<<T as Config>::RuntimeCall>,
-						T::BlockNumber,
+						frame_system::BlockNumberOf<T>,
 						OldOrigin,
 						T::AccountId,
 					>,
@@ -695,7 +702,9 @@ impl<T: Config> Pallet<T> {
 		});
 	}
 
-	fn resolve_time(when: DispatchTime<T::BlockNumber>) -> Result<T::BlockNumber, DispatchError> {
+	fn resolve_time(
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+	) -> Result<frame_system::BlockNumberOf<T>, DispatchError> {
 		let now = frame_system::Pallet::<T>::block_number();
 
 		let when = match when {
@@ -713,9 +722,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn place_task(
-		when: T::BlockNumber,
+		when: frame_system::BlockNumberOf<T>,
 		what: ScheduledOf<T>,
-	) -> Result<TaskAddress<T::BlockNumber>, (DispatchError, ScheduledOf<T>)> {
+	) -> Result<TaskAddress<frame_system::BlockNumberOf<T>>, (DispatchError, ScheduledOf<T>)> {
 		let maybe_name = what.maybe_id;
 		let index = Self::push_to_agenda(when, what)?;
 		let address = (when, index);
@@ -727,7 +736,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn push_to_agenda(
-		when: T::BlockNumber,
+		when: frame_system::BlockNumberOf<T>,
 		what: ScheduledOf<T>,
 	) -> Result<u32, (DispatchError, ScheduledOf<T>)> {
 		let mut agenda = Agenda::<T>::get(when);
@@ -749,7 +758,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Remove trailing `None` items of an agenda at `when`. If all items are `None` remove the
 	/// agenda record entirely.
-	fn cleanup_agenda(when: T::BlockNumber) {
+	fn cleanup_agenda(when: frame_system::BlockNumberOf<T>) {
 		let mut agenda = Agenda::<T>::get(when);
 		match agenda.iter().rposition(|i| i.is_some()) {
 			Some(i) if agenda.len() > i + 1 => {
@@ -764,12 +773,12 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn do_schedule(
-		when: DispatchTime<T::BlockNumber>,
-		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+		maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
 		call: Bounded<<T as Config>::RuntimeCall>,
-	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
+	) -> Result<TaskAddress<frame_system::BlockNumberOf<T>>, DispatchError> {
 		let when = Self::resolve_time(when)?;
 
 		let lookup_hash = call.lookup_hash();
@@ -799,7 +808,7 @@ impl<T: Config> Pallet<T> {
 
 	fn do_cancel(
 		origin: Option<T::PalletsOrigin>,
-		(when, index): TaskAddress<T::BlockNumber>,
+		(when, index): TaskAddress<frame_system::BlockNumberOf<T>>,
 	) -> Result<(), DispatchError> {
 		let scheduled = Agenda::<T>::try_mutate(when, |agenda| {
 			agenda.get_mut(index as usize).map_or(
@@ -831,9 +840,9 @@ impl<T: Config> Pallet<T> {
 	}
 
 	fn do_reschedule(
-		(when, index): TaskAddress<T::BlockNumber>,
-		new_time: DispatchTime<T::BlockNumber>,
-	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
+		(when, index): TaskAddress<frame_system::BlockNumberOf<T>>,
+		new_time: DispatchTime<frame_system::BlockNumberOf<T>>,
+	) -> Result<TaskAddress<frame_system::BlockNumberOf<T>>, DispatchError> {
 		let new_time = Self::resolve_time(new_time)?;
 
 		if new_time == when {
@@ -853,12 +862,12 @@ impl<T: Config> Pallet<T> {
 
 	fn do_schedule_named(
 		id: TaskName,
-		when: DispatchTime<T::BlockNumber>,
-		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+		maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
 		call: Bounded<<T as Config>::RuntimeCall>,
-	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
+	) -> Result<TaskAddress<frame_system::BlockNumberOf<T>>, DispatchError> {
 		// ensure id it is unique
 		if Lookup::<T>::contains_key(&id) {
 			return Err(Error::<T>::FailedToSchedule.into())
@@ -922,8 +931,8 @@ impl<T: Config> Pallet<T> {
 
 	fn do_reschedule_named(
 		id: TaskName,
-		new_time: DispatchTime<T::BlockNumber>,
-	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
+		new_time: DispatchTime<frame_system::BlockNumberOf<T>>,
+	) -> Result<TaskAddress<frame_system::BlockNumberOf<T>>, DispatchError> {
 		let new_time = Self::resolve_time(new_time)?;
 
 		let lookup = Lookup::<T>::get(id);
@@ -953,7 +962,7 @@ use ServiceTaskError::*;
 
 impl<T: Config> Pallet<T> {
 	/// Service up to `max` agendas queue starting from earliest incompletely executed agenda.
-	fn service_agendas(weight: &mut WeightMeter, now: T::BlockNumber, max: u32) {
+	fn service_agendas(weight: &mut WeightMeter, now: frame_system::BlockNumberOf<T>, max: u32) {
 		if !weight.check_accrue(T::WeightInfo::service_agendas_base()) {
 			return
 		}
@@ -983,8 +992,8 @@ impl<T: Config> Pallet<T> {
 	fn service_agenda(
 		weight: &mut WeightMeter,
 		executed: &mut u32,
-		now: T::BlockNumber,
-		when: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
+		when: frame_system::BlockNumberOf<T>,
 		max: u32,
 	) -> bool {
 		let mut agenda = Agenda::<T>::get(when);
@@ -1052,8 +1061,8 @@ impl<T: Config> Pallet<T> {
 	/// - Rescheduling the task for execution in a later agenda if periodic.
 	fn service_task(
 		weight: &mut WeightMeter,
-		now: T::BlockNumber,
-		when: T::BlockNumber,
+		now: frame_system::BlockNumberOf<T>,
+		when: frame_system::BlockNumberOf<T>,
 		agenda_index: u32,
 		is_first: bool,
 		mut task: ScheduledOf<T>,
@@ -1161,14 +1170,15 @@ impl<T: Config> Pallet<T> {
 }
 
 impl<T: Config<Hash = PreimageHash>>
-	schedule::v2::Anon<T::BlockNumber, <T as Config>::RuntimeCall, T::PalletsOrigin> for Pallet<T>
+	schedule::v2::Anon<frame_system::BlockNumberOf<T>, <T as Config>::RuntimeCall, T::PalletsOrigin>
+	for Pallet<T>
 {
-	type Address = TaskAddress<T::BlockNumber>;
+	type Address = TaskAddress<frame_system::BlockNumberOf<T>>;
 	type Hash = T::Hash;
 
 	fn schedule(
-		when: DispatchTime<T::BlockNumber>,
-		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+		maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
 		call: CallOrHashOf<T>,
@@ -1184,26 +1194,32 @@ impl<T: Config<Hash = PreimageHash>>
 
 	fn reschedule(
 		address: Self::Address,
-		when: DispatchTime<T::BlockNumber>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_reschedule(address, when)
 	}
 
-	fn next_dispatch_time((when, index): Self::Address) -> Result<T::BlockNumber, ()> {
+	fn next_dispatch_time(
+		(when, index): Self::Address,
+	) -> Result<frame_system::BlockNumberOf<T>, ()> {
 		Agenda::<T>::get(when).get(index as usize).ok_or(()).map(|_| when)
 	}
 }
 
 impl<T: Config<Hash = PreimageHash>>
-	schedule::v2::Named<T::BlockNumber, <T as Config>::RuntimeCall, T::PalletsOrigin> for Pallet<T>
+	schedule::v2::Named<
+		frame_system::BlockNumberOf<T>,
+		<T as Config>::RuntimeCall,
+		T::PalletsOrigin,
+	> for Pallet<T>
 {
-	type Address = TaskAddress<T::BlockNumber>;
+	type Address = TaskAddress<frame_system::BlockNumberOf<T>>;
 	type Hash = T::Hash;
 
 	fn schedule_named(
 		id: Vec<u8>,
-		when: DispatchTime<T::BlockNumber>,
-		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+		maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
 		call: CallOrHashOf<T>,
@@ -1221,13 +1237,13 @@ impl<T: Config<Hash = PreimageHash>>
 
 	fn reschedule_named(
 		id: Vec<u8>,
-		when: DispatchTime<T::BlockNumber>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
 	) -> Result<Self::Address, DispatchError> {
 		let name = blake2_256(&id[..]);
 		Self::do_reschedule_named(name, when)
 	}
 
-	fn next_dispatch_time(id: Vec<u8>) -> Result<T::BlockNumber, ()> {
+	fn next_dispatch_time(id: Vec<u8>) -> Result<frame_system::BlockNumberOf<T>, ()> {
 		let name = blake2_256(&id[..]);
 		Lookup::<T>::get(name)
 			.and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when))
@@ -1235,14 +1251,15 @@ impl<T: Config<Hash = PreimageHash>>
 	}
 }
 
-impl<T: Config> schedule::v3::Anon<T::BlockNumber, <T as Config>::RuntimeCall, T::PalletsOrigin>
+impl<T: Config>
+	schedule::v3::Anon<frame_system::BlockNumberOf<T>, <T as Config>::RuntimeCall, T::PalletsOrigin>
 	for Pallet<T>
 {
-	type Address = TaskAddress<T::BlockNumber>;
+	type Address = TaskAddress<frame_system::BlockNumberOf<T>>;
 
 	fn schedule(
-		when: DispatchTime<T::BlockNumber>,
-		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+		maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
 		call: Bounded<<T as Config>::RuntimeCall>,
@@ -1256,12 +1273,14 @@ impl<T: Config> schedule::v3::Anon<T::BlockNumber, <T as Config>::RuntimeCall, T
 
 	fn reschedule(
 		address: Self::Address,
-		when: DispatchTime<T::BlockNumber>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_reschedule(address, when).map_err(map_err_to_v3_err::<T>)
 	}
 
-	fn next_dispatch_time((when, index): Self::Address) -> Result<T::BlockNumber, DispatchError> {
+	fn next_dispatch_time(
+		(when, index): Self::Address,
+	) -> Result<frame_system::BlockNumberOf<T>, DispatchError> {
 		Agenda::<T>::get(when)
 			.get(index as usize)
 			.ok_or(DispatchError::Unavailable)
@@ -1271,15 +1290,19 @@ impl<T: Config> schedule::v3::Anon<T::BlockNumber, <T as Config>::RuntimeCall, T
 
 use schedule::v3::TaskName;
 
-impl<T: Config> schedule::v3::Named<T::BlockNumber, <T as Config>::RuntimeCall, T::PalletsOrigin>
-	for Pallet<T>
+impl<T: Config>
+	schedule::v3::Named<
+		frame_system::BlockNumberOf<T>,
+		<T as Config>::RuntimeCall,
+		T::PalletsOrigin,
+	> for Pallet<T>
 {
-	type Address = TaskAddress<T::BlockNumber>;
+	type Address = TaskAddress<frame_system::BlockNumberOf<T>>;
 
 	fn schedule_named(
 		id: TaskName,
-		when: DispatchTime<T::BlockNumber>,
-		maybe_periodic: Option<schedule::Period<T::BlockNumber>>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
+		maybe_periodic: Option<schedule::Period<frame_system::BlockNumberOf<T>>>,
 		priority: schedule::Priority,
 		origin: T::PalletsOrigin,
 		call: Bounded<<T as Config>::RuntimeCall>,
@@ -1293,12 +1316,12 @@ impl<T: Config> schedule::v3::Named<T::BlockNumber, <T as Config>::RuntimeCall,
 
 	fn reschedule_named(
 		id: TaskName,
-		when: DispatchTime<T::BlockNumber>,
+		when: DispatchTime<frame_system::BlockNumberOf<T>>,
 	) -> Result<Self::Address, DispatchError> {
 		Self::do_reschedule_named(id, when).map_err(map_err_to_v3_err::<T>)
 	}
 
-	fn next_dispatch_time(id: TaskName) -> Result<T::BlockNumber, DispatchError> {
+	fn next_dispatch_time(id: TaskName) -> Result<frame_system::BlockNumberOf<T>, DispatchError> {
 		Lookup::<T>::get(id)
 			.and_then(|(when, index)| Agenda::<T>::get(when).get(index as usize).map(|_| when))
 			.ok_or(DispatchError::Unavailable)
diff --git a/frame/scheduler/src/migration.rs b/frame/scheduler/src/migration.rs
index 78313fda66412..f7ef028e68fc2 100644
--- a/frame/scheduler/src/migration.rs
+++ b/frame/scheduler/src/migration.rs
@@ -34,22 +34,14 @@ pub mod v1 {
 	pub(crate) type Agenda<T: Config> = StorageMap<
 		Pallet<T>,
 		Twox64Concat,
-		<T as frame_system::Config>::BlockNumber,
-		Vec<
-			Option<
-				ScheduledV1<<T as Config>::RuntimeCall, <T as frame_system::Config>::BlockNumber>,
-			>,
-		>,
+		frame_system::BlockNumberOf<T>,
+		Vec<Option<ScheduledV1<<T as Config>::RuntimeCall, frame_system::BlockNumberOf<T>>>>,
 		ValueQuery,
 	>;
 
 	#[frame_support::storage_alias]
-	pub(crate) type Lookup<T: Config> = StorageMap<
-		Pallet<T>,
-		Twox64Concat,
-		Vec<u8>,
-		TaskAddress<<T as frame_system::Config>::BlockNumber>,
-	>;
+	pub(crate) type Lookup<T: Config> =
+		StorageMap<Pallet<T>, Twox64Concat, Vec<u8>, TaskAddress<frame_system::BlockNumberOf<T>>>;
 }
 
 pub mod v2 {
@@ -60,18 +52,14 @@ pub mod v2 {
 	pub(crate) type Agenda<T: Config> = StorageMap<
 		Pallet<T>,
 		Twox64Concat,
-		<T as frame_system::Config>::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		Vec<Option<ScheduledV2Of<T>>>,
 		ValueQuery,
 	>;
 
 	#[frame_support::storage_alias]
-	pub(crate) type Lookup<T: Config> = StorageMap<
-		Pallet<T>,
-		Twox64Concat,
-		Vec<u8>,
-		TaskAddress<<T as frame_system::Config>::BlockNumber>,
-	>;
+	pub(crate) type Lookup<T: Config> =
+		StorageMap<Pallet<T>, Twox64Concat, Vec<u8>, TaskAddress<frame_system::BlockNumberOf<T>>>;
 }
 
 pub mod v3 {
@@ -82,18 +70,14 @@ pub mod v3 {
 	pub(crate) type Agenda<T: Config> = StorageMap<
 		Pallet<T>,
 		Twox64Concat,
-		<T as frame_system::Config>::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		Vec<Option<ScheduledV3Of<T>>>,
 		ValueQuery,
 	>;
 
 	#[frame_support::storage_alias]
-	pub(crate) type Lookup<T: Config> = StorageMap<
-		Pallet<T>,
-		Twox64Concat,
-		Vec<u8>,
-		TaskAddress<<T as frame_system::Config>::BlockNumber>,
-	>;
+	pub(crate) type Lookup<T: Config> =
+		StorageMap<Pallet<T>, Twox64Concat, Vec<u8>, TaskAddress<frame_system::BlockNumberOf<T>>>;
 
 	/// Migrate the scheduler pallet from V3 to V4.
 	pub struct MigrateToV4<T>(sp_std::marker::PhantomData<T>);
diff --git a/frame/scheduler/src/mock.rs b/frame/scheduler/src/mock.rs
index 1b0fb8112469c..97605a260df31 100644
--- a/frame/scheduler/src/mock.rs
+++ b/frame/scheduler/src/mock.rs
@@ -30,7 +30,6 @@ use frame_support::{
 use frame_system::{EnsureRoot, EnsureSignedBy};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	Perbill,
 };
@@ -93,14 +92,10 @@ pub mod logger {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Logger: logger::{Pallet, Call, Event<T>},
@@ -131,12 +126,11 @@ impl system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs
index f8fc0fecd492a..9fff9fc08d466 100644
--- a/frame/scored-pool/src/lib.rs
+++ b/frame/scored-pool/src/lib.rs
@@ -170,7 +170,7 @@ pub mod pallet {
 		/// Every `Period` blocks the `Members` are filled with the highest scoring
 		/// members in the `Pool`.
 		#[pallet::constant]
-		type Period: Get<Self::BlockNumber>;
+		type Period: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The receiver of the signal for when the membership has been initialized.
 		/// This happens pre-genesis and will usually be the same as `MembershipChanged`.
@@ -282,7 +282,7 @@ pub mod pallet {
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
 		/// Every `Period` blocks the `Members` set is refreshed from the
 		/// highest scoring members in the pool.
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			if n % T::Period::get() == Zero::zero() {
 				let pool = <Pool<T, I>>::get();
 				<Pallet<T, I>>::refresh_members(pool, ChangeReceiver::MembershipChanged);
diff --git a/frame/scored-pool/src/mock.rs b/frame/scored-pool/src/mock.rs
index 83bc939e8230d..df42feb530852 100644
--- a/frame/scored-pool/src/mock.rs
+++ b/frame/scored-pool/src/mock.rs
@@ -26,19 +26,12 @@ use frame_support::{
 };
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -61,13 +54,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index a7e326fb27ac3..5c1777bb47772 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -46,8 +46,8 @@ pub trait Config:
 {
 }
 
-impl<T: Config> OnInitialize<T::BlockNumber> for Pallet<T> {
-	fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
+impl<T: Config> OnInitialize<frame_system::BlockNumberOf<T>> for Pallet<T> {
+	fn on_initialize(n: frame_system::BlockNumberOf<T>) -> frame_support::weights::Weight {
 		pallet_session::Pallet::<T>::on_initialize(n)
 	}
 }
@@ -156,7 +156,7 @@ fn check_membership_proof_setup<T: Config>(
 		Session::<T>::set_keys(RawOrigin::Signed(controller).into(), keys, proof).unwrap();
 	}
 
-	Pallet::<T>::on_initialize(T::BlockNumber::one());
+	Pallet::<T>::on_initialize(frame_system::BlockNumberOf::<T>::one());
 
 	// skip sessions until the new validator set is enacted
 	while Session::<T>::validators().len() < n as usize {
diff --git a/frame/session/benchmarking/src/mock.rs b/frame/session/benchmarking/src/mock.rs
index 3b027492e0a6a..0c8af5fd1251e 100644
--- a/frame/session/benchmarking/src/mock.rs
+++ b/frame/session/benchmarking/src/mock.rs
@@ -28,17 +28,12 @@ use sp_runtime::traits::IdentityLookup;
 
 type AccountId = u64;
 type AccountIndex = u32;
-type BlockNumber = u64;
 type Balance = u64;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -54,13 +49,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs
index 1219aaaf12a10..7a4fe39223cce 100644
--- a/frame/session/src/lib.rs
+++ b/frame/session/src/lib.rs
@@ -393,12 +393,12 @@ pub mod pallet {
 		type ValidatorIdOf: Convert<Self::AccountId, Option<Self::ValidatorId>>;
 
 		/// Indicator for when to end the session.
-		type ShouldEndSession: ShouldEndSession<Self::BlockNumber>;
+		type ShouldEndSession: ShouldEndSession<frame_system::BlockNumberOf<Self>>;
 
 		/// Something that can predict the next session rotation. This should typically come from
 		/// the same logical unit that provides [`ShouldEndSession`], yet, it gives a best effort
 		/// estimate. It is helpful to implement [`EstimateNextNewSession`].
-		type NextSessionRotation: EstimateNextSessionRotation<Self::BlockNumber>;
+		type NextSessionRotation: EstimateNextSessionRotation<frame_system::BlockNumberOf<Self>>;
 
 		/// Handler for managing new session.
 		type SessionManager: SessionManager<Self::ValidatorId>;
@@ -559,7 +559,7 @@ pub mod pallet {
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		/// Called when a block is initialized. Will rotate session if it is the last
 		/// block of the current session.
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			if T::ShouldEndSession::should_end_session(n) {
 				Self::rotate_session();
 				T::BlockWeights::get().max_block
@@ -901,14 +901,16 @@ impl<T: Config> ValidatorSet<T::AccountId> for Pallet<T> {
 	}
 }
 
-impl<T: Config> EstimateNextNewSession<T::BlockNumber> for Pallet<T> {
-	fn average_session_length() -> T::BlockNumber {
+impl<T: Config> EstimateNextNewSession<frame_system::BlockNumberOf<T>> for Pallet<T> {
+	fn average_session_length() -> frame_system::BlockNumberOf<T> {
 		T::NextSessionRotation::average_session_length()
 	}
 
 	/// This session pallet always calls new_session and next_session at the same time, hence we
 	/// do a simple proxy and pass the function to next rotation.
-	fn estimate_next_new_session(now: T::BlockNumber) -> (Option<T::BlockNumber>, Weight) {
+	fn estimate_next_new_session(
+		now: frame_system::BlockNumberOf<T>,
+	) -> (Option<frame_system::BlockNumberOf<T>>, Weight) {
 		T::NextSessionRotation::estimate_next_session_rotation(now)
 	}
 }
diff --git a/frame/session/src/mock.rs b/frame/session/src/mock.rs
index d6b8d9e207e02..20efffb1d5491 100644
--- a/frame/session/src/mock.rs
+++ b/frame/session/src/mock.rs
@@ -27,7 +27,7 @@ use std::collections::BTreeMap;
 use sp_core::{crypto::key_types::DUMMY, H256};
 use sp_runtime::{
 	impl_opaque_keys,
-	testing::{Header, UintAuthorityId},
+	testing::UintAuthorityId,
 	traits::{BlakeTwo256, IdentityLookup},
 };
 use sp_staking::SessionIndex;
@@ -75,15 +75,11 @@ impl OpaqueKeys for PreUpgradeMockSessionKeys {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 #[cfg(feature = "historical")]
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
@@ -93,10 +89,7 @@ frame_support::construct_runtime!(
 
 #[cfg(not(feature = "historical"))]
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
@@ -245,13 +238,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs
index 6f42ae00f287d..683b5d0984030 100644
--- a/frame/society/src/lib.rs
+++ b/frame/society/src/lib.rs
@@ -416,10 +416,8 @@ impl<AccountId: PartialEq, Balance> BidKind<AccountId, Balance> {
 	}
 }
 
-pub type PayoutsFor<T, I> = BoundedVec<
-	(<T as frame_system::Config>::BlockNumber, BalanceOf<T, I>),
-	<T as Config<I>>::MaxPayouts,
->;
+pub type PayoutsFor<T, I> =
+	BoundedVec<(frame_system::BlockNumberOf<T>, BalanceOf<T, I>), <T as Config<I>>::MaxPayouts>;
 
 /// Information concerning a member.
 #[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
@@ -439,10 +437,7 @@ pub struct PayoutRecord<Balance, PayoutsVec> {
 
 pub type PayoutRecordFor<T, I> = PayoutRecord<
 	BalanceOf<T, I>,
-	BoundedVec<
-		(<T as frame_system::Config>::BlockNumber, BalanceOf<T, I>),
-		<T as Config<I>>::MaxPayouts,
-	>,
+	BoundedVec<(frame_system::BlockNumberOf<T>, BalanceOf<T, I>), <T as Config<I>>::MaxPayouts>,
 >;
 
 /// Record for an individual new member who was elevated from a candidate recently.
@@ -491,7 +486,7 @@ pub mod pallet {
 		type Currency: ReservableCurrency<Self::AccountId>;
 
 		/// Something that provides randomness in the runtime.
-		type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
+		type Randomness: Randomness<Self::Hash, frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum number of strikes before a member gets funds slashed.
 		#[pallet::constant]
@@ -504,23 +499,23 @@ pub mod pallet {
 		/// The number of blocks on which new candidates should be voted on. Together with
 		/// `ClaimPeriod`, this sums to the number of blocks between candidate intake periods.
 		#[pallet::constant]
-		type VotingPeriod: Get<Self::BlockNumber>;
+		type VotingPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The number of blocks on which new candidates can claim their membership and be the
 		/// named head.
 		#[pallet::constant]
-		type ClaimPeriod: Get<Self::BlockNumber>;
+		type ClaimPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum duration of the payout lock.
 		#[pallet::constant]
-		type MaxLockDuration: Get<Self::BlockNumber>;
+		type MaxLockDuration: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The origin that is allowed to call `found`.
 		type FounderSetOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
 		/// The number of blocks between membership challenges.
 		#[pallet::constant]
-		type ChallengePeriod: Get<Self::BlockNumber>;
+		type ChallengePeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum number of payouts a member may have waiting unclaimed.
 		#[pallet::constant]
@@ -758,7 +753,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			let mut weight = Weight::zero();
 			let weights = T::BlockWeights::get();
 
@@ -1409,7 +1404,7 @@ pub enum Period<BlockNumber> {
 
 impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Get the period we are currently in.
-	fn period() -> Period<T::BlockNumber> {
+	fn period() -> Period<frame_system::BlockNumberOf<T>> {
 		let claim_period = T::ClaimPeriod::get();
 		let voting_period = T::VotingPeriod::get();
 		let rotation_period = voting_period + claim_period;
@@ -1902,7 +1897,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		candidate: &T::AccountId,
 		value: BalanceOf<T, I>,
 		kind: BidKind<T::AccountId, BalanceOf<T, I>>,
-		maturity: T::BlockNumber,
+		maturity: frame_system::BlockNumberOf<T>,
 	) {
 		let value = match kind {
 			BidKind::Deposit(deposit) => {
@@ -1939,7 +1934,11 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	///
 	/// It is the caller's duty to ensure that `who` is already a member. This does nothing if `who`
 	/// is not a member or if `value` is zero.
-	fn bump_payout(who: &T::AccountId, when: T::BlockNumber, value: BalanceOf<T, I>) {
+	fn bump_payout(
+		who: &T::AccountId,
+		when: frame_system::BlockNumberOf<T>,
+		value: BalanceOf<T, I>,
+	) {
 		if value.is_zero() {
 			return
 		}
@@ -2022,7 +2021,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	///
 	/// This is a rather opaque calculation based on the formula here:
 	/// https://www.desmos.com/calculator/9itkal1tce
-	fn lock_duration(x: u32) -> T::BlockNumber {
+	fn lock_duration(x: u32) -> frame_system::BlockNumberOf<T> {
 		let lock_pc = 100 - 50_000 / (x + 500);
 		Percent::from_percent(lock_pc as u8) * T::MaxLockDuration::get()
 	}
diff --git a/frame/society/src/migrations.rs b/frame/society/src/migrations.rs
index bd590f9b18770..afee7d4d135e3 100644
--- a/frame/society/src/migrations.rs
+++ b/frame/society/src/migrations.rs
@@ -161,7 +161,7 @@ pub(crate) mod old {
 		Pallet<T, I>,
 		Twox64Concat,
 		<T as frame_system::Config>::AccountId,
-		Vec<(<T as frame_system::Config>::BlockNumber, BalanceOf<T, I>)>,
+		Vec<(frame_system::BlockNumberOf<T>, BalanceOf<T, I>)>,
 		ValueQuery,
 	>;
 	#[storage_alias]
diff --git a/frame/society/src/mock.rs b/frame/society/src/mock.rs
index ed04aa181e161..6151aa675ee4b 100644
--- a/frame/society/src/mock.rs
+++ b/frame/society/src/mock.rs
@@ -27,21 +27,13 @@ use frame_support::{
 use frame_support_test::TestRandomness;
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
 use RuntimeOrigin as Origin;
-
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -69,13 +61,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/staking/src/mock.rs b/frame/staking/src/mock.rs
index f9af9f5003b43..5cfc8a6995916 100644
--- a/frame/staking/src/mock.rs
+++ b/frame/staking/src/mock.rs
@@ -32,7 +32,7 @@ use sp_core::H256;
 use sp_io;
 use sp_runtime::{
 	curve::PiecewiseLinear,
-	testing::{Header, UintAuthorityId},
+	testing::UintAuthorityId,
 	traits::{IdentityLookup, Zero},
 };
 use sp_staking::offence::{DisableStrategy, OffenceDetails, OnOffenceHandler};
@@ -82,14 +82,10 @@ pub fn is_disabled(controller: AccountId) -> bool {
 	Session::disabled_validators().contains(&validator_index)
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Authorship: pallet_authorship,
@@ -128,13 +124,12 @@ impl frame_system::Config for Test {
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU64<250>;
 	type Version = ();
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index 44d5674f2f816..57d3abf32f082 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -1021,7 +1021,9 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 		Ok(Self::get_npos_targets(None))
 	}
 
-	fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
+	fn next_election_prediction(
+		now: frame_system::BlockNumberOf<T>,
+	) -> frame_system::BlockNumberOf<T> {
 		let current_era = Self::current_era().unwrap_or(0);
 		let current_session = Self::current_planned_session();
 		let current_era_start_session_index =
@@ -1038,7 +1040,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 
 		let session_length = T::NextNewSession::average_session_length();
 
-		let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
+		let sessions_left: frame_system::BlockNumberOf<T> = match ForceEra::<T>::get() {
 			Forcing::ForceNone => Bounded::max_value(),
 			Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
 			Forcing::NotForcing if era_progress >= T::SessionsPerEra::get() => Zero::zero(),
@@ -1237,7 +1239,7 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
 
 /// Add reward points to block authors:
 /// * 20 points to the block producer for producing a (non-uncle) block,
-impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
+impl<T> pallet_authorship::EventHandler<T::AccountId, frame_system::BlockNumberOf<T>> for Pallet<T>
 where
 	T: Config + pallet_authorship::Config + pallet_session::Config,
 {
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index bff51312e7121..d0d18ffa78f6e 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -87,7 +87,7 @@ pub mod pallet {
 		/// The staking balance.
 		type Currency: LockableCurrency<
 			Self::AccountId,
-			Moment = Self::BlockNumber,
+			Moment = frame_system::BlockNumberOf<Self>,
 			Balance = Self::CurrencyBalance,
 		>;
 		/// Just the `Currency::Balance` type; we have this item to allow us to constrain it to
@@ -118,14 +118,14 @@ pub mod pallet {
 		/// Something that provides the election functionality.
 		type ElectionProvider: ElectionProvider<
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = frame_system::BlockNumberOf<Self>,
 			// we only accept an election provider that has staking as data provider.
 			DataProvider = Pallet<Self>,
 		>;
 		/// Something that provides the election functionality at genesis.
 		type GenesisElectionProvider: ElectionProvider<
 			AccountId = Self::AccountId,
-			BlockNumber = Self::BlockNumber,
+			BlockNumber = frame_system::BlockNumberOf<Self>,
 			DataProvider = Pallet<Self>,
 		>;
 
@@ -200,7 +200,7 @@ pub mod pallet {
 
 		/// Something that can estimate the next session change, accurately or as a best effort
 		/// guess.
-		type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
+		type NextNewSession: EstimateNextNewSession<frame_system::BlockNumberOf<Self>>;
 
 		/// The maximum number of nominators rewarded for each validator.
 		///
diff --git a/frame/state-trie-migration/src/lib.rs b/frame/state-trie-migration/src/lib.rs
index 05ca21c1de752..9d1e285fca9b0 100644
--- a/frame/state-trie-migration/src/lib.rs
+++ b/frame/state-trie-migration/src/lib.rs
@@ -1065,15 +1065,11 @@ mod mock {
 		StorageChild,
 	};
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
 
 	// Configure a mock runtime to test the pallet.
 	frame_support::construct_runtime!(
-		pub enum Test where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
+		pub enum Test
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
@@ -1092,14 +1088,13 @@ mod mock {
 		type RuntimeOrigin = RuntimeOrigin;
 		type RuntimeCall = RuntimeCall;
 		type Index = u64;
-		type BlockNumber = u32;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
-		type Header = sp_runtime::generic::Header<Self::BlockNumber, BlakeTwo256>;
+		type Block = Block;
 		type RuntimeEvent = RuntimeEvent;
-		type BlockHashCount = ConstU32<250>;
+		type BlockHashCount = ConstU64<250>;
 		type DbWeight = ();
 		type Version = ();
 		type PalletInfo = PalletInfo;
@@ -1257,7 +1252,7 @@ mod mock {
 		let mut root = Default::default();
 		let mut weight_sum = Weight::zero();
 		log::trace!(target: LOG_TARGET, "running from {:?} to {:?}", System::block_number(), n);
-		while System::block_number() < n {
+		while System::block_number() < n.into() {
 			System::set_block_number(System::block_number() + 1);
 			System::on_initialize(System::block_number());
 
@@ -1630,7 +1625,7 @@ pub(crate) mod remote_tests {
 
 	#[allow(dead_code)]
 	fn run_to_block<Runtime: crate::Config<Hash = H256>>(
-		n: <Runtime as frame_system::Config>::BlockNumber,
+		n: frame_system::BlockNumberOf<Runtime>,
 	) -> (H256, Weight) {
 		let mut root = Default::default();
 		let mut weight_sum = Weight::zero();
@@ -1670,7 +1665,7 @@ pub(crate) mod remote_tests {
 			frame_system::Pallet::<Runtime>::block_number()
 		});
 
-		let mut duration: <Runtime as frame_system::Config>::BlockNumber = Zero::zero();
+		let mut duration: frame_system::BlockNumberOf<Runtime> = Zero::zero();
 		// set the version to 1, as if the upgrade happened.
 		ext.state_version = sp_core::storage::StateVersion::V1;
 
diff --git a/frame/statement/src/mock.rs b/frame/statement/src/mock.rs
index 8b9e7a1a7d965..d99ff2e1d852c 100644
--- a/frame/statement/src/mock.rs
+++ b/frame/statement/src/mock.rs
@@ -27,12 +27,10 @@ use frame_support::{
 };
 use sp_core::{Pair, H256};
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	AccountId32,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 pub const MIN_ALLOWED_STATEMENTS: u32 = 4;
@@ -41,10 +39,7 @@ pub const MIN_ALLOWED_BYTES: u32 = 1024;
 pub const MAX_ALLOWED_BYTES: u32 = 4096;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances,
@@ -60,12 +55,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId32;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs
index 856cb35c8718c..b523a31efa86e 100644
--- a/frame/sudo/src/mock.rs
+++ b/frame/sudo/src/mock.rs
@@ -22,10 +22,7 @@ use crate as sudo;
 use frame_support::traits::{ConstU32, ConstU64, Contains, GenesisBuild};
 use sp_core::H256;
 use sp_io;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
 // Logger module to track execution.
 #[frame_support::pallet]
@@ -90,14 +87,10 @@ pub mod logger {
 	pub(super) type I32Log<T> = StorageValue<_, BoundedVec<i32, ConstU32<1_000>>, ValueQuery>;
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Sudo: sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
@@ -120,12 +113,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/support/procedural/src/construct_runtime/expand/inherent.rs b/frame/support/procedural/src/construct_runtime/expand/inherent.rs
index 2f1cf75ab7ce9..13a7a550c90b6 100644
--- a/frame/support/procedural/src/construct_runtime/expand/inherent.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/inherent.rs
@@ -19,12 +19,12 @@ use crate::construct_runtime::Pallet;
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::str::FromStr;
-use syn::{Ident, TypePath};
+use syn::Ident;
 
 pub fn expand_outer_inherent(
 	runtime: &Ident,
-	block: &TypePath,
-	unchecked_extrinsic: &TypePath,
+	block: &TokenStream,
+	unchecked_extrinsic: &TokenStream,
 	pallet_decls: &[Pallet],
 	scrate: &TokenStream,
 ) -> TokenStream {
diff --git a/frame/support/procedural/src/construct_runtime/expand/metadata.rs b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
index 81fc93ba3c9ef..e23e4d1fe75b8 100644
--- a/frame/support/procedural/src/construct_runtime/expand/metadata.rs
+++ b/frame/support/procedural/src/construct_runtime/expand/metadata.rs
@@ -19,13 +19,13 @@ use crate::construct_runtime::Pallet;
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::str::FromStr;
-use syn::{Ident, TypePath};
+use syn::Ident;
 
 pub fn expand_runtime_metadata(
 	runtime: &Ident,
 	pallet_declarations: &[Pallet],
 	scrate: &TokenStream,
-	extrinsic: &TypePath,
+	extrinsic: &TokenStream,
 ) -> TokenStream {
 	let pallets = pallet_declarations
 		.iter()
diff --git a/frame/support/procedural/src/construct_runtime/mod.rs b/frame/support/procedural/src/construct_runtime/mod.rs
index 9879a65d684a6..a6a1596e67c28 100644
--- a/frame/support/procedural/src/construct_runtime/mod.rs
+++ b/frame/support/procedural/src/construct_runtime/mod.rs
@@ -149,10 +149,7 @@ use frame_support_procedural_tools::{
 	generate_crate_access, generate_crate_access_2018, generate_hidden_includes,
 };
 use itertools::Itertools;
-use parse::{
-	ExplicitRuntimeDeclaration, ImplicitRuntimeDeclaration, Pallet, RuntimeDeclaration,
-	WhereSection,
-};
+use parse::{ExplicitRuntimeDeclaration, ImplicitRuntimeDeclaration, Pallet, RuntimeDeclaration};
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
@@ -222,12 +219,7 @@ fn construct_runtime_intermediary_expansion(
 fn construct_runtime_final_expansion(
 	definition: ExplicitRuntimeDeclaration,
 ) -> Result<TokenStream2> {
-	let ExplicitRuntimeDeclaration {
-		name,
-		where_section: WhereSection { block, node_block, unchecked_extrinsic },
-		pallets,
-		pallets_token,
-	} = definition;
+	let ExplicitRuntimeDeclaration { name, pallets, pallets_token, where_section } = definition;
 
 	let system_pallet =
 		pallets.iter().find(|decl| decl.name == SYSTEM_PALLET_NAME).ok_or_else(|| {
@@ -264,6 +256,10 @@ fn construct_runtime_final_expansion(
 	let scrate = generate_crate_access(hidden_crate_name, "frame-support");
 	let scrate_decl = generate_hidden_includes(hidden_crate_name, "frame-support");
 
+	let frame_system = generate_crate_access_2018("frame-system")?;
+	let block = quote!(<#name as #frame_system::Config>::Block);
+	let unchecked_extrinsic = quote!(<#block as #scrate::sp_runtime::traits::Block>::Extrinsic);
+
 	let outer_event = expand::expand_outer_event(&name, &pallets, &scrate)?;
 
 	let outer_origin = expand::expand_outer_origin(&name, system_pallet, &pallets, &scrate)?;
@@ -283,7 +279,22 @@ fn construct_runtime_final_expansion(
 	let integrity_test = decl_integrity_test(&scrate);
 	let static_assertions = decl_static_assertions(&name, &pallets, &scrate);
 
+	let warning = if let Some(where_section) = where_section {
+		Some(
+			proc_macro_warning::Warning::new_deprecated("WhereSection")
+				.old("use where section")
+				.new("use `frame_system::Config` to set the `Block` type and remove this section")
+				.help_links(&["https://github.com/paritytech/substrate/pull/14193"])
+				.span(where_section.span)
+				.build(),
+		)
+	} else {
+		None
+	};
+
 	let res = quote!(
+		#warning
+
 		#scrate_decl
 
 		// Prevent UncheckedExtrinsic to print unused warning.
@@ -297,9 +308,6 @@ fn construct_runtime_final_expansion(
 			#scrate::scale_info::TypeInfo
 		)]
 		pub struct #name;
-		impl #scrate::sp_runtime::traits::GetNodeBlockType for #name {
-			type NodeBlock = #node_block;
-		}
 		impl #scrate::sp_runtime::traits::GetRuntimeBlockType for #name {
 			type RuntimeBlock = #block;
 		}
diff --git a/frame/support/procedural/src/construct_runtime/parse.rs b/frame/support/procedural/src/construct_runtime/parse.rs
index f819a90d1b5cd..6daedd542fda2 100644
--- a/frame/support/procedural/src/construct_runtime/parse.rs
+++ b/frame/support/procedural/src/construct_runtime/parse.rs
@@ -62,7 +62,7 @@ pub enum RuntimeDeclaration {
 #[derive(Debug)]
 pub struct ImplicitRuntimeDeclaration {
 	pub name: Ident,
-	pub where_section: WhereSection,
+	pub where_section: Option<WhereSection>,
 	pub pallets: Vec<PalletDeclaration>,
 }
 
@@ -70,7 +70,7 @@ pub struct ImplicitRuntimeDeclaration {
 #[derive(Debug)]
 pub struct ExplicitRuntimeDeclaration {
 	pub name: Ident,
-	pub where_section: WhereSection,
+	pub where_section: Option<WhereSection>,
 	pub pallets: Vec<Pallet>,
 	pub pallets_token: token::Brace,
 }
@@ -87,7 +87,7 @@ impl Parse for RuntimeDeclaration {
 		}
 
 		let name = input.parse::<syn::Ident>()?;
-		let where_section = input.parse()?;
+		let where_section = if input.peek(token::Where) { Some(input.parse()?) } else { None };
 		let pallets =
 			input.parse::<ext::Braces<ext::Punctuated<PalletDeclaration, Token![,]>>>()?;
 		let pallets_token = pallets.token;
@@ -112,6 +112,7 @@ impl Parse for RuntimeDeclaration {
 
 #[derive(Debug)]
 pub struct WhereSection {
+	pub span: Span,
 	pub block: syn::TypePath,
 	pub node_block: syn::TypePath,
 	pub unchecked_extrinsic: syn::TypePath,
@@ -120,6 +121,7 @@ pub struct WhereSection {
 impl Parse for WhereSection {
 	fn parse(input: ParseStream) -> Result<Self> {
 		input.parse::<token::Where>()?;
+
 		let mut definitions = Vec::new();
 		while !input.peek(token::Brace) {
 			let definition: WhereDefinition = input.parse()?;
@@ -143,7 +145,7 @@ impl Parse for WhereSection {
 			);
 			return Err(Error::new(*kind_span, msg))
 		}
-		Ok(Self { block, node_block, unchecked_extrinsic })
+		Ok(Self { span: input.span(), block, node_block, unchecked_extrinsic })
 	}
 }
 
diff --git a/frame/support/procedural/src/lib.rs b/frame/support/procedural/src/lib.rs
index bde5b55148b4b..d31abf3142714 100644
--- a/frame/support/procedural/src/lib.rs
+++ b/frame/support/procedural/src/lib.rs
@@ -854,7 +854,7 @@ pub fn storage_alias(_: TokenStream, input: TokenStream) -> TokenStream {
 ///     type RuntimeOrigin = RuntimeOrigin;
 ///     type OnSetCode = ();
 ///     type PalletInfo = PalletInfo;
-///     type Header = Header;
+///     type Block = Block;
 ///     // We decide to override this one.
 ///     type AccountData = pallet_balances::AccountData<u64>;
 /// }
@@ -872,8 +872,7 @@ pub fn storage_alias(_: TokenStream, input: TokenStream) -> TokenStream {
 ///     type BlockLength = ();
 ///     type DbWeight = ();
 ///     type Index = u64;
-///     type BlockNumber = u64;
-///     type Hash = sp_core::hash::H256;
+///     ///     type Hash = sp_core::hash::H256;
 ///     type Hashing = sp_runtime::traits::BlakeTwo256;
 ///     type AccountId = AccountId;
 ///     type Lookup = IdentityLookup<AccountId>;
@@ -900,7 +899,7 @@ pub fn storage_alias(_: TokenStream, input: TokenStream) -> TokenStream {
 ///     type RuntimeOrigin = RuntimeOrigin;
 ///     type OnSetCode = ();
 ///     type PalletInfo = PalletInfo;
-///     type Header = Header;
+///     type Block = Block;
 ///     type AccountData = pallet_balances::AccountData<u64>;
 ///     type Version = <TestDefaultConfig as DefaultConfig>::Version;
 ///     type BlockWeights = <TestDefaultConfig as DefaultConfig>::BlockWeights;
@@ -1557,7 +1556,7 @@ pub fn unbounded(_: TokenStream, _: TokenStream) -> TokenStream {
 /// ```ignore
 /// #[pallet::storage]
 /// #[pallet::whitelist_storage]
-/// pub(super) type Number<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+/// pub(super) type Number<T: Config> = StorageValue<_, frame_system::BlockNumberOf<T>, ValueQuery>;
 /// ```
 ///
 /// NOTE: As with all `pallet::*` attributes, this one _must_ be written as
diff --git a/frame/support/procedural/src/pallet/expand/hooks.rs b/frame/support/procedural/src/pallet/expand/hooks.rs
index ef22f5a3af5be..d42d1940e0112 100644
--- a/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -75,7 +75,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		let frame_system = &def.frame_system;
 		quote::quote! {
 			impl<#type_impl_gen>
-				#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+				#frame_support::traits::Hooks<#frame_system::BlockNumberOf<T>>
 				for #pallet_ident<#type_use_gen> #where_clause {}
 		}
 	} else {
@@ -137,50 +137,50 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		#hooks_impl
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OnFinalize<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OnFinalize<#frame_system::BlockNumberOf<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
-			fn on_finalize(n: <T as #frame_system::Config>::BlockNumber) {
+			fn on_finalize(n: #frame_system::BlockNumberOf<T>) {
 				#frame_support::sp_tracing::enter_span!(
 					#frame_support::sp_tracing::trace_span!("on_finalize")
 				);
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 					>
 				>::on_finalize(n)
 			}
 		}
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OnIdle<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OnIdle<#frame_system::BlockNumberOf<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_idle(
-				n: <T as #frame_system::Config>::BlockNumber,
+				n: #frame_system::BlockNumberOf<T>,
 				remaining_weight: #frame_support::weights::Weight
 			) -> #frame_support::weights::Weight {
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 					>
 				>::on_idle(n, remaining_weight)
 			}
 		}
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OnInitialize<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OnInitialize<#frame_system::BlockNumberOf<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_initialize(
-				n: <T as #frame_system::Config>::BlockNumber
+				n: #frame_system::BlockNumberOf<T>
 			) -> #frame_support::weights::Weight {
 				#frame_support::sp_tracing::enter_span!(
 					#frame_support::sp_tracing::trace_span!("on_initialize")
 				);
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 					>
 				>::on_initialize(n)
 			}
@@ -205,7 +205,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 					>
 				>::on_runtime_upgrade()
 			}
@@ -215,7 +215,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				<
 					Self
 					as
-					#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+					#frame_support::traits::Hooks<#frame_system::BlockNumberOf<T>>
 				>::pre_upgrade()
 			}
 
@@ -226,19 +226,19 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				<
 					Self
 					as
-					#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+					#frame_support::traits::Hooks<#frame_system::BlockNumberOf<T>>
 				>::post_upgrade(state)
 			}
 		}
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OffchainWorker<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OffchainWorker<#frame_system::BlockNumberOf<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
-			fn offchain_worker(n: <T as #frame_system::Config>::BlockNumber) {
+			fn offchain_worker(n: #frame_system::BlockNumberOf<T>) {
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 					>
 				>::offchain_worker(n)
 			}
@@ -253,7 +253,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				fn integrity_test() {
 					<
 						Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 						>
 						>::integrity_test()
 				}
@@ -262,17 +262,17 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 
 		#[cfg(feature = "try-runtime")]
 		impl<#type_impl_gen>
-			#frame_support::traits::TryState<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::TryState<#frame_system::BlockNumberOf<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn try_state(
-				n: <T as #frame_system::Config>::BlockNumber,
+				n: #frame_system::BlockNumberOf<T>,
 				_s: #frame_support::traits::TryStateSelect
 			) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
 				#log_try_state
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::BlockNumberOf<T>
 					>
 				>::try_state(n)
 			}
diff --git a/frame/support/src/dispatch.rs b/frame/support/src/dispatch.rs
index 9981e5ad65b78..452db0a983157 100644
--- a/frame/support/src/dispatch.rs
+++ b/frame/support/src/dispatch.rs
@@ -645,259 +645,6 @@ impl<T> PaysFee<T> for (u64, Pays) {
 // END TODO
 
 /// Declares a `Module` struct and a `Call` enum, which implements the dispatch logic.
-///
-/// ## Declaration
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::dispatch;
-/// # use frame_system::{Config, ensure_signed};
-/// decl_module! {
-/// 	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
-///
-/// 		// Private functions are dispatchable, but not available to other
-/// 		// FRAME pallets.
-/// 		#[weight = 0]
-/// 		fn my_function(origin, var: u64) -> dispatch::DispatchResult {
-/// 				// Your implementation
-/// 				Ok(())
-/// 		}
-///
-/// 			// Public functions are both dispatchable and available to other
-/// 		// FRAME pallets.
-/// 		#[weight = 0]
-/// 			pub fn my_public_function(origin) -> dispatch::DispatchResult {
-/// 			// Your implementation
-/// 				Ok(())
-/// 		}
-/// 		}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// The declaration is set with the header where:
-///
-/// * `Module`: The struct generated by the macro, with type `Config`.
-/// * `Call`: The enum generated for every pallet, which implements
-///   [`Callable`](./dispatch/trait.Callable.html).
-/// * `origin`: Alias of `T::RuntimeOrigin`.
-/// * `Result`: The expected return type from pallet functions.
-///
-/// The first parameter of dispatchable functions must always be `origin`.
-///
-/// ### Shorthand Example
-///
-/// The macro automatically expands a shorthand function declaration to return the
-/// [`DispatchResult`] type. These functions are the same:
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::dispatch;
-/// # use frame_system::{Config, ensure_signed};
-/// decl_module! {
-/// 	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
-/// 		#[weight = 0]
-/// 		fn my_long_function(origin) -> dispatch::DispatchResult {
-/// 				// Your implementation
-/// 			Ok(())
-/// 		}
-///
-/// 		#[weight = 0]
-/// 		fn my_short_function(origin) {
-/// 				// Your implementation
-/// 		}
-/// 		}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// ### Consuming only portions of the annotated static weight
-///
-/// Per default a callable function consumes all of its static weight as declared via
-/// the #\[weight\] attribute. However, there are use cases where only a portion of this
-/// weight should be consumed. In that case the static weight is charged pre dispatch and
-/// the difference is refunded post dispatch.
-///
-/// In order to make use of this feature the function must return `DispatchResultWithPostInfo`
-/// in place of the default `DispatchResult`. Then the actually consumed weight can be returned.
-/// To consume a non default weight while returning an error
-/// [`WithPostDispatchInfo::with_weight`](./weight/trait.WithPostDispatchInfo.html) can be used
-/// to augment any error with custom weight information.
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::{weights::Weight, dispatch::{DispatchResultWithPostInfo, WithPostDispatchInfo, PostDispatchInfo}};
-/// # use frame_system::{Config, ensure_signed};
-/// decl_module! {
-/// 	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
-/// 		#[weight = 1_000_000]
-/// 		fn my_long_function(origin, do_expensive_calc: bool) -> DispatchResultWithPostInfo {
-/// 			ensure_signed(origin).map_err(|e| e.with_weight(Weight::from_parts(100_000, 0)))?;
-/// 			if do_expensive_calc {
-/// 				// do the expensive calculation
-/// 				// ...
-/// 				// return None to indicate that we are using all weight (the default)
-/// 				return Ok(None::<Weight>.into());
-/// 			}
-/// 			// expensive calculation not executed: use only a portion of the weight
-/// 			Ok(PostDispatchInfo { actual_weight: Some(Weight::from_parts(100_000, 0)), ..Default::default() })
-/// 		}
-/// 	}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// ### Transactional Function Example
-///
-/// Transactional function discards all changes to storage if it returns `Err`, or commits if
-/// `Ok`, via the #\[transactional\] attribute. Note the attribute must be after #\[weight\].
-/// The #\[transactional\] attribute is deprecated since it is the default behaviour.
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::transactional;
-/// # use frame_system::Config;
-/// decl_module! {
-/// 	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
-/// 		#[weight = 0]
-/// 		#[transactional]
-/// 		fn my_short_function(origin) {
-/// 				// Your implementation
-/// 		}
-/// 	}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// ### Privileged Function Example
-///
-/// A privileged function checks that the origin of the call is `ROOT`.
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::dispatch;
-/// # use frame_system::{Config, ensure_signed, ensure_root};
-/// decl_module! {
-/// 	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
-/// 		#[weight = 0]
-/// 			fn my_privileged_function(origin) -> dispatch::DispatchResult {
-/// 			ensure_root(origin)?;
-/// 				// Your implementation
-/// 			Ok(())
-/// 		}
-/// 		}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// ### Attributes on Functions
-///
-/// Attributes on functions are supported, but must be in the order of:
-/// 1. Optional #\[doc\] attribute.
-/// 2. #\[weight\] attribute.
-/// 3. Optional function attributes, for instance #\[transactional\]. Those function attributes will
-/// be written only on the dispatchable functions implemented on `Module`, not on the `Call` enum
-/// variant.
-///
-/// ## Multiple Module Instances Example
-///
-/// A Substrate module can be built such that multiple instances of the same module can be used
-/// within a single runtime. For example, the [Balances module](../pallet_balances/index.html) can
-/// be added multiple times to your runtime in order to support multiple, independent currencies for
-/// your blockchain. Here is an example of how you would declare such a module using the
-/// `decl_module!` macro:
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::dispatch;
-/// # use frame_system::ensure_signed;
-/// # pub struct DefaultInstance;
-/// # pub trait Instance: 'static {}
-/// # impl Instance for DefaultInstance {}
-/// pub trait Config<I: Instance=DefaultInstance>: frame_system::Config {}
-///
-/// decl_module! {
-/// 	pub struct Module<T: Config<I>, I: Instance = DefaultInstance> for enum Call where origin: T::RuntimeOrigin {
-/// 		// Your implementation
-/// 	}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// Note: `decl_storage` must be called to generate `Instance` trait and optionally
-/// `DefaultInstance` type.
-///
-/// ## Where clause
-///
-/// Besides the default `origin: T::RuntimeOrigin`, you can also pass other bounds to the module
-/// declaration. This where bound will be replicated to all types generated by this macro. The
-/// chaining of multiple trait bounds with `+` is not supported. If multiple bounds for one type are
-/// required, it needs to be split up into multiple bounds.
-///
-/// ```
-/// # #[macro_use]
-/// # extern crate frame_support;
-/// # use frame_support::dispatch;
-/// # use frame_system::{self as system, ensure_signed};
-/// pub trait Config: system::Config where Self::AccountId: From<u32> {}
-///
-/// decl_module! {
-/// 	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin, T::AccountId: From<u32> {
-/// 		// Your implementation
-/// 	}
-/// }
-/// # fn main() {}
-/// ```
-///
-/// ## Reserved Functions
-///
-/// The following are reserved function signatures:
-///
-/// * `deposit_event`: Helper function for depositing an [event](https://docs.substrate.io/main-docs/build/events-errors/).
-/// The default behavior is to call `deposit_event` from the [System
-/// module](../frame_system/index.html). However, you can write your own implementation for events
-/// in your runtime. To use the default behavior, add `fn deposit_event() = default;` to your
-/// `Module`.
-///
-/// The following reserved functions also take the block number (with type `T::BlockNumber`) as an
-/// optional input:
-///
-/// * `on_runtime_upgrade`: Executes at the beginning of a block prior to on_initialize when there
-/// is a runtime upgrade. This allows each module to upgrade its storage before the storage items
-/// are used. As such, **calling other modules must be avoided**!! Using this function will
-/// implement the [`OnRuntimeUpgrade`](../sp_runtime/traits/trait.OnRuntimeUpgrade.html) trait.
-/// Function signature must be `fn on_runtime_upgrade() -> frame_support::weights::Weight`.
-///
-/// * `on_initialize`: Executes at the beginning of a block. Using this function will
-/// implement the [`OnInitialize`](./trait.OnInitialize.html) trait.
-/// Function signature can be either:
-///   * `fn on_initialize(n: BlockNumber) -> frame_support::weights::Weight` or
-///   * `fn on_initialize() -> frame_support::weights::Weight`
-///
-/// * `on_idle`: Executes at the end of a block. Passes a remaining weight to provide a threshold
-/// for when to execute non vital functions. Using this function will implement the
-/// [`OnIdle`](./traits/trait.OnIdle.html) trait.
-/// Function signature is:
-///   * `fn on_idle(n: BlockNumber, remaining_weight: Weight) -> frame_support::weights::Weight`
-///
-/// * `on_finalize`: Executes at the end of a block. Using this function will
-/// implement the [`OnFinalize`](./traits/trait.OnFinalize.html) trait.
-/// Function signature can be either:
-///   * `fn on_finalize(n: BlockNumber) -> frame_support::weights::Weight` or
-///   * `fn on_finalize() -> frame_support::weights::Weight`
-///
-/// * `offchain_worker`: Executes at the beginning of a block and produces extrinsics for a future
-///   block upon completion. Using this function will implement the
-///   [`OffchainWorker`](./traits/trait.OffchainWorker.html) trait.
-/// * `integrity_test`: Executes in a test generated by `construct_runtime`, note it doesn't execute
-///   in an externalities-provided environment. Implement
-///   [`IntegrityTest`](./trait.IntegrityTest.html) trait.
 #[macro_export]
 #[deprecated(note = "Will be removed after July 2023; use the attribute `#[pallet]` macro instead.
 	For more info, see: <https://github.com/paritytech/substrate/pull/13705>")]
@@ -3575,9 +3322,12 @@ mod weight_tests {
 
 	pub use self::frame_system::{Call, Config, Pallet};
 
+	type HeaderOf<T> = <<T as Config>::Block as sp_runtime::traits::HeaderProvider>::Header;
+	type BlockNumberOf<T> = <HeaderOf<T> as sp_runtime::traits::Header>::Number;
+
 	#[crate::pallet(dev_mode)]
 	pub mod frame_system {
-		use super::{frame_system, frame_system::pallet_prelude::*};
+		use super::{frame_system, frame_system::pallet_prelude::*, BlockNumberOf};
 		pub use crate::dispatch::RawOrigin;
 		use crate::pallet_prelude::*;
 
@@ -3587,7 +3337,7 @@ mod weight_tests {
 		#[pallet::config]
 		#[pallet::disable_frame_system_supertrait_check]
 		pub trait Config: 'static {
-			type BlockNumber: Parameter + Default + MaxEncodedLen;
+			type Block: Parameter + sp_runtime::traits::Block;
 			type AccountId;
 			type Balance;
 			type BaseCallFilter: crate::traits::Contains<Self::RuntimeCall>;
@@ -3665,10 +3415,6 @@ mod weight_tests {
 
 	crate::construct_runtime!(
 		pub enum Runtime
-		where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: self::frame_system,
 		}
@@ -3682,7 +3428,7 @@ mod weight_tests {
 	}
 
 	impl Config for Runtime {
-		type BlockNumber = BlockNumber;
+		type Block = Block;
 		type AccountId = AccountId;
 		type Balance = Balance;
 		type BaseCallFilter = crate::traits::Everything;
diff --git a/frame/support/src/error.rs b/frame/support/src/error.rs
index 14dc16d4dd5c2..5a7dd73f481ec 100644
--- a/frame/support/src/error.rs
+++ b/frame/support/src/error.rs
@@ -21,51 +21,6 @@
 pub use sp_runtime::traits::{BadOrigin, LookupError};
 
 /// Declare an error type for a runtime module.
-///
-/// `decl_error!` supports only variants that do not hold any data. The dispatchable
-/// functions return [`DispatchResult`](sp_runtime::DispatchResult). The error type
-/// implements `From<ErrorType> for DispatchResult` to make the error type usable as error
-/// in the dispatchable functions.
-///
-/// It is required that the error type is registered in `decl_module!` to make the error
-/// exported in the metadata.
-///
-/// # Usage
-///
-/// ```
-/// # use frame_support::{decl_error, decl_module};
-/// #
-/// decl_error! {
-///     /// Errors that can occur in my module.
-///     pub enum MyError for Module<T: Config> {
-///         /// Hey this is an error message that indicates bla.
-///         MyCoolErrorMessage,
-///         /// You are just not cool enough for my module!
-///         YouAreNotCoolEnough,
-///     }
-/// }
-///
-/// # use frame_system::Config;
-///
-/// // You need to register the error type in `decl_module!` as well to make the error
-/// // exported in the metadata.
-///
-/// decl_module! {
-///     pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
-///         type Error = MyError<T>;
-///
-///         #[weight = 0]
-///         fn do_something(origin) -> frame_support::dispatch::DispatchResult {
-///             Err(MyError::<T>::YouAreNotCoolEnough.into())
-///         }
-///     }
-/// }
-///
-/// # fn main() {}
-/// ```
-///
-/// For instantiable modules you also need to give the instance generic type and bound to the
-/// error declaration.
 #[macro_export]
 #[deprecated(note = "Will be removed after July 2023; use the attribute `#[pallet]` macro instead.
 	For more info, see: <https://github.com/paritytech/substrate/pull/13705>")]
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
index 0f2b135eed323..fcab98f5f3eb3 100644
--- a/frame/support/src/lib.rs
+++ b/frame/support/src/lib.rs
@@ -112,7 +112,9 @@ pub use self::{
 	},
 };
 pub use sp_runtime::{
-	self, print, traits::Printable, ConsensusEngineId, MAX_MODULE_ERROR_ENCODED_SIZE,
+	self, print,
+	traits::{HeaderProvider, Printable},
+	ConsensusEngineId, MAX_MODULE_ERROR_ENCODED_SIZE,
 };
 
 use codec::{Decode, Encode};
@@ -839,10 +841,13 @@ pub mod tests {
 
 	pub use self::frame_system::{Config, Pallet};
 
+	type HeaderOf<T> = <<T as Config>::Block as sp_runtime::traits::HeaderProvider>::Header;
+	type BlockNumberOf<T> = <HeaderOf<T> as sp_runtime::traits::Header>::Number;
+
 	#[pallet]
 	pub mod frame_system {
 		#[allow(unused)]
-		use super::{frame_system, frame_system::pallet_prelude::*};
+		use super::{frame_system, frame_system::pallet_prelude::*, BlockNumberOf};
 		pub use crate::dispatch::RawOrigin;
 		use crate::pallet_prelude::*;
 
@@ -852,7 +857,7 @@ pub mod tests {
 		#[pallet::config]
 		#[pallet::disable_frame_system_supertrait_check]
 		pub trait Config: 'static {
-			type BlockNumber: Parameter + Default + MaxEncodedLen;
+			type Block: Parameter + sp_runtime::traits::Block;
 			type AccountId;
 			type BaseCallFilter: crate::traits::Contains<Self::RuntimeCall>;
 			type RuntimeOrigin;
@@ -882,12 +887,12 @@ pub mod tests {
 		#[pallet::storage]
 		#[pallet::getter(fn generic_data)]
 		pub type GenericData<T: Config> =
-			StorageMap<_, Identity, T::BlockNumber, T::BlockNumber, ValueQuery>;
+			StorageMap<_, Identity, BlockNumberOf<T>, BlockNumberOf<T>, ValueQuery>;
 
 		#[pallet::storage]
 		#[pallet::getter(fn generic_data2)]
 		pub type GenericData2<T: Config> =
-			StorageMap<_, Blake2_128Concat, T::BlockNumber, T::BlockNumber, OptionQuery>;
+			StorageMap<_, Blake2_128Concat, BlockNumberOf<T>, BlockNumberOf<T>, OptionQuery>;
 
 		#[pallet::storage]
 		pub type DataDM<T> =
@@ -897,10 +902,10 @@ pub mod tests {
 		pub type GenericDataDM<T: Config> = StorageDoubleMap<
 			_,
 			Blake2_128Concat,
-			T::BlockNumber,
+			BlockNumberOf<T>,
 			Identity,
-			T::BlockNumber,
-			T::BlockNumber,
+			BlockNumberOf<T>,
+			BlockNumberOf<T>,
 			ValueQuery,
 		>;
 
@@ -908,10 +913,10 @@ pub mod tests {
 		pub type GenericData2DM<T: Config> = StorageDoubleMap<
 			_,
 			Blake2_128Concat,
-			T::BlockNumber,
+			BlockNumberOf<T>,
 			Twox64Concat,
-			T::BlockNumber,
-			T::BlockNumber,
+			BlockNumberOf<T>,
+			BlockNumberOf<T>,
 			OptionQuery,
 		>;
 
@@ -922,7 +927,7 @@ pub mod tests {
 			Blake2_128Concat,
 			u32,
 			Blake2_128Concat,
-			T::BlockNumber,
+			BlockNumberOf<T>,
 			Vec<u32>,
 			ValueQuery,
 		>;
@@ -964,17 +969,13 @@ pub mod tests {
 
 	crate::construct_runtime!(
 		pub enum Runtime
-		where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: self::frame_system,
 		}
 	);
 
 	impl Config for Runtime {
-		type BlockNumber = BlockNumber;
+		type Block = Block;
 		type AccountId = AccountId;
 		type BaseCallFilter = crate::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
@@ -1002,12 +1003,8 @@ pub mod tests {
 	fn storage_alias_works() {
 		new_test_ext().execute_with(|| {
 			#[crate::storage_alias]
-			type GenericData2<T> = StorageMap<
-				System,
-				Blake2_128Concat,
-				<T as Config>::BlockNumber,
-				<T as Config>::BlockNumber,
-			>;
+			type GenericData2<T> =
+				StorageMap<System, Blake2_128Concat, BlockNumberOf<T>, BlockNumberOf<T>>;
 
 			assert_eq!(Pallet::<Runtime>::generic_data2(5), None);
 			GenericData2::<Runtime>::insert(5, 5);
@@ -1015,12 +1012,8 @@ pub mod tests {
 
 			/// Some random docs that ensure that docs are accepted
 			#[crate::storage_alias]
-			pub type GenericData<T> = StorageMap<
-				Test2,
-				Blake2_128Concat,
-				<T as Config>::BlockNumber,
-				<T as Config>::BlockNumber,
-			>;
+			pub type GenericData<T> =
+				StorageMap<Test2, Blake2_128Concat, BlockNumberOf<T>, BlockNumberOf<T>>;
 		});
 	}
 
diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs
index 349f5de3ef3bc..2008b341c68b5 100644
--- a/frame/support/src/storage/generator/mod.rs
+++ b/frame/support/src/storage/generator/mod.rs
@@ -45,10 +45,19 @@ mod tests {
 		storage::{generator::StorageValue, unhashed},
 	};
 
+	type BlockNumber = u32;
+	type AccountId = u32;
+	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
+	type Block = generic::Block<Header, UncheckedExtrinsic>;
+	type HeaderOf<T> =
+		<<T as frame_system::Config>::Block as sp_runtime::traits::HeaderProvider>::Header;
+	type BlockNumberOf<T> = <HeaderOf<T> as sp_runtime::traits::Header>::Number;
+
 	#[crate::pallet]
 	pub mod frame_system {
 		#[allow(unused)]
-		use super::{frame_system, frame_system::pallet_prelude::*};
+		use super::{frame_system, frame_system::pallet_prelude::*, BlockNumberOf};
 		pub use crate::dispatch::RawOrigin;
 		use crate::pallet_prelude::*;
 
@@ -58,7 +67,7 @@ mod tests {
 		#[pallet::config]
 		#[pallet::disable_frame_system_supertrait_check]
 		pub trait Config: 'static {
-			type BlockNumber;
+			type Block: sp_runtime::traits::Block;
 			type AccountId;
 			type BaseCallFilter: crate::traits::Contains<Self::RuntimeCall>;
 			type RuntimeOrigin;
@@ -105,25 +114,15 @@ mod tests {
 		}
 	}
 
-	type BlockNumber = u32;
-	type AccountId = u32;
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
-	type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
-	type Block = generic::Block<Header, UncheckedExtrinsic>;
-
 	crate::construct_runtime!(
 		pub enum Runtime
-		where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: self::frame_system,
 		}
 	);
 
 	impl self::frame_system::Config for Runtime {
-		type BlockNumber = BlockNumber;
+		type Block = Block;
 		type AccountId = AccountId;
 		type BaseCallFilter = crate::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
diff --git a/frame/support/test/compile_pass/src/lib.rs b/frame/support/test/compile_pass/src/lib.rs
index 4eaa657b1e486..75911d7569f80 100644
--- a/frame/support/test/compile_pass/src/lib.rs
+++ b/frame/support/test/compile_pass/src/lib.rs
@@ -58,13 +58,12 @@ impl frame_system::Config for Runtime {
 	type Index = u128;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
-	type Header = Header;
+	type Block = Block;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type BlockHashCount = ConstU64<2400>;
 	type Version = Version;
 	type AccountData = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type BlockNumber = BlockNumber;
 	type AccountId = AccountId;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
@@ -83,12 +82,7 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
 
 construct_runtime!(
-	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub struct Runtime {
 		System: frame_system,
 	}
 );
diff --git a/frame/support/test/src/lib.rs b/frame/support/test/src/lib.rs
index 2a3cf13d4dac7..d025eb2eaf70d 100644
--- a/frame/support/test/src/lib.rs
+++ b/frame/support/test/src/lib.rs
@@ -25,6 +25,11 @@ pub use frame_support::dispatch::RawOrigin;
 
 pub use self::pallet::*;
 
+/// The Header type used by the runtime.
+pub type HeaderOf<T> = <<T as Config>::Block as sp_runtime::traits::HeaderProvider>::Header;
+/// The block number type used by the runtime.
+pub type BlockNumberOf<T> = <HeaderOf<T> as sp_runtime::traits::Header>::Number;
+
 #[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use super::*;
@@ -39,7 +44,7 @@ pub mod pallet {
 	#[pallet::disable_frame_system_supertrait_check]
 	pub trait Config: 'static + Eq + Clone {
 		/// The block number type.
-		type BlockNumber: Parameter + Member + Default + MaybeSerializeDeserialize + MaxEncodedLen;
+		type Block: Parameter + sp_runtime::traits::Block;
 		/// The account type.
 		type AccountId: Parameter + Member + MaxEncodedLen;
 		/// The basic call filter to use in Origin.
@@ -97,7 +102,7 @@ pub mod pallet {
 		/// The extrinsic is failed
 		ExtrinsicFailed,
 		/// The ignored error
-		Ignore(<T as Config>::BlockNumber),
+		Ignore(BlockNumberOf<T>),
 	}
 }
 
@@ -119,19 +124,19 @@ pub mod pallet_prelude {
 	pub type OriginFor<T> = <T as crate::Config>::RuntimeOrigin;
 
 	/// Type alias for the `BlockNumber` associated type of system config.
-	pub type BlockNumberFor<T> = <T as super::Config>::BlockNumber;
+	pub type BlockNumberFor<T> = crate::BlockNumberOf<T>;
 }
 
 /// Provides an implementation of [`frame_support::traits::Randomness`] that should only be used in
 /// tests!
 pub struct TestRandomness<T>(sp_std::marker::PhantomData<T>);
 
-impl<Output: codec::Decode + Default, T> frame_support::traits::Randomness<Output, T::BlockNumber>
-	for TestRandomness<T>
+impl<Output: codec::Decode + Default, T>
+	frame_support::traits::Randomness<Output, frame_system::BlockNumberOf<T>> for TestRandomness<T>
 where
 	T: frame_system::Config,
 {
-	fn random(subject: &[u8]) -> (Output, T::BlockNumber) {
+	fn random(subject: &[u8]) -> (Output, frame_system::BlockNumberOf<T>) {
 		use sp_runtime::traits::TrailingZeroInput;
 
 		(
diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
index 85e790095eb31..756402e50e5e2 100644
--- a/frame/support/test/tests/construct_runtime.rs
+++ b/frame/support/test/tests/construct_runtime.rs
@@ -22,14 +22,18 @@
 #![recursion_limit = "128"]
 
 use codec::MaxEncodedLen;
-use frame_support::{parameter_types, traits::PalletInfo as _};
+use frame_support::{
+	derive_impl, parameter_types, traits::PalletInfo as _, weights::RuntimeDbWeight,
+};
+use frame_system::limits::{BlockLength, BlockWeights};
 use scale_info::TypeInfo;
-use sp_core::sr25519;
+use sp_core::{sr25519, ConstU32};
 use sp_runtime::{
 	generic,
 	traits::{BlakeTwo256, Verify},
 	DispatchError, ModuleError,
 };
+use sp_version::RuntimeVersion;
 
 parameter_types! {
 	pub static IntegrityTestExec: u32 = 0;
@@ -37,9 +41,8 @@ parameter_types! {
 
 #[frame_support::pallet(dev_mode)]
 mod module1 {
-	use self::frame_system::pallet_prelude::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(_);
@@ -75,10 +78,9 @@ mod module1 {
 
 #[frame_support::pallet(dev_mode)]
 mod module2 {
-	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -122,10 +124,9 @@ mod nested {
 
 	#[frame_support::pallet(dev_mode)]
 	pub mod module3 {
-		use self::frame_system::pallet_prelude::*;
 		use super::*;
 		use frame_support::pallet_prelude::*;
-		use frame_support_test as frame_system;
+		use frame_system::pallet_prelude::*;
 
 		#[pallet::pallet]
 		pub struct Pallet<T>(_);
@@ -177,10 +178,9 @@ mod nested {
 
 #[frame_support::pallet(dev_mode)]
 pub mod module3 {
-	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -243,22 +243,16 @@ pub mod module3 {
 	}
 }
 
-pub type BlockNumber = u64;
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
-pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Header = generic::Header<u32, BlakeTwo256>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
-use frame_support_test as system;
-
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
-		System: system::{Pallet, Call, Event<T>, Origin<T>} = 30,
+		System: frame_system::{Pallet, Call, Event<T>, Origin<T>} = 30,
 		Module1_1: module1::<Instance1>::{Pallet, Call, Storage, Event<T>, Origin<T>},
 		Module2: module2::{Pallet, Call, Storage, Event<T>, Origin},
 		Module1_2: module1::<Instance2>::{Pallet, Call, Storage, Event<T>, Origin<T>},
@@ -274,15 +268,18 @@ frame_support::construct_runtime!(
 	}
 );
 
-impl frame_support_test::Config for Runtime {
-	type BlockNumber = BlockNumber;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
+	type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl module1::Config<module1::Instance1> for Runtime {
@@ -330,7 +327,7 @@ fn test_pub() -> AccountId {
 fn check_modules_error_type() {
 	sp_io::TestExternalities::default().execute_with(|| {
 		assert_eq!(
-			Module1_1::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_1::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 31,
 				error: [0; 4],
@@ -338,7 +335,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module2::fail(system::Origin::<Runtime>::Root.into()),
+			Module2::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 32,
 				error: [0; 4],
@@ -346,7 +343,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_2::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_2::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 33,
 				error: [0; 4],
@@ -354,7 +351,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			NestedModule3::fail(system::Origin::<Runtime>::Root.into()),
+			NestedModule3::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 34,
 				error: [0; 4],
@@ -362,7 +359,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_3::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_3::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 6,
 				error: [0; 4],
@@ -370,7 +367,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_4::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_4::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 3,
 				error: [0; 4],
@@ -378,7 +375,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_5::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_5::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 4,
 				error: [0; 4],
@@ -386,7 +383,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_6::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_6::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 1,
 				error: [0; 4],
@@ -394,7 +391,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_7::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_7::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 2,
 				error: [0; 4],
@@ -402,7 +399,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_8::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_8::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 12,
 				error: [0; 4],
@@ -410,7 +407,7 @@ fn check_modules_error_type() {
 			})),
 		);
 		assert_eq!(
-			Module1_9::fail(system::Origin::<Runtime>::Root.into()),
+			Module1_9::fail(frame_system::Origin::<Runtime>::Root.into()),
 			Err(DispatchError::Module(ModuleError {
 				index: 13,
 				error: [0; 4],
@@ -430,7 +427,7 @@ fn integrity_test_works() {
 fn origin_codec() {
 	use codec::Encode;
 
-	let origin = OriginCaller::system(system::RawOrigin::None);
+	let origin = OriginCaller::system(frame_system::RawOrigin::None);
 	assert_eq!(origin.encode()[0], 30);
 
 	let origin = OriginCaller::Module1_1(module1::Origin(Default::default()));
@@ -465,7 +462,8 @@ fn origin_codec() {
 fn event_codec() {
 	use codec::Encode;
 
-	let event = system::Event::<Runtime>::ExtrinsicSuccess;
+	let event =
+		frame_system::Event::<Runtime>::ExtrinsicSuccess { dispatch_info: Default::default() };
 	assert_eq!(RuntimeEvent::from(event).encode()[0], 30);
 
 	let event = module1::Event::<Runtime, module1::Instance1>::A(test_pub());
@@ -502,7 +500,7 @@ fn event_codec() {
 #[test]
 fn call_codec() {
 	use codec::Encode;
-	assert_eq!(RuntimeCall::System(system::Call::noop {}).encode()[0], 30);
+	assert_eq!(RuntimeCall::System(frame_system::Call::remark { remark: vec![1] }).encode()[0], 30);
 	assert_eq!(RuntimeCall::Module1_1(module1::Call::fail {}).encode()[0], 31);
 	assert_eq!(RuntimeCall::Module2(module2::Call::fail {}).encode()[0], 32);
 	assert_eq!(RuntimeCall::Module1_2(module1::Call::fail {}).encode()[0], 33);
@@ -633,15 +631,67 @@ fn call_subtype_conversion() {
 fn test_metadata() {
 	use frame_support::metadata::*;
 	use scale_info::meta_type;
+	use sp_core::Encode;
+
+	fn maybe_docs(doc: Vec<&'static str>) -> Vec<&'static str> {
+		if cfg!(feature = "no-metadata-docs") {
+			vec![]
+		} else {
+			doc
+		}
+	}
 
 	let pallets = vec![
 		PalletMetadata {
 			name: "System",
 			storage: None,
-			calls: Some(meta_type::<system::Call<Runtime>>().into()),
-			event: Some(meta_type::<system::Event<Runtime>>().into()),
-			constants: vec![],
-			error: Some(meta_type::<system::Error<Runtime>>().into()),
+			calls: Some(meta_type::<frame_system::Call<Runtime>>().into()),
+			event: Some(meta_type::<frame_system::Event<Runtime>>().into()),
+			constants: vec![
+				PalletConstantMetadata {
+					name: "BlockWeights",
+					ty: meta_type::<BlockWeights>(),
+					value: BlockWeights::default().encode(),
+					docs: maybe_docs(vec![" Block & extrinsics weights: base values and limits."]),
+				},
+				PalletConstantMetadata {
+					name: "BlockLength",
+					ty: meta_type::<BlockLength>(),
+					value: BlockLength::default().encode(),
+					docs: maybe_docs(vec![" The maximum length of a block (in bytes)."]),
+				},
+				PalletConstantMetadata {
+					name: "BlockHashCount",
+					ty: meta_type::<u32>(),
+					value: 10u32.encode(),
+					docs: maybe_docs(vec![" Maximum number of block number to block hash mappings to keep (oldest pruned first)."]),
+				},
+				PalletConstantMetadata {
+					name: "DbWeight",
+					ty: meta_type::<RuntimeDbWeight>(),
+					value: RuntimeDbWeight::default().encode(),
+					docs: maybe_docs(vec![" The weight of runtime database operations the runtime can invoke.",]),
+				},
+				PalletConstantMetadata {
+					name: "Version",
+					ty: meta_type::<RuntimeVersion>(),
+					value: RuntimeVersion::default().encode(),
+					docs: maybe_docs(vec![ " Get the chain's current version."]),
+				},
+				PalletConstantMetadata {
+					name: "SS58Prefix",
+					ty: meta_type::<u16>(),
+					value: 0u16.encode(),
+					docs: maybe_docs(vec![
+						" The designated SS58 prefix of this chain.",
+						"",
+						" This replaces the \"ss58Format\" property declared in the chain spec. Reason is",
+						" that the runtime should know about the prefix in order to make use of it as",
+						" an identifier of the chain.",
+					]),
+				},
+			],
+			error: Some(meta_type::<frame_system::Error<Runtime>>().into()),
 			index: 30,
 		},
 		PalletMetadata {
@@ -775,7 +825,7 @@ fn test_metadata() {
 fn pallet_in_runtime_is_correct() {
 	assert_eq!(PalletInfo::index::<System>().unwrap(), 30);
 	assert_eq!(PalletInfo::name::<System>().unwrap(), "System");
-	assert_eq!(PalletInfo::module_name::<System>().unwrap(), "system");
+	assert_eq!(PalletInfo::module_name::<System>().unwrap(), "frame_system");
 	assert!(PalletInfo::crate_version::<System>().is_some());
 
 	assert_eq!(PalletInfo::index::<Module1_1>().unwrap(), 31);
diff --git a/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs b/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs
deleted file mode 100644
index ab55c22e9fbf1..0000000000000
--- a/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use frame_support::construct_runtime;
-
-construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		Block = Block1,
-		UncheckedExtrinsic = Uxt,
-	{}
-}
-
-fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr b/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr
deleted file mode 100644
index b622adbfe65b4..0000000000000
--- a/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: `Block` was declared above. Please use exactly one declaration for `Block`.
- --> $DIR/abundant_where_param.rs:7:3
-  |
-7 |         Block = Block1,
-  |         ^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs b/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
index ea468d6de13ee..f5a339157ef00 100644
--- a/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
+++ b/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
@@ -12,7 +12,7 @@ mod pallet {
 }
 
 pub type Signature = sr25519::Signature;
-pub type BlockNumber = u64;
+type BlockNumber = u32;
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
@@ -20,10 +20,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 impl pallet::Config for Runtime {}
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
diff --git a/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr b/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr
index b1c1879aa56ad..1ea62b7d6fd65 100644
--- a/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr
@@ -1,7 +1,7 @@
 error: Unexpected tokens, expected one of `=`, `,`
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:29:43
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:26:43
    |
-29 |         Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
+26 |         Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
    |                                                 ^^^^^^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
index dd8340daa0233..513fbcfb51354 100644
--- a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		Balance: balances::{Pallet},
diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
index 27c5644e0d736..6fb983f03a961 100644
--- a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr
@@ -1,11 +1,11 @@
 error: Two pallets with the same name!
-  --> $DIR/conflicting_module_name.rs:10:3
-   |
-10 |         Balance: balances::{Pallet},
-   |         ^^^^^^^
+ --> tests/construct_runtime_ui/conflicting_module_name.rs:7:3
+  |
+7 |         Balance: balances::{Pallet},
+  |         ^^^^^^^
 
 error: Two pallets with the same name!
-  --> $DIR/conflicting_module_name.rs:11:3
-   |
-11 |         Balance: balances::{Pallet},
-   |         ^^^^^^^
+ --> tests/construct_runtime_ui/conflicting_module_name.rs:8:3
+  |
+8 |         Balance: balances::{Pallet},
+  |         ^^^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs b/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
index 3269d22434fdf..68a2523d3bcb2 100644
--- a/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
+++ b/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		Balance: balances::{Config, Call, Config<T>, Origin<T>},
diff --git a/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr b/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr
index 9d10474ce85ab..e3f694781441f 100644
--- a/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr
@@ -1,5 +1,5 @@
 error: `Config` was already declared before. Please remove the duplicate declaration
-  --> $DIR/double_module_parts.rs:10:37
-   |
-10 |         Balance: balances::{Config, Call, Config<T>, Origin<T>},
-   |                                           ^^^^^^
+ --> tests/construct_runtime_ui/double_module_parts.rs:7:37
+  |
+7 |         Balance: balances::{Config, Call, Config<T>, Origin<T>},
+  |                                           ^^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
index 44b7fd0ba25f7..23badd76276e2 100644
--- a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
+++ b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		system: ,
 	}
diff --git a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
index 7102076e5acb0..f0c0f17779d67 100644
--- a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `crate`, `self`, `super`, identifier
- --> $DIR/empty_pallet_path.rs:9:11
+ --> tests/construct_runtime_ui/empty_pallet_path.rs:6:11
   |
-9 |         system: ,
+6 |         system: ,
   |                 ^
diff --git a/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs b/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
index 83a166fc00552..d3f0350ffcadd 100644
--- a/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
@@ -17,7 +17,6 @@ mod pallet {
 }
 
 pub type Signature = sr25519::Signature;
-pub type BlockNumber = u64;
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
@@ -25,10 +24,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 impl pallet::Config for Runtime {}
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet exclude_parts { Call },
diff --git a/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr b/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr
index 66098898bb877..bd63551f90735 100644
--- a/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr
@@ -1,22 +1,33 @@
 error: Invalid pallet part specified, the pallet `Pallet` doesn't have the `Call` part. Available parts are: `Pallet`, `Storage`.
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:34:34
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:30:34
    |
-34 |         Pallet: pallet exclude_parts { Call },
+30 |         Pallet: pallet exclude_parts { Call },
    |                                        ^^^^
 
+error[E0412]: cannot find type `BlockNumber` in this scope
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:20:35
+   |
+20 | pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+   |                                   ^^^^^^^^^^^ not found in this scope
+   |
+help: you might be missing a type parameter
+   |
+20 | pub type Header<BlockNumber> = generic::Header<BlockNumber, BlakeTwo256>;
+   |                +++++++++++++
+
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:23:64
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:22:64
    |
-23 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+22 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-23 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+22 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:25:25
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:24:25
    |
-25 | impl pallet::Config for Runtime {}
+24 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope
diff --git a/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs b/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
index 7ab4329110d8b..7e58ff90e5c79 100644
--- a/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
+++ b/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		#[cfg(test)]
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
diff --git a/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr b/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr
index a86a839615aa0..28c95dbe37a36 100644
--- a/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr
@@ -1,5 +1,5 @@
 error: `System` pallet declaration is feature gated, please remove any `#[cfg]` attributes
-  --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:10:3
-   |
-10 |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-   |         ^^^^^^
+ --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:7:3
+  |
+7 |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+  |         ^^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
index 0912ffc98d54b..1ad1f8e0b1d5f 100644
--- a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
+++ b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		Balance: balances::<Instance1>::{Call<T>, Origin<T>},
diff --git a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
index 06caa036b91ff..22f38072747ee 100644
--- a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr
@@ -1,5 +1,5 @@
 error: `Call` is not allowed to have generics. Only the following pallets are allowed to have generics: `Event`, `Origin`, `Config`.
-  --> $DIR/generics_in_invalid_module.rs:10:36
-   |
-10 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
-   |                                          ^^^^
+ --> tests/construct_runtime_ui/generics_in_invalid_module.rs:7:36
+  |
+7 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
+  |                                          ^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs b/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
index c253444ee31db..bce87c51336eb 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		#[cfg(feature = 1)]
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr
index 68366a3410bf1..bfee2910cd2a4 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr
@@ -1,6 +1,6 @@
 error: feature = 1
                  ^ expected one of `<key>`, `all`, `any`, `not` here
-  --> tests/construct_runtime_ui/invalid_meta_literal.rs:10:3
-   |
-10 |         #[cfg(feature = 1)]
-   |         ^
+ --> tests/construct_runtime_ui/invalid_meta_literal.rs:7:3
+  |
+7 |         #[cfg(feature = 1)]
+  |         ^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
index 9fb3169e1df77..bf6919f5a58ef 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		system: System::(),
 	}
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
index 0a20cf4e39a88..1f9277c3f0a8e 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr
@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> tests/construct_runtime_ui/invalid_module_details.rs:9:17
+ --> tests/construct_runtime_ui/invalid_module_details.rs:6:17
   |
-9 |         system: System::(),
+6 |         system: System::(),
   |                       ^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
index 6ba268b73eea6..51f14e6883e4a 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		system: System::{enum},
 	}
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
index 42f79e96d4473..d4e7b97f00b4d 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`, `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
- --> $DIR/invalid_module_details_keyword.rs:9:20
+ --> tests/construct_runtime_ui/invalid_module_details_keyword.rs:6:20
   |
-9 |         system: System::{enum},
+6 |         system: System::{enum},
   |                          ^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
index d627ffd5b66f7..f70b5b0d63a27 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		Balance: balances::{Error},
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
index 6d535ca4335fc..f17f04ae60aba 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`, `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
-  --> $DIR/invalid_module_entry.rs:10:23
-   |
-10 |         Balance: balances::{Error},
-   |                             ^^^^^
+ --> tests/construct_runtime_ui/invalid_module_entry.rs:7:23
+  |
+7 |         Balance: balances::{Error},
+  |                             ^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
index 09c316e6ebaed..c132fa01b2297 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		system: System ?
 	}
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr
index 6025de82bd206..80be1b8dd42fd 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr
@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> $DIR/invalid_token_after_module.rs:9:18
+ --> tests/construct_runtime_ui/invalid_token_after_module.rs:6:18
   |
-9 |         system: System ?
+6 |         system: System ?
   |                        ^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
index 18d367d102d3a..42e7759f87f2b 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		system ?
 	}
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr
index eaae082c8460c..8988f8a35b0a4 100644
--- a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr
@@ -1,5 +1,5 @@
 error: expected `:`
- --> $DIR/invalid_token_after_name.rs:9:10
+ --> tests/construct_runtime_ui/invalid_token_after_name.rs:6:10
   |
-9 |         system ?
+6 |         system ?
   |                ^
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs b/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs
deleted file mode 100644
index 091f0644494f6..0000000000000
--- a/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use frame_support::construct_runtime;
-
-construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		TypeX = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{}
-}
-
-fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr b/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr
deleted file mode 100644
index 9e358b6a21fab..0000000000000
--- a/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: expected one of: `Block`, `NodeBlock`, `UncheckedExtrinsic`
- --> $DIR/invalid_where_param.rs:7:3
-  |
-7 |         TypeX = Block,
-  |         ^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
index 3cd2f157d0475..e1b2d0098d902 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
+++ b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		Balance: balances::<Instance1>::{Event},
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
index b1aa9b86cd0d6..b3d9f3ac0f85f 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr
@@ -1,5 +1,5 @@
 error: Instantiable pallet with no generic `Event` cannot be constructed: pallet `Balance` must have generic `Event`
-  --> $DIR/missing_event_generic_on_module_with_instance.rs:10:3
-   |
-10 |         Balance: balances::<Instance1>::{Event},
-   |         ^^^^^^^
+ --> tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs:7:3
+  |
+7 |         Balance: balances::<Instance1>::{Event},
+  |         ^^^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs b/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
index 24e4ee979bd76..afd96a04854f2 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
+++ b/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		system: System::<>,
 	}
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr b/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr
index 6303c74e42e5c..5072f718db12e 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr
@@ -1,5 +1,5 @@
 error: expected identifier
- --> $DIR/missing_module_instance.rs:9:20
+ --> tests/construct_runtime_ui/missing_module_instance.rs:6:20
   |
-9 |         system: System::<>,
+6 |         system: System::<>,
   |                          ^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
index 787ba20117678..33e92c07ee201 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
+++ b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		Balance: balances::<Instance1>::{Origin},
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
index 63bb7442a8576..7300346191c0c 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr
@@ -1,5 +1,5 @@
 error: Instantiable pallet with no generic `Origin` cannot be constructed: pallet `Balance` must have generic `Origin`
-  --> $DIR/missing_origin_generic_on_module_with_instance.rs:10:3
-   |
-10 |         Balance: balances::<Instance1>::{Origin},
-   |         ^^^^^^^
+ --> tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs:7:3
+  |
+7 |         Balance: balances::<Instance1>::{Origin},
+  |         ^^^^^^^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs b/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
index 7ab902c3aadd8..685f9059b1be2 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
+++ b/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 	}
 }
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr b/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
index 7648f5c1bfb33..778cfe4b2196a 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
@@ -1,6 +1,6 @@
 error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`
- --> $DIR/missing_system_module.rs:8:2
+ --> tests/construct_runtime_ui/missing_system_module.rs:5:2
   |
-8 | /     {
-9 | |     }
+5 | /     {
+6 | |     }
   | |_____^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr b/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
index d2a66f95101f4..67e27f4742f1c 100644
--- a/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
@@ -1,5 +1,5 @@
-error: expected `where`
+error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`
  --> tests/construct_runtime_ui/missing_where_block.rs:4:21
   |
 4 |     pub struct Runtime {}
-  |                        ^
+  |                        ^^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs b/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs
deleted file mode 100644
index 4d2225a4afbc9..0000000000000
--- a/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use frame_support::construct_runtime;
-
-construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-	{}
-}
-
-fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr b/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
deleted file mode 100644
index fb7e38b53dcd6..0000000000000
--- a/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: Missing associated type for `UncheckedExtrinsic`. Add `UncheckedExtrinsic` = ... to where section.
- --> tests/construct_runtime_ui/missing_where_param.rs:7:2
-  |
-7 |     {}
-  |     ^
diff --git a/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs b/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
index 5dfc67c83836a..8bd9d9c89e528 100644
--- a/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
+++ b/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet1: pallet::{Pallet},
diff --git a/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr b/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
index 19a9a7bd08e32..55cef6704ee3f 100644
--- a/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
@@ -1,7 +1,7 @@
 error: The number of pallets exceeds the maximum number of tuple elements. To increase this limit, enable the tuples-96 feature of [frame_support].
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:50:2
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:49:2
    |
-50 |     pub struct Runtime where
+49 |     pub struct Runtime
    |     ^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
@@ -34,26 +34,26 @@ error[E0412]: cannot find type `RuntimeOrigin` in this scope
    |                          ^^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeOrigin`
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:27:21
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:26:21
    |
-27 |     type RuntimeCall = RuntimeCall;
+26 |     type RuntimeCall = RuntimeCall;
    |                        ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
 
 error[E0412]: cannot find type `RuntimeEvent` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:33:22
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:32:22
    |
-33 |     type RuntimeEvent = RuntimeEvent;
+32 |     type RuntimeEvent = RuntimeEvent;
    |                         ^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeEvent`
 
 error[E0412]: cannot find type `PalletInfo` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:39:20
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:38:20
    |
-39 |     type PalletInfo = PalletInfo;
+38 |     type PalletInfo = PalletInfo;
    |                       ^^^^^^^^^^
    |
 help: you might have meant to use the associated type
    |
-39 |     type PalletInfo = Self::PalletInfo;
+38 |     type PalletInfo = Self::PalletInfo;
    |                       ~~~~~~~~~~~~~~~~
 help: consider importing this trait
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs b/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
index 866c3f0de6c3c..b97af084c26ef 100644
--- a/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
+++ b/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs
@@ -48,13 +48,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -72,10 +71,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet},
diff --git a/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr b/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
index b9cec02a2b092..656fc0141161e 100644
--- a/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of constant value failed
-  --> tests/construct_runtime_ui/pallet_error_too_large.rs:74:1
+  --> tests/construct_runtime_ui/pallet_error_too_large.rs:73:1
    |
-74 | / construct_runtime! {
-75 | |     pub struct Runtime where
-76 | |         Block = Block,
-77 | |         NodeBlock = Block,
-...  |
-82 | |     }
-83 | | }
-   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:74:1
+73 | / construct_runtime! {
+74 | |     pub struct Runtime
+75 | |     {
+76 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+77 | |         Pallet: pallet::{Pallet},
+78 | |     }
+79 | | }
+   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:73:1
    |
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
index 0010f5277bb40..8d94f18546a21 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet, Call},
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
index c2092edea05b5..03a9ea928e9bd 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr
@@ -4,13 +4,13 @@ error: `Pallet` does not have #[pallet::call] defined, perhaps you should remove
 5  |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Call},
+53 | |     }
+54 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_call_check::is_call_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
index 35212df8f457c..e5bb5fb486cb3 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet, Event},
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
index eb667fe04a39e..c9c0962d13f46 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
@@ -4,27 +4,27 @@ error: `Pallet` does not have #[pallet::event] defined, perhaps you should remov
 5  |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Event},
+53 | |     }
+54 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_event_check::is_event_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Event` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_event_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_event_part.rs:48:1
    |
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Event},
+53 | |     }
+54 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
index ec753e9a03129..b6bc408043fbf 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet, Config},
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
index cdab7d3afa18c..d5db097ccd3d0 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
@@ -4,27 +4,27 @@ error: `Pallet` does not have #[pallet::genesis_config] defined, perhaps you sho
 5  |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Config},
+53 | |     }
+54 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_genesis_config_check::is_genesis_config_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `GenesisConfig` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:48:1
    |
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Config},
+53 | |     }
+54 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
index 22eaccca42d97..4fb6382c93ffa 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet, Inherent},
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
index a068cab4cb1ab..bce1c4d9efb87 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr
@@ -4,31 +4,31 @@ error: `Pallet` does not have #[pallet::inherent] defined, perhaps you should re
 5  |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Inherent},
+53 | |     }
+54 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_inherent_check::is_inherent_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `create_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `create_inherent` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Inherent},
+53 | |     }
+54 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -37,19 +37,19 @@ error[E0599]: no function or associated item named `create_inherent` found for s
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Inherent},
+53 | |     }
+54 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -58,19 +58,19 @@ error[E0599]: no function or associated item named `is_inherent` found for struc
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `check_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `check_inherent` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Inherent},
+53 | |     }
+54 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -79,19 +79,19 @@ error[E0599]: no function or associated item named `check_inherent` found for st
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- associated item `INHERENT_IDENTIFIER` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Inherent},
+53 | |     }
+54 | | }
    | |_^ associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -100,19 +100,19 @@ error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `p
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent_required` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent_required` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Inherent},
+53 | |     }
+54 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
index 1705fff49dda8..997c32c95055e 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet, Origin},
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
index 0677340e25c12..90bf0b52cd296 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
@@ -4,27 +4,27 @@ error: `Pallet` does not have #[pallet::origin] defined, perhaps you should remo
 5  |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Origin},
+53 | |     }
+54 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_origin_check::is_origin_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Origin` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_origin_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_origin_part.rs:48:1
    |
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, Origin},
+53 | |     }
+54 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
index 8f64d30940725..f97eee993701b 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs
@@ -23,13 +23,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -47,10 +46,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet::{Pallet, ValidateUnsigned},
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
index 84f1e54d5c24e..a7ce8615093f9 100644
--- a/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr
@@ -4,48 +4,46 @@ error: `Pallet` does not have #[pallet::validate_unsigned] defined, perhaps you
 5  |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-49 | / construct_runtime! {
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+48 | / construct_runtime! {
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
+53 | |     }
+54 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_validate_unsigned_check::is_validate_unsigned_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no variant or associated item named `Pallet` found for enum `RuntimeCall` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:56:3
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:52:3
    |
-49 | // construct_runtime! {
-50 | ||     pub struct Runtime where
-51 | ||         Block = Block,
-52 | ||         NodeBlock = Block,
-...  ||
-55 | ||         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-56 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+48 | // construct_runtime! {
+49 | ||     pub struct Runtime
+50 | ||     {
+51 | ||         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
    | ||        -^^^^^^ variant or associated item not found in `RuntimeCall`
    | ||________|
    | |
-57 | |      }
-58 | |  }
+53 | |      }
+54 | |  }
    | |__- variant or associated item `Pallet` not found for this enum
 
 error[E0599]: no function or associated item named `pre_dispatch` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `pre_dispatch` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
+53 | |     }
+54 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -55,19 +53,19 @@ error[E0599]: no function or associated item named `pre_dispatch` found for stru
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `validate_unsigned` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:49:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:48:1
    |
 11 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `validate_unsigned` not found for this struct
 ...
-49 |   construct_runtime! {
+48 |   construct_runtime! {
    |  _^
-50 | |     pub struct Runtime where
-51 | |         Block = Block,
-52 | |         NodeBlock = Block,
-...  |
-57 | |     }
-58 | | }
+49 | |     pub struct Runtime
+50 | |     {
+51 | |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+52 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
+53 | |     }
+54 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
diff --git a/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs b/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs
index e5fd284dc8722..e4e2d3dca021e 100644
--- a/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs
+++ b/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		#[cfg(feature(test))]
diff --git a/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr b/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr
index 98d99a0d34997..34637269db617 100644
--- a/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr
@@ -1,6 +1,6 @@
 error: feature(test)
               ^ expected one of `=`, `,`, `)` here
-  --> tests/construct_runtime_ui/unsupported_meta_structure.rs:10:3
-   |
-10 |         #[cfg(feature(test))]
-   |         ^
+ --> tests/construct_runtime_ui/unsupported_meta_structure.rs:7:3
+  |
+7 |         #[cfg(feature(test))]
+  |         ^
diff --git a/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs b/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs
index 03363d30a6429..491cc2c90533d 100644
--- a/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs
+++ b/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs
@@ -1,10 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet},
 		#[attr]
diff --git a/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr b/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr
index fceb2b8a99db8..da1b61b1c3078 100644
--- a/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr
@@ -1,5 +1,5 @@
 error: Unsupported attribute, only #[cfg] is supported on pallet declarations in `construct_runtime`
-  --> tests/construct_runtime_ui/unsupported_pallet_attr.rs:10:3
-   |
-10 |         #[attr]
-   |         ^
+ --> tests/construct_runtime_ui/unsupported_pallet_attr.rs:7:3
+  |
+7 |         #[attr]
+  |         ^
diff --git a/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs b/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs
index 971e2b831ae08..7c67d6decbcf1 100644
--- a/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs
+++ b/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs
@@ -17,7 +17,7 @@ mod pallet {
 }
 
 pub type Signature = sr25519::Signature;
-pub type BlockNumber = u64;
+type BlockNumber = u32;
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
@@ -25,10 +25,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 impl pallet::Config for Runtime {}
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: pallet use_parts { Call },
diff --git a/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr b/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr
index cb6b6a44d61da..4058ccab2c5d7 100644
--- a/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr
+++ b/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr
@@ -1,7 +1,7 @@
 error: Invalid pallet part specified, the pallet `Pallet` doesn't have the `Call` part. Available parts are: `Pallet`, `Storage`.
-  --> tests/construct_runtime_ui/use_undefined_part.rs:34:30
+  --> tests/construct_runtime_ui/use_undefined_part.rs:31:30
    |
-34 |         Pallet: pallet use_parts { Call },
+31 |         Pallet: pallet use_parts { Call },
    |                                    ^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
diff --git a/frame/support/test/tests/final_keys.rs b/frame/support/test/tests/final_keys.rs
index f56a6c9fcaaa1..87d7b37ae9716 100644
--- a/frame/support/test/tests/final_keys.rs
+++ b/frame/support/test/tests/final_keys.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 use codec::Encode;
-use frame_support::{storage::unhashed, StoragePrefixedMap};
-use sp_core::sr25519;
+use frame_support::{derive_impl, storage::unhashed, StoragePrefixedMap};
+use sp_core::{sr25519, ConstU32};
 use sp_io::{
 	hashing::{blake2_128, twox_128, twox_64},
 	TestExternalities,
@@ -31,7 +31,6 @@ use sp_runtime::{
 mod no_instance {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -59,7 +58,8 @@ mod no_instance {
 
 	#[pallet::storage]
 	#[pallet::getter(fn test_generic_value)]
-	pub type TestGenericValue<T: Config> = StorageValue<_, T::BlockNumber, OptionQuery>;
+	pub type TestGenericValue<T: Config> =
+		StorageValue<_, frame_system::BlockNumberOf<T>, OptionQuery>;
 	#[pallet::storage]
 	#[pallet::getter(fn foo2)]
 	pub type TestGenericDoubleMap<T: Config> = StorageDoubleMap<
@@ -67,7 +67,7 @@ mod no_instance {
 		Blake2_128Concat,
 		u32,
 		Blake2_128Concat,
-		T::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		u32,
 		ValueQuery,
 	>;
@@ -75,8 +75,8 @@ mod no_instance {
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
 		pub value: u32,
-		pub test_generic_value: T::BlockNumber,
-		pub test_generic_double_map: Vec<(u32, T::BlockNumber, u32)>,
+		pub test_generic_value: frame_system::BlockNumberOf<T>,
+		pub test_generic_double_map: Vec<(u32, frame_system::BlockNumberOf<T>, u32)>,
 	}
 
 	impl<T: Config> Default for GenesisConfig<T> {
@@ -105,7 +105,6 @@ mod no_instance {
 mod instance {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
@@ -136,7 +135,7 @@ mod instance {
 	#[pallet::storage]
 	#[pallet::getter(fn test_generic_value)]
 	pub type TestGenericValue<T: Config<I>, I: 'static = ()> =
-		StorageValue<_, T::BlockNumber, OptionQuery>;
+		StorageValue<_, frame_system::BlockNumberOf<T>, OptionQuery>;
 	#[pallet::storage]
 	#[pallet::getter(fn foo2)]
 	pub type TestGenericDoubleMap<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
@@ -144,7 +143,7 @@ mod instance {
 		Blake2_128Concat,
 		u32,
 		Blake2_128Concat,
-		T::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		u32,
 		ValueQuery,
 	>;
@@ -152,8 +151,8 @@ mod instance {
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
 		pub value: u32,
-		pub test_generic_value: T::BlockNumber,
-		pub test_generic_double_map: Vec<(u32, T::BlockNumber, u32)>,
+		pub test_generic_value: frame_system::BlockNumberOf<T>,
+		pub test_generic_double_map: Vec<(u32, frame_system::BlockNumberOf<T>, u32)>,
 		pub phantom: PhantomData<I>,
 	}
 
@@ -201,27 +200,24 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 frame_support::construct_runtime!(
 	pub enum Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_support_test,
+		System: frame_system,
 		FinalKeysNone: no_instance,
 		FinalKeysSome: instance,
 		Instance2FinalKeysSome: instance::<Instance2>,
 	}
 );
 
-impl frame_support_test::Config for Runtime {
-	type BlockNumber = BlockNumber;
-	type AccountId = AccountId;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl no_instance::Config for Runtime {}
diff --git a/frame/support/test/tests/genesisconfig.rs b/frame/support/test/tests/genesisconfig.rs
index 291b250c146b2..7a0d2daeeaf70 100644
--- a/frame/support/test/tests/genesisconfig.rs
+++ b/frame/support/test/tests/genesisconfig.rs
@@ -15,7 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_core::sr25519;
+use frame_support::derive_impl;
+use sp_core::{sr25519, ConstU32};
 use sp_runtime::{
 	generic,
 	traits::{BlakeTwo256, Verify},
@@ -25,7 +26,6 @@ use sp_runtime::{
 pub mod pallet {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -39,11 +39,11 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::unbounded]
 	pub type AppendableDM<T: Config> =
-		StorageDoubleMap<_, Identity, u32, Identity, T::BlockNumber, Vec<u32>>;
+		StorageDoubleMap<_, Identity, u32, Identity, frame_system::BlockNumberOf<T>, Vec<u32>>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
-		pub t: Vec<(u32, T::BlockNumber, Vec<u32>)>,
+		pub t: Vec<(u32, frame_system::BlockNumberOf<T>, Vec<u32>)>,
 	}
 
 	impl<T: Config> Default for GenesisConfig<T> {
@@ -71,25 +71,22 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 frame_support::construct_runtime!(
 	pub enum Test
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_support_test,
+		System: frame_system,
 		MyPallet: pallet,
 	}
 );
 
-impl frame_support_test::Config for Test {
-	type BlockNumber = BlockNumber;
-	type AccountId = AccountId;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl pallet::Config for Test {}
diff --git a/frame/support/test/tests/instance.rs b/frame/support/test/tests/instance.rs
index 28611ddbf599c..64c7758186f5c 100644
--- a/frame/support/test/tests/instance.rs
+++ b/frame/support/test/tests/instance.rs
@@ -18,6 +18,7 @@
 #![recursion_limit = "128"]
 
 use frame_support::{
+	derive_impl,
 	inherent::{InherentData, InherentIdentifier, MakeFatalError, ProvideInherent},
 	metadata_ir::{
 		PalletStorageMetadataIR, StorageEntryMetadataIR, StorageEntryModifierIR,
@@ -39,10 +40,9 @@ pub trait Currency {}
 // * Origin, Inherent, Event
 #[frame_support::pallet(dev_mode)]
 mod module1 {
-	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(_);
@@ -77,7 +77,7 @@ mod module1 {
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
 		pub value: <T as Config<I>>::GenericType,
-		pub test: <T as frame_system::Config>::BlockNumber,
+		pub test: frame_system::BlockNumberOf<T>,
 	}
 
 	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
@@ -89,7 +89,7 @@ mod module1 {
 	#[pallet::genesis_build]
 	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I>
 	where
-		T::BlockNumber: std::fmt::Display,
+		frame_system::BlockNumberOf<T>: std::fmt::Display,
 	{
 		fn build(&self) {
 			<Value<T, I>>::put(self.value.clone());
@@ -123,7 +123,7 @@ mod module1 {
 	#[pallet::inherent]
 	impl<T: Config<I>, I: 'static> ProvideInherent for Pallet<T, I>
 	where
-		T::BlockNumber: From<u32>,
+		frame_system::BlockNumberOf<T>: From<u32>,
 	{
 		type Call = Call<T, I>;
 		type Error = MakeFatalError<()>;
@@ -150,7 +150,6 @@ mod module1 {
 mod module2 {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
@@ -198,7 +197,7 @@ mod module2 {
 	#[pallet::genesis_build]
 	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I>
 	where
-		T::BlockNumber: std::fmt::Display,
+		frame_system::BlockNumberOf<T>: std::fmt::Display,
 	{
 		fn build(&self) {
 			<Value<T, I>>::put(self.value.clone());
@@ -252,7 +251,6 @@ mod module2 {
 mod module3 {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
@@ -277,12 +275,9 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub enum Runtime
 	{
-		System: frame_support_test::{Pallet, Call, Event<T>},
+		System: frame_system::{Pallet, Call, Event<T>},
 		Module1_1: module1::<Instance1>::{
 			Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
 		},
@@ -303,15 +298,16 @@ frame_support::construct_runtime!(
 	}
 );
 
-impl frame_support_test::Config for Runtime {
-	type BlockNumber = BlockNumber;
-	type AccountId = AccountId;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl module1::Config<module1::Instance1> for Runtime {
diff --git a/frame/support/test/tests/issue2219.rs b/frame/support/test/tests/issue2219.rs
index 3822fea030d15..47c2a4b88093a 100644
--- a/frame/support/test/tests/issue2219.rs
+++ b/frame/support/test/tests/issue2219.rs
@@ -15,7 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sp_core::{sr25519, ConstU64};
+use frame_support::derive_impl;
+use sp_core::{sr25519, ConstU32};
 use sp_runtime::{
 	generic,
 	traits::{BlakeTwo256, Verify},
@@ -25,10 +26,10 @@ use sp_runtime::{
 mod module {
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use sp_core::ConstU64;
 
 	pub type Request<T> =
-		(<T as frame_system::Config>::AccountId, Role, <T as frame_system::Config>::BlockNumber);
+		(<T as frame_system::Config>::AccountId, Role, frame_system::BlockNumberOf<T>);
 	pub type Requests<T> = Vec<Request<T>>;
 
 	#[derive(Copy, Clone, Eq, PartialEq, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)]
@@ -46,35 +47,35 @@ mod module {
 		pub max_actors: u32,
 
 		// payouts are made at this block interval
-		pub reward_period: T::BlockNumber,
+		pub reward_period: frame_system::BlockNumberOf<T>,
 
 		// minimum amount of time before being able to unstake
-		pub bonding_period: T::BlockNumber,
+		pub bonding_period: frame_system::BlockNumberOf<T>,
 
 		// how long tokens remain locked for after unstaking
-		pub unbonding_period: T::BlockNumber,
+		pub unbonding_period: frame_system::BlockNumberOf<T>,
 
 		// minimum period required to be in service. unbonding before this time is highly penalized
-		pub min_service_period: T::BlockNumber,
+		pub min_service_period: frame_system::BlockNumberOf<T>,
 
 		// "startup" time allowed for roles that need to sync their infrastructure
 		// with other providers before they are considered in service and punishable for
 		// not delivering required level of service.
-		pub startup_grace_period: T::BlockNumber,
+		pub startup_grace_period: frame_system::BlockNumberOf<T>,
 	}
 
 	impl<T: Config> Default for RoleParameters<T> {
 		fn default() -> Self {
 			Self {
 				max_actors: 10,
-				reward_period: T::BlockNumber::default(),
-				unbonding_period: T::BlockNumber::default(),
+				reward_period: frame_system::BlockNumberOf::<T>::default(),
+				unbonding_period: frame_system::BlockNumberOf::<T>::default(),
 
 				// not currently used
 				min_actors: 5,
-				bonding_period: T::BlockNumber::default(),
-				min_service_period: T::BlockNumber::default(),
-				startup_grace_period: T::BlockNumber::default(),
+				bonding_period: frame_system::BlockNumberOf::<T>::default(),
+				min_service_period: frame_system::BlockNumberOf::<T>::default(),
+				startup_grace_period: frame_system::BlockNumberOf::<T>::default(),
 			}
 		}
 	}
@@ -115,7 +116,8 @@ mod module {
 	/// tokens locked until given block number
 	#[pallet::storage]
 	#[pallet::getter(fn bondage)]
-	pub type Bondage<T: Config> = StorageMap<_, Blake2_128Concat, T::AccountId, T::BlockNumber>;
+	pub type Bondage<T: Config> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, frame_system::BlockNumberOf<T>>;
 
 	/// First step before enter a role is registering intent with a new account/key.
 	/// This is done by sending a role_entry_request() from the new account.
@@ -152,34 +154,29 @@ mod module {
 	}
 }
 
-pub type BlockNumber = u64;
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
-pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+pub type Header = generic::Header<u32, BlakeTwo256>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
-impl frame_support_test::Config for Runtime {
-	type BlockNumber = BlockNumber;
-	type AccountId = AccountId;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl module::Config for Runtime {}
 
 frame_support::construct_runtime!(
-	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_support_test,
+	pub struct Runtime {
+		System: frame_system,
 		Module: module,
 	}
 );
@@ -187,6 +184,7 @@ frame_support::construct_runtime!(
 #[test]
 fn create_genesis_config() {
 	let config = RuntimeGenesisConfig {
+		system: Default::default(),
 		module: module::GenesisConfig { request_life_time: 0, enable_storage_role: true },
 	};
 	assert_eq!(config.module.request_life_time, 0);
diff --git a/frame/support/test/tests/origin.rs b/frame/support/test/tests/origin.rs
index 47451157b352c..f11a00345b6b0 100644
--- a/frame/support/test/tests/origin.rs
+++ b/frame/support/test/tests/origin.rs
@@ -20,14 +20,15 @@
 #![recursion_limit = "128"]
 
 use frame_support::traits::{Contains, OriginTrait};
-use sp_runtime::{generic, traits::BlakeTwo256};
+use sp_core::ConstU32;
+use sp_runtime::{generic, traits::BlakeTwo256, RuntimeDebug};
 
+use frame_support::derive_impl;
 mod nested {
 	#[frame_support::pallet(dev_mode)]
 	pub mod module {
-		use self::frame_system::pallet_prelude::*;
 		use frame_support::pallet_prelude::*;
-		use frame_support_test as frame_system;
+		use frame_system::pallet_prelude::*;
 
 		#[pallet::pallet]
 		pub struct Pallet<T>(_);
@@ -72,9 +73,9 @@ mod nested {
 
 #[frame_support::pallet(dev_mode)]
 pub mod module {
-	use self::frame_system::pallet_prelude::*;
+	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
@@ -154,26 +155,24 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, (),
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 frame_support::construct_runtime!(
-	pub enum RuntimeOriginTest where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub enum RuntimeOriginTest
 	{
-		System: frame_support_test,
+		System: frame_system,
 		NestedModule: nested::module,
 		Module: module,
 	}
 );
 
-impl frame_support_test::Config for RuntimeOriginTest {
-	type BlockNumber = BlockNumber;
-	type AccountId = AccountId;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for RuntimeOriginTest {
 	type BaseCallFilter = BaseCallFilter;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl nested::module::Config for RuntimeOriginTest {
diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index d0efcb3b5c18f..1aeacbaa481f4 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -649,13 +649,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type BlockWeights = ();
@@ -701,10 +700,7 @@ pub type UncheckedExtrinsic =
 	sp_runtime::testing::TestXt<RuntimeCall, frame_system::CheckNonZeroSender<Runtime>>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		// Exclude part `Storage` in order not to check its metadata in tests.
 		System: frame_system exclude_parts { Pallet, Storage },
diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs
index 0747753289af0..d5d5982dd6d79 100644
--- a/frame/support/test/tests/pallet_instance.rs
+++ b/frame/support/test/tests/pallet_instance.rs
@@ -290,13 +290,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type BlockWeights = ();
@@ -334,10 +333,7 @@ pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		// Exclude part `Storage` in order not to check its metadata in tests.
 		System: frame_system exclude_parts { Storage },
diff --git a/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs b/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
index 28b901213943c..516aa1e131aca 100644
--- a/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
+++ b/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
@@ -61,13 +61,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type BlockWeights = ();
@@ -89,10 +88,7 @@ pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		// Exclude part `Storage` in order not to check its metadata in tests.
 		System: frame_system exclude_parts { Pallet, Storage },
diff --git a/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs b/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
index 9c9c49c4b2740..8f28e4a9b28a7 100644
--- a/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
+++ b/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs
@@ -14,13 +14,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = frame_support::traits::ConstU32<250>;
 	type BlockWeights = ();
@@ -38,10 +37,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
 		Pallet: test_pallet::{Pallet, Config},
diff --git a/frame/support/test/tests/runtime_metadata.rs b/frame/support/test/tests/runtime_metadata.rs
index 70ca307d4428c..b016caae70ccd 100644
--- a/frame/support/test/tests/runtime_metadata.rs
+++ b/frame/support/test/tests/runtime_metadata.rs
@@ -22,9 +22,7 @@ use frame_support::{
 	traits::ConstU32,
 };
 use scale_info::{form::MetaForm, meta_type};
-use sp_runtime::traits::Block as BlockT;
 
-pub type BlockNumber = u64;
 pub type Index = u64;
 pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
@@ -37,13 +35,12 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u32;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type Version = ();
@@ -58,10 +55,7 @@ impl frame_system::Config for Runtime {
 }
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub enum Runtime
 	{
 		System: frame_system,
 	}
@@ -107,7 +101,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
@@ -204,7 +198,7 @@ fn runtime_metadata() {
 					name: "initialize_block",
 					inputs: vec![RuntimeApiMethodParamMetadataIR::<MetaForm> {
 						name: "header",
-						ty: meta_type::<&<Block as BlockT>::Header>(),
+						ty: meta_type::<&<Block as sp_runtime::traits::HeaderProvider>::Header>(),
 					}],
 					output: meta_type::<()>(),
 					docs: maybe_docs(vec![" Initialize a block with the given header."]),
diff --git a/frame/support/test/tests/storage_layers.rs b/frame/support/test/tests/storage_layers.rs
index 3e306834869bb..93a541ad91162 100644
--- a/frame/support/test/tests/storage_layers.rs
+++ b/frame/support/test/tests/storage_layers.rs
@@ -71,12 +71,11 @@ impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = Index;
-	type BlockNumber = BlockNumber;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU32<250>;
 	type DbWeight = ();
@@ -94,12 +93,7 @@ impl frame_system::Config for Runtime {
 impl Config for Runtime {}
 
 frame_support::construct_runtime!(
-	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub struct Runtime {
 		System: frame_system,
 		MyPallet: pallet,
 	}
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index 5fc4ba7cca6d9..c2fd6799f9d75 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -18,13 +18,14 @@
 // Disable warnings for #\[transactional\] being deprecated.
 #![allow(deprecated)]
 
+pub use self::pallet::*;
 use frame_support::{
-	assert_noop, assert_ok, assert_storage_noop,
+	assert_noop, assert_ok, assert_storage_noop, derive_impl,
 	dispatch::DispatchResult,
 	storage::{with_transaction, TransactionOutcome::*},
 	transactional,
 };
-use sp_core::sr25519;
+use sp_core::{sr25519, ConstU32};
 use sp_io::TestExternalities;
 use sp_runtime::{
 	generic,
@@ -32,14 +33,11 @@ use sp_runtime::{
 	TransactionOutcome,
 };
 
-pub use self::pallet::*;
-
 #[frame_support::pallet]
 pub mod pallet {
-	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
-	use frame_support_test as frame_system;
+	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub (super) trait Store)]
@@ -82,25 +80,22 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 frame_support::construct_runtime!(
 	pub enum Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_support_test,
+		System: frame_system,
 		MyPallet: pallet,
 	}
 );
 
-impl frame_support_test::Config for Runtime {
-	type BlockNumber = BlockNumber;
-	type AccountId = AccountId;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type PalletInfo = PalletInfo;
-	type DbWeight = ();
+	type OnSetCode = ();
+	type Block = Block;
+	type BlockHashCount = ConstU32<10>;
 }
 
 impl Config for Runtime {}
diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs
index e2fed3e51855d..802b0a4c9f061 100644
--- a/frame/system/benches/bench.rs
+++ b/frame/system/benches/bench.rs
@@ -19,7 +19,6 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use frame_support::traits::{ConstU32, ConstU64};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	Perbill,
 };
@@ -43,14 +42,10 @@ mod module {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Runtime
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Module: module::{Pallet, Event},
@@ -70,13 +65,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/system/benchmarking/src/mock.rs b/frame/system/benchmarking/src/mock.rs
index 8b05c5a8ba82a..90a035711214a 100644
--- a/frame/system/benchmarking/src/mock.rs
+++ b/frame/system/benchmarking/src/mock.rs
@@ -24,16 +24,11 @@ use sp_runtime::traits::IdentityLookup;
 
 type AccountId = u64;
 type AccountIndex = u32;
-type BlockNumber = u64;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 	}
@@ -46,13 +41,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = AccountIndex;
-	type BlockNumber = BlockNumber;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = sp_runtime::testing::Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ();
 	type Version = ();
diff --git a/frame/system/src/extensions/check_genesis.rs b/frame/system/src/extensions/check_genesis.rs
index 5964ec452842f..e962d40146f86 100644
--- a/frame/system/src/extensions/check_genesis.rs
+++ b/frame/system/src/extensions/check_genesis.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Pallet};
+use crate::{BlockNumberOf, Config, Pallet};
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -60,7 +60,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckGenesis<T> {
 	const IDENTIFIER: &'static str = "CheckGenesis";
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-		Ok(<Pallet<T>>::block_hash(T::BlockNumber::zero()))
+		Ok(<Pallet<T>>::block_hash(BlockNumberOf::<T>::zero()))
 	}
 
 	fn pre_dispatch(
diff --git a/frame/system/src/extensions/check_mortality.rs b/frame/system/src/extensions/check_mortality.rs
index 23c357d481350..64e81bb2c7d1d 100644
--- a/frame/system/src/extensions/check_mortality.rs
+++ b/frame/system/src/extensions/check_mortality.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{BlockHash, Config, Pallet};
+use crate::{BlockHash, BlockNumberOf, Config, Pallet};
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -78,7 +78,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
 		let current_u64 = <Pallet<T>>::block_number().saturated_into::<u64>();
-		let n = self.0.birth(current_u64).saturated_into::<T::BlockNumber>();
+		let n = self.0.birth(current_u64).saturated_into::<BlockNumberOf<T>>();
 		if !<BlockHash<T>>::contains_key(n) {
 			Err(InvalidTransaction::AncientBirthBlock.into())
 		} else {
diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs
index cbda3d55cc68c..604f5136e9f8c 100644
--- a/frame/system/src/lib.rs
+++ b/frame/system/src/lib.rs
@@ -72,9 +72,9 @@ use sp_runtime::traits::TrailingZeroInput;
 use sp_runtime::{
 	generic,
 	traits::{
-		self, AtLeast32Bit, AtLeast32BitUnsigned, BadOrigin, BlockNumberProvider, Bounded,
-		CheckEqual, Dispatchable, Hash, Lookup, LookupError, MaybeDisplay,
-		MaybeSerializeDeserialize, Member, One, Saturating, SimpleBitOps, StaticLookup, Zero,
+		self, AtLeast32Bit, BadOrigin, BlockNumberProvider, Bounded, CheckEqual, Dispatchable,
+		Hash, Lookup, LookupError, MaybeDisplay, MaybeSerializeDeserialize, Member, One,
+		Saturating, SimpleBitOps, StaticLookup, Zero,
 	},
 	DispatchError, RuntimeDebug,
 };
@@ -197,6 +197,11 @@ impl<MaxNormal: Get<u32>, MaxOverflow: Get<u32>> ConsumerLimits for (MaxNormal,
 	}
 }
 
+/// The Header type used by the runtime.
+pub type HeaderOf<T> = <<T as Config>::Block as traits::HeaderProvider>::Header;
+/// The block number type used by the runtime.
+pub type BlockNumberOf<T> = <HeaderOf<T> as traits::Header>::Number;
+
 #[frame_support::pallet]
 pub mod pallet {
 	use crate::{self as frame_system, pallet_prelude::*, *};
@@ -217,13 +222,10 @@ pub mod pallet {
 		#[frame_support::register_default_impl(TestDefaultConfig)]
 		impl DefaultConfig for TestDefaultConfig {
 			type Index = u32;
-			type BlockNumber = u32;
-			type Header = sp_runtime::generic::Header<Self::BlockNumber, Self::Hashing>;
 			type Hash = sp_core::hash::H256;
 			type Hashing = sp_runtime::traits::BlakeTwo256;
 			type AccountId = u64;
 			type Lookup = sp_runtime::traits::IdentityLookup<u64>;
-			type BlockHashCount = frame_support::traits::ConstU32<10>;
 			type MaxConsumers = frame_support::traits::ConstU32<16>;
 			type AccountData = ();
 			type OnNewAccount = ();
@@ -287,21 +289,6 @@ pub mod pallet {
 			+ Copy
 			+ MaxEncodedLen;
 
-		/// The block number type used by the runtime.
-		type BlockNumber: Parameter
-			+ Member
-			+ MaybeSerializeDeserialize
-			+ Debug
-			+ MaybeDisplay
-			+ AtLeast32BitUnsigned
-			+ Default
-			+ Bounded
-			+ Copy
-			+ sp_std::hash::Hash
-			+ sp_std::str::FromStr
-			+ MaxEncodedLen
-			+ TypeInfo;
-
 		/// The output of the `Hashing` function.
 		type Hash: Parameter
 			+ Member
@@ -338,12 +325,16 @@ pub mod pallet {
 		/// functional/efficient alternatives.
 		type Lookup: StaticLookup<Target = Self::AccountId>;
 
-		/// The block header.
-		type Header: Parameter + traits::Header<Number = Self::BlockNumber, Hash = Self::Hash>;
+		/// The block type.
+		#[pallet::no_default]
+		type Block: Parameter + traits::Block<Hash = Self::Hash>;
 
 		/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 		#[pallet::constant]
-		type BlockHashCount: Get<Self::BlockNumber>;
+		#[pallet::no_default]
+		type BlockHashCount: Get<
+			<<Self::Block as traits::HeaderProvider>::Header as traits::Header>::Number,
+		>;
 
 		/// The weight of runtime database operations the runtime can invoke.
 		#[pallet::constant]
@@ -402,7 +393,7 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+	impl<T: Config> Hooks<BlockNumberOf<T>> for Pallet<T> {
 		#[cfg(feature = "std")]
 		fn integrity_test() {
 			sp_io::TestExternalities::default().execute_with(|| {
@@ -590,7 +581,7 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::getter(fn block_hash)]
 	pub type BlockHash<T: Config> =
-		StorageMap<_, Twox64Concat, T::BlockNumber, T::Hash, ValueQuery>;
+		StorageMap<_, Twox64Concat, BlockNumberOf<T>, T::Hash, ValueQuery>;
 
 	/// Extrinsics data for the current block (maps an extrinsic's index to its data).
 	#[pallet::storage]
@@ -603,7 +594,7 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::whitelist_storage]
 	#[pallet::getter(fn block_number)]
-	pub(super) type Number<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub(super) type Number<T: Config> = StorageValue<_, BlockNumberOf<T>, ValueQuery>;
 
 	/// Hash of the previous block.
 	#[pallet::storage]
@@ -642,14 +633,14 @@ pub mod pallet {
 	/// allows light-clients to leverage the changes trie storage tracking mechanism and
 	/// in case of changes fetch the list of events of interest.
 	///
-	/// The value has the type `(T::BlockNumber, EventIndex)` because if we used only just
+	/// The value has the type `(BlockNumberOf<T>, EventIndex)` because if we used only just
 	/// the `EventIndex` then in case if the topic has the same contents on the next block
 	/// no notification will be triggered thus the event might be lost.
 	#[pallet::storage]
 	#[pallet::unbounded]
 	#[pallet::getter(fn event_topics)]
 	pub(super) type EventTopics<T: Config> =
-		StorageMap<_, Blake2_128Concat, T::Hash, Vec<(T::BlockNumber, EventIndex)>, ValueQuery>;
+		StorageMap<_, Blake2_128Concat, T::Hash, Vec<(BlockNumberOf<T>, EventIndex)>, ValueQuery>;
 
 	/// Stores the `spec_version` and `spec_name` of when the last runtime upgrade happened.
 	#[pallet::storage]
@@ -680,7 +671,7 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
 		fn build(&self) {
-			<BlockHash<T>>::insert::<_, T::Hash>(T::BlockNumber::zero(), hash69());
+			<BlockHash<T>>::insert::<_, T::Hash>(BlockNumberOf::<T>::zero(), hash69());
 			<ParentHash<T>>::put::<T::Hash>(hash69());
 			<LastRuntimeUpgrade<T>>::put(LastRuntimeUpgradeInfo::from(T::Version::get()));
 			<UpgradedToU32RefCount<T>>::put(true);
@@ -1388,7 +1379,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	/// Start the execution of a particular block.
-	pub fn initialize(number: &T::BlockNumber, parent_hash: &T::Hash, digest: &generic::Digest) {
+	pub fn initialize(number: &BlockNumberOf<T>, parent_hash: &T::Hash, digest: &generic::Digest) {
 		// populate environment
 		ExecutionPhase::<T>::put(Phase::Initialization);
 		storage::unhashed::put(well_known_keys::EXTRINSIC_INDEX, &0u32);
@@ -1405,7 +1396,7 @@ impl<T: Config> Pallet<T> {
 
 	/// Remove temporary "environment" entries in storage, compute the storage root and return the
 	/// resulting header for this block.
-	pub fn finalize() -> T::Header {
+	pub fn finalize() -> HeaderOf<T> {
 		log::debug!(
 			target: LOG_TARGET,
 			"[{:?}] {} extrinsics, length: {} (normal {}%, op: {}%, mandatory {}%) / normal weight:\
@@ -1477,7 +1468,7 @@ impl<T: Config> Pallet<T> {
 		let storage_root = T::Hash::decode(&mut &sp_io::storage::root(version)[..])
 			.expect("Node is configured to use the same hash; qed");
 
-		<T::Header as traits::Header>::new(
+		<HeaderOf<T> as traits::Header>::new(
 			number,
 			extrinsics_root,
 			storage_root,
@@ -1496,8 +1487,8 @@ impl<T: Config> Pallet<T> {
 	pub fn externalities() -> TestExternalities {
 		TestExternalities::new(sp_core::storage::Storage {
 			top: map![
-				<BlockHash<T>>::hashed_key_for(T::BlockNumber::zero()) => [69u8; 32].encode(),
-				<Number<T>>::hashed_key().to_vec() => T::BlockNumber::one().encode(),
+				<BlockHash<T>>::hashed_key_for(BlockNumberOf::<T>::zero()) => [69u8; 32].encode(),
+				<Number<T>>::hashed_key().to_vec() => BlockNumberOf::<T>::one().encode(),
 				<ParentHash<T>>::hashed_key().to_vec() => [69u8; 32].encode()
 			],
 			children_default: map![],
@@ -1542,7 +1533,7 @@ impl<T: Config> Pallet<T> {
 	/// Set the block number to something in particular. Can be used as an alternative to
 	/// `initialize` for tests that don't need to bother with the other environment entries.
 	#[cfg(any(feature = "std", feature = "runtime-benchmarks", test))]
-	pub fn set_block_number(n: T::BlockNumber) {
+	pub fn set_block_number(n: BlockNumberOf<T>) {
 		<Number<T>>::put(n);
 	}
 
@@ -1760,7 +1751,7 @@ impl<T: Config> HandleLifetime<T::AccountId> for Consumer<T> {
 }
 
 impl<T: Config> BlockNumberProvider for Pallet<T> {
-	type BlockNumber = <T as Config>::BlockNumber;
+	type BlockNumber = BlockNumberOf<T>;
 
 	fn current_block_number() -> Self::BlockNumber {
 		Pallet::<T>::block_number()
@@ -1826,11 +1817,13 @@ impl<T: Config> Lookup for ChainContext<T> {
 
 /// Prelude to be used alongside pallet macro, for ease of use.
 pub mod pallet_prelude {
-	pub use crate::{ensure_none, ensure_root, ensure_signed, ensure_signed_or_root};
+	pub use crate::{
+		ensure_none, ensure_root, ensure_signed, ensure_signed_or_root, BlockNumberOf, HeaderOf,
+	};
 
 	/// Type alias for the `Origin` associated type of system config.
 	pub type OriginFor<T> = <T as crate::Config>::RuntimeOrigin;
 
 	/// Type alias for the `BlockNumber` associated type of system config.
-	pub type BlockNumberFor<T> = <T as crate::Config>::BlockNumber;
+	pub type BlockNumberFor<T> = BlockNumberOf<T>;
 }
diff --git a/frame/system/src/mock.rs b/frame/system/src/mock.rs
index b484c22ad4fe4..bba3b92077de7 100644
--- a/frame/system/src/mock.rs
+++ b/frame/system/src/mock.rs
@@ -22,19 +22,14 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage, Perbill,
 };
 
-type UncheckedExtrinsic = mocking::MockUncheckedExtrinsic<Test>;
 type Block = mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 	}
@@ -97,12 +92,11 @@ impl Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<10>;
 	type DbWeight = DbWeight;
diff --git a/frame/system/src/mocking.rs b/frame/system/src/mocking.rs
index 8f76c1b8e08ba..6195432a46bb8 100644
--- a/frame/system/src/mocking.rs
+++ b/frame/system/src/mocking.rs
@@ -27,8 +27,16 @@ pub type MockUncheckedExtrinsic<T, Signature = (), Extra = ()> = generic::Unchec
 	Extra,
 >;
 
-/// An implementation of `sp_runtime::traits::Block` to be used in tests.
+/// An implementation of `sp_runtime::traits::Block` to be used in tests
+/// with BlockNumber as `u64`.
 pub type MockBlock<T> = generic::Block<
-	generic::Header<<T as crate::Config>::BlockNumber, sp_runtime::traits::BlakeTwo256>,
+	generic::Header<u64, sp_runtime::traits::BlakeTwo256>,
+	MockUncheckedExtrinsic<T>,
+>;
+
+/// An implementation of `sp_runtime::traits::Block` to be used in tests
+/// with BlockNumber as `u32`.
+pub type MockBlockU32<T> = generic::Block<
+	generic::Header<u32, sp_runtime::traits::BlakeTwo256>,
 	MockUncheckedExtrinsic<T>,
 >;
diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs
index e707764beb95c..b2f4d7fd5cfaa 100644
--- a/frame/timestamp/src/lib.rs
+++ b/frame/timestamp/src/lib.rs
@@ -130,7 +130,7 @@ pub mod pallet {
 		type Moment: Parameter
 			+ Default
 			+ AtLeast32Bit
-			+ Scale<Self::BlockNumber, Output = Self::Moment>
+			+ Scale<BlockNumberOf<Self>, Output = Self::Moment>
 			+ Copy
 			+ MaxEncodedLen
 			+ scale_info::StaticTypeInfo;
diff --git a/frame/timestamp/src/mock.rs b/frame/timestamp/src/mock.rs
index 6f681788236c3..d111d946ef798 100644
--- a/frame/timestamp/src/mock.rs
+++ b/frame/timestamp/src/mock.rs
@@ -26,20 +26,13 @@ use frame_support::{
 };
 use sp_core::H256;
 use sp_io::TestExternalities;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 type Moment = u64;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
@@ -53,13 +46,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/tips/src/benchmarking.rs b/frame/tips/src/benchmarking.rs
index 613f684afdf56..81334c3eca729 100644
--- a/frame/tips/src/benchmarking.rs
+++ b/frame/tips/src/benchmarking.rs
@@ -78,7 +78,7 @@ fn create_tips<T: Config<I>, I: 'static>(
 	}
 	Tips::<T, I>::mutate(hash, |maybe_tip| {
 		if let Some(open_tip) = maybe_tip {
-			open_tip.closes = Some(T::BlockNumber::zero());
+			open_tip.closes = Some(frame_system::BlockNumberOf::<T>::zero());
 		}
 	});
 	Ok(())
diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs
index 970e2ac152c4b..ab7a97a213122 100644
--- a/frame/tips/src/lib.rs
+++ b/frame/tips/src/lib.rs
@@ -143,7 +143,7 @@ pub mod pallet {
 
 		/// The period for which a tip remains open after is has achieved threshold tippers.
 		#[pallet::constant]
-		type TipCountdown: Get<Self::BlockNumber>;
+		type TipCountdown: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// The percent of the final tip which goes to the original reporter of the tip.
 		#[pallet::constant]
@@ -173,7 +173,7 @@ pub mod pallet {
 		_,
 		Twox64Concat,
 		T::Hash,
-		OpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>,
+		OpenTip<T::AccountId, BalanceOf<T, I>, frame_system::BlockNumberOf<T>, T::Hash>,
 		OptionQuery,
 	>;
 
@@ -470,7 +470,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	///
 	/// `O(T)` and one storage access.
 	fn insert_tip_and_check_closing(
-		tip: &mut OpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>,
+		tip: &mut OpenTip<T::AccountId, BalanceOf<T, I>, frame_system::BlockNumberOf<T>, T::Hash>,
 		tipper: T::AccountId,
 		tip_value: BalanceOf<T, I>,
 	) -> bool {
@@ -515,7 +515,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Plus `O(T)` (`T` is Tippers length).
 	fn payout_tip(
 		hash: T::Hash,
-		tip: OpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>,
+		tip: OpenTip<T::AccountId, BalanceOf<T, I>, frame_system::BlockNumberOf<T>, T::Hash>,
 	) {
 		let mut tips = tip.tips;
 		Self::retain_active_tips(&mut tips);
@@ -577,7 +577,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 		for (hash, old_tip) in storage_key_iter::<
 			T::Hash,
-			OldOpenTip<T::AccountId, BalanceOf<T, I>, T::BlockNumber, T::Hash>,
+			OldOpenTip<T::AccountId, BalanceOf<T, I>, frame_system::BlockNumberOf<T>, T::Hash>,
 			Twox64Concat,
 		>(module, item)
 		.drain()
diff --git a/frame/tips/src/tests.rs b/frame/tips/src/tests.rs
index 25043b413db07..2cf5043331b0d 100644
--- a/frame/tips/src/tests.rs
+++ b/frame/tips/src/tests.rs
@@ -21,7 +21,6 @@
 
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BadOrigin, BlakeTwo256, IdentityLookup},
 	BuildStorage, Perbill, Permill,
 };
@@ -39,14 +38,10 @@ use frame_support::{
 use super::*;
 use crate::{self as pallet_tips, Event as TipEvent};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -67,13 +62,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/transaction-payment/asset-tx-payment/src/mock.rs b/frame/transaction-payment/asset-tx-payment/src/mock.rs
index 740915023a32d..fbc70c118da7b 100644
--- a/frame/transaction-payment/asset-tx-payment/src/mock.rs
+++ b/frame/transaction-payment/asset-tx-payment/src/mock.rs
@@ -29,23 +29,14 @@ use frame_system as system;
 use frame_system::EnsureRoot;
 use pallet_transaction_payment::CurrencyAdapter;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, ConvertInto, IdentityLookup, SaturatedConversion},
-};
+use sp_runtime::traits::{BlakeTwo256, ConvertInto, IdentityLookup, SaturatedConversion};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 type Balance = u64;
 type AccountId = u64;
 
 frame_support::construct_runtime!(
-	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
+	pub struct Runtime {
 		System: system,
 		Balances: pallet_balances,
 		TransactionPayment: pallet_transaction_payment,
@@ -86,13 +77,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
index 7f8ed4b802675..274a5304c8214 100644
--- a/frame/transaction-payment/rpc/src/lib.rs
+++ b/frame/transaction-payment/rpc/src/lib.rs
@@ -30,7 +30,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_rpc::number::NumberOrHex;
-use sp_runtime::traits::{Block as BlockT, MaybeDisplay};
+use sp_runtime::traits::{Block as BlockT, HeaderProvider, MaybeDisplay};
 
 pub use pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi;
 
@@ -80,7 +80,7 @@ impl From<Error> for i32 {
 
 impl<C, Block, Balance>
 	TransactionPaymentApiServer<
-		<Block as BlockT>::Hash,
+		<Block as HeaderProvider>::Hash,
 		RuntimeDispatchInfo<Balance, sp_weights::Weight>,
 	> for TransactionPayment<C, Block>
 where
diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs
index 1ea2dc9f33ebb..8b9a2d7fe34e1 100644
--- a/frame/transaction-payment/src/lib.rs
+++ b/frame/transaction-payment/src/lib.rs
@@ -408,7 +408,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_finalize(_: T::BlockNumber) {
+		fn on_finalize(_: frame_system::BlockNumberOf<T>) {
 			<NextFeeMultiplier<T>>::mutate(|fm| {
 				*fm = T::FeeMultiplierUpdate::convert(*fm);
 			});
diff --git a/frame/transaction-payment/src/mock.rs b/frame/transaction-payment/src/mock.rs
index 28d57065eca18..023f1cf6e1f40 100644
--- a/frame/transaction-payment/src/mock.rs
+++ b/frame/transaction-payment/src/mock.rs
@@ -19,10 +19,7 @@ use super::*;
 use crate as pallet_transaction_payment;
 
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
 use frame_support::{
 	dispatch::DispatchClass,
@@ -33,14 +30,10 @@ use frame_support::{
 use frame_system as system;
 use pallet_balances::Call as BalancesCall;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub struct Runtime
 	{
 		System: system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -83,13 +76,12 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/transaction-storage/src/benchmarking.rs b/frame/transaction-storage/src/benchmarking.rs
index dfea3331569f9..322964bc07892 100644
--- a/frame/transaction-storage/src/benchmarking.rs
+++ b/frame/transaction-storage/src/benchmarking.rs
@@ -113,7 +113,7 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 	assert_eq!(event, &system_event);
 }
 
-pub fn run_to_block<T: Config>(n: T::BlockNumber) {
+pub fn run_to_block<T: Config>(n: frame_system::BlockNumberOf<T>) {
 	while frame_system::Pallet::<T>::block_number() < n {
 		crate::Pallet::<T>::on_finalize(frame_system::Pallet::<T>::block_number());
 		frame_system::Pallet::<T>::on_finalize(frame_system::Pallet::<T>::block_number());
@@ -144,7 +144,7 @@ benchmarks! {
 			vec![0u8; T::MaxTransactionSize::get() as usize],
 		)?;
 		run_to_block::<T>(1u32.into());
-	}: _(RawOrigin::Signed(caller.clone()), T::BlockNumber::zero(), 0)
+	}: _(RawOrigin::Signed(caller.clone()), frame_system::BlockNumberOf::<T>::zero(), 0)
 	verify {
 		assert_last_event::<T>(Event::Renewed { index: 0 }.into());
 	}
@@ -159,7 +159,7 @@ benchmarks! {
 				vec![0u8; T::MaxTransactionSize::get() as usize],
 			)?;
 		}
-		run_to_block::<T>(StoragePeriod::<T>::get() + T::BlockNumber::one());
+		run_to_block::<T>(StoragePeriod::<T>::get() + frame_system::BlockNumberOf::<T>::one());
 		let encoded_proof = proof();
 		let proof = TransactionStorageProof::decode(&mut &*encoded_proof).unwrap();
 	}: check_proof(RawOrigin::None, proof)
diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs
index b99bc49fc5b6f..ba1f71f8bf508 100644
--- a/frame/transaction-storage/src/lib.rs
+++ b/frame/transaction-storage/src/lib.rs
@@ -145,7 +145,7 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			// Drop obsolete roots. The proof for `obsolete` will be checked later
 			// in this block, so we drop `obsolete` - 1.
 			let period = <StoragePeriod<T>>::get();
@@ -158,7 +158,7 @@ pub mod pallet {
 			T::DbWeight::get().reads_writes(2, 4)
 		}
 
-		fn on_finalize(n: T::BlockNumber) {
+		fn on_finalize(n: frame_system::BlockNumberOf<T>) {
 			assert!(
 				<ProofChecked<T>>::take() || {
 					// Proof is not required for early or empty blocks.
@@ -238,7 +238,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::renew())]
 		pub fn renew(
 			origin: OriginFor<T>,
-			block: T::BlockNumber,
+			block: frame_system::BlockNumberOf<T>,
 			index: u32,
 		) -> DispatchResultWithPostInfo {
 			let sender = ensure_signed(origin)?;
@@ -342,7 +342,7 @@ pub mod pallet {
 	pub(super) type Transactions<T: Config> = StorageMap<
 		_,
 		Blake2_128Concat,
-		T::BlockNumber,
+		frame_system::BlockNumberOf<T>,
 		BoundedVec<TransactionInfo, T::MaxBlockTransactions>,
 		OptionQuery,
 	>;
@@ -350,7 +350,7 @@ pub mod pallet {
 	/// Count indexed chunks for each block.
 	#[pallet::storage]
 	pub(super) type ChunkCount<T: Config> =
-		StorageMap<_, Blake2_128Concat, T::BlockNumber, u32, ValueQuery>;
+		StorageMap<_, Blake2_128Concat, frame_system::BlockNumberOf<T>, u32, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn byte_fee)]
@@ -365,7 +365,8 @@ pub mod pallet {
 	/// Storage period for data in blocks. Should match `sp_storage_proof::DEFAULT_STORAGE_PERIOD`
 	/// for block authoring.
 	#[pallet::storage]
-	pub(super) type StoragePeriod<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+	pub(super) type StoragePeriod<T: Config> =
+		StorageValue<_, frame_system::BlockNumberOf<T>, ValueQuery>;
 
 	// Intermediates
 	#[pallet::storage]
@@ -380,7 +381,7 @@ pub mod pallet {
 	pub struct GenesisConfig<T: Config> {
 		pub byte_fee: BalanceOf<T>,
 		pub entry_fee: BalanceOf<T>,
-		pub storage_period: T::BlockNumber,
+		pub storage_period: frame_system::BlockNumberOf<T>,
 	}
 
 	impl<T: Config> Default for GenesisConfig<T> {
diff --git a/frame/transaction-storage/src/mock.rs b/frame/transaction-storage/src/mock.rs
index 1f8a4e2d09ba8..bfaf0c3c075d9 100644
--- a/frame/transaction-storage/src/mock.rs
+++ b/frame/transaction-storage/src/mock.rs
@@ -24,20 +24,15 @@ use crate::{
 use frame_support::traits::{ConstU16, ConstU32, ConstU64, OnFinalize, OnInitialize};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 pub type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
@@ -54,12 +49,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs
index a3761083e4faa..61ea4b1a73311 100644
--- a/frame/treasury/src/benchmarking.rs
+++ b/frame/treasury/src/benchmarking.rs
@@ -135,7 +135,7 @@ benchmarks_instance_pallet! {
 		setup_pot_account::<T, _>();
 		create_approved_proposals::<T, _>(p)?;
 	}: {
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T, _>::on_initialize(frame_system::BlockNumberOf::<T>::zero());
 	}
 
 	impl_benchmark_test_suite!(Treasury, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs
index 509ab933430bb..57d4c8a706ec9 100644
--- a/frame/treasury/src/lib.rs
+++ b/frame/treasury/src/lib.rs
@@ -175,7 +175,7 @@ pub mod pallet {
 
 		/// Period between successive spends.
 		#[pallet::constant]
-		type SpendPeriod: Get<Self::BlockNumber>;
+		type SpendPeriod: Get<frame_system::BlockNumberOf<Self>>;
 
 		/// Percentage of spare funds (if any) that are burnt per spend period.
 		#[pallet::constant]
@@ -309,7 +309,7 @@ pub mod pallet {
 	impl<T: Config<I>, I: 'static> Hooks<BlockNumberFor<T>> for Pallet<T, I> {
 		/// ## Complexity
 		/// - `O(A)` where `A` is the number of approvals
-		fn on_initialize(n: T::BlockNumber) -> Weight {
+		fn on_initialize(n: frame_system::BlockNumberOf<T>) -> Weight {
 			let pot = Self::pot();
 			let deactivated = Deactivated::<T, I>::get();
 			if pot != deactivated {
diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs
index 0659c2f5941b1..a614b0dda5228 100644
--- a/frame/treasury/src/tests.rs
+++ b/frame/treasury/src/tests.rs
@@ -20,10 +20,7 @@
 #![cfg(test)]
 
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BadOrigin, BlakeTwo256, Dispatchable, IdentityLookup},
-};
+use sp_runtime::traits::{BadOrigin, BlakeTwo256, Dispatchable, IdentityLookup};
 
 use frame_support::{
 	assert_err_ignore_postinfo, assert_noop, assert_ok,
@@ -36,16 +33,12 @@ use frame_support::{
 use super::*;
 use crate as treasury;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 type UtilityCall = pallet_utility::Call<Test>;
 type TreasuryCall = crate::Call<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -61,13 +54,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128; // u64 is not enough to hold bytes used to generate bounty account
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/uniques/src/mock.rs b/frame/uniques/src/mock.rs
index e783f0b7cf4d9..dfcddc2b5fde4 100644
--- a/frame/uniques/src/mock.rs
+++ b/frame/uniques/src/mock.rs
@@ -25,19 +25,12 @@ use frame_support::{
 	traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -52,12 +45,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type DbWeight = ();
diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs
index ced50f828d564..ef6ec49349378 100644
--- a/frame/utility/src/tests.rs
+++ b/frame/utility/src/tests.rs
@@ -33,7 +33,6 @@ use frame_support::{
 use pallet_collective::{EnsureProportionAtLeast, Instance1};
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, Hash, IdentityLookup},
 	TokenError,
 };
@@ -125,14 +124,10 @@ mod mock_democracy {
 	}
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Call, Inherent},
@@ -156,13 +151,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/frame/vesting/src/benchmarking.rs b/frame/vesting/src/benchmarking.rs
index 15be519842992..ae5c60d0bc7fc 100644
--- a/frame/vesting/src/benchmarking.rs
+++ b/frame/vesting/src/benchmarking.rs
@@ -55,7 +55,7 @@ fn add_vesting_schedules<T: Config>(
 	let source_lookup = T::Lookup::unlookup(source.clone());
 	T::Currency::make_free_balance_be(&source, BalanceOf::<T>::max_value());
 
-	System::<T>::set_block_number(T::BlockNumber::zero());
+	System::<T>::set_block_number(frame_system::BlockNumberOf::<T>::zero());
 
 	let mut total_locked: BalanceOf<T> = Zero::zero();
 	for _ in 0..n {
@@ -88,7 +88,7 @@ benchmarks! {
 		let expected_balance = add_vesting_schedules::<T>(caller_lookup, s)?;
 
 		// At block zero, everything is vested.
-		assert_eq!(System::<T>::block_number(), T::BlockNumber::zero());
+		assert_eq!(System::<T>::block_number(), frame_system::BlockNumberOf::<T>::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
 			Some(expected_balance),
@@ -144,7 +144,7 @@ benchmarks! {
 		let expected_balance = add_vesting_schedules::<T>(other_lookup.clone(), s)?;
 
 		// At block zero, everything is vested.
-		assert_eq!(System::<T>::block_number(), T::BlockNumber::zero());
+		assert_eq!(System::<T>::block_number(), frame_system::BlockNumberOf::<T>::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&other),
 			Some(expected_balance),
@@ -284,7 +284,7 @@ benchmarks! {
 		let expected_balance = add_vesting_schedules::<T>(caller_lookup, s)?;
 
 		// Schedules are not vesting at block 0.
-		assert_eq!(System::<T>::block_number(), T::BlockNumber::zero());
+		assert_eq!(System::<T>::block_number(), frame_system::BlockNumberOf::<T>::zero());
 		assert_eq!(
 			Vesting::<T>::vesting_balance(&caller),
 			Some(expected_balance),
diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs
index 8f98295dd385a..c8eaad1b8f5ba 100644
--- a/frame/vesting/src/lib.rs
+++ b/frame/vesting/src/lib.rs
@@ -127,8 +127,8 @@ impl VestingAction {
 	/// Pick the schedules that this action dictates should continue vesting undisturbed.
 	fn pick_schedules<T: Config>(
 		&self,
-		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
-	) -> impl Iterator<Item = VestingInfo<BalanceOf<T>, T::BlockNumber>> + '_ {
+		schedules: Vec<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>>,
+	) -> impl Iterator<Item = VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>> + '_ {
 		schedules.into_iter().enumerate().filter_map(move |(index, schedule)| {
 			if self.should_remove(index) {
 				None
@@ -162,7 +162,7 @@ pub mod pallet {
 		type Currency: LockableCurrency<Self::AccountId>;
 
 		/// Convert the block number into a balance.
-		type BlockNumberToBalance: Convert<Self::BlockNumber, BalanceOf<Self>>;
+		type BlockNumberToBalance: Convert<frame_system::BlockNumberOf<Self>, BalanceOf<Self>>;
 
 		/// The minimum amount transferred to call `vested_transfer`.
 		#[pallet::constant]
@@ -201,7 +201,10 @@ pub mod pallet {
 		_,
 		Blake2_128Concat,
 		T::AccountId,
-		BoundedVec<VestingInfo<BalanceOf<T>, T::BlockNumber>, MaxVestingSchedulesGet<T>>,
+		BoundedVec<
+			VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
+			MaxVestingSchedulesGet<T>,
+		>,
 	>;
 
 	/// Storage version of the pallet.
@@ -216,7 +219,12 @@ pub mod pallet {
 	#[pallet::genesis_config]
 	#[derive(frame_support::DefaultNoBound)]
 	pub struct GenesisConfig<T: Config> {
-		pub vesting: Vec<(T::AccountId, T::BlockNumber, T::BlockNumber, BalanceOf<T>)>,
+		pub vesting: Vec<(
+			T::AccountId,
+			frame_system::BlockNumberOf<T>,
+			frame_system::BlockNumberOf<T>,
+			BalanceOf<T>,
+		)>,
 	}
 
 	#[pallet::genesis_build]
@@ -342,7 +350,7 @@ pub mod pallet {
 		pub fn vested_transfer(
 			origin: OriginFor<T>,
 			target: AccountIdLookupOf<T>,
-			schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
+			schedule: VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
 		) -> DispatchResult {
 			let transactor = ensure_signed(origin)?;
 			let transactor = <T::Lookup as StaticLookup>::unlookup(transactor);
@@ -371,7 +379,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			source: AccountIdLookupOf<T>,
 			target: AccountIdLookupOf<T>,
-			schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
+			schedule: VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
 		) -> DispatchResult {
 			ensure_root(origin)?;
 			Self::do_vested_transfer(source, target, schedule)
@@ -433,10 +441,10 @@ impl<T: Config> Pallet<T> {
 	// Create a new `VestingInfo`, based off of two other `VestingInfo`s.
 	// NOTE: We assume both schedules have had funds unlocked up through the current block.
 	fn merge_vesting_info(
-		now: T::BlockNumber,
-		schedule1: VestingInfo<BalanceOf<T>, T::BlockNumber>,
-		schedule2: VestingInfo<BalanceOf<T>, T::BlockNumber>,
-	) -> Option<VestingInfo<BalanceOf<T>, T::BlockNumber>> {
+		now: frame_system::BlockNumberOf<T>,
+		schedule1: VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
+		schedule2: VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
+	) -> Option<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>> {
 		let schedule1_ending_block = schedule1.ending_block_as_balance::<T::BlockNumberToBalance>();
 		let schedule2_ending_block = schedule2.ending_block_as_balance::<T::BlockNumberToBalance>();
 		let now_as_balance = T::BlockNumberToBalance::convert(now);
@@ -483,7 +491,7 @@ impl<T: Config> Pallet<T> {
 	fn do_vested_transfer(
 		source: AccountIdLookupOf<T>,
 		target: AccountIdLookupOf<T>,
-		schedule: VestingInfo<BalanceOf<T>, T::BlockNumber>,
+		schedule: VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
 	) -> DispatchResult {
 		// Validate user inputs.
 		ensure!(schedule.locked() >= T::MinVestedTransfer::get(), Error::<T>::AmountLow);
@@ -531,9 +539,9 @@ impl<T: Config> Pallet<T> {
 	///
 	/// NOTE: the amount locked does not include any schedules that are filtered out via `action`.
 	fn report_schedule_updates(
-		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+		schedules: Vec<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>>,
 		action: VestingAction,
-	) -> (Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>, BalanceOf<T>) {
+	) -> (Vec<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>>, BalanceOf<T>) {
 		let now = <frame_system::Pallet<T>>::block_number();
 
 		let mut total_locked_now: BalanceOf<T> = Zero::zero();
@@ -570,10 +578,10 @@ impl<T: Config> Pallet<T> {
 	/// Write an accounts updated vesting schedules to storage.
 	fn write_vesting(
 		who: &T::AccountId,
-		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+		schedules: Vec<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>>,
 	) -> Result<(), DispatchError> {
 		let schedules: BoundedVec<
-			VestingInfo<BalanceOf<T>, T::BlockNumber>,
+			VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
 			MaxVestingSchedulesGet<T>,
 		> = schedules.try_into().map_err(|_| Error::<T>::AtMaxVestingSchedules)?;
 
@@ -602,9 +610,12 @@ impl<T: Config> Pallet<T> {
 	/// Execute a `VestingAction` against the given `schedules`. Returns the updated schedules
 	/// and locked amount.
 	fn exec_action(
-		schedules: Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>,
+		schedules: Vec<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>>,
 		action: VestingAction,
-	) -> Result<(Vec<VestingInfo<BalanceOf<T>, T::BlockNumber>>, BalanceOf<T>), DispatchError> {
+	) -> Result<
+		(Vec<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>>, BalanceOf<T>),
+		DispatchError,
+	> {
 		let (schedules, locked_now) = match action {
 			VestingAction::Merge { index1: idx1, index2: idx2 } => {
 				// The schedule index is based off of the schedule ordering prior to filtering out
@@ -649,7 +660,7 @@ where
 	BalanceOf<T>: MaybeSerializeDeserialize + Debug,
 {
 	type Currency = T::Currency;
-	type Moment = T::BlockNumber;
+	type Moment = frame_system::BlockNumberOf<T>;
 
 	/// Get the amount that is currently being vested and cannot be transferred out of this account.
 	fn vesting_balance(who: &T::AccountId) -> Option<BalanceOf<T>> {
@@ -680,7 +691,7 @@ where
 		who: &T::AccountId,
 		locked: BalanceOf<T>,
 		per_block: BalanceOf<T>,
-		starting_block: T::BlockNumber,
+		starting_block: frame_system::BlockNumberOf<T>,
 	) -> DispatchResult {
 		if locked.is_zero() {
 			return Ok(())
@@ -713,7 +724,7 @@ where
 		who: &T::AccountId,
 		locked: BalanceOf<T>,
 		per_block: BalanceOf<T>,
-		starting_block: T::BlockNumber,
+		starting_block: frame_system::BlockNumberOf<T>,
 	) -> DispatchResult {
 		// Check for `per_block` or `locked` of 0.
 		if !VestingInfo::new(locked, per_block, starting_block).is_valid() {
diff --git a/frame/vesting/src/migrations.rs b/frame/vesting/src/migrations.rs
index 69bbc97296500..b37decf9b80fc 100644
--- a/frame/vesting/src/migrations.rs
+++ b/frame/vesting/src/migrations.rs
@@ -40,12 +40,12 @@ pub mod v1 {
 	pub fn migrate<T: Config>() -> Weight {
 		let mut reads_writes = 0;
 
-		Vesting::<T>::translate::<VestingInfo<BalanceOf<T>, T::BlockNumber>, _>(
+		Vesting::<T>::translate::<VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>, _>(
 			|_key, vesting_info| {
 				reads_writes += 1;
 				let v: Option<
 					BoundedVec<
-						VestingInfo<BalanceOf<T>, T::BlockNumber>,
+						VestingInfo<BalanceOf<T>, frame_system::BlockNumberOf<T>>,
 						MaxVestingSchedulesGet<T>,
 					>,
 				> = vec![vesting_info].try_into().ok();
diff --git a/frame/vesting/src/mock.rs b/frame/vesting/src/mock.rs
index 31f35bbdab604..cebae13b2f1b6 100644
--- a/frame/vesting/src/mock.rs
+++ b/frame/vesting/src/mock.rs
@@ -20,22 +20,15 @@ use frame_support::{
 	traits::{ConstU32, ConstU64, GenesisBuild, WithdrawReasons},
 };
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, Identity, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, Identity, IdentityLookup};
 
 use super::*;
 use crate as pallet_vesting;
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -49,14 +42,13 @@ impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockHashCount = ConstU64<250>;
 	type BlockLength = ();
-	type BlockNumber = u64;
 	type BlockWeights = ();
 	type RuntimeCall = RuntimeCall;
 	type DbWeight = ();
 	type RuntimeEvent = RuntimeEvent;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
-	type Header = Header;
+	type Block = Block;
 	type Index = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type OnKilledAccount = ();
diff --git a/frame/whitelist/src/mock.rs b/frame/whitelist/src/mock.rs
index afb9d00861563..3b25cdd4d14ae 100644
--- a/frame/whitelist/src/mock.rs
+++ b/frame/whitelist/src/mock.rs
@@ -28,19 +28,14 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use sp_core::H256;
 use sp_runtime::{
-	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage,
 };
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		Balances: pallet_balances,
@@ -56,13 +51,12 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();
diff --git a/primitives/api/proc-macro/src/decl_runtime_apis.rs b/primitives/api/proc-macro/src/decl_runtime_apis.rs
index 827a3156060a9..ae1c5cb86760e 100644
--- a/primitives/api/proc-macro/src/decl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/decl_runtime_apis.rs
@@ -591,7 +591,7 @@ fn generate_client_side_decls(decls: &[ItemTrait]) -> Result<TokenStream> {
 		let decl = decl.clone();
 
 		let crate_ = generate_crate_access();
-		let block_hash = quote!( <Block as #crate_::BlockT>::Hash );
+		let block_hash = quote!( <Block as #crate_::HeaderProvider>::Hash );
 		let mut found_attributes = HashMap::new();
 		let mut errors = Vec::new();
 		let trait_ = decl.ident.clone();
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
index fa933ceb91797..c62473197561a 100644
--- a/primitives/api/proc-macro/src/impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -259,7 +259,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 
 				fn has_api<A: #crate_::RuntimeApiInfo + ?Sized>(
 					&self,
-					at: <Block as #crate_::BlockT>::Hash,
+					at: <Block as #crate_::HeaderProvider>::Hash,
 				) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
 					#crate_::CallApiAt::<Block>::runtime_version_at(self.call, at)
 					.map(|v| #crate_::RuntimeVersion::has_api_with(&v, &A::ID, |v| v == A::VERSION))
@@ -267,7 +267,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 
 				fn has_api_with<A: #crate_::RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 					&self,
-					at: <Block as #crate_::BlockT>::Hash,
+					at: <Block as #crate_::HeaderProvider>::Hash,
 					pred: P,
 				) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
 					#crate_::CallApiAt::<Block>::runtime_version_at(self.call, at)
@@ -276,7 +276,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 
 				fn api_version<A: #crate_::RuntimeApiInfo + ?Sized>(
 					&self,
-					at: <Block as #crate_::BlockT>::Hash,
+					at: <Block as #crate_::HeaderProvider>::Hash,
 				) -> std::result::Result<Option<u32>, #crate_::ApiError> where Self: Sized {
 					#crate_::CallApiAt::<Block>::runtime_version_at(self.call, at)
 					.map(|v| #crate_::RuntimeVersion::api_version(&v, &A::ID))
@@ -302,7 +302,7 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				fn into_storage_changes(
 					&self,
 					backend: &Self::StateBackend,
-					parent_hash: Block::Hash,
+					parent_hash: <Block as sp_runtime::traits::HeaderProvider>::Hash,
 				) -> core::result::Result<
 					#crate_::StorageChanges<C::StateBackend, Block>,
 				String
@@ -481,7 +481,7 @@ impl<'a> ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 		input.items.push(parse_quote! {
 			fn __runtime_api_internal_call_api_at(
 				&self,
-				at: <__SrApiBlock__ as #crate_::BlockT>::Hash,
+				at: <__SrApiBlock__ as #crate_::HeaderProvider>::Hash,
 				context: #crate_::ExecutionContext,
 				params: std::vec::Vec<u8>,
 				fn_name: &dyn Fn(#crate_::RuntimeVersion) -> &'static str,
diff --git a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
index be8c8ca0f8527..6bd39271115b9 100644
--- a/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
+++ b/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs
@@ -77,14 +77,14 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 
 			fn has_api<A: #crate_::RuntimeApiInfo + ?Sized>(
 				&self,
-				_: <Block as #crate_::BlockT>::Hash,
+				_: <Block as #crate_::HeaderProvider>::Hash,
 			) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
 				Ok(true)
 			}
 
 			fn has_api_with<A: #crate_::RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 				&self,
-				_: <Block as #crate_::BlockT>::Hash,
+				_: <Block as #crate_::HeaderProvider>::Hash,
 				pred: P,
 			) -> std::result::Result<bool, #crate_::ApiError> where Self: Sized {
 				Ok(pred(A::VERSION))
@@ -92,7 +92,7 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 
 			fn api_version<A: #crate_::RuntimeApiInfo + ?Sized>(
 				&self,
-				_: <Block as #crate_::BlockT>::Hash,
+				_: <Block as #crate_::HeaderProvider>::Hash,
 			) -> std::result::Result<Option<u32>, #crate_::ApiError> where Self: Sized {
 				Ok(Some(A::VERSION))
 			}
@@ -114,7 +114,7 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 			fn into_storage_changes(
 				&self,
 				_: &Self::StateBackend,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 			) -> std::result::Result<
 				#crate_::StorageChanges<Self::StateBackend, #block_type>,
 				String
@@ -126,7 +126,7 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 		impl #crate_::Core<#block_type> for #self_ty {
 			fn __runtime_api_internal_call_api_at(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 				_: #crate_::ExecutionContext,
 				_: std::vec::Vec<u8>,
 				_: &dyn Fn(#crate_::RuntimeVersion) -> &'static str,
@@ -136,14 +136,14 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 
 			fn version(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 			) -> std::result::Result<#crate_::RuntimeVersion, #crate_::ApiError> {
 				unimplemented!("`Core::version` not implemented for runtime api mocks")
 			}
 
 			fn version_with_context(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 				_: #crate_::ExecutionContext,
 			) -> std::result::Result<#crate_::RuntimeVersion, #crate_::ApiError> {
 				unimplemented!("`Core::version` not implemented for runtime api mocks")
@@ -151,7 +151,7 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 
 			fn execute_block(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 				_: #block_type,
 			) -> std::result::Result<(), #crate_::ApiError> {
 				unimplemented!("`Core::execute_block` not implemented for runtime api mocks")
@@ -159,7 +159,7 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 
 			fn execute_block_with_context(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 				_: #crate_::ExecutionContext,
 				_: #block_type,
 			) -> std::result::Result<(), #crate_::ApiError> {
@@ -168,17 +168,17 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 
 			fn initialize_block(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
-				_: &<#block_type as #crate_::BlockT>::Header,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
+				_: &<#block_type as #crate_::HeaderProvider>::Header,
 			) -> std::result::Result<(), #crate_::ApiError> {
 				unimplemented!("`Core::initialize_block` not implemented for runtime api mocks")
 			}
 
 			fn initialize_block_with_context(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 				_: #crate_::ExecutionContext,
-				_: &<#block_type as #crate_::BlockT>::Header,
+				_: &<#block_type as #crate_::HeaderProvider>::Header,
 			) -> std::result::Result<(), #crate_::ApiError> {
 				unimplemented!("`Core::initialize_block` not implemented for runtime api mocks")
 			}
@@ -273,7 +273,7 @@ impl<'a> FoldRuntimeApiImpl<'a> {
 		impl_item.items.push(parse_quote! {
 			fn __runtime_api_internal_call_api_at(
 				&self,
-				_: <#block_type as #crate_::BlockT>::Hash,
+				_: <#block_type as #crate_::HeaderProvider>::Hash,
 				_: #crate_::ExecutionContext,
 				_: std::vec::Vec<u8>,
 				_: &dyn Fn(#crate_::RuntimeVersion) -> &'static str,
@@ -319,7 +319,7 @@ impl<'a> Fold for FoldRuntimeApiImpl<'a> {
 				};
 
 			let block_type = &self.block_type;
-			let hash_type = quote!( <#block_type as #crate_::BlockT>::Hash );
+			let hash_type = quote!( <#block_type as #crate_::HeaderProvider>::Hash );
 
 			let (at_param_name, hash_type) = match get_at_param_name(
 				is_advanced,
diff --git a/primitives/api/proc-macro/src/runtime_metadata.rs b/primitives/api/proc-macro/src/runtime_metadata.rs
index 458248cbd3d16..b535287da169c 100644
--- a/primitives/api/proc-macro/src/runtime_metadata.rs
+++ b/primitives/api/proc-macro/src/runtime_metadata.rs
@@ -80,8 +80,9 @@ pub fn generate_decl_runtime_metadata(decl: &ItemTrait) -> TokenStream2 {
 	// also has `TypeInfo + 'static` bounds (required by `scale_info::meta_type`).
 	//
 	// For example, if a runtime API defines a method that has an input:
-	// `fn func(input: <Block as BlockT>::Header)`
-	// then the runtime metadata will imply `<Block as BlockT>::Header: TypeInfo + 'static`.
+	// `fn func(input: <Block as sp_runtime::traits::HeaderProvider>::Header)`
+	// then the runtime metadata will imply `<Block as sp_runtime::traits::HeaderProvider>::Header:
+	// TypeInfo + 'static`.
 	//
 	// This restricts the bounds at the metadata level, without needing to modify the `BlockT`
 	// itself, since the concrete implementations are already satisfying `TypeInfo`.
diff --git a/primitives/api/src/lib.rs b/primitives/api/src/lib.rs
index 1a286a927e6e8..27e74889c569d 100644
--- a/primitives/api/src/lib.rs
+++ b/primitives/api/src/lib.rs
@@ -85,6 +85,7 @@ use sp_core::OpaqueMetadata;
 pub use sp_core::{offchain, ExecutionContext};
 #[doc(hidden)]
 pub use sp_metadata_ir::{self as metadata_ir, frame_metadata as metadata};
+pub use sp_runtime::traits::HeaderProvider;
 #[doc(hidden)]
 #[cfg(feature = "std")]
 pub use sp_runtime::StateVersion;
@@ -287,7 +288,7 @@ pub use sp_api_proc_macro::decl_runtime_apis;
 /// #           unimplemented!()
 /// #       }
 /// #       fn execute_block(_block: Block) {}
-/// #       fn initialize_block(_header: &<Block as BlockT>::Header) {}
+/// #       fn initialize_block(_header: &<Block as sp_runtime::traits::HeaderProvider>::Header) {}
 /// #   }
 ///
 ///     impl self::Balance<Block> for Runtime {
@@ -407,7 +408,7 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 ///
 /// ## Example
 /// ```rust
-/// # use sp_runtime::traits::Block as BlockT;
+/// # use sp_runtime::traits::{Block as BlockT, HeaderProvider};
 /// # use sp_test_primitives::Block;
 /// # use codec;
 /// #
@@ -427,13 +428,13 @@ pub use sp_api_proc_macro::impl_runtime_apis;
 /// sp_api::mock_impl_runtime_apis! {
 ///     impl Balance<Block> for MockApi {
 ///         #[advanced]
-///         fn get_balance(&self, at: <Block as BlockT>::Hash) -> Result<u64, sp_api::ApiError> {
+///         fn get_balance(&self, at: <Block as HeaderProvider>::Hash) -> Result<u64, sp_api::ApiError> {
 ///             println!("Being called at: {}", at);
 ///
 ///             Ok(self.balance.into())
 ///         }
 ///         #[advanced]
-///         fn set_balance(at: <Block as BlockT>::Hash, val: u64) -> Result<(), sp_api::ApiError> {
+///         fn set_balance(at: <Block as HeaderProvider>::Hash, val: u64) -> Result<(), sp_api::ApiError> {
 ///             println!("Being called at: {}", at);
 ///
 ///             Ok(().into())
@@ -535,14 +536,17 @@ pub trait ApiExt<Block: BlockT> {
 		Self: Sized;
 
 	/// Checks if the given api is implemented and versions match.
-	fn has_api<A: RuntimeApiInfo + ?Sized>(&self, at_hash: Block::Hash) -> Result<bool, ApiError>
+	fn has_api<A: RuntimeApiInfo + ?Sized>(
+		&self,
+		at_hash: <Block as HeaderProvider>::Hash,
+	) -> Result<bool, ApiError>
 	where
 		Self: Sized;
 
 	/// Check if the given api is implemented and the version passes a predicate.
 	fn has_api_with<A: RuntimeApiInfo + ?Sized, P: Fn(u32) -> bool>(
 		&self,
-		at_hash: Block::Hash,
+		at_hash: <Block as HeaderProvider>::Hash,
 		pred: P,
 	) -> Result<bool, ApiError>
 	where
@@ -551,7 +555,7 @@ pub trait ApiExt<Block: BlockT> {
 	/// Returns the version of the given api.
 	fn api_version<A: RuntimeApiInfo + ?Sized>(
 		&self,
-		at_hash: Block::Hash,
+		at_hash: <Block as HeaderProvider>::Hash,
 	) -> Result<Option<u32>, ApiError>
 	where
 		Self: Sized;
@@ -576,7 +580,7 @@ pub trait ApiExt<Block: BlockT> {
 	fn into_storage_changes(
 		&self,
 		backend: &Self::StateBackend,
-		parent_hash: Block::Hash,
+		parent_hash: <Block as HeaderProvider>::Hash,
 	) -> Result<StorageChanges<Self::StateBackend, Block>, String>
 	where
 		Self: Sized;
@@ -586,7 +590,7 @@ pub trait ApiExt<Block: BlockT> {
 #[cfg(feature = "std")]
 pub struct CallApiAtParams<'a, Block: BlockT, Backend: StateBackend<HashFor<Block>>> {
 	/// The block id that determines the state that should be setup when calling the function.
-	pub at: Block::Hash,
+	pub at: <Block as HeaderProvider>::Hash,
 	/// The name of the function that should be called.
 	pub function: &'static str,
 	/// The encoded arguments of the function.
@@ -615,10 +619,14 @@ pub trait CallApiAt<Block: BlockT> {
 	) -> Result<Vec<u8>, ApiError>;
 
 	/// Returns the runtime version at the given block.
-	fn runtime_version_at(&self, at_hash: Block::Hash) -> Result<RuntimeVersion, ApiError>;
+	fn runtime_version_at(
+		&self,
+		at_hash: <Block as HeaderProvider>::Hash,
+	) -> Result<RuntimeVersion, ApiError>;
 
 	/// Get the state `at` the given block.
-	fn state_at(&self, at: Block::Hash) -> Result<Self::StateBackend, ApiError>;
+	fn state_at(&self, at: <Block as HeaderProvider>::Hash)
+		-> Result<Self::StateBackend, ApiError>;
 }
 
 /// Auxiliary wrapper that holds an api instance and binds it to the given lifetime.
@@ -723,7 +731,7 @@ decl_runtime_apis! {
 		fn execute_block(block: Block);
 		/// Initialize a block with the given header.
 		#[renamed("initialise_block", 2)]
-		fn initialize_block(header: &<Block as BlockT>::Header);
+		fn initialize_block(header: &<Block as HeaderProvider>::Header);
 	}
 
 	/// The `Metadata` api trait that returns metadata for the runtime.
diff --git a/primitives/api/test/tests/decl_and_impl.rs b/primitives/api/test/tests/decl_and_impl.rs
index 274f80bd1b465..b9422484e479c 100644
--- a/primitives/api/test/tests/decl_and_impl.rs
+++ b/primitives/api/test/tests/decl_and_impl.rs
@@ -18,7 +18,6 @@
 use sp_api::{
 	decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis, ApiError, ApiExt, RuntimeApiInfo,
 };
-use sp_runtime::traits::Block as BlockT;
 
 use substrate_test_runtime_client::runtime::{Block, Hash};
 
@@ -89,7 +88,7 @@ impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
@@ -114,12 +113,12 @@ mock_impl_runtime_apis! {
 		}
 
 		#[advanced]
-		fn same_name(_: <Block as BlockT>::Hash) -> Result<(), ApiError> {
+		fn same_name(_: <Block as sp_runtime::traits::HeaderProvider>::Hash) -> Result<(), ApiError> {
 			Ok(().into())
 		}
 
 		#[advanced]
-		fn wild_card(at: <Block as BlockT>::Hash, _: u32) -> Result<(), ApiError> {
+		fn wild_card(at: <Block as sp_runtime::traits::HeaderProvider>::Hash, _: u32) -> Result<(), ApiError> {
 			if Hash::repeat_byte(0x0f) == at {
 				// yeah
 				Ok(().into())
@@ -145,19 +144,19 @@ type TestClient = substrate_test_runtime_client::client::Client<
 fn test_client_side_function_signature() {
 	let _test: fn(
 		&RuntimeApiImpl<Block, TestClient>,
-		<Block as BlockT>::Hash,
+		<Block as sp_runtime::traits::HeaderProvider>::Hash,
 		u64,
 	) -> Result<(), ApiError> = RuntimeApiImpl::<Block, TestClient>::test;
 	let _something_with_block: fn(
 		&RuntimeApiImpl<Block, TestClient>,
-		<Block as BlockT>::Hash,
+		<Block as sp_runtime::traits::HeaderProvider>::Hash,
 		Block,
 	) -> Result<Block, ApiError> = RuntimeApiImpl::<Block, TestClient>::something_with_block;
 
 	#[allow(deprecated)]
 	let _same_name_before_version_2: fn(
 		&RuntimeApiImpl<Block, TestClient>,
-		<Block as BlockT>::Hash,
+		<Block as sp_runtime::traits::HeaderProvider>::Hash,
 	) -> Result<String, ApiError> = RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
 }
 
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs b/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs
index 32501be7855c6..5d5238d500ba9 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs
@@ -1,4 +1,3 @@
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
@@ -23,7 +22,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
index 2324be85be4f8..307eec0719b04 100644
--- a/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
+++ b/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr
@@ -1,35 +1,35 @@
 error[E0053]: method `test` has an incompatible type for trait
-  --> tests/ui/impl_incorrect_method_signature.rs:16:17
+  --> tests/ui/impl_incorrect_method_signature.rs:15:17
    |
-16 |         fn test(data: String) {}
+15 |         fn test(data: String) {}
    |                       ^^^^^^
    |                       |
    |                       expected `u64`, found `std::string::String`
    |                       help: change the parameter type to match the trait: `u64`
    |
 note: type in trait
-  --> tests/ui/impl_incorrect_method_signature.rs:10:17
+  --> tests/ui/impl_incorrect_method_signature.rs:9:17
    |
-10 |         fn test(data: u64);
+9  |         fn test(data: u64);
    |                       ^^^
    = note: expected signature `fn(u64)`
               found signature `fn(std::string::String)`
 
 error[E0308]: mismatched types
-  --> tests/ui/impl_incorrect_method_signature.rs:16:11
+  --> tests/ui/impl_incorrect_method_signature.rs:15:11
    |
-14 | / sp_api::impl_runtime_apis! {
-15 | |     impl self::Api<Block> for Runtime {
-16 | |         fn test(data: String) {}
+13 | / sp_api::impl_runtime_apis! {
+14 | |     impl self::Api<Block> for Runtime {
+15 | |         fn test(data: String) {}
    | |                 ^^^^ expected `u64`, found `String`
-17 | |     }
+16 | |     }
 ...  |
-29 | |     }
-30 | | }
+28 | |     }
+29 | | }
    | |_- arguments to this function are incorrect
    |
 note: associated function defined here
-  --> tests/ui/impl_incorrect_method_signature.rs:10:6
+  --> tests/ui/impl_incorrect_method_signature.rs:9:6
    |
-10 |         fn test(data: u64);
+9  |         fn test(data: u64);
    |            ^^^^
diff --git a/primitives/api/test/tests/ui/impl_missing_version.rs b/primitives/api/test/tests/ui/impl_missing_version.rs
index 8fd40a400922f..ca5666216eef3 100644
--- a/primitives/api/test/tests/ui/impl_missing_version.rs
+++ b/primitives/api/test/tests/ui/impl_missing_version.rs
@@ -1,4 +1,3 @@
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 struct Runtime {}
@@ -28,7 +27,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/impl_missing_version.stderr b/primitives/api/test/tests/ui/impl_missing_version.stderr
index 770543aa8875d..4ca0997392ba5 100644
--- a/primitives/api/test/tests/ui/impl_missing_version.stderr
+++ b/primitives/api/test/tests/ui/impl_missing_version.stderr
@@ -1,8 +1,8 @@
 error[E0405]: cannot find trait `ApiV4` in module `self::runtime_decl_for_api`
-  --> tests/ui/impl_missing_version.rs:18:13
+  --> tests/ui/impl_missing_version.rs:17:13
    |
-8  |     pub trait Api {
+7  |     pub trait Api {
    |     ------------- similarly named trait `ApiV2` defined here
 ...
-18 |     impl self::Api<Block> for Runtime {
+17 |     impl self::Api<Block> for Runtime {
    |                ^^^ help: a trait with a similar name exists: `ApiV2`
diff --git a/primitives/api/test/tests/ui/missing_versioned_method.rs b/primitives/api/test/tests/ui/missing_versioned_method.rs
index 919cef055fe62..790ed3832ae49 100644
--- a/primitives/api/test/tests/ui/missing_versioned_method.rs
+++ b/primitives/api/test/tests/ui/missing_versioned_method.rs
@@ -1,4 +1,3 @@
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 struct Runtime {}
@@ -27,7 +26,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/missing_versioned_method.stderr b/primitives/api/test/tests/ui/missing_versioned_method.stderr
index b88d903212df1..25255a67fbd4b 100644
--- a/primitives/api/test/tests/ui/missing_versioned_method.stderr
+++ b/primitives/api/test/tests/ui/missing_versioned_method.stderr
@@ -1,8 +1,8 @@
 error[E0046]: not all trait items implemented, missing: `test3`
-  --> tests/ui/missing_versioned_method.rs:18:2
+  --> tests/ui/missing_versioned_method.rs:17:2
    |
-12 |         fn test3();
+11 |         fn test3();
    |         ----------- `test3` from trait
 ...
-18 |     impl self::Api<Block> for Runtime {
+17 |     impl self::Api<Block> for Runtime {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `test3` in implementation
diff --git a/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs b/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs
index 036bba417f57d..446d6c18cdb1d 100644
--- a/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs
+++ b/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.rs
@@ -1,4 +1,3 @@
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 struct Runtime {}
@@ -30,7 +29,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr b/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr
index 4afa6856a5814..7c3785f48c2ce 100644
--- a/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr
+++ b/primitives/api/test/tests/ui/missing_versioned_method_multiple_vers.stderr
@@ -1,8 +1,8 @@
 error[E0046]: not all trait items implemented, missing: `test3`
-  --> tests/ui/missing_versioned_method_multiple_vers.rs:20:2
+  --> tests/ui/missing_versioned_method_multiple_vers.rs:19:2
    |
-12 |         fn test3();
+11 |         fn test3();
    |         ----------- `test3` from trait
 ...
-20 |     impl self::Api<Block> for Runtime {
+19 |     impl self::Api<Block> for Runtime {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `test3` in implementation
diff --git a/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs b/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs
index b572a3bc30d5d..e47f52fde0422 100644
--- a/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs
+++ b/primitives/api/test/tests/ui/positive_cases/custom_where_bound.rs
@@ -1,6 +1,5 @@
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 struct Runtime {}
@@ -34,7 +33,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/positive_cases/default_impls.rs b/primitives/api/test/tests/ui/positive_cases/default_impls.rs
index 58192feb9ecac..258448de330e7 100644
--- a/primitives/api/test/tests/ui/positive_cases/default_impls.rs
+++ b/primitives/api/test/tests/ui/positive_cases/default_impls.rs
@@ -1,4 +1,3 @@
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 struct Runtime {}
@@ -29,7 +28,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs
index 14a8fa4d4e0b1..e5bacc10b0ff7 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs
@@ -1,4 +1,3 @@
-use sp_runtime::traits::Block as BlockT;
 use substrate_test_runtime_client::runtime::Block;
 
 /// The declaration of the `Runtime` type is done by the `construct_runtime!` macro in a real
@@ -25,7 +24,7 @@ sp_api::impl_runtime_apis! {
 		fn execute_block(_: Block) {
 			unimplemented!()
 		}
-		fn initialize_block(_: &<Block as BlockT>::Header) {
+		fn initialize_block(_: &<Block as sp_runtime::traits::HeaderProvider>::Header) {
 			unimplemented!()
 		}
 	}
diff --git a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
index e9d550f3a3bcf..c224002dea1cb 100644
--- a/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
+++ b/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr
@@ -1,39 +1,39 @@
 error[E0053]: method `test` has an incompatible type for trait
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:16:17
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:15:17
    |
-16 |         fn test(data: &u64) {
+15 |         fn test(data: &u64) {
    |                       ^^^^
    |                       |
    |                       expected `u64`, found `&u64`
    |                       help: change the parameter type to match the trait: `u64`
    |
 note: type in trait
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:10:17
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:9:17
    |
-10 |         fn test(data: u64);
+9  |         fn test(data: u64);
    |                       ^^^
    = note: expected signature `fn(u64)`
               found signature `fn(&u64)`
 
 error[E0308]: mismatched types
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:16:11
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:15:11
    |
-14 | / sp_api::impl_runtime_apis! {
-15 | |     impl self::Api<Block> for Runtime {
-16 | |         fn test(data: &u64) {
+13 | / sp_api::impl_runtime_apis! {
+14 | |     impl self::Api<Block> for Runtime {
+15 | |         fn test(data: &u64) {
    | |                 ^^^^^^^ expected `u64`, found `&u64`
-17 | |             unimplemented!()
+16 | |             unimplemented!()
 ...  |
-31 | |     }
-32 | | }
+30 | |     }
+31 | | }
    | |_- arguments to this function are incorrect
    |
 note: associated function defined here
-  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:10:6
+  --> tests/ui/type_reference_in_impl_runtime_apis_call.rs:9:6
    |
-10 |         fn test(data: u64);
+9  |         fn test(data: u64);
    |            ^^^^
 help: consider removing the borrow
    |
-16 |         fn test(data: &u64) {
+15 |         fn test(data: &u64) {
    |
diff --git a/primitives/block-builder/src/lib.rs b/primitives/block-builder/src/lib.rs
index 29e04857f463e..81c790cbbacdb 100644
--- a/primitives/block-builder/src/lib.rs
+++ b/primitives/block-builder/src/lib.rs
@@ -20,7 +20,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_inherents::{CheckInherentsResult, InherentData};
-use sp_runtime::{traits::Block as BlockT, ApplyExtrinsicResult};
+use sp_runtime::{
+	traits::{Block as BlockT, HeaderProvider},
+	ApplyExtrinsicResult,
+};
 
 sp_api::decl_runtime_apis! {
 	/// The `BlockBuilder` api trait that provides the required functionality for building a block.
@@ -39,7 +42,7 @@ sp_api::decl_runtime_apis! {
 
 		/// Finish the current block.
 		#[renamed("finalise_block", 3)]
-		fn finalize_block() -> <Block as BlockT>::Header;
+		fn finalize_block() -> <Block as HeaderProvider>::Header;
 
 		/// Generate inherent extrinsics. The inherent data will vary from chain to chain.
 		fn inherent_extrinsics(
diff --git a/primitives/blockchain/src/backend.rs b/primitives/blockchain/src/backend.rs
index e9278be1d5d3c..748802f7d35fc 100644
--- a/primitives/blockchain/src/backend.rs
+++ b/primitives/blockchain/src/backend.rs
@@ -42,7 +42,7 @@ pub trait HeaderBackend<Block: BlockT>: Send + Sync {
 	fn number(
 		&self,
 		hash: Block::Hash,
-	) -> Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>>;
+	) -> Result<Option<<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number>>;
 	/// Get block hash by number. Returns `None` if the header is not in the chain.
 	fn hash(&self, number: NumberFor<Block>) -> Result<Option<Block::Hash>>;
 
@@ -265,15 +265,19 @@ pub struct Info<Block: BlockT> {
 	/// Best block hash.
 	pub best_hash: Block::Hash,
 	/// Best block number.
-	pub best_number: <<Block as BlockT>::Header as HeaderT>::Number,
+	pub best_number: <<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	/// Genesis block hash.
 	pub genesis_hash: Block::Hash,
 	/// The head of the finalized chain.
 	pub finalized_hash: Block::Hash,
 	/// Last finalized block number.
-	pub finalized_number: <<Block as BlockT>::Header as HeaderT>::Number,
+	pub finalized_number:
+		<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	/// Last finalized state.
-	pub finalized_state: Option<(Block::Hash, <<Block as BlockT>::Header as HeaderT>::Number)>,
+	pub finalized_state: Option<(
+		Block::Hash,
+		<<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
+	)>,
 	/// Number of concurrent leave forks.
 	pub number_leaves: usize,
 	/// Missing blocks after warp sync. (start, end).
diff --git a/primitives/consensus/common/src/block_validation.rs b/primitives/consensus/common/src/block_validation.rs
index 91e5330bbb06a..76090cbf97965 100644
--- a/primitives/consensus/common/src/block_validation.rs
+++ b/primitives/consensus/common/src/block_validation.rs
@@ -19,17 +19,23 @@
 
 use crate::BlockStatus;
 use futures::FutureExt as _;
-use sp_runtime::traits::Block;
+use sp_runtime::traits::{Block, HeaderProvider};
 use std::{error::Error, future::Future, pin::Pin, sync::Arc};
 
 /// A type which provides access to chain information.
 pub trait Chain<B: Block> {
-	/// Retrieve the status of the block denoted by the given [`Block::Hash`].
-	fn block_status(&self, hash: B::Hash) -> Result<BlockStatus, Box<dyn Error + Send>>;
+	/// Retrieve the status of the block denoted by the given [`HeaderProvider::Hash`].
+	fn block_status(
+		&self,
+		hash: <B as HeaderProvider>::Hash,
+	) -> Result<BlockStatus, Box<dyn Error + Send>>;
 }
 
 impl<T: Chain<B>, B: Block> Chain<B> for Arc<T> {
-	fn block_status(&self, hash: B::Hash) -> Result<BlockStatus, Box<dyn Error + Send>> {
+	fn block_status(
+		&self,
+		hash: <B as HeaderProvider>::Hash,
+	) -> Result<BlockStatus, Box<dyn Error + Send>> {
 		(&**self).block_status(hash)
 	}
 }
diff --git a/primitives/consensus/common/src/select_chain.rs b/primitives/consensus/common/src/select_chain.rs
index d387cc1ade097..7e56572cff165 100644
--- a/primitives/consensus/common/src/select_chain.rs
+++ b/primitives/consensus/common/src/select_chain.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::error::Error;
-use sp_runtime::traits::{Block as BlockT, NumberFor};
+use sp_runtime::traits::{Block as BlockT, HeaderProvider, NumberFor};
 
 /// The SelectChain trait defines the strategy upon which the head is chosen
 /// if multiple forks are present for an opaque definition of "best" in the
@@ -36,21 +36,21 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 pub trait SelectChain<Block: BlockT>: Sync + Send + Clone {
 	/// Get all leaves of the chain, i.e. block hashes that have no children currently.
 	/// Leaves that can never be finalized will not be returned.
-	async fn leaves(&self) -> Result<Vec<<Block as BlockT>::Hash>, Error>;
+	async fn leaves(&self) -> Result<Vec<<Block as HeaderProvider>::Hash>, Error>;
 
 	/// Among those `leaves` deterministically pick one chain as the generally
 	/// best chain to author new blocks upon and probably (but not necessarily)
 	/// finalize.
-	async fn best_chain(&self) -> Result<<Block as BlockT>::Header, Error>;
+	async fn best_chain(&self) -> Result<<Block as HeaderProvider>::Header, Error>;
 
 	/// Get the best descendent of `base_hash` that we should attempt to
 	/// finalize next, if any. It is valid to return the given `base_hash`
 	/// itself if no better descendent exists.
 	async fn finality_target(
 		&self,
-		base_hash: <Block as BlockT>::Hash,
+		base_hash: <Block as HeaderProvider>::Hash,
 		_maybe_max_number: Option<NumberFor<Block>>,
-	) -> Result<<Block as BlockT>::Hash, Error> {
+	) -> Result<<Block as HeaderProvider>::Hash, Error> {
 		Ok(base_hash)
 	}
 }
diff --git a/primitives/runtime/src/generic/block.rs b/primitives/runtime/src/generic/block.rs
index 6261e412eb8ad..3578ee5512119 100644
--- a/primitives/runtime/src/generic/block.rs
+++ b/primitives/runtime/src/generic/block.rs
@@ -20,6 +20,7 @@
 #[cfg(feature = "std")]
 use std::fmt;
 
+use scale_info::TypeInfo;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
@@ -79,21 +80,27 @@ impl<Block: BlockT> fmt::Display for BlockId<Block> {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
 #[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
-pub struct Block<Header, Extrinsic: MaybeSerialize> {
+pub struct Block<Header, Extrinsic> {
 	/// The block header.
 	pub header: Header,
 	/// The accompanying extrinsics.
 	pub extrinsics: Vec<Extrinsic>,
 }
 
-impl<Header, Extrinsic: MaybeSerialize> traits::Block for Block<Header, Extrinsic>
+impl<Header, Extrinsic> traits::HeaderProvider for Block<Header, Extrinsic>
 where
 	Header: HeaderT,
-	Extrinsic: Member + Codec + traits::Extrinsic,
 {
-	type Extrinsic = Extrinsic;
 	type Header = Header;
 	type Hash = <Self::Header as traits::Header>::Hash;
+}
+
+impl<Header, Extrinsic: MaybeSerialize> traits::Block for Block<Header, Extrinsic>
+where
+	Header: HeaderT,
+	Extrinsic: TypeInfo + Member + Codec + traits::Extrinsic,
+{
+	type Extrinsic = Extrinsic;
 
 	fn header(&self) -> &Self::Header {
 		&self.header
diff --git a/primitives/runtime/src/generic/header.rs b/primitives/runtime/src/generic/header.rs
index 6fdf43ac08105..48b7a64e4b237 100644
--- a/primitives/runtime/src/generic/header.rs
+++ b/primitives/runtime/src/generic/header.rs
@@ -18,7 +18,7 @@
 //! Generic implementation of a block header.
 
 use crate::{
-	codec::{Codec, Decode, Encode},
+	codec::{Codec, Decode, Encode, EncodeLike, MaxEncodedLen},
 	generic::Digest,
 	scale_info::TypeInfo,
 	traits::{
@@ -87,8 +87,12 @@ where
 		+ Codec
 		+ Copy
 		+ Into<U256>
-		+ TryFrom<U256>,
-	Hash: HashT,
+		+ TryFrom<U256>
+		+ TypeInfo
+		+ Default
+		+ EncodeLike
+		+ MaxEncodedLen,
+	Hash: HashT + TypeInfo,
 {
 	type Number = Number;
 	type Hash = <Hash as HashT>::Output;
diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs
index 6d02e23094f90..307e2cac5e8ad 100644
--- a/primitives/runtime/src/testing.rs
+++ b/primitives/runtime/src/testing.rs
@@ -199,7 +199,7 @@ impl Header {
 }
 
 /// An opaque extrinsic wrapper type.
-#[derive(PartialEq, Eq, Clone, Debug, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, Debug, Encode, Decode, TypeInfo)]
 pub struct ExtrinsicWrapper<Xt>(Xt);
 
 impl<Xt> traits::Extrinsic for ExtrinsicWrapper<Xt> {
@@ -235,7 +235,7 @@ impl<Xt> Deref for ExtrinsicWrapper<Xt> {
 }
 
 /// Testing block
-#[derive(PartialEq, Eq, Clone, Serialize, Debug, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, Serialize, Debug, Encode, Decode, TypeInfo)]
 pub struct Block<Xt> {
 	/// Block header
 	pub header: Header,
@@ -244,12 +244,38 @@ pub struct Block<Xt> {
 }
 
 impl<
-		Xt: 'static + Codec + Sized + Send + Sync + Serialize + Clone + Eq + Debug + traits::Extrinsic,
-	> traits::Block for Block<Xt>
+		Xt: 'static
+			+ Codec
+			+ Sized
+			+ Send
+			+ Sync
+			+ Serialize
+			+ Clone
+			+ Eq
+			+ Debug
+			+ traits::Extrinsic
+			+ TypeInfo,
+	> traits::HeaderProvider for Block<Xt>
 {
-	type Extrinsic = Xt;
 	type Header = Header;
 	type Hash = <Header as traits::Header>::Hash;
+}
+
+impl<
+		Xt: 'static
+			+ Codec
+			+ Sized
+			+ Send
+			+ Sync
+			+ Serialize
+			+ Clone
+			+ Eq
+			+ Debug
+			+ traits::Extrinsic
+			+ TypeInfo,
+	> traits::Block for Block<Xt>
+{
+	type Extrinsic = Xt;
 
 	fn header(&self) -> &Self::Header {
 		&self.header
diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs
index 9c09bad21d9bc..9f66fdb60d859 100644
--- a/primitives/runtime/src/traits.rs
+++ b/primitives/runtime/src/traits.rs
@@ -1154,7 +1154,9 @@ pub trait IsMember<MemberId> {
 /// `parent_hash`, as well as a `digest` and a block `number`.
 ///
 /// You can also create a `new` one from those fields.
-pub trait Header: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + 'static {
+pub trait Header:
+	Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + TypeInfo + 'static
+{
 	/// Header number.
 	type Number: Member
 		+ MaybeSerializeDeserialize
@@ -1164,7 +1166,11 @@ pub trait Header: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + 's
 		+ Copy
 		+ MaybeDisplay
 		+ AtLeast32BitUnsigned
-		+ Codec;
+		+ Codec
+		+ TypeInfo
+		+ Default
+		+ EncodeLike
+		+ MaxEncodedLen;
 	/// Header hash type
 	type Hash: HashOutput;
 	/// Hashing algorithm
@@ -1210,18 +1216,23 @@ pub trait Header: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + 's
 	}
 }
 
+/// Something that provides the Header Type.
+pub trait HeaderProvider {
+	/// Header type.
+	type Header: Header<Hash = Self::Hash>;
+	/// Header hash type.
+	type Hash: HashOutput;
+}
+
 /// Something which fulfills the abstract idea of a Substrate block. It has types for
 /// `Extrinsic` pieces of information as well as a `Header`.
 ///
 /// You can get an iterator over each of the `extrinsics` and retrieve the `header`.
-pub trait Block: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + 'static {
+pub trait Block:
+	HeaderProvider + Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + TypeInfo + 'static
+{
 	/// Type for extrinsics.
 	type Extrinsic: Member + Codec + Extrinsic + MaybeSerialize;
-	/// Header type.
-	type Header: Header<Hash = Self::Hash>;
-	/// Block hash type.
-	type Hash: HashOutput;
-
 	/// Returns a reference to the header.
 	fn header(&self) -> &Self::Header;
 	/// Returns a reference to the list of extrinsics.
@@ -1231,8 +1242,8 @@ pub trait Block: Clone + Send + Sync + Codec + Eq + MaybeSerialize + Debug + 'st
 	/// Creates new block from header and extrinsics.
 	fn new(header: Self::Header, extrinsics: Vec<Self::Extrinsic>) -> Self;
 	/// Returns the hash of the block.
-	fn hash(&self) -> Self::Hash {
-		<<Self::Header as Header>::Hashing as Hash>::hash_of(self.header())
+	fn hash(&self) -> <Self as HeaderProvider>::Hash {
+		<<<Self as HeaderProvider>::Header as Header>::Hashing as Hash>::hash_of(self.header())
 	}
 	/// Creates an encoded block from the given `header` and `extrinsics` without requiring the
 	/// creation of an instance.
@@ -1280,9 +1291,9 @@ pub trait ExtrinsicMetadata {
 }
 
 /// Extract the hashing type for a block.
-pub type HashFor<B> = <<B as Block>::Header as Header>::Hashing;
+pub type HashFor<B> = <<B as HeaderProvider>::Header as Header>::Hashing;
 /// Extract the number type for a block.
-pub type NumberFor<B> = <<B as Block>::Header as Header>::Number;
+pub type NumberFor<B> = <<B as HeaderProvider>::Header as Header>::Number;
 /// Extract the digest type for a block.
 
 /// A "checkable" piece of information, used by the standard Substrate Executive in order to
diff --git a/primitives/version/src/lib.rs b/primitives/version/src/lib.rs
index bd8408bb4a48a..c0edf76ac1ef0 100644
--- a/primitives/version/src/lib.rs
+++ b/primitives/version/src/lib.rs
@@ -48,7 +48,7 @@ pub use sp_runtime::{create_runtime_str, StateVersion};
 pub use sp_std;
 
 #[cfg(feature = "std")]
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::{Block as BlockT, HeaderProvider};
 
 #[cfg(feature = "std")]
 pub mod embed;
@@ -370,14 +370,20 @@ pub trait GetNativeVersion {
 #[cfg(feature = "std")]
 pub trait GetRuntimeVersionAt<Block: BlockT> {
 	/// Returns the version of runtime at the given block.
-	fn runtime_version(&self, at: <Block as BlockT>::Hash) -> Result<RuntimeVersion, String>;
+	fn runtime_version(
+		&self,
+		at: <Block as HeaderProvider>::Hash,
+	) -> Result<RuntimeVersion, String>;
 }
 
 #[cfg(feature = "std")]
 impl<T: GetRuntimeVersionAt<Block>, Block: BlockT> GetRuntimeVersionAt<Block>
 	for std::sync::Arc<T>
 {
-	fn runtime_version(&self, at: <Block as BlockT>::Hash) -> Result<RuntimeVersion, String> {
+	fn runtime_version(
+		&self,
+		at: <Block as HeaderProvider>::Hash,
+	) -> Result<RuntimeVersion, String> {
 		(&**self).runtime_version(at)
 	}
 }
diff --git a/test-utils/client/src/client_ext.rs b/test-utils/client/src/client_ext.rs
index a258faa5e03e3..3679e7b943c4b 100644
--- a/test-utils/client/src/client_ext.rs
+++ b/test-utils/client/src/client_ext.rs
@@ -21,7 +21,10 @@ use sc_client_api::{backend::Finalizer, client::BlockBackend};
 use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
 use sc_service::client::Client;
 use sp_consensus::{BlockOrigin, Error as ConsensusError};
-use sp_runtime::{traits::Block as BlockT, Justification, Justifications};
+use sp_runtime::{
+	traits::{Block as BlockT, HeaderProvider},
+	Justification, Justifications,
+};
 
 /// Extension trait for a test client.
 pub trait ClientExt<Block: BlockT>: Sized {
@@ -33,7 +36,7 @@ pub trait ClientExt<Block: BlockT>: Sized {
 	) -> sp_blockchain::Result<()>;
 
 	/// Returns hash of the genesis block.
-	fn genesis_hash(&self) -> <Block as BlockT>::Hash;
+	fn genesis_hash(&self) -> <Block as HeaderProvider>::Hash;
 }
 
 /// Extension trait for a test client around block importing.
@@ -80,7 +83,7 @@ where
 		Finalizer::finalize_block(self, hash, justification, true)
 	}
 
-	fn genesis_hash(&self) -> <Block as BlockT>::Hash {
+	fn genesis_hash(&self) -> <Block as HeaderProvider>::Hash {
 		self.block_hash(0u32.into()).unwrap().unwrap()
 	}
 }
diff --git a/test-utils/runtime/src/genesismap.rs b/test-utils/runtime/src/genesismap.rs
index f1289ce41a583..728f33e639fab 100644
--- a/test-utils/runtime/src/genesismap.rs
+++ b/test-utils/runtime/src/genesismap.rs
@@ -29,7 +29,7 @@ use sp_core::{
 };
 use sp_keyring::{AccountKeyring, Sr25519Keyring};
 use sp_runtime::{
-	traits::{Block as BlockT, Hash as HashT, Header as HeaderT},
+	traits::{Hash as HashT, Header as HeaderT},
 	BuildStorage,
 };
 
@@ -153,7 +153,7 @@ impl GenesisStorageBuilder {
 pub fn insert_genesis_block(storage: &mut Storage) -> sp_core::hash::H256 {
 	let child_roots = storage.children_default.iter().map(|(sk, child_content)| {
 		let state_root =
-			<<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+			<<<crate::Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Hashing as HashT>::trie_root(
 				child_content.data.clone().into_iter().collect(),
 				sp_runtime::StateVersion::V1,
 			);
@@ -161,7 +161,7 @@ pub fn insert_genesis_block(storage: &mut Storage) -> sp_core::hash::H256 {
 	});
 	// add child roots to storage
 	storage.top.extend(child_roots);
-	let state_root = <<<crate::Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+	let state_root = <<<crate::Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Hashing as HashT>::trie_root(
 		storage.top.clone().into_iter().collect(),
 		sp_runtime::StateVersion::V1,
 	);
diff --git a/test-utils/runtime/src/lib.rs b/test-utils/runtime/src/lib.rs
index 8d77439f16455..23230021c3457 100644
--- a/test-utils/runtime/src/lib.rs
+++ b/test-utils/runtime/src/lib.rs
@@ -56,7 +56,7 @@ pub use sp_core::hash::H256;
 use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_runtime::{
 	create_runtime_str, impl_opaque_keys,
-	traits::{BlakeTwo256, Block as BlockT, DispatchInfoOf, NumberFor, Verify},
+	traits::{BlakeTwo256, Block as BlockT, DispatchInfoOf, HeaderProvider, NumberFor, Verify},
 	transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
 	ApplyExtrinsicResult, Perbill,
 };
@@ -291,10 +291,7 @@ impl sp_runtime::traits::SignedExtension for CheckSubstrateCall {
 }
 
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = Extrinsic
+	pub enum Runtime
 	{
 		System: frame_system,
 		Babe: pallet_babe,
@@ -347,12 +344,11 @@ impl frame_system::pallet::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = Index;
-	type BlockNumber = BlockNumber;
 	type Hash = H256;
 	type Hashing = Hashing;
 	type AccountId = AccountId;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<2400>;
 	type DbWeight = ();
@@ -478,7 +474,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as HeaderProvider>::Header) {
 			log::trace!(target: LOG_TARGET, "initialize_block: {header:#?}");
 			Executive::initialize_block(header);
 		}
@@ -501,7 +497,7 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			utx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
+			block_hash: <Block as HeaderProvider>::Hash,
 		) -> TransactionValidity {
 			let validity = Executive::validate_transaction(source, utx.clone(), block_hash);
 			log::trace!(target: LOG_TARGET, "validate_transaction {:?} {:?}", utx, validity);
@@ -514,7 +510,7 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalize_block() -> <Block as BlockT>::Header {
+		fn finalize_block() -> <Block as HeaderProvider>::Header {
 			log::trace!(target: LOG_TARGET, "finalize_block");
 			Executive::finalize_block()
 		}
@@ -645,7 +641,7 @@ impl_runtime_apis! {
 
 		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: sp_consensus_babe::EquivocationProof<
-			<Block as BlockT>::Header,
+			<Block as HeaderProvider>::Header,
 			>,
 			_key_owner_proof: sp_consensus_babe::OpaqueKeyOwnershipProof,
 		) -> Option<()> {
@@ -661,7 +657,7 @@ impl_runtime_apis! {
 	}
 
 	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
+		fn offchain_worker(header: &<Block as HeaderProvider>::Header) {
 			let ext = Extrinsic::new_unsigned(
 				substrate_test_pallet::pallet::Call::storage_change{
 					key:b"some_key".encode(),
@@ -695,7 +691,7 @@ impl_runtime_apis! {
 
 		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: sp_consensus_grandpa::EquivocationProof<
-			<Block as BlockT>::Hash,
+			<Block as HeaderProvider>::Hash,
 			NumberFor<Block>,
 			>,
 			_key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof,
diff --git a/test-utils/runtime/transaction-pool/src/lib.rs b/test-utils/runtime/transaction-pool/src/lib.rs
index 8e28449661650..7972a7b58b5ac 100644
--- a/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/test-utils/runtime/transaction-pool/src/lib.rs
@@ -316,7 +316,7 @@ impl sc_transaction_pool::ChainApi for TestApi {
 	fn block_id_to_hash(
 		&self,
 		at: &BlockId<Self::Block>,
-	) -> Result<Option<<Self::Block as BlockT>::Hash>, Error> {
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Hash>, Error> {
 		Ok(match at {
 			generic::BlockId::Hash(x) => Some(*x),
 			generic::BlockId::Number(num) =>
@@ -330,7 +330,10 @@ impl sc_transaction_pool::ChainApi for TestApi {
 		Self::hash_and_length_inner(ex)
 	}
 
-	fn block_body(&self, hash: <Self::Block as BlockT>::Hash) -> Self::BodyFuture {
+	fn block_body(
+		&self,
+		hash: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Self::BodyFuture {
 		futures::future::ready(Ok(self
 			.chain
 			.read()
@@ -341,15 +344,15 @@ impl sc_transaction_pool::ChainApi for TestApi {
 
 	fn block_header(
 		&self,
-		hash: <Self::Block as BlockT>::Hash,
-	) -> Result<Option<<Self::Block as BlockT>::Header>, Self::Error> {
+		hash: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+	) -> Result<Option<<Self::Block as sp_runtime::traits::HeaderProvider>::Header>, Self::Error> {
 		Ok(self.chain.read().block_by_hash.get(&hash).map(|b| b.header().clone()))
 	}
 
 	fn tree_route(
 		&self,
-		from: <Self::Block as BlockT>::Hash,
-		to: <Self::Block as BlockT>::Hash,
+		from: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
+		to: <Self::Block as sp_runtime::traits::HeaderProvider>::Hash,
 	) -> Result<TreeRoute<Self::Block>, Self::Error> {
 		sp_blockchain::tree_route::<Block, TestApi>(self, from, to).map_err(Into::into)
 	}
diff --git a/utils/frame/benchmarking-cli/src/pallet/command.rs b/utils/frame/benchmarking-cli/src/pallet/command.rs
index 702ec27561dcc..bf6b379f2d84a 100644
--- a/utils/frame/benchmarking-cli/src/pallet/command.rs
+++ b/utils/frame/benchmarking-cli/src/pallet/command.rs
@@ -146,7 +146,7 @@ impl PalletCmd {
 	pub fn run<BB, ExecDispatch>(&self, config: Configuration) -> Result<()>
 	where
 		BB: BlockT + Debug,
-		<<<BB as BlockT>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
+		<<<BB as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
 		ExecDispatch: NativeExecutionDispatch + 'static,
 	{
 		if let Some(output_path) = &self.output {
diff --git a/utils/frame/benchmarking-cli/src/storage/read.rs b/utils/frame/benchmarking-cli/src/storage/read.rs
index fe72364269d50..1f9b0c44cb6c2 100644
--- a/utils/frame/benchmarking-cli/src/storage/read.rs
+++ b/utils/frame/benchmarking-cli/src/storage/read.rs
@@ -34,7 +34,7 @@ impl StorageCmd {
 		C: UsageProvider<B> + StorageProvider<B, BA>,
 		B: BlockT + Debug,
 		BA: ClientBackend<B>,
-		<<B as BlockT>::Header as HeaderT>::Number: From<u32>,
+		<<B as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number: From<u32>,
 	{
 		let mut record = BenchRecord::default();
 		let best_hash = client.usage_info().chain.best_hash;
diff --git a/utils/frame/rpc/client/src/lib.rs b/utils/frame/rpc/client/src/lib.rs
index a6a667bef5681..ebc903559e19c 100644
--- a/utils/frame/rpc/client/src/lib.rs
+++ b/utils/frame/rpc/client/src/lib.rs
@@ -145,7 +145,7 @@ pub struct FinalizedHeaders<
 impl<'a, Block: BlockT, HP: HeaderProvider<Block>, HS: HeaderSubscription<Block>>
 	FinalizedHeaders<'a, Block, HP, HS>
 where
-	<Block as BlockT>::Header: DeserializeOwned,
+	<Block as sp_runtime::traits::HeaderProvider>::Header: DeserializeOwned,
 {
 	pub fn new(header_provider: &'a HP, subscription: HS) -> Self {
 		Self {
diff --git a/utils/frame/rpc/state-trie-migration-rpc/src/lib.rs b/utils/frame/rpc/state-trie-migration-rpc/src/lib.rs
index d1175fdea907a..722bfe04a9e99 100644
--- a/utils/frame/rpc/state-trie-migration-rpc/src/lib.rs
+++ b/utils/frame/rpc/state-trie-migration-rpc/src/lib.rs
@@ -153,13 +153,17 @@ impl<C, B, BA> StateMigration<C, B, BA> {
 	}
 }
 
-impl<C, B, BA> StateMigrationApiServer<<B as BlockT>::Hash> for StateMigration<C, B, BA>
+impl<C, B, BA> StateMigrationApiServer<<B as sp_runtime::traits::HeaderProvider>::Hash>
+	for StateMigration<C, B, BA>
 where
 	B: BlockT,
 	C: Send + Sync + 'static + sc_client_api::HeaderBackend<B>,
 	BA: 'static + sc_client_api::backend::Backend<B>,
 {
-	fn call(&self, at: Option<<B as BlockT>::Hash>) -> RpcResult<MigrationStatusResult> {
+	fn call(
+		&self,
+		at: Option<<B as sp_runtime::traits::HeaderProvider>::Hash>,
+	) -> RpcResult<MigrationStatusResult> {
 		self.deny_unsafe.check_if_safe()?;
 
 		let hash = at.unwrap_or_else(|| self.client.info().best_hash);
diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs
index 431bcdab03288..c816bb739a388 100644
--- a/utils/frame/rpc/support/src/lib.rs
+++ b/utils/frame/rpc/support/src/lib.rs
@@ -40,10 +40,7 @@ use sp_storage::{StorageData, StorageKey};
 /// # use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
 /// #
 /// # construct_runtime!(
-/// # 	pub enum TestRuntime where
-/// # 		Block = frame_system::mocking::MockBlock<TestRuntime>,
-/// # 		NodeBlock = frame_system::mocking::MockBlock<TestRuntime>,
-/// # 		UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<TestRuntime>,
+/// # 	pub enum TestRuntime
 /// # 	{
 /// # 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 /// # 		Test: pallet_test::{Pallet, Storage},
@@ -59,12 +56,11 @@ use sp_storage::{StorageData, StorageKey};
 /// # 	type RuntimeOrigin = RuntimeOrigin;
 /// # 	type RuntimeCall = RuntimeCall;
 /// # 	type Index = u64;
-/// # 	type BlockNumber = u64;
 /// # 	type Hash = Hash;
 /// # 	type Hashing = BlakeTwo256;
 /// # 	type AccountId = u64;
 /// # 	type Lookup = IdentityLookup<Self::AccountId>;
-/// # 	type Header = Header;
+/// # 	type Block = frame_system::mocking::MockBlock<TestRuntime>;
 /// # 	type RuntimeEvent = RuntimeEvent;
 /// # 	type BlockHashCount = ();
 /// # 	type DbWeight = ();
diff --git a/utils/frame/rpc/system/src/lib.rs b/utils/frame/rpc/system/src/lib.rs
index 26efa02970efe..745227d16337f 100644
--- a/utils/frame/rpc/system/src/lib.rs
+++ b/utils/frame/rpc/system/src/lib.rs
@@ -86,7 +86,7 @@ impl<P: TransactionPool, C, B> System<P, C, B> {
 
 #[async_trait]
 impl<P, C, Block, AccountId, Index>
-	SystemApiServer<<Block as traits::Block>::Hash, AccountId, Index> for System<P, C, Block>
+	SystemApiServer<<Block as traits::HeaderProvider>::Hash, AccountId, Index> for System<P, C, Block>
 where
 	C: sp_api::ProvideRuntimeApi<Block>,
 	C: HeaderBackend<Block>,
@@ -115,7 +115,7 @@ where
 	async fn dry_run(
 		&self,
 		extrinsic: Bytes,
-		at: Option<<Block as traits::Block>::Hash>,
+		at: Option<<Block as traits::HeaderProvider>::Hash>,
 	) -> RpcResult<Bytes> {
 		self.deny_unsafe.check_if_safe()?;
 		let api = self.client.runtime_api();
diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
index fb4a644e2004c..3d21d5be7a7cd 100644
--- a/utils/frame/try-runtime/cli/src/lib.rs
+++ b/utils/frame/try-runtime/cli/src/lib.rs
@@ -798,7 +798,7 @@ where
 	<Block::Hash as FromStr>::Err: Debug,
 {
 	hash_str
-		.parse::<<Block as BlockT>::Hash>()
+		.parse::<<Block as sp_runtime::traits::HeaderProvider>::Hash>()
 		.map_err(|e| format!("Could not parse block hash: {:?}", e).into())
 }