diff --git a/build/source_list.bzl b/build/source_list.bzl
index f1b9339..b7dc677 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -1366,7 +1366,6 @@
     "quic/core/uber_quic_stream_id_manager_test.cc",
     "quic/core/uber_received_packet_manager_test.cc",
     "quic/core/web_transport_write_blocked_list_test.cc",
-    "quic/moqt/test_tools/moqt_simulator_test.cc",
     "quic/test_tools/crypto_test_utils_test.cc",
     "quic/test_tools/quic_test_utils_test.cc",
     "quic/test_tools/simple_session_notifier_test.cc",
@@ -1629,6 +1628,7 @@
     "quic/moqt/moqt_track_test.cc",
     "quic/moqt/relay_namespace_tree_test.cc",
     "quic/moqt/session_namespace_tree_test.cc",
+    "quic/moqt/test_tools/moqt_simulator_test.cc",
     "quic/moqt/tools/moq_chat_end_to_end_test.cc",
     "quic/moqt/tools/moq_chat_test.cc",
     "quic/moqt/tools/moqt_end_to_end_test.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index ad9e46d..ea393d9 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -1367,7 +1367,6 @@
     "src/quiche/quic/core/uber_quic_stream_id_manager_test.cc",
     "src/quiche/quic/core/uber_received_packet_manager_test.cc",
     "src/quiche/quic/core/web_transport_write_blocked_list_test.cc",
-    "src/quiche/quic/moqt/test_tools/moqt_simulator_test.cc",
     "src/quiche/quic/test_tools/crypto_test_utils_test.cc",
     "src/quiche/quic/test_tools/quic_test_utils_test.cc",
     "src/quiche/quic/test_tools/simple_session_notifier_test.cc",
@@ -1634,6 +1633,7 @@
     "src/quiche/quic/moqt/moqt_track_test.cc",
     "src/quiche/quic/moqt/relay_namespace_tree_test.cc",
     "src/quiche/quic/moqt/session_namespace_tree_test.cc",
+    "src/quiche/quic/moqt/test_tools/moqt_simulator_test.cc",
     "src/quiche/quic/moqt/tools/moq_chat_end_to_end_test.cc",
     "src/quiche/quic/moqt/tools/moq_chat_test.cc",
     "src/quiche/quic/moqt/tools/moqt_end_to_end_test.cc",
diff --git a/build/source_list.json b/build/source_list.json
index bbeb1f7..d379a6f 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -1366,7 +1366,6 @@
     "quiche/quic/core/uber_quic_stream_id_manager_test.cc",
     "quiche/quic/core/uber_received_packet_manager_test.cc",
     "quiche/quic/core/web_transport_write_blocked_list_test.cc",
-    "quiche/quic/moqt/test_tools/moqt_simulator_test.cc",
     "quiche/quic/test_tools/crypto_test_utils_test.cc",
     "quiche/quic/test_tools/quic_test_utils_test.cc",
     "quiche/quic/test_tools/simple_session_notifier_test.cc",
@@ -1633,6 +1632,7 @@
     "quiche/quic/moqt/moqt_track_test.cc",
     "quiche/quic/moqt/relay_namespace_tree_test.cc",
     "quiche/quic/moqt/session_namespace_tree_test.cc",
+    "quiche/quic/moqt/test_tools/moqt_simulator_test.cc",
     "quiche/quic/moqt/tools/moq_chat_end_to_end_test.cc",
     "quiche/quic/moqt/tools/moq_chat_test.cc",
     "quiche/quic/moqt/tools/moqt_end_to_end_test.cc",
diff --git a/quiche/BUILD.bazel b/quiche/BUILD.bazel
index c366829..8e0fc4c 100644
--- a/quiche/BUILD.bazel
+++ b/quiche/BUILD.bazel
@@ -497,8 +497,15 @@
         ":moqt_core",
         ":quiche_core",
         ":quiche_test_support",
+        "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/base",
+        "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
+        "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:span",
     ],
 )