diff --git a/cache/clock_cache.cc b/cache/clock_cache.cc
index bb649599023..06cc27a8eaa 100644
--- a/cache/clock_cache.cc
+++ b/cache/clock_cache.cc
@@ -16,7 +16,7 @@
 #include "cache/secondary_cache_adapter.h"
 #include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "rocksdb/env.h"
 #include "util/hash.h"
diff --git a/cache/compressed_secondary_cache.cc b/cache/compressed_secondary_cache.cc
index 2408afc0a17..86bb13bdfdc 100644
--- a/cache/compressed_secondary_cache.cc
+++ b/cache/compressed_secondary_cache.cc
@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "monitoring/perf_context_imp.h"
 #include "util/compression.h"
 #include "util/string_util.h"
diff --git a/cache/compressed_secondary_cache.h b/cache/compressed_secondary_cache.h
index d20f2d1d7a2..ad8f0d712e3 100644
--- a/cache/compressed_secondary_cache.h
+++ b/cache/compressed_secondary_cache.h
@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "cache/lru_cache.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/secondary_cache.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
diff --git a/cache/lru_cache.cc b/cache/lru_cache.cc
index 02119c81900..036956db32c 100644
--- a/cache/lru_cache.cc
+++ b/cache/lru_cache.cc
@@ -16,7 +16,7 @@
 
 #include "cache/secondary_cache_adapter.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "util/distributed_mutex.h"
 
diff --git a/db/blob/blob_contents.h b/db/blob/blob_contents.h
index b9f1ea80781..15a672a0ae3 100644
--- a/db/blob/blob_contents.h
+++ b/db/blob/blob_contents.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/advanced_cache.h"
 #include "rocksdb/rocksdb_namespace.h"
 #include "rocksdb/slice.h"
diff --git a/db/blob/blob_file_reader.cc b/db/blob/blob_file_reader.cc
index 79c0bf50dd6..7abd1ce6b57 100644
--- a/db/blob/blob_file_reader.cc
+++ b/db/blob/blob_file_reader.cc
@@ -12,7 +12,7 @@
 #include "db/blob/blob_log_format.h"
 #include "file/file_prefetch_buffer.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/cf_options.h"
 #include "rocksdb/file_system.h"
 #include "rocksdb/slice.h"
diff --git a/db/blob/blob_log_sequential_reader.cc b/db/blob/blob_log_sequential_reader.cc
index 77872518971..2ed43068194 100644
--- a/db/blob/blob_log_sequential_reader.cc
+++ b/db/blob/blob_log_sequential_reader.cc
@@ -7,7 +7,7 @@
 #include "db/blob/blob_log_sequential_reader.h"
 
 #include "file/random_access_file_reader.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "util/stop_watch.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/db/blob/blob_log_writer.cc b/db/blob/blob_log_writer.cc
index 9dbac7f259f..bf5ef27c1d6 100644
--- a/db/blob/blob_log_writer.cc
+++ b/db/blob/blob_log_writer.cc
@@ -10,7 +10,7 @@
 
 #include "db/blob/blob_log_format.h"
 #include "file/writable_file_writer.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/system_clock.h"
 #include "test_util/sync_point.h"
 #include "util/coding.h"
diff --git a/db/blob/blob_source.cc b/db/blob/blob_source.cc
index 5e5e8135564..b524982e532 100644
--- a/db/blob/blob_source.cc
+++ b/db/blob/blob_source.cc
@@ -13,7 +13,7 @@
 #include "db/blob/blob_contents.h"
 #include "db/blob/blob_file_reader.h"
 #include "db/blob/blob_log_format.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/cf_options.h"
 #include "table/get_context.h"
 #include "table/multiget_context.h"
diff --git a/db/compaction/compaction_job_stats_test.cc b/db/compaction/compaction_job_stats_test.cc
index 9f93f19727a..78584120179 100644
--- a/db/compaction/compaction_job_stats_test.cc
+++ b/db/compaction/compaction_job_stats_test.cc
@@ -24,7 +24,7 @@
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "monitoring/thread_status_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/cache.h"
@@ -54,7 +54,7 @@
 #include "util/compression.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
diff --git a/db/compaction/compaction_picker.cc b/db/compaction/compaction_picker.cc
index 06a69cb0166..a8f314a5bb8 100644
--- a/db/compaction/compaction_picker.cc
+++ b/db/compaction/compaction_picker.cc
@@ -20,7 +20,7 @@
 #include "file/filename.h"
 #include "logging/log_buffer.h"
 #include "logging/logging.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
 #include "util/string_util.h"
diff --git a/db/compaction/compaction_picker_universal.cc b/db/compaction/compaction_picker_universal.cc
index 8ca66df5180..8ad43efcce8 100644
--- a/db/compaction/compaction_picker_universal.cc
+++ b/db/compaction/compaction_picker_universal.cc
@@ -19,7 +19,7 @@
 #include "file/filename.h"
 #include "logging/log_buffer.h"
 #include "logging/logging.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
 #include "util/string_util.h"
diff --git a/db/db_impl/db_impl_open.cc b/db/db_impl/db_impl_open.cc
index 5bad1e12bdf..6bc8ae4c30b 100644
--- a/db/db_impl/db_impl_open.cc
+++ b/db/db_impl/db_impl_open.cc
@@ -24,7 +24,7 @@
 #include "rocksdb/table.h"
 #include "rocksdb/wal_filter.h"
 #include "test_util/sync_point.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 Options SanitizeOptions(const std::string& dbname, const Options& src,
diff --git a/db/db_iterator_test.cc b/db/db_iterator_test.cc
index f8dd46da01a..862377b6db3 100644
--- a/db/db_iterator_test.cc
+++ b/db/db_iterator_test.cc
@@ -16,7 +16,7 @@
 #include "port/stack_trace.h"
 #include "rocksdb/iostats_context.h"
 #include "rocksdb/perf_context.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "util/random.h"
 #include "utilities/merge_operators/string_append/stringappend2.h"
 
diff --git a/db/db_test.cc b/db/db_test.cc
index 1b01422a9ba..6fabea304ae 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -66,7 +66,7 @@
 #include "util/compression.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
diff --git a/db/listener_test.cc b/db/listener_test.cc
index 7c96bfd34e1..d62768a4265 100644
--- a/db/listener_test.cc
+++ b/db/listener_test.cc
@@ -12,7 +12,7 @@
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
@@ -29,7 +29,7 @@
 #include "test_util/testutil.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
diff --git a/db/memtable.cc b/db/memtable.cc
index f6c0cc62470..3801b67a9b5 100644
--- a/db/memtable.cc
+++ b/db/memtable.cc
@@ -26,7 +26,7 @@
 #include "memory/arena.h"
 #include "memory/memory_usage.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "port/port.h"
 #include "rocksdb/comparator.h"
diff --git a/db/merge_helper.cc b/db/merge_helper.cc
index 976af55bcf5..110ac9622e6 100644
--- a/db/merge_helper.cc
+++ b/db/merge_helper.cc
@@ -15,7 +15,7 @@
 #include "db/wide/wide_column_serialization.h"
 #include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/likely.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
diff --git a/db/write_batch.cc b/db/write_batch.cc
index 7fa0ed69416..726b14f0988 100644
--- a/db/write_batch.cc
+++ b/db/write_batch.cc
@@ -59,7 +59,7 @@
 #include "db/wide/wide_column_serialization.h"
 #include "db/write_batch_internal.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/lang.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/system_clock.h"
diff --git a/env/mock_env.cc b/env/mock_env.cc
index a4e0c43f139..c232af61eb5 100644
--- a/env/mock_env.cc
+++ b/env/mock_env.cc
@@ -21,7 +21,7 @@
 #include "util/cast_util.h"
 #include "util/hash.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/file/file_prefetch_buffer.cc b/file/file_prefetch_buffer.cc
index 2fab9c9172b..050947210f9 100644
--- a/file/file_prefetch_buffer.cc
+++ b/file/file_prefetch_buffer.cc
@@ -18,7 +18,7 @@
 #include "port/port.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/file/file_prefetch_buffer.h b/file/file_prefetch_buffer.h
index 77286ddcfa4..418dc752adb 100644
--- a/file/file_prefetch_buffer.h
+++ b/file/file_prefetch_buffer.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "file/readahead_file_info.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/file_system.h"
diff --git a/file/random_access_file_reader.cc b/file/random_access_file_reader.cc
index 2f8b516673e..7a1af196536 100644
--- a/file/random_access_file_reader.cc
+++ b/file/random_access_file_reader.cc
@@ -19,7 +19,7 @@
 #include "table/format.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 const std::array<Histograms, std::size_t(Env::IOActivity::kUnknown)>
diff --git a/file/readahead_raf.cc b/file/readahead_raf.cc
index 6d346432e22..dd09822e3e2 100644
--- a/file/readahead_raf.cc
+++ b/file/readahead_raf.cc
@@ -15,7 +15,7 @@
 #include "file/read_write_util.h"
 #include "rocksdb/file_system.h"
 #include "util/aligned_buffer.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 namespace {
diff --git a/file/sequence_file_reader.cc b/file/sequence_file_reader.cc
index 0cc941b3d08..a753c1d098c 100644
--- a/file/sequence_file_reader.cc
+++ b/file/sequence_file_reader.cc
@@ -19,7 +19,7 @@
 #include "test_util/sync_point.h"
 #include "util/aligned_buffer.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 IOStatus SequentialFileReader::Create(
diff --git a/file/writable_file_writer.cc b/file/writable_file_writer.cc
index b60993c6d82..908878a5fae 100644
--- a/file/writable_file_writer.cc
+++ b/file/writable_file_writer.cc
@@ -21,7 +21,7 @@
 #include "test_util/sync_point.h"
 #include "util/crc32c.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 IOStatus WritableFileWriter::Create(const std::shared_ptr<FileSystem>& fs,
diff --git a/java/rocksjni/statisticsjni.h b/java/rocksjni/statisticsjni.h
index ce823f9b128..3262b296cf5 100644
--- a/java/rocksjni/statisticsjni.h
+++ b/java/rocksjni/statisticsjni.h
@@ -13,7 +13,7 @@
 #include <set>
 #include <string>
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/statistics.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/memory/memory_allocator.h b/memory/memory_allocator_impl.h
similarity index 100%
rename from memory/memory_allocator.h
rename to memory/memory_allocator_impl.h
diff --git a/monitoring/instrumented_mutex.h b/monitoring/instrumented_mutex.h
index e5aae34dfb8..b97d2502e43 100644
--- a/monitoring/instrumented_mutex.h
+++ b/monitoring/instrumented_mutex.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/system_clock.h"
diff --git a/monitoring/perf_step_timer.h b/monitoring/perf_step_timer.h
index 8deb312527f..f6c45d773cf 100644
--- a/monitoring/perf_step_timer.h
+++ b/monitoring/perf_step_timer.h
@@ -5,7 +5,7 @@
 //
 #pragma once
 #include "monitoring/perf_level_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/system_clock.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/monitoring/statistics.cc b/monitoring/statistics.cc
index 927cf9895c7..7459dc46f7b 100644
--- a/monitoring/statistics.cc
+++ b/monitoring/statistics.cc
@@ -3,14 +3,14 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-#include "monitoring/statistics.h"
+#include "rocksdb/statistics.h"
 
 #include <algorithm>
 #include <cinttypes>
 #include <cstdio>
 
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/convenience.h"
-#include "rocksdb/statistics.h"
 #include "rocksdb/utilities/customizable_util.h"
 #include "rocksdb/utilities/options_type.h"
 #include "util/string_util.h"
diff --git a/monitoring/statistics.h b/monitoring/statistics_impl.h
similarity index 100%
rename from monitoring/statistics.h
rename to monitoring/statistics_impl.h
diff --git a/options/customizable_test.cc b/options/customizable_test.cc
index d183354107e..d88777793ac 100644
--- a/options/customizable_test.cc
+++ b/options/customizable_test.cc
@@ -35,7 +35,7 @@
 #include "rocksdb/utilities/object_registry.h"
 #include "rocksdb/utilities/options_type.h"
 #include "table/block_based/filter_policy_internal.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "table/mock_table.h"
 #include "test_util/mock_time_env.h"
 #include "test_util/testharness.h"
diff --git a/options/options.cc b/options/options.cc
index 9a435f1efe6..1caebdfb2f6 100644
--- a/options/options.cc
+++ b/options/options.cc
@@ -13,7 +13,7 @@
 #include <limits>
 
 #include "logging/logging.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/db_options.h"
 #include "options/options_helper.h"
 #include "rocksdb/cache.h"
diff --git a/table/block_based/block_based_table_builder.cc b/table/block_based/block_based_table_builder.cc
index 3d7a08e7755..ee8865a50d0 100644
--- a/table/block_based/block_based_table_builder.cc
+++ b/table/block_based/block_based_table_builder.cc
@@ -29,7 +29,7 @@
 #include "db/dbformat.h"
 #include "index_builder.h"
 #include "logging/logging.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"
diff --git a/table/block_based/flush_block_policy.cc b/table/block_based/flush_block_policy.cc
index baac21e2148..d5cc310013f 100644
--- a/table/block_based/flush_block_policy.cc
+++ b/table/block_based/flush_block_policy.cc
@@ -13,7 +13,7 @@
 #include "rocksdb/utilities/customizable_util.h"
 #include "table/block_based/block_based_table_reader.h"
 #include "table/block_based/block_builder.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "table/format.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/table/block_based/flush_block_policy.h b/table/block_based/flush_block_policy_impl.h
similarity index 100%
rename from table/block_based/flush_block_policy.h
rename to table/block_based/flush_block_policy_impl.h
diff --git a/table/block_fetcher.cc b/table/block_fetcher.cc
index 1fdf86168de..b2fa6d4b528 100644
--- a/table/block_fetcher.cc
+++ b/table/block_fetcher.cc
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "logging/logging.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "monitoring/perf_context_imp.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/env.h"
diff --git a/table/block_fetcher.h b/table/block_fetcher.h
index 72adced30e3..da6c352d0a2 100644
--- a/table/block_fetcher.h
+++ b/table/block_fetcher.h
@@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #pragma once
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "table/block_based/block.h"
 #include "table/block_based/block_type.h"
 #include "table/format.h"
diff --git a/table/format.cc b/table/format.cc
index 7d709a217b4..dc077bd4529 100644
--- a/table/format.cc
+++ b/table/format.cc
@@ -14,9 +14,9 @@
 
 #include "block_fetcher.h"
 #include "file/random_access_file_reader.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/options_helper.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
diff --git a/table/format.h b/table/format.h
index 71d3706c42d..c375165bf64 100644
--- a/table/format.h
+++ b/table/format.h
@@ -15,7 +15,7 @@
 
 #include "file/file_prefetch_buffer.h"
 #include "file/random_access_file_reader.h"
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "options/cf_options.h"
 #include "port/malloc.h"
 #include "port/port.h"  // noexcept
diff --git a/table/get_context.cc b/table/get_context.cc
index a4944e895b4..8f5cd75f151 100644
--- a/table/get_context.cc
+++ b/table/get_context.cc
@@ -12,7 +12,7 @@
 #include "db/wide/wide_column_serialization.h"
 #include "monitoring/file_read_sample.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/system_clock.h"
diff --git a/table/persistent_cache_helper.h b/table/persistent_cache_helper.h
index ece339aeec1..cce4092cde4 100644
--- a/table/persistent_cache_helper.h
+++ b/table/persistent_cache_helper.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "table/format.h"
 #include "table/persistent_cache_options.h"
 
diff --git a/table/persistent_cache_options.h b/table/persistent_cache_options.h
index b543ab3a316..46f26879795 100644
--- a/table/persistent_cache_options.h
+++ b/table/persistent_cache_options.h
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "cache/cache_key.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/persistent_cache.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/table/table_test.cc b/table/table_test.cc
index 17b8af9f131..9610ba76724 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -27,7 +27,7 @@
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
 #include "memtable/stl_wrappers.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/options_helper.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
@@ -55,7 +55,7 @@
 #include "table/block_based/block_based_table_reader.h"
 #include "table/block_based/block_builder.h"
 #include "table/block_based/filter_policy_internal.h"
-#include "table/block_based/flush_block_policy.h"
+#include "table/block_based/flush_block_policy_impl.h"
 #include "table/block_fetcher.h"
 #include "table/format.h"
 #include "table/get_context.h"
diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc
index f6edcce58a2..98ff071e09d 100644
--- a/tools/db_bench_tool.cc
+++ b/tools/db_bench_tool.cc
@@ -42,7 +42,7 @@
 #include "db/malloc_stats.h"
 #include "db/version_set.h"
 #include "monitoring/histogram.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "options/cf_options.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
diff --git a/util/compression.h b/util/compression.h
index 31ff5a7554a..eb5d1c7bbc1 100644
--- a/util/compression.h
+++ b/util/compression.h
@@ -20,7 +20,7 @@
 #endif  // ROCKSDB_MALLOC_USABLE_SIZE
 #include <string>
 
-#include "memory/memory_allocator.h"
+#include "memory/memory_allocator_impl.h"
 #include "rocksdb/options.h"
 #include "rocksdb/table.h"
 #include "table/block_based/block_type.h"
diff --git a/util/rate_limiter.cc b/util/rate_limiter.cc
index 1534a7b9014..be54138d948 100644
--- a/util/rate_limiter.cc
+++ b/util/rate_limiter.cc
@@ -7,15 +7,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 "util/rate_limiter.h"
-
 #include <algorithm>
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/system_clock.h"
 #include "test_util/sync_point.h"
 #include "util/aligned_buffer.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 size_t RateLimiter::RequestToken(size_t bytes, size_t alignment,
diff --git a/util/rate_limiter.h b/util/rate_limiter_impl.h
similarity index 100%
rename from util/rate_limiter.h
rename to util/rate_limiter_impl.h
diff --git a/util/rate_limiter_test.cc b/util/rate_limiter_test.cc
index 93361acba95..7df2bb04f1d 100644
--- a/util/rate_limiter_test.cc
+++ b/util/rate_limiter_test.cc
@@ -7,8 +7,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/rate_limiter.h"
-
 #include <chrono>
 #include <cinttypes>
 #include <cstdint>
@@ -20,6 +18,7 @@
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
 #include "util/random.h"
+#include "util/rate_limiter_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/util/stop_watch.h b/util/stop_watch.h
index c2ffeeccc7a..ece72007b83 100644
--- a/util/stop_watch.h
+++ b/util/stop_watch.h
@@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 #pragma once
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/system_clock.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/utilities/agg_merge/agg_merge.cc b/utilities/agg_merge/agg_merge.cc
index a7eab1f1227..8e5c536f559 100644
--- a/utilities/agg_merge/agg_merge.cc
+++ b/utilities/agg_merge/agg_merge.cc
@@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#include "utilities/agg_merge/agg_merge.h"
+#include "rocksdb/utilities/agg_merge.h"
 
 #include <assert.h>
 
@@ -17,9 +17,9 @@
 #include "port/likely.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/slice.h"
-#include "rocksdb/utilities/agg_merge.h"
 #include "rocksdb/utilities/options_type.h"
 #include "util/coding.h"
+#include "utilities/agg_merge/agg_merge_impl.h"
 #include "utilities/merge_operators.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/utilities/agg_merge/agg_merge.h b/utilities/agg_merge/agg_merge_impl.h
similarity index 100%
rename from utilities/agg_merge/agg_merge.h
rename to utilities/agg_merge/agg_merge_impl.h
diff --git a/utilities/agg_merge/agg_merge_test.cc b/utilities/agg_merge/agg_merge_test.cc
index a65441cd0a5..67abcf142a2 100644
--- a/utilities/agg_merge/agg_merge_test.cc
+++ b/utilities/agg_merge/agg_merge_test.cc
@@ -12,7 +12,7 @@
 #include "db/db_test_util.h"
 #include "rocksdb/options.h"
 #include "test_util/testharness.h"
-#include "utilities/agg_merge/agg_merge.h"
+#include "utilities/agg_merge/agg_merge_impl.h"
 #include "utilities/agg_merge/test_agg_merge.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/utilities/agg_merge/test_agg_merge.cc b/utilities/agg_merge/test_agg_merge.cc
index 06e5b5697a3..63b89cccd69 100644
--- a/utilities/agg_merge/test_agg_merge.cc
+++ b/utilities/agg_merge/test_agg_merge.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "util/coding.h"
-#include "utilities/agg_merge/agg_merge.h"
+#include "utilities/agg_merge/agg_merge_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 
diff --git a/utilities/backup/backup_engine.cc b/utilities/backup/backup_engine.cc
index 98f5d9d0d8e..e74218d45ca 100644
--- a/utilities/backup/backup_engine.cc
+++ b/utilities/backup/backup_engine.cc
@@ -49,7 +49,7 @@
 #include "util/coding.h"
 #include "util/crc32c.h"
 #include "util/math.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/string_util.h"
 #include "utilities/backup/backup_engine_impl.h"
 #include "utilities/checkpoint/checkpoint_impl.h"
diff --git a/utilities/backup/backup_engine_test.cc b/utilities/backup/backup_engine_test.cc
index 0c4a6a3c5f5..dd41937d4e4 100644
--- a/utilities/backup/backup_engine_test.cc
+++ b/utilities/backup/backup_engine_test.cc
@@ -46,7 +46,7 @@
 #include "util/cast_util.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
-#include "util/rate_limiter.h"
+#include "util/rate_limiter_impl.h"
 #include "util/stderr_logger.h"
 #include "util/string_util.h"
 #include "utilities/backup/backup_engine_impl.h"
diff --git a/utilities/blob_db/blob_compaction_filter.h b/utilities/blob_db/blob_compaction_filter.h
index e7858b08606..cb83d0d034f 100644
--- a/utilities/blob_db/blob_compaction_filter.h
+++ b/utilities/blob_db/blob_compaction_filter.h
@@ -7,7 +7,7 @@
 #include <unordered_set>
 
 #include "db/blob/blob_index.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/compaction_filter.h"
 #include "utilities/blob_db/blob_db_gc_stats.h"
 #include "utilities/blob_db/blob_db_impl.h"
diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc
index cfbbd74580b..7a4b603f229 100644
--- a/utilities/blob_db/blob_db_impl.cc
+++ b/utilities/blob_db/blob_db_impl.cc
@@ -22,7 +22,7 @@
 #include "file/writable_file_writer.h"
 #include "logging/logging.h"
 #include "monitoring/instrumented_mutex.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
diff --git a/utilities/simulator_cache/sim_cache.cc b/utilities/simulator_cache/sim_cache.cc
index 80e535f3b4b..d58c3b34f16 100644
--- a/utilities/simulator_cache/sim_cache.cc
+++ b/utilities/simulator_cache/sim_cache.cc
@@ -9,7 +9,7 @@
 #include <iomanip>
 
 #include "file/writable_file_writer.h"
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "rocksdb/file_system.h"