diff --git a/build/source_list.bzl b/build/source_list.bzl
index 7c1b37c..0d8046e 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -699,6 +699,7 @@
     "quic/tools/quic_client_default_network_helper.h",
     "quic/tools/quic_default_client.h",
     "quic/tools/quic_memory_cache_backend.h",
+    "quic/tools/quic_server_factory.h",
     "quic/tools/quic_simple_client_session.h",
     "quic/tools/quic_simple_client_stream.h",
     "quic/tools/quic_simple_crypto_server_stream_helper.h",
@@ -720,6 +721,7 @@
     "quic/tools/quic_client_default_network_helper.cc",
     "quic/tools/quic_default_client.cc",
     "quic/tools/quic_memory_cache_backend.cc",
+    "quic/tools/quic_server_factory.cc",
     "quic/tools/quic_simple_client_session.cc",
     "quic/tools/quic_simple_client_stream.cc",
     "quic/tools/quic_simple_crypto_server_stream_helper.cc",
@@ -1331,7 +1333,6 @@
 ]
 cli_tools_hdrs = [
     "quic/tools/quic_epoll_client_factory.h",
-    "quic/tools/quic_epoll_server_factory.h",
     "quic/tools/quic_toy_client.h",
     "quic/tools/quic_toy_server.h",
 ]
@@ -1343,7 +1344,6 @@
     "quic/tools/quic_client_bin.cc",
     "quic/tools/quic_client_interop_test_bin.cc",
     "quic/tools/quic_epoll_client_factory.cc",
-    "quic/tools/quic_epoll_server_factory.cc",
     "quic/tools/quic_packet_printer_bin.cc",
     "quic/tools/quic_reject_reason_decoder_bin.cc",
     "quic/tools/quic_server_bin.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index 76219c9..b53797a 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -699,6 +699,7 @@
     "src/quiche/quic/tools/quic_client_default_network_helper.h",
     "src/quiche/quic/tools/quic_default_client.h",
     "src/quiche/quic/tools/quic_memory_cache_backend.h",
+    "src/quiche/quic/tools/quic_server_factory.h",
     "src/quiche/quic/tools/quic_simple_client_session.h",
     "src/quiche/quic/tools/quic_simple_client_stream.h",
     "src/quiche/quic/tools/quic_simple_crypto_server_stream_helper.h",
@@ -720,6 +721,7 @@
     "src/quiche/quic/tools/quic_client_default_network_helper.cc",
     "src/quiche/quic/tools/quic_default_client.cc",
     "src/quiche/quic/tools/quic_memory_cache_backend.cc",
+    "src/quiche/quic/tools/quic_server_factory.cc",
     "src/quiche/quic/tools/quic_simple_client_session.cc",
     "src/quiche/quic/tools/quic_simple_client_stream.cc",
     "src/quiche/quic/tools/quic_simple_crypto_server_stream_helper.cc",
@@ -1331,7 +1333,6 @@
 ]
 cli_tools_hdrs = [
     "src/quiche/quic/tools/quic_epoll_client_factory.h",
-    "src/quiche/quic/tools/quic_epoll_server_factory.h",
     "src/quiche/quic/tools/quic_toy_client.h",
     "src/quiche/quic/tools/quic_toy_server.h",
 ]
@@ -1343,7 +1344,6 @@
     "src/quiche/quic/tools/quic_client_bin.cc",
     "src/quiche/quic/tools/quic_client_interop_test_bin.cc",
     "src/quiche/quic/tools/quic_epoll_client_factory.cc",
-    "src/quiche/quic/tools/quic_epoll_server_factory.cc",
     "src/quiche/quic/tools/quic_packet_printer_bin.cc",
     "src/quiche/quic/tools/quic_reject_reason_decoder_bin.cc",
     "src/quiche/quic/tools/quic_server_bin.cc",
diff --git a/build/source_list.json b/build/source_list.json
index 8e32230..d65d487 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -698,6 +698,7 @@
     "quiche/quic/tools/quic_client_default_network_helper.h",
     "quiche/quic/tools/quic_default_client.h",
     "quiche/quic/tools/quic_memory_cache_backend.h",
+    "quiche/quic/tools/quic_server_factory.h",
     "quiche/quic/tools/quic_simple_client_session.h",
     "quiche/quic/tools/quic_simple_client_stream.h",
     "quiche/quic/tools/quic_simple_crypto_server_stream_helper.h",
@@ -719,6 +720,7 @@
     "quiche/quic/tools/quic_client_default_network_helper.cc",
     "quiche/quic/tools/quic_default_client.cc",
     "quiche/quic/tools/quic_memory_cache_backend.cc",
+    "quiche/quic/tools/quic_server_factory.cc",
     "quiche/quic/tools/quic_simple_client_session.cc",
     "quiche/quic/tools/quic_simple_client_stream.cc",
     "quiche/quic/tools/quic_simple_crypto_server_stream_helper.cc",
@@ -1330,7 +1332,6 @@
   ],
   "cli_tools_hdrs": [
     "quiche/quic/tools/quic_epoll_client_factory.h",
-    "quiche/quic/tools/quic_epoll_server_factory.h",
     "quiche/quic/tools/quic_toy_client.h",
     "quiche/quic/tools/quic_toy_server.h"
   ],
@@ -1342,7 +1343,6 @@
     "quiche/quic/tools/quic_client_bin.cc",
     "quiche/quic/tools/quic_client_interop_test_bin.cc",
     "quiche/quic/tools/quic_epoll_client_factory.cc",
-    "quiche/quic/tools/quic_epoll_server_factory.cc",
     "quiche/quic/tools/quic_packet_printer_bin.cc",
     "quiche/quic/tools/quic_reject_reason_decoder_bin.cc",
     "quiche/quic/tools/quic_server_bin.cc",
diff --git a/quiche/quic/tools/quic_server.h b/quiche/quic/tools/quic_server.h
index 61531fb..7cb870f 100644
--- a/quiche/quic/tools/quic_server.h
+++ b/quiche/quic/tools/quic_server.h
@@ -17,11 +17,9 @@
 #include "quiche/quic/core/crypto/quic_crypto_server_config.h"
 #include "quiche/quic/core/io/quic_event_loop.h"
 #include "quiche/quic/core/quic_config.h"
-#include "quiche/quic/core/quic_framer.h"
 #include "quiche/quic/core/quic_packet_writer.h"
 #include "quiche/quic/core/quic_udp_socket.h"
 #include "quiche/quic/core/quic_version_manager.h"
-#include "quiche/quic/platform/api/quic_epoll.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/quic/tools/quic_simple_server_backend.h"
 #include "quiche/quic/tools/quic_spdy_server_base.h"
diff --git a/quiche/quic/tools/quic_server_bin.cc b/quiche/quic/tools/quic_server_bin.cc
index b7e587b..d823af0 100644
--- a/quiche/quic/tools/quic_server_bin.cc
+++ b/quiche/quic/tools/quic_server_bin.cc
@@ -7,9 +7,7 @@
 
 #include <vector>
 
-#include "quiche/quic/core/quic_versions.h"
-#include "quiche/quic/platform/api/quic_flags.h"
-#include "quiche/quic/tools/quic_epoll_server_factory.h"
+#include "quiche/quic/tools/quic_server_factory.h"
 #include "quiche/quic/tools/quic_toy_server.h"
 #include "quiche/common/platform/api/quiche_command_line_flags.h"
 #include "quiche/common/platform/api/quiche_system_event_loop.h"
@@ -25,7 +23,7 @@
   }
 
   quic::QuicToyServer::MemoryCacheBackendFactory backend_factory;
-  quic::QuicEpollServerFactory server_factory;
+  quic::QuicServerFactory server_factory;
   quic::QuicToyServer server(&backend_factory, &server_factory);
   return server.Start();
 }
diff --git a/quiche/quic/tools/quic_epoll_server_factory.cc b/quiche/quic/tools/quic_server_factory.cc
similarity index 80%
rename from quiche/quic/tools/quic_epoll_server_factory.cc
rename to quiche/quic/tools/quic_server_factory.cc
index a81b973..7aac48b 100644
--- a/quiche/quic/tools/quic_epoll_server_factory.cc
+++ b/quiche/quic/tools/quic_server_factory.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/quic/tools/quic_epoll_server_factory.h"
+#include "quiche/quic/tools/quic_server_factory.h"
 
 #include <utility>
 
@@ -10,7 +10,7 @@
 
 namespace quic {
 
-std::unique_ptr<quic::QuicSpdyServerBase> QuicEpollServerFactory::CreateServer(
+std::unique_ptr<quic::QuicSpdyServerBase> QuicServerFactory::CreateServer(
     quic::QuicSimpleServerBackend* backend,
     std::unique_ptr<quic::ProofSource> proof_source,
     const quic::ParsedQuicVersionVector& supported_versions) {
diff --git a/quiche/quic/tools/quic_epoll_server_factory.h b/quiche/quic/tools/quic_server_factory.h
similarity index 61%
rename from quiche/quic/tools/quic_epoll_server_factory.h
rename to quiche/quic/tools/quic_server_factory.h
index c1e2e2c..ba6bdfc 100644
--- a/quiche/quic/tools/quic_epoll_server_factory.h
+++ b/quiche/quic/tools/quic_server_factory.h
@@ -2,26 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_QUIC_TOOLS_QUIC_EPOLL_SERVER_FACTORY_H_
-#define QUICHE_QUIC_TOOLS_QUIC_EPOLL_SERVER_FACTORY_H_
+#ifndef QUICHE_QUIC_TOOLS_QUIC_SERVER_FACTORY_H_
+#define QUICHE_QUIC_TOOLS_QUIC_SERVER_FACTORY_H_
 
-#include "quiche/quic/platform/api/quic_epoll.h"
 #include "quiche/quic/tools/quic_toy_server.h"
 
 namespace quic {
 
 // Factory creating QuicServer instances.
-class QuicEpollServerFactory : public QuicToyServer::ServerFactory {
+class QuicServerFactory : public QuicToyServer::ServerFactory {
  public:
   std::unique_ptr<QuicSpdyServerBase> CreateServer(
       QuicSimpleServerBackend* backend,
       std::unique_ptr<ProofSource> proof_source,
       const quic::ParsedQuicVersionVector& supported_versions) override;
-
- private:
-  QuicEpollServer epoll_server_;
 };
 
 }  // namespace quic
 
-#endif  // QUICHE_QUIC_TOOLS_QUIC_EPOLL_SERVER_FACTORY_H_
+#endif  // QUICHE_QUIC_TOOLS_QUIC_SERVER_FACTORY_H_
diff --git a/quiche/quic/tools/quic_toy_server.cc b/quiche/quic/tools/quic_toy_server.cc
index 1e31b2e..6b3c76f 100644
--- a/quiche/quic/tools/quic_toy_server.cc
+++ b/quiche/quic/tools/quic_toy_server.cc
@@ -9,7 +9,6 @@
 
 #include "quiche/quic/core/quic_versions.h"
 #include "quiche/quic/platform/api/quic_default_proof_providers.h"
-#include "quiche/quic/platform/api/quic_flags.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/quic/tools/quic_memory_cache_backend.h"
 #include "quiche/common/platform/api/quiche_command_line_flags.h"