diff --git a/cache/lru_cache.cc b/cache/lru_cache.cc
index 04e612bdbc..5a4a2729db 100644
--- a/cache/lru_cache.cc
+++ b/cache/lru_cache.cc
@@ -11,7 +11,6 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string>
 
 #include "util/mutexlock.h"
diff --git a/db/c.cc b/db/c.cc
index cb09e9d0e6..e9f520e25c 100644
--- a/db/c.cc
+++ b/db/c.cc
@@ -60,7 +60,6 @@ using ROCKSDB_NAMESPACE::ColumnFamilyDescriptor;
 using ROCKSDB_NAMESPACE::ColumnFamilyHandle;
 using ROCKSDB_NAMESPACE::ColumnFamilyOptions;
 using ROCKSDB_NAMESPACE::CompactionFilter;
-using ROCKSDB_NAMESPACE::CompactionFilterContext;
 using ROCKSDB_NAMESPACE::CompactionFilterFactory;
 using ROCKSDB_NAMESPACE::CompactionOptionsFIFO;
 using ROCKSDB_NAMESPACE::CompactRangeOptions;
@@ -82,7 +81,6 @@ using ROCKSDB_NAMESPACE::LiveFileMetaData;
 using ROCKSDB_NAMESPACE::Logger;
 using ROCKSDB_NAMESPACE::MemoryUtil;
 using ROCKSDB_NAMESPACE::MergeOperator;
-using ROCKSDB_NAMESPACE::MergeOperators;
 using ROCKSDB_NAMESPACE::NewBloomFilterPolicy;
 using ROCKSDB_NAMESPACE::NewGenericRateLimiter;
 using ROCKSDB_NAMESPACE::NewLRUCache;
@@ -115,10 +113,8 @@ using ROCKSDB_NAMESPACE::WriteBatch;
 using ROCKSDB_NAMESPACE::WriteBatchWithIndex;
 using ROCKSDB_NAMESPACE::WriteOptions;
 
-using std::shared_ptr;
 using std::vector;
 using std::unordered_set;
-using std::map;
 
 extern "C" {
 
diff --git a/db/compaction/compaction_job_stats_test.cc b/db/compaction/compaction_job_stats_test.cc
index 9c640a591e..1edb270fea 100644
--- a/db/compaction/compaction_job_stats_test.cc
+++ b/db/compaction/compaction_job_stats_test.cc
@@ -24,7 +24,6 @@
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
-#include "logging/logging.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "monitoring/thread_status_util.h"
diff --git a/db/compaction/compaction_picker_test.cc b/db/compaction/compaction_picker_test.cc
index d5580cc8ad..c415fd811a 100644
--- a/db/compaction/compaction_picker_test.cc
+++ b/db/compaction/compaction_picker_test.cc
@@ -12,7 +12,6 @@
 #include "db/compaction/compaction_picker_level.h"
 #include "db/compaction/compaction_picker_universal.h"
 
-#include "logging/logging.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/string_util.h"
diff --git a/db/comparator_db_test.cc b/db/comparator_db_test.cc
index 4eac91e2a5..876cf07fae 100644
--- a/db/comparator_db_test.cc
+++ b/db/comparator_db_test.cc
@@ -17,7 +17,6 @@
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
-using std::unique_ptr;
 
 namespace ROCKSDB_NAMESPACE {
 namespace {
diff --git a/db/corruption_test.cc b/db/corruption_test.cc
index ef5dbba48d..cb7cfef348 100644
--- a/db/corruption_test.cc
+++ b/db/corruption_test.cc
@@ -9,7 +9,6 @@
 
 #ifndef ROCKSDB_LITE
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/db/dbformat_test.cc b/db/dbformat_test.cc
index a6e633fb1d..06c5bb2025 100644
--- a/db/dbformat_test.cc
+++ b/db/dbformat_test.cc
@@ -8,7 +8,6 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "db/dbformat.h"
-#include "logging/logging.h"
 #include "test_util/testharness.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc
index 7e208bbf91..db6da36138 100644
--- a/db/fault_injection_test.cc
+++ b/db/fault_injection_test.cc
@@ -16,7 +16,6 @@
 #include "db/version_set.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
-#include "logging/logging.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
diff --git a/db/filename_test.cc b/db/filename_test.cc
index 10d85e6aba..d166876ba0 100644
--- a/db/filename_test.cc
+++ b/db/filename_test.cc
@@ -10,7 +10,6 @@
 #include "file/filename.h"
 
 #include "db/dbformat.h"
-#include "logging/logging.h"
 #include "port/port.h"
 #include "test_util/testharness.h"
 
diff --git a/db/listener_test.cc b/db/listener_test.cc
index 92f879a132..1712a5be89 100644
--- a/db/listener_test.cc
+++ b/db/listener_test.cc
@@ -10,7 +10,6 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "file/filename.h"
-#include "logging/logging.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/cache.h"
diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc
index 7694b59554..d198e36769 100644
--- a/db/obsolete_files_test.cc
+++ b/db/obsolete_files_test.cc
@@ -28,10 +28,6 @@
 #include "test_util/testutil.h"
 #include "util/string_util.h"
 
-using std::cerr;
-using std::cout;
-using std::endl;
-using std::flush;
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/db/periodic_work_scheduler.cc b/db/periodic_work_scheduler.cc
index 89303ca0f1..cc6f714d94 100644
--- a/db/periodic_work_scheduler.cc
+++ b/db/periodic_work_scheduler.cc
@@ -6,7 +6,6 @@
 #include "db/periodic_work_scheduler.h"
 
 #include "db/db_impl/db_impl.h"
-#include "util/cast_util.h"
 
 #ifndef ROCKSDB_LITE
 namespace ROCKSDB_NAMESPACE {
diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc
index 0f422a2d68..0ea7e99004 100644
--- a/db/plain_table_db_test.cc
+++ b/db/plain_table_db_test.cc
@@ -16,7 +16,6 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "file/filename.h"
-#include "logging/logging.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
@@ -39,7 +38,6 @@
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
-using std::unique_ptr;
 
 namespace ROCKSDB_NAMESPACE {
 class PlainTableKeyDecoderTest : public testing::Test {};
diff --git a/db/version_builder_test.cc b/db/version_builder_test.cc
index 513900de5b..9dca9ec2a6 100644
--- a/db/version_builder_test.cc
+++ b/db/version_builder_test.cc
@@ -11,7 +11,6 @@
 
 #include "db/version_edit.h"
 #include "db/version_set.h"
-#include "logging/logging.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/string_util.h"
diff --git a/db/version_set_test.cc b/db/version_set_test.cc
index 57eae6f369..fce8e025fd 100644
--- a/db/version_set_test.cc
+++ b/db/version_set_test.cc
@@ -11,7 +11,6 @@
 
 #include "db/db_impl/db_impl.h"
 #include "db/log_writer.h"
-#include "logging/logging.h"
 #include "table/block_based/block_based_table_factory.h"
 #include "table/mock_table.h"
 #include "test_util/testharness.h"
diff --git a/env/env.cc b/env/env.cc
index 9dcdd34214..06dffce1cc 100644
--- a/env/env.cc
+++ b/env/env.cc
@@ -15,7 +15,6 @@
 #include "memory/arena.h"
 #include "options/db_options.h"
 #include "port/port.h"
-#include "port/sys_time.h"
 #include "rocksdb/options.h"
 #include "rocksdb/utilities/object_registry.h"
 #include "util/autovector.h"
diff --git a/env/env_posix.cc b/env/env_posix.cc
index fd7cbec22d..78d5e251b7 100644
--- a/env/env_posix.cc
+++ b/env/env_posix.cc
@@ -16,9 +16,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#if defined(OS_LINUX)
-#include <linux/fs.h>
-#endif
 #if defined(ROCKSDB_IOURING_PRESENT)
 #include <liburing.h>
 #endif
@@ -27,13 +24,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #if defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_ANDROID)
 #include <sys/statfs.h>
-#include <sys/syscall.h>
-#include <sys/sysmacros.h>
 #endif
 #include <sys/statvfs.h>
 #include <sys/time.h>
@@ -58,7 +52,6 @@
 
 #include "env/composite_env_wrapper.h"
 #include "env/io_posix.h"
-#include "logging/logging.h"
 #include "logging/posix_logger.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/thread_status_updater.h"
diff --git a/env/fs_posix.cc b/env/fs_posix.cc
index 5fa3d8224f..92133eb227 100644
--- a/env/fs_posix.cc
+++ b/env/fs_posix.cc
@@ -16,9 +16,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#if defined(OS_LINUX)
-#include <linux/fs.h>
-#endif
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
@@ -29,7 +26,6 @@
 #include <sys/stat.h>
 #if defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_ANDROID)
 #include <sys/statfs.h>
-#include <sys/syscall.h>
 #include <sys/sysmacros.h>
 #endif
 #include <sys/statvfs.h>
@@ -52,7 +48,6 @@
 
 #include "env/composite_env_wrapper.h"
 #include "env/io_posix.h"
-#include "logging/logging.h"
 #include "logging/posix_logger.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/thread_status_updater.h"
diff --git a/env/io_posix.cc b/env/io_posix.cc
index 689d898120..97770d256f 100644
--- a/env/io_posix.cc
+++ b/env/io_posix.cc
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #ifdef OS_LINUX
 #include <sys/statfs.h>
-#include <sys/syscall.h>
 #include <sys/sysmacros.h>
 #endif
 #include "monitoring/iostats_context_imp.h"
diff --git a/file/filename.cc b/file/filename.cc
index 9836971f4f..a581b466f5 100644
--- a/file/filename.cc
+++ b/file/filename.cc
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <vector>
 #include "file/writable_file_writer.h"
-#include "logging/logging.h"
 #include "rocksdb/env.h"
 #include "test_util/sync_point.h"
 #include "util/stop_watch.h"
diff --git a/logging/auto_roll_logger_test.cc b/logging/auto_roll_logger_test.cc
index 520d9de235..e5d3848004 100644
--- a/logging/auto_roll_logger_test.cc
+++ b/logging/auto_roll_logger_test.cc
@@ -7,7 +7,6 @@
 #ifndef ROCKSDB_LITE
 
 #include "logging/auto_roll_logger.h"
-#include <errno.h>
 #include <sys/stat.h>
 #include <algorithm>
 #include <cmath>
diff --git a/logging/event_logger.cc b/logging/event_logger.cc
index f1747ad253..78bf4f8ff5 100644
--- a/logging/event_logger.cc
+++ b/logging/event_logger.cc
@@ -10,7 +10,6 @@
 #include <sstream>
 #include <string>
 
-#include "logging/logging.h"
 #include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/monitoring/persistent_stats_history.cc b/monitoring/persistent_stats_history.cc
index 7cc869cf21..86fe98f1fc 100644
--- a/monitoring/persistent_stats_history.cc
+++ b/monitoring/persistent_stats_history.cc
@@ -12,7 +12,6 @@
 #include <string>
 #include <utility>
 #include "db/db_impl/db_impl.h"
-#include "port/likely.h"
 #include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/monitoring/statistics.cc b/monitoring/statistics.cc
index 2c7f65a89d..1723827cff 100644
--- a/monitoring/statistics.cc
+++ b/monitoring/statistics.cc
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <cinttypes>
 #include <cstdio>
-#include "port/likely.h"
 #include "rocksdb/statistics.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/port/port_posix.cc b/port/port_posix.cc
index 8610c6e0d5..59fa6b89b7 100644
--- a/port/port_posix.cc
+++ b/port/port_posix.cc
@@ -21,11 +21,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/resource.h>
-#include <sys/syscall.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <cstdlib>
-#include "logging/logging.h"
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/table/block_based/block.cc b/table/block_based/block.cc
index bc481d57e5..2d32ebcb49 100644
--- a/table/block_based/block.cc
+++ b/table/block_based/block.cc
@@ -15,7 +15,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
diff --git a/table/block_based/block_based_table_builder.cc b/table/block_based/block_based_table_builder.cc
index 8ee047347e..8ab775c1d3 100644
--- a/table/block_based/block_based_table_builder.cc
+++ b/table/block_based/block_based_table_builder.cc
@@ -21,7 +21,6 @@
 
 #include "db/dbformat.h"
 #include "index_builder.h"
-#include "port/lang.h"
 
 #include "rocksdb/cache.h"
 #include "rocksdb/comparator.h"
@@ -56,7 +55,6 @@ namespace ROCKSDB_NAMESPACE {
 extern const std::string kHashIndexPrefixesBlock;
 extern const std::string kHashIndexPrefixesMetadataBlock;
 
-typedef BlockBasedTableOptions::IndexType IndexType;
 
 // Without anonymous namespace here, we fail the warning -Wmissing-prototypes
 namespace {
diff --git a/table/block_based/block_based_table_reader.cc b/table/block_based/block_based_table_reader.cc
index 8c02c33f50..049a14d8ca 100644
--- a/table/block_based/block_based_table_reader.cc
+++ b/table/block_based/block_based_table_reader.cc
@@ -62,7 +62,6 @@
 #include "util/crc32c.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/xxhash.h"
 
 namespace ROCKSDB_NAMESPACE {
 
@@ -70,7 +69,6 @@ extern const uint64_t kBlockBasedTableMagicNumber;
 extern const std::string kHashIndexPrefixesBlock;
 extern const std::string kHashIndexPrefixesMetadataBlock;
 
-typedef BlockBasedTable::IndexReader IndexReader;
 
 // Found that 256 KB readahead size provides the best performance, based on
 // experiments, for auto readahead. Experiment data is in PR #3282.
diff --git a/table/block_based/partitioned_filter_block_test.cc b/table/block_based/partitioned_filter_block_test.cc
index e23f910b53..e06a38da75 100644
--- a/table/block_based/partitioned_filter_block_test.cc
+++ b/table/block_based/partitioned_filter_block_test.cc
@@ -12,7 +12,6 @@
 #include "table/block_based/filter_policy_internal.h"
 
 #include "index_builder.h"
-#include "logging/logging.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/coding.h"
diff --git a/table/cuckoo/cuckoo_table_reader_test.cc b/table/cuckoo/cuckoo_table_reader_test.cc
index 5795de80d3..56a0b23931 100644
--- a/table/cuckoo/cuckoo_table_reader_test.cc
+++ b/table/cuckoo/cuckoo_table_reader_test.cc
@@ -31,7 +31,6 @@ int main() {
 #include "util/string_util.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;
-using GFLAGS_NAMESPACE::SetUsageMessage;
 
 DEFINE_string(file_dir, "", "Directory where the files will be created"
     " for benchmark. Added for using tmpfs.");
diff --git a/table/format.cc b/table/format.cc
index 41235a1b52..8af4d35e50 100644
--- a/table/format.cc
+++ b/table/format.cc
@@ -14,7 +14,6 @@
 
 #include "block_fetcher.h"
 #include "file/random_access_file_reader.h"
-#include "logging/logging.h"
 #include "memory/memory_allocator.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/statistics.h"
diff --git a/test_util/sync_point.cc b/test_util/sync_point.cc
index 16eb4e5531..c8dda57f59 100644
--- a/test_util/sync_point.cc
+++ b/test_util/sync_point.cc
@@ -6,7 +6,6 @@
 #include "test_util/sync_point.h"
 
 #include <fcntl.h>
-#include <sys/stat.h>
 
 #include "test_util/sync_point_impl.h"
 
diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc
index b81cae6cef..322535aef3 100644
--- a/tools/db_bench_tool.cc
+++ b/tools/db_bench_tool.cc
@@ -10,7 +10,6 @@
 #ifdef GFLAGS
 #ifdef NUMA
 #include <numa.h>
-#include <numaif.h>
 #endif
 #ifndef OS_WIN
 #include <unistd.h>
diff --git a/tools/ldb_cmd.cc b/tools/ldb_cmd.cc
index ae66d65f2a..8ff9800251 100644
--- a/tools/ldb_cmd.cc
+++ b/tools/ldb_cmd.cc
@@ -24,7 +24,6 @@
 #include "db/write_batch_internal.h"
 #include "env/composite_env_wrapper.h"
 #include "file/filename.h"
-#include "port/port_dirent.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/file_checksum.h"
 #include "rocksdb/table_properties.h"
diff --git a/tools/trace_analyzer_tool.cc b/tools/trace_analyzer_tool.cc
index 2951af13f4..c861225b11 100644
--- a/tools/trace_analyzer_tool.cc
+++ b/tools/trace_analyzer_tool.cc
@@ -9,7 +9,6 @@
 #ifdef GFLAGS
 #ifdef NUMA
 #include <numa.h>
-#include <numaif.h>
 #endif
 #ifndef OS_WIN
 #include <unistd.h>
@@ -50,8 +49,6 @@
 #include "util/string_util.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;
-using GFLAGS_NAMESPACE::RegisterFlagValidator;
-using GFLAGS_NAMESPACE::SetUsageMessage;
 
 DEFINE_string(trace_path, "", "The trace file path.");
 DEFINE_string(output_dir, "", "The directory to store the output files.");
diff --git a/util/bloom_test.cc b/util/bloom_test.cc
index 0fea9c6625..2c671794a1 100644
--- a/util/bloom_test.cc
+++ b/util/bloom_test.cc
@@ -19,7 +19,6 @@ int main() {
 #include <cmath>
 #include <vector>
 
-#include "logging/logging.h"
 #include "memory/arena.h"
 #include "port/jemalloc_helper.h"
 #include "rocksdb/filter_policy.h"
diff --git a/util/comparator.cc b/util/comparator.cc
index 44d45732ad..96e770489b 100644
--- a/util/comparator.cc
+++ b/util/comparator.cc
@@ -11,7 +11,6 @@
 #include <stdint.h>
 #include <algorithm>
 #include <memory>
-#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/slice.h"
 
diff --git a/util/dynamic_bloom_test.cc b/util/dynamic_bloom_test.cc
index 47d04a36c6..d8bee265bc 100644
--- a/util/dynamic_bloom_test.cc
+++ b/util/dynamic_bloom_test.cc
@@ -20,7 +20,6 @@ int main() {
 #include <vector>
 
 #include "dynamic_bloom.h"
-#include "logging/logging.h"
 #include "memory/arena.h"
 #include "port/port.h"
 #include "test_util/testharness.h"
diff --git a/util/string_util.cc b/util/string_util.cc
index d098ecb0b5..c44992f880 100644
--- a/util/string_util.cc
+++ b/util/string_util.cc
@@ -6,7 +6,6 @@
 #include "util/string_util.h"
 
 #include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>
diff --git a/util/xxhash.cc b/util/xxhash.cc
index d1b1395ab2..9b0d123894 100644
--- a/util/xxhash.cc
+++ b/util/xxhash.cc
@@ -218,7 +218,6 @@ static xxh_u32 XXH_read32(const void* memPtr)
 
 
 /* ===   Endianess   === */
-typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
 
 /* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
 #ifndef XXH_CPU_LITTLE_ENDIAN
@@ -1154,7 +1153,6 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
 
 #include "xxh3p.h" /* XXH3 preview for RocksDB */
 
-
 #endif  /* XXH_NO_LONG_LONG */
 
 #endif  /* XXHASH_C_01393879 */
diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc
index 0190f76320..f6d8347905 100644
--- a/utilities/blob_db/blob_db_test.cc
+++ b/utilities/blob_db/blob_db_test.cc
@@ -26,7 +26,6 @@
 #include "rocksdb/utilities/debug.h"
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
-#include "util/cast_util.h"
 #include "util/random.h"
 #include "util/string_util.h"
 #include "utilities/blob_db/blob_db_impl.h"
diff --git a/utilities/cassandra/cassandra_format_test.cc b/utilities/cassandra/cassandra_format_test.cc
index 32d4d907ca..9805d35d72 100644
--- a/utilities/cassandra/cassandra_format_test.cc
+++ b/utilities/cassandra/cassandra_format_test.cc
@@ -10,7 +10,6 @@
 #include "utilities/cassandra/serialize.h"
 #include "utilities/cassandra/test_utils.h"
 
-using namespace ROCKSDB_NAMESPACE::cassandra;
 
 namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
diff --git a/utilities/cassandra/cassandra_functional_test.cc b/utilities/cassandra/cassandra_functional_test.cc
index 5c614b48f5..d53a079078 100644
--- a/utilities/cassandra/cassandra_functional_test.cc
+++ b/utilities/cassandra/cassandra_functional_test.cc
@@ -17,7 +17,6 @@
 #include "utilities/cassandra/test_utils.h"
 #include "utilities/merge_operators.h"
 
-using namespace ROCKSDB_NAMESPACE;
 
 namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
diff --git a/utilities/cassandra/cassandra_serialize_test.cc b/utilities/cassandra/cassandra_serialize_test.cc
index 491540bfec..8d0cf66672 100644
--- a/utilities/cassandra/cassandra_serialize_test.cc
+++ b/utilities/cassandra/cassandra_serialize_test.cc
@@ -6,7 +6,6 @@
 #include "test_util/testharness.h"
 #include "utilities/cassandra/serialize.h"
 
-using namespace ROCKSDB_NAMESPACE::cassandra;
 
 namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
diff --git a/utilities/merge_operators/sortlist.cc b/utilities/merge_operators/sortlist.cc
index b6bd65b36a..078b83e197 100644
--- a/utilities/merge_operators/sortlist.cc
+++ b/utilities/merge_operators/sortlist.cc
@@ -7,9 +7,6 @@
 #include "rocksdb/slice.h"
 #include "utilities/merge_operators.h"
 
-using ROCKSDB_NAMESPACE::Logger;
-using ROCKSDB_NAMESPACE::MergeOperator;
-using ROCKSDB_NAMESPACE::Slice;
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/utilities/merge_operators/string_append/stringappend_test.cc b/utilities/merge_operators/string_append/stringappend_test.cc
index 675c4b2afd..fdc8904075 100644
--- a/utilities/merge_operators/string_append/stringappend_test.cc
+++ b/utilities/merge_operators/string_append/stringappend_test.cc
@@ -27,7 +27,6 @@
 #include "utilities/merge_operators.h"
 #include "utilities/merge_operators/string_append/stringappend2.h"
 
-using namespace ROCKSDB_NAMESPACE;
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/utilities/transactions/optimistic_transaction_test.cc b/utilities/transactions/optimistic_transaction_test.cc
index 63c1a255c6..21c8cdac4e 100644
--- a/utilities/transactions/optimistic_transaction_test.cc
+++ b/utilities/transactions/optimistic_transaction_test.cc
@@ -10,7 +10,6 @@
 #include <thread>
 
 #include "db/db_impl/db_impl.h"
-#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/perf_context.h"