diff --git a/src/payment/forwarding.rs b/src/payment/forwarding.rs
index 2a50f24c8..8ec5ed9e3 100644
--- a/src/payment/forwarding.rs
+++ b/src/payment/forwarding.rs
@@ -16,15 +16,13 @@ use lightning::impl_writeable_tlv_based;
 use lightning::ln::types::ChannelId;
 use lightning::util::ser::{Readable, Writeable, Writer};
 
+use super::forwarding_store::ForwardingStore;
+use super::PageToken;
 use crate::config::{Config, ForwardedPaymentTrackingMode};
 use crate::error::Error;
 use crate::ffi::{maybe_deref, maybe_wrap};
-use crate::hex_utils;
 use crate::runtime::Runtime;
-use crate::UserChannelId;
-
-use super::forwarding_store::ForwardingStore;
-use super::PageToken;
+use crate::{hex_utils, UserChannelId};
 
 fn parse_forwarding_id(id: &str) -> Option<[u8; 32]> {
 	hex_utils::to_vec(id)?.try_into().ok()
diff --git a/src/payment/forwarding_store.rs b/src/payment/forwarding_store.rs
index 7bf88dcdd..66c2b504c 100644
--- a/src/payment/forwarding_store.rs
+++ b/src/payment/forwarding_store.rs
@@ -26,7 +26,6 @@ use crate::data_store::{
 	DataStore, DataStorePage, KeepAllEntries, KeepNoEntries, StorableObject, StorableObjectId,
 	StorableObjectUpdate, UpdatableObject,
 };
-use crate::hex_utils;
 use crate::io::{
 	CHANNEL_FORWARDING_STATS_PERSISTENCE_SECONDARY_NAMESPACE,
 	CHANNEL_PAIR_FORWARDING_STATS_PERSISTENCE_SECONDARY_NAMESPACE,
@@ -38,7 +37,7 @@ use crate::logger::{log_debug, log_error, Logger};
 use crate::types::{
 	ChannelForwardingStatsStore, ChannelPairForwardingStatsStore, DynStore, ForwardedPaymentStore,
 };
-use crate::{Error, UserChannelId};
+use crate::{hex_utils, Error, UserChannelId};
 
 pub(crate) const FORWARDED_PAYMENT_AGGREGATION_BUCKET_SIZE_SECS: u64 = 60 * 60;