diff --git a/cache/cache_bench.cc b/cache/cache_bench.cc
index 96d07d864..48cf2b44d 100644
--- a/cache/cache_bench.cc
+++ b/cache/cache_bench.cc
@@ -11,10 +11,10 @@ int main() {
 }
 #else
 
-#include <stdio.h>
 #include <sys/types.h>
 
 #include <cinttypes>
+#include <cstdio>
 #include <limits>
 
 #include "port/port.h"
diff --git a/cache/lru_cache.cc b/cache/lru_cache.cc
index 5a4a2729d..f42190121 100644
--- a/cache/lru_cache.cc
+++ b/cache/lru_cache.cc
@@ -9,8 +9,8 @@
 
 #include "cache/lru_cache.h"
 
-#include <assert.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 #include <string>
 
 #include "util/mutexlock.h"
diff --git a/db/c.cc b/db/c.cc
index b03bf9ad8..0f9d52010 100644
--- a/db/c.cc
+++ b/db/c.cc
@@ -11,7 +11,11 @@
 
 #include "rocksdb/c.h"
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <map>
+#include <unordered_set>
+#include <vector>
+
 #include "port/port.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
@@ -24,6 +28,7 @@
 #include "rocksdb/memtablerep.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/options.h"
+#include "rocksdb/perf_context.h"
 #include "rocksdb/rate_limiter.h"
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/statistics.h"
@@ -39,13 +44,8 @@
 #include "rocksdb/utilities/transaction_db.h"
 #include "rocksdb/utilities/write_batch_with_index.h"
 #include "rocksdb/write_batch.h"
-#include "rocksdb/perf_context.h"
 #include "utilities/merge_operators.h"
 
-#include <vector>
-#include <unordered_set>
-#include <map>
-
 using ROCKSDB_NAMESPACE::BackupableDBOptions;
 using ROCKSDB_NAMESPACE::BackupEngine;
 using ROCKSDB_NAMESPACE::BackupID;
diff --git a/db/db_iter.h b/db/db_iter.h
index 284d9c12d..621d3280e 100644
--- a/db/db_iter.h
+++ b/db/db_iter.h
@@ -8,8 +8,9 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #pragma once
-#include <stdint.h>
+#include <cstdint>
 #include <string>
+
 #include "db/db_impl/db_impl.h"
 #include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
diff --git a/db/flush_scheduler.h b/db/flush_scheduler.h
index cbe17994f..eb03f3e11 100644
--- a/db/flush_scheduler.h
+++ b/db/flush_scheduler.h
@@ -5,10 +5,11 @@
 
 #pragma once
 
-#include <stdint.h>
 #include <atomic>
+#include <cstdint>
 #include <mutex>
 #include <set>
+
 #include "util/autovector.h"
 
 namespace ROCKSDB_NAMESPACE {
diff --git a/db/log_writer.h b/db/log_writer.h
index 463826e88..1a91b2199 100644
--- a/db/log_writer.h
+++ b/db/log_writer.h
@@ -8,8 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 #pragma once
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <memory>
 
 #include "db/log_format.h"
diff --git a/db/logs_with_prep_tracker.h b/db/logs_with_prep_tracker.h
index 86c88012a..7f9ece76b 100644
--- a/db/logs_with_prep_tracker.h
+++ b/db/logs_with_prep_tracker.h
@@ -5,8 +5,8 @@
 //
 #pragma once
 
-#include <stdint.h>
 #include <cassert>
+#include <cstdint>
 #include <cstdlib>
 #include <mutex>
 #include <unordered_map>
diff --git a/db/range_tombstone_fragmenter.cc b/db/range_tombstone_fragmenter.cc
index 58426248c..7721a78c7 100644
--- a/db/range_tombstone_fragmenter.cc
+++ b/db/range_tombstone_fragmenter.cc
@@ -6,12 +6,11 @@
 #include "db/range_tombstone_fragmenter.h"
 
 #include <algorithm>
+#include <cinttypes>
+#include <cstdio>
 #include <functional>
 #include <set>
 
-#include <stdio.h>
-#include <cinttypes>
-
 #include "util/autovector.h"
 #include "util/kv_map.h"
 #include "util/vector_iterator.h"
diff --git a/db/table_cache.h b/db/table_cache.h
index a834683fc..1c163cdeb 100644
--- a/db/table_cache.h
+++ b/db/table_cache.h
@@ -10,9 +10,9 @@
 // Thread-safe (provides internal synchronization)
 
 #pragma once
+#include <cstdint>
 #include <string>
 #include <vector>
-#include <stdint.h>
 
 #include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
diff --git a/db/version_set.cc b/db/version_set.cc
index e2ecb8b0a..6952577c6 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -9,11 +9,10 @@
 
 #include "db/version_set.h"
 
-#include <stdio.h>
-
 #include <algorithm>
 #include <array>
 #include <cinttypes>
+#include <cstdio>
 #include <list>
 #include <map>
 #include <set>
diff --git a/db/write_thread.h b/db/write_thread.h
index bf4720daf..f9a527d1d 100644
--- a/db/write_thread.h
+++ b/db/write_thread.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <assert.h>
-#include <stdint.h>
 #include <atomic>
+#include <cassert>
 #include <chrono>
 #include <condition_variable>
+#include <cstdint>
 #include <mutex>
 #include <type_traits>
 #include <vector>