diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index d09cab9edc..3029e0ac44 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -108,7 +108,6 @@ rtc_library("rtc_p2p") {
     "../rtc_base:rtc_numerics",
     "../rtc_base:socket",
     "../rtc_base:socket_address",
-    "../rtc_base:socket_factory",
     "../rtc_base:socket_server",
     "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc
index 2a53f5e237..a53ed96bfe 100644
--- a/p2p/base/basic_packet_socket_factory.cc
+++ b/p2p/base/basic_packet_socket_factory.cc
@@ -14,15 +14,16 @@
 
 #include <string>
 
-#include "api/async_dns_resolver.h"
-#include "api/wrapping_async_dns_resolver.h"
 #include "p2p/base/async_stun_tcp_socket.h"
+#include "rtc_base/async_resolver.h"
 #include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/async_udp_socket.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/ssl_adapter.h"
 
 namespace rtc {
@@ -189,10 +190,8 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
   return tcp_socket;
 }
 
-std::unique_ptr<webrtc::AsyncDnsResolverInterface>
-BasicPacketSocketFactory::CreateAsyncDnsResolver() {
-  return std::make_unique<webrtc::WrappingAsyncDnsResolver>(
-      new AsyncResolver());
+AsyncResolverInterface* BasicPacketSocketFactory::CreateAsyncResolver() {
+  return new AsyncResolver();
 }
 
 int BasicPacketSocketFactory::BindSocket(Socket* socket,
diff --git a/p2p/base/basic_packet_socket_factory.h b/p2p/base/basic_packet_socket_factory.h
index 147f513807..616d6de9db 100644
--- a/p2p/base/basic_packet_socket_factory.h
+++ b/p2p/base/basic_packet_socket_factory.h
@@ -11,18 +11,10 @@
 #ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
 #define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
 
-#include <stdint.h>
-
-#include <memory>
 #include <string>
 
-#include "api/async_dns_resolver.h"
 #include "api/packet_socket_factory.h"
-#include "rtc_base/async_packet_socket.h"
-#include "rtc_base/proxy_info.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socket_address.h"
-#include "rtc_base/socket_factory.h"
 
 namespace rtc {
 
@@ -47,8 +39,7 @@ class BasicPacketSocketFactory : public PacketSocketFactory {
       const std::string& user_agent,
       const PacketSocketTcpOptions& tcp_options) override;
 
-  std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
-      override;
+  AsyncResolverInterface* CreateAsyncResolver() override;
 
  private:
   int BindSocket(Socket* socket,
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index 52153d8c90..a610eb5fb7 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -1002,10 +1002,7 @@ class FakePacketSocketFactory : public rtc::PacketSocketFactory {
   void set_next_client_tcp_socket(AsyncPacketSocket* next_client_tcp_socket) {
     next_client_tcp_socket_ = next_client_tcp_socket;
   }
-  std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
-      override {
-    return nullptr;
-  }
+  rtc::AsyncResolverInterface* CreateAsyncResolver() override { return NULL; }
 
  private:
   AsyncPacketSocket* next_udp_socket_;
diff --git a/test/network/emulated_turn_server.cc b/test/network/emulated_turn_server.cc
index 07118bc0ac..4cd2b51366 100644
--- a/test/network/emulated_turn_server.cc
+++ b/test/network/emulated_turn_server.cc
@@ -101,8 +101,7 @@ class PacketSocketFactoryWrapper : public rtc::PacketSocketFactory {
       const rtc::PacketSocketTcpOptions& tcp_options) override {
     return nullptr;
   }
-  std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
-      override {
+  rtc::AsyncResolverInterface* CreateAsyncResolver() override {
     return nullptr;
   }