After GrpcLibrary refactoring. Compiles and passes. WIP still

2016-01-27 18:41:26 -08:00 · 2016-01-27 18:41:26 -08:00 · e1300deb87
parent 6a48405ed0
commit e1300deb87
31 changed files with 544 additions and 248 deletions
--- a/11
+++ b/11
@ -785,6 +785,7 @@ cc_library(
    "src/cpp/common/call.cc",
    "src/cpp/common/channel_arguments.cc",
    "src/cpp/common/completion_queue.cc",
+    "src/cpp/common/grpc_library_initializer.cc",
    "src/cpp/common/rpc_method.cc",
    "src/cpp/proto/proto_utils.cc",
    "src/cpp/server/async_generic_service.cc",
@ -801,6 +802,7 @@ cc_library(
    "src/cpp/util/status.cc",
    "src/cpp/util/string_ref.cc",
    "src/cpp/util/time.cc",
+    "src/cpp/codegen/grpc_library.cc",
  ],
  hdrs = [
    "include/grpc++/channel.h",
@ -854,6 +856,7 @@ cc_library(
    "include/grpc++/impl/codegen/completion_queue_tag.h",
    "include/grpc++/impl/codegen/config.h",
    "include/grpc++/impl/codegen/config_protobuf.h",
+    "include/grpc++/impl/codegen/grpc_library.h",
    "include/grpc++/impl/codegen/proto_utils.h",
    "include/grpc++/impl/codegen/security/auth_context.h",
    "include/grpc++/impl/codegen/serialization_traits.h",
@ -863,6 +866,7 @@ cc_library(
    "include/grpc++/impl/codegen/status.h",
    "include/grpc++/impl/codegen/status_code_enum.h",
    "include/grpc++/impl/codegen/string_ref.h",
+    "include/grpc++/impl/codegen/stub_options.h",
    "include/grpc++/impl/codegen/sync.h",
    "include/grpc++/impl/codegen/sync_cxx11.h",
    "include/grpc++/impl/codegen/sync_no_cxx11.h",
@ -900,6 +904,7 @@ cc_library(
    "src/cpp/common/call.cc",
    "src/cpp/common/channel_arguments.cc",
    "src/cpp/common/completion_queue.cc",
+    "src/cpp/common/grpc_library_initializer.cc",
    "src/cpp/common/rpc_method.cc",
    "src/cpp/proto/proto_utils.cc",
    "src/cpp/server/async_generic_service.cc",
@ -916,6 +921,7 @@ cc_library(
    "src/cpp/util/status.cc",
    "src/cpp/util/string_ref.cc",
    "src/cpp/util/time.cc",
+    "src/cpp/codegen/grpc_library.cc",
  ],
  hdrs = [
    "include/grpc++/channel.h",
@ -969,6 +975,7 @@ cc_library(
    "include/grpc++/impl/codegen/completion_queue_tag.h",
    "include/grpc++/impl/codegen/config.h",
    "include/grpc++/impl/codegen/config_protobuf.h",
+    "include/grpc++/impl/codegen/grpc_library.h",
    "include/grpc++/impl/codegen/proto_utils.h",
    "include/grpc++/impl/codegen/security/auth_context.h",
    "include/grpc++/impl/codegen/serialization_traits.h",
@ -978,6 +985,7 @@ cc_library(
    "include/grpc++/impl/codegen/status.h",
    "include/grpc++/impl/codegen/status_code_enum.h",
    "include/grpc++/impl/codegen/string_ref.h",
+    "include/grpc++/impl/codegen/stub_options.h",
    "include/grpc++/impl/codegen/sync.h",
    "include/grpc++/impl/codegen/sync_cxx11.h",
    "include/grpc++/impl/codegen/sync_no_cxx11.h",
@ -1018,6 +1026,7 @@ cc_library(
    "src/compiler/objective_c_generator.cc",
    "src/compiler/python_generator.cc",
    "src/compiler/ruby_generator.cc",
+    "src/cpp/codegen/grpc_library.cc",
  ],
  hdrs = [
    "include/grpc++/impl/codegen/async_stream.h",
@ -1028,6 +1037,7 @@ cc_library(
    "include/grpc++/impl/codegen/completion_queue_tag.h",
    "include/grpc++/impl/codegen/config.h",
    "include/grpc++/impl/codegen/config_protobuf.h",
+    "include/grpc++/impl/codegen/grpc_library.h",
    "include/grpc++/impl/codegen/proto_utils.h",
    "include/grpc++/impl/codegen/security/auth_context.h",
    "include/grpc++/impl/codegen/serialization_traits.h",
@ -1037,6 +1047,7 @@ cc_library(
    "include/grpc++/impl/codegen/status.h",
    "include/grpc++/impl/codegen/status_code_enum.h",
    "include/grpc++/impl/codegen/string_ref.h",
+    "include/grpc++/impl/codegen/stub_options.h",
    "include/grpc++/impl/codegen/sync.h",
    "include/grpc++/impl/codegen/sync_cxx11.h",
    "include/grpc++/impl/codegen/sync_no_cxx11.h",
--- a/11
+++ b/11
@ -3010,6 +3010,7 @@ LIBGRPC++_SRC = \
    src/cpp/common/call.cc \
    src/cpp/common/channel_arguments.cc \
    src/cpp/common/completion_queue.cc \
+    src/cpp/common/grpc_library_initializer.cc \
    src/cpp/common/rpc_method.cc \
    src/cpp/proto/proto_utils.cc \
    src/cpp/server/async_generic_service.cc \
@ -3026,6 +3027,7 @@ LIBGRPC++_SRC = \
    src/cpp/util/status.cc \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time.cc \
+    src/cpp/codegen/grpc_library.cc \

 PUBLIC_HEADERS_CXX += \
    include/grpc++/channel.h \
@ -3079,6 +3081,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/completion_queue_tag.h \
    include/grpc++/impl/codegen/config.h \
    include/grpc++/impl/codegen/config_protobuf.h \
+    include/grpc++/impl/codegen/grpc_library.h \
    include/grpc++/impl/codegen/proto_utils.h \
    include/grpc++/impl/codegen/security/auth_context.h \
    include/grpc++/impl/codegen/serialization_traits.h \
@ -3088,6 +3091,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/status.h \
    include/grpc++/impl/codegen/status_code_enum.h \
    include/grpc++/impl/codegen/string_ref.h \
+    include/grpc++/impl/codegen/stub_options.h \
    include/grpc++/impl/codegen/sync.h \
    include/grpc++/impl/codegen/sync_cxx11.h \
    include/grpc++/impl/codegen/sync_no_cxx11.h \
@ -3301,6 +3305,7 @@ LIBGRPC++_UNSECURE_SRC = \
    src/cpp/common/call.cc \
    src/cpp/common/channel_arguments.cc \
    src/cpp/common/completion_queue.cc \
+    src/cpp/common/grpc_library_initializer.cc \
    src/cpp/common/rpc_method.cc \
    src/cpp/proto/proto_utils.cc \
    src/cpp/server/async_generic_service.cc \
@ -3317,6 +3322,7 @@ LIBGRPC++_UNSECURE_SRC = \
    src/cpp/util/status.cc \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time.cc \
+    src/cpp/codegen/grpc_library.cc \

 PUBLIC_HEADERS_CXX += \
    include/grpc++/channel.h \
@ -3370,6 +3376,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/completion_queue_tag.h \
    include/grpc++/impl/codegen/config.h \
    include/grpc++/impl/codegen/config_protobuf.h \
+    include/grpc++/impl/codegen/grpc_library.h \
    include/grpc++/impl/codegen/proto_utils.h \
    include/grpc++/impl/codegen/security/auth_context.h \
    include/grpc++/impl/codegen/serialization_traits.h \
@ -3379,6 +3386,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/status.h \
    include/grpc++/impl/codegen/status_code_enum.h \
    include/grpc++/impl/codegen/string_ref.h \
+    include/grpc++/impl/codegen/stub_options.h \
    include/grpc++/impl/codegen/sync.h \
    include/grpc++/impl/codegen/sync_cxx11.h \
    include/grpc++/impl/codegen/sync_no_cxx11.h \
@ -3458,6 +3466,7 @@ LIBGRPC_PLUGIN_SUPPORT_SRC = \
    src/compiler/objective_c_generator.cc \
    src/compiler/python_generator.cc \
    src/compiler/ruby_generator.cc \
+    src/cpp/codegen/grpc_library.cc \

 PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/async_stream.h \
@ -3468,6 +3477,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/completion_queue_tag.h \
    include/grpc++/impl/codegen/config.h \
    include/grpc++/impl/codegen/config_protobuf.h \
+    include/grpc++/impl/codegen/grpc_library.h \
    include/grpc++/impl/codegen/proto_utils.h \
    include/grpc++/impl/codegen/security/auth_context.h \
    include/grpc++/impl/codegen/serialization_traits.h \
@ -3477,6 +3487,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpc++/impl/codegen/status.h \
    include/grpc++/impl/codegen/status_code_enum.h \
    include/grpc++/impl/codegen/string_ref.h \
+    include/grpc++/impl/codegen/stub_options.h \
    include/grpc++/impl/codegen/sync.h \
    include/grpc++/impl/codegen/sync_cxx11.h \
    include/grpc++/impl/codegen/sync_no_cxx11.h \
--- a/build.yaml
+++ b/build.yaml
@ -84,6 +84,7 @@ filegroups:
  - src/cpp/common/call.cc
  - src/cpp/common/channel_arguments.cc
  - src/cpp/common/completion_queue.cc
+  - src/cpp/common/grpc_library_initializer.cc
  - src/cpp/common/rpc_method.cc
  - src/cpp/proto/proto_utils.cc
  - src/cpp/server/async_generic_service.cc
@ -107,10 +108,10 @@ filegroups:
  - include/grpc++/impl/codegen/call_hook.h
  - include/grpc++/impl/codegen/channel_interface.h
  - include/grpc++/impl/codegen/client_context.h
-  - include/grpc++/impl/codegen/stub_options.h
  - include/grpc++/impl/codegen/completion_queue_tag.h
  - include/grpc++/impl/codegen/config.h
  - include/grpc++/impl/codegen/config_protobuf.h
+  - include/grpc++/impl/codegen/grpc_library.h
  - include/grpc++/impl/codegen/proto_utils.h
  - include/grpc++/impl/codegen/security/auth_context.h
  - include/grpc++/impl/codegen/serialization_traits.h
@ -120,10 +121,13 @@ filegroups:
  - include/grpc++/impl/codegen/status.h
  - include/grpc++/impl/codegen/status_code_enum.h
  - include/grpc++/impl/codegen/string_ref.h
+  - include/grpc++/impl/codegen/stub_options.h
  - include/grpc++/impl/codegen/sync.h
  - include/grpc++/impl/codegen/sync_cxx11.h
  - include/grpc++/impl/codegen/sync_no_cxx11.h
  - include/grpc++/impl/codegen/time.h
+  src:
+  - src/cpp/codegen/grpc_library.cc
 - name: grpc_base
  public_headers:
  - include/grpc/byte_buffer.h
--- a/include/grpc++/alarm.h
+++ b/include/grpc++/alarm.h
@ -36,14 +36,15 @@
 #ifndef GRPCXX_ALARM_H
 #define GRPCXX_ALARM_H

-#include <grpc++/completion_queue.h>
-#include <grpc++/impl/grpc_library.h>
-#include <grpc++/support/time.h>
+#include <grpc++/impl/codegen/grpc_library.h>
+#include <grpc++/impl/codegen/time.h>

 namespace grpc {

+class CompletionQueue;
+
 /// A thin wrapper around \a grpc_alarm (see / \a / src/core/surface/alarm.h).
-class Alarm : public GrpcLibrary {
+class Alarm : private GrpcLibrary {
 public:
  /// Create a completion queue alarm instance associated to \a cq.
  ///
--- a/include/grpc++/channel.h
+++ b/include/grpc++/channel.h
@ -36,20 +36,20 @@

 #include <memory>

-#include <grpc/grpc.h>
 #include <grpc++/impl/call.h>
 #include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/grpc_library.h>
-#include <grpc++/support/config.h>
+#include <grpc++/impl/codegen/config.h>
+#include <grpc++/impl/codegen/grpc_library.h>
+#include <grpc/grpc.h>

 struct grpc_channel;

 namespace grpc {
 /// Channels represent a connection to an endpoint. Created by \a CreateChannel.
 class Channel GRPC_FINAL : public ChannelInterface,
-                           public GrpcLibrary,
                           public CallHook,
-                           public std::enable_shared_from_this<Channel> {
+                           public std::enable_shared_from_this<Channel>,
+                           private GrpcLibrary {
 public:
  ~Channel();

--- a/include/grpc++/completion_queue.h
+++ b/include/grpc++/completion_queue.h
@ -36,9 +36,9 @@
 #ifndef GRPCXX_COMPLETION_QUEUE_H
 #define GRPCXX_COMPLETION_QUEUE_H

-#include <grpc++/impl/grpc_library.h>
-#include <grpc++/support/status.h>
-#include <grpc++/support/time.h>
+#include <grpc++/impl/codegen/grpc_library.h>
+#include <grpc++/impl/codegen/status.h>
+#include <grpc++/impl/codegen/time.h>

 struct grpc_completion_queue;

@ -78,7 +78,7 @@ class ServerContext;

 /// A thin wrapper around \a grpc_completion_queue (see / \a
 /// src/core/surface/completion_queue.h).
-class CompletionQueue : public GrpcLibrary {
+class CompletionQueue : private GrpcLibrary {
 public:
  /// Default constructor. Implicitly creates a \a grpc_completion_queue
  /// instance.
@ -90,7 +90,7 @@ class CompletionQueue : public GrpcLibrary {
  explicit CompletionQueue(grpc_completion_queue* take);

  /// Destructor. Destroys the owned wrapped completion queue / instance.
-  ~CompletionQueue() GRPC_OVERRIDE;
+  ~CompletionQueue();

  /// Tri-state return for AsyncNext: SHUTDOWN, GOT_EVENT, TIMEOUT.
  enum NextStatus {
--- a/include/grpc++/impl/client_unary_call.h
+++ b/include/grpc++/impl/client_unary_call.h
@ -34,10 +34,10 @@
 #ifndef GRPCXX_IMPL_CLIENT_UNARY_CALL_H
 #define GRPCXX_IMPL_CLIENT_UNARY_CALL_H

-#include <grpc++/impl/call.h>
+#include <grpc++/impl/codegen/call.h>
 #include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/support/config.h>
-#include <grpc++/support/status.h>
+#include <grpc++/impl/codegen/config.h>
+#include <grpc++/impl/codegen/status.h>

 namespace grpc {

--- a/include/grpc++/impl/codegen/grpc_library.h
+++ b/include/grpc++/impl/codegen/grpc_library.h
@ -0,0 +1,67 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef GRPCXX_IMPL_CODEGEN_GRPC_LIBRARY_H
+#define GRPCXX_IMPL_CODEGEN_GRPC_LIBRARY_H
+
+#include <grpc/impl/codegen/log.h>
+
+namespace grpc {
+
+class GrpcLibraryInterface {
+ public:
+  virtual void init() = 0;
+  virtual void shutdown() = 0;
+};
+
+extern GrpcLibraryInterface* g_glip;
+
+class GrpcLibrary {
+ public:
+  GrpcLibrary() {
+    GPR_ASSERT(g_glip &&
+               "gRPC library not initialized. See "
+               "grpc::internal::GrpcLibraryInitializer.");
+    g_glip->init();
+  }
+  virtual ~GrpcLibrary() {
+    GPR_ASSERT(g_glip &&
+               "gRPC library not initialized. See "
+               "grpc::internal::GrpcLibraryInitializer.");
+    g_glip->shutdown();
+  }
+};
+
+}  // namespace grpc
+
+#endif  // GRPCXX_IMPL_GRPC_LIBRARY_H
--- a/include/grpc++/impl/grpc_library.h
+++ b/include/grpc++/impl/grpc_library.h
@ -34,16 +34,34 @@
 #ifndef GRPCXX_IMPL_GRPC_LIBRARY_H
 #define GRPCXX_IMPL_GRPC_LIBRARY_H

+#include <grpc++/impl/codegen/config.h>
+#include <grpc++/impl/codegen/grpc_library.h>
 #include <grpc/grpc.h>

 namespace grpc {

-class GrpcLibrary {
+namespace internal {
+class GrpcLibrary GRPC_FINAL : public GrpcLibraryInterface {
 public:
-  GrpcLibrary() { grpc_init(); }
-  virtual ~GrpcLibrary() { grpc_shutdown(); }
+  void init() GRPC_OVERRIDE { grpc_init(); }
+
+  void shutdown() GRPC_OVERRIDE { grpc_shutdown(); }
 };

+static GrpcLibrary g_gli;
+
+class GrpcLibraryInitializer GRPC_FINAL {
+ public:
+  GrpcLibraryInitializer() { grpc::g_glip = &g_gli; }
+
+  /// A no-op method to force the linker to reference this class, which will
+  /// take care of initializing and shutting down the gRPC runtime.
+  inline void summon() {}
+};
+
+extern GrpcLibraryInitializer g_gli_initializer;
+
+}  // namespace internal
 }  // namespace grpc

 #endif  // GRPCXX_IMPL_GRPC_LIBRARY_H
--- a/include/grpc++/security/credentials.h
+++ b/include/grpc++/security/credentials.h
@ -37,12 +37,13 @@
 #include <map>
 #include <memory>

-#include <grpc++/impl/grpc_library.h>
+#include <grpc++/impl/codegen/grpc_library.h>
 #include <grpc++/security/auth_context.h>
-#include <grpc++/support/config.h>
 #include <grpc++/support/status.h>
 #include <grpc++/support/string_ref.h>

+struct grpc_call;
+
 namespace grpc {
 class ChannelArguments;
 class Channel;
@ -56,9 +57,10 @@ class SecureCallCredentials;
 /// for all the calls on that channel.
 ///
 /// \see http://www.grpc.io/docs/guides/auth.html
-class ChannelCredentials : public GrpcLibrary {
+class ChannelCredentials : private GrpcLibrary {
 public:
-  ~ChannelCredentials() GRPC_OVERRIDE;
+  ChannelCredentials();
+  ~ChannelCredentials();

 protected:
  friend std::shared_ptr<ChannelCredentials> CompositeChannelCredentials(
@ -81,9 +83,10 @@ class ChannelCredentials : public GrpcLibrary {
 /// authenticate with a server for a given call on a channel.
 ///
 /// \see http://www.grpc.io/docs/guides/auth.html
-class CallCredentials : public GrpcLibrary {
+class CallCredentials {
 public:
-  ~CallCredentials() GRPC_OVERRIDE;
+  CallCredentials();
+  ~CallCredentials();

  /// Apply this instance's credentials to \a call.
  virtual bool ApplyToCall(grpc_call* call) = 0;
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@ -39,10 +39,10 @@

 #include <grpc++/completion_queue.h>
 #include <grpc++/impl/call.h>
-#include <grpc++/impl/grpc_library.h>
+#include <grpc++/impl/codegen/grpc_library.h>
+#include <grpc++/impl/codegen/server_interface.h>
 #include <grpc++/impl/rpc_service_method.h>
 #include <grpc++/impl/sync.h>
-#include <grpc++/impl/codegen/server_interface.h>
 #include <grpc++/security/server_credentials.h>
 #include <grpc++/support/channel_arguments.h>
 #include <grpc++/support/config.h>
@ -62,7 +62,7 @@ class ThreadPoolInterface;
 /// Models a gRPC server.
 ///
 /// Servers are configured and started via \a grpc::ServerBuilder.
-class Server GRPC_FINAL : public ServerInterface, public GrpcLibrary {
+class Server GRPC_FINAL : public ServerInterface, private GrpcLibrary {
 public:
  ~Server();

--- a/include/grpc++/support/sync_stream.h
+++ b/include/grpc++/support/sync_stream.h
@ -34,18 +34,18 @@
 #ifndef GRPCXX_SUPPORT_SYNC_STREAM_H
 #define GRPCXX_SUPPORT_SYNC_STREAM_H

-#include <grpc/impl/codegen/log.h>
+#include <grpc++/channel.h>
+#include <grpc++/client_context.h>
+#include <grpc++/completion_queue.h>
+#include <grpc++/impl/call.h>
 #include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/codegen/client_context.h>
-#include <grpc++/impl/codegen/call.h>
-#include <grpc++/impl/codegen/service_type.h>
-#include <grpc++/impl/codegen/server_context.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpc++/impl/service_type.h>
+#include <grpc++/server_context.h>
+#include <grpc++/support/status.h>
+#include <grpc/support/log.h>

 namespace grpc {

-class CompletionQueue;
-
 /// Common interface for all synchronous client side streaming.
 class ClientStreamingInterface {
 public:
@ -121,9 +121,7 @@ class ClientReader GRPC_FINAL : public ClientReaderInterface<R> {
  template <class W>
  ClientReader(ChannelInterface* channel, const RpcMethod& method,
               ClientContext* context, const W& request)
-      : context_(context),
-        cq_(new CompletionQueue),
-        call_(channel->CreateCall(method, context, cq_.get())) {
+      : context_(context), call_(channel->CreateCall(method, context, &cq_)) {
    CallOpSet<CallOpSendInitialMetadata, CallOpSendMessage,
              CallOpClientSendClose> ops;
    ops.SendInitialMetadata(context->send_initial_metadata_);
@ -131,7 +129,7 @@ class ClientReader GRPC_FINAL : public ClientReaderInterface<R> {
    GPR_ASSERT(ops.SendMessage(request).ok());
    ops.ClientSendClose();
    call_.PerformOps(&ops);
-    cq_->Pluck(&ops);
+    cq_.Pluck(&ops);
  }

  void WaitForInitialMetadata() GRPC_OVERRIDE {
@ -140,7 +138,7 @@ class ClientReader GRPC_FINAL : public ClientReaderInterface<R> {
    CallOpSet<CallOpRecvInitialMetadata> ops;
    ops.RecvInitialMetadata(context_);
    call_.PerformOps(&ops);
-    cq_->Pluck(&ops);  /// status ignored
+    cq_.Pluck(&ops);  /// status ignored
  }

  bool Read(R* msg) GRPC_OVERRIDE {
@ -150,7 +148,7 @@ class ClientReader GRPC_FINAL : public ClientReaderInterface<R> {
    }
    ops.RecvMessage(msg);
    call_.PerformOps(&ops);
-    return cq_->Pluck(&ops) && ops.got_message;
+    return cq_.Pluck(&ops) && ops.got_message;
  }

  Status Finish() GRPC_OVERRIDE {
@ -158,13 +156,13 @@ class ClientReader GRPC_FINAL : public ClientReaderInterface<R> {
    Status status;
    ops.ClientRecvStatus(context_, &status);
    call_.PerformOps(&ops);
-    GPR_ASSERT(cq_->Pluck(&ops));
+    GPR_ASSERT(cq_.Pluck(&ops));
    return status;
  }

 private:
  ClientContext* context_;
-  std::unique_ptr<CompletionQueue> cq_;
+  CompletionQueue cq_;
  Call call_;
 };

@ -187,15 +185,13 @@ class ClientWriter : public ClientWriterInterface<W> {
  template <class R>
  ClientWriter(ChannelInterface* channel, const RpcMethod& method,
               ClientContext* context, R* response)
-      : context_(context),
-        cq_(new CompletionQueue),
-        call_(channel->CreateCall(method, context, cq_.get())) {
+      : context_(context), call_(channel->CreateCall(method, context, &cq_)) {
    finish_ops_.RecvMessage(response);

    CallOpSet<CallOpSendInitialMetadata> ops;
    ops.SendInitialMetadata(context->send_initial_metadata_);
    call_.PerformOps(&ops);
-    cq_->Pluck(&ops);
+    cq_.Pluck(&ops);
  }

  using WriterInterface<W>::Write;
@ -205,14 +201,14 @@ class ClientWriter : public ClientWriterInterface<W> {
      return false;
    }
    call_.PerformOps(&ops);
-    return cq_->Pluck(&ops);
+    return cq_.Pluck(&ops);
  }

  bool WritesDone() GRPC_OVERRIDE {
    CallOpSet<CallOpClientSendClose> ops;
    ops.ClientSendClose();
    call_.PerformOps(&ops);
-    return cq_->Pluck(&ops);
+    return cq_.Pluck(&ops);
  }

  /// Read the final response and wait for the final status.
@ -220,14 +216,14 @@ class ClientWriter : public ClientWriterInterface<W> {
    Status status;
    finish_ops_.ClientRecvStatus(context_, &status);
    call_.PerformOps(&finish_ops_);
-    GPR_ASSERT(cq_->Pluck(&finish_ops_));
+    GPR_ASSERT(cq_.Pluck(&finish_ops_));
    return status;
  }

 private:
  ClientContext* context_;
  CallOpSet<CallOpGenericRecvMessage, CallOpClientRecvStatus> finish_ops_;
-  std::unique_ptr<CompletionQueue> cq_;
+  CompletionQueue cq_;
  Call call_;
 };

@ -255,13 +251,11 @@ class ClientReaderWriter GRPC_FINAL : public ClientReaderWriterInterface<W, R> {
  /// Blocking create a stream.
  ClientReaderWriter(ChannelInterface* channel, const RpcMethod& method,
                     ClientContext* context)
-      : context_(context),
-        cq_(new CompletionQueue),
-        call_(channel->CreateCall(method, context, cq_.get())) {
+      : context_(context), call_(channel->CreateCall(method, context, &cq_)) {
    CallOpSet<CallOpSendInitialMetadata> ops;
    ops.SendInitialMetadata(context->send_initial_metadata_);
    call_.PerformOps(&ops);
-    cq_->Pluck(&ops);
+    cq_.Pluck(&ops);
  }

  void WaitForInitialMetadata() GRPC_OVERRIDE {
@ -270,7 +264,7 @@ class ClientReaderWriter GRPC_FINAL : public ClientReaderWriterInterface<W, R> {
    CallOpSet<CallOpRecvInitialMetadata> ops;
    ops.RecvInitialMetadata(context_);
    call_.PerformOps(&ops);
-    cq_->Pluck(&ops);  // status ignored
+    cq_.Pluck(&ops);  // status ignored
  }

  bool Read(R* msg) GRPC_OVERRIDE {
@ -280,7 +274,7 @@ class ClientReaderWriter GRPC_FINAL : public ClientReaderWriterInterface<W, R> {
    }
    ops.RecvMessage(msg);
    call_.PerformOps(&ops);
-    return cq_->Pluck(&ops) && ops.got_message;
+    return cq_.Pluck(&ops) && ops.got_message;
  }

  using WriterInterface<W>::Write;
@ -288,14 +282,14 @@ class ClientReaderWriter GRPC_FINAL : public ClientReaderWriterInterface<W, R> {
    CallOpSet<CallOpSendMessage> ops;
    if (!ops.SendMessage(msg, options).ok()) return false;
    call_.PerformOps(&ops);
-    return cq_->Pluck(&ops);
+    return cq_.Pluck(&ops);
  }

  bool WritesDone() GRPC_OVERRIDE {
    CallOpSet<CallOpClientSendClose> ops;
    ops.ClientSendClose();
    call_.PerformOps(&ops);
-    return cq_->Pluck(&ops);
+    return cq_.Pluck(&ops);
  }

  Status Finish() GRPC_OVERRIDE {
@ -303,13 +297,13 @@ class ClientReaderWriter GRPC_FINAL : public ClientReaderWriterInterface<W, R> {
    Status status;
    ops.ClientRecvStatus(context_, &status);
    call_.PerformOps(&ops);
-    GPR_ASSERT(cq_->Pluck(&ops));
+    GPR_ASSERT(cq_.Pluck(&ops));
    return status;
  }

 private:
  ClientContext* context_;
-  std::unique_ptr<CompletionQueue> cq_;
+  CompletionQueue cq_;
  Call call_;
 };

--- a/src/cpp/client/channel.cc
+++ b/src/cpp/client/channel.cc
@ -35,25 +35,28 @@

 #include <memory>

-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/slice.h>
 #include <grpc++/client_context.h>
 #include <grpc++/completion_queue.h>
-#include <grpc++/security/credentials.h>
 #include <grpc++/impl/call.h>
-#include <grpc++/impl/rpc_method.h>
 #include <grpc++/impl/codegen/completion_queue_tag.h>
+#include <grpc++/impl/grpc_library.h>
+#include <grpc++/impl/rpc_method.h>
+#include <grpc++/security/credentials.h>
 #include <grpc++/support/channel_arguments.h>
 #include <grpc++/support/config.h>
 #include <grpc++/support/status.h>
 #include <grpc++/support/time.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/slice.h>
 #include "src/core/profiling/timers.h"

 namespace grpc {

 Channel::Channel(const grpc::string& host, grpc_channel* channel)
-    : host_(host), c_channel_(channel) {}
+    : host_(host), c_channel_(channel) {
+  internal::g_gli_initializer.summon();
+}

 Channel::~Channel() { grpc_channel_destroy(c_channel_); }

--- a/src/cpp/client/create_channel.cc
+++ b/src/cpp/client/create_channel.cc
@ -36,6 +36,7 @@

 #include <grpc++/channel.h>
 #include <grpc++/create_channel.h>
+#include <grpc++/impl/grpc_library.h>
 #include <grpc++/support/channel_arguments.h>

 #include "src/cpp/client/create_channel_internal.h"
@ -53,7 +54,8 @@ std::shared_ptr<Channel> CreateCustomChannel(
    const grpc::string& target,
    const std::shared_ptr<ChannelCredentials>& creds,
    const ChannelArguments& args) {
-  GrpcLibrary init_lib;  // We need to call init in case of a bad creds.
+  internal::GrpcLibrary
+      init_lib;  // We need to call init in case of a bad creds.
  ChannelArguments cp_args = args;
  std::ostringstream user_agent_prefix;
  user_agent_prefix << "grpc-c++/" << grpc_version_string();
--- a/src/cpp/client/credentials.cc
+++ b/src/cpp/client/credentials.cc
@ -31,12 +31,19 @@
 *
 */

+#include <grpc++/impl/grpc_library.h>
 #include <grpc++/security/credentials.h>

 namespace grpc {

+ChannelCredentials::ChannelCredentials() {
+  internal::g_gli_initializer.summon();
+}
+
 ChannelCredentials::~ChannelCredentials() {}

+CallCredentials::CallCredentials() { internal::g_gli_initializer.summon(); }
+
 CallCredentials::~CallCredentials() {}

 }  // namespace grpc
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@ -41,6 +41,12 @@

 namespace grpc {

+SecureChannelCredentials::SecureChannelCredentials(
+    grpc_channel_credentials* c_creds)
+    : c_creds_(c_creds) {
+  internal::g_gli_initializer.summon();
+}
+
 std::shared_ptr<grpc::Channel> SecureChannelCredentials::CreateChannel(
    const string& target, const grpc::ChannelArguments& args) {
  grpc_channel_args channel_args;
@ -51,6 +57,12 @@ std::shared_ptr<grpc::Channel> SecureChannelCredentials::CreateChannel(
                                 nullptr));
 }

+SecureCallCredentials::SecureCallCredentials(grpc_call_credentials* c_creds)
+    : c_creds_(c_creds) {
+  internal::GrpcLibraryInitializer gli_initializer;
+  gli_initializer.summon();
+}
+
 bool SecureCallCredentials::ApplyToCall(grpc_call* call) {
  return grpc_call_set_credentials(call, c_creds_) == GRPC_CALL_OK;
 }
--- a/src/cpp/client/secure_credentials.h
+++ b/src/cpp/client/secure_credentials.h
@ -45,11 +45,8 @@ namespace grpc {

 class SecureChannelCredentials GRPC_FINAL : public ChannelCredentials {
 public:
-  explicit SecureChannelCredentials(grpc_channel_credentials* c_creds)
-      : c_creds_(c_creds) {}
-  ~SecureChannelCredentials() GRPC_OVERRIDE {
-    grpc_channel_credentials_release(c_creds_);
-  }
+  explicit SecureChannelCredentials(grpc_channel_credentials* c_creds);
+  ~SecureChannelCredentials() { grpc_channel_credentials_release(c_creds_); }
  grpc_channel_credentials* GetRawCreds() { return c_creds_; }

  std::shared_ptr<grpc::Channel> CreateChannel(
@ -62,11 +59,8 @@ class SecureChannelCredentials GRPC_FINAL : public ChannelCredentials {

 class SecureCallCredentials GRPC_FINAL : public CallCredentials {
 public:
-  explicit SecureCallCredentials(grpc_call_credentials* c_creds)
-      : c_creds_(c_creds) {}
-  ~SecureCallCredentials() GRPC_OVERRIDE {
-    grpc_call_credentials_release(c_creds_);
-  }
+  explicit SecureCallCredentials(grpc_call_credentials* c_creds);
+  ~SecureCallCredentials() { grpc_call_credentials_release(c_creds_); }
  grpc_call_credentials* GetRawCreds() { return c_creds_; }

  bool ApplyToCall(grpc_call* call) GRPC_OVERRIDE;
--- a/src/cpp/codegen/grpc_library.cc
+++ b/src/cpp/codegen/grpc_library.cc
@ -0,0 +1,40 @@
+/*
+ *
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <grpc++/impl/codegen/grpc_library.h>
+
+namespace grpc {
+
+GrpcLibraryInterface *g_glip = nullptr;
+
+}  // namespace grpc
--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@ -30,13 +30,17 @@
 *
 */

-#include <grpc/grpc.h>
 #include <grpc++/alarm.h>
+#include <grpc++/completion_queue.h>
+#include <grpc++/impl/grpc_library.h>
+#include <grpc/grpc.h>

 namespace grpc {

 Alarm::Alarm(CompletionQueue* cq, gpr_timespec deadline, void* tag)
-    : alarm_(grpc_alarm_create(cq->cq(), deadline, tag)) {}
+    : alarm_(grpc_alarm_create(cq->cq(), deadline, tag)) {
+  internal::g_gli_initializer.summon();
+}

 Alarm::~Alarm() { grpc_alarm_destroy(alarm_); }

--- a/src/cpp/common/completion_queue.cc
+++ b/src/cpp/common/completion_queue.cc
@ -34,14 +34,16 @@

 #include <memory>

+#include <grpc++/impl/codegen/completion_queue_tag.h>
+#include <grpc++/impl/grpc_library.h>
+#include <grpc++/support/time.h>
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
-#include <grpc++/support/time.h>
-#include <grpc++/impl/codegen/completion_queue_tag.h>

 namespace grpc {

 CompletionQueue::CompletionQueue() {
+  internal::g_gli_initializer.summon();
  cq_ = grpc_completion_queue_create(nullptr);
 }

--- a/src/cpp/common/grpc_library_initializer.cc
+++ b/src/cpp/common/grpc_library_initializer.cc
@ -0,0 +1,41 @@
+/*
+ * Copyright 2016, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <grpc++/impl/grpc_library.h>
+
+namespace grpc {
+namespace internal {
+
+GrpcLibraryInitializer g_gli_initializer;
+
+}  // namespace internal
+}  // namespace grpc
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@ -35,18 +35,19 @@

 #include <utility>

-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc++/completion_queue.h>
 #include <grpc++/generic/async_generic_service.h>
+#include <grpc++/impl/codegen/completion_queue_tag.h>
+#include <grpc++/impl/grpc_library.h>
 #include <grpc++/impl/method_handler_impl.h>
 #include <grpc++/impl/rpc_service_method.h>
 #include <grpc++/impl/service_type.h>
-#include <grpc++/impl/codegen/completion_queue_tag.h>
-#include <grpc++/server_context.h>
 #include <grpc++/security/server_credentials.h>
+#include <grpc++/server_context.h>
 #include <grpc++/support/time.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>

 #include "src/core/profiling/timers.h"
 #include "src/cpp/server/thread_pool_interface.h"
@ -288,6 +289,7 @@ Server::Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned,
      server_(CreateServer(args)),
      thread_pool_(thread_pool),
      thread_pool_owned_(thread_pool_owned) {
+  internal::g_gli_initializer.summon();
  gpr_once_init(&g_once_init_callbacks, InitGlobalCallbacks);
  grpc_server_register_completion_queue(server_, cq_.cq(), nullptr);
 }
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -26,7 +26,7 @@
 # for the list of possible encodings.
 # The default value is: UTF-8.

-DOXYFILE_ENCODING      = UTF-8
+DOXYFILE_ENCODING = UTF - 8

 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
 # double-quotes, unless you are using Doxywizard) that should identify the
@ -34,33 +34,34 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.

-PROJECT_NAME           = "GRPC C++"
+                    PROJECT_NAME = "GRPC C++"

 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.12.0.0
+    PROJECT_NUMBER = 0.12.0.0

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.

-PROJECT_BRIEF          =
+    PROJECT_BRIEF =

 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.

-PROJECT_LOGO           =
+        PROJECT_LOGO =

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.

-OUTPUT_DIRECTORY       = doc/ref/c++
+            OUTPUT_DIRECTORY =
+                doc / ref / c++

 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@ -70,7 +71,7 @@ OUTPUT_DIRECTORY       = doc/ref/c++
 # performance problems for the file system.
 # The default value is: NO.

-CREATE_SUBDIRS         = NO
+                CREATE_SUBDIRS = NO

 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
@ -78,7 +79,7 @@ CREATE_SUBDIRS         = NO
 # U+3044.
 # The default value is: NO.

-ALLOW_UNICODE_NAMES    = NO
+                    ALLOW_UNICODE_NAMES = NO

 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
@ -93,14 +94,14 @@ ALLOW_UNICODE_NAMES    = NO
 # Ukrainian and Vietnamese.
 # The default value is: English.

-OUTPUT_LANGUAGE        = English
+                        OUTPUT_LANGUAGE = English

 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.

-BRIEF_MEMBER_DESC      = YES
+                            BRIEF_MEMBER_DESC = YES

 # If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
 # description of a member or function before the detailed description
@ -109,7 +110,7 @@ BRIEF_MEMBER_DESC      = YES
 # brief descriptions will be completely suppressed.
 # The default value is: YES.

-REPEAT_BRIEF           = YES
+                                REPEAT_BRIEF = YES

 # This tag implements a quasi-intelligent brief description abbreviator that is
 # used to form the text in various listings. Each string in this list, if found
@ -120,14 +121,14 @@ REPEAT_BRIEF           = YES
 # the entity):The $name class, The $name widget, The $name file, is, provides,
 # specifies, contains, represents, a, an and the.

-ABBREVIATE_BRIEF       =
+                                    ABBREVIATE_BRIEF =

 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
 # doxygen will generate a detailed section even if there is only a brief
 # description.
 # The default value is: NO.

-ALWAYS_DETAILED_SEC    = NO
+                                        ALWAYS_DETAILED_SEC = NO

 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
 # inherited members of a class in the documentation of that class as if those
@ -135,14 +136,14 @@ ALWAYS_DETAILED_SEC    = NO
 # operators of the base classes will not be shown.
 # The default value is: NO.

-INLINE_INHERITED_MEMB  = NO
+                                            INLINE_INHERITED_MEMB = NO

 # If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.

-FULL_PATH_NAMES        = YES
+                                                FULL_PATH_NAMES = YES

 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@ -154,7 +155,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.

-STRIP_FROM_PATH        =
+                                                    STRIP_FROM_PATH =

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
@ -163,14 +164,14 @@ STRIP_FROM_PATH        =
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.

-STRIP_FROM_INC_PATH    =
+                                                        STRIP_FROM_INC_PATH =

 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
 # support long names like on DOS, Mac, or CD-ROM.
 # The default value is: NO.

-SHORT_NAMES            = NO
+                                                            SHORT_NAMES = NO

 # If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
 # first line (until the first dot) of a Javadoc-style comment as the brief
@ -179,7 +180,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.

-JAVADOC_AUTOBRIEF      = YES
+                                                                JAVADOC_AUTOBRIEF = YES

 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
@ -187,7 +188,7 @@ JAVADOC_AUTOBRIEF      = YES
 # requiring an explicit \brief command for a brief description.)
 # The default value is: NO.

-QT_AUTOBRIEF           = NO
+                                                                    QT_AUTOBRIEF = NO

 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@ -199,26 +200,28 @@ QT_AUTOBRIEF           = NO
 # not recognized any more.
 # The default value is: NO.

-MULTILINE_CPP_IS_BRIEF = NO
+                                                                        MULTILINE_CPP_IS_BRIEF = NO

 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.

-INHERIT_DOCS           = YES
+                                                                            INHERIT_DOCS = YES

 # If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
 # page for each member. If set to NO, the documentation of a member will be part
 # of the file/class/namespace that contains it.
 # The default value is: NO.

-SEPARATE_MEMBER_PAGES  = NO
+                                                                                SEPARATE_MEMBER_PAGES =
+                                                                                    NO

 # The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
 # uses this value to replace tabs by spaces in code fragments.
 # Minimum value: 1, maximum value: 16, default value: 4.

-TAB_SIZE               = 2
+                                                                                        TAB_SIZE =
+                                                                                            2

 # This tag can be used to specify a number of aliases that act as commands in
 # the documentation. An alias has the form:
@ -230,13 +233,13 @@ TAB_SIZE               = 2
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.

-ALIASES                =
+    ALIASES =

 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
 # will allow you to use the command class in the itcl::class meaning.

-TCL_SUBST              =
+        TCL_SUBST =

 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@ -244,7 +247,7 @@ TCL_SUBST              =
 # members will be omitted, etc.
 # The default value is: NO.

-OPTIMIZE_OUTPUT_FOR_C  = YES
+            OPTIMIZE_OUTPUT_FOR_C = YES

 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
 # Python sources only. Doxygen will then generate output that is more tailored
@ -252,19 +255,19 @@ OPTIMIZE_OUTPUT_FOR_C  = YES
 # qualified scopes will look different, etc.
 # The default value is: NO.

-OPTIMIZE_OUTPUT_JAVA   = NO
+                OPTIMIZE_OUTPUT_JAVA = NO

 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
 # sources. Doxygen will then generate output that is tailored for Fortran.
 # The default value is: NO.

-OPTIMIZE_FOR_FORTRAN   = NO
+                    OPTIMIZE_FOR_FORTRAN = NO

 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
 # sources. Doxygen will then generate output that is tailored for VHDL.
 # The default value is: NO.

-OPTIMIZE_OUTPUT_VHDL   = NO
+                        OPTIMIZE_OUTPUT_VHDL = NO

 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
@ -283,7 +286,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.

-EXTENSION_MAPPING      =
+                            EXTENSION_MAPPING =

 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@ -293,7 +296,7 @@ EXTENSION_MAPPING      =
 # case of backward compatibilities issues.
 # The default value is: YES.

-MARKDOWN_SUPPORT       = YES
+                                MARKDOWN_SUPPORT = YES

 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
@ -301,7 +304,7 @@ MARKDOWN_SUPPORT       = YES
 # globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.

-AUTOLINK_SUPPORT       = YES
+                                    AUTOLINK_SUPPORT = YES

 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should set this
@ -311,13 +314,13 @@ AUTOLINK_SUPPORT       = YES
 # diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.

-BUILTIN_STL_SUPPORT    = NO
+                                        BUILTIN_STL_SUPPORT = NO

 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 # The default value is: NO.

-CPP_CLI_SUPPORT        = NO
+                                            CPP_CLI_SUPPORT = NO

 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
 # http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
@ -325,7 +328,7 @@ CPP_CLI_SUPPORT        = NO
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.

-SIP_SUPPORT            = NO
+                                                SIP_SUPPORT = NO

 # For Microsoft's IDL there are propget and propput attributes to indicate
 # getter and setter methods for a property. Setting this option to YES will make
@ -335,7 +338,7 @@ SIP_SUPPORT            = NO
 # should set this option to NO.
 # The default value is: YES.

-IDL_PROPERTY_SUPPORT   = YES
+                                                    IDL_PROPERTY_SUPPORT = YES

 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES then doxygen will reuse the documentation of the first
@ -343,7 +346,7 @@ IDL_PROPERTY_SUPPORT   = YES
 # all members of a group must be documented explicitly.
 # The default value is: NO.

-DISTRIBUTE_GROUP_DOC   = NO
+                                                        DISTRIBUTE_GROUP_DOC = NO

 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
@ -352,7 +355,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # \nosubgrouping command.
 # The default value is: YES.

-SUBGROUPING            = YES
+                                                            SUBGROUPING = YES

 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
 # are shown inside the group in which they are included (e.g. using \ingroup)
@ -363,7 +366,7 @@ SUBGROUPING            = YES
 # SEPARATE_MEMBER_PAGES.
 # The default value is: NO.

-INLINE_GROUPED_CLASSES = NO
+                                                                INLINE_GROUPED_CLASSES = NO

 # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
 # with only public data fields or simple typedef fields will be shown inline in
@ -373,7 +376,7 @@ INLINE_GROUPED_CLASSES = NO
 # Man pages) or section (for LaTeX and RTF).
 # The default value is: NO.

-INLINE_SIMPLE_STRUCTS  = NO
+                                                                    INLINE_SIMPLE_STRUCTS = NO

 # When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
 # enum is documented as struct, union, or enum with the name of the typedef. So
@ -384,7 +387,8 @@ INLINE_SIMPLE_STRUCTS  = NO
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 # The default value is: NO.

-TYPEDEF_HIDES_STRUCT   = NO
+                                                                        TYPEDEF_HIDES_STRUCT =
+                                                                            NO

 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
@ -397,7 +401,8 @@ TYPEDEF_HIDES_STRUCT   = NO
 # the optimal cache size from a speed point of view.
 # Minimum value: 0, maximum value: 9, default value: 0.

-LOOKUP_CACHE_SIZE      = 0
+                                                                                LOOKUP_CACHE_SIZE =
+                                                                                    0

 #---------------------------------------------------------------------------
 # Build related configuration options
@ -411,25 +416,25 @@ LOOKUP_CACHE_SIZE      = 0
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.

-EXTRACT_ALL            = YES
+    EXTRACT_ALL = YES

 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
 # The default value is: NO.

-EXTRACT_PRIVATE        = NO
+        EXTRACT_PRIVATE = NO

 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.

-EXTRACT_PACKAGE        = NO
+            EXTRACT_PACKAGE = NO

 # If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
 # included in the documentation.
 # The default value is: NO.

-EXTRACT_STATIC         = NO
+                EXTRACT_STATIC = NO

 # If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
 # locally in source files will be included in the documentation. If set to NO,
@ -437,7 +442,7 @@ EXTRACT_STATIC         = NO
 # for Java sources.
 # The default value is: YES.

-EXTRACT_LOCAL_CLASSES  = YES
+                    EXTRACT_LOCAL_CLASSES = YES

 # This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
@ -445,7 +450,7 @@ EXTRACT_LOCAL_CLASSES  = YES
 # included.
 # The default value is: NO.

-EXTRACT_LOCAL_METHODS  = NO
+                        EXTRACT_LOCAL_METHODS = NO

 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
@ -454,7 +459,7 @@ EXTRACT_LOCAL_METHODS  = NO
 # are hidden.
 # The default value is: NO.

-EXTRACT_ANON_NSPACES   = NO
+                            EXTRACT_ANON_NSPACES = NO

 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
@ -462,7 +467,7 @@ EXTRACT_ANON_NSPACES   = NO
 # section is generated. This option has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.

-HIDE_UNDOC_MEMBERS     = NO
+                                HIDE_UNDOC_MEMBERS = NO

 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
@ -470,28 +475,28 @@ HIDE_UNDOC_MEMBERS     = NO
 # has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.

-HIDE_UNDOC_CLASSES     = NO
+                                    HIDE_UNDOC_CLASSES = NO

 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
 # (class|struct|union) declarations. If set to NO, these declarations will be
 # included in the documentation.
 # The default value is: NO.

-HIDE_FRIEND_COMPOUNDS  = NO
+                                        HIDE_FRIEND_COMPOUNDS = NO

 # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
 # documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.

-HIDE_IN_BODY_DOCS      = NO
+                                            HIDE_IN_BODY_DOCS = NO

 # The INTERNAL_DOCS tag determines if documentation that is typed after a
 # \internal command is included. If the tag is set to NO then the documentation
 # will be excluded. Set it to YES to include the internal documentation.
 # The default value is: NO.

-INTERNAL_DOCS          = NO
+                                                INTERNAL_DOCS = NO

 # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
 # names in lower-case letters. If set to YES, upper-case letters are also
@ -500,53 +505,53 @@ INTERNAL_DOCS          = NO
 # and Mac users are advised to set this option to NO.
 # The default value is: system dependent.

-CASE_SENSE_NAMES       = NO
+                                                    CASE_SENSE_NAMES = NO

 # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
 # their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.

-HIDE_SCOPE_NAMES       = NO
+                                                        HIDE_SCOPE_NAMES = NO

 # If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
 # append additional text to a page's title, such as Class Reference. If set to
 # YES the compound reference will be hidden.
 # The default value is: NO.

-HIDE_COMPOUND_REFERENCE= NO
+                                                            HIDE_COMPOUND_REFERENCE = NO

 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.

-SHOW_INCLUDE_FILES     = YES
+                                                                SHOW_INCLUDE_FILES = YES

 # If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
 # grouped member an include statement to the documentation, telling the reader
 # which file to include in order to use the member.
 # The default value is: NO.

-SHOW_GROUPED_MEMB_INC  = NO
+                                                                    SHOW_GROUPED_MEMB_INC = NO

 # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
 # files with double quotes in the documentation rather than with sharp brackets.
 # The default value is: NO.

-FORCE_LOCAL_INCLUDES   = NO
+                                                                        FORCE_LOCAL_INCLUDES = NO

 # If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
 # documentation for inline members.
 # The default value is: YES.

-INLINE_INFO            = YES
+                                                                            INLINE_INFO = YES

 # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
 # name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.

-SORT_MEMBER_DOCS       = YES
+                                                                                SORT_MEMBER_DOCS = YES

 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
@ -554,7 +559,7 @@ SORT_MEMBER_DOCS       = YES
 # this will also influence the order of the classes in the class list.
 # The default value is: NO.

-SORT_BRIEF_DOCS        = NO
+                                                                                    SORT_BRIEF_DOCS = NO

 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and
@ -566,14 +571,14 @@ SORT_BRIEF_DOCS        = NO
 # detailed member documentation.
 # The default value is: NO.

-SORT_MEMBERS_CTORS_1ST = NO
+                                                                                        SORT_MEMBERS_CTORS_1ST = NO

 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
 # of group names into alphabetical order. If set to NO the group names will
 # appear in their defined order.
 # The default value is: NO.

-SORT_GROUP_NAMES       = NO
+                                                                                            SORT_GROUP_NAMES = NO

 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
 # fully-qualified names, including namespaces. If set to NO, the class list will
@ -583,7 +588,7 @@ SORT_GROUP_NAMES       = NO
 # list.
 # The default value is: NO.

-SORT_BY_SCOPE_NAME     = NO
+                                                                                                SORT_BY_SCOPE_NAME = NO

 # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
 # type resolution of all parameters of a function it will reject a match between
@ -593,38 +598,39 @@ SORT_BY_SCOPE_NAME     = NO
 # accept a match between prototype and implementation in such cases.
 # The default value is: NO.

-STRICT_PROTO_MATCHING  = NO
+                                                                                                    STRICT_PROTO_MATCHING = NO

 # The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
 # list. This list is created by putting \todo commands in the documentation.
 # The default value is: YES.

-GENERATE_TODOLIST      = YES
+                                                                                                        GENERATE_TODOLIST = YES

 # The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
 # list. This list is created by putting \test commands in the documentation.
 # The default value is: YES.

-GENERATE_TESTLIST      = YES
+                                                                                                            GENERATE_TESTLIST = YES

 # The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
 # list. This list is created by putting \bug commands in the documentation.
 # The default value is: YES.

-GENERATE_BUGLIST       = YES
+                                                                                                                GENERATE_BUGLIST = YES

 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
 # the deprecated list. This list is created by putting \deprecated commands in
 # the documentation.
 # The default value is: YES.

-GENERATE_DEPRECATEDLIST= YES
+                                                                                                                    GENERATE_DEPRECATEDLIST =
+                                                                                                                        YES

 # The ENABLED_SECTIONS tag can be used to enable conditional documentation
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.

-ENABLED_SECTIONS       =
+                                                                                                                            ENABLED_SECTIONS =

 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
 # initial value of a variable or macro / define can have for it to appear in the
@ -635,28 +641,29 @@ ENABLED_SECTIONS       =
 # documentation regardless of this setting.
 # Minimum value: 0, maximum value: 10000, default value: 30.

-MAX_INITIALIZER_LINES  = 30
+                                                                                                                                MAX_INITIALIZER_LINES =
+                                                                                                                                    30

 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
 # the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
 # The default value is: YES.

-SHOW_USED_FILES        = YES
+    SHOW_USED_FILES = YES

 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
 # will remove the Files entry from the Quick Index and from the Folder Tree View
 # (if specified).
 # The default value is: YES.

-SHOW_FILES             = YES
+        SHOW_FILES = YES

 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
 # page. This will remove the Namespaces entry from the Quick Index and from the
 # Folder Tree View (if specified).
 # The default value is: YES.

-SHOW_NAMESPACES        = YES
+            SHOW_NAMESPACES = YES

 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
@ -666,7 +673,7 @@ SHOW_NAMESPACES        = YES
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.

-FILE_VERSION_FILTER    =
+                FILE_VERSION_FILTER =

 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
@ -679,7 +686,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.

-LAYOUT_FILE            =
+                    LAYOUT_FILE =

 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@ -689,7 +696,7 @@ LAYOUT_FILE            =
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.

-CITE_BIB_FILES         =
+                        CITE_BIB_FILES =

 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@ -700,7 +707,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.

-QUIET                  = NO
+                            QUIET = NO

 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
@ -709,14 +716,14 @@ QUIET                  = NO
 # Tip: Turn warnings on while writing the documentation.
 # The default value is: YES.

-WARNINGS               = YES
+                                WARNINGS = YES

 # If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.

-WARN_IF_UNDOCUMENTED   = YES
+                                    WARN_IF_UNDOCUMENTED = YES

 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some parameters
@ -724,7 +731,7 @@ WARN_IF_UNDOCUMENTED   = YES
 # markup commands wrongly.
 # The default value is: YES.

-WARN_IF_DOC_ERROR      = YES
+                                        WARN_IF_DOC_ERROR = YES

 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
@ -732,7 +739,7 @@ WARN_IF_DOC_ERROR      = YES
 # parameter documentation, but not about the absence of documentation.
 # The default value is: NO.

-WARN_NO_PARAMDOC       = NO
+                                            WARN_NO_PARAMDOC = NO

 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@ -742,13 +749,14 @@ WARN_NO_PARAMDOC       = NO
 # FILE_VERSION_FILTER)
 # The default value is: $file:$line: $text.

-WARN_FORMAT            = "$file:$line: $text"
+                                                WARN_FORMAT =
+                                                    "$file:$line: $text"

 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
 # error (stderr).

-WARN_LOGFILE           =
+    WARN_LOGFILE =

 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@ -760,70 +768,60 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.

-INPUT                  = include/grpc++/channel.h \
-include/grpc++/client_context.h \
-include/grpc++/completion_queue.h \
-include/grpc++/create_channel.h \
-include/grpc++/generic/async_generic_service.h \
-include/grpc++/generic/generic_stub.h \
-include/grpc++/grpc++.h \
-include/grpc++/impl/call.h \
-include/grpc++/impl/client_unary_call.h \
-include/grpc++/impl/grpc_library.h \
-include/grpc++/impl/method_handler_impl.h \
-include/grpc++/impl/proto_utils.h \
-include/grpc++/impl/rpc_method.h \
-include/grpc++/impl/rpc_service_method.h \
-include/grpc++/impl/serialization_traits.h \
-include/grpc++/impl/server_builder_option.h \
-include/grpc++/impl/service_type.h \
-include/grpc++/impl/sync.h \
-include/grpc++/impl/sync_cxx11.h \
-include/grpc++/impl/sync_no_cxx11.h \
-include/grpc++/impl/thd.h \
-include/grpc++/impl/thd_cxx11.h \
-include/grpc++/impl/thd_no_cxx11.h \
-include/grpc++/security/auth_context.h \
-include/grpc++/security/auth_metadata_processor.h \
-include/grpc++/security/credentials.h \
-include/grpc++/security/server_credentials.h \
-include/grpc++/server.h \
-include/grpc++/server_builder.h \
-include/grpc++/server_context.h \
-include/grpc++/support/async_stream.h \
-include/grpc++/support/async_unary_call.h \
-include/grpc++/support/byte_buffer.h \
-include/grpc++/support/channel_arguments.h \
-include/grpc++/support/config.h \
-include/grpc++/support/config_protobuf.h \
-include/grpc++/support/slice.h \
-include/grpc++/support/status.h \
-include/grpc++/support/status_code_enum.h \
-include/grpc++/support/string_ref.h \
-include/grpc++/support/stub_options.h \
-include/grpc++/support/sync_stream.h \
-include/grpc++/support/time.h \
-include/grpc++/impl/codegen/async_stream.h \
-include/grpc++/impl/codegen/call.h \
-include/grpc++/impl/codegen/call_hook.h \
-include/grpc++/impl/codegen/channel_interface.h \
-include/grpc++/impl/codegen/client_context.h \
-include/grpc++/impl/codegen/completion_queue_tag.h \
-include/grpc++/impl/codegen/config.h \
-include/grpc++/impl/codegen/config_protobuf.h \
-include/grpc++/impl/codegen/proto_utils.h \
-include/grpc++/impl/codegen/security/auth_context.h \
-include/grpc++/impl/codegen/serialization_traits.h \
-include/grpc++/impl/codegen/server_context.h \
-include/grpc++/impl/codegen/server_interface.h \
-include/grpc++/impl/codegen/service_type.h \
-include/grpc++/impl/codegen/status.h \
-include/grpc++/impl/codegen/status_code_enum.h \
-include/grpc++/impl/codegen/string_ref.h \
-include/grpc++/impl/codegen/sync.h \
-include/grpc++/impl/codegen/sync_cxx11.h \
-include/grpc++/impl/codegen/sync_no_cxx11.h \
-include/grpc++/impl/codegen/time.h
+        INPUT =
+            include / grpc++ / channel.h include / grpc++ /
+            client_context.h include / grpc++ / completion_queue.h include /
+            grpc++ / create_channel.h include / grpc++ / generic /
+            async_generic_service.h include / grpc++ / generic /
+            generic_stub.h include / grpc++ / grpc++.h include / grpc++ / impl /
+            call.h include / grpc++ / impl / client_unary_call.h include /
+            grpc++ / impl / grpc_library.h include / grpc++ / impl /
+            method_handler_impl.h include / grpc++ / impl /
+            proto_utils.h include / grpc++ / impl / rpc_method.h include /
+            grpc++ / impl / rpc_service_method.h include / grpc++ / impl /
+            serialization_traits.h include / grpc++ / impl /
+            server_builder_option.h include / grpc++ / impl /
+            service_type.h include / grpc++ / impl / sync.h include / grpc++ /
+            impl / sync_cxx11.h include / grpc++ / impl /
+            sync_no_cxx11.h include / grpc++ / impl / thd.h include / grpc++ /
+            impl / thd_cxx11.h include / grpc++ / impl /
+            thd_no_cxx11.h include / grpc++ / security /
+            auth_context.h include / grpc++ / security /
+            auth_metadata_processor.h include / grpc++ / security /
+            credentials.h include / grpc++ / security /
+            server_credentials.h include / grpc++ / server.h include / grpc++ /
+            server_builder.h include / grpc++ / server_context.h include /
+            grpc++ / support / async_stream.h include / grpc++ / support /
+            async_unary_call.h include / grpc++ / support /
+            byte_buffer.h include / grpc++ / support /
+            channel_arguments.h include / grpc++ / support / config.h include /
+            grpc++ / support / config_protobuf.h include / grpc++ / support /
+            slice.h include / grpc++ / support / status.h include / grpc++ /
+            support / status_code_enum.h include / grpc++ / support /
+            string_ref.h include / grpc++ / support / stub_options.h include /
+            grpc++ / support / sync_stream.h include / grpc++ / support /
+            time.h include / grpc++ / impl / codegen / async_stream.h include /
+            grpc++ / impl / codegen / call.h include / grpc++ / impl / codegen /
+            call_hook.h include / grpc++ / impl / codegen /
+            channel_interface.h include / grpc++ / impl / codegen /
+            client_context.h include / grpc++ / impl / codegen /
+            completion_queue_tag.h include / grpc++ / impl / codegen /
+            config.h include / grpc++ / impl / codegen /
+            config_protobuf.h include / grpc++ / impl / codegen /
+            grpc_library.h include / grpc++ / impl / codegen /
+            proto_utils.h include / grpc++ / impl / codegen / security /
+            auth_context.h include / grpc++ / impl / codegen /
+            serialization_traits.h include / grpc++ / impl / codegen /
+            server_context.h include / grpc++ / impl / codegen /
+            server_interface.h include / grpc++ / impl / codegen /
+            service_type.h include / grpc++ / impl / codegen /
+            status.h include / grpc++ / impl / codegen /
+            status_code_enum.h include / grpc++ / impl / codegen /
+            string_ref.h include / grpc++ / impl / codegen /
+            stub_options.h include / grpc++ / impl / codegen / sync.h include /
+            grpc++ / impl / codegen / sync_cxx11.h include / grpc++ / impl /
+            codegen / sync_no_cxx11.h include / grpc++ / impl / codegen /
+            time.h

 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@ -832,7 +830,7 @@ include/grpc++/impl/codegen/time.h
 # possible encodings.
 # The default value is: UTF-8.

-INPUT_ENCODING         = UTF-8
+                INPUT_ENCODING = UTF - 8

 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
@ -843,13 +841,13 @@ INPUT_ENCODING         = UTF-8
 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
 # *.qsf, *.as and *.js.

-FILE_PATTERNS          =
+                                 FILE_PATTERNS =

 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
 # The default value is: NO.

-RECURSIVE              = NO
+                                     RECURSIVE = NO

 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@ -858,14 +856,14 @@ RECURSIVE              = NO
 # Note that relative paths are relative to the directory from which doxygen is
 # run.

-EXCLUDE                =
+                                         EXCLUDE =

 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 # The default value is: NO.

-EXCLUDE_SYMLINKS       = NO
+                                             EXCLUDE_SYMLINKS = NO

 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -811,6 +811,7 @@ include/grpc++/impl/codegen/client_context.h \
 include/grpc++/impl/codegen/completion_queue_tag.h \
 include/grpc++/impl/codegen/config.h \
 include/grpc++/impl/codegen/config_protobuf.h \
+include/grpc++/impl/codegen/grpc_library.h \
 include/grpc++/impl/codegen/proto_utils.h \
 include/grpc++/impl/codegen/security/auth_context.h \
 include/grpc++/impl/codegen/serialization_traits.h \
@ -820,6 +821,7 @@ include/grpc++/impl/codegen/service_type.h \
 include/grpc++/impl/codegen/status.h \
 include/grpc++/impl/codegen/status_code_enum.h \
 include/grpc++/impl/codegen/string_ref.h \
+include/grpc++/impl/codegen/stub_options.h \
 include/grpc++/impl/codegen/sync.h \
 include/grpc++/impl/codegen/sync_cxx11.h \
 include/grpc++/impl/codegen/sync_no_cxx11.h \
@ -848,6 +850,7 @@ src/cpp/client/insecure_credentials.cc \
 src/cpp/common/call.cc \
 src/cpp/common/channel_arguments.cc \
 src/cpp/common/completion_queue.cc \
+src/cpp/common/grpc_library_initializer.cc \
 src/cpp/common/rpc_method.cc \
 src/cpp/proto/proto_utils.cc \
 src/cpp/server/async_generic_service.cc \
@ -863,7 +866,8 @@ src/cpp/util/byte_buffer.cc \
 src/cpp/util/slice.cc \
 src/cpp/util/status.cc \
 src/cpp/util/string_ref.cc \
-src/cpp/util/time.cc
+src/cpp/util/time.cc \
+src/cpp/codegen/grpc_library.cc

 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -3908,6 +3908,7 @@
      "include/grpc++/impl/codegen/completion_queue_tag.h", 
      "include/grpc++/impl/codegen/config.h", 
      "include/grpc++/impl/codegen/config_protobuf.h", 
+      "include/grpc++/impl/codegen/grpc_library.h", 
      "include/grpc++/impl/codegen/proto_utils.h", 
      "include/grpc++/impl/codegen/security/auth_context.h", 
      "include/grpc++/impl/codegen/serialization_traits.h", 
@ -3917,6 +3918,7 @@
      "include/grpc++/impl/codegen/status.h", 
      "include/grpc++/impl/codegen/status_code_enum.h", 
      "include/grpc++/impl/codegen/string_ref.h", 
+      "include/grpc++/impl/codegen/stub_options.h", 
      "include/grpc++/impl/codegen/sync.h", 
      "include/grpc++/impl/codegen/sync_cxx11.h", 
      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
@ -3984,6 +3986,7 @@
      "include/grpc++/impl/codegen/completion_queue_tag.h", 
      "include/grpc++/impl/codegen/config.h", 
      "include/grpc++/impl/codegen/config_protobuf.h", 
+      "include/grpc++/impl/codegen/grpc_library.h", 
      "include/grpc++/impl/codegen/proto_utils.h", 
      "include/grpc++/impl/codegen/security/auth_context.h", 
      "include/grpc++/impl/codegen/serialization_traits.h", 
@ -3993,6 +3996,7 @@
      "include/grpc++/impl/codegen/status.h", 
      "include/grpc++/impl/codegen/status_code_enum.h", 
      "include/grpc++/impl/codegen/string_ref.h", 
+      "include/grpc++/impl/codegen/stub_options.h", 
      "include/grpc++/impl/codegen/sync.h", 
      "include/grpc++/impl/codegen/sync_cxx11.h", 
      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
@ -4041,11 +4045,13 @@
      "src/cpp/client/insecure_credentials.cc", 
      "src/cpp/client/secure_credentials.cc", 
      "src/cpp/client/secure_credentials.h", 
+      "src/cpp/codegen/grpc_library.cc", 
      "src/cpp/common/auth_property_iterator.cc", 
      "src/cpp/common/call.cc", 
      "src/cpp/common/channel_arguments.cc", 
      "src/cpp/common/completion_queue.cc", 
      "src/cpp/common/create_auth_context.h", 
+      "src/cpp/common/grpc_library_initializer.cc", 
      "src/cpp/common/rpc_method.cc", 
      "src/cpp/common/secure_auth_context.cc", 
      "src/cpp/common/secure_auth_context.h", 
@ -4144,6 +4150,7 @@
      "include/grpc++/impl/codegen/completion_queue_tag.h", 
      "include/grpc++/impl/codegen/config.h", 
      "include/grpc++/impl/codegen/config_protobuf.h", 
+      "include/grpc++/impl/codegen/grpc_library.h", 
      "include/grpc++/impl/codegen/proto_utils.h", 
      "include/grpc++/impl/codegen/security/auth_context.h", 
      "include/grpc++/impl/codegen/serialization_traits.h", 
@ -4153,6 +4160,7 @@
      "include/grpc++/impl/codegen/status.h", 
      "include/grpc++/impl/codegen/status_code_enum.h", 
      "include/grpc++/impl/codegen/string_ref.h", 
+      "include/grpc++/impl/codegen/stub_options.h", 
      "include/grpc++/impl/codegen/sync.h", 
      "include/grpc++/impl/codegen/sync_cxx11.h", 
      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
@ -4217,6 +4225,7 @@
      "include/grpc++/impl/codegen/completion_queue_tag.h", 
      "include/grpc++/impl/codegen/config.h", 
      "include/grpc++/impl/codegen/config_protobuf.h", 
+      "include/grpc++/impl/codegen/grpc_library.h", 
      "include/grpc++/impl/codegen/proto_utils.h", 
      "include/grpc++/impl/codegen/security/auth_context.h", 
      "include/grpc++/impl/codegen/serialization_traits.h", 
@ -4226,6 +4235,7 @@
      "include/grpc++/impl/codegen/status.h", 
      "include/grpc++/impl/codegen/status_code_enum.h", 
      "include/grpc++/impl/codegen/string_ref.h", 
+      "include/grpc++/impl/codegen/stub_options.h", 
      "include/grpc++/impl/codegen/sync.h", 
      "include/grpc++/impl/codegen/sync_cxx11.h", 
      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
@ -4272,10 +4282,12 @@
      "src/cpp/client/credentials.cc", 
      "src/cpp/client/generic_stub.cc", 
      "src/cpp/client/insecure_credentials.cc", 
+      "src/cpp/codegen/grpc_library.cc", 
      "src/cpp/common/call.cc", 
      "src/cpp/common/channel_arguments.cc", 
      "src/cpp/common/completion_queue.cc", 
      "src/cpp/common/create_auth_context.h", 
+      "src/cpp/common/grpc_library_initializer.cc", 
      "src/cpp/common/insecure_create_auth_context.cc", 
      "src/cpp/common/rpc_method.cc", 
      "src/cpp/proto/proto_utils.cc", 
@ -4309,6 +4321,7 @@
      "include/grpc++/impl/codegen/completion_queue_tag.h", 
      "include/grpc++/impl/codegen/config.h", 
      "include/grpc++/impl/codegen/config_protobuf.h", 
+      "include/grpc++/impl/codegen/grpc_library.h", 
      "include/grpc++/impl/codegen/proto_utils.h", 
      "include/grpc++/impl/codegen/security/auth_context.h", 
      "include/grpc++/impl/codegen/serialization_traits.h", 
@ -4318,6 +4331,7 @@
      "include/grpc++/impl/codegen/status.h", 
      "include/grpc++/impl/codegen/status_code_enum.h", 
      "include/grpc++/impl/codegen/string_ref.h", 
+      "include/grpc++/impl/codegen/stub_options.h", 
      "include/grpc++/impl/codegen/sync.h", 
      "include/grpc++/impl/codegen/sync_cxx11.h", 
      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
@ -4369,6 +4383,7 @@
      "include/grpc++/impl/codegen/completion_queue_tag.h", 
      "include/grpc++/impl/codegen/config.h", 
      "include/grpc++/impl/codegen/config_protobuf.h", 
+      "include/grpc++/impl/codegen/grpc_library.h", 
      "include/grpc++/impl/codegen/proto_utils.h", 
      "include/grpc++/impl/codegen/security/auth_context.h", 
      "include/grpc++/impl/codegen/serialization_traits.h", 
@ -4378,6 +4393,7 @@
      "include/grpc++/impl/codegen/status.h", 
      "include/grpc++/impl/codegen/status_code_enum.h", 
      "include/grpc++/impl/codegen/string_ref.h", 
+      "include/grpc++/impl/codegen/stub_options.h", 
      "include/grpc++/impl/codegen/sync.h", 
      "include/grpc++/impl/codegen/sync_cxx11.h", 
      "include/grpc++/impl/codegen/sync_no_cxx11.h", 
@ -4421,7 +4437,8 @@
      "src/compiler/ruby_generator.h", 
      "src/compiler/ruby_generator_helpers-inl.h", 
      "src/compiler/ruby_generator_map-inl.h", 
-      "src/compiler/ruby_generator_string-inl.h"
+      "src/compiler/ruby_generator_string-inl.h", 
+      "src/cpp/codegen/grpc_library.cc"
    ]
  }, 
  {
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@ -309,6 +309,7 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue_tag.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\security\auth_context.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\serialization_traits.h" />
@ -318,6 +319,7 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status_code_enum.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_cxx11.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_no_cxx11.h" />
@ -366,6 +368,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\completion_queue.cc">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\grpc_library_initializer.cc">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\proto\proto_utils.cc">
@ -398,6 +402,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time.cc">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj">
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@ -49,6 +49,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\completion_queue.cc">
      <Filter>src\cpp\common</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\grpc_library_initializer.cc">
+      <Filter>src\cpp\common</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc">
      <Filter>src\cpp\common</Filter>
    </ClCompile>
@ -97,6 +100,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time.cc">
      <Filter>src\cpp\util</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+      <Filter>src\cpp\codegen</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h">
@ -252,6 +258,9 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
@ -279,6 +288,9 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
@ -353,6 +365,9 @@
    <Filter Include="src\cpp\client">
      <UniqueIdentifier>{7febf32a-d7a6-76fa-9e17-f189f591c062}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\cpp\codegen">
+      <UniqueIdentifier>{3c3e27f4-d3d9-3c42-5204-08b5e839f2de}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\cpp\common">
      <UniqueIdentifier>{2336e396-7e0b-8bf9-3b09-adc6ad1f0e5b}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@ -309,6 +309,7 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue_tag.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\security\auth_context.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\serialization_traits.h" />
@ -318,6 +319,7 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status_code_enum.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_cxx11.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_no_cxx11.h" />
@ -353,6 +355,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\completion_queue.cc">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\grpc_library_initializer.cc">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\proto\proto_utils.cc">
@ -385,6 +389,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time.cc">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj">
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@ -34,6 +34,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\completion_queue.cc">
      <Filter>src\cpp\common</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\grpc_library_initializer.cc">
+      <Filter>src\cpp\common</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc">
      <Filter>src\cpp\common</Filter>
    </ClCompile>
@ -82,6 +85,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time.cc">
      <Filter>src\cpp\util</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+      <Filter>src\cpp\codegen</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h">
@ -237,6 +243,9 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
@ -264,6 +273,9 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
@ -329,6 +341,9 @@
    <Filter Include="src\cpp\client">
      <UniqueIdentifier>{ff72923a-6499-8d2a-e0fb-6d574b85d77e}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\cpp\codegen">
+      <UniqueIdentifier>{18e9c249-37f0-7f2c-f026-502d48ed8c92}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\cpp\common">
      <UniqueIdentifier>{ed8e4daa-825f-fbe5-2a45-846ad9165d3d}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
@ -155,6 +155,7 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\completion_queue_tag.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\security\auth_context.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\serialization_traits.h" />
@ -164,6 +165,7 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\status_code_enum.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_cxx11.h" />
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_no_cxx11.h" />
@ -217,6 +219,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\compiler\ruby_generator.cc">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+    </ClCompile>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
@ -16,6 +16,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\compiler\ruby_generator.cc">
      <Filter>src\compiler</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+      <Filter>src\cpp\codegen</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\async_stream.h">
@ -42,6 +45,9 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\grpc_library.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
@ -69,6 +75,9 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\string_ref.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\stub_options.h">
+      <Filter>include\grpc++\impl\codegen</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync.h">
      <Filter>include\grpc++\impl\codegen</Filter>
    </ClInclude>
@ -224,6 +233,12 @@
    <Filter Include="src\compiler">
      <UniqueIdentifier>{0e6b1e6c-7299-59ce-d757-619bcddd5441}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\cpp">
+      <UniqueIdentifier>{29d80aab-9e9d-0417-6dfa-59dec47c9883}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\cpp\codegen">
+      <UniqueIdentifier>{c0d4a389-f341-8385-4534-fe9d8fb09952}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
 </Project>