diff --git a/quic/core/crypto/transport_parameters.cc b/quic/core/crypto/transport_parameters.cc
index 0d828db..b2dd3fa 100644
--- a/quic/core/crypto/transport_parameters.cc
+++ b/quic/core/crypto/transport_parameters.cc
@@ -23,6 +23,7 @@
 #include "quic/core/quic_versions.h"
 #include "quic/platform/api/quic_bug_tracker.h"
 #include "quic/platform/api/quic_flag_utils.h"
+#include "quic/platform/api/quic_ip_address.h"
 
 namespace quic {
 
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index da28e4c..303ec74 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -46,6 +46,7 @@
 #include "quic/platform/api/quic_client_stats.h"
 #include "quic/platform/api/quic_flag_utils.h"
 #include "quic/platform/api/quic_flags.h"
+#include "quic/platform/api/quic_ip_address_family.h"
 #include "quic/platform/api/quic_logging.h"
 #include "quic/platform/api/quic_stack_trace.h"
 #include "common/quiche_text_utils.h"
diff --git a/quic/core/quic_packet_writer.h b/quic/core/quic_packet_writer.h
index 875f25a..107c818 100644
--- a/quic/core/quic_packet_writer.h
+++ b/quic/core/quic_packet_writer.h
@@ -10,6 +10,7 @@
 
 #include "quic/core/quic_packets.h"
 #include "quic/platform/api/quic_export.h"
+#include "quic/platform/api/quic_ip_address.h"
 #include "quic/platform/api/quic_socket_address.h"
 
 namespace quic {
diff --git a/quic/core/quic_socket_address_coder.cc b/quic/core/quic_socket_address_coder.cc
index 5eeb95d..60d0e3c 100644
--- a/quic/core/quic_socket_address_coder.cc
+++ b/quic/core/quic_socket_address_coder.cc
@@ -8,6 +8,8 @@
 #include <string>
 #include <vector>
 
+#include "quic/platform/api/quic_ip_address_family.h"
+
 namespace quic {
 
 namespace {
diff --git a/quic/core/quic_socket_address_coder.h b/quic/core/quic_socket_address_coder.h
index 468e6d8..d66663c 100644
--- a/quic/core/quic_socket_address_coder.h
+++ b/quic/core/quic_socket_address_coder.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "quic/platform/api/quic_export.h"
+#include "quic/platform/api/quic_ip_address.h"
 #include "quic/platform/api/quic_socket_address.h"
 
 namespace quic {
diff --git a/quic/core/quic_socket_address_coder_test.cc b/quic/core/quic_socket_address_coder_test.cc
index 0287cd3..6a8adad 100644
--- a/quic/core/quic_socket_address_coder_test.cc
+++ b/quic/core/quic_socket_address_coder_test.cc
@@ -7,6 +7,8 @@
 #include <string>
 
 #include "absl/base/macros.h"
+#include "quic/platform/api/quic_ip_address.h"
+#include "quic/platform/api/quic_ip_address_family.h"
 #include "quic/platform/api/quic_test.h"
 
 namespace quic {
diff --git a/quic/platform/api/quic_ip_address_test.cc b/quic/platform/api/quic_ip_address_test.cc
index f0f196f..3d12ed9 100644
--- a/quic/platform/api/quic_ip_address_test.cc
+++ b/quic/platform/api/quic_ip_address_test.cc
@@ -6,6 +6,7 @@
 
 #include <cstdint>
 
+#include "quic/platform/api/quic_ip_address_family.h"
 #include "quic/platform/api/quic_test.h"
 
 namespace quic {
diff --git a/quic/platform/api/quic_socket_address_test.cc b/quic/platform/api/quic_socket_address_test.cc
index 2282a8a..1d7737d 100644
--- a/quic/platform/api/quic_socket_address_test.cc
+++ b/quic/platform/api/quic_socket_address_test.cc
@@ -7,6 +7,7 @@
 #include <memory>
 #include <sstream>
 
+#include "quic/platform/api/quic_ip_address.h"
 #include "quic/platform/api/quic_test.h"
 
 namespace quic {
diff --git a/quic/qbone/platform/ip_range.h b/quic/qbone/platform/ip_range.h
index e3df295..70efc1a 100644
--- a/quic/qbone/platform/ip_range.h
+++ b/quic/qbone/platform/ip_range.h
@@ -7,6 +7,7 @@
 
 #include "absl/strings/str_cat.h"
 #include "quic/platform/api/quic_ip_address.h"
+#include "quic/platform/api/quic_ip_address_family.h"
 
 namespace quic {
 
diff --git a/quic/qbone/qbone_packet_processor.cc b/quic/qbone/qbone_packet_processor.cc
index 6e83e76..e2848ed 100644
--- a/quic/qbone/qbone_packet_processor.cc
+++ b/quic/qbone/qbone_packet_processor.cc
@@ -8,6 +8,7 @@
 
 #include "absl/strings/string_view.h"
 #include "quic/platform/api/quic_bug_tracker.h"
+#include "quic/platform/api/quic_ip_address_family.h"
 #include "quic/platform/api/quic_logging.h"
 #include "quic/qbone/platform/icmp_packet.h"
 #include "quic/qbone/platform/internet_checksum.h"