diff --git a/consensus/types/src/attestation/indexed_payload_attestation.rs b/consensus/types/src/attestation/indexed_payload_attestation.rs
index ddc2d00185..82a47651d0 100644
--- a/consensus/types/src/attestation/indexed_payload_attestation.rs
+++ b/consensus/types/src/attestation/indexed_payload_attestation.rs
@@ -1,8 +1,10 @@
 use crate::test_utils::TestRandom;
-use crate::*;
+use crate::{EthSpec, ForkName, PayloadAttestationData, context_deserialize};
+use bls::AggregateSignature;
 use core::slice::Iter;
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
+use ssz_types::VariableList;
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;
 
diff --git a/consensus/types/src/attestation/mod.rs b/consensus/types/src/attestation/mod.rs
index f9cfdb5c65..586d99bd90 100644
--- a/consensus/types/src/attestation/mod.rs
+++ b/consensus/types/src/attestation/mod.rs
@@ -5,6 +5,7 @@ mod attestation_duty;
 mod beacon_committee;
 mod checkpoint;
 mod indexed_attestation;
+mod indexed_payload_attestation;
 mod participation_flags;
 mod payload_attestation;
 mod payload_attestation_data;
@@ -29,6 +30,7 @@ pub use checkpoint::Checkpoint;
 pub use indexed_attestation::{
     IndexedAttestation, IndexedAttestationBase, IndexedAttestationElectra, IndexedAttestationRef,
 };
+pub use indexed_payload_attestation::IndexedPayloadAttestation;
 pub use participation_flags::ParticipationFlags;
 pub use payload_attestation::PayloadAttestation;
 pub use payload_attestation_data::PayloadAttestationData;
diff --git a/consensus/types/src/attestation/payload_attestation.rs b/consensus/types/src/attestation/payload_attestation.rs
index fa1bfc0293..b0fdd86891 100644
--- a/consensus/types/src/attestation/payload_attestation.rs
+++ b/consensus/types/src/attestation/payload_attestation.rs
@@ -1,8 +1,10 @@
 use crate::attestation::payload_attestation_data::PayloadAttestationData;
 use crate::test_utils::TestRandom;
-use crate::*;
+use crate::{EthSpec, ForkName, context_deserialize};
+use bls::AggregateSignature;
 use educe::Educe;
 use serde::{Deserialize, Serialize};
+use ssz::BitList;
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;
diff --git a/consensus/types/src/attestation/payload_attestation_data.rs b/consensus/types/src/attestation/payload_attestation_data.rs
index 01e9a1e8f8..46ae5bf221 100644
--- a/consensus/types/src/attestation/payload_attestation_data.rs
+++ b/consensus/types/src/attestation/payload_attestation_data.rs
@@ -1,5 +1,5 @@
 use crate::test_utils::TestRandom;
-use crate::*;
+use crate::{ForkName, Hash256, SignedRoot, Slot, context_deserialize};
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
diff --git a/consensus/types/src/builder/builder_pending_payment.rs b/consensus/types/src/builder/builder_pending_payment.rs
index 0beb53ac29..7241419ec9 100644
--- a/consensus/types/src/builder/builder_pending_payment.rs
+++ b/consensus/types/src/builder/builder_pending_payment.rs
@@ -1,5 +1,5 @@
 use crate::test_utils::TestRandom;
-use crate::*;
+use crate::{BuilderPendingWithdrawal, ForkName, context_deserialize};
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
diff --git a/consensus/types/src/builder/builder_pending_withdrawal.rs b/consensus/types/src/builder/builder_pending_withdrawal.rs
index 951b9cad58..9c82d5a64a 100644
--- a/consensus/types/src/builder/builder_pending_withdrawal.rs
+++ b/consensus/types/src/builder/builder_pending_withdrawal.rs
@@ -1,5 +1,5 @@
 use crate::test_utils::TestRandom;
-use crate::*;
+use crate::{Address, Epoch, ForkName, context_deserialize};
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
 use test_random_derive::TestRandom;
diff --git a/consensus/types/src/execution/execution_payload_bid.rs b/consensus/types/src/execution/execution_payload_bid.rs
index bb8c26b585..ed4712a02d 100644
--- a/consensus/types/src/execution/execution_payload_bid.rs
+++ b/consensus/types/src/execution/execution_payload_bid.rs
@@ -1,4 +1,7 @@
-use crate::{test_utils::TestRandom, *};
+use crate::test_utils::TestRandom;
+use crate::{
+    Address, ExecutionBlockHash, ForkName, Hash256, SignedRoot, Slot, context_deserialize,
+};
 use educe::Educe;
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
diff --git a/consensus/types/src/execution/execution_payload_envelope.rs b/consensus/types/src/execution/execution_payload_envelope.rs
index c0fa3babb5..9999713515 100644
--- a/consensus/types/src/execution/execution_payload_envelope.rs
+++ b/consensus/types/src/execution/execution_payload_envelope.rs
@@ -1,6 +1,8 @@
 use crate::test_utils::TestRandom;
-use crate::*;
-use beacon_block_body::KzgCommitments;
+use crate::{
+    EthSpec, ExecutionPayloadGloas, ExecutionRequests, ForkName, Hash256, KzgCommitments,
+    SignedRoot, Slot, context_deserialize,
+};
 use educe::Educe;
 use serde::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};