diff --git a/benchmarks/db_bench.cc b/benchmarks/db_bench.cc
index 429a61a..baa069a 100644
--- a/benchmarks/db_bench.cc
+++ b/benchmarks/db_bench.cc
@@ -2,10 +2,7 @@
 // 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 <atomic>
-#include <cstdio>
 #include <cstdlib>
 
 #include "leveldb/cache.h"
@@ -13,8 +10,10 @@
 #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 "port/port.h"
+
 #include "util/crc32c.h"
 #include "util/histogram.h"
 #include "util/mutexlock.h"
diff --git a/db/autocompact_test.cc b/db/autocompact_test.cc
index 69341e3..08ce97b 100644
--- a/db/autocompact_test.cc
+++ b/db/autocompact_test.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 "gtest/gtest.h"
 #include "db/db_impl.h"
+
 #include "leveldb/cache.h"
-#include "leveldb/db.h"
+#include "leveldb/iterator.h"
+
 #include "util/testutil.h"
 
 namespace leveldb {
diff --git a/db/builder.cc b/db/builder.cc
index e6329e0..c9de137 100644
--- a/db/builder.cc
+++ b/db/builder.cc
@@ -2,15 +2,13 @@
 // 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/db.h"
+
 #include "leveldb/env.h"
 #include "leveldb/iterator.h"
+#include "leveldb/table_builder.h"
 
 namespace leveldb {
 
diff --git a/db/builder.h b/db/builder.h
index 7bd0b80..e12f543 100644
--- a/db/builder.h
+++ b/db/builder.h
@@ -5,6 +5,8 @@
 #ifndef STORAGE_LEVELDB_DB_BUILDER_H_
 #define STORAGE_LEVELDB_DB_BUILDER_H_
 
+#include <string>
+
 #include "leveldb/status.h"
 
 namespace leveldb {
diff --git a/db/c.cc b/db/c.cc
index 8bdde38..f859c1f 100644
--- a/db/c.cc
+++ b/db/c.cc
@@ -4,10 +4,7 @@
 
 #include "leveldb/c.h"
 
-#include <string.h>
-
-#include <cstdint>
-#include <cstdlib>
+#include <cstring>
 
 #include "leveldb/cache.h"
 #include "leveldb/comparator.h"
@@ -16,7 +13,6 @@
 #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;
diff --git a/db/corruption_test.cc b/db/corruption_test.cc
index dc7da76..a35c89d 100644
--- a/db/corruption_test.cc
+++ b/db/corruption_test.cc
@@ -2,18 +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 "db/version_set.h"
+
 #include "leveldb/cache.h"
-#include "leveldb/db.h"
-#include "leveldb/table.h"
+#include "leveldb/iterator.h"
 #include "leveldb/write_batch.h"
+
 #include "util/logging.h"
+#include "util/random.h"
 #include "util/testutil.h"
 
 namespace leveldb {
diff --git a/db/db_impl.cc b/db/db_impl.cc
index 1a4e459..4d2f6d6 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -4,17 +4,8 @@
 
 #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"
@@ -22,16 +13,13 @@
 #include "db/table_cache.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include "leveldb/db.h"
+#include <algorithm>
+
 #include "leveldb/env.h"
-#include "leveldb/status.h"
-#include "leveldb/table.h"
+#include "leveldb/iterator.h"
 #include "leveldb/table_builder.h"
-#include "port/port.h"
-#include "table/block.h"
+
 #include "table/merger.h"
-#include "table/two_level_iterator.h"
-#include "util/coding.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 
diff --git a/db/db_impl.h b/db/db_impl.h
index c7b0172..2953af1 100644
--- a/db/db_impl.h
+++ b/db/db_impl.h
@@ -5,18 +5,19 @@
 #ifndef STORAGE_LEVELDB_DB_DB_IMPL_H_
 #define STORAGE_LEVELDB_DB_DB_IMPL_H_
 
-#include <atomic>
-#include <deque>
-#include <set>
-#include <string>
-
-#include "db/dbformat.h"
 #include "db/log_writer.h"
 #include "db/snapshot.h"
-#include "leveldb/db.h"
+#include <atomic>
+#include <deque>
+#include <map>
+#include <set>
+#include <vector>
+
 #include "leveldb/env.h"
-#include "port/port.h"
-#include "port/thread_annotations.h"
+#include "leveldb/options.h"
+#include "leveldb/status.h"
+
+#include "port/port_stdcxx.h"
 
 namespace leveldb {
 
diff --git a/db/db_iter.cc b/db/db_iter.cc
index 532c2db..4f386c1 100644
--- a/db/db_iter.cc
+++ b/db/db_iter.cc
@@ -2,16 +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 "db/db_iter.h"
-
 #include "db/db_impl.h"
-#include "db/dbformat.h"
-#include "db/filename.h"
-#include "leveldb/env.h"
+
 #include "leveldb/iterator.h"
-#include "port/port.h"
-#include "util/logging.h"
-#include "util/mutexlock.h"
+
 #include "util/random.h"
 
 namespace leveldb {
diff --git a/db/db_iter.h b/db/db_iter.h
index 5977fc8..3f85e12 100644
--- a/db/db_iter.h
+++ b/db/db_iter.h
@@ -5,10 +5,9 @@
 #ifndef STORAGE_LEVELDB_DB_DB_ITER_H_
 #define STORAGE_LEVELDB_DB_DB_ITER_H_
 
-#include <cstdint>
-
 #include "db/dbformat.h"
-#include "leveldb/db.h"
+
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 
diff --git a/db/db_test.cc b/db/db_test.cc
index 9bd6e14..c4db54d 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -2,26 +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 "leveldb/db.h"
-
-#include <atomic>
-#include <cinttypes>
-#include <string>
-
-#include "gtest/gtest.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
-#include "db/version_set.h"
-#include "db/write_batch_internal.h"
+
 #include "leveldb/cache.h"
-#include "leveldb/env.h"
-#include "leveldb/filter_policy.h"
-#include "leveldb/table.h"
-#include "port/port.h"
-#include "port/thread_annotations.h"
-#include "util/hash.h"
+#include "leveldb/iterator.h"
+#include "leveldb/write_batch.h"
+
 #include "util/logging.h"
 #include "util/mutexlock.h"
+#include "util/random.h"
 #include "util/testutil.h"
 
 namespace leveldb {
diff --git a/db/dbformat.cc b/db/dbformat.cc
index 2a5749f..d7aa8f5 100644
--- a/db/dbformat.cc
+++ b/db/dbformat.cc
@@ -4,11 +4,10 @@
 
 #include "db/dbformat.h"
 
-#include <cstdio>
+#include <cstring>
 #include <sstream>
 
-#include "port/port.h"
-#include "util/coding.h"
+#include "util/logging.h"
 
 namespace leveldb {
 
diff --git a/db/dbformat.h b/db/dbformat.h
index a1c30ed..acffcf1 100644
--- a/db/dbformat.h
+++ b/db/dbformat.h
@@ -5,17 +5,11 @@
 #ifndef STORAGE_LEVELDB_DB_DBFORMAT_H_
 #define STORAGE_LEVELDB_DB_DBFORMAT_H_
 
-#include <cstddef>
-#include <cstdint>
-#include <string>
-
 #include "leveldb/comparator.h"
-#include "leveldb/db.h"
 #include "leveldb/filter_policy.h"
 #include "leveldb/slice.h"
-#include "leveldb/table_builder.h"
+
 #include "util/coding.h"
-#include "util/logging.h"
 
 namespace leveldb {
 
diff --git a/db/dbformat_test.cc b/db/dbformat_test.cc
index 7f3f81a..e71c899 100644
--- a/db/dbformat_test.cc
+++ b/db/dbformat_test.cc
@@ -4,8 +4,7 @@
 
 #include "db/dbformat.h"
 
-#include "gtest/gtest.h"
-#include "util/logging.h"
+#include <gtest/gtest_pred_impl.h>
 
 namespace leveldb {
 
diff --git a/db/dumpfile.cc b/db/dumpfile.cc
index 6085475..271b97e 100644
--- a/db/dumpfile.cc
+++ b/db/dumpfile.cc
@@ -2,21 +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 "leveldb/dumpfile.h"
-
-#include <cstdio>
-
-#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 {
diff --git a/db/filename.cc b/db/filename.cc
index e526249..9c019d5 100644
--- a/db/filename.cc
+++ b/db/filename.cc
@@ -4,11 +4,8 @@
 
 #include "db/filename.h"
 
-#include <cassert>
-#include <cstdio>
-
-#include "db/dbformat.h"
 #include "leveldb/env.h"
+
 #include "util/logging.h"
 
 namespace leveldb {
diff --git a/db/filename.h b/db/filename.h
index 563c6d8..99ad539 100644
--- a/db/filename.h
+++ b/db/filename.h
@@ -10,9 +10,7 @@
 #include <cstdint>
 #include <string>
 
-#include "leveldb/slice.h"
 #include "leveldb/status.h"
-#include "port/port.h"
 
 namespace leveldb {
 
diff --git a/db/filename_test.cc b/db/filename_test.cc
index 9ac0111..cdddab5 100644
--- a/db/filename_test.cc
+++ b/db/filename_test.cc
@@ -4,10 +4,9 @@
 
 #include "db/filename.h"
 
+#include "leveldb/slice.h"
+
 #include "gtest/gtest.h"
-#include "db/dbformat.h"
-#include "port/port.h"
-#include "util/logging.h"
 
 namespace leveldb {
 
diff --git a/db/leveldbutil.cc b/db/leveldbutil.cc
index 95ee897..4426edd 100644
--- a/db/leveldbutil.cc
+++ b/db/leveldbutil.cc
@@ -2,11 +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 <cstdio>
-
 #include "leveldb/dumpfile.h"
 #include "leveldb/env.h"
-#include "leveldb/status.h"
 
 namespace leveldb {
 namespace {
diff --git a/db/log_reader.cc b/db/log_reader.cc
index 9880279..9b53c25 100644
--- a/db/log_reader.cc
+++ b/db/log_reader.cc
@@ -4,9 +4,8 @@
 
 #include "db/log_reader.h"
 
-#include <cstdio>
-
 #include "leveldb/env.h"
+
 #include "util/coding.h"
 #include "util/crc32c.h"
 
diff --git a/db/log_reader.h b/db/log_reader.h
index ba711f8..cd1a498 100644
--- a/db/log_reader.h
+++ b/db/log_reader.h
@@ -5,8 +5,6 @@
 #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"
diff --git a/db/log_writer.cc b/db/log_writer.cc
index ad66bfb..065ca12 100644
--- a/db/log_writer.cc
+++ b/db/log_writer.cc
@@ -4,9 +4,8 @@
 
 #include "db/log_writer.h"
 
-#include <cstdint>
-
 #include "leveldb/env.h"
+
 #include "util/coding.h"
 #include "util/crc32c.h"
 
diff --git a/db/log_writer.h b/db/log_writer.h
index ad36794..14b86dc 100644
--- a/db/log_writer.h
+++ b/db/log_writer.h
@@ -5,10 +5,10 @@
 #ifndef STORAGE_LEVELDB_DB_LOG_WRITER_H_
 #define STORAGE_LEVELDB_DB_LOG_WRITER_H_
 
-#include <cstdint>
-
 #include "db/log_format.h"
-#include "leveldb/slice.h"
+#include <cstdint>
+#include <cstddef>
+
 #include "leveldb/status.h"
 
 namespace leveldb {
diff --git a/db/memtable.cc b/db/memtable.cc
index 4f09340..0945eb6 100644
--- a/db/memtable.cc
+++ b/db/memtable.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "db/memtable.h"
-#include "db/dbformat.h"
-#include "leveldb/comparator.h"
-#include "leveldb/env.h"
+
+#include <cstring>
+
 #include "leveldb/iterator.h"
-#include "util/coding.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/db/memtable.h b/db/memtable.h
index 9d986b1..565f66d 100644
--- a/db/memtable.h
+++ b/db/memtable.h
@@ -5,12 +5,10 @@
 #ifndef STORAGE_LEVELDB_DB_MEMTABLE_H_
 #define STORAGE_LEVELDB_DB_MEMTABLE_H_
 
-#include <string>
-
 #include "db/dbformat.h"
 #include "db/skiplist.h"
-#include "leveldb/db.h"
-#include "util/arena.h"
+
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 
diff --git a/db/recovery_test.cc b/db/recovery_test.cc
index 1d9f621..f30da61 100644
--- a/db/recovery_test.cc
+++ b/db/recovery_test.cc
@@ -2,17 +2,14 @@
 // 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/version_set.h"
 #include "db/write_batch_internal.h"
-#include "leveldb/db.h"
-#include "leveldb/env.h"
-#include "leveldb/write_batch.h"
-#include "util/logging.h"
+
 #include "util/testutil.h"
 
+#include "log_writer.h"
+
 namespace leveldb {
 
 class RecoveryTest : public testing::Test {
diff --git a/db/repair.cc b/db/repair.cc
index 97a27c6..b28b4b1 100644
--- a/db/repair.cc
+++ b/db/repair.cc
@@ -26,7 +26,6 @@
 
 #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"
@@ -34,9 +33,12 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
-#include "leveldb/comparator.h"
-#include "leveldb/db.h"
+
 #include "leveldb/env.h"
+#include "leveldb/iterator.h"
+#include "leveldb/table_builder.h"
+
+#include "util/logging.h"
 
 namespace leveldb {
 
diff --git a/db/skiplist.h b/db/skiplist.h
index 1140e59..e179987 100644
--- a/db/skiplist.h
+++ b/db/skiplist.h
@@ -27,10 +27,6 @@
 //
 // ... prev vs. next pointer ordering ...
 
-#include <atomic>
-#include <cassert>
-#include <cstdlib>
-
 #include "util/arena.h"
 #include "util/random.h"
 
diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc
index 1d355cb..b9aed48 100644
--- a/db/skiplist_test.cc
+++ b/db/skiplist_test.cc
@@ -4,16 +4,8 @@
 
 #include "db/skiplist.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 "port/port_stdcxx.h"
 #include "util/hash.h"
-#include "util/random.h"
 #include "util/testutil.h"
 
 namespace leveldb {
diff --git a/db/table_cache.cc b/db/table_cache.cc
index 73f05fd..93db0bf 100644
--- a/db/table_cache.cc
+++ b/db/table_cache.cc
@@ -5,8 +5,12 @@
 #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 {
diff --git a/db/table_cache.h b/db/table_cache.h
index db8a123..5c46732 100644
--- a/db/table_cache.h
+++ b/db/table_cache.h
@@ -7,13 +7,12 @@
 #ifndef STORAGE_LEVELDB_DB_TABLE_CACHE_H_
 #define STORAGE_LEVELDB_DB_TABLE_CACHE_H_
 
-#include <cstdint>
 #include <string>
 
-#include "db/dbformat.h"
 #include "leveldb/cache.h"
+#include "leveldb/iterator.h"
+#include "leveldb/options.h"
 #include "leveldb/table.h"
-#include "port/port.h"
 
 namespace leveldb {
 
diff --git a/db/version_edit.cc b/db/version_edit.cc
index 356ce88..e9e2e7a 100644
--- a/db/version_edit.cc
+++ b/db/version_edit.cc
@@ -4,8 +4,9 @@
 
 #include "db/version_edit.h"
 
-#include "db/version_set.h"
-#include "util/coding.h"
+#include "leveldb/status.h"
+
+#include "util/logging.h"
 
 namespace leveldb {
 
diff --git a/db/version_edit.h b/db/version_edit.h
index 137b4b1..7094cae 100644
--- a/db/version_edit.h
+++ b/db/version_edit.h
@@ -5,11 +5,12 @@
 #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 {
 
diff --git a/db/version_edit_test.cc b/db/version_edit_test.cc
index a108c15..dfb6b5d 100644
--- a/db/version_edit_test.cc
+++ b/db/version_edit_test.cc
@@ -4,6 +4,8 @@
 
 #include "db/version_edit.h"
 
+#include "leveldb/status.h"
+
 #include "gtest/gtest.h"
 
 namespace leveldb {
diff --git a/db/version_set.cc b/db/version_set.cc
index 4e37bf9..8fbf5a4 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -4,19 +4,20 @@
 
 #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/memtable.h"
 #include "db/table_cache.h"
+#include <algorithm>
+
 #include "leveldb/env.h"
-#include "leveldb/table_builder.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 {
diff --git a/db/version_set.h b/db/version_set.h
index ea0c925..d55ff94 100644
--- a/db/version_set.h
+++ b/db/version_set.h
@@ -15,13 +15,12 @@
 #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 "port/port.h"
+
+#include "leveldb/options.h"
+#include "leveldb/status.h"
+
+#include "port/port_stdcxx.h"
 #include "port/thread_annotations.h"
 
 namespace leveldb {
diff --git a/db/version_set_test.cc b/db/version_set_test.cc
index 64bb983..c6f3063 100644
--- a/db/version_set_test.cc
+++ b/db/version_set_test.cc
@@ -4,9 +4,9 @@
 
 #include "db/version_set.h"
 
-#include "gtest/gtest.h"
-#include "util/logging.h"
-#include "util/testutil.h"
+#include <gtest/gtest_pred_impl.h>
+
+#include "version_edit.h"
 
 namespace leveldb {
 
diff --git a/db/write_batch.cc b/db/write_batch.cc
index b54313c..366a3b6 100644
--- a/db/write_batch.cc
+++ b/db/write_batch.cc
@@ -13,13 +13,10 @@
 //    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/db.h"
-#include "util/coding.h"
+
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc
index 1a3ea8f..affc568 100644
--- a/db/write_batch_test.cc
+++ b/db/write_batch_test.cc
@@ -2,13 +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 "gtest/gtest.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "leveldb/db.h"
-#include "leveldb/env.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) {
diff --git a/helpers/memenv/memenv.cc b/helpers/memenv/memenv.cc
index e476613..927bac1 100644
--- a/helpers/memenv/memenv.cc
+++ b/helpers/memenv/memenv.cc
@@ -2,18 +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 "helpers/memenv/memenv.h"
-
 #include <cstring>
-#include <limits>
 #include <map>
-#include <string>
-#include <vector>
 
 #include "leveldb/env.h"
-#include "leveldb/status.h"
-#include "port/port.h"
-#include "port/thread_annotations.h"
+
 #include "util/mutexlock.h"
 
 namespace leveldb {
diff --git a/helpers/memenv/memenv_test.cc b/helpers/memenv/memenv_test.cc
index 909a0ca..800b08e 100644
--- a/helpers/memenv/memenv_test.cc
+++ b/helpers/memenv/memenv_test.cc
@@ -2,15 +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 "helpers/memenv/memenv.h"
-
-#include <string>
-#include <vector>
-
-#include "gtest/gtest.h"
 #include "db/db_impl.h"
-#include "leveldb/db.h"
-#include "leveldb/env.h"
+
+#include "leveldb/iterator.h"
+
 #include "util/testutil.h"
 
 namespace leveldb {
diff --git a/include/leveldb/cache.h b/include/leveldb/cache.h
index a94c683..92853b9 100644
--- a/include/leveldb/cache.h
+++ b/include/leveldb/cache.h
@@ -19,6 +19,7 @@
 #define STORAGE_LEVELDB_INCLUDE_CACHE_H_
 
 #include <cstdint>
+#include <cstddef>
 
 #include "leveldb/export.h"
 #include "leveldb/slice.h"
diff --git a/include/leveldb/db.h b/include/leveldb/db.h
index a13d147..7ff06c1 100644
--- a/include/leveldb/db.h
+++ b/include/leveldb/db.h
@@ -5,12 +5,10 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_DB_H_
 #define STORAGE_LEVELDB_INCLUDE_DB_H_
 
-#include <cstdint>
-#include <cstdio>
-
-#include "leveldb/export.h"
 #include "leveldb/iterator.h"
-#include "leveldb/options.h"
+
+#include "slice.h"
+#include "status.h"
 
 namespace leveldb {
 
diff --git a/include/leveldb/dumpfile.h b/include/leveldb/dumpfile.h
index a58bc6b..f58374d 100644
--- a/include/leveldb/dumpfile.h
+++ b/include/leveldb/dumpfile.h
@@ -9,7 +9,6 @@
 
 #include "leveldb/env.h"
 #include "leveldb/export.h"
-#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/include/leveldb/env.h b/include/leveldb/env.h
index e00895a..9f94b31 100644
--- a/include/leveldb/env.h
+++ b/include/leveldb/env.h
@@ -14,11 +14,8 @@
 #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.
diff --git a/include/leveldb/iterator.h b/include/leveldb/iterator.h
index bb9a5df..895937f 100644
--- a/include/leveldb/iterator.h
+++ b/include/leveldb/iterator.h
@@ -15,6 +15,8 @@
 #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"
diff --git a/include/leveldb/slice.h b/include/leveldb/slice.h
index 37cb821..163120f 100644
--- a/include/leveldb/slice.h
+++ b/include/leveldb/slice.h
@@ -16,7 +16,6 @@
 #define STORAGE_LEVELDB_INCLUDE_SLICE_H_
 
 #include <cassert>
-#include <cstddef>
 #include <cstring>
 #include <string>
 
diff --git a/include/leveldb/status.h b/include/leveldb/status.h
index e327314..b38f312 100644
--- a/include/leveldb/status.h
+++ b/include/leveldb/status.h
@@ -13,10 +13,6 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_STATUS_H_
 #define STORAGE_LEVELDB_INCLUDE_STATUS_H_
 
-#include <algorithm>
-#include <string>
-
-#include "leveldb/export.h"
 #include "leveldb/slice.h"
 
 namespace leveldb {
diff --git a/include/leveldb/table.h b/include/leveldb/table.h
index a30e903..c160eb8 100644
--- a/include/leveldb/table.h
+++ b/include/leveldb/table.h
@@ -10,6 +10,8 @@
 #include "leveldb/export.h"
 #include "leveldb/iterator.h"
 
+#include "status.h"
+
 namespace leveldb {
 
 class Block;
diff --git a/include/leveldb/table_builder.h b/include/leveldb/table_builder.h
index 85710c3..7b26218 100644
--- a/include/leveldb/table_builder.h
+++ b/include/leveldb/table_builder.h
@@ -13,9 +13,6 @@
 #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"
 
diff --git a/port/port.h b/port/port.h
index 4b247f7..ff972a0 100644
--- a/port/port.h
+++ b/port/port.h
@@ -5,13 +5,10 @@
 #ifndef STORAGE_LEVELDB_PORT_PORT_H_
 #define STORAGE_LEVELDB_PORT_PORT_H_
 
-#include <string.h>
-
 // Include the appropriate platform specific file below.  If you are
 // 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
diff --git a/port/port_stdcxx.h b/port/port_stdcxx.h
index 2bda48d..41e7958 100644
--- a/port/port_stdcxx.h
+++ b/port/port_stdcxx.h
@@ -31,10 +31,6 @@
 
 #include <cassert>
 #include <condition_variable>  // NOLINT
-#include <cstddef>
-#include <cstdint>
-#include <mutex>  // NOLINT
-#include <string>
 
 #include "port/thread_annotations.h"
 
diff --git a/table/block.cc b/table/block.cc
index 3b15257..e443198 100644
--- a/table/block.cc
+++ b/table/block.cc
@@ -6,14 +6,12 @@
 
 #include "table/block.h"
 
-#include <algorithm>
-#include <cstdint>
-#include <vector>
-
 #include "leveldb/comparator.h"
+#include "leveldb/iterator.h"
+#include "leveldb/status.h"
+
 #include "table/format.h"
 #include "util/coding.h"
-#include "util/logging.h"
 
 namespace leveldb {
 
diff --git a/table/block_builder.cc b/table/block_builder.cc
index 37d4008..e6cb522 100644
--- a/table/block_builder.cc
+++ b/table/block_builder.cc
@@ -28,11 +28,9 @@
 
 #include "table/block_builder.h"
 
-#include <algorithm>
-#include <cassert>
-
-#include "leveldb/comparator.h"
 #include "leveldb/options.h"
+#include "leveldb/slice.h"
+
 #include "util/coding.h"
 
 namespace leveldb {
diff --git a/table/block_builder.h b/table/block_builder.h
index 7a481cd..f14a0d6 100644
--- a/table/block_builder.h
+++ b/table/block_builder.h
@@ -6,6 +6,7 @@
 #define STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_
 
 #include <cstdint>
+#include <string>
 #include <vector>
 
 #include "leveldb/slice.h"
diff --git a/table/filter_block.h b/table/filter_block.h
index 25ab75b..31a3968 100644
--- a/table/filter_block.h
+++ b/table/filter_block.h
@@ -9,13 +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"
-#include "util/hash.h"
 
 namespace leveldb {
 
diff --git a/table/filter_block_test.cc b/table/filter_block_test.cc
index 3ee41cf..d6a6398 100644
--- a/table/filter_block_test.cc
+++ b/table/filter_block_test.cc
@@ -4,12 +4,13 @@
 
 #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 "util/testutil.h"
+
+#include "gtest/gtest.h"
 
 namespace leveldb {
 
diff --git a/table/format.cc b/table/format.cc
index e183977..7206fe3 100644
--- a/table/format.cc
+++ b/table/format.cc
@@ -5,8 +5,9 @@
 #include "table/format.h"
 
 #include "leveldb/env.h"
-#include "port/port.h"
-#include "table/block.h"
+#include "leveldb/options.h"
+
+#include "port/port_stdcxx.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 
diff --git a/table/format.h b/table/format.h
index f6ea304..15065d6 100644
--- a/table/format.h
+++ b/table/format.h
@@ -5,12 +5,8 @@
 #ifndef STORAGE_LEVELDB_TABLE_FORMAT_H_
 #define STORAGE_LEVELDB_TABLE_FORMAT_H_
 
-#include <cstdint>
-#include <string>
-
 #include "leveldb/slice.h"
 #include "leveldb/status.h"
-#include "leveldb/table_builder.h"
 
 namespace leveldb {
 
diff --git a/table/iterator.cc b/table/iterator.cc
index dfef083..8edf7fd 100644
--- a/table/iterator.cc
+++ b/table/iterator.cc
@@ -4,6 +4,8 @@
 
 #include "leveldb/iterator.h"
 
+#include "leveldb/status.h"
+
 namespace leveldb {
 
 Iterator::Iterator() {
diff --git a/table/iterator_wrapper.h b/table/iterator_wrapper.h
index c230572..f5deace 100644
--- a/table/iterator_wrapper.h
+++ b/table/iterator_wrapper.h
@@ -6,7 +6,7 @@
 #define STORAGE_LEVELDB_TABLE_ITERATOR_WRAPPER_H_
 
 #include "leveldb/iterator.h"
-#include "leveldb/slice.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 
diff --git a/table/merger.cc b/table/merger.cc
index 76441b1..449024f 100644
--- a/table/merger.cc
+++ b/table/merger.cc
@@ -2,10 +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 "table/merger.h"
-
 #include "leveldb/comparator.h"
-#include "leveldb/iterator.h"
+
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {
diff --git a/table/table.cc b/table/table.cc
index 29e835f..e6df04c 100644
--- a/table/table.cc
+++ b/table/table.cc
@@ -8,7 +8,9 @@
 #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"
diff --git a/table/table_builder.cc b/table/table_builder.cc
index 29a619d..915e1c3 100644
--- a/table/table_builder.cc
+++ b/table/table_builder.cc
@@ -4,12 +4,11 @@
 
 #include "leveldb/table_builder.h"
 
-#include <cassert>
-
 #include "leveldb/comparator.h"
 #include "leveldb/env.h"
 #include "leveldb/filter_policy.h"
-#include "leveldb/options.h"
+
+#include "port/port_stdcxx.h"
 #include "table/block_builder.h"
 #include "table/filter_block.h"
 #include "table/format.h"
diff --git a/table/table_test.cc b/table/table_test.cc
index 7f0f998..11b2b50 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -4,21 +4,19 @@
 
 #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/random.h"
+#include "util/logging.h"
 #include "util/testutil.h"
 
 namespace leveldb {
diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc
index 144790d..c2125c0 100644
--- a/table/two_level_iterator.cc
+++ b/table/two_level_iterator.cc
@@ -2,11 +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 "table/two_level_iterator.h"
+#include "leveldb/options.h"
 
-#include "leveldb/table.h"
-#include "table/block.h"
-#include "table/format.h"
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {
diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h
index 81ffe80..e3a5eb7 100644
--- a/table/two_level_iterator.h
+++ b/table/two_level_iterator.h
@@ -6,6 +6,7 @@
 #define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_
 
 #include "leveldb/iterator.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 
diff --git a/util/arena.cc b/util/arena.cc
index 46e3b2e..28aaf17 100644
--- a/util/arena.cc
+++ b/util/arena.cc
@@ -4,6 +4,10 @@
 
 #include "util/arena.h"
 
+#include <cassert>
+#include <atomic>
+#include <vector>
+
 namespace leveldb {
 
 static const int kBlockSize = 4096;
diff --git a/util/arena.h b/util/arena.h
index 68fc55d..a9340af 100644
--- a/util/arena.h
+++ b/util/arena.h
@@ -5,10 +5,8 @@
 #ifndef STORAGE_LEVELDB_UTIL_ARENA_H_
 #define STORAGE_LEVELDB_UTIL_ARENA_H_
 
-#include <atomic>
 #include <cassert>
-#include <cstddef>
-#include <cstdint>
+#include <atomic>
 #include <vector>
 
 namespace leveldb {
diff --git a/util/bloom_test.cc b/util/bloom_test.cc
index 9f11108..b688144 100644
--- a/util/bloom_test.cc
+++ b/util/bloom_test.cc
@@ -2,11 +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 "gtest/gtest.h"
 #include "leveldb/filter_policy.h"
+#include "leveldb/slice.h"
+
 #include "util/coding.h"
-#include "util/logging.h"
-#include "util/testutil.h"
+
+#include "gtest/gtest.h"
 
 namespace leveldb {
 
diff --git a/util/cache.cc b/util/cache.cc
index fc3d154..42b14d5 100644
--- a/util/cache.cc
+++ b/util/cache.cc
@@ -4,12 +4,10 @@
 
 #include "leveldb/cache.h"
 
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
+#include <cstring>
+
+#include "leveldb/slice.h"
 
-#include "port/port.h"
-#include "port/thread_annotations.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
 
diff --git a/util/cache_test.cc b/util/cache_test.cc
index e68da34..3d54a03 100644
--- a/util/cache_test.cc
+++ b/util/cache_test.cc
@@ -4,10 +4,11 @@
 
 #include "leveldb/cache.h"
 
-#include <vector>
+#include "leveldb/slice.h"
+
+#include "util/coding.h"
 
 #include "gtest/gtest.h"
-#include "util/coding.h"
 
 namespace leveldb {
 
diff --git a/util/coding.cc b/util/coding.cc
index a8f8af8..390eb3a 100644
--- a/util/coding.cc
+++ b/util/coding.cc
@@ -4,6 +4,8 @@
 
 #include "util/coding.h"
 
+#include "leveldb/slice.h"
+
 namespace leveldb {
 
 void PutFixed32(std::string* dst, uint32_t value) {
diff --git a/util/coding.h b/util/coding.h
index f0bb57b..34e6589 100644
--- a/util/coding.h
+++ b/util/coding.h
@@ -11,11 +11,9 @@
 #define STORAGE_LEVELDB_UTIL_CODING_H_
 
 #include <cstdint>
-#include <cstring>
 #include <string>
 
 #include "leveldb/slice.h"
-#include "port/port.h"
 
 namespace leveldb {
 
diff --git a/util/coding_test.cc b/util/coding_test.cc
index cceda14..b617590 100644
--- a/util/coding_test.cc
+++ b/util/coding_test.cc
@@ -4,9 +4,9 @@
 
 #include "util/coding.h"
 
-#include <vector>
+#include <gtest/gtest_pred_impl.h>
 
-#include "gtest/gtest.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 
diff --git a/util/comparator.cc b/util/comparator.cc
index c5766e9..c67103b 100644
--- a/util/comparator.cc
+++ b/util/comparator.cc
@@ -4,13 +4,8 @@
 
 #include "leveldb/comparator.h"
 
-#include <algorithm>
-#include <cstdint>
-#include <string>
-#include <type_traits>
-
 #include "leveldb/slice.h"
-#include "util/logging.h"
+
 #include "util/no_destructor.h"
 
 namespace leveldb {
diff --git a/util/crc32c.cc b/util/crc32c.cc
index 3f18908..06cb846 100644
--- a/util/crc32c.cc
+++ b/util/crc32c.cc
@@ -4,12 +4,7 @@
 //
 // A portable implementation of crc32c.
 
-#include "util/crc32c.h"
-
-#include <cstddef>
-#include <cstdint>
-
-#include "port/port.h"
+#include "port/port_stdcxx.h"
 #include "util/coding.h"
 
 namespace leveldb {
diff --git a/util/env_posix.cc b/util/env_posix.cc
index ffd06c4..b1b473f 100644
--- a/util/env_posix.cc
+++ b/util/env_posix.cc
@@ -8,31 +8,14 @@
 #ifndef __Fuchsia__
 #include <sys/resource.h>
 #endif
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.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 <sys/stat.h>
+#include <unistd.h>
 
-#include "leveldb/env.h"
-#include "leveldb/slice.h"
-#include "leveldb/status.h"
-#include "port/port.h"
-#include "port/thread_annotations.h"
+#include "port/port_stdcxx.h"
 #include "util/env_posix_test_helper.h"
 #include "util/posix_logger.h"
 
diff --git a/util/env_posix_test.cc b/util/env_posix_test.cc
index 34bda62..ce25a48 100644
--- a/util/env_posix_test.cc
+++ b/util/env_posix_test.cc
@@ -2,20 +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 <sys/resource.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
-#include <string>
+#include <port/port_config.h>
+#include <sys/resource.h>
 #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"
 
diff --git a/util/hash.cc b/util/hash.cc
index 8122fa8..cb01b80 100644
--- a/util/hash.cc
+++ b/util/hash.cc
@@ -2,10 +2,6 @@
 // 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 <cstring>
-
 #include "util/coding.h"
 
 // The FALLTHROUGH_INTENDED macro can be used to annotate implicit fall-through
diff --git a/util/histogram.cc b/util/histogram.cc
index 7af4030..66f495c 100644
--- a/util/histogram.cc
+++ b/util/histogram.cc
@@ -6,8 +6,7 @@
 
 #include <cmath>
 #include <cstdio>
-
-#include "port/port.h"
+#include <string>
 
 namespace leveldb {
 
diff --git a/util/logging.cc b/util/logging.cc
index 8d6fb5b..34d4b2b 100644
--- a/util/logging.cc
+++ b/util/logging.cc
@@ -2,14 +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 <cstdio>
-#include <cstdlib>
+#include <cstdint>
 #include <limits>
+#include <string>
 
-#include "leveldb/env.h"
 #include "leveldb/slice.h"
 
 namespace leveldb {
diff --git a/util/logging.h b/util/logging.h
index a0394b2..2efd0c1 100644
--- a/util/logging.h
+++ b/util/logging.h
@@ -9,11 +9,8 @@
 #define STORAGE_LEVELDB_UTIL_LOGGING_H_
 
 #include <cstdint>
-#include <cstdio>
 #include <string>
 
-#include "port/port.h"
-
 namespace leveldb {
 
 class Slice;
diff --git a/util/logging_test.cc b/util/logging_test.cc
index 1746c57..4488c71 100644
--- a/util/logging_test.cc
+++ b/util/logging_test.cc
@@ -4,10 +4,8 @@
 
 #include "util/logging.h"
 
-#include <limits>
-#include <string>
+#include <gtest/gtest_pred_impl.h>
 
-#include "gtest/gtest.h"
 #include "leveldb/slice.h"
 
 namespace leveldb {
diff --git a/util/mutexlock.h b/util/mutexlock.h
index 0cb2e25..e2b1633 100644
--- a/util/mutexlock.h
+++ b/util/mutexlock.h
@@ -5,8 +5,7 @@
 #ifndef STORAGE_LEVELDB_UTIL_MUTEXLOCK_H_
 #define STORAGE_LEVELDB_UTIL_MUTEXLOCK_H_
 
-#include "port/port.h"
-#include "port/thread_annotations.h"
+#include "port/port_stdcxx.h"
 
 namespace leveldb {
 
diff --git a/util/no_destructor.h b/util/no_destructor.h
index a0d3b87..b418547 100644
--- a/util/no_destructor.h
+++ b/util/no_destructor.h
@@ -5,7 +5,6 @@
 #ifndef STORAGE_LEVELDB_UTIL_NO_DESTRUCTOR_H_
 #define STORAGE_LEVELDB_UTIL_NO_DESTRUCTOR_H_
 
-#include <type_traits>
 #include <utility>
 
 namespace leveldb {
diff --git a/util/no_destructor_test.cc b/util/no_destructor_test.cc
index e3602cc..7593f34 100644
--- a/util/no_destructor_test.cc
+++ b/util/no_destructor_test.cc
@@ -4,10 +4,6 @@
 
 #include "util/no_destructor.h"
 
-#include <cstdint>
-#include <cstdlib>
-#include <utility>
-
 #include "gtest/gtest.h"
 
 namespace leveldb {
diff --git a/util/posix_logger.h b/util/posix_logger.h
index 6bbc1a0..cd67235 100644
--- a/util/posix_logger.h
+++ b/util/posix_logger.h
@@ -8,13 +8,9 @@
 #ifndef STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_
 #define STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_
 
-#include <sys/time.h>
-
-#include <cassert>
 #include <cstdarg>
-#include <cstdio>
-#include <ctime>
 #include <sstream>
+#include <sys/time.h>
 #include <thread>
 
 #include "leveldb/env.h"
diff --git a/util/status.cc b/util/status.cc
index 0559f5b..294e12a 100644
--- a/util/status.cc
+++ b/util/status.cc
@@ -4,9 +4,7 @@
 
 #include "leveldb/status.h"
 
-#include <cstdio>
-
-#include "port/port.h"
+#include <cstring>
 
 namespace leveldb {
 
diff --git a/util/status_test.cc b/util/status_test.cc
index dbf5faa..8466341 100644
--- a/util/status_test.cc
+++ b/util/status_test.cc
@@ -4,10 +4,7 @@
 
 #include "leveldb/status.h"
 
-#include <utility>
-
 #include "gtest/gtest.h"
-#include "leveldb/slice.h"
 
 namespace leveldb {
 
diff --git a/util/testutil.cc b/util/testutil.cc
index 5f77b08..8eebda3 100644
--- a/util/testutil.cc
+++ b/util/testutil.cc
@@ -2,9 +2,7 @@
 // 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/testutil.h"
-
-#include <string>
+#include "leveldb/slice.h"
 
 #include "util/random.h"
 
diff --git a/util/testutil.h b/util/testutil.h
index e0e2d64..55d443d 100644
--- a/util/testutil.h
+++ b/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 {