7 files changed, 7 insertions, 6 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 8f837b6a14..de62995ecf 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -91,7 +91,6 @@ static int g_default_max_ping_strikes = DEFAULT_MAX_PING_STRIKES;
 
 #define MAX_CLIENT_STREAM_ID 0x7fffffffu
 grpc_core::TraceFlag grpc_http_trace(false, "http");
-grpc_core::TraceFlag grpc_flowctl_trace(false, "flowctl");
 
 grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount(false,
                                                          "chttp2_refcount");
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
index 408759a292..982db403d8 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 extern grpc_core::TraceFlag grpc_http_trace;
-extern grpc_core::TraceFlag grpc_flowctl_trace;
 extern grpc_core::TraceFlag grpc_trace_http2_stream_state;
 
 #ifndef NDEBUG
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
index dd80036530..5a1358e260 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.cc
+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -31,6 +31,8 @@
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/support/string.h"
 
+grpc_core::TraceFlag grpc_flowctl_trace(false, "flowctl");
+
 namespace grpc_core {
 namespace chttp2 {
 
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h
index d5107d467b..59ba758d52 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.h
+++ b/src/core/ext/transport/chttp2/transport/flow_control.h
@@ -30,7 +30,7 @@
 struct grpc_chttp2_transport;
 struct grpc_chttp2_stream;
 
-extern "C" grpc_tracer_flag grpc_flowctl_trace;
+extern grpc_core::TraceFlag grpc_flowctl_trace;
 
 namespace grpc_core {
 namespace chttp2 {
@@ -112,7 +112,7 @@ class FlowControlTrace {
             StreamFlowControl* sfc);
   void Finish();
 
-  const bool enabled_ = GRPC_TRACER_ON(grpc_flowctl_trace);
+  const bool enabled_ = grpc_flowctl_trace.enabled();
 
   TransportFlowControl* tfc_;
   StreamFlowControl* sfc_;
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index f658b66391..ee6974a6d5 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -679,7 +679,6 @@ void grpc_chttp2_complete_closure_step(grpc_exec_ctx *exec_ctx,
   (sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1)
 
 extern grpc_core::TraceFlag grpc_http_trace;
-extern grpc_core::TraceFlag grpc_flowctl_trace;
 
 #define GRPC_CHTTP2_IF_TRACING(stmt) \
   if (!grpc_http_trace.enabled())    \
diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc
index 52cfbe52ea..8fb6393a36 100644
--- a/src/core/lib/debug/trace.cc
+++ b/src/core/lib/debug/trace.cc
@@ -29,6 +29,8 @@ int grpc_tracer_set_enabled(const char *name, int enabled);
 
 namespace grpc_core {
 
+TraceFlag* TraceFlag::root_tracer_ = nullptr;
+
 TraceFlag::TraceFlag(bool default_enabled, const char *name)
     : next_tracer_(root_tracer_), name_(name), value_(default_enabled) {
   root_tracer_ = this;
diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h
index ad12e45127..f7a6005825 100644
--- a/src/core/lib/debug/trace.h
+++ b/src/core/lib/debug/trace.h
@@ -47,7 +47,7 @@ namespace grpc_core {
 class TraceFlag {
  public:
   TraceFlag(bool default_enabled, const char *name);
-  ~TraceFlag();
+  ~TraceFlag() { }
 
   static bool Set(const char *tracer, bool enabled);