update includes

benchmarks/db_bench.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include <atomic>
+#include <cstdio>
 #include <cstdlib>
 
 #include "leveldb/cache.h"
@@ -10,10 +11,8 @@
 #include "leveldb/db.h"
 #include "leveldb/env.h"
 #include "leveldb/filter_policy.h"
-#include "leveldb/iterator.h"
-#include "leveldb/options.h"
 #include "leveldb/write_batch.h"
-
+#include "leveldb/options.h"
 #include "util/crc32c.h"
 #include "util/histogram.h"
 #include "util/mutexlock.h"

db/autocompact_test.cc

@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "gtest/gtest.h"
 #include "db/db_impl.h"
-
 #include "leveldb/cache.h"
-#include "leveldb/iterator.h"
-
+#include "leveldb/db.h"
 #include "util/testutil.h"
 
 namespace leveldb {

db/builder.cc

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "db/builder.h"
+
+#include "db/dbformat.h"
 #include "db/filename.h"
 #include "db/table_cache.h"
 #include "db/version_edit.h"
-
 #include "leveldb/env.h"
 #include "leveldb/iterator.h"
 #include "leveldb/table_builder.h"

db/builder.h

@@ -5,8 +5,6 @@
 #ifndef STORAGE_LEVELDB_DB_BUILDER_H_
 #define STORAGE_LEVELDB_DB_BUILDER_H_
 
-#include <string>
-
 #include "leveldb/status.h"
 
 namespace leveldb {

db/c.cc

@@ -4,7 +4,10 @@
 
 #include "leveldb/c.h"
 
-#include <cstring>
+#include <string.h>
+
+#include <cstdint>
+#include <cstdlib>
 
 #include "leveldb/cache.h"
 #include "leveldb/comparator.h"
@@ -13,6 +16,7 @@
 #include "leveldb/filter_policy.h"
 #include "leveldb/iterator.h"
 #include "leveldb/options.h"
+#include "leveldb/status.h"
 #include "leveldb/write_batch.h"
 
 using leveldb::Cache;

db/corruption_test.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include <sys/types.h>
+
+#include "gtest/gtest.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/log_format.h"
-
 #include "leveldb/cache.h"
-#include "leveldb/iterator.h"
+#include "leveldb/db.h"
 #include "leveldb/write_batch.h"
-
 #include "util/logging.h"
-#include "util/random.h"
 #include "util/testutil.h"
 
 namespace leveldb {

db/db_impl.cc

@@ -4,8 +4,17 @@
 
 #include "db/db_impl.h"
 
+#include <algorithm>
+#include <atomic>
+#include <cstdint>
+#include <cstdio>
+#include <set>
+#include <string>
+#include <vector>
+
 #include "db/builder.h"
 #include "db/db_iter.h"
+#include "db/dbformat.h"
 #include "db/filename.h"
 #include "db/log_reader.h"
 #include "db/log_writer.h"
@@ -13,12 +22,10 @@
 #include "db/table_cache.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include <algorithm>
-
+#include "leveldb/db.h"
 #include "leveldb/env.h"
-#include "leveldb/iterator.h"
+#include "leveldb/status.h"
 #include "leveldb/table_builder.h"
-
 #include "table/merger.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"

db/db_impl.h

@@ -5,19 +5,19 @@
 #ifndef STORAGE_LEVELDB_DB_DB_IMPL_H_
 #define STORAGE_LEVELDB_DB_DB_IMPL_H_
 
-#include "db/log_writer.h"
-#include "db/snapshot.h"
 #include <atomic>
 #include <deque>
-#include <map>
 #include <set>
-#include <vector>
+#include <string>
 
+#include "db/dbformat.h"
+#include "db/log_writer.h"
+#include "db/snapshot.h"
+#include "leveldb/db.h"
 #include "leveldb/env.h"
 #include "leveldb/options.h"
-#include "leveldb/status.h"
-
-#include "port/port_stdcxx.h"
+#include "port/port.h"
+#include "port/thread_annotations.h"
 
 namespace leveldb {
 

db/db_iter.cc

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "db/db_iter.h"
+
 #include "db/db_impl.h"
-
+#include "db/dbformat.h"
 #include "leveldb/iterator.h"
-
 #include "util/random.h"
 
 namespace leveldb {

db/db_iter.h

@@ -5,8 +5,9 @@
 #ifndef STORAGE_LEVELDB_DB_DB_ITER_H_
 #define STORAGE_LEVELDB_DB_DB_ITER_H_
 
-#include "db/dbformat.h"
+#include <cstdint>
 
+#include "db/dbformat.h"
 #include "leveldb/iterator.h"
 
 namespace leveldb {

db/db_test.cc

@@ -2,16 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "leveldb/db.h"
+
+#include <atomic>
+#include <string>
+
+#include "gtest/gtest.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
-
 #include "leveldb/cache.h"
-#include "leveldb/iterator.h"
+#include "leveldb/env.h"
+#include "leveldb/filter_policy.h"
 #include "leveldb/write_batch.h"
-
+#include "port/thread_annotations.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/random.h"
 #include "util/testutil.h"
 
 namespace leveldb {

db/dbformat.cc

@@ -4,9 +4,9 @@
 
 #include "db/dbformat.h"
 
-#include <cstring>
 #include <sstream>
 
+#include "util/coding.h"
 #include "util/logging.h"
 
 namespace leveldb {

db/dbformat.h

@@ -5,10 +5,13 @@
 #ifndef STORAGE_LEVELDB_DB_DBFORMAT_H_
 #define STORAGE_LEVELDB_DB_DBFORMAT_H_
 
+#include <cstddef>
+#include <cstdint>
+#include <string>
+
 #include "leveldb/comparator.h"
 #include "leveldb/filter_policy.h"
 #include "leveldb/slice.h"
-
 #include "util/coding.h"
 
 namespace leveldb {

db/dbformat_test.cc

@@ -4,7 +4,7 @@
 
 #include "db/dbformat.h"
 
-#include <gtest/gtest_pred_impl.h>
+#include "gtest/gtest.h"
 
 namespace leveldb {
 

db/dumpfile.cc

@@ -2,16 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "leveldb/dumpfile.h"
+
+#include "db/dbformat.h"
 #include "db/filename.h"
 #include "db/log_reader.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
-
 #include "leveldb/env.h"
 #include "leveldb/iterator.h"
 #include "leveldb/options.h"
+#include "leveldb/status.h"
 #include "leveldb/table.h"
-
+#include "leveldb/write_batch.h"
 #include "util/logging.h"
 
 namespace leveldb {

db/filename.cc

@@ -4,8 +4,10 @@
 
 #include "db/filename.h"
 
-#include "leveldb/env.h"
+#include <cassert>
+#include <cstdio>
 
+#include "leveldb/env.h"
 #include "util/logging.h"
 
 namespace leveldb {

db/filename_test.cc

@@ -4,8 +4,6 @@
 
 #include "db/filename.h"
 
-#include "leveldb/slice.h"
-
 #include "gtest/gtest.h"
 
 namespace leveldb {

db/leveldbutil.cc

@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include <cstdio>
+
 #include "leveldb/dumpfile.h"
 #include "leveldb/env.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 namespace {

db/log_reader.cc

@@ -4,8 +4,9 @@
 
 #include "db/log_reader.h"
 
-#include "leveldb/env.h"
+#include <cstdio>
 
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 

db/log_reader.h

@@ -5,6 +5,8 @@
 #ifndef STORAGE_LEVELDB_DB_LOG_READER_H_
 #define STORAGE_LEVELDB_DB_LOG_READER_H_
 
+#include <cstdint>
+
 #include "db/log_format.h"
 #include "leveldb/slice.h"
 #include "leveldb/status.h"

db/log_writer.cc

@@ -4,8 +4,9 @@
 
 #include "db/log_writer.h"
 
-#include "leveldb/env.h"
+#include <cstdint>
 
+#include "leveldb/env.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 

db/log_writer.h

@@ -5,10 +5,10 @@
 #ifndef STORAGE_LEVELDB_DB_LOG_WRITER_H_
 #define STORAGE_LEVELDB_DB_LOG_WRITER_H_
 
-#include "db/log_format.h"
 #include <cstdint>
-#include <cstddef>
 
+#include "db/log_format.h"
+#include "leveldb/slice.h"
 #include "leveldb/status.h"
 
 namespace leveldb {

db/memtable.cc

@@ -3,11 +3,10 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "db/memtable.h"
-
-#include <cstring>
-
+#include "db/dbformat.h"
+#include "leveldb/comparator.h"
 #include "leveldb/iterator.h"
-#include "leveldb/status.h"
+#include "util/coding.h"
 
 namespace leveldb {
 

db/memtable.h

@@ -5,10 +5,12 @@
 #ifndef STORAGE_LEVELDB_DB_MEMTABLE_H_
 #define STORAGE_LEVELDB_DB_MEMTABLE_H_
 
+#include <string>
+
 #include "db/dbformat.h"
 #include "db/skiplist.h"
-
 #include "leveldb/iterator.h"
+#include "util/arena.h"
 
 namespace leveldb {
 

db/recovery_test.cc

@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "gtest/gtest.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/write_batch_internal.h"
-
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/write_batch.h"
 #include "util/testutil.h"
 
-#include "log_writer.h"
-
 namespace leveldb {
 
 class RecoveryTest : public testing::Test {

db/repair.cc

@@ -26,6 +26,7 @@
 
 #include "db/builder.h"
 #include "db/db_impl.h"
+#include "db/dbformat.h"
 #include "db/filename.h"
 #include "db/log_reader.h"
 #include "db/log_writer.h"
@@ -33,12 +34,10 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
-
-#include "leveldb/env.h"
-#include "leveldb/iterator.h"
-#include "leveldb/table_builder.h"
-
 #include "util/logging.h"
+#include "leveldb/comparator.h"
+#include "leveldb/env.h"
+#include "leveldb/table_builder.h"
 
 namespace leveldb {
 

db/skiplist.h

@@ -27,6 +27,9 @@
 //
 // ... prev vs. next pointer ordering ...
 
+#include <atomic>
+#include <cassert>
+
 #include "util/arena.h"
 #include "util/random.h"
 

db/skiplist_test.cc

@@ -4,8 +4,16 @@
 
 #include "db/skiplist.h"
 
-#include "port/port_stdcxx.h"
+#include <atomic>
+#include <set>
+
+#include "gtest/gtest.h"
+#include "leveldb/env.h"
+#include "port/port.h"
+#include "port/thread_annotations.h"
+#include "util/arena.h"
 #include "util/hash.h"
+#include "util/random.h"
 #include "util/testutil.h"
 
 namespace leveldb {

db/table_cache.cc

@@ -5,12 +5,8 @@
 #include "db/table_cache.h"
 
 #include "db/filename.h"
-
 #include "leveldb/env.h"
-#include "leveldb/iterator.h"
-#include "leveldb/options.h"
 #include "leveldb/table.h"
-
 #include "util/coding.h"
 
 namespace leveldb {

db/table_cache.h

@@ -7,12 +7,12 @@
 #ifndef STORAGE_LEVELDB_DB_TABLE_CACHE_H_
 #define STORAGE_LEVELDB_DB_TABLE_CACHE_H_
 
+#include <cstdint>
 #include <string>
 
 #include "leveldb/cache.h"
-#include "leveldb/iterator.h"
-#include "leveldb/options.h"
 #include "leveldb/table.h"
+#include "leveldb/options.h"
 
 namespace leveldb {
 

db/version_edit.cc

@@ -4,8 +4,7 @@
 
 #include "db/version_edit.h"
 
-#include "leveldb/status.h"
-
+#include "util/coding.h"
 #include "util/logging.h"
 
 namespace leveldb {

db/version_edit.h

@@ -5,11 +5,11 @@
 #ifndef STORAGE_LEVELDB_DB_VERSION_EDIT_H_
 #define STORAGE_LEVELDB_DB_VERSION_EDIT_H_
 
-#include "db/dbformat.h"
-#include <map>
 #include <set>
+#include <utility>
 #include <vector>
 
+#include "db/dbformat.h"
 #include "leveldb/status.h"
 
 namespace leveldb {

db/version_edit_test.cc

@@ -4,8 +4,6 @@
 
 #include "db/version_edit.h"
 
-#include "leveldb/status.h"
-
 #include "gtest/gtest.h"
 
 namespace leveldb {

db/version_set.cc

@@ -4,20 +4,17 @@
 
 #include "db/version_set.h"
 
+#include <algorithm>
+#include <cstdio>
+
 #include "db/filename.h"
 #include "db/log_reader.h"
 #include "db/log_writer.h"
 #include "db/table_cache.h"
-#include <algorithm>
-
 #include "leveldb/env.h"
-#include "leveldb/iterator.h"
-#include "leveldb/options.h"
-#include "leveldb/table.h"
-
-#include "port/port_stdcxx.h"
 #include "table/merger.h"
 #include "table/two_level_iterator.h"
+#include "util/coding.h"
 #include "util/logging.h"
 
 namespace leveldb {

db/version_set.h

@@ -15,12 +15,14 @@
 #ifndef STORAGE_LEVELDB_DB_VERSION_SET_H_
 #define STORAGE_LEVELDB_DB_VERSION_SET_H_
 
+#include <map>
+#include <set>
+#include <vector>
+
+#include "db/dbformat.h"
 #include "db/version_edit.h"
-
 #include "leveldb/options.h"
-#include "leveldb/status.h"
-
-#include "port/port_stdcxx.h"
+#include "port/port.h"
 #include "port/thread_annotations.h"
 
 namespace leveldb {

db/version_set_test.cc

@@ -4,9 +4,8 @@
 
 #include "db/version_set.h"
 
-#include <gtest/gtest_pred_impl.h>
-
-#include "version_edit.h"
+#include "gtest/gtest.h"
+#include "util/logging.h"
 
 namespace leveldb {
 

db/write_batch.cc

@@ -13,10 +13,12 @@
 //    len: varint32
 //    data: uint8[len]
 
+#include "leveldb/write_batch.h"
+
+#include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-
-#include "leveldb/status.h"
+#include "util/coding.h"
 
 namespace leveldb {
 

db/write_batch_test.cc

@@ -2,16 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "gtest/gtest.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-
-#include "leveldb/iterator.h"
-#include "leveldb/status.h"
-
 #include "util/logging.h"
 
-#include "gtest/gtest.h"
-
 namespace leveldb {
 
 static std::string PrintContents(WriteBatch* b) {

helpers/memenv/memenv.cc

@@ -2,11 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "helpers/memenv/memenv.h"
+
 #include <cstring>
 #include <map>
+#include <string>
+#include <vector>
 
 #include "leveldb/env.h"
-
+#include "leveldb/status.h"
+#include "port/thread_annotations.h"
 #include "util/mutexlock.h"
 
 namespace leveldb {

helpers/memenv/memenv_test.cc

@@ -2,10 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "helpers/memenv/memenv.h"
+
+#include <string>
+#include <vector>
+
+#include "gtest/gtest.h"
 #include "db/db_impl.h"
-
-#include "leveldb/iterator.h"
-
+#include "leveldb/db.h"
+#include "leveldb/env.h"
 #include "util/testutil.h"
 
 namespace leveldb {

include/leveldb/cache.h

@@ -19,7 +19,6 @@
 #define STORAGE_LEVELDB_INCLUDE_CACHE_H_
 
 #include <cstdint>
-#include <cstddef>
 
 #include "leveldb/export.h"
 #include "leveldb/slice.h"

include/leveldb/db.h

@@ -5,10 +5,10 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_DB_H_
 #define STORAGE_LEVELDB_INCLUDE_DB_H_
 
-#include "leveldb/iterator.h"
+#include <cstdint>
 
-#include "slice.h"
-#include "status.h"
+#include "leveldb/export.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 

include/leveldb/dumpfile.h

@@ -9,6 +9,7 @@
 
 #include "leveldb/env.h"
 #include "leveldb/export.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 

include/leveldb/env.h

@@ -14,8 +14,11 @@
 #define STORAGE_LEVELDB_INCLUDE_ENV_H_
 
 #include <cstdarg>
+#include <cstdint>
+#include <string>
 #include <vector>
 
+#include "leveldb/export.h"
 #include "leveldb/status.h"
 
 // This workaround can be removed when leveldb::Env::DeleteFile is removed.

include/leveldb/iterator.h

@@ -15,8 +15,6 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_ITERATOR_H_
 #define STORAGE_LEVELDB_INCLUDE_ITERATOR_H_
 
-#include <assert.h>
-
 #include "leveldb/export.h"
 #include "leveldb/slice.h"
 #include "leveldb/status.h"

include/leveldb/slice.h

@@ -16,6 +16,7 @@
 #define STORAGE_LEVELDB_INCLUDE_SLICE_H_
 
 #include <cassert>
+#include <cstddef>
 #include <cstring>
 #include <string>
 

include/leveldb/status.h

@@ -13,6 +13,9 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_STATUS_H_
 #define STORAGE_LEVELDB_INCLUDE_STATUS_H_
 
+#include <string>
+
+#include "leveldb/export.h"
 #include "leveldb/slice.h"
 
 namespace leveldb {

include/leveldb/table.h

@@ -10,8 +10,6 @@
 #include "leveldb/export.h"
 #include "leveldb/iterator.h"
 
-#include "status.h"
-
 namespace leveldb {
 
 class Block;

include/leveldb/table_builder.h

@@ -13,6 +13,9 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_
 #define STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_
 
+#include <cstdint>
+
+#include "leveldb/export.h"
 #include "leveldb/options.h"
 #include "leveldb/status.h"
 

port/port.h

@@ -9,6 +9,7 @@
 // porting to a new platform, see "port_example.h" for documentation
 // of what the new port_<platform>.h file must provide.
 #if defined(LEVELDB_PLATFORM_POSIX) || defined(LEVELDB_PLATFORM_WINDOWS)
+#include "port/port_stdcxx.h"
 #elif defined(LEVELDB_PLATFORM_CHROMIUM)
 #include "port/port_chromium.h"
 #endif

port/port_stdcxx.h

@@ -31,6 +31,10 @@
 
 #include <cassert>
 #include <condition_variable>  // NOLINT
+#include <cstddef>
+#include <cstdint>
+#include <mutex>  // NOLINT
+#include <string>
 
 #include "port/thread_annotations.h"
 

table/block.cc

@@ -6,10 +6,10 @@
 
 #include "table/block.h"
 
-#include "leveldb/comparator.h"
-#include "leveldb/iterator.h"
-#include "leveldb/status.h"
+#include <cstdint>
+#include <vector>
 
+#include "leveldb/comparator.h"
 #include "table/format.h"
 #include "util/coding.h"
 

table/block_builder.cc

@@ -28,9 +28,11 @@
 
 #include "table/block_builder.h"
 
-#include "leveldb/options.h"
-#include "leveldb/slice.h"
+#include <algorithm>
+#include <cassert>
 
+#include "leveldb/comparator.h"
+#include "leveldb/options.h"
 #include "util/coding.h"
 
 namespace leveldb {

table/block_builder.h

@@ -6,7 +6,6 @@
 #define STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_
 
 #include <cstdint>
-#include <string>
 #include <vector>
 
 #include "leveldb/slice.h"

table/filter_block.h

@@ -9,6 +9,9 @@
 #ifndef STORAGE_LEVELDB_TABLE_FILTER_BLOCK_H_
 #define STORAGE_LEVELDB_TABLE_FILTER_BLOCK_H_
 
+#include <cstddef>
+#include <cstdint>
+#include <string>
 #include <vector>
 
 #include "leveldb/slice.h"

table/filter_block_test.cc

@@ -4,14 +4,12 @@
 
 #include "table/filter_block.h"
 
+#include "gtest/gtest.h"
 #include "leveldb/filter_policy.h"
-
 #include "util/coding.h"
 #include "util/hash.h"
 #include "util/logging.h"
 
-#include "gtest/gtest.h"
-
 namespace leveldb {
 
 // For testing: emit an array with one hash value per key

table/format.cc

@@ -6,8 +6,7 @@
 
 #include "leveldb/env.h"
 #include "leveldb/options.h"
-
-#include "port/port_stdcxx.h"
+#include "port/port.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 

table/format.h

@@ -5,6 +5,9 @@
 #ifndef STORAGE_LEVELDB_TABLE_FORMAT_H_
 #define STORAGE_LEVELDB_TABLE_FORMAT_H_
 
+#include <cstdint>
+#include <string>
+
 #include "leveldb/slice.h"
 #include "leveldb/status.h"
 

table/iterator.cc

@@ -4,8 +4,6 @@
 
 #include "leveldb/iterator.h"
 
-#include "leveldb/status.h"
-
 namespace leveldb {
 
 Iterator::Iterator() {

table/iterator_wrapper.h

@@ -6,7 +6,7 @@
 #define STORAGE_LEVELDB_TABLE_ITERATOR_WRAPPER_H_
 
 #include "leveldb/iterator.h"
-#include "leveldb/status.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 

table/merger.cc

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "leveldb/comparator.h"
+#include "table/merger.h"
 
+#include "leveldb/comparator.h"
+#include "leveldb/iterator.h"
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {

table/table.cc

@@ -8,9 +8,7 @@
 #include "leveldb/comparator.h"
 #include "leveldb/env.h"
 #include "leveldb/filter_policy.h"
-#include "leveldb/iterator.h"
 #include "leveldb/options.h"
-
 #include "table/block.h"
 #include "table/filter_block.h"
 #include "table/format.h"

table/table_builder.cc

@@ -4,16 +4,18 @@
 
 #include "leveldb/table_builder.h"
 
+#include <cassert>
+
 #include "leveldb/comparator.h"
 #include "leveldb/env.h"
 #include "leveldb/filter_policy.h"
-
-#include "port/port_stdcxx.h"
+#include "leveldb/options.h"
 #include "table/block_builder.h"
 #include "table/filter_block.h"
 #include "table/format.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
+#include "port/port.h"
 
 namespace leveldb {
 

table/table_test.cc

@@ -4,20 +4,24 @@
 
 #include "leveldb/table.h"
 
+#include <map>
+#include <string>
+
+#include "gtest/gtest.h"
+#include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include <cstring>
-
 #include "leveldb/db.h"
+#include "leveldb/env.h"
 #include "leveldb/iterator.h"
 #include "leveldb/table_builder.h"
-
-#include "port/port_stdcxx.h"
 #include "table/block.h"
 #include "table/block_builder.h"
 #include "table/format.h"
-#include "util/logging.h"
+#include "util/random.h"
 #include "util/testutil.h"
+#include "util/logging.h"
+#include "port/port.h"
 
 namespace leveldb {
 

table/two_level_iterator.cc

@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "leveldb/options.h"
+#include "table/two_level_iterator.h"
 
+#include "leveldb/options.h"
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {

table/two_level_iterator.h

@@ -6,7 +6,6 @@
 #define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
 
 #include "leveldb/iterator.h"
-#include "leveldb/slice.h"
 
 namespace leveldb {
 

util/arena.cc

@@ -4,10 +4,6 @@
 
 #include "util/arena.h"
 
-#include <cassert>
-#include <atomic>
-#include <vector>
-
 namespace leveldb {
 
 static const int kBlockSize = 4096;

util/arena.h

@@ -5,8 +5,9 @@
 #ifndef STORAGE_LEVELDB_UTIL_ARENA_H_
 #define STORAGE_LEVELDB_UTIL_ARENA_H_
 
-#include <cassert>
 #include <atomic>
+#include <cassert>
+#include <cstddef>
 #include <vector>
 
 namespace leveldb {

util/bloom_test.cc

@@ -2,12 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "leveldb/filter_policy.h"
-#include "leveldb/slice.h"
-
-#include "util/coding.h"
-
 #include "gtest/gtest.h"
+#include "leveldb/filter_policy.h"
+#include "util/coding.h"
 
 namespace leveldb {
 

util/cache.cc

@@ -4,10 +4,10 @@
 
 #include "leveldb/cache.h"
 
-#include <cstring>
-
-#include "leveldb/slice.h"
+#include <cassert>
+#include <cstdlib>
 
+#include "port/thread_annotations.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
 

util/cache_test.cc

@@ -4,11 +4,10 @@
 
 #include "leveldb/cache.h"
 
-#include "leveldb/slice.h"
-
-#include "util/coding.h"
+#include <vector>
 
 #include "gtest/gtest.h"
+#include "util/coding.h"
 
 namespace leveldb {
 

util/coding.cc

@@ -4,8 +4,6 @@
 
 #include "util/coding.h"
 
-#include "leveldb/slice.h"
-
 namespace leveldb {
 
 void PutFixed32(std::string* dst, uint32_t value) {

util/coding_test.cc

@@ -4,9 +4,9 @@
 
 #include "util/coding.h"
 
-#include <gtest/gtest_pred_impl.h>
+#include <vector>
 
-#include "leveldb/slice.h"
+#include "gtest/gtest.h"
 
 namespace leveldb {
 

util/comparator.cc

@@ -4,8 +4,12 @@
 
 #include "leveldb/comparator.h"
 
-#include "leveldb/slice.h"
+#include <algorithm>
+#include <cstdint>
+#include <string>
+#include <type_traits>
 
+#include "leveldb/slice.h"
 #include "util/no_destructor.h"
 
 namespace leveldb {

util/crc32c.cc

@@ -4,7 +4,12 @@
 //
 // A portable implementation of crc32c.
 
-#include "port/port_stdcxx.h"
+#include "util/crc32c.h"
+
+#include <cstddef>
+#include <cstdint>
+
+#include "port/port.h"
 #include "util/coding.h"
 
 namespace leveldb {

util/env_posix.cc

@@ -8,14 +8,31 @@
 #ifndef __Fuchsia__
 #include <sys/resource.h>
 #endif
-#include <atomic>
-#include <cstring>
-#include <queue>
-#include <set>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include "port/port_stdcxx.h"
+#include <atomic>
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <limits>
+#include <queue>
+#include <set>
+#include <string>
+#include <thread>
+#include <type_traits>
+#include <utility>
+
+#include "leveldb/env.h"
+#include "leveldb/slice.h"
+#include "leveldb/status.h"
+#include "port/port.h"
+#include "port/thread_annotations.h"
 #include "util/env_posix_test_helper.h"
 #include "util/posix_logger.h"
 

util/env_posix_test.cc

@@ -2,11 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include <cstring>
-#include <port/port_config.h>
 #include <sys/resource.h>
-#include <unordered_set>
+#include <sys/wait.h>
+#include <unistd.h>
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+#include "gtest/gtest.h"
+#include "leveldb/env.h"
+#include "port/port.h"
 #include "util/env_posix_test_helper.h"
 #include "util/testutil.h"
 

util/hash.cc

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "util/hash.h"
+
 #include "util/coding.h"
 
 // The FALLTHROUGH_INTENDED macro can be used to annotate implicit fall-through

util/histogram.cc

@@ -6,7 +6,6 @@
 
 #include <cmath>
 #include <cstdio>
-#include <string>
 
 namespace leveldb {
 

util/logging.cc

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
+#include "util/logging.h"
+
 #include <cstdarg>
-#include <cstdint>
+#include <cstdio>
 #include <limits>
-#include <string>
 
 #include "leveldb/slice.h"
 

util/logging_test.cc

@@ -4,8 +4,10 @@
 
 #include "util/logging.h"
 
-#include <gtest/gtest_pred_impl.h>
+#include <limits>
+#include <string>
 
+#include "gtest/gtest.h"
 #include "leveldb/slice.h"
 
 namespace leveldb {

util/mutexlock.h

@@ -5,7 +5,8 @@
 #ifndef STORAGE_LEVELDB_UTIL_MUTEXLOCK_H_
 #define STORAGE_LEVELDB_UTIL_MUTEXLOCK_H_
 
-#include "port/port_stdcxx.h"
+#include "port/port.h"
+#include "port/thread_annotations.h"
 
 namespace leveldb {
 

util/no_destructor.h

@@ -5,6 +5,7 @@
 #ifndef STORAGE_LEVELDB_UTIL_NO_DESTRUCTOR_H_
 #define STORAGE_LEVELDB_UTIL_NO_DESTRUCTOR_H_
 
+#include <type_traits>
 #include <utility>
 
 namespace leveldb {

util/no_destructor_test.cc

@@ -4,6 +4,9 @@
 
 #include "util/no_destructor.h"
 
+#include <cstdint>
+#include <cstdlib>
+
 #include "gtest/gtest.h"
 
 namespace leveldb {

util/posix_logger.h

@@ -8,9 +8,13 @@
 #ifndef STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_
 #define STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_
 
-#include <cstdarg>
-#include <sstream>
 #include <sys/time.h>
+
+#include <cassert>
+#include <cstdarg>
+#include <cstdio>
+#include <ctime>
+#include <sstream>
 #include <thread>
 
 #include "leveldb/env.h"

util/status.cc

@@ -4,7 +4,7 @@
 
 #include "leveldb/status.h"
 
-#include <cstring>
+#include <cstdio>
 
 namespace leveldb {
 

util/status_test.cc

@@ -4,7 +4,10 @@
 
 #include "leveldb/status.h"
 
+#include <utility>
+
 #include "gtest/gtest.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 

util/testutil.cc

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "leveldb/slice.h"
+#include "util/testutil.h"
+
+#include <string>
 
 #include "util/random.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 namespace test {

util/testutil.h

@@ -5,11 +5,11 @@
 #ifndef STORAGE_LEVELDB_UTIL_TESTUTIL_H_
 #define STORAGE_LEVELDB_UTIL_TESTUTIL_H_
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "helpers/memenv/memenv.h"
-#include <gmock/gmock-matchers.h>
-
 #include "leveldb/env.h"
-
+#include "leveldb/slice.h"
 #include "util/random.h"
 
 namespace leveldb {