diff --git a/quic/core/legacy_quic_stream_id_manager.h b/quic/core/legacy_quic_stream_id_manager.h
index b4d0c3e..728d288 100644
--- a/quic/core/legacy_quic_stream_id_manager.h
+++ b/quic/core/legacy_quic_stream_id_manager.h
@@ -4,6 +4,7 @@
 #ifndef QUICHE_QUIC_CORE_LEGACY_QUIC_STREAM_ID_MANAGER_H_
 #define QUICHE_QUIC_CORE_LEGACY_QUIC_STREAM_ID_MANAGER_H_
 
+#include "absl/container/flat_hash_set.h"
 #include "quic/core/quic_stream_id_manager.h"
 #include "quic/core/quic_types.h"
 #include "quic/core/quic_versions.h"
@@ -111,7 +112,7 @@
 
   // Set of stream ids that are less than the largest stream id that has been
   // received, but are nonetheless available to be created.
-  QuicHashSet<QuicStreamId> available_streams_;
+  absl::flat_hash_set<QuicStreamId> available_streams_;
 
   QuicStreamId largest_peer_created_stream_id_;
 
diff --git a/quic/core/quic_stream_id_manager.h b/quic/core/quic_stream_id_manager.h
index 31d21be..4261f43 100644
--- a/quic/core/quic_stream_id_manager.h
+++ b/quic/core/quic_stream_id_manager.h
@@ -4,6 +4,7 @@
 #ifndef QUICHE_QUIC_CORE_QUIC_STREAM_ID_MANAGER_H_
 #define QUICHE_QUIC_CORE_QUIC_STREAM_ID_MANAGER_H_
 
+#include "absl/container/flat_hash_set.h"
 #include "absl/strings/str_cat.h"
 #include "quic/core/frames/quic_frame.h"
 #include "quic/core/quic_types.h"
@@ -176,7 +177,7 @@
 
   // Set of stream ids that are less than the largest stream id that has been
   // received, but are nonetheless available to be created.
-  QuicHashSet<QuicStreamId> available_streams_;
+  absl::flat_hash_set<QuicStreamId> available_streams_;
 
   QuicStreamId largest_peer_created_stream_id_;
 };
diff --git a/quic/qbone/platform/netlink_test.cc b/quic/qbone/platform/netlink_test.cc
index 084532f..58b03d3 100644
--- a/quic/qbone/platform/netlink_test.cc
+++ b/quic/qbone/platform/netlink_test.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "absl/container/node_hash_set.h"
 #include "quic/platform/api/quic_bug_tracker.h"
 #include "quic/platform/api/quic_containers.h"
 #include "quic/platform/api/quic_test.h"
@@ -287,8 +288,8 @@
 TEST_F(NetlinkTest, GetAddressesWorks) {
   auto netlink = std::make_unique<Netlink>(&mock_kernel_);
 
-  QuicUnorderedSet<std::string> addresses = {QuicIpAddress::Any4().ToString(),
-                                             QuicIpAddress::Any6().ToString()};
+  absl::node_hash_set<std::string> addresses = {
+      QuicIpAddress::Any4().ToString(), QuicIpAddress::Any6().ToString()};
 
   ExpectNetlinkPacket(
       RTM_GETADDR, NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST,
diff --git a/quic/test_tools/simulator/simulator.h b/quic/test_tools/simulator/simulator.h
index 9b73cc3..8f31717 100644
--- a/quic/test_tools/simulator/simulator.h
+++ b/quic/test_tools/simulator/simulator.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "absl/container/flat_hash_map.h"
+#include "absl/container/flat_hash_set.h"
 #include "quic/core/quic_connection.h"
 #include "quic/core/quic_simple_buffer_allocator.h"
 #include "quic/platform/api/quic_bug_tracker.h"
@@ -132,7 +133,7 @@
   // For each actor, maintain the time it is scheduled at.  The value for
   // unscheduled actors is QuicTime::Infinite().
   absl::flat_hash_map<Actor*, QuicTime> scheduled_times_;
-  QuicHashSet<std::string> actor_names_;
+  absl::flat_hash_set<std::string> actor_names_;
 };
 
 template <class TerminationPredicate>