diff --git a/src/core/matrix/state_res/mod.rs b/src/core/matrix/state_res/mod.rs
index 2555e7e3..33faa852 100644
--- a/src/core/matrix/state_res/mod.rs
+++ b/src/core/matrix/state_res/mod.rs
@@ -65,11 +65,13 @@ mod fetch_state;
 mod resolve;
 #[cfg(test)]
 mod test_utils;
+mod topological_sort;
 
 use self::{event_auth::check_state_dependent_auth_rules, fetch_state::FetchStateExt};
 pub use self::{
 	event_auth::{AuthTypes, auth_check, auth_types_for_event},
 	event_format::check_pdu_format,
-	resolve::{AuthSet, ConflictMap, StateMap, resolve, topological_sort},
+	resolve::{AuthSet, ConflictMap, StateMap, resolve},
+	topological_sort::topological_sort,
 };
 use crate::matrix::TypeStateKey;
diff --git a/src/core/matrix/state_res/resolve.rs b/src/core/matrix/state_res/resolve.rs
index 8d1232ec..a2fbc0cd 100644
--- a/src/core/matrix/state_res/resolve.rs
+++ b/src/core/matrix/state_res/resolve.rs
@@ -7,7 +7,6 @@ mod iterative_auth_check;
 mod mainline_sort;
 mod power_sort;
 mod split_conflicted;
-mod topological_sort;
 
 use std::collections::{BTreeMap, BTreeSet, HashSet};
 
@@ -15,7 +14,6 @@ use futures::{FutureExt, Stream, StreamExt, TryFutureExt};
 use itertools::Itertools;
 use ruma::{OwnedEventId, events::StateEventType, room_version_rules::RoomVersionRules};
 
-pub use self::topological_sort::topological_sort;
 use self::{
 	auth_difference::auth_difference, conflicted_subgraph::conflicted_subgraph_dfs,
 	iterative_auth_check::iterative_auth_check, mainline_sort::mainline_sort,
diff --git a/src/core/matrix/state_res/resolve/power_sort.rs b/src/core/matrix/state_res/resolve/power_sort.rs
index 01e2da80..c7c06842 100644
--- a/src/core/matrix/state_res/resolve/power_sort.rs
+++ b/src/core/matrix/state_res/resolve/power_sort.rs
@@ -10,8 +10,8 @@ use ruma::{
 	room_version_rules::RoomVersionRules,
 };
 
-use super::{
-	super::events::{
+use super::super::{
+	events::{
 		RoomCreateEvent, RoomPowerLevelsEvent, RoomPowerLevelsIntField, is_power_event,
 		power_levels::RoomPowerLevelsEventOptionExt,
 	},
diff --git a/src/core/matrix/state_res/resolve/tests.rs b/src/core/matrix/state_res/resolve/tests.rs
index e2f53705..b5093453 100644
--- a/src/core/matrix/state_res/resolve/tests.rs
+++ b/src/core/matrix/state_res/resolve/tests.rs
@@ -499,7 +499,7 @@ async fn test_reverse_topological_power_sort() {
 		event_id("p") => hashset![event_id("o")],
 	};
 
-	let res = super::topological_sort(&graph, &async |_id| {
+	let res = super::super::topological_sort(&graph, &async |_id| {
 		Ok((int!(0).into(), MilliSecondsSinceUnixEpoch(uint!(0))))
 	})
 	.await
diff --git a/src/core/matrix/state_res/resolve/topological_sort.rs b/src/core/matrix/state_res/topological_sort.rs
similarity index 100%
rename from src/core/matrix/state_res/resolve/topological_sort.rs
rename to src/core/matrix/state_res/topological_sort.rs