diff --git a/generator/integration_tests/golden/golden_kitchen_sink_client.h b/generator/integration_tests/golden/golden_kitchen_sink_client.h
index d56d725dd1ef2..6c5f716a2bb84 100644
--- a/generator/integration_tests/golden/golden_kitchen_sink_client.h
+++ b/generator/integration_tests/golden/golden_kitchen_sink_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CLIENT_H
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection.h b/generator/integration_tests/golden/golden_kitchen_sink_connection.h
index fadd800f282a5..9e28dc7a90551 100644
--- a/generator/integration_tests/golden/golden_kitchen_sink_connection.h
+++ b/generator/integration_tests/golden/golden_kitchen_sink_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 
@@ -46,5 +47,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_H
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h b/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h
index 9917eabc4d73e..c1daf09003253 100644
--- a/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h
+++ b/generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 
 namespace google {
@@ -36,5 +37,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/generator/integration_tests/golden/golden_kitchen_sink_options.h b/generator/integration_tests/golden/golden_kitchen_sink_options.h
index d341c6a472e8e..6c6082b29056e 100644
--- a/generator/integration_tests/golden/golden_kitchen_sink_options.h
+++ b/generator/integration_tests/golden/golden_kitchen_sink_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
@@ -44,5 +45,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_GOLDEN_KITCHEN_SINK_OPTIONS_H
diff --git a/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h b/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h
index cdc30e3cc27c5..1133a953e9afb 100644
--- a/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h
+++ b/generator/integration_tests/golden/mocks/mock_golden_kitchen_sink_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/deprecated_client.cc b/generator/integration_tests/golden/v1/deprecated_client.cc
index 98924b99a70a2..4460d2c3f2d15 100644
--- a/generator/integration_tests/golden/v1/deprecated_client.cc
+++ b/generator/integration_tests/golden/v1/deprecated_client.cc
@@ -43,3 +43,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/deprecated_client.h b/generator/integration_tests/golden/v1/deprecated_client.h
index d7eb4f8c67633..cc516e3fd6b27 100644
--- a/generator/integration_tests/golden/v1/deprecated_client.h
+++ b/generator/integration_tests/golden/v1/deprecated_client.h
@@ -123,5 +123,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CLIENT_H
diff --git a/generator/integration_tests/golden/v1/deprecated_connection.cc b/generator/integration_tests/golden/v1/deprecated_connection.cc
index 66fcf200333b8..cc4c65e33b6ee 100644
--- a/generator/integration_tests/golden/v1/deprecated_connection.cc
+++ b/generator/integration_tests/golden/v1/deprecated_connection.cc
@@ -64,3 +64,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/deprecated_connection.h b/generator/integration_tests/golden/v1/deprecated_connection.h
index 33dbdb6d0f041..92689028d7f17 100644
--- a/generator/integration_tests/golden/v1/deprecated_connection.h
+++ b/generator/integration_tests/golden/v1/deprecated_connection.h
@@ -207,5 +207,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.cc b/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.cc
index c43fa17bcba82..757da1bef4b4b 100644
--- a/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.cc
+++ b/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.cc
@@ -47,3 +47,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h
index f818b1fc5852a..2a49149e3990a 100644
--- a/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h
+++ b/generator/integration_tests/golden/v1/deprecated_connection_idempotency_policy.h
@@ -48,5 +48,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/generator/integration_tests/golden/v1/deprecated_options.h b/generator/integration_tests/golden/v1/deprecated_options.h
index 8e8d0a4ffddbc..36e9267b47f01 100644
--- a/generator/integration_tests/golden/v1/deprecated_options.h
+++ b/generator/integration_tests/golden/v1/deprecated_options.h
@@ -73,5 +73,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_OPTIONS_H
diff --git a/generator/integration_tests/golden/v1/deprecated_rest_connection.cc b/generator/integration_tests/golden/v1/deprecated_rest_connection.cc
index fa27d29d93cbd..d00a20abcbaf1 100644
--- a/generator/integration_tests/golden/v1/deprecated_rest_connection.cc
+++ b/generator/integration_tests/golden/v1/deprecated_rest_connection.cc
@@ -56,3 +56,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/deprecated_rest_connection.h b/generator/integration_tests/golden/v1/deprecated_rest_connection.h
index 8c509353b9e01..f9c43c3fa1eba 100644
--- a/generator/integration_tests/golden/v1/deprecated_rest_connection.h
+++ b/generator/integration_tests/golden/v1/deprecated_rest_connection.h
@@ -61,5 +61,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_DEPRECATED_REST_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc
index 73f3e97457b67..4d903f60804cc 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc
@@ -16,6 +16,8 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h"
 #include <memory>
@@ -212,3 +214,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h
index 2bbc80a7ff323..e701b1a7aba52 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -909,5 +910,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CLIENT_H
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc
index 96daeb8189fb1..aed3d046ad105 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h"
@@ -151,3 +152,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h
index 6c7ac2a9bd245..620b39131c2df 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
@@ -253,5 +254,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc
index 2d3eb94d5b0c3..0f87b4bb91e98 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 #include <memory>
 
@@ -90,3 +91,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h
index cfb7da3604b1f..b48bdc0bdf825 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <generator/integration_tests/test.grpc.pb.h>
@@ -83,5 +84,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_options.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_options.h
index c070f8e825bfc..bb754145e674c 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_options.h
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -72,5 +73,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_OPTIONS_H
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.cc b/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.cc
index 85a418fc25022..13e8817a9b004 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.cc
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h"
@@ -55,3 +56,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.h b/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.h
index eb6c39094df40..b26796e5a47bb 100644
--- a/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.h
+++ b/generator/integration_tests/golden/v1/golden_kitchen_sink_rest_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_REST_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_REST_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -60,5 +61,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_GOLDEN_KITCHEN_SINK_REST_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc
index 8f6a9fcaf66b6..8565c2a7ac6e8 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.cc
@@ -45,3 +45,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h
index 948b2b92ed011..76816a6c0f7f1 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_auth_decorator.h
@@ -53,5 +53,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_AUTH_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.cc b/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.cc
index ba512c0132efb..d6c736ce2f629 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.cc
@@ -75,3 +75,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h b/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h
index 1f4e27c322044..a80637fc0861f 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_connection_impl.h
@@ -62,5 +62,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_CONNECTION_IMPL_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc
index fd3fe04cdf8d0..0ec0fea0299dd 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.cc
@@ -56,3 +56,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h
index ef62c7c39caf4..7ca71d53be024 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_logging_decorator.h
@@ -53,5 +53,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_LOGGING_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc
index c20c965fdd7ab..bd26eb4930666 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc
@@ -71,3 +71,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h
index b3df571b3d9f7..e42689de4392e 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h
@@ -60,5 +60,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_METADATA_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.cc b/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.cc
index 73efcf2693b4d..d65b3f2946aec 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.cc
@@ -62,3 +62,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h b/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h
index 32f71550325ef..9305995aa8728 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_option_defaults.h
@@ -34,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_OPTION_DEFAULTS_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.cc b/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.cc
index 8614fa9f5db7d..b34965946ec72 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.cc
@@ -57,3 +57,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.h
index 8dbd70cc188f0..77a26900d8b2d 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_connection_impl.h
@@ -76,5 +76,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_CONNECTION_IMPL_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.cc
index dc9cb7580c1ff..3a66b9d6a1d70 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.cc
@@ -53,3 +53,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h
index c251b57091919..2f404262d6c60 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_logging_decorator.h
@@ -56,5 +56,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_LOGGING_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc
index adc65827303d8..e69e520b67508 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc
@@ -59,3 +59,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h
index c9c0002d8a5f9..cdfd83e381b79 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h
@@ -57,5 +57,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_METADATA_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc
index e58e74c1474db..59a14f47024f4 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc
@@ -56,3 +56,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h
index ac02c5019c130..6c74d93730493 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h
@@ -64,5 +64,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_STUB_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.cc b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.cc
index 362a91352675e..8eaf3f8eabec7 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.cc
@@ -57,3 +57,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h
index cf257f9add21c..46a15cb21340f 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_rest_stub_factory.h
@@ -37,5 +37,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_REST_STUB_FACTORY_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_retry_traits.h b/generator/integration_tests/golden/v1/internal/deprecated_retry_traits.h
index e7bb228b1d856..a3c5e5eef8a32 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_retry_traits.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_retry_traits.h
@@ -39,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_RETRY_TRAITS_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_sources.cc b/generator/integration_tests/golden/v1/internal/deprecated_sources.cc
index 22adbe82a469a..96bb7cd1d479f 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_sources.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_sources.cc
@@ -36,4 +36,5 @@
 #include "generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc"
 #include "generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc"
 #include "generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub.cc b/generator/integration_tests/golden/v1/internal/deprecated_stub.cc
index 198b961b50bc9..348ef1370f8a8 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_stub.cc
@@ -48,3 +48,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub.h b/generator/integration_tests/golden/v1/internal/deprecated_stub.h
index 44837af0131f8..6f5b8f2d75350 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_stub.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_stub.h
@@ -61,5 +61,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_STUB_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc b/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc
index 3cc56203e2f95..2f30a0b188fc5 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.cc
@@ -72,3 +72,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.h b/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.h
index 90417eba91707..e8db3419e7607 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_stub_factory.h
@@ -39,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_STUB_FACTORY_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc
index 72a46456be9fb..adcf64e5c93ca 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc
@@ -57,3 +57,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h b/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h
index 063dac2c619c4..e2ce66be55e68 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h
@@ -64,5 +64,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_TRACING_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc
index 6583dff1502f9..9ea791f6ade00 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc
@@ -59,3 +59,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h b/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h
index 2aeab6eeeddea..6e49a5cf3fd07 100644
--- a/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h
+++ b/generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h
@@ -64,5 +64,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_DEPRECATED_TRACING_STUB_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc
index 9ba86c1582d76..cbb0586388e3c 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h"
 #include "google/cloud/internal/async_read_write_stream_auth.h"
 #include "google/cloud/internal/async_streaming_read_rpc_auth.h"
@@ -225,3 +226,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h
index 6878af270a2bf..dd9df481f52e7 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -143,5 +144,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_AUTH_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc
index 31dc189cf626f..e19b3b9a65d23 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -279,3 +280,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h
index fbe724ab958d9..6f2044c378673 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
@@ -108,5 +109,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_CONNECTION_IMPL_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc
index ddbd94428d4f6..c3db7c3375ecf 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h"
 #include "google/cloud/internal/async_read_write_stream_logging.h"
 #include "google/cloud/internal/async_streaming_read_rpc_logging.h"
@@ -323,3 +324,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h
index 6b1e9cc829e78..2e5a1f1288812 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -144,5 +145,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_LOGGING_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc
index 42de8cb22315a..4cc5cba5d549f 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -284,3 +285,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h
index 1d311a70ace4f..61c2842b0cf34 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -150,5 +151,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_METADATA_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc
index e8c2f7433f1ea..eba482c3dc5fc 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
@@ -61,3 +62,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h
index 020850fe00b8a..b95ea1ed3f12d 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_OPTION_DEFAULTS_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.cc
index 38f0c83f996fa..4e6c1f09661f7 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h"
 #include "google/cloud/common_options.h"
@@ -220,3 +221,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.h
index 1f16a5d8f1713..706a402563e02 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
@@ -106,5 +107,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_CONNECTION_IMPL_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc
index ee13e209b9839..eb12ef70a1e3e 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -192,3 +193,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h
index df10cae810a7f..3b198e2bb0d7d 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h"
 #include "google/cloud/future.h"
 #include "google/cloud/internal/rest_context.h"
@@ -95,5 +96,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_LOGGING_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc
index 1ae999a7c3717..18854519e95d5 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h"
 #include "absl/strings/str_format.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -194,3 +195,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h
index be9f9bc99b00f..aec0a0f5321ef 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h"
 #include "google/cloud/future.h"
 #include "google/cloud/rest_options.h"
@@ -96,5 +97,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_METADATA_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc
index c99d9c8015f51..b4deccc2aba6c 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h"
 #include "google/cloud/common_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -170,3 +171,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h
index 5967727ed7a73..0d83c8156aa0e 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/completion_queue.h"
 #include "google/cloud/internal/rest_client.h"
 #include "google/cloud/internal/rest_context.h"
@@ -147,5 +148,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc
index 0e91b257a9a3d..89c2a5e7e7824 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h"
 #include "absl/strings/match.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_logging_decorator.h"
@@ -56,3 +57,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h
index 0fc7c30040b8f..f90af8ce4db3c 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -36,5 +37,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_REST_STUB_FACTORY_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h
index aa7bde30efe20..c78a1bbcd91b5 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_RETRY_TRAITS_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc
index dca9944170b7c..dfba9fea2b0ec 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h"
 #include <memory>
 #include <mutex>
@@ -176,3 +177,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h
index b33762b040970..5718f9871e765 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_round_robin_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -144,5 +145,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_ROUND_ROBIN_DECORATOR_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_sources.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_sources.cc
index 0e37eb5d5d66f..d38aa7e5cf632 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_sources.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_sources.cc
@@ -17,6 +17,7 @@
 // source: generator/integration_tests/test.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.cc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.cc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.cc"
@@ -36,4 +37,5 @@
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc
index 116f81d935b47..7bb005644c598 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/internal/async_read_write_stream_impl.h"
@@ -259,3 +260,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h
index 9051aadd25728..2f8d3ba8a3f6c 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/async_streaming_read_write_rpc.h"
 #include "google/cloud/completion_queue.h"
 #include "google/cloud/future.h"
@@ -265,5 +266,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc
index b3b0beca42d6d..537422e03a61b 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_auth_decorator.h"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_logging_decorator.h"
@@ -77,3 +78,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h
index e680ee1ec8657..f81a29a19c7b4 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_STUB_FACTORY_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc
index c1cd546b9b301..f33dc0b4f323d 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -153,3 +154,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h
index ab3c947fc10fa..02b6cd2a71b90 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -104,5 +105,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_TRACING_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc
index 32f1dcee73593..3c550b2572fea 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h"
 #include "google/cloud/internal/async_read_write_stream_tracing.h"
 #include "google/cloud/internal/async_streaming_read_rpc_tracing.h"
@@ -257,3 +258,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h
index 5713f2b4a7fac..ea6236b3704cd 100644
--- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h
+++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -154,5 +155,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_INTERNAL_GOLDEN_KITCHEN_SINK_TRACING_STUB_H
diff --git a/generator/integration_tests/golden/v1/mocks/mock_deprecated_connection.h b/generator/integration_tests/golden/v1/mocks/mock_deprecated_connection.h
index da0b25b2e3a61..f9a65a18161ca 100644
--- a/generator/integration_tests/golden/v1/mocks/mock_deprecated_connection.h
+++ b/generator/integration_tests/golden/v1/mocks/mock_deprecated_connection.h
@@ -56,5 +56,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_DEPRECATED_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h b/generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h
index 4dd03ae816fd3..128ebebab7b2a 100644
--- a/generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h
+++ b/generator/integration_tests/golden/v1/mocks/mock_golden_kitchen_sink_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection.h"
 #include <gmock/gmock.h>
 
@@ -108,5 +109,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GENERATOR_INTEGRATION_TESTS_GOLDEN_V1_MOCKS_MOCK_GOLDEN_KITCHEN_SINK_CONNECTION_H
diff --git a/generator/integration_tests/golden/v1/samples/deprecated_client_samples.cc b/generator/integration_tests/golden/v1/samples/deprecated_client_samples.cc
index 350d909ce97e8..88deb2ea1f905 100644
--- a/generator/integration_tests/golden/v1/samples/deprecated_client_samples.cc
+++ b/generator/integration_tests/golden/v1/samples/deprecated_client_samples.cc
@@ -144,3 +144,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc b/generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc
index f7c47da7a56f9..379dc9fc0f9f0 100644
--- a/generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc
+++ b/generator/integration_tests/golden/v1/samples/golden_kitchen_sink_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: generator/integration_tests/test.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_client.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_connection_idempotency_policy.h"
 #include "generator/integration_tests/golden/v1/golden_kitchen_sink_options.h"
@@ -143,3 +144,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/generator/internal/auth_decorator_generator.cc b/generator/internal/auth_decorator_generator.cc
index 7fa235742f85e..b73eb3ad1c302 100644
--- a/generator/internal/auth_decorator_generator.cc
+++ b/generator/internal/auth_decorator_generator.cc
@@ -79,6 +79,7 @@ class $auth_class_name$ : public $stub_class_name$ {
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -360,6 +361,7 @@ future<Status> $auth_class_name$::AsyncCancelOperation(
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/client_generator.cc b/generator/internal/client_generator.cc
index b1b2b2e740027..41ac60e936d0b 100644
--- a/generator/internal/client_generator.cc
+++ b/generator/internal/client_generator.cc
@@ -392,6 +392,7 @@ R"""(  std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
   HeaderPrint("};\n");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -728,6 +729,7 @@ std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/connection_generator.cc b/generator/internal/connection_generator.cc
index 9d2aa81503aff..20a21c7464858 100644
--- a/generator/internal/connection_generator.cc
+++ b/generator/internal/connection_generator.cc
@@ -320,7 +320,7 @@ class $connection_class_name$ {
   }
 
   HeaderCloseNamespaces();
-
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -508,7 +508,7 @@ void BigQueryReadReadRowsStreamingUpdater(
 )""");
     CcCloseNamespaces();
   }
-
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/connection_impl_generator.cc b/generator/internal/connection_impl_generator.cc
index a94c54217a7c4..657025bb7856a 100644
--- a/generator/internal/connection_impl_generator.cc
+++ b/generator/internal/connection_impl_generator.cc
@@ -136,7 +136,7 @@ class $connection_class_name$Impl
   HeaderPrint("\n};\n");
 
   HeaderCloseNamespaces();
-
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -242,6 +242,7 @@ void $service_name$$method_name$StreamingUpdater(
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/connection_impl_rest_generator.cc b/generator/internal/connection_impl_rest_generator.cc
index 5703b6b98cf8f..51c61e9367988 100644
--- a/generator/internal/connection_impl_rest_generator.cc
+++ b/generator/internal/connection_impl_rest_generator.cc
@@ -127,6 +127,7 @@ class $connection_impl_rest_class_name$
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
 }
@@ -194,6 +195,7 @@ Status ConnectionImplRestGenerator::GenerateCc() {
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/connection_rest_generator.cc b/generator/internal/connection_rest_generator.cc
index 094cab268f2b8..20d330d026ef3 100644
--- a/generator/internal/connection_rest_generator.cc
+++ b/generator/internal/connection_rest_generator.cc
@@ -120,6 +120,7 @@ std::shared_ptr<$connection_class_name$> Make$connection_class_name$Rest(
   }
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -195,6 +196,7 @@ std::shared_ptr<$connection_class_name$> Make$connection_class_name$Rest(
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/forwarding_client_generator.cc b/generator/internal/forwarding_client_generator.cc
index 73bfff5530528..c26b402da5742 100644
--- a/generator/internal/forwarding_client_generator.cc
+++ b/generator/internal/forwarding_client_generator.cc
@@ -61,6 +61,7 @@ using ::google::cloud::$product_namespace$::$client_class_name$;
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint(R"""(
 #endif  // $header_include_guard$
diff --git a/generator/internal/forwarding_connection_generator.cc b/generator/internal/forwarding_connection_generator.cc
index 8447ed3dbf0d7..df76fada232db 100644
--- a/generator/internal/forwarding_connection_generator.cc
+++ b/generator/internal/forwarding_connection_generator.cc
@@ -92,6 +92,7 @@ using ::google::cloud::$product_namespace$::$retry_policy_name$;
   }
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint(R"""(
 #endif  // $header_include_guard$
diff --git a/generator/internal/forwarding_idempotency_policy_generator.cc b/generator/internal/forwarding_idempotency_policy_generator.cc
index 3fbab6c018141..1eb5f8e3ed0df 100644
--- a/generator/internal/forwarding_idempotency_policy_generator.cc
+++ b/generator/internal/forwarding_idempotency_policy_generator.cc
@@ -60,6 +60,7 @@ using ::google::cloud::$product_namespace$::$idempotency_class_name$;
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint(R"""(
 #endif  // $header_include_guard$
diff --git a/generator/internal/forwarding_mock_connection_generator.cc b/generator/internal/forwarding_mock_connection_generator.cc
index 4b8cce6971407..394a46af94443 100644
--- a/generator/internal/forwarding_mock_connection_generator.cc
+++ b/generator/internal/forwarding_mock_connection_generator.cc
@@ -60,6 +60,7 @@ using ::google::cloud::$product_namespace$_mocks::$mock_connection_class_name$;
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint(R"""(
 #endif  // $header_include_guard$
diff --git a/generator/internal/forwarding_options_generator.cc b/generator/internal/forwarding_options_generator.cc
index d79882fad809e..3d23a677f9458 100644
--- a/generator/internal/forwarding_options_generator.cc
+++ b/generator/internal/forwarding_options_generator.cc
@@ -73,6 +73,7 @@ using ::google::cloud::$product_namespace$::$service_name$RetryPolicyOption;
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint(R"""(
 #endif  // $header_include_guard$
diff --git a/generator/internal/idempotency_policy_generator.cc b/generator/internal/idempotency_policy_generator.cc
index 9dc9c07dd5916..84877a3c609cd 100644
--- a/generator/internal/idempotency_policy_generator.cc
+++ b/generator/internal/idempotency_policy_generator.cc
@@ -111,6 +111,7 @@ Status IdempotencyPolicyGenerator::GenerateHeader() {
   // clang-format on
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -213,6 +214,7 @@ Idempotency $idempotency_class_name$::$method_name$($request_type$ const&) {
   // clang-format on
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/logging_decorator_generator.cc b/generator/internal/logging_decorator_generator.cc
index dde8fad017019..627a6d9a58aa8 100644
--- a/generator/internal/logging_decorator_generator.cc
+++ b/generator/internal/logging_decorator_generator.cc
@@ -91,6 +91,7 @@ Status LoggingDecoratorGenerator::GenerateHeader() {
   HeaderPrint("};  // $logging_class_name$\n");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
 }
@@ -407,6 +408,7 @@ future<Status> $logging_class_name$::AsyncCancelOperation(
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/logging_decorator_rest_generator.cc b/generator/internal/logging_decorator_rest_generator.cc
index b44dad02b367d..2de7e5d8b5bf1 100644
--- a/generator/internal/logging_decorator_rest_generator.cc
+++ b/generator/internal/logging_decorator_rest_generator.cc
@@ -136,6 +136,7 @@ class $logging_rest_class_name$ : public $stub_rest_class_name$ {
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
 }
@@ -295,6 +296,7 @@ future<Status>
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/metadata_decorator_generator.cc b/generator/internal/metadata_decorator_generator.cc
index b250454086cb1..2f6c1d89176ba 100644
--- a/generator/internal/metadata_decorator_generator.cc
+++ b/generator/internal/metadata_decorator_generator.cc
@@ -163,6 +163,7 @@ class $metadata_class_name$ : public $stub_class_name$ {
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -420,6 +421,7 @@ void $metadata_class_name$::SetMetadata(grpc::ClientContext& context,
 )""");
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/metadata_decorator_rest_generator.cc b/generator/internal/metadata_decorator_rest_generator.cc
index b11eb794dedcb..6cdba1265761e 100644
--- a/generator/internal/metadata_decorator_rest_generator.cc
+++ b/generator/internal/metadata_decorator_rest_generator.cc
@@ -205,6 +205,7 @@ class $metadata_rest_class_name$ : public $stub_rest_class_name$ {
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
 }
@@ -362,6 +363,7 @@ void $metadata_rest_class_name$::SetMetadata(
 )""");
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/mock_connection_generator.cc b/generator/internal/mock_connection_generator.cc
index cef641e3ed9bb..bef3306f50147 100644
--- a/generator/internal/mock_connection_generator.cc
+++ b/generator/internal/mock_connection_generator.cc
@@ -194,6 +194,7 @@ class $mock_connection_class_name$ : public $product_namespace$::$connection_cla
   HeaderPrint("};\n");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
diff --git a/generator/internal/option_defaults_generator.cc b/generator/internal/option_defaults_generator.cc
index b621f7558f582..34056dc2189fe 100644
--- a/generator/internal/option_defaults_generator.cc
+++ b/generator/internal/option_defaults_generator.cc
@@ -72,7 +72,7 @@ Status OptionDefaultsGenerator::GenerateHeader() {
   HeaderPrint("Options options);\n");
 
   HeaderCloseNamespaces();
-
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -188,6 +188,7 @@ auto constexpr kBackoffScaling = 2.0;
 )""");
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/options_generator.cc b/generator/internal/options_generator.cc
index 81e703fea4fb5..9824bbf141dd7 100644
--- a/generator/internal/options_generator.cc
+++ b/generator/internal/options_generator.cc
@@ -124,6 +124,7 @@ using $service_name$PolicyOptionList =
   }
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
diff --git a/generator/internal/retry_traits_generator.cc b/generator/internal/retry_traits_generator.cc
index 9e9929d7fee28..fca4589c961d3 100644
--- a/generator/internal/retry_traits_generator.cc
+++ b/generator/internal/retry_traits_generator.cc
@@ -63,6 +63,7 @@ Status RetryTraitsGenerator::GenerateHeader() {
   );
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
diff --git a/generator/internal/round_robin_decorator_generator.cc b/generator/internal/round_robin_decorator_generator.cc
index 12ebe514c5eda..7d388bfd113f3 100644
--- a/generator/internal/round_robin_decorator_generator.cc
+++ b/generator/internal/round_robin_decorator_generator.cc
@@ -78,6 +78,7 @@ class $round_robin_class_name$ : public $stub_class_name$ {
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -268,6 +269,7 @@ std::shared_ptr<$stub_class_name$>
 )""");
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/sample_generator.cc b/generator/internal/sample_generator.cc
index 7814dc6896459..31a117a685e94 100644
--- a/generator/internal/sample_generator.cc
+++ b/generator/internal/sample_generator.cc
@@ -332,6 +332,7 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
 }
 )""");
 
+  HeaderPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/service_code_generator.cc b/generator/internal/service_code_generator.cc
index b55a1105db68d..3e44142422442 100644
--- a/generator/internal/service_code_generator.cc
+++ b/generator/internal/service_code_generator.cc
@@ -293,13 +293,16 @@ VarsDictionary ServiceCodeGenerator::MergeServiceAndMethodVars(
 
 void ServiceCodeGenerator::HeaderLocalIncludes(
     std::vector<std::string> const& local_includes) {
+  needs_diagnostics_pop_ = IsDeprecated() || HasDeprecatedRpcs();
   GenerateLocalIncludes(header_, local_includes, FileType::kHeaderFile,
-                        IsDeprecated());
+                        needs_diagnostics_pop_);
 }
 
 void ServiceCodeGenerator::CcLocalIncludes(
     std::vector<std::string> const& local_includes) {
-  GenerateLocalIncludes(cc_, local_includes, FileType::kCcFile, IsDeprecated());
+  needs_diagnostics_pop_ = IsDeprecated() || HasDeprecatedRpcs();
+  GenerateLocalIncludes(cc_, local_includes, FileType::kCcFile,
+                        needs_diagnostics_pop_);
 }
 
 void ServiceCodeGenerator::HeaderSystemIncludes(
@@ -519,6 +522,27 @@ bool ServiceCodeGenerator::IsDeprecated() const {
   return service_descriptor_->options().deprecated();
 }
 
+bool ServiceCodeGenerator::HasDeprecatedRpcs() const {
+  for (auto i = 0; i < service_descriptor_->method_count(); ++i) {
+    if (service_descriptor_->method(i)->options().deprecated()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void ServiceCodeGenerator::HeaderPrintDiagnosticsPop() {
+  if (needs_diagnostics_pop_) {
+    HeaderPrint("#include \"google/cloud/internal/diagnostics_pop.inc\"\n");
+  }
+}
+
+void ServiceCodeGenerator::CcPrintDiagnosticsPop() {
+  if (needs_diagnostics_pop_) {
+    CcPrint("#include \"google/cloud/internal/diagnostics_pop.inc\"\n");
+  }
+}
+
 }  // namespace generator_internal
 }  // namespace cloud
 }  // namespace google
diff --git a/generator/internal/service_code_generator.h b/generator/internal/service_code_generator.h
index e645b048e2ae3..0e63cfa0fb923 100644
--- a/generator/internal/service_code_generator.h
+++ b/generator/internal/service_code_generator.h
@@ -242,6 +242,11 @@ class ServiceCodeGenerator : public GeneratorInterface {
    */
   bool IsDeprecated() const;
 
+  bool HasDeprecatedRpcs() const;
+
+  void HeaderPrintDiagnosticsPop();
+  void CcPrintDiagnosticsPop();
+
  private:
   void SetMethods();
 
@@ -263,6 +268,7 @@ class ServiceCodeGenerator : public GeneratorInterface {
   std::map<std::string, VarsDictionary> service_method_vars_;
   std::string namespace_;
   bool define_backwards_compatibility_namespace_alias_ = false;
+  bool needs_diagnostics_pop_ = false;
   MethodDescriptorList methods_;
   MethodDescriptorList async_methods_;
   Printer header_;
diff --git a/generator/internal/sources_generator.cc b/generator/internal/sources_generator.cc
index 7646797c90870..549c2d5ae2091 100644
--- a/generator/internal/sources_generator.cc
+++ b/generator/internal/sources_generator.cc
@@ -55,6 +55,7 @@ Status SourcesGenerator::GenerateHeader() {
   HeaderPrint(R"""(// NOLINTBEGIN(bugprone-suspicious-include)
   )""");
   HeaderLocalIncludes(sources_);
+  HeaderPrintDiagnosticsPop();
   HeaderPrint(R"""(// NOLINTEND(bugprone-suspicious-include)
   )""");
   return Status();
diff --git a/generator/internal/stub_factory_generator.cc b/generator/internal/stub_factory_generator.cc
index 56e3b83c472e7..23500faeb5857 100644
--- a/generator/internal/stub_factory_generator.cc
+++ b/generator/internal/stub_factory_generator.cc
@@ -63,6 +63,7 @@ std::shared_ptr<$stub_class_name$> CreateDefault$stub_class_name$(
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -168,6 +169,7 @@ CreateDefault$stub_class_name$(
 )""");
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/stub_factory_rest_generator.cc b/generator/internal/stub_factory_rest_generator.cc
index 914ea19a28d33..81ac695461911 100644
--- a/generator/internal/stub_factory_rest_generator.cc
+++ b/generator/internal/stub_factory_rest_generator.cc
@@ -58,6 +58,7 @@ std::shared_ptr<$stub_rest_class_name$> CreateDefault$stub_rest_class_name$(
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -106,6 +107,7 @@ CreateDefault$stub_rest_class_name$(Options const& options) {
 )""");
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/stub_generator.cc b/generator/internal/stub_generator.cc
index a3a9b6d95ca88..ddce7b08c8913 100644
--- a/generator/internal/stub_generator.cc
+++ b/generator/internal/stub_generator.cc
@@ -290,6 +290,7 @@ Status StubGenerator::GenerateHeader() {
   HeaderPrint("};\n");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -595,6 +596,7 @@ future<Status> Default$stub_class_name$::AsyncCancelOperation(
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/stub_rest_generator.cc b/generator/internal/stub_rest_generator.cc
index 2921d5090ea31..7c284d9151dc3 100644
--- a/generator/internal/stub_rest_generator.cc
+++ b/generator/internal/stub_rest_generator.cc
@@ -242,6 +242,7 @@ class Default$stub_rest_class_name$ : public $stub_rest_class_name$ {
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -500,6 +501,7 @@ Default$stub_rest_class_name$::AsyncCancelOperation(
   }
 
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/tracing_connection_generator.cc b/generator/internal/tracing_connection_generator.cc
index 1afea7c3997cb..74db938267132 100644
--- a/generator/internal/tracing_connection_generator.cc
+++ b/generator/internal/tracing_connection_generator.cc
@@ -101,7 +101,7 @@ Make$tracing_connection_class_name$(
 )""");
 
   HeaderCloseNamespaces();
-
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -162,6 +162,7 @@ Make$tracing_connection_class_name$(
 }
 )""");
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/generator/internal/tracing_stub_generator.cc b/generator/internal/tracing_stub_generator.cc
index f48aaab69b27e..020a679549aba 100644
--- a/generator/internal/tracing_stub_generator.cc
+++ b/generator/internal/tracing_stub_generator.cc
@@ -87,6 +87,7 @@ std::shared_ptr<$stub_class_name$> Make$tracing_stub_class_name$(
 )""");
 
   HeaderCloseNamespaces();
+  HeaderPrintDiagnosticsPop();
   // close header guard
   HeaderPrint("\n#endif  // $header_include_guard$\n");
   return {};
@@ -358,6 +359,7 @@ std::shared_ptr<$stub_class_name$> Make$tracing_stub_class_name$(
 }
 )""");
   CcCloseNamespaces();
+  CcPrintDiagnosticsPop();
   return {};
 }
 
diff --git a/google/cloud/bigquery/data_transfer_client.h b/google/cloud/bigquery/data_transfer_client.h
index 36d8f6b559544..361d0161b41db 100644
--- a/google/cloud/bigquery/data_transfer_client.h
+++ b/google/cloud/bigquery/data_transfer_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/data_transfer_connection.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_client.h"
 
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CLIENT_H
diff --git a/google/cloud/bigquery/data_transfer_connection.h b/google/cloud/bigquery/data_transfer_connection.h
index 77ae9f1b1c8d8..d7f55100adbad 100644
--- a/google/cloud/bigquery/data_transfer_connection.h
+++ b/google/cloud/bigquery/data_transfer_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/data_transfer_connection_idempotency_policy.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 
@@ -56,5 +57,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_H
diff --git a/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h b/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h
index f84d3426b2e4e..3ceccf67a5dee 100644
--- a/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h
+++ b/google/cloud/bigquery/data_transfer_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
 
 namespace google {
@@ -42,5 +43,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/data_transfer_options.h b/google/cloud/bigquery/data_transfer_options.h
index d930f6ff84c61..ee13e97da5779 100644
--- a/google/cloud/bigquery/data_transfer_options.h
+++ b/google/cloud/bigquery/data_transfer_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/data_transfer_connection.h"
 #include "google/cloud/bigquery/data_transfer_connection_idempotency_policy.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_options.h"
@@ -53,5 +54,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATA_TRANSFER_OPTIONS_H
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_client.cc b/google/cloud/bigquery/datatransfer/v1/data_transfer_client.cc
index d5f73f1079ad6..f5ff15b7ba2ea 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_client.cc
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_client.h"
 #include <memory>
 #include <utility>
@@ -319,3 +320,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_client.h b/google/cloud/bigquery/datatransfer/v1/data_transfer_client.h
index d033c41af40d3..3a71891f2a894 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_client.h
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -1144,5 +1145,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CLIENT_H
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.cc b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.cc
index 7c58ff402a884..1d61213a8a49d 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.cc
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_options.h"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.h"
@@ -188,3 +189,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h
index 6ace2eafbbd60..64b9bc5833ac7 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
@@ -300,5 +301,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_H
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.cc b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.cc
index 37d81dfb6fbc5..e9dbdfc7e7663 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.cc
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
 #include <memory>
 
@@ -152,3 +153,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h
index 6264d14802dd7..221432a1d08c5 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h>
@@ -116,5 +117,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/datatransfer/v1/data_transfer_options.h b/google/cloud/bigquery/datatransfer/v1/data_transfer_options.h
index 5c0db8adcdb87..77f17f3906360 100644
--- a/google/cloud/bigquery/datatransfer/v1/data_transfer_options.h
+++ b/google/cloud/bigquery/datatransfer/v1/data_transfer_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -72,5 +73,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_DATA_TRANSFER_OPTIONS_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc
index 80f1228b847fe..36ffb35d1d9d1 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h"
 #include <google/cloud/bigquery/datatransfer/v1/datatransfer.grpc.pb.h>
 #include <memory>
@@ -211,3 +212,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h
index 01bf27dbad0a9..024bb77dc8931 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -145,5 +146,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_AUTH_DECORATOR_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.cc
index 41f677bed02dd..b4d5bcef6c1fb 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.h"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -456,3 +457,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.h
index 940dc57bf84a4..4db3f0a40b7cf 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_options.h"
@@ -142,5 +143,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_CONNECTION_IMPL_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc
index 2990548cad3da..ed9191239dc0d 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -286,3 +287,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h
index bced4fc54d6bf..3c221c13f91f6 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -145,5 +146,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_LOGGING_DECORATOR_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc
index 86f97235fd5dd..ac407ce843c84 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -239,3 +240,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h
index d9d3239a1a552..32b54fb5a6d51 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -151,5 +152,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_METADATA_DECORATOR_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.cc
index 59d30c64427cb..3386962af8160 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_options.h"
@@ -71,3 +72,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.h
index a9c95ec5d8412..d2980801178a5 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_OPTION_DEFAULTS_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_retry_traits.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_retry_traits.h
index efeae129451ee..2b9760506b421 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_retry_traits.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_RETRY_TRAITS_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_sources.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_sources.cc
index 5fd16d88e75cb..c5f4a2e7b01bc 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_sources.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_sources.cc
@@ -17,6 +17,7 @@
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_client.cc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.cc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc
index 97ff410cf160a..48f054f7e5ae3 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -268,3 +269,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h
index e5a05f61be1e5..2ae7e7bd969a4 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
@@ -262,5 +263,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc
index 9b7f2a0858651..ff4512efeb07f 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.h"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_auth_decorator.h"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_logging_decorator.h"
@@ -74,3 +75,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.h
index d5762b98bf052..52c4f14b884a9 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_STUB_FACTORY_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc
index af3bd81d0053a..8c78a9d212634 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -257,3 +258,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h
index d9841e928c3e2..414b827319293 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -143,5 +144,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_TRACING_CONNECTION_H
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc
index 41b65665dc9a0..ec8759943e1ec 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -296,3 +297,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h
index 6bc13abef5ea1..fabbf3d2f65b5 100644
--- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h
+++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/internal/data_transfer_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -158,5 +159,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_INTERNAL_DATA_TRANSFER_TRACING_STUB_H
diff --git a/google/cloud/bigquery/datatransfer/v1/mocks/mock_data_transfer_connection.h b/google/cloud/bigquery/datatransfer/v1/mocks/mock_data_transfer_connection.h
index f32902e98254e..92645f7779e74 100644
--- a/google/cloud/bigquery/datatransfer/v1/mocks/mock_data_transfer_connection.h
+++ b/google/cloud/bigquery/datatransfer/v1/mocks/mock_data_transfer_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection.h"
 #include <gmock/gmock.h>
 
@@ -165,5 +166,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_datatransfer_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_DATATRANSFER_V1_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
diff --git a/google/cloud/bigquery/datatransfer/v1/samples/data_transfer_client_samples.cc b/google/cloud/bigquery/datatransfer/v1/samples/data_transfer_client_samples.cc
index 0c90d0e7db92d..fb71ce8aab577 100644
--- a/google/cloud/bigquery/datatransfer/v1/samples/data_transfer_client_samples.cc
+++ b/google/cloud/bigquery/datatransfer/v1/samples/data_transfer_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/datatransfer/v1/datatransfer.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_client.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_connection_idempotency_policy.h"
 #include "google/cloud/bigquery/datatransfer/v1/data_transfer_options.h"
@@ -163,3 +164,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/mocks/mock_data_transfer_connection.h b/google/cloud/bigquery/mocks/mock_data_transfer_connection.h
index 5be1967395f73..c3a1e9db0eeab 100644
--- a/google/cloud/bigquery/mocks/mock_data_transfer_connection.h
+++ b/google/cloud/bigquery/mocks/mock_data_transfer_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/data_transfer_connection.h"
 #include "google/cloud/bigquery/datatransfer/v1/mocks/mock_data_transfer_connection.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_DATA_TRANSFER_CONNECTION_H
diff --git a/google/cloud/bigquery/mocks/mock_reservation_connection.h b/google/cloud/bigquery/mocks/mock_reservation_connection.h
index 59193794e893f..a21d85d7656cc 100644
--- a/google/cloud/bigquery/mocks/mock_reservation_connection.h
+++ b/google/cloud/bigquery/mocks/mock_reservation_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_RESERVATION_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_RESERVATION_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/mocks/mock_reservation_connection.h"
 #include "google/cloud/bigquery/reservation_connection.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_MOCKS_MOCK_RESERVATION_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc
index 3e5a576a057de..6d106735e353d 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h"
 #include <google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h>
 #include <memory>
@@ -244,3 +245,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h b/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h
index d6ffdc4dd4280..5b40f2fe5f3d0 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -170,5 +171,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_AUTH_DECORATOR_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.cc
index 4f4bae2922bee..279bdfc2bc68e 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.h"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -510,3 +511,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.h b/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.h
index f9349b38d779d..e3608ad330046 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
@@ -162,5 +163,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_CONNECTION_IMPL_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc
index f7cec9db54798..fcff3db4bf3bd 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -334,3 +335,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h b/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h
index ac557342cfa7a..22ba263de5aab 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -170,5 +171,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_LOGGING_DECORATOR_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc
index aa2507b104099..dd4331a85e5c8 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -276,3 +277,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h b/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h
index 50b0444d1e47a..88eed21b5b2de 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -176,5 +177,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_METADATA_DECORATOR_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.cc
index 3ed3665c332f4..08e94de7f64e0 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_options.h"
@@ -69,3 +70,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h b/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h
index 5e9226fb8711d..d44a615e48758 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_OPTION_DEFAULTS_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h b/google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h
index 160751556204c..02e57df852762 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_RETRY_TRAITS_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_sources.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_sources.cc
index 31fbea95ad798..6054e1813f484 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_sources.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_sources.cc
@@ -17,6 +17,7 @@
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.cc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.cc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/bigquery/reservation/v1/reservation_client.cc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.cc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc
index 70a8728018a58..880e75f7edabb 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -315,3 +316,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h
index bf8f09db881d8..3d18a7a2d4714 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
@@ -303,5 +304,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc
index e8c82beca748c..3b3b1722d9940 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.h"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_auth_decorator.h"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_logging_decorator.h"
@@ -71,3 +72,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.h b/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.h
index 75614c952465c..83483c13b960f 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_STUB_FACTORY_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc
index 6ed3a1f123e4d..f29872c944c3f 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -292,3 +293,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h
index 543f41e4435d6..6d035ffa404c2 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -163,5 +164,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_TRACING_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc
index a7c74c07d2b70..78cccb334db23 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -346,3 +347,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h
index 807c0b215d52d..f717886f54343 100644
--- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h
+++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -183,5 +184,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_INTERNAL_RESERVATION_TRACING_STUB_H
diff --git a/google/cloud/bigquery/reservation/v1/mocks/mock_reservation_connection.h b/google/cloud/bigquery/reservation/v1/mocks/mock_reservation_connection.h
index e63b8a378aee1..cc7e9ca40b9d7 100644
--- a/google/cloud/bigquery/reservation/v1/mocks/mock_reservation_connection.h
+++ b/google/cloud/bigquery/reservation/v1/mocks/mock_reservation_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_MOCKS_MOCK_RESERVATION_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_MOCKS_MOCK_RESERVATION_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include <gmock/gmock.h>
 
@@ -195,5 +196,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_MOCKS_MOCK_RESERVATION_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation/v1/reservation_client.cc b/google/cloud/bigquery/reservation/v1/reservation_client.cc
index 988e188ee4177..fd2559e7dab2c 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_client.cc
+++ b/google/cloud/bigquery/reservation/v1/reservation_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_client.h"
 #include <memory>
 #include <utility>
@@ -446,3 +447,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/reservation_client.h b/google/cloud/bigquery/reservation/v1/reservation_client.h
index 6076a27c9b2a2..58a8fa5cdad11 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_client.h
+++ b/google/cloud/bigquery/reservation/v1/reservation_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -1767,5 +1768,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CLIENT_H
diff --git a/google/cloud/bigquery/reservation/v1/reservation_connection.cc b/google/cloud/bigquery/reservation/v1/reservation_connection.cc
index 07e97da1adf31..aa43608cd77af 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_connection.cc
+++ b/google/cloud/bigquery/reservation/v1/reservation_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_connection_impl.h"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_option_defaults.h"
@@ -203,3 +204,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/reservation_connection.h b/google/cloud/bigquery/reservation/v1/reservation_connection.h
index e0eebb61a4c52..c60ed5044c222 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_connection.h
+++ b/google/cloud/bigquery/reservation/v1/reservation_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/internal/reservation_retry_traits.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -315,5 +316,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.cc b/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.cc
index 08897c7852b75..f81d517a8b62b 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.cc
+++ b/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h"
 #include <memory>
 
@@ -167,3 +168,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h b/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h
index cd2d1368bdcdc..159b4c1e8c735 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h
+++ b/google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/cloud/bigquery/reservation/v1/reservation.grpc.pb.h>
@@ -128,5 +129,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/reservation/v1/reservation_options.h b/google/cloud/bigquery/reservation/v1/reservation_options.h
index e4dcee83de905..f9a3634582e55 100644
--- a/google/cloud/bigquery/reservation/v1/reservation_options.h
+++ b/google/cloud/bigquery/reservation/v1/reservation_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -72,5 +73,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery_reservation_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_V1_RESERVATION_OPTIONS_H
diff --git a/google/cloud/bigquery/reservation/v1/samples/reservation_client_samples.cc b/google/cloud/bigquery/reservation/v1/samples/reservation_client_samples.cc
index b60e2f18e0405..f91694ff5d3ec 100644
--- a/google/cloud/bigquery/reservation/v1/samples/reservation_client_samples.cc
+++ b/google/cloud/bigquery/reservation/v1/samples/reservation_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/bigquery/reservation/v1/reservation.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_client.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h"
 #include "google/cloud/bigquery/reservation/v1/reservation_options.h"
@@ -164,3 +165,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/bigquery/reservation_client.h b/google/cloud/bigquery/reservation_client.h
index a728f4643c7b2..2ceb527e6c3c8 100644
--- a/google/cloud/bigquery/reservation_client.h
+++ b/google/cloud/bigquery/reservation_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_client.h"
 #include "google/cloud/bigquery/reservation_connection.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CLIENT_H
diff --git a/google/cloud/bigquery/reservation_connection.h b/google/cloud/bigquery/reservation_connection.h
index 40bde54134e36..b3b0bc38f7958 100644
--- a/google/cloud/bigquery/reservation_connection.h
+++ b/google/cloud/bigquery/reservation_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection.h"
 #include "google/cloud/bigquery/reservation_connection_idempotency_policy.h"
 
@@ -55,5 +56,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_H
diff --git a/google/cloud/bigquery/reservation_connection_idempotency_policy.h b/google/cloud/bigquery/reservation_connection_idempotency_policy.h
index 2a1982ec17c4b..1b89e380fb050 100644
--- a/google/cloud/bigquery/reservation_connection_idempotency_policy.h
+++ b/google/cloud/bigquery/reservation_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_connection_idempotency_policy.h"
 
 namespace google {
@@ -42,5 +43,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/bigquery/reservation_options.h b/google/cloud/bigquery/reservation_options.h
index 6c3e565432c51..e4529c4704aa6 100644
--- a/google/cloud/bigquery/reservation_options.h
+++ b/google/cloud/bigquery/reservation_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/bigquery/reservation/v1/reservation_options.h"
 #include "google/cloud/bigquery/reservation_connection.h"
 #include "google/cloud/bigquery/reservation_connection_idempotency_policy.h"
@@ -53,5 +54,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace bigquery
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGQUERY_RESERVATION_OPTIONS_H
diff --git a/google/cloud/channel/v1/cloud_channel_reports_client.cc b/google/cloud/channel/v1/cloud_channel_reports_client.cc
index 9f8170bf7e6c8..84fd1d7f238d7 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_client.cc
+++ b/google/cloud/channel/v1/cloud_channel_reports_client.cc
@@ -156,3 +156,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/cloud_channel_reports_client.h b/google/cloud/channel/v1/cloud_channel_reports_client.h
index 454eea919eb0d..d737b86ca0e66 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_client.h
+++ b/google/cloud/channel/v1/cloud_channel_reports_client.h
@@ -684,5 +684,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CLIENT_H
diff --git a/google/cloud/channel/v1/cloud_channel_reports_connection.cc b/google/cloud/channel/v1/cloud_channel_reports_connection.cc
index 55adbd4dc1e90..458286860c720 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_connection.cc
+++ b/google/cloud/channel/v1/cloud_channel_reports_connection.cc
@@ -125,3 +125,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/cloud_channel_reports_connection.h b/google/cloud/channel/v1/cloud_channel_reports_connection.h
index a1bec0f6aebc9..f872cbc1ff011 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_connection.h
+++ b/google/cloud/channel/v1/cloud_channel_reports_connection.h
@@ -264,5 +264,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CONNECTION_H
diff --git a/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.cc b/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.cc
index 521be7414bb60..60315dda1c6da 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.cc
+++ b/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.cc
@@ -85,3 +85,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h b/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h
index f2c14443e49bc..5201259c1a327 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h
+++ b/google/cloud/channel/v1/cloud_channel_reports_connection_idempotency_policy.h
@@ -68,5 +68,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/channel/v1/cloud_channel_reports_options.h b/google/cloud/channel/v1/cloud_channel_reports_options.h
index 84c403c1c31aa..9cc5050356a1e 100644
--- a/google/cloud/channel/v1/cloud_channel_reports_options.h
+++ b/google/cloud/channel/v1/cloud_channel_reports_options.h
@@ -85,5 +85,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_CLOUD_CHANNEL_REPORTS_OPTIONS_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc
index b43c92875c062..c26e7ebcc1c9d 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.cc
@@ -153,3 +153,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h
index 88147f4b2ba8a..59805095d2d16 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_auth_decorator.h
@@ -97,5 +97,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_AUTH_DECORATOR_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.cc
index 1264ef3378844..8ce54ad916fc7 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.cc
@@ -313,3 +313,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h b/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h
index 30b266b668b07..f8396a6aa4b2e 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_connection_impl.h
@@ -92,5 +92,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_CONNECTION_IMPL_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc
index 070c1478bbbcd..220bda5be44bd 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.cc
@@ -176,3 +176,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h
index f5994de4f2ef0..aead1080c95ab 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_logging_decorator.h
@@ -98,5 +98,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_LOGGING_DECORATOR_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc
index dd576ee77f88e..ac36310db5d26 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.cc
@@ -159,3 +159,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h
index 9c7765fc10dc8..7fe372484ac37 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_metadata_decorator.h
@@ -104,5 +104,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_METADATA_DECORATOR_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.cc
index 00f77d5b6dd8a..dbacda2a69816 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.cc
@@ -86,3 +86,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.h b/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.h
index 6059740adbe3b..1f3cd65a3085f 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_option_defaults.h
@@ -34,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_OPTION_DEFAULTS_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_retry_traits.h b/google/cloud/channel/v1/internal/cloud_channel_reports_retry_traits.h
index eebbbe2e50fe3..cf1172293a615 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_retry_traits.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_retry_traits.h
@@ -40,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_RETRY_TRAITS_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_sources.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_sources.cc
index 519e066e12778..c57366d416965 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_sources.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_sources.cc
@@ -30,4 +30,5 @@
 #include "google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc"
 #include "google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc"
 #include "google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc
index 850459fd894dc..556609331f5e8 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.cc
@@ -175,3 +175,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h
index 3323159b099d7..558cf97f111d7 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub.h
@@ -160,5 +160,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_STUB_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc
index fcbb009c595fd..ae6259fbdc33d 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.cc
@@ -74,3 +74,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.h b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.h
index 225b6406b47f2..1c2116156314a 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_stub_factory.h
@@ -40,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_STUB_FACTORY_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc
index acb8052875371..771c6a402e408 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc
@@ -139,3 +139,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h
index 3f8ea51dc7d84..8dcea302c4a56 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.h
@@ -90,5 +90,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_TRACING_CONNECTION_H
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc
index c34b0b38c89c9..6f5d718c62734 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc
@@ -175,3 +175,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h
index ccc6d6a1f55ed..25f7557276fe3 100644
--- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h
+++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.h
@@ -111,5 +111,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_INTERNAL_CLOUD_CHANNEL_REPORTS_TRACING_STUB_H
diff --git a/google/cloud/channel/v1/mocks/mock_cloud_channel_reports_connection.h b/google/cloud/channel/v1/mocks/mock_cloud_channel_reports_connection.h
index 76a8eeafbc457..5192cbcc0231a 100644
--- a/google/cloud/channel/v1/mocks/mock_cloud_channel_reports_connection.h
+++ b/google/cloud/channel/v1/mocks/mock_cloud_channel_reports_connection.h
@@ -116,5 +116,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace channel_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CHANNEL_V1_MOCKS_MOCK_CLOUD_CHANNEL_REPORTS_CONNECTION_H
diff --git a/google/cloud/channel/v1/samples/cloud_channel_reports_client_samples.cc b/google/cloud/channel/v1/samples/cloud_channel_reports_client_samples.cc
index 58a4946c3fcdd..111f5d5945af7 100644
--- a/google/cloud/channel/v1/samples/cloud_channel_reports_client_samples.cc
+++ b/google/cloud/channel/v1/samples/cloud_channel_reports_client_samples.cc
@@ -214,3 +214,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.cc b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.cc
index ff18e772ad12b..919280b483ff4 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.cc
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.h"
 #include <memory>
 #include <utility>
@@ -177,3 +178,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.h
index aa5d2df1e848c..e5bd35bbf9486 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.h
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -625,5 +626,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CLIENT_H
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.cc b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.cc
index 9ea65db6b0901..dfd02b0c389c9 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.cc
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.h"
@@ -118,3 +119,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h
index 239dbe023d8f5..a8137b88d95eb 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
@@ -263,5 +264,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.cc b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.cc
index d2dcc2fab1bb8..bdae025d90971 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.cc
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h"
 #include <memory>
 
@@ -90,3 +91,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h
index 06647059526a7..e355bc1ff2d97 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h>
@@ -75,5 +76,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h
index dca22c98f9a4d..422e360a2ffed 100644
--- a/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h
+++ b/google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -73,5 +74,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_CLOUD_CONTROLS_PARTNER_CORE_OPTIONS_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc
index cfa1ca9bb0ac0..ae57ec91a59e7 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h"
 #include <google/cloud/cloudcontrolspartner/v1/core.grpc.pb.h>
 #include <memory>
@@ -115,3 +116,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h
index e0c1a3e068688..325258800f28e 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -93,5 +94,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_AUTH_DECORATOR_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.cc
index 3879d32490e2e..c373d36be6dd8 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.h"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -264,3 +265,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.h
index dde748465a207..f27da79c81b1e 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h"
@@ -98,5 +99,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_IMPL_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc
index fcee95c06fe6a..1fb044572a9cb 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -153,3 +154,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h
index 9ba13e36e9191..4624309b9b35a 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -93,5 +94,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_LOGGING_DECORATOR_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc
index d58064a0638dc..e39697e221f64 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -141,3 +142,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h
index eb90ff6d317c4..00182178e808a 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -99,5 +100,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_METADATA_DECORATOR_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.cc
index f1584af6ac231..fd63ad154cba7 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h"
@@ -73,3 +74,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.h
index c3c0ce0cc6cca..bd1cbd1e96718 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_OPTION_DEFAULTS_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_retry_traits.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_retry_traits.h
index b98a1166a3fed..38c07d38c0c43 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_retry_traits.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_RETRY_TRAITS_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_sources.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_sources.cc
index c3425ca657fa4..0937cd5ebb124 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_sources.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_sources.cc
@@ -17,6 +17,7 @@
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.cc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.cc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc
index 52edf3bbfee64..b90f52ec04dc9 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -140,3 +141,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h
index d43a2d7a08760..fcb6d5125dabf 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
@@ -148,5 +149,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc
index a7769c2443774..5b6c3c9e16b44 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.h"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_auth_decorator.h"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_logging_decorator.h"
@@ -71,3 +72,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.h
index 6b7235e788bbb..e8334db372625 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_STUB_FACTORY_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc
index 8f625234d2b1d..ff4e3e55ab14f 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -149,3 +150,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h
index 0959b64e2a206..839af00d68588 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -99,5 +100,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_TRACING_CONNECTION_H
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc
index 86db931c39403..9b75791d77e45 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -161,3 +162,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h
index 2e5cee4b76d00..187315b14374a 100644
--- a/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h
+++ b/google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/internal/cloud_controls_partner_core_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -108,5 +109,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_INTERNAL_CLOUD_CONTROLS_PARTNER_CORE_TRACING_STUB_H
diff --git a/google/cloud/cloudcontrolspartner/v1/mocks/mock_cloud_controls_partner_core_connection.h b/google/cloud/cloudcontrolspartner/v1/mocks/mock_cloud_controls_partner_core_connection.h
index e6a62300b5825..da12c41a03837 100644
--- a/google/cloud/cloudcontrolspartner/v1/mocks/mock_cloud_controls_partner_core_connection.h
+++ b/google/cloud/cloudcontrolspartner/v1/mocks/mock_cloud_controls_partner_core_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_MOCKS_MOCK_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_MOCKS_MOCK_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection.h"
 #include <gmock/gmock.h>
 
@@ -104,5 +105,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloudcontrolspartner_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CLOUDCONTROLSPARTNER_V1_MOCKS_MOCK_CLOUD_CONTROLS_PARTNER_CORE_CONNECTION_H
diff --git a/google/cloud/cloudcontrolspartner/v1/samples/cloud_controls_partner_core_client_samples.cc b/google/cloud/cloudcontrolspartner/v1/samples/cloud_controls_partner_core_client_samples.cc
index 9c10243749e6e..cd387ab070bec 100644
--- a/google/cloud/cloudcontrolspartner/v1/samples/cloud_controls_partner_core_client_samples.cc
+++ b/google/cloud/cloudcontrolspartner/v1/samples/cloud_controls_partner_core_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/cloudcontrolspartner/v1/core.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_client.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_connection_idempotency_policy.h"
 #include "google/cloud/cloudcontrolspartner/v1/cloud_controls_partner_core_options.h"
@@ -168,3 +169,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/cluster_manager_client.h b/google/cloud/container/cluster_manager_client.h
index 2cfc33bb0b1b3..3bd1131cbf8f7 100644
--- a/google/cloud/container/cluster_manager_client.h
+++ b/google/cloud/container/cluster_manager_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/cluster_manager_connection.h"
 #include "google/cloud/container/v1/cluster_manager_client.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CLIENT_H
diff --git a/google/cloud/container/cluster_manager_connection.h b/google/cloud/container/cluster_manager_connection.h
index c8d2146e75a5c..8a3eec74993e2 100644
--- a/google/cloud/container/cluster_manager_connection.h
+++ b/google/cloud/container/cluster_manager_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/cluster_manager_connection_idempotency_policy.h"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 
@@ -47,5 +48,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_H
diff --git a/google/cloud/container/cluster_manager_connection_idempotency_policy.h b/google/cloud/container/cluster_manager_connection_idempotency_policy.h
index 9476103de4ad0..ea5ddbe8c6ce1 100644
--- a/google/cloud/container/cluster_manager_connection_idempotency_policy.h
+++ b/google/cloud/container/cluster_manager_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
 
 namespace google {
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/container/cluster_manager_options.h b/google/cloud/container/cluster_manager_options.h
index 6e722b4ee47ea..8b2b10e72b14d 100644
--- a/google/cloud/container/cluster_manager_options.h
+++ b/google/cloud/container/cluster_manager_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/cluster_manager_connection.h"
 #include "google/cloud/container/cluster_manager_connection_idempotency_policy.h"
 #include "google/cloud/container/v1/cluster_manager_options.h"
@@ -46,5 +47,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_CLUSTER_MANAGER_OPTIONS_H
diff --git a/google/cloud/container/mocks/mock_cluster_manager_connection.h b/google/cloud/container/mocks/mock_cluster_manager_connection.h
index 17f08ba5a0524..f311c92fc77a2 100644
--- a/google/cloud/container/mocks/mock_cluster_manager_connection.h
+++ b/google/cloud/container/mocks/mock_cluster_manager_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/cluster_manager_connection.h"
 #include "google/cloud/container/v1/mocks/mock_cluster_manager_connection.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
diff --git a/google/cloud/container/v1/cluster_manager_client.cc b/google/cloud/container/v1/cluster_manager_client.cc
index d8698081abcdb..35dd3736d4e13 100644
--- a/google/cloud/container/v1/cluster_manager_client.cc
+++ b/google/cloud/container/v1/cluster_manager_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_client.h"
 #include <memory>
 #include <utility>
@@ -508,3 +509,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/cluster_manager_client.h b/google/cloud/container/v1/cluster_manager_client.h
index a31af52bf9004..bac9bd3a95c03 100644
--- a/google/cloud/container/v1/cluster_manager_client.h
+++ b/google/cloud/container/v1/cluster_manager_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -1943,5 +1944,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CLIENT_H
diff --git a/google/cloud/container/v1/cluster_manager_connection.cc b/google/cloud/container/v1/cluster_manager_connection.cc
index b48c50e73e50c..e8b3ca3bddef5 100644
--- a/google/cloud/container/v1/cluster_manager_connection.cc
+++ b/google/cloud/container/v1/cluster_manager_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include "google/cloud/container/v1/cluster_manager_options.h"
 #include "google/cloud/container/v1/internal/cluster_manager_connection_impl.h"
@@ -260,3 +261,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/cluster_manager_connection.h b/google/cloud/container/v1/cluster_manager_connection.h
index 9697611e4838b..1d111da68b3b3 100644
--- a/google/cloud/container/v1/cluster_manager_connection.h
+++ b/google/cloud/container/v1/cluster_manager_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
 #include "google/cloud/container/v1/internal/cluster_manager_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
@@ -315,5 +316,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CONNECTION_H
diff --git a/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.cc b/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.cc
index cc8697ad389c4..12eba67dc5ee3 100644
--- a/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.cc
+++ b/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
 #include <memory>
 
@@ -214,3 +215,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h b/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h
index 818b40244a953..c2953229969c8 100644
--- a/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h
+++ b/google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/container/v1/cluster_service.grpc.pb.h>
@@ -147,5 +148,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/container/v1/cluster_manager_options.h b/google/cloud/container/v1/cluster_manager_options.h
index 60401676a9e9c..af83bb32fbcdf 100644
--- a/google/cloud/container/v1/cluster_manager_options.h
+++ b/google/cloud/container/v1/cluster_manager_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -72,5 +73,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_CLUSTER_MANAGER_OPTIONS_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc b/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc
index 86e04a2eaaffe..bab025c2fa539 100644
--- a/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_auth_decorator.h"
 #include <google/container/v1/cluster_service.grpc.pb.h>
 #include <memory>
@@ -321,3 +322,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_auth_decorator.h b/google/cloud/container/v1/internal/cluster_manager_auth_decorator.h
index ea8817625609f..c09983546eca9 100644
--- a/google/cloud/container/v1/internal/cluster_manager_auth_decorator.h
+++ b/google/cloud/container/v1/internal/cluster_manager_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -193,5 +194,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_AUTH_DECORATOR_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_connection_impl.cc b/google/cloud/container/v1/internal/cluster_manager_connection_impl.cc
index e4a54c6e62759..b9646f70df1db 100644
--- a/google/cloud/container/v1/internal/cluster_manager_connection_impl.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_connection_impl.h"
 #include "google/cloud/container/v1/internal/cluster_manager_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -566,3 +567,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_connection_impl.h b/google/cloud/container/v1/internal/cluster_manager_connection_impl.h
index 49ab4ddaa58a2..a684008c2ed0f 100644
--- a/google/cloud/container/v1/internal/cluster_manager_connection_impl.h
+++ b/google/cloud/container/v1/internal/cluster_manager_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
 #include "google/cloud/container/v1/cluster_manager_options.h"
@@ -169,5 +170,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_CONNECTION_IMPL_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc b/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc
index 5228f5f573648..4bbd63da7d5ca 100644
--- a/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -442,3 +443,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_logging_decorator.h b/google/cloud/container/v1/internal/cluster_manager_logging_decorator.h
index dd8b5ff8fe20a..c47b127800c89 100644
--- a/google/cloud/container/v1/internal/cluster_manager_logging_decorator.h
+++ b/google/cloud/container/v1/internal/cluster_manager_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -193,5 +194,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_LOGGING_DECORATOR_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc b/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc
index 91296e3703a6c..798cdce20e5a7 100644
--- a/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -359,3 +360,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.h b/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.h
index cf74f19965ef1..13085d0ef2342 100644
--- a/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.h
+++ b/google/cloud/container/v1/internal/cluster_manager_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -198,5 +199,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_METADATA_DECORATOR_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_option_defaults.cc b/google/cloud/container/v1/internal/cluster_manager_option_defaults.cc
index 426a4cd842c00..a8a5e4f51507a 100644
--- a/google/cloud/container/v1/internal/cluster_manager_option_defaults.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_option_defaults.h"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include "google/cloud/container/v1/cluster_manager_options.h"
@@ -64,3 +65,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_option_defaults.h b/google/cloud/container/v1/internal/cluster_manager_option_defaults.h
index b7bbbe3003e37..96ec79cddb21a 100644
--- a/google/cloud/container/v1/internal/cluster_manager_option_defaults.h
+++ b/google/cloud/container/v1/internal/cluster_manager_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_OPTION_DEFAULTS_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_retry_traits.h b/google/cloud/container/v1/internal/cluster_manager_retry_traits.h
index e9c26128c6a7b..afc6094fcb43f 100644
--- a/google/cloud/container/v1/internal/cluster_manager_retry_traits.h
+++ b/google/cloud/container/v1/internal/cluster_manager_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_RETRY_TRAITS_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_sources.cc b/google/cloud/container/v1/internal/cluster_manager_sources.cc
index fc6f5750e7d1f..40b758fabd0d5 100644
--- a/google/cloud/container/v1/internal/cluster_manager_sources.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_sources.cc
@@ -17,6 +17,7 @@
 // source: google/container/v1/cluster_service.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_client.cc"
 #include "google/cloud/container/v1/cluster_manager_connection.cc"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/container/v1/internal/cluster_manager_stub_factory.cc"
 #include "google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc"
 #include "google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/container/v1/internal/cluster_manager_stub.cc b/google/cloud/container/v1/internal/cluster_manager_stub.cc
index 9cb115eaef373..a033b91b9abf1 100644
--- a/google/cloud/container/v1/internal/cluster_manager_stub.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -442,3 +443,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_stub.h b/google/cloud/container/v1/internal/cluster_manager_stub.h
index 4e1753c9f3dd2..b3b2202388c02 100644
--- a/google/cloud/container/v1/internal/cluster_manager_stub.h
+++ b/google/cloud/container/v1/internal/cluster_manager_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
@@ -339,5 +340,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_STUB_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc b/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc
index 5b3e2419c3890..8ca6f94b3ca3e 100644
--- a/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub_factory.h"
 #include "google/cloud/container/v1/internal/cluster_manager_auth_decorator.h"
 #include "google/cloud/container/v1/internal/cluster_manager_logging_decorator.h"
@@ -69,3 +70,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_stub_factory.h b/google/cloud/container/v1/internal/cluster_manager_stub_factory.h
index cf4930392b4e9..fc9bccf46a355 100644
--- a/google/cloud/container/v1/internal/cluster_manager_stub_factory.h
+++ b/google/cloud/container/v1/internal/cluster_manager_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_STUB_FACTORY_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc
index 41c0594ed4bc4..5925838a061ee 100644
--- a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -356,3 +357,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h
index 1b83d786d140a..9ebadba9e3375 100644
--- a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h
+++ b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -170,5 +171,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_TRACING_CONNECTION_H
diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc
index 381d8243dc878..dd034835c0627 100644
--- a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc
+++ b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -455,3 +456,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h
index 3793038e972e9..9c79f9e9a5eb4 100644
--- a/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h
+++ b/google/cloud/container/v1/internal/cluster_manager_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/internal/cluster_manager_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -205,5 +206,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_INTERNAL_CLUSTER_MANAGER_TRACING_STUB_H
diff --git a/google/cloud/container/v1/mocks/mock_cluster_manager_connection.h b/google/cloud/container/v1/mocks/mock_cluster_manager_connection.h
index f428096b2715c..9f29ff04dc2ac 100644
--- a/google/cloud/container/v1/mocks/mock_cluster_manager_connection.h
+++ b/google/cloud/container/v1/mocks/mock_cluster_manager_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_connection.h"
 #include <gmock/gmock.h>
 
@@ -202,5 +203,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace container_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_CONTAINER_V1_MOCKS_MOCK_CLUSTER_MANAGER_CONNECTION_H
diff --git a/google/cloud/container/v1/samples/cluster_manager_client_samples.cc b/google/cloud/container/v1/samples/cluster_manager_client_samples.cc
index 91b4a22c69b45..834c863a8ae4e 100644
--- a/google/cloud/container/v1/samples/cluster_manager_client_samples.cc
+++ b/google/cloud/container/v1/samples/cluster_manager_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/container/v1/cluster_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/container/v1/cluster_manager_client.h"
 #include "google/cloud/container/v1/cluster_manager_connection_idempotency_policy.h"
 #include "google/cloud/container/v1/cluster_manager_options.h"
@@ -154,3 +155,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/edge_network_client.cc b/google/cloud/edgenetwork/v1/edge_network_client.cc
index b9f7f157bc9ad..da01a9cef0ef8 100644
--- a/google/cloud/edgenetwork/v1/edge_network_client.cc
+++ b/google/cloud/edgenetwork/v1/edge_network_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_client.h"
 #include <memory>
 #include <utility>
@@ -803,3 +804,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/edge_network_client.h b/google/cloud/edgenetwork/v1/edge_network_client.h
index 544381e456d9c..f198f8b50ad39 100644
--- a/google/cloud/edgenetwork/v1/edge_network_client.h
+++ b/google/cloud/edgenetwork/v1/edge_network_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/no_await_tag.h"
@@ -2664,5 +2665,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CLIENT_H
diff --git a/google/cloud/edgenetwork/v1/edge_network_connection.cc b/google/cloud/edgenetwork/v1/edge_network_connection.cc
index 028912a1bce49..a2ed819726026 100644
--- a/google/cloud/edgenetwork/v1/edge_network_connection.cc
+++ b/google/cloud/edgenetwork/v1/edge_network_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include "google/cloud/edgenetwork/v1/edge_network_options.h"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h"
@@ -420,3 +421,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/edge_network_connection.h b/google/cloud/edgenetwork/v1/edge_network_connection.h
index aad99778e57f1..0598f5f0561c7 100644
--- a/google/cloud/edgenetwork/v1/edge_network_connection.h
+++ b/google/cloud/edgenetwork/v1/edge_network_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
@@ -403,5 +404,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_H
diff --git a/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.cc b/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.cc
index 8942d3dcfa633..d6c9e9e163fa1 100644
--- a/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.cc
+++ b/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h"
 #include <memory>
 
@@ -208,3 +209,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h b/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h
index 6b03944054395..0330a2ef86bda 100644
--- a/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h
+++ b/google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/cloud/edgenetwork/v1/service.grpc.pb.h>
@@ -147,5 +148,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/edgenetwork/v1/edge_network_options.h b/google/cloud/edgenetwork/v1/edge_network_options.h
index f974ea6e375f3..6183d9d5a3e11 100644
--- a/google/cloud/edgenetwork/v1/edge_network_options.h
+++ b/google/cloud/edgenetwork/v1/edge_network_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -82,5 +83,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_EDGE_NETWORK_OPTIONS_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc
index cca71df9bf2b5..0e330f2e4acc1 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h"
 #include <google/cloud/edgenetwork/v1/service.grpc.pb.h>
 #include <memory>
@@ -550,3 +551,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h
index 6edf1f3b57c17..30a7079c1053e 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -286,5 +287,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_AUTH_DECORATOR_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.cc b/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.cc
index da75219e453c8..b5ddf0dea499a 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -1466,3 +1467,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h b/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h
index 98aa413619412..7f2c0da2262d0 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h"
 #include "google/cloud/edgenetwork/v1/edge_network_options.h"
@@ -263,5 +264,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_CONNECTION_IMPL_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc
index b455d1c5fb61e..5563e9fa80f68 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -661,3 +662,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h
index d6ba5b8f9eb63..5ee11e00acbd0 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -286,5 +287,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_LOGGING_DECORATOR_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc
index cae664591acba..6d85d365311f1 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -488,3 +489,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h
index 99b598b7df4ac..addf0e6db4302 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -291,5 +292,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_METADATA_DECORATOR_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.cc b/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.cc
index cffb888c32079..3ba967e00f049 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.h"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include "google/cloud/edgenetwork/v1/edge_network_options.h"
@@ -76,3 +77,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.h b/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.h
index c72cf55c60e2a..f03fc0babec29 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_OPTION_DEFAULTS_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_retry_traits.h b/google/cloud/edgenetwork/v1/internal/edge_network_retry_traits.h
index 9758c7d366263..c92b6b34c5db7 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_retry_traits.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_RETRY_TRAITS_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_sources.cc b/google/cloud/edgenetwork/v1/internal/edge_network_sources.cc
index 4d585571ca486..5cb9666ef3cb6 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_sources.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_sources.cc
@@ -17,6 +17,7 @@
 // source: google/cloud/edgenetwork/v1/service.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_client.cc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.cc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc b/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc
index 7e9a87379c071..0563f1c33a89e 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -642,3 +643,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub.h b/google/cloud/edgenetwork/v1/internal/edge_network_stub.h
index 13169918cde90..bbc03e43e4628 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_stub.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/completion_queue.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -528,5 +529,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc
index 8a15568c1b9e8..7699c111fdd77 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.h"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_auth_decorator.h"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_logging_decorator.h"
@@ -74,3 +75,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.h b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.h
index e244040e14b62..2a24e2baad862 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_STUB_FACTORY_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc
index 68bdb47f84190..233f0d2c6b50b 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -557,3 +558,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h
index ba6913930e6b8..3844df24fa43b 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -262,5 +263,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_TRACING_CONNECTION_H
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc
index 17d120363ac11..48cc8f282b882 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -599,3 +600,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h
index 3cfe7c3c3e3a5..39d9a1cb73b06 100644
--- a/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h
+++ b/google/cloud/edgenetwork/v1/internal/edge_network_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/internal/edge_network_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -297,5 +298,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_INTERNAL_EDGE_NETWORK_TRACING_STUB_H
diff --git a/google/cloud/edgenetwork/v1/mocks/mock_edge_network_connection.h b/google/cloud/edgenetwork/v1/mocks/mock_edge_network_connection.h
index 13e5266fface6..14ce106c6b5a3 100644
--- a/google/cloud/edgenetwork/v1/mocks/mock_edge_network_connection.h
+++ b/google/cloud/edgenetwork/v1/mocks/mock_edge_network_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_MOCKS_MOCK_EDGE_NETWORK_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_MOCKS_MOCK_EDGE_NETWORK_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_connection.h"
 #include <gmock/gmock.h>
 
@@ -556,5 +557,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace edgenetwork_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_EDGENETWORK_V1_MOCKS_MOCK_EDGE_NETWORK_CONNECTION_H
diff --git a/google/cloud/edgenetwork/v1/samples/edge_network_client_samples.cc b/google/cloud/edgenetwork/v1/samples/edge_network_client_samples.cc
index 90b5899a7f54a..309a435248239 100644
--- a/google/cloud/edgenetwork/v1/samples/edge_network_client_samples.cc
+++ b/google/cloud/edgenetwork/v1/samples/edge_network_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/edgenetwork/v1/service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/edgenetwork/v1/edge_network_client.h"
 #include "google/cloud/edgenetwork/v1/edge_network_connection_idempotency_policy.h"
 #include "google/cloud/edgenetwork/v1/edge_network_options.h"
@@ -200,3 +201,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/iam_client.cc b/google/cloud/iam/admin/v1/iam_client.cc
index 9b38d4f484b17..7035a418c15e2 100644
--- a/google/cloud/iam/admin/v1/iam_client.cc
+++ b/google/cloud/iam/admin/v1/iam_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_client.h"
 #include "google/cloud/iam/admin/v1/iam_options.h"
 #include <memory>
@@ -402,3 +403,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/iam_client.h b/google/cloud/iam/admin/v1/iam_client.h
index bcdedfe5a3e92..5664e067061c3 100644
--- a/google/cloud/iam/admin/v1/iam_client.h
+++ b/google/cloud/iam/admin/v1/iam_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/iam_updater.h"
@@ -1654,5 +1655,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CLIENT_H
diff --git a/google/cloud/iam/admin/v1/iam_connection.cc b/google/cloud/iam/admin/v1/iam_connection.cc
index d59010702ee42..7059294b741f1 100644
--- a/google/cloud/iam/admin/v1/iam_connection.cc
+++ b/google/cloud/iam/admin/v1/iam_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/iam/admin/v1/iam_options.h"
 #include "google/cloud/iam/admin/v1/internal/iam_connection_impl.h"
@@ -216,3 +217,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/iam_connection.h b/google/cloud/iam/admin/v1/iam_connection.h
index 3873617ccde5a..8d4d11b96d328 100644
--- a/google/cloud/iam/admin/v1/iam_connection.h
+++ b/google/cloud/iam/admin/v1/iam_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
 #include "google/cloud/iam/admin/v1/internal/iam_retry_traits.h"
 #include "google/cloud/backoff_policy.h"
@@ -299,5 +300,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CONNECTION_H
diff --git a/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.cc b/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.cc
index ed0e6c3d8ccfd..09ab933b58de2 100644
--- a/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.cc
+++ b/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
 #include <memory>
 
@@ -183,3 +184,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h b/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h
index 1d6b9246208b7..dd2486ddcfd3e 100644
--- a/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h
+++ b/google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/iam/admin/v1/iam.grpc.pb.h>
@@ -129,5 +130,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iam/admin/v1/iam_options.h b/google/cloud/iam/admin/v1/iam_options.h
index 3db46c3514fb5..94b8a4946eb91 100644
--- a/google/cloud/iam/admin/v1/iam_options.h
+++ b/google/cloud/iam/admin/v1/iam_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -71,5 +72,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_IAM_OPTIONS_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc b/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc
index 7b690d41410c8..924591c1e977b 100644
--- a/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_auth_decorator.h"
 #include <google/iam/admin/v1/iam.grpc.pb.h>
 #include <memory>
@@ -269,3 +270,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_auth_decorator.h b/google/cloud/iam/admin/v1/internal/iam_auth_decorator.h
index 3f50d5529497a..b82cd727660e0 100644
--- a/google/cloud/iam/admin/v1/internal/iam_auth_decorator.h
+++ b/google/cloud/iam/admin/v1/internal/iam_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -181,5 +182,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_AUTH_DECORATOR_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_connection_impl.cc b/google/cloud/iam/admin/v1/internal/iam_connection_impl.cc
index 0de4f923a7cd4..52b07fdefd205 100644
--- a/google/cloud/iam/admin/v1/internal/iam_connection_impl.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_connection_impl.h"
 #include "google/cloud/iam/admin/v1/internal/iam_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -532,3 +533,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_connection_impl.h b/google/cloud/iam/admin/v1/internal/iam_connection_impl.h
index 048326533a4cc..1c5ddd08ab99f 100644
--- a/google/cloud/iam/admin/v1/internal/iam_connection_impl.h
+++ b/google/cloud/iam/admin/v1/internal/iam_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
 #include "google/cloud/iam/admin/v1/iam_options.h"
@@ -159,5 +160,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_CONNECTION_IMPL_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc b/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc
index 49e6fdae1fbc2..9b775f86650f2 100644
--- a/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -376,3 +377,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_logging_decorator.h b/google/cloud/iam/admin/v1/internal/iam_logging_decorator.h
index febd5ddcfc571..8fe2a7975a272 100644
--- a/google/cloud/iam/admin/v1/internal/iam_logging_decorator.h
+++ b/google/cloud/iam/admin/v1/internal/iam_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -180,5 +181,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_LOGGING_DECORATOR_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc b/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc
index f7ab740582eb0..810527f8989e6 100644
--- a/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -296,3 +297,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.h b/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.h
index 722b34678e5df..055022030dd68 100644
--- a/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.h
+++ b/google/cloud/iam/admin/v1/internal/iam_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -186,5 +187,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_METADATA_DECORATOR_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_option_defaults.cc b/google/cloud/iam/admin/v1/internal/iam_option_defaults.cc
index 1e6f7626343c2..9141c5262666c 100644
--- a/google/cloud/iam/admin/v1/internal/iam_option_defaults.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_option_defaults.h"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/iam/admin/v1/iam_options.h"
@@ -62,3 +63,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_option_defaults.h b/google/cloud/iam/admin/v1/internal/iam_option_defaults.h
index af91062bca504..7fcb47f56660c 100644
--- a/google/cloud/iam/admin/v1/internal/iam_option_defaults.h
+++ b/google/cloud/iam/admin/v1/internal/iam_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -34,5 +35,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_OPTION_DEFAULTS_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_retry_traits.h b/google/cloud/iam/admin/v1/internal/iam_retry_traits.h
index d68057fc92cd2..e45e9bffb0c7b 100644
--- a/google/cloud/iam/admin/v1/internal/iam_retry_traits.h
+++ b/google/cloud/iam/admin/v1/internal/iam_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_RETRY_TRAITS_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_sources.cc b/google/cloud/iam/admin/v1/internal/iam_sources.cc
index 7cb0c20922c91..59fb7199e09a6 100644
--- a/google/cloud/iam/admin/v1/internal/iam_sources.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_sources.cc
@@ -17,6 +17,7 @@
 // source: google/iam/admin/v1/iam.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_client.cc"
 #include "google/cloud/iam/admin/v1/iam_connection.cc"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/iam/admin/v1/internal/iam_stub_factory.cc"
 #include "google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc"
 #include "google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/iam/admin/v1/internal/iam_stub.cc b/google/cloud/iam/admin/v1/internal/iam_stub.cc
index 5105f16d92efd..0a8bbbf00dd34 100644
--- a/google/cloud/iam/admin/v1/internal/iam_stub.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -364,3 +365,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_stub.h b/google/cloud/iam/admin/v1/internal/iam_stub.h
index 24b97c5f0c9d2..117b6c4f89b51 100644
--- a/google/cloud/iam/admin/v1/internal/iam_stub.h
+++ b/google/cloud/iam/admin/v1/internal/iam_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
@@ -312,5 +313,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_STUB_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc b/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc
index cff409db68694..3d50f31705edf 100644
--- a/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub_factory.h"
 #include "google/cloud/iam/admin/v1/internal/iam_auth_decorator.h"
 #include "google/cloud/iam/admin/v1/internal/iam_logging_decorator.h"
@@ -67,3 +68,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_stub_factory.h b/google/cloud/iam/admin/v1/internal/iam_stub_factory.h
index c9b9ae8d6bc0d..801da18a16889 100644
--- a/google/cloud/iam/admin/v1/internal/iam_stub_factory.h
+++ b/google/cloud/iam/admin/v1/internal/iam_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -39,5 +40,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_STUB_FACTORY_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc
index e165d4236e924..e006605b49b6f 100644
--- a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -286,3 +287,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h
index 1874a9182e543..55d20ae44eec1 100644
--- a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h
+++ b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -160,5 +161,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_TRACING_CONNECTION_H
diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc
index 58d2edf267da8..72ce0c38600f3 100644
--- a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc
+++ b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -366,3 +367,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h
index 4139678a37786..0bd9dbd6c5358 100644
--- a/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h
+++ b/google/cloud/iam/admin/v1/internal/iam_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/internal/iam_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -192,5 +193,6 @@ namespace gcpcxxV1 = GOOGLE_CLOUD_CPP_NS;  // NOLINT(misc-unused-alias-decls)
 }  // namespace iam_admin_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_INTERNAL_IAM_TRACING_STUB_H
diff --git a/google/cloud/iam/admin/v1/mocks/mock_iam_connection.h b/google/cloud/iam/admin/v1/mocks/mock_iam_connection.h
index b3ea110b9b4a6..22d6d34778353 100644
--- a/google/cloud/iam/admin/v1/mocks/mock_iam_connection.h
+++ b/google/cloud/iam/admin/v1/mocks/mock_iam_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_MOCKS_MOCK_IAM_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_MOCKS_MOCK_IAM_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include <gmock/gmock.h>
 
@@ -185,5 +186,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_admin_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_ADMIN_V1_MOCKS_MOCK_IAM_CONNECTION_H
diff --git a/google/cloud/iam/admin/v1/samples/iam_client_samples.cc b/google/cloud/iam/admin/v1/samples/iam_client_samples.cc
index a4dd2bb1d39cd..f7d4d5936441d 100644
--- a/google/cloud/iam/admin/v1/samples/iam_client_samples.cc
+++ b/google/cloud/iam/admin/v1/samples/iam_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/iam/admin/v1/iam.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_client.h"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
 #include "google/cloud/iam/admin/v1/iam_options.h"
@@ -151,3 +152,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/iam/iam_client.h b/google/cloud/iam/iam_client.h
index 23d466ef181cf..c4746e82d9a50 100644
--- a/google/cloud/iam/iam_client.h
+++ b/google/cloud/iam/iam_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_client.h"
 #include "google/cloud/iam/iam_connection.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CLIENT_H
diff --git a/google/cloud/iam/iam_connection.h b/google/cloud/iam/iam_connection.h
index 7b9fa24f1d8c1..fbb15f94e5142 100644
--- a/google/cloud/iam/iam_connection.h
+++ b/google/cloud/iam/iam_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection.h"
 #include "google/cloud/iam/iam_connection_idempotency_policy.h"
 
@@ -46,5 +47,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_H
diff --git a/google/cloud/iam/iam_connection_idempotency_policy.h b/google/cloud/iam/iam_connection_idempotency_policy.h
index b6fac9be2b1a4..d9fc4f2c9695a 100644
--- a/google/cloud/iam/iam_connection_idempotency_policy.h
+++ b/google/cloud/iam/iam_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_connection_idempotency_policy.h"
 
 namespace google {
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/iam/iam_options.h b/google/cloud/iam/iam_options.h
index 62308f44db96c..70b29314663f7 100644
--- a/google/cloud/iam/iam_options.h
+++ b/google/cloud/iam/iam_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/iam_options.h"
 #include "google/cloud/iam/iam_connection.h"
 #include "google/cloud/iam/iam_connection_idempotency_policy.h"
@@ -44,5 +45,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_IAM_OPTIONS_H
diff --git a/google/cloud/iam/mocks/mock_iam_connection.h b/google/cloud/iam/mocks/mock_iam_connection.h
index df785c272b924..e830a2bbd3010 100644
--- a/google/cloud/iam/mocks/mock_iam_connection.h
+++ b/google/cloud/iam/mocks/mock_iam_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/iam/admin/v1/mocks/mock_iam_connection.h"
 #include "google/cloud/iam/iam_connection.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace iam_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_MOCKS_MOCK_IAM_CONNECTION_H
diff --git a/google/cloud/resourcesettings/README.md b/google/cloud/resourcesettings/README.md
index 9358ee9630edc..ea8cb28125493 100644
--- a/google/cloud/resourcesettings/README.md
+++ b/google/cloud/resourcesettings/README.md
@@ -21,6 +21,7 @@ top-level [README](/README.md#building-and-installing).
 <!-- inject-quickstart-start -->
 
 ```cc
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/resourcesettings/v1/resource_settings_client.h"
 #include "google/cloud/project.h"
 #include <iostream>
@@ -46,6 +47,7 @@ int main(int argc, char* argv[]) try {
   std::cerr << "google::cloud::Status thrown: " << status << "\n";
   return 1;
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
 ```
 
 <!-- inject-quickstart-end -->
diff --git a/google/cloud/resourcesettings/mocks/mock_resource_settings_connection.h b/google/cloud/resourcesettings/mocks/mock_resource_settings_connection.h
index bc2a23a35dbd9..f894d60d3a73f 100644
--- a/google/cloud/resourcesettings/mocks/mock_resource_settings_connection.h
+++ b/google/cloud/resourcesettings/mocks/mock_resource_settings_connection.h
@@ -40,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_MOCKS_MOCK_RESOURCE_SETTINGS_CONNECTION_H
diff --git a/google/cloud/resourcesettings/quickstart/quickstart.cc b/google/cloud/resourcesettings/quickstart/quickstart.cc
index 0816d39890757..3790e2735ea3c 100644
--- a/google/cloud/resourcesettings/quickstart/quickstart.cc
+++ b/google/cloud/resourcesettings/quickstart/quickstart.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 //! [all]
 #include "google/cloud/resourcesettings/v1/resource_settings_client.h"
 #include "google/cloud/project.h"
@@ -39,3 +40,4 @@ int main(int argc, char* argv[]) try {
   return 1;
 }
 //! [all]
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/resource_settings_client.h b/google/cloud/resourcesettings/resource_settings_client.h
index dcb12cd73dd70..206e5f4d0fce6 100644
--- a/google/cloud/resourcesettings/resource_settings_client.h
+++ b/google/cloud/resourcesettings/resource_settings_client.h
@@ -38,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_RESOURCE_SETTINGS_CLIENT_H
diff --git a/google/cloud/resourcesettings/resource_settings_connection.h b/google/cloud/resourcesettings/resource_settings_connection.h
index 06fec173fa46f..6c51cfdebfc4a 100644
--- a/google/cloud/resourcesettings/resource_settings_connection.h
+++ b/google/cloud/resourcesettings/resource_settings_connection.h
@@ -56,5 +56,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_RESOURCE_SETTINGS_CONNECTION_H
diff --git a/google/cloud/resourcesettings/resource_settings_connection_idempotency_policy.h b/google/cloud/resourcesettings/resource_settings_connection_idempotency_policy.h
index 0c5adf94cd804..06a32ada598c2 100644
--- a/google/cloud/resourcesettings/resource_settings_connection_idempotency_policy.h
+++ b/google/cloud/resourcesettings/resource_settings_connection_idempotency_policy.h
@@ -43,5 +43,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_RESOURCE_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/resourcesettings/resource_settings_options.h b/google/cloud/resourcesettings/resource_settings_options.h
index ec09c1875cd42..6ea797b84128f 100644
--- a/google/cloud/resourcesettings/resource_settings_options.h
+++ b/google/cloud/resourcesettings/resource_settings_options.h
@@ -54,5 +54,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_RESOURCE_SETTINGS_OPTIONS_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.cc
index fd9cfa8bde04a..badcd45ad0170 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.cc
@@ -63,3 +63,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.h b/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.h
index 2733542dc199e..4d9ebc698a9ce 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_auth_decorator.h
@@ -63,5 +63,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_AUTH_DECORATOR_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.cc
index 3955562f97c9f..e5239d6deaf18 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.cc
@@ -137,3 +137,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.h b/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.h
index c2ee2db6539e0..d343fc915b5a4 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_connection_impl.h
@@ -74,5 +74,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_CONNECTION_IMPL_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.cc
index d11eadcdc4c98..f0431eae890d4 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.cc
@@ -79,3 +79,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.h b/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.h
index a2530a5412808..fa38be435168f 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_logging_decorator.h
@@ -63,5 +63,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_LOGGING_DECORATOR_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.cc
index 1e3b5f9bc00ba..e2227bcb50621 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.cc
@@ -90,3 +90,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.h b/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.h
index 657eee1808595..b89a6c40658dc 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_metadata_decorator.h
@@ -69,5 +69,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_METADATA_DECORATOR_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.cc
index 4cea36bc833a0..2e25a5359d205 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.cc
@@ -72,3 +72,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.h b/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.h
index 33ebcbe47f9af..53b040562fb9c 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_option_defaults.h
@@ -34,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_OPTION_DEFAULTS_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_retry_traits.h b/google/cloud/resourcesettings/v1/internal/resource_settings_retry_traits.h
index 040ee13982901..79a67e17a001a 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_retry_traits.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_retry_traits.h
@@ -40,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_RETRY_TRAITS_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_sources.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_sources.cc
index fb0b9e2b9452b..de212c6b032a8 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_sources.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_sources.cc
@@ -30,4 +30,5 @@
 #include "google/cloud/resourcesettings/v1/resource_settings_client.cc"
 #include "google/cloud/resourcesettings/v1/resource_settings_connection.cc"
 #include "google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_stub.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_stub.cc
index a0c09e6ce3ef6..f44f7ff3a352c 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_stub.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_stub.cc
@@ -71,3 +71,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_stub.h b/google/cloud/resourcesettings/v1/internal/resource_settings_stub.h
index ba63dc9fb0ed8..7befc7e58b595 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_stub.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_stub.h
@@ -85,5 +85,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_STUB_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.cc
index 86b46b47086c6..cdd328824776d 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.cc
@@ -73,3 +73,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.h b/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.h
index 3fb84ed013f08..858dd6dbc35f1 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_stub_factory.h
@@ -40,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_STUB_FACTORY_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc
index a2f2dc2dfe12f..4f906e9b95407 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc
@@ -85,3 +85,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.h b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.h
index 11638072378e5..aff266b2e51e6 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.h
@@ -76,5 +76,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_TRACING_CONNECTION_H
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.cc
index cb55ac6308655..bf9cb303c157b 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.cc
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.cc
@@ -87,3 +87,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.h b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.h
index 4ea5a41b28851..bb6057add432f 100644
--- a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.h
+++ b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_stub.h
@@ -77,5 +77,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_INTERNAL_RESOURCE_SETTINGS_TRACING_STUB_H
diff --git a/google/cloud/resourcesettings/v1/mocks/mock_resource_settings_connection.h b/google/cloud/resourcesettings/v1/mocks/mock_resource_settings_connection.h
index 83ca1e3038ff9..9dd0b9b81e601 100644
--- a/google/cloud/resourcesettings/v1/mocks/mock_resource_settings_connection.h
+++ b/google/cloud/resourcesettings/v1/mocks/mock_resource_settings_connection.h
@@ -69,5 +69,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_MOCKS_MOCK_RESOURCE_SETTINGS_CONNECTION_H
diff --git a/google/cloud/resourcesettings/v1/resource_settings_client.cc b/google/cloud/resourcesettings/v1/resource_settings_client.cc
index f3f87ea0d29f0..94cb8d610c080 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_client.cc
+++ b/google/cloud/resourcesettings/v1/resource_settings_client.cc
@@ -79,3 +79,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/resource_settings_client.h b/google/cloud/resourcesettings/v1/resource_settings_client.h
index 86ff1d4f52909..727c534b959cb 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_client.h
+++ b/google/cloud/resourcesettings/v1/resource_settings_client.h
@@ -304,5 +304,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_RESOURCE_SETTINGS_CLIENT_H
diff --git a/google/cloud/resourcesettings/v1/resource_settings_connection.cc b/google/cloud/resourcesettings/v1/resource_settings_connection.cc
index 32bdf73d3ebdf..444332b2c9ce1 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_connection.cc
+++ b/google/cloud/resourcesettings/v1/resource_settings_connection.cc
@@ -84,3 +84,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/resource_settings_connection.h b/google/cloud/resourcesettings/v1/resource_settings_connection.h
index b3ddbd8b26ec3..a2c3efe3e9f39 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_connection.h
+++ b/google/cloud/resourcesettings/v1/resource_settings_connection.h
@@ -233,5 +233,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_RESOURCE_SETTINGS_CONNECTION_H
diff --git a/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.cc b/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.cc
index 77420a3faa3c4..f3a5ccdef8e49 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.cc
+++ b/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.cc
@@ -60,3 +60,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.h b/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.h
index 8160bf8b015d1..5e5303452ef20 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.h
+++ b/google/cloud/resourcesettings/v1/resource_settings_connection_idempotency_policy.h
@@ -55,5 +55,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_RESOURCE_SETTINGS_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/resourcesettings/v1/resource_settings_options.h b/google/cloud/resourcesettings/v1/resource_settings_options.h
index 86a997723e803..591935ab6b14c 100644
--- a/google/cloud/resourcesettings/v1/resource_settings_options.h
+++ b/google/cloud/resourcesettings/v1/resource_settings_options.h
@@ -74,5 +74,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace resourcesettings_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_RESOURCESETTINGS_V1_RESOURCE_SETTINGS_OPTIONS_H
diff --git a/google/cloud/resourcesettings/v1/samples/resource_settings_client_samples.cc b/google/cloud/resourcesettings/v1/samples/resource_settings_client_samples.cc
index 4ee5f50dbb40e..6494bdde6b141 100644
--- a/google/cloud/resourcesettings/v1/samples/resource_settings_client_samples.cc
+++ b/google/cloud/resourcesettings/v1/samples/resource_settings_client_samples.cc
@@ -165,3 +165,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/mocks/mock_security_center_connection.h b/google/cloud/securitycenter/mocks/mock_security_center_connection.h
index e112e09a05ee6..0cc153e2530b7 100644
--- a/google/cloud/securitycenter/mocks/mock_security_center_connection.h
+++ b/google/cloud/securitycenter/mocks/mock_security_center_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/security_center_connection.h"
 #include "google/cloud/securitycenter/v1/mocks/mock_security_center_connection.h"
 
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
diff --git a/google/cloud/securitycenter/security_center_client.h b/google/cloud/securitycenter/security_center_client.h
index bde60f1a5fb35..782411293b43a 100644
--- a/google/cloud/securitycenter/security_center_client.h
+++ b/google/cloud/securitycenter/security_center_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/security_center_connection.h"
 #include "google/cloud/securitycenter/v1/security_center_client.h"
 
@@ -37,5 +38,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CLIENT_H
diff --git a/google/cloud/securitycenter/security_center_connection.h b/google/cloud/securitycenter/security_center_connection.h
index 2f486ce428039..6d09cc64454d3 100644
--- a/google/cloud/securitycenter/security_center_connection.h
+++ b/google/cloud/securitycenter/security_center_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/security_center_connection_idempotency_policy.h"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 
@@ -49,5 +50,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_H
diff --git a/google/cloud/securitycenter/security_center_connection_idempotency_policy.h b/google/cloud/securitycenter/security_center_connection_idempotency_policy.h
index 9833b79f95ca0..31c231a9d7b98 100644
--- a/google/cloud/securitycenter/security_center_connection_idempotency_policy.h
+++ b/google/cloud/securitycenter/security_center_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h"
 
 namespace google {
@@ -41,5 +42,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/securitycenter/security_center_options.h b/google/cloud/securitycenter/security_center_options.h
index ddaa3e59fcc3e..e190eedf60cf8 100644
--- a/google/cloud/securitycenter/security_center_options.h
+++ b/google/cloud/securitycenter/security_center_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/security_center_connection.h"
 #include "google/cloud/securitycenter/security_center_connection_idempotency_policy.h"
 #include "google/cloud/securitycenter/v1/security_center_options.h"
@@ -51,5 +52,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_SECURITY_CENTER_OPTIONS_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc
index c19357e2d6d7a..9848b24d15840 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h"
 #include <google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h>
 #include <memory>
@@ -772,3 +773,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h
index 87e661281d567..df46a2073b2ab 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_AUTH_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_AUTH_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/version.h"
@@ -466,5 +467,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_AUTH_DECORATOR_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_connection_impl.cc b/google/cloud/securitycenter/v1/internal/security_center_connection_impl.cc
index da35f2cc0915e..d3b48696012e4 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_connection_impl.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_connection_impl.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_connection_impl.h"
 #include "google/cloud/securitycenter/v1/internal/security_center_option_defaults.h"
 #include "google/cloud/background_threads.h"
@@ -1707,3 +1708,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h b/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h
index e2a5bb014cdb3..e0bc5fbd5d2ae 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_connection_impl.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_CONNECTION_IMPL_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_CONNECTION_IMPL_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_retry_traits.h"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
@@ -401,5 +402,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_CONNECTION_IMPL_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc
index 416c5c2f6dfe0..efea41a16e920 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
@@ -1058,3 +1059,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h
index aef83ffc98951..73d92299f4039 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_LOGGING_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_LOGGING_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/tracing_options.h"
 #include "google/cloud/version.h"
@@ -466,5 +467,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_LOGGING_DECORATOR_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc
index 67b130e2c3b81..89b3054bf7453 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
@@ -796,3 +797,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h
index 5980fd8d9a8f8..970bff276ab1e 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_metadata_decorator.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_METADATA_DECORATOR_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_METADATA_DECORATOR_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
@@ -471,5 +472,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_METADATA_DECORATOR_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_option_defaults.cc b/google/cloud/securitycenter/v1/internal/security_center_option_defaults.cc
index 3043b87b6b2e6..824ce5858ce10 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_option_defaults.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_option_defaults.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_option_defaults.h"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 #include "google/cloud/securitycenter/v1/security_center_options.h"
@@ -79,3 +80,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_option_defaults.h b/google/cloud/securitycenter/v1/internal/security_center_option_defaults.h
index 8afd9dae28c5e..5da24e93600cc 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_option_defaults.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_option_defaults.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_OPTION_DEFAULTS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_OPTION_DEFAULTS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/options.h"
 #include "google/cloud/version.h"
 
@@ -33,5 +34,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_OPTION_DEFAULTS_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_retry_traits.h b/google/cloud/securitycenter/v1/internal/security_center_retry_traits.h
index 992a344c0096a..6e8d20d326833 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_retry_traits.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_retry_traits.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_RETRY_TRAITS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_RETRY_TRAITS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/status.h"
 #include "google/cloud/version.h"
 
@@ -39,5 +40,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_RETRY_TRAITS_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_sources.cc b/google/cloud/securitycenter/v1/internal/security_center_sources.cc
index b6543c30d10ea..bcfe0d7d006f0 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_sources.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_sources.cc
@@ -17,6 +17,7 @@
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
 // NOLINTBEGIN(bugprone-suspicious-include)
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_auth_decorator.cc"
 #include "google/cloud/securitycenter/v1/internal/security_center_connection_impl.cc"
 #include "google/cloud/securitycenter/v1/internal/security_center_logging_decorator.cc"
@@ -29,4 +30,5 @@
 #include "google/cloud/securitycenter/v1/security_center_client.cc"
 #include "google/cloud/securitycenter/v1/security_center_connection.cc"
 #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.cc"
+#include "google/cloud/internal/diagnostics_pop.inc"
 // NOLINTEND(bugprone-suspicious-include)
diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub.cc b/google/cloud/securitycenter/v1/internal/security_center_stub.cc
index 5d1b0d739b28f..d4653c5b503ef 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_stub.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
@@ -1003,3 +1004,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub.h b/google/cloud/securitycenter/v1/internal/security_center_stub.h
index d79cd749ae0a7..b2e657670f2bf 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_stub.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/completion_queue.h"
 #include "google/cloud/future.h"
 #include "google/cloud/options.h"
@@ -903,5 +904,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc
index 063f11fa446be..24dfeaa9c89ce 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub_factory.h"
 #include "google/cloud/securitycenter/v1/internal/security_center_auth_decorator.h"
 #include "google/cloud/securitycenter/v1/internal/security_center_logging_decorator.h"
@@ -72,3 +73,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.h b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.h
index 5a0c02af4c131..9bd9acbd9cef4 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_stub_factory.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_stub_factory.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_FACTORY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_FACTORY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/internal/unified_grpc_credentials.h"
 #include "google/cloud/options.h"
@@ -38,5 +39,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_STUB_FACTORY_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc
index 9cd3719a3d721..8d4bebe17c23d 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/internal/traced_stream_range.h"
@@ -833,3 +834,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h
index 84d81f11604cb..074d5500dfd59 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_TRACING_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_TRACING_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 #include "google/cloud/version.h"
 #include <memory>
@@ -399,5 +400,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_TRACING_CONNECTION_H
diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc
index f7ec9e3bfe555..7c97a85798254 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc
+++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h"
 #include "google/cloud/internal/grpc_opentelemetry.h"
 #include <memory>
@@ -1016,3 +1017,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h
index e254e1ec7d0fa..7ee9d921e935c 100644
--- a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h
+++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_TRACING_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_TRACING_STUB_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_stub.h"
 #include "google/cloud/internal/trace_propagator.h"
 #include "google/cloud/options.h"
@@ -477,5 +478,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_INTERNAL_SECURITY_CENTER_TRACING_STUB_H
diff --git a/google/cloud/securitycenter/v1/mocks/mock_security_center_connection.h b/google/cloud/securitycenter/v1/mocks/mock_security_center_connection.h
index eef5f0022f2a2..ea02bda2c77e3 100644
--- a/google/cloud/securitycenter/v1/mocks/mock_security_center_connection.h
+++ b/google/cloud/securitycenter/v1/mocks/mock_security_center_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 #include <gmock/gmock.h>
 
@@ -545,5 +546,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1_mocks
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_MOCKS_MOCK_SECURITY_CENTER_CONNECTION_H
diff --git a/google/cloud/securitycenter/v1/samples/security_center_client_samples.cc b/google/cloud/securitycenter/v1/samples/security_center_client_samples.cc
index 13302a4a4c940..926c21b9b536d 100644
--- a/google/cloud/securitycenter/v1/samples/security_center_client_samples.cc
+++ b/google/cloud/securitycenter/v1/samples/security_center_client_samples.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_client.h"
 #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h"
 #include "google/cloud/securitycenter/v1/security_center_options.h"
@@ -204,3 +205,4 @@ int main(int argc, char* argv[]) {  // NOLINT(bugprone-exception-escape)
   });
   return example.Run(argc, argv);
 }
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/security_center_client.cc b/google/cloud/securitycenter/v1/security_center_client.cc
index decb6c638ff17..671763032ba7c 100644
--- a/google/cloud/securitycenter/v1/security_center_client.cc
+++ b/google/cloud/securitycenter/v1/security_center_client.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_client.h"
 #include "google/cloud/securitycenter/v1/security_center_options.h"
 #include <memory>
@@ -1376,3 +1377,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/security_center_client.h b/google/cloud/securitycenter/v1/security_center_client.h
index f50b3673c7d0b..9c4f2fd7dc9d4 100644
--- a/google/cloud/securitycenter/v1/security_center_client.h
+++ b/google/cloud/securitycenter/v1/security_center_client.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CLIENT_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CLIENT_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 #include "google/cloud/future.h"
 #include "google/cloud/iam_updater.h"
@@ -4812,5 +4813,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CLIENT_H
diff --git a/google/cloud/securitycenter/v1/security_center_connection.cc b/google/cloud/securitycenter/v1/security_center_connection.cc
index 3f609af5ac7d3..e983bae5b88a8 100644
--- a/google/cloud/securitycenter/v1/security_center_connection.cc
+++ b/google/cloud/securitycenter/v1/security_center_connection.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 #include "google/cloud/securitycenter/v1/internal/security_center_connection_impl.h"
 #include "google/cloud/securitycenter/v1/internal/security_center_option_defaults.h"
@@ -556,3 +557,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/security_center_connection.h b/google/cloud/securitycenter/v1/security_center_connection.h
index 9d9666a00692b..de4b0c67d0150 100644
--- a/google/cloud/securitycenter/v1/security_center_connection.h
+++ b/google/cloud/securitycenter/v1/security_center_connection.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/internal/security_center_retry_traits.h"
 #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -539,5 +540,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_H
diff --git a/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.cc b/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.cc
index b4f3307dbf0b8..ef12b1f360a70 100644
--- a/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.cc
+++ b/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.cc
@@ -16,6 +16,7 @@
 // If you make any local changes, they will be lost.
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h"
 #include <memory>
 
@@ -425,3 +426,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h b/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h
index f635efe79ee01..66bd681dbd19a 100644
--- a/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h
+++ b/google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/idempotency.h"
 #include "google/cloud/version.h"
 #include <google/cloud/securitycenter/v1/securitycenter_service.grpc.pb.h>
@@ -297,5 +298,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_CONNECTION_IDEMPOTENCY_POLICY_H
diff --git a/google/cloud/securitycenter/v1/security_center_options.h b/google/cloud/securitycenter/v1/security_center_options.h
index 28896699cee57..4194d22f9a08a 100644
--- a/google/cloud/securitycenter/v1/security_center_options.h
+++ b/google/cloud/securitycenter/v1/security_center_options.h
@@ -19,6 +19,7 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_OPTIONS_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_OPTIONS_H
 
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/securitycenter/v1/security_center_connection.h"
 #include "google/cloud/securitycenter/v1/security_center_connection_idempotency_policy.h"
 #include "google/cloud/backoff_policy.h"
@@ -83,5 +84,6 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace securitycenter_v1
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
 
 #endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SECURITYCENTER_V1_SECURITY_CENTER_OPTIONS_H