diff --git a/common/quiche_data_reader.cc b/common/quiche_data_reader.cc
index f6b6fb5..3445013 100644
--- a/common/quiche_data_reader.cc
+++ b/common/quiche_data_reader.cc
@@ -4,6 +4,8 @@
 
 #include "net/third_party/quiche/src/common/quiche_data_reader.h"
 
+#include <cstring>
+
 #include "net/third_party/quiche/src/common/platform/api/quiche_endian.h"
 #include "net/third_party/quiche/src/common/platform/api/quiche_logging.h"
 #include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h"
diff --git a/common/quiche_data_writer.h b/common/quiche_data_writer.h
index 869a947..cded0fa 100644
--- a/common/quiche_data_writer.h
+++ b/common/quiche_data_writer.h
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <limits>
 
 #include "net/third_party/quiche/src/common/platform/api/quiche_endian.h"
diff --git a/http2/decoder/decode_http2_structures.cc b/http2/decoder/decode_http2_structures.cc
index f106ab0..8eccaf8 100644
--- a/http2/decoder/decode_http2_structures.cc
+++ b/http2/decoder/decode_http2_structures.cc
@@ -5,6 +5,7 @@
 #include "net/third_party/quiche/src/http2/decoder/decode_http2_structures.h"
 
 #include <cstdint>
+#include <cstring>
 
 #include "net/third_party/quiche/src/http2/decoder/decode_buffer.h"
 #include "net/third_party/quiche/src/http2/http2_constants.h"
diff --git a/http2/decoder/http2_structure_decoder.cc b/http2/decoder/http2_structure_decoder.cc
index f30a91b..3a5b1eb 100644
--- a/http2/decoder/http2_structure_decoder.cc
+++ b/http2/decoder/http2_structure_decoder.cc
@@ -5,6 +5,7 @@
 #include "net/third_party/quiche/src/http2/decoder/http2_structure_decoder.h"
 
 #include <algorithm>
+#include <cstring>
 
 #include "net/third_party/quiche/src/http2/platform/api/http2_bug_tracker.h"
 
diff --git a/quic/core/crypto/curve25519_key_exchange.cc b/quic/core/crypto/curve25519_key_exchange.cc
index f4cc793..2f19e9d 100644
--- a/quic/core/crypto/curve25519_key_exchange.cc
+++ b/quic/core/crypto/curve25519_key_exchange.cc
@@ -5,6 +5,7 @@
 #include "net/third_party/quiche/src/quic/core/crypto/curve25519_key_exchange.h"
 
 #include <cstdint>
+#include <cstring>
 #include <string>
 
 #include "third_party/boringssl/src/include/openssl/curve25519.h"
diff --git a/quic/core/crypto/p256_key_exchange.cc b/quic/core/crypto/p256_key_exchange.cc
index a1b45ba..01f345d 100644
--- a/quic/core/crypto/p256_key_exchange.cc
+++ b/quic/core/crypto/p256_key_exchange.cc
@@ -5,6 +5,7 @@
 #include "net/third_party/quiche/src/quic/core/crypto/p256_key_exchange.h"
 
 #include <cstdint>
+#include <cstring>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/quic/core/quic_circular_deque.h b/quic/core/quic_circular_deque.h
index 997740b..15b5cb6 100644
--- a/quic/core/quic_circular_deque.h
+++ b/quic/core/quic_circular_deque.h
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstring>
 #include <iterator>
 #include <memory>
 #include <ostream>
diff --git a/quic/core/quic_error_codes.cc b/quic/core/quic_error_codes.cc
index e8324b5..6afccfe 100644
--- a/quic/core/quic_error_codes.cc
+++ b/quic/core/quic_error_codes.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/third_party/quiche/src/quic/core/quic_error_codes.h"
 #include <cstdint>
+#include <cstring>
+
 #include "third_party/boringssl/src/include/openssl/ssl.h"
+#include "net/third_party/quiche/src/quic/core/quic_error_codes.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
 #include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h"
 
diff --git a/quic/platform/api/quic_socket_address.cc b/quic/platform/api/quic_socket_address.cc
index 72debb9..ee3c3be 100644
--- a/quic/platform/api/quic_socket_address.cc
+++ b/quic/platform/api/quic_socket_address.cc
@@ -4,6 +4,7 @@
 
 #include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h"
 
+#include <cstring>
 #include <limits>
 #include <string>
 
diff --git a/spdy/core/spdy_header_storage.cc b/spdy/core/spdy_header_storage.cc
index d6b7abc..90493e1 100644
--- a/spdy/core/spdy_header_storage.cc
+++ b/spdy/core/spdy_header_storage.cc
@@ -1,5 +1,7 @@
 #include "net/third_party/quiche/src/spdy/core/spdy_header_storage.h"
 
+#include <cstring>
+
 #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"
 
 namespace spdy {
diff --git a/spdy/core/spdy_simple_arena.cc b/spdy/core/spdy_simple_arena.cc
index f7d48b4..d6745bf 100644
--- a/spdy/core/spdy_simple_arena.cc
+++ b/spdy/core/spdy_simple_arena.cc
@@ -5,6 +5,7 @@
 #include "net/third_party/quiche/src/spdy/core/spdy_simple_arena.h"
 
 #include <algorithm>
+#include <cstring>
 
 #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h"