diff --git a/db/version_edit.cc b/db/version_edit.cc
index 5de96b887..50fc0dec5 100644
--- a/db/version_edit.cc
+++ b/db/version_edit.cc
@@ -31,7 +31,7 @@ enum Tag {
   // these are new formats divergent from open source leveldb
   kNewFile2             = 100,  // store smallest & largest seqno
 
-  kColumnFamily         = 200, // specify column family for version edit
+  kColumnFamily         = 200,  // specify column family for version edit
   kColumnFamilyAdd      = 201,
   kColumnFamilyDrop     = 202,
 };
diff --git a/db/version_edit.h b/db/version_edit.h
index b7dfa6d03..b2df9f8d3 100644
--- a/db/version_edit.h
+++ b/db/version_edit.h
@@ -11,6 +11,7 @@
 #include <set>
 #include <utility>
 #include <vector>
+#include <string>
 #include "db/dbformat.h"
 
 namespace rocksdb {
diff --git a/db/version_set.cc b/db/version_set.cc
index d3ba5a64b..63c08f777 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -11,6 +11,7 @@
 
 #include <algorithm>
 #include <map>
+#include <set>
 #include <climits>
 #include <stdio.h>
 #include "db/filename.h"
diff --git a/db/write_batch.cc b/db/write_batch.cc
index c6f096476..42990d73e 100644
--- a/db/write_batch.cc
+++ b/db/write_batch.cc
@@ -92,7 +92,7 @@ Status WriteBatch::Iterate(Handler* handler) const {
   while (!input.empty() && handler->Continue()) {
     char tag = input[0];
     input.remove_prefix(1);
-    uint32_t column_family = 0; // default
+    uint32_t column_family = 0;  // default
     switch (tag) {
       case kTypeColumnFamilyValue:
         if (!GetVarint32(&input, &column_family)) {
diff --git a/include/rocksdb/column_family.h b/include/rocksdb/column_family.h
index dbb116506..b6e24e70f 100644
--- a/include/rocksdb/column_family.h
+++ b/include/rocksdb/column_family.h
@@ -8,6 +8,7 @@
 
 #pragma once
 #include "rocksdb/slice.h"
+#include <string>
 
 namespace rocksdb {
 
@@ -21,11 +22,10 @@ struct ColumnFamilyHandle {
   uint32_t id;
   // default
   ColumnFamilyHandle() : id() {}
-  /* implicit */
-  ColumnFamilyHandle(uint32_t _id) : id(_id) {}
+  explicit ColumnFamilyHandle(uint32_t _id) : id(_id) {}
 };
 
 const ColumnFamilyHandle default_column_family = ColumnFamilyHandle();
 extern const std::string default_column_family_name;
 
-}
+}  // namespace rocksdb