diff --git a/tensorflow/cc/client/client_session.h b/tensorflow/cc/client/client_session.h
index 3765eaec9bf..a661319b074 100644
--- a/tensorflow/cc/client/client_session.h
+++ b/tensorflow/cc/client/client_session.h
@@ -64,7 +64,7 @@ class ClientSession {
   ClientSession(const Scope& scope, const string& target);
 
   /// Same as above, but use the empty string ("") as the target specification.
-  ClientSession(const Scope& scope);
+  explicit ClientSession(const Scope& scope);
 
   /// Create a new session, configuring it with `session_options`.
   ClientSession(const Scope& scope, const SessionOptions& session_options);
diff --git a/tensorflow/cc/gradients/grad_testutil.h b/tensorflow/cc/gradients/grad_testutil.h
index 70c81f1a73a..43d533ad760 100644
--- a/tensorflow/cc/gradients/grad_testutil.h
+++ b/tensorflow/cc/gradients/grad_testutil.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_CC_GRADIENTS_GRAD_TESTUTIL_H_
 #define TENSORFLOW_CC_GRADIENTS_GRAD_TESTUTIL_H_
 
+#include <vector>
+
 #include "tensorflow/cc/framework/ops.h"
 #include "tensorflow/cc/framework/scope.h"
 
diff --git a/tensorflow/cc/ops/const_op.h b/tensorflow/cc/ops/const_op.h
index 424a683665f..9c888701b45 100644
--- a/tensorflow/cc/ops/const_op.h
+++ b/tensorflow/cc/ops/const_op.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_CC_OPS_CONST_OP_H_
 #define TENSORFLOW_CC_OPS_CONST_OP_H_
 
+#include <vector>
+
 #include "tensorflow/cc/framework/ops.h"
 #include "tensorflow/cc/framework/scope.h"
 #include "tensorflow/core/graph/node_builder.h"
diff --git a/tensorflow/cc/ops/while_loop.h b/tensorflow/cc/ops/while_loop.h
index 727237b5c7a..6dbf1d23dba 100644
--- a/tensorflow/cc/ops/while_loop.h
+++ b/tensorflow/cc/ops/while_loop.h
@@ -16,6 +16,9 @@ limitations under the License.
 #ifndef TENSORFLOW_CC_OPS_WHILE_LOOP_H_
 #define TENSORFLOW_CC_OPS_WHILE_LOOP_H_
 
+#include <string>
+#include <vector>
+
 #include "tensorflow/cc/framework/ops.h"
 #include "tensorflow/cc/framework/scope.h"
 
diff --git a/tensorflow/cc/profiler/profiler.h b/tensorflow/cc/profiler/profiler.h
index 64edbb5766c..dc60fd5fb37 100644
--- a/tensorflow/cc/profiler/profiler.h
+++ b/tensorflow/cc/profiler/profiler.h
@@ -16,6 +16,9 @@ limitations under the License.
 #ifndef TENSORFLOW_CC_PROFILER_PROFILER_H_
 #define TENSORFLOW_CC_PROFILER_PROFILER_H_
 
+#include <memory>
+#include <string>
+
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/profiler/internal/tfprof_stats.h"
@@ -56,7 +59,7 @@ namespace tfprof {
 class Profiler {
  public:
   /// `graph` is the model's GraphDef.
-  Profiler(const GraphDef& graph);
+  explicit Profiler(const GraphDef& graph);
 
   /// Adds tracing information `run_meta` to profiler. A `run_meta` is
   /// generated by a TensorFlow session run call. `step` is the key