diff --git a/build/source_list.bzl b/build/source_list.bzl
index e7806bf..3615c89 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -698,7 +698,6 @@
     "quic/tools/quic_backend_response.h",
     "quic/tools/quic_client_base.h",
     "quic/tools/quic_client_factory.h",
-    "quic/tools/quic_event_loop_tools.h",
     "quic/tools/quic_memory_cache_backend.h",
     "quic/tools/quic_name_lookup.h",
     "quic/tools/quic_simple_client_session.h",
@@ -992,6 +991,7 @@
     "quic/tools/quic_client_default_network_helper.h",
     "quic/tools/quic_default_client.h",
     "quic/tools/quic_epoll_client_factory.h",
+    "quic/tools/quic_event_loop_tools.h",
     "quic/tools/quic_server.h",
 ]
 io_tool_support_srcs = [
diff --git a/build/source_list.gni b/build/source_list.gni
index da2d729..472aede 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -698,7 +698,6 @@
     "src/quiche/quic/tools/quic_backend_response.h",
     "src/quiche/quic/tools/quic_client_base.h",
     "src/quiche/quic/tools/quic_client_factory.h",
-    "src/quiche/quic/tools/quic_event_loop_tools.h",
     "src/quiche/quic/tools/quic_memory_cache_backend.h",
     "src/quiche/quic/tools/quic_name_lookup.h",
     "src/quiche/quic/tools/quic_simple_client_session.h",
@@ -992,6 +991,7 @@
     "src/quiche/quic/tools/quic_client_default_network_helper.h",
     "src/quiche/quic/tools/quic_default_client.h",
     "src/quiche/quic/tools/quic_epoll_client_factory.h",
+    "src/quiche/quic/tools/quic_event_loop_tools.h",
     "src/quiche/quic/tools/quic_server.h",
 ]
 io_tool_support_srcs = [
diff --git a/build/source_list.json b/build/source_list.json
index 42f3fbb..fc9ff8b 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -697,7 +697,6 @@
     "quiche/quic/tools/quic_backend_response.h",
     "quiche/quic/tools/quic_client_base.h",
     "quiche/quic/tools/quic_client_factory.h",
-    "quiche/quic/tools/quic_event_loop_tools.h",
     "quiche/quic/tools/quic_memory_cache_backend.h",
     "quiche/quic/tools/quic_name_lookup.h",
     "quiche/quic/tools/quic_simple_client_session.h",
@@ -991,6 +990,7 @@
     "quiche/quic/tools/quic_client_default_network_helper.h",
     "quiche/quic/tools/quic_default_client.h",
     "quiche/quic/tools/quic_epoll_client_factory.h",
+    "quiche/quic/tools/quic_event_loop_tools.h",
     "quiche/quic/tools/quic_server.h"
   ],
   "io_tool_support_srcs": [