From 8b5b1ba826952451b8f15597795ca7b4a6771029 Mon Sep 17 00:00:00 2001
From: Eugene Ostroukhov <eostroukhov@google.com>
Date: Mon, 18 Dec 2023 13:51:14 -0800
Subject: [PATCH] [Build] Fix proto includes

---
 BUILD                                                      | 7 ++++---
 src/cpp/ext/gcp/observability_logging_sink.h               | 2 --
 src/cpp/ext/proto_server_reflection.h                      | 2 --
 src/cpp/server/channelz/channelz_service.h                 | 1 -
 src/cpp/server/csds/csds.h                                 | 1 -
 src/cpp/server/load_reporter/load_reporter.h               | 2 +-
 .../load_reporter/load_reporter_async_service_impl.h       | 1 -
 7 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/BUILD b/BUILD
index afff44dfd0d18..ab58ab93db5b4 100644
--- a/BUILD
+++ b/BUILD
@@ -1705,9 +1705,10 @@ grpc_cc_library(
     language = "c++",
     tags = ["nofixdeps"],
     deps = [
-        "gpr",
-        "grpc++",
-        "lb_load_reporter",
+        ":gpr",
+        ":grpc++",
+        ":lb_load_reporter",
+        "//src/proto/grpc/lb/v1:load_reporter_proto",
     ],
 )
 
diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h
index d095a29d5035b..5a405133e44a5 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.h
+++ b/src/cpp/ext/gcp/observability_logging_sink.h
@@ -29,8 +29,6 @@
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/struct.pb.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "google/logging/v2/logging.grpc.pb.h"
diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h
index 5482c9bc2549c..989e0bd3e23a3 100644
--- a/src/cpp/ext/proto_server_reflection.h
+++ b/src/cpp/ext/proto_server_reflection.h
@@ -32,9 +32,7 @@
 #include <grpcpp/support/sync_stream.h>
 
 #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h"
-#include "src/proto/grpc/reflection/v1/reflection.pb.h"
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
-#include "src/proto/grpc/reflection/v1alpha/reflection.pb.h"
 
 namespace grpc {
 
diff --git a/src/cpp/server/channelz/channelz_service.h b/src/cpp/server/channelz/channelz_service.h
index a61a706402aea..8f049671f7c3f 100644
--- a/src/cpp/server/channelz/channelz_service.h
+++ b/src/cpp/server/channelz/channelz_service.h
@@ -25,7 +25,6 @@
 #include <grpcpp/support/status.h>
 
 #include "src/proto/grpc/channelz/channelz.grpc.pb.h"
-#include "src/proto/grpc/channelz/channelz.pb.h"
 
 namespace grpc {
 
diff --git a/src/cpp/server/csds/csds.h b/src/cpp/server/csds/csds.h
index 8ff193f80533c..ede92c236f13a 100644
--- a/src/cpp/server/csds/csds.h
+++ b/src/cpp/server/csds/csds.h
@@ -26,7 +26,6 @@
 #include <grpcpp/support/sync_stream.h>
 
 #include "src/proto/grpc/testing/xds/v3/csds.grpc.pb.h"
-#include "src/proto/grpc/testing/xds/v3/csds.pb.h"
 
 namespace grpc {
 namespace xds {
diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h
index 7351689e0f170..5f79a3c588813 100644
--- a/src/cpp/server/load_reporter/load_reporter.h
+++ b/src/cpp/server/load_reporter/load_reporter.h
@@ -40,7 +40,7 @@
 
 #include "src/core/lib/gprpp/sync.h"
 #include "src/cpp/server/load_reporter/load_data_store.h"
-#include "src/proto/grpc/lb/v1/load_reporter.pb.h"
+#include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
 
 // IWYU pragma: no_include <ratio>
 
diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
index f20a2e0c552ab..d5a742dbe2aa5 100644
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
@@ -39,7 +39,6 @@
 #include "src/core/lib/gprpp/thd.h"
 #include "src/cpp/server/load_reporter/load_reporter.h"
 #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
-#include "src/proto/grpc/lb/v1/load_reporter.pb.h"
 
 namespace grpc {
 namespace load_reporter {