diff --git a/quiche/common/platform/default/quiche_platform_impl/quiche_containers_impl.h b/quiche/common/platform/default/quiche_platform_impl/quiche_containers_impl.h
index 56ce474..ded2e40 100644
--- a/quiche/common/platform/default/quiche_platform_impl/quiche_containers_impl.h
+++ b/quiche/common/platform/default/quiche_platform_impl/quiche_containers_impl.h
@@ -5,13 +5,8 @@
 #ifndef QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_CONTAINERS_IMPL_H_
 #define QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_CONTAINERS_IMPL_H_
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-
 #include "absl/container/btree_set.h"
 
-#pragma clang diagnostic pop
-
 namespace quiche {
 
 template <typename Key, typename Compare>
diff --git a/quiche/quic/core/proto/cached_network_parameters_proto.h b/quiche/quic/core/proto/cached_network_parameters_proto.h
index 90c9156..2b43885 100644
--- a/quiche/quic/core/proto/cached_network_parameters_proto.h
+++ b/quiche/quic/core/proto/cached_network_parameters_proto.h
@@ -5,11 +5,6 @@
 #ifndef QUICHE_QUIC_CORE_PROTO_CACHED_NETWORK_PARAMETERS_PROTO_H_
 #define QUICHE_QUIC_CORE_PROTO_CACHED_NETWORK_PARAMETERS_PROTO_H_
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-
 #include "quiche/quic/core/proto/cached_network_parameters.pb.h"
 
-#pragma clang diagnostic pop
-
 #endif  // QUICHE_QUIC_CORE_PROTO_CACHED_NETWORK_PARAMETERS_PROTO_H_
diff --git a/quiche/quic/core/proto/crypto_server_config_proto.h b/quiche/quic/core/proto/crypto_server_config_proto.h
index 5d50ff8..feda6ee 100644
--- a/quiche/quic/core/proto/crypto_server_config_proto.h
+++ b/quiche/quic/core/proto/crypto_server_config_proto.h
@@ -5,11 +5,6 @@
 #ifndef QUICHE_QUIC_CORE_PROTO_CRYPTO_SERVER_CONFIG_PROTO_H_
 #define QUICHE_QUIC_CORE_PROTO_CRYPTO_SERVER_CONFIG_PROTO_H_
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-
 #include "quiche/quic/core/proto/crypto_server_config.pb.h"
 
-#pragma clang diagnostic pop
-
 #endif  // QUICHE_QUIC_CORE_PROTO_CRYPTO_SERVER_CONFIG_PROTO_H_
diff --git a/quiche/quic/core/proto/source_address_token_proto.h b/quiche/quic/core/proto/source_address_token_proto.h
index 3144ca1..55c2c00 100644
--- a/quiche/quic/core/proto/source_address_token_proto.h
+++ b/quiche/quic/core/proto/source_address_token_proto.h
@@ -5,11 +5,6 @@
 #ifndef QUICHE_QUIC_CORE_PROTO_SOURCE_ADDRESS_TOKEN_PROTO_H_
 #define QUICHE_QUIC_CORE_PROTO_SOURCE_ADDRESS_TOKEN_PROTO_H_
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-
 #include "quiche/quic/core/proto/source_address_token.pb.h"
 
-#pragma clang diagnostic pop
-
 #endif  // QUICHE_QUIC_CORE_PROTO_SOURCE_ADDRESS_TOKEN_PROTO_H_
diff --git a/quiche/quic/load_balancer/load_balancer_server_id_test.cc b/quiche/quic/load_balancer/load_balancer_server_id_test.cc
index ab15094..91fcc57 100644
--- a/quiche/quic/load_balancer/load_balancer_server_id_test.cc
+++ b/quiche/quic/load_balancer/load_balancer_server_id_test.cc
@@ -4,13 +4,8 @@
 
 #include "quiche/quic/load_balancer/load_balancer_server_id.h"
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-
 #include "absl/hash/hash_testing.h"
 
-#pragma clang diagnostic pop
-
 #include "quiche/quic/platform/api/quic_expect_bug.h"
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"