Clean up

include/grpcpp/support/validate_service_config.h

@@ -33,4 +33,4 @@ grpc::string ValidateServiceConfigJSON(const grpc::string& service_config_json);
 
 }  // namespace grpc
 
-#endif  // GRPCPP_SUPPORT_VALIDATE_SERVICE_CONFIG_H
+#endif  // GRPCPP_SUPPORT_VALIDATE_SERVICE_CONFIG_H

src/cpp/common/channel_arguments.cc

@@ -23,7 +23,6 @@
 #include <grpc/support/log.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/resource_quota.h>
-#include "src/core/ext/filters/client_channel/service_config.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"