diff --git a/build/source_list.bzl b/build/source_list.bzl
index 17cf6a2..4d88da3 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -945,7 +945,6 @@
     "spdy/test_tools/spdy_test_utils.cc",
 ]
 epoll_tool_support_hdrs = [
-    "common/platform/api/quiche_epoll.h",
     "common/platform/api/quiche_event_loop.h",
     "common/platform/api/quiche_stream_buffer_allocator.h",
     "common/platform/api/quiche_udp_socket_platform_api.h",
@@ -981,7 +980,6 @@
     "quic/masque/masque_server_backend.h",
     "quic/masque/masque_server_session.h",
     "quic/masque/masque_utils.h",
-    "quic/platform/api/quic_epoll.h",
     "quic/platform/api/quic_udp_socket_platform_api.h",
     "quic/tools/quic_server.h",
 ]
@@ -1014,7 +1012,6 @@
     "quic/tools/quic_server.cc",
 ]
 epoll_test_support_hdrs = [
-    "common/platform/api/quiche_epoll_test_tools.h",
     "epoll_server/fake_simple_epoll_server.h",
     "epoll_server/platform/api/epoll_address_test_utils.h",
     "epoll_server/platform/api/epoll_expect_bug.h",
diff --git a/build/source_list.gni b/build/source_list.gni
index 0536fdc..34c4230 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -945,7 +945,6 @@
     "src/quiche/spdy/test_tools/spdy_test_utils.cc",
 ]
 epoll_tool_support_hdrs = [
-    "src/quiche/common/platform/api/quiche_epoll.h",
     "src/quiche/common/platform/api/quiche_event_loop.h",
     "src/quiche/common/platform/api/quiche_stream_buffer_allocator.h",
     "src/quiche/common/platform/api/quiche_udp_socket_platform_api.h",
@@ -981,7 +980,6 @@
     "src/quiche/quic/masque/masque_server_backend.h",
     "src/quiche/quic/masque/masque_server_session.h",
     "src/quiche/quic/masque/masque_utils.h",
-    "src/quiche/quic/platform/api/quic_epoll.h",
     "src/quiche/quic/platform/api/quic_udp_socket_platform_api.h",
     "src/quiche/quic/tools/quic_server.h",
 ]
@@ -1014,7 +1012,6 @@
     "src/quiche/quic/tools/quic_server.cc",
 ]
 epoll_test_support_hdrs = [
-    "src/quiche/common/platform/api/quiche_epoll_test_tools.h",
     "src/quiche/epoll_server/fake_simple_epoll_server.h",
     "src/quiche/epoll_server/platform/api/epoll_address_test_utils.h",
     "src/quiche/epoll_server/platform/api/epoll_expect_bug.h",
diff --git a/build/source_list.json b/build/source_list.json
index f2e721d..a74080f 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -944,7 +944,6 @@
     "quiche/spdy/test_tools/spdy_test_utils.cc"
   ],
   "epoll_tool_support_hdrs": [
-    "quiche/common/platform/api/quiche_epoll.h",
     "quiche/common/platform/api/quiche_event_loop.h",
     "quiche/common/platform/api/quiche_stream_buffer_allocator.h",
     "quiche/common/platform/api/quiche_udp_socket_platform_api.h",
@@ -980,7 +979,6 @@
     "quiche/quic/masque/masque_server_backend.h",
     "quiche/quic/masque/masque_server_session.h",
     "quiche/quic/masque/masque_utils.h",
-    "quiche/quic/platform/api/quic_epoll.h",
     "quiche/quic/platform/api/quic_udp_socket_platform_api.h",
     "quiche/quic/tools/quic_server.h"
   ],
@@ -1013,7 +1011,6 @@
     "quiche/quic/tools/quic_server.cc"
   ],
   "epoll_test_support_hdrs": [
-    "quiche/common/platform/api/quiche_epoll_test_tools.h",
     "quiche/epoll_server/fake_simple_epoll_server.h",
     "quiche/epoll_server/platform/api/epoll_address_test_utils.h",
     "quiche/epoll_server/platform/api/epoll_expect_bug.h",
diff --git a/quiche/common/platform/api/quiche_epoll.h b/quiche/common/platform/api/quiche_epoll.h
deleted file mode 100644
index 5fd470c..0000000
--- a/quiche/common/platform/api/quiche_epoll.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_H_
-#define QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_H_
-
-#include "quiche_platform_impl/quiche_epoll_impl.h"
-
-namespace quiche {
-
-using QuicheEpollServer = QuicheEpollServerImpl;
-using QuicheEpollEvent = QuicheEpollEventImpl;
-using QuicheEpollAlarmBase = QuicheEpollAlarmBaseImpl;
-using QuicheEpollCallbackInterface = QuicheEpollCallbackInterfaceImpl;
-
-}  // namespace quiche
-
-#endif  // QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_H_
diff --git a/quiche/common/platform/api/quiche_epoll_test_tools.h b/quiche/common/platform/api/quiche_epoll_test_tools.h
deleted file mode 100644
index 998ed83..0000000
--- a/quiche/common/platform/api/quiche_epoll_test_tools.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_TEST_TOOLS_H_
-#define QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_TEST_TOOLS_H_
-
-#include "quiche_platform_impl/quiche_epoll_test_tools_impl.h"
-
-namespace quiche {
-
-using QuicheFakeEpollServer = QuicheFakeEpollServerImpl;
-
-}  // namespace quiche
-
-#endif  // QUICHE_COMMON_PLATFORM_API_QUICHE_EPOLL_TEST_TOOLS_H_
diff --git a/quiche/quic/platform/api/quic_epoll.h b/quiche/quic/platform/api/quic_epoll.h
deleted file mode 100644
index 58aa780..0000000
--- a/quiche/quic/platform/api/quic_epoll.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_EPOLL_H_
-#define QUICHE_QUIC_PLATFORM_API_QUIC_EPOLL_H_
-
-#include "quiche/common/platform/api/quiche_epoll.h"
-
-namespace quic {
-
-using QuicEpollServer = quiche::QuicheEpollServer;
-using QuicEpollEvent = quiche::QuicheEpollEvent;
-using QuicEpollAlarmBase = quiche::QuicheEpollAlarmBase;
-using QuicEpollCallbackInterface = quiche::QuicheEpollCallbackInterface;
-
-}  // namespace quic
-
-#endif  // QUICHE_QUIC_PLATFORM_API_QUIC_EPOLL_H_