diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml
index 5e4fb7d468..c9078e8631 100644
--- a/.github/workflows/lint_and_test_cpp.yaml
+++ b/.github/workflows/lint_and_test_cpp.yaml
@@ -35,8 +35,8 @@ on:
       - CMakeLists.txt
       - cmake_modules/**
       - run.sh
-      - scripts/pack_server.sh
-      - scripts/pack_tools.sh
+      - build-support/pack_server.sh
+      - build-support/pack_tools.sh
       - src/**
       - thirdparty/**
 
@@ -55,7 +55,29 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: clang-format
-        run: ./scripts/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
+        run: ./build-support/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
+
+  cpp_clang_tidy_linter:
+    name: Tidy
+    runs-on: ubuntu-22.04
+    container:
+      image: apache/pegasus:thirdparties-bin-ubuntu2204-${{ github.base_ref }}
+    steps:
+      - name: Install Softwares
+        run: |
+          apt-get update
+          apt-get install clang-tidy -y
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Rebuild thirdparty if needed
+        uses: "./.github/actions/rebuild_thirdparty_if_needed"
+      - name: clang-tidy
+        run: |
+          git config --global --add safe.directory /__w/pegasus/pegasus
+          ./run.sh build --test --compiler clang-14,clang++-14 -t debug --skip_thirdparty -c --cmake_only
+          ./build-support/clang_tidy.py --rev-range $(git log origin/${{ github.base_ref }} -n1 --format=format:"%H")
+        shell: bash
 
   cpp_clang_tidy_linter:
     name: Tidy
diff --git a/.github/workflows/regular-build.yml b/.github/workflows/regular-build.yml
index 04468e4d39..54853e82c4 100644
--- a/.github/workflows/regular-build.yml
+++ b/.github/workflows/regular-build.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: clang-format
-        run: ./scripts/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
+        run: ./build-support/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
 
   build_cpp:
     name: Build Cpp
diff --git a/.licenserc.yaml b/.licenserc.yaml
index b8e45b5ec4..86ae01ea0f 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -110,8 +110,9 @@ header:
     - 'cmake_modules/FindRT.cmake'
     - 'cmake_modules/FindDL.cmake'
     # Copyright (c) 2017 Guillaume Papin
-    - 'scripts/run-clang-format.py'
+    - 'build-support/run-clang-format.py'
     # The MIT License (MIT), Copyright (c) 2015 Microsoft Corporation
+    - 'build-support/compile_thrift.py'
     - 'cmake_modules/BaseFunctions.cmake'
     - 'docs/rdsn-README.md'
     - 'idl/command.thrift'
@@ -120,7 +121,6 @@ header:
     - 'idl/metadata.thrift'
     - 'idl/meta_admin.thrift'
     - 'idl/replica_admin.thrift'
-    - 'scripts/compile_thrift.py'
     - 'scripts/learn_stat.py'
     - 'src/runtime/api_layer1.h'
     - 'src/runtime/api_task.h'
diff --git a/LICENSE b/LICENSE
index a8e975f469..18ff45771e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -514,7 +514,7 @@ RESULTING FROM THE USE OF THIS SOFTWARE.
 
 --------------------------------------------------------------------------------
 
-scripts/run-clang-format.py - MIT License
+build-support/run-clang-format.py - MIT License
 
 MIT License
 
diff --git a/scripts/bump_version.sh b/build-support/bump_version.sh
similarity index 100%
rename from scripts/bump_version.sh
rename to build-support/bump_version.sh
diff --git a/scripts/check_license.py b/build-support/check_license.py
similarity index 100%
rename from scripts/check_license.py
rename to build-support/check_license.py
diff --git a/build-support/clang_tidy.py b/build-support/clang_tidy.py
new file mode 100755
index 0000000000..01e8d88fd6
--- /dev/null
+++ b/build-support/clang_tidy.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import argparse
+import collections
+import json
+import multiprocessing
+from multiprocessing.pool import ThreadPool
+import os
+import re
+import subprocess
+import sys
+import tempfile
+
+ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+
+BUILD_PATH = os.path.join(ROOT, "build", "latest")
+
+def run_tidy(sha="HEAD", is_rev_range=False):
+    diff_cmdline = ["git", "diff" if is_rev_range else "show", sha]
+
+    # Figure out which paths changed in the given diff.
+    changed_paths = subprocess.check_output(diff_cmdline + ["--name-only", "--pretty=format:"]).splitlines()
+    changed_paths = [p for p in changed_paths if p]
+
+    # Produce a separate diff for each file and run clang-tidy-diff on it
+    # in parallel.
+    #
+    # Note: this will incorporate any configuration from .clang-tidy.
+    def tidy_on_path(path):
+        patch_file = tempfile.NamedTemporaryFile()
+        cmd = diff_cmdline + [
+            "--src-prefix=%s/" % ROOT,
+            "--dst-prefix=%s/" % ROOT,
+            "--",
+            path]
+        subprocess.check_call(cmd, stdout=patch_file, cwd=ROOT)
+        cmdline = ["clang-tidy-diff",
+                   "-clang-tidy-binary",
+                   "clang-tidy",
+                   "-p0",
+                   "-path", BUILD_PATH,
+                   "-checks=-llvm-include-order,-modernize-concat-nested-namespaces,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-macro-usage,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-modernize-use-trailing-return-type,-bugprone-easily-swappable-parameters,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-c-arrays,-hicpp-avoid-c-arrays,-modernize-avoid-c-arrays,-llvm-header-guard,-cppcoreguidelines-pro-bounds-pointer-arithmetic",
+                   "-extra-arg=-language=c++",
+                   "-extra-arg=-std=c++17",
+                   "-extra-arg=-Ithirdparty/output/include"]
+        return subprocess.check_output(
+            cmdline,
+            stdin=open(patch_file.name),
+            cwd=ROOT).decode()
+    pool = ThreadPool(multiprocessing.cpu_count())
+    try:
+        return "".join(pool.imap(tidy_on_path, changed_paths))
+    except KeyboardInterrupt as ki:
+        sys.exit(1)
+    finally:
+        pool.terminate()
+        pool.join()
+
+
+def split_warnings(clang_output):
+    accumulated = ""
+    for l in clang_output.splitlines():
+        if l == "" or l == "No relevant changes found.":
+            continue
+        if l.startswith(ROOT) and re.search(r'(warning|error): ', l):
+            if accumulated:
+                yield accumulated
+            accumulated = ""
+        accumulated += l + "\n"
+    if accumulated:
+        yield accumulated
+
+
+if __name__ == "__main__":
+    # Basic setup and argument parsing.
+    parser = argparse.ArgumentParser(description="Run clang-tidy on a patch")
+    parser.add_argument("--rev-range", action="store_true",
+                        default=False,
+                        help="Whether the revision specifies the 'rev..' range")
+    parser.add_argument('rev', help="The git revision (or range of revisions) to process")
+    args = parser.parse_args()
+
+    # Run clang-tidy and parse the output.
+    clang_output = run_tidy(args.rev, args.rev_range)
+    print("Clang output")
+    print(clang_output)
+    sys.exit(None != re.match("warning: |error: ", clang_output, flags=0))
diff --git a/scripts/collector_table_counter_gen.py b/build-support/collector_table_counter_gen.py
similarity index 98%
rename from scripts/collector_table_counter_gen.py
rename to build-support/collector_table_counter_gen.py
index 03a3f9f297..da50e1458f 100755
--- a/scripts/collector_table_counter_gen.py
+++ b/build-support/collector_table_counter_gen.py
@@ -118,7 +118,7 @@ def generate_code_in_command_helper_header(replica_counter):
 
 
 # python3 ./collector_table_counter_gen.py counter1,counter2
-# please use `./scripts/format_files.sh` to format after generate code
+# please use `./build-support/format_files.sh` to format after generate code
 if __name__ == '__main__':
     if len(sys.argv) != 2:
         print("python3 ./collector_table_counter_gen.py {counter1,counter2..}")
diff --git a/scripts/compile_thrift.py b/build-support/compile_thrift.py
similarity index 100%
rename from scripts/compile_thrift.py
rename to build-support/compile_thrift.py
diff --git a/scripts/format_files.sh b/build-support/format_files.sh
similarity index 100%
rename from scripts/format_files.sh
rename to build-support/format_files.sh
diff --git a/scripts/pack_client.sh b/build-support/pack_client.sh
similarity index 100%
rename from scripts/pack_client.sh
rename to build-support/pack_client.sh
diff --git a/scripts/pack_common.sh b/build-support/pack_common.sh
similarity index 100%
rename from scripts/pack_common.sh
rename to build-support/pack_common.sh
diff --git a/scripts/pack_server.sh b/build-support/pack_server.sh
similarity index 100%
rename from scripts/pack_server.sh
rename to build-support/pack_server.sh
diff --git a/scripts/pack_tools.sh b/build-support/pack_tools.sh
similarity index 100%
rename from scripts/pack_tools.sh
rename to build-support/pack_tools.sh
diff --git a/scripts/recompile_thrift.sh b/build-support/recompile_thrift.sh
similarity index 100%
rename from scripts/recompile_thrift.sh
rename to build-support/recompile_thrift.sh
diff --git a/scripts/redis_proto_check.py b/build-support/redis_proto_check.py
similarity index 100%
rename from scripts/redis_proto_check.py
rename to build-support/redis_proto_check.py
diff --git a/scripts/run-clang-format.py b/build-support/run-clang-format.py
similarity index 100%
rename from scripts/run-clang-format.py
rename to build-support/run-clang-format.py
diff --git a/java-client/README.md b/java-client/README.md
index 9cfdb9a703..fbde959bf0 100644
--- a/java-client/README.md
+++ b/java-client/README.md
@@ -60,7 +60,7 @@ mvn clean package -Dtest=TestPing
 ### Install
 
 ```
-cd scripts && bash recompile_thrift.sh && cd -
+cd build-support && bash recompile_thrift.sh && cd -
 mvn clean install -DskipTests
 ```
 
diff --git a/run.sh b/run.sh
index 8c6048b019..67c3e001d8 100755
--- a/run.sh
+++ b/run.sh
@@ -324,8 +324,8 @@ function run_build()
     if [ ! -f "${ROOT}/src/common/serialization_helper/dsn.layer2_types.h" ]; then
         echo "Gen thrift"
         # TODO(yingchun): should be optimized
-        python3 $ROOT/scripts/compile_thrift.py
-        sh ${ROOT}/scripts/recompile_thrift.sh
+        python3 $ROOT/build-support/compile_thrift.py
+        sh ${ROOT}/build-support/recompile_thrift.sh
     fi
 
     if [ ! -d "$BUILD_DIR" ]; then
@@ -2105,19 +2105,19 @@ case $cmd in
         ;;
     pack_server)
         shift
-        PEGASUS_ROOT=$ROOT ./scripts/pack_server.sh $*
+        PEGASUS_ROOT=$ROOT ./build-support/pack_server.sh $*
         ;;
     pack_client)
         shift
-        PEGASUS_ROOT=$ROOT ./scripts/pack_client.sh $*
+        PEGASUS_ROOT=$ROOT ./build-support/pack_client.sh $*
         ;;
     pack_tools)
         shift
-        PEGASUS_ROOT=$ROOT ./scripts/pack_tools.sh $*
+        PEGASUS_ROOT=$ROOT ./build-support/pack_tools.sh $*
         ;;
     bump_version)
         shift
-        ./scripts/bump_version.sh $*
+        ./build-support/bump_version.sh $*
         ;;
     *)
         echo "ERROR: unknown command $cmd"
diff --git a/scala-client/README.md b/scala-client/README.md
index 7aa454f0d3..1467f169e2 100644
--- a/scala-client/README.md
+++ b/scala-client/README.md
@@ -68,8 +68,8 @@ NOTE: It requires the Pegasus [onebox](https://pegasus.apache.org/overview/onebo
 
 Build Java dependency at first, then build and test Scala client.
 ```
-cd ${PROJECT_ROOT}/java-client/scripts
-./recompile_thrift.sh
+cd ${PROJECT_ROOT}/build-support
+bash recompile_thrift.sh
 
 cd ${PROJECT_ROOT}/java-client
 mvn clean package -DskipTests -Dcheckstyle.skip=true
diff --git a/src/aio/aio_provider.h b/src/aio/aio_provider.h
index 58e0d4500e..28cdad1d8d 100644
--- a/src/aio/aio_provider.h
+++ b/src/aio/aio_provider.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/src/aio/aio_task.cpp b/src/aio/aio_task.cpp
index 112cb79eb9..e56d3bd167 100644
--- a/src/aio/aio_task.cpp
+++ b/src/aio/aio_task.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <string.h>
+#include <cstring>
 #include <functional>
 #include <list>
 #include <memory>
diff --git a/src/aio/aio_task.h b/src/aio/aio_task.h
index f8bf2ca5cf..47ef8b1c3a 100644
--- a/src/aio/aio_task.h
+++ b/src/aio/aio_task.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <vector>
diff --git a/src/aio/disk_engine.h b/src/aio/disk_engine.h
index 70cce466a1..8d34bdfdd7 100644
--- a/src/aio/disk_engine.h
+++ b/src/aio/disk_engine.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
 #include "aio/aio_task.h"
diff --git a/src/aio/file_io.h b/src/aio/file_io.h
index 0cef3f1b80..a34f12e067 100644
--- a/src/aio/file_io.h
+++ b/src/aio/file_io.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <list>
 #include <string>
 #include <utility>
diff --git a/src/aio/native_linux_aio_provider.h b/src/aio/native_linux_aio_provider.h
index 538b808dfa..958b012cbf 100644
--- a/src/aio/native_linux_aio_provider.h
+++ b/src/aio/native_linux_aio_provider.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/src/aio/test/aio.cpp b/src/aio/test/aio.cpp
index 9193b33922..95bf1c27f9 100644
--- a/src/aio/test/aio.cpp
+++ b/src/aio/test/aio.cpp
@@ -26,7 +26,7 @@
 
 #include <fmt/core.h>
 #include <rocksdb/status.h>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <cstdint>
 #include <list>
diff --git a/src/base/meta_store.h b/src/base/meta_store.h
index a6e8e953be..6205cc8d13 100644
--- a/src/base/meta_store.h
+++ b/src/base/meta_store.h
@@ -21,7 +21,7 @@
 
 #include <gtest/gtest_prod.h>
 #include <rocksdb/options.h>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include "utils/error_code.h"
diff --git a/src/base/pegasus_key_schema.h b/src/base/pegasus_key_schema.h
index 4790693ac7..df7ffb81b2 100644
--- a/src/base/pegasus_key_schema.h
+++ b/src/base/pegasus_key_schema.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include "utils/ports.h"
 #include "utils/utils.h"
diff --git a/src/base/pegasus_rpc_types.h b/src/base/pegasus_rpc_types.h
index 8a680d5b6f..46eec1e422 100644
--- a/src/base/pegasus_rpc_types.h
+++ b/src/base/pegasus_rpc_types.h
@@ -26,7 +26,7 @@
 #include "consensus_types.h"
 #include "replica_admin_types.h"
 #include <rrdb/rrdb_types.h>
-#include <rrdb/rrdb.client.h>
+#include "rrdb/rrdb.client.h"
 
 namespace pegasus {
 
diff --git a/src/base/pegasus_utils.cpp b/src/base/pegasus_utils.cpp
index d0cd360342..1f0b3aa1a2 100644
--- a/src/base/pegasus_utils.cpp
+++ b/src/base/pegasus_utils.cpp
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-#include "pegasus_utils.h"
+#include "base/pegasus_utils.h"
 
-#include <stdio.h>
 #include <cctype>
+#include <cstdio>
 
 #include "utils/fmt_logging.h"
 
diff --git a/src/base/pegasus_utils.h b/src/base/pegasus_utils.h
index adb0788884..ba6ff4d06d 100644
--- a/src/base/pegasus_utils.h
+++ b/src/base/pegasus_utils.h
@@ -20,8 +20,8 @@
 #pragma once
 
 #include <rocksdb/slice.h>
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
 #include <functional>
 #include <list>
 #include <queue>
diff --git a/src/base/pegasus_value_schema.h b/src/base/pegasus_value_schema.h
index c95ceedbd3..04cd2cf41b 100644
--- a/src/base/pegasus_value_schema.h
+++ b/src/base/pegasus_value_schema.h
@@ -20,8 +20,8 @@
 #pragma once
 
 #include <rocksdb/slice.h>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <algorithm>
 #include <array>
 #include <memory>
@@ -33,7 +33,7 @@
 #include "utils/endians.h"
 #include "utils/fmt_logging.h"
 #include <string_view>
-#include "value_field.h"
+#include "base/value_field.h"
 
 namespace pegasus {
 
diff --git a/src/base/test/base_test_utils.cpp b/src/base/test/base_test_utils.cpp
new file mode 100644
index 0000000000..b9d89b8f09
--- /dev/null
+++ b/src/base/test/base_test_utils.cpp
@@ -0,0 +1,45 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "base/test/base_test_utils.h"
+
+#include <memory>
+#include <fmt/format.h>
+#include <rocksdb/slice.h>
+
+namespace pegasus {
+std::string generate_value(value_schema *schema,
+                           uint32_t expire_ts,
+                           uint64_t time_tag,
+                           std::string_view user_data)
+{
+    std::string write_buf;
+    std::vector<rocksdb::Slice> write_slices;
+    value_params params{write_buf, write_slices};
+    params.fields[value_field_type::EXPIRE_TIMESTAMP] =
+        std::make_unique<expire_timestamp_field>(expire_ts);
+    params.fields[value_field_type::TIME_TAG] = std::make_unique<time_tag_field>(time_tag);
+    params.fields[value_field_type::USER_DATA] = std::make_unique<user_data_field>(user_data);
+
+    rocksdb::SliceParts sparts = schema->generate_value(params);
+    std::string raw_value;
+    for (int i = 0; i < sparts.num_parts; i++) {
+        raw_value.append(sparts.parts[i].ToString(false /*hex*/));
+    }
+    return raw_value;
+}
+} // namespace pegasus
diff --git a/src/base/test/base_test_utils.h b/src/base/test/base_test_utils.h
new file mode 100644
index 0000000000..2710689ad2
--- /dev/null
+++ b/src/base/test/base_test_utils.h
@@ -0,0 +1,30 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#pragma once
+
+#include <string>
+#include <string_view>
+
+#include "base/pegasus_value_schema.h"
+
+namespace pegasus {
+std::string generate_value(value_schema *schema,
+                           uint32_t expire_ts,
+                           uint64_t time_tag,
+                           std::string_view user_data);
+} // namespace pegasus
\ No newline at end of file
diff --git a/src/base/test/value_manager_test.cpp b/src/base/test/value_manager_test.cpp
index f9e8a8dfd0..204a307653 100644
--- a/src/base/test/value_manager_test.cpp
+++ b/src/base/test/value_manager_test.cpp
@@ -17,21 +17,17 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
+#include <string_view>
 
 #include "base/value_schema_manager.h"
 #include "gtest/gtest.h"
-#include "pegasus_value_schema.h"
-#include <string_view>
-#include "value_field.h"
-
-using namespace pegasus;
+#include "base/pegasus_value_schema.h"
+#include "base/value_field.h"
+#include "base/test/base_test_utils.h"
 
-extern std::string generate_value(value_schema *schema,
-                                  uint32_t expire_ts,
-                                  uint64_t time_tag,
-                                  std::string_view user_data);
+namespace pegasus {
 
 TEST(value_schema_manager, get_latest_value_schema)
 {
@@ -89,3 +85,4 @@ TEST(pegasus_value_manager, get_value_schema)
         ASSERT_EQ(t.expect_version, schema->version());
     }
 }
+} // namespace pegasus
diff --git a/src/base/test/value_schema_test.cpp b/src/base/test/value_schema_test.cpp
index aa39bffccd..feaf4bf0f1 100644
--- a/src/base/test/value_schema_test.cpp
+++ b/src/base/test/value_schema_test.cpp
@@ -18,11 +18,12 @@
  */
 
 #include <rocksdb/slice.h>
-#include <stdint.h>
+#include <cstdint>
 #include <array>
 #include <limits>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -30,15 +31,14 @@
 #include "base/value_schema_manager.h"
 #include "gtest/gtest.h"
 #include "utils/blob.h"
-#include <string_view>
-#include "value_field.h"
+#include "base/test/base_test_utils.h"
+#include "base/value_field.h"
 
-using namespace pegasus;
-
-uint32_t extract_expire_ts(value_schema *schema, const std::string &raw_value)
+namespace pegasus {
+auto extract_expire_ts(value_schema *schema, const std::string &raw_value)
 {
     auto field = schema->extract_field(raw_value, pegasus::value_field_type::EXPIRE_TIMESTAMP);
-    auto expire_ts_field = static_cast<expire_timestamp_field *>(field.get());
+    auto *expire_ts_field = dynamic_cast<expire_timestamp_field *>(field.get());
     return expire_ts_field->expire_ts;
 }
 
@@ -49,27 +49,6 @@ uint64_t extract_time_tag(value_schema *schema, const std::string &raw_value)
     return time_field->time_tag;
 }
 
-std::string generate_value(value_schema *schema,
-                           uint32_t expire_ts,
-                           uint64_t time_tag,
-                           std::string_view user_data)
-{
-    std::string write_buf;
-    std::vector<rocksdb::Slice> write_slices;
-    value_params params{write_buf, write_slices};
-    params.fields[value_field_type::EXPIRE_TIMESTAMP] =
-        std::make_unique<expire_timestamp_field>(expire_ts);
-    params.fields[value_field_type::TIME_TAG] = std::make_unique<time_tag_field>(time_tag);
-    params.fields[value_field_type::USER_DATA] = std::make_unique<user_data_field>(user_data);
-
-    rocksdb::SliceParts sparts = schema->generate_value(params);
-    std::string raw_value;
-    for (int i = 0; i < sparts.num_parts; i++) {
-        raw_value += sparts.parts[i].ToString();
-    }
-    return raw_value;
-}
-
 TEST(value_schema, generate_and_extract)
 {
     struct test_case
@@ -134,3 +113,4 @@ TEST(value_schema, update_expire_ts)
         ASSERT_EQ(t.update_expire_ts, extract_expire_ts(schema, raw_value));
     }
 }
+} // namespace pegasus
diff --git a/src/base/value_schema_manager.h b/src/base/value_schema_manager.h
index 86b834bfd6..bfcab29a95 100644
--- a/src/base/value_schema_manager.h
+++ b/src/base/value_schema_manager.h
@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <array>
 #include <memory>
 
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "utils/singleton.h"
 #include <string_view>
 
diff --git a/src/base/value_schema_v0.cpp b/src/base/value_schema_v0.cpp
index 1d9d0433bc..98880ddc6f 100644
--- a/src/base/value_schema_v0.cpp
+++ b/src/base/value_schema_v0.cpp
@@ -20,8 +20,8 @@
 #include "value_schema_v0.h"
 
 #include <string_view>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <algorithm>
 #include <array>
 #include <utility>
diff --git a/src/base/value_schema_v0.h b/src/base/value_schema_v0.h
index 750136916d..346b33c8b5 100644
--- a/src/base/value_schema_v0.h
+++ b/src/base/value_schema_v0.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <string>
 
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "utils/blob.h"
 #include <string_view>
-#include "value_field.h"
+#include "base/value_field.h"
 
 namespace pegasus {
 /**
diff --git a/src/base/value_schema_v1.cpp b/src/base/value_schema_v1.cpp
index 50ac2ba5bd..40d0479027 100644
--- a/src/base/value_schema_v1.cpp
+++ b/src/base/value_schema_v1.cpp
@@ -20,8 +20,8 @@
 #include "value_schema_v1.h"
 
 #include <string_view>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <algorithm>
 #include <array>
 #include <utility>
diff --git a/src/base/value_schema_v1.h b/src/base/value_schema_v1.h
index 88e8a03373..88953581db 100644
--- a/src/base/value_schema_v1.h
+++ b/src/base/value_schema_v1.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <string>
 
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "utils/blob.h"
 #include <string_view>
-#include "value_field.h"
+#include "base/value_field.h"
 
 namespace pegasus {
 /**
diff --git a/src/base/value_schema_v2.cpp b/src/base/value_schema_v2.cpp
index 82f4942a74..7cc00e74a0 100644
--- a/src/base/value_schema_v2.cpp
+++ b/src/base/value_schema_v2.cpp
@@ -20,8 +20,8 @@
 #include "value_schema_v2.h"
 
 #include <string_view>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <algorithm>
 #include <array>
 #include <utility>
diff --git a/src/base/value_schema_v2.h b/src/base/value_schema_v2.h
index 5415c5d648..47c78ca6c4 100644
--- a/src/base/value_schema_v2.h
+++ b/src/base/value_schema_v2.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <string>
 
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "utils/blob.h"
 #include <string_view>
-#include "value_field.h"
+#include "base/value_field.h"
 
 namespace pegasus {
 /**
diff --git a/src/block_service/block_service_manager.h b/src/block_service/block_service_manager.h
index d945f259e3..892613604b 100644
--- a/src/block_service/block_service_manager.h
+++ b/src/block_service/block_service_manager.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp
index 3defe88356..445d1eb91b 100644
--- a/src/block_service/hdfs/hdfs_service.cpp
+++ b/src/block_service/hdfs/hdfs_service.cpp
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <rocksdb/env.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <type_traits>
 #include <unordered_set>
diff --git a/src/block_service/hdfs/hdfs_service.h b/src/block_service/hdfs/hdfs_service.h
index bc3da5b519..a67455a689 100644
--- a/src/block_service/hdfs/hdfs_service.h
+++ b/src/block_service/hdfs/hdfs_service.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #include <hdfs/hdfs.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/src/block_service/local/local_service.h b/src/block_service/local/local_service.h
index 8bc3ffd56c..0bc4c4261c 100644
--- a/src/block_service/local/local_service.h
+++ b/src/block_service/local/local_service.h
@@ -20,7 +20,7 @@
 #include <nlohmann/detail/macro_scope.hpp>
 #include <nlohmann/json.hpp>     // IWYU pragma: keep
 #include <nlohmann/json_fwd.hpp> // IWYU pragma: keep
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/block_service/test/hdfs_service_test.cpp b/src/block_service/test/hdfs_service_test.cpp
index b0880de2a3..4a7b617db9 100644
--- a/src/block_service/test/hdfs_service_test.cpp
+++ b/src/block_service/test/hdfs_service_test.cpp
@@ -19,8 +19,8 @@
 #include <rocksdb/env.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/status.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <cstdint>
 #include <memory>
diff --git a/src/block_service/test/local_service_test.cpp b/src/block_service/test/local_service_test.cpp
index ad19d5a4ac..f607bae865 100644
--- a/src/block_service/test/local_service_test.cpp
+++ b/src/block_service/test/local_service_test.cpp
@@ -24,7 +24,7 @@
 #include <rocksdb/env.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/status.h>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include "block_service/local/local_service.h"
diff --git a/src/client/partition_resolver.h b/src/client/partition_resolver.h
index d4105a26bc..55b216788d 100644
--- a/src/client/partition_resolver.h
+++ b/src/client/partition_resolver.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <functional>
 #include <string>
diff --git a/src/client/partition_resolver_simple.h b/src/client/partition_resolver_simple.h
index 5dc203ae34..28e222a914 100644
--- a/src/client/partition_resolver_simple.h
+++ b/src/client/partition_resolver_simple.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <deque>
 #include <functional>
 #include <memory>
diff --git a/src/client/replication_ddl_client.cpp b/src/client/replication_ddl_client.cpp
index 27bfb2df0a..c39bf40bde 100644
--- a/src/client/replication_ddl_client.cpp
+++ b/src/client/replication_ddl_client.cpp
@@ -27,7 +27,7 @@
 #include "replication_ddl_client.h"
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <cctype>
 #include <cstdint>
diff --git a/src/client/replication_ddl_client.h b/src/client/replication_ddl_client.h
index 274605bb34..1d353996b9 100644
--- a/src/client/replication_ddl_client.h
+++ b/src/client/replication_ddl_client.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <deque>
 #include <map>
diff --git a/src/client/test/ddl_client_test.cpp b/src/client/test/ddl_client_test.cpp
index f44a0382b0..4ba9a7642d 100644
--- a/src/client/test/ddl_client_test.cpp
+++ b/src/client/test/ddl_client_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <deque>
 #include <memory>
 #include <string>
diff --git a/src/client_lib/client_factory.cpp b/src/client_lib/client_factory.cpp
index a1401fa79a..6e7853a926 100644
--- a/src/client_lib/client_factory.cpp
+++ b/src/client_lib/client_factory.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <pegasus/client.h>
+#include "pegasus/client.h"
 #include "pegasus_client_factory_impl.h"
 
 namespace pegasus {
diff --git a/src/client_lib/mutation.cpp b/src/client_lib/mutation.cpp
index 260dfca84d..f0a7b4c18f 100644
--- a/src/client_lib/mutation.cpp
+++ b/src/client_lib/mutation.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <pegasus/client.h>
+#include "pegasus/client.h"
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/client_lib/pegasus_client_factory_impl.cpp b/src/client_lib/pegasus_client_factory_impl.cpp
index b98cb139a1..afbff629f1 100644
--- a/src/client_lib/pegasus_client_factory_impl.cpp
+++ b/src/client_lib/pegasus_client_factory_impl.cpp
@@ -19,7 +19,7 @@
 
 #include "pegasus_client_factory_impl.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <utility>
 
 #include "client_lib/pegasus_client_impl.h"
diff --git a/src/client_lib/pegasus_client_impl.cpp b/src/client_lib/pegasus_client_impl.cpp
index 4ab09425bb..c8ffbbac35 100644
--- a/src/client_lib/pegasus_client_impl.cpp
+++ b/src/client_lib/pegasus_client_impl.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <fmt/core.h>
-#include <pegasus/error.h>
+#include "pegasus/error.h"
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
@@ -31,9 +31,9 @@
 #include "common/replication_other_types.h"
 #include "common/serialization_helper/dsn.layer2_types.h"
 #include "pegasus/client.h"
-#include "pegasus_client_impl.h"
-#include "pegasus_key_schema.h"
-#include "pegasus_utils.h"
+#include "client_lib/pegasus_client_impl.h"
+#include "base/pegasus_key_schema.h"
+#include "base/pegasus_utils.h"
 #include "rrdb/rrdb.client.h"
 #include "runtime/rpc/dns_resolver.h"
 #include "runtime/rpc/group_host_port.h"
diff --git a/src/client_lib/pegasus_client_impl.h b/src/client_lib/pegasus_client_impl.h
index 689fe74925..5bdeb9f0ad 100644
--- a/src/client_lib/pegasus_client_impl.h
+++ b/src/client_lib/pegasus_client_impl.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pegasus/client.h>
-#include <rrdb/rrdb.client.h>
-#include <stdint.h>
+#include "pegasus/client.h"
+#include "rrdb/rrdb.client.h"
+#include <cstdint>
 #include <functional>
 #include <list>
 #include <map>
diff --git a/src/client_lib/pegasus_scanner_impl.cpp b/src/client_lib/pegasus_scanner_impl.cpp
index a6eb731ccc..a96e77d3d0 100644
--- a/src/client_lib/pegasus_scanner_impl.cpp
+++ b/src/client_lib/pegasus_scanner_impl.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <functional>
 #include <list>
@@ -30,8 +30,8 @@
 #include "common/gpid.h"
 #include "pegasus/client.h"
 #include "pegasus/error.h"
-#include "pegasus_client_impl.h"
-#include "pegasus_key_schema.h"
+#include "client_lib/pegasus_client_impl.h"
+#include "base/pegasus_key_schema.h"
 #include "rrdb/rrdb.client.h"
 #include "rrdb/rrdb_types.h"
 #include "runtime/rpc/serialization.h"
diff --git a/src/common/backup_common.h b/src/common/backup_common.h
index 96e11717e8..abc9fb5e20 100644
--- a/src/common/backup_common.h
+++ b/src/common/backup_common.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include "runtime/rpc/rpc_holder.h"
diff --git a/src/common/bulk_load_common.h b/src/common/bulk_load_common.h
index 4a45869722..f2af00aab1 100644
--- a/src/common/bulk_load_common.h
+++ b/src/common/bulk_load_common.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include "runtime/rpc/rpc_holder.h"
diff --git a/src/common/duplication_common.h b/src/common/duplication_common.h
index fe0ec067b4..a07282d34d 100644
--- a/src/common/duplication_common.h
+++ b/src/common/duplication_common.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <set>
 #include <string>
 
diff --git a/src/common/fs_manager.h b/src/common/fs_manager.h
index 0ceecc3e43..870adcdbe6 100644
--- a/src/common/fs_manager.h
+++ b/src/common/fs_manager.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <memory>
diff --git a/src/common/replication_common.cpp b/src/common/replication_common.cpp
index e34bcb5838..01aae88e03 100644
--- a/src/common/replication_common.cpp
+++ b/src/common/replication_common.cpp
@@ -26,7 +26,7 @@
 
 #include "common/replication_common.h"
 
-#include <string.h>
+#include <cstring>
 #include <fstream>
 #include <memory>
 
diff --git a/src/common/replication_common.h b/src/common/replication_common.h
index 9d88b9d96a..3f11228330 100644
--- a/src/common/replication_common.h
+++ b/src/common/replication_common.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/src/common/test/fs_manager_test.cpp b/src/common/test/fs_manager_test.cpp
index 62a435fce1..f810dda6fc 100644
--- a/src/common/test/fs_manager_test.cpp
+++ b/src/common/test/fs_manager_test.cpp
@@ -18,7 +18,7 @@
  */
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/src/common/test/replication_common_test.cpp b/src/common/test/replication_common_test.cpp
index 00699bbd5a..53cfa0d75d 100644
--- a/src/common/test/replication_common_test.cpp
+++ b/src/common/test/replication_common_test.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <fstream>
 #include <string>
 #include <vector>
diff --git a/src/failure_detector/failure_detector.h b/src/failure_detector/failure_detector.h
index 51fa5bf544..f029640291 100644
--- a/src/failure_detector/failure_detector.h
+++ b/src/failure_detector/failure_detector.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/failure_detector/failure_detector_multimaster.cpp b/src/failure_detector/failure_detector_multimaster.cpp
index 03af27402f..67df642662 100644
--- a/src/failure_detector/failure_detector_multimaster.cpp
+++ b/src/failure_detector/failure_detector_multimaster.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <utility>
 
 #include "failure_detector/failure_detector_multimaster.h"
diff --git a/src/failure_detector/test/failure_detector.cpp b/src/failure_detector/test/failure_detector.cpp
index 81e1fdf3cd..08fce2f923 100644
--- a/src/failure_detector/test/failure_detector.cpp
+++ b/src/failure_detector/test/failure_detector.cpp
@@ -25,9 +25,9 @@
  */
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdint>
+#include <cstdlib>
+#include <ctime>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
diff --git a/src/geo/bench/bench.cpp b/src/geo/bench/bench.cpp
index 42814687d3..5432802152 100644
--- a/src/geo/bench/bench.cpp
+++ b/src/geo/bench/bench.cpp
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-#include <pegasus/error.h>
+#include "pegasus/error.h"
 #include <rocksdb/env.h>
 #include <rocksdb/statistics.h>
 #include <s2/s1angle.h>
 #include <s2/s2latlng.h>
 #include <s2/s2latlng_rect.h>
 #include <s2/s2testing.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <iostream>
 #include <list>
diff --git a/src/geo/lib/geo_client.cpp b/src/geo/lib/geo_client.cpp
index 1cbb7b49d6..69abb0416e 100644
--- a/src/geo/lib/geo_client.cpp
+++ b/src/geo/lib/geo_client.cpp
@@ -20,8 +20,8 @@
 #include "geo_client.h"
 
 #include <fmt/core.h>
-#include <math.h>
-#include <pegasus/error.h>
+#include <cmath>
+#include "pegasus/error.h"
 #include <s2/s1angle.h>
 #include <s2/s2cap.h>
 #include <s2/s2cell.h>
@@ -31,7 +31,7 @@
 #include <s2/s2latlng.h>
 #include <s2/s2region_coverer.h>
 #include <s2/util/units/length-units.h>
-#include <stddef.h>
+#include <cstddef>
 #include <atomic>
 #include <cstdint>
 #include <limits>
diff --git a/src/geo/lib/geo_client.h b/src/geo/lib/geo_client.h
index 1d00dc7fe5..a342f7c7d6 100644
--- a/src/geo/lib/geo_client.h
+++ b/src/geo/lib/geo_client.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pegasus/client.h>
+#include "pegasus/client.h"
 #include <functional>
 #include <list>
 #include <memory>
diff --git a/src/geo/lib/latlng_codec.cpp b/src/geo/lib/latlng_codec.cpp
index 8a74618bc6..9c15742fd9 100644
--- a/src/geo/lib/latlng_codec.cpp
+++ b/src/geo/lib/latlng_codec.cpp
@@ -21,7 +21,7 @@
 
 #include <s2/s1angle.h>
 #include <s2/s2latlng.h>
-#include <stddef.h>
+#include <cstddef>
 
 #include "utils/error_code.h"
 #include "utils/errors.h"
diff --git a/src/geo/lib/latlng_codec.h b/src/geo/lib/latlng_codec.h
index 91d986d1f3..908a6d2e03 100644
--- a/src/geo/lib/latlng_codec.h
+++ b/src/geo/lib/latlng_codec.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/geo/test/geo_test.cpp b/src/geo/test/geo_test.cpp
index e66a251d0d..d81b9b5ee7 100644
--- a/src/geo/test/geo_test.cpp
+++ b/src/geo/test/geo_test.cpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include <base/pegasus_key_schema.h>
-#include <math.h>
-#include <pegasus/error.h>
+#include "base/pegasus_key_schema.h"
+#include <cmath>
+#include "pegasus/error.h"
 #include <s2/s1angle.h>
 #include <s2/s2cap.h>
 #include <s2/s2cell.h>
@@ -27,7 +27,7 @@
 #include <s2/s2earth.h>
 #include <s2/s2latlng.h>
 #include <s2/s2testing.h>
-#include <stdint.h>
+#include <cstdint>
 #include <list>
 #include <memory>
 #include <string>
diff --git a/src/gutil/test/map_util_unittest.cpp b/src/gutil/test/map_util_unittest.cpp
index 8f68bf50a2..b473366eec 100644
--- a/src/gutil/test/map_util_unittest.cpp
+++ b/src/gutil/test/map_util_unittest.cpp
@@ -19,7 +19,7 @@
 #include <absl/hash/hash.h>
 #include <string_view>
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <deque>
 #include <list>
diff --git a/src/http/http_client.h b/src/http/http_client.h
index 9624f1e467..d5f58621dc 100644
--- a/src/http/http_client.h
+++ b/src/http/http_client.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #include <curl/curl.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <iosfwd>
 #include <memory>
diff --git a/src/http/http_message_parser.cpp b/src/http/http_message_parser.cpp
index df873eea2e..08a0305fa0 100644
--- a/src/http/http_message_parser.cpp
+++ b/src/http/http_message_parser.cpp
@@ -26,9 +26,9 @@
 
 #include "http_message_parser.h"
 
-#include <stdint.h>
+#include <cstdint>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <string.h>
+#include <cstring>
 #include <utility>
 #include <vector>
 
diff --git a/src/http/http_message_parser.h b/src/http/http_message_parser.h
index 5f19576798..f6c5c9e298 100644
--- a/src/http/http_message_parser.h
+++ b/src/http/http_message_parser.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <nodejs/http_parser.h>
-#include <stddef.h>
+#include <cstddef>
 #include <memory>
 #include <queue>
 #include <string>
diff --git a/src/http/http_server.cpp b/src/http/http_server.cpp
index d5575f580e..754f0edf63 100644
--- a/src/http/http_server.cpp
+++ b/src/http/http_server.cpp
@@ -17,8 +17,8 @@
 
 #include "http/http_server.h"
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <memory>
 #include <ostream>
 #include <vector>
diff --git a/src/http/http_status_code.h b/src/http/http_status_code.h
index 5fa91d3b27..0995961639 100644
--- a/src/http/http_status_code.h
+++ b/src/http/http_status_code.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 
 #include "utils/enum_helper.h"
diff --git a/src/http/pprof_http_service.cpp b/src/http/pprof_http_service.cpp
index d7246ae69d..f718300d32 100644
--- a/src/http/pprof_http_service.cpp
+++ b/src/http/pprof_http_service.cpp
@@ -19,14 +19,14 @@
 
 #include "pprof_http_service.h"
 
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
 #include <gperftools/heap-profiler.h>
 #include <gperftools/malloc_extension.h>
 #include <gperftools/profiler.h>
 #include <pthread.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/http/test/http_client_test.cpp b/src/http/test/http_client_test.cpp
index ece1a13b81..d5e8ba745f 100644
--- a/src/http/test/http_client_test.cpp
+++ b/src/http/test/http_client_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 // IWYU pragma: no_include <gtest/gtest-message.h>
 // IWYU pragma: no_include <gtest/gtest-param-test.h>
 // IWYU pragma: no_include <gtest/gtest-test-part.h>
diff --git a/src/http/test/http_server_test.cpp b/src/http/test/http_server_test.cpp
index dc7f0bce79..79325f88c6 100644
--- a/src/http/test/http_server_test.cpp
+++ b/src/http/test/http_server_test.cpp
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <memory>
 #include <queue>
 #include <string>
diff --git a/src/http/uri_decoder.cpp b/src/http/uri_decoder.cpp
index 63b784caec..3395e25335 100644
--- a/src/http/uri_decoder.cpp
+++ b/src/http/uri_decoder.cpp
@@ -17,7 +17,7 @@
 
 #include "uri_decoder.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "fmt/core.h"
 #include "utils/error_code.h"
diff --git a/src/include/pegasus/client.h b/src/include/pegasus/client.h
index 60e36c55b5..75f97a6515 100644
--- a/src/include/pegasus/client.h
+++ b/src/include/pegasus/client.h
@@ -23,8 +23,8 @@
 #include <vector>
 #include <set>
 #include <map>
-#include <stdint.h>
-#include <pegasus/error.h>
+#include <cstdint>
+#include "pegasus/error.h"
 #include <functional>
 #include <memory>
 
diff --git a/src/meta/app_env_validator.cpp b/src/meta/app_env_validator.cpp
index 06288cb611..a337a5bb5e 100644
--- a/src/meta/app_env_validator.cpp
+++ b/src/meta/app_env_validator.cpp
@@ -21,7 +21,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
-#include <stdint.h>
+#include <cstdint>
 #include <set>
 #include <utility>
 #include <vector>
diff --git a/src/meta/app_env_validator.h b/src/meta/app_env_validator.h
index 7a0ca11751..6523362d50 100644
--- a/src/meta/app_env_validator.h
+++ b/src/meta/app_env_validator.h
@@ -19,7 +19,7 @@
 
 #include <nlohmann/json.hpp> // IWYU pragma: keep
 #include <nlohmann/json_fwd.hpp>
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <string>
diff --git a/src/meta/backup_engine.h b/src/meta/backup_engine.h
index a762f3cc76..901fc49fbb 100644
--- a/src/meta/backup_engine.h
+++ b/src/meta/backup_engine.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <string>
 
diff --git a/src/meta/cluster_balance_policy.cpp b/src/meta/cluster_balance_policy.cpp
index 8415803af9..77b8c5f15b 100644
--- a/src/meta/cluster_balance_policy.cpp
+++ b/src/meta/cluster_balance_policy.cpp
@@ -17,8 +17,8 @@
 
 #include "cluster_balance_policy.h"
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 #include <cstdint>
 #include <functional>
 #include <iterator>
diff --git a/src/meta/distributed_lock_service_simple.h b/src/meta/distributed_lock_service_simple.h
index 0d5d5e46fb..12bf5be1e3 100644
--- a/src/meta/distributed_lock_service_simple.h
+++ b/src/meta/distributed_lock_service_simple.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <list>
 #include <string>
 #include <unordered_map>
diff --git a/src/meta/duplication/meta_duplication_service.h b/src/meta/duplication/meta_duplication_service.h
index 3f06d63265..cbfe53c626 100644
--- a/src/meta/duplication/meta_duplication_service.h
+++ b/src/meta/duplication/meta_duplication_service.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/meta/greedy_load_balancer.cpp b/src/meta/greedy_load_balancer.cpp
index 81d7482bd9..8f7a26f1b9 100644
--- a/src/meta/greedy_load_balancer.cpp
+++ b/src/meta/greedy_load_balancer.cpp
@@ -28,7 +28,7 @@
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <cstdint>
 #include <map>
diff --git a/src/meta/load_balance_policy.cpp b/src/meta/load_balance_policy.cpp
index 1278b35f98..3c95b9bc46 100644
--- a/src/meta/load_balance_policy.cpp
+++ b/src/meta/load_balance_policy.cpp
@@ -20,7 +20,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <limits.h>
+#include <climits>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 #include <algorithm>
diff --git a/src/meta/load_balance_policy.h b/src/meta/load_balance_policy.h
index 486b0d2e69..a3879352ad 100644
--- a/src/meta/load_balance_policy.h
+++ b/src/meta/load_balance_policy.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <list>
 #include <map>
diff --git a/src/meta/meta_data.h b/src/meta/meta_data.h
index dd2533ecfc..60718ce3e4 100644
--- a/src/meta/meta_data.h
+++ b/src/meta/meta_data.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <atomic>
 #include <functional>
diff --git a/src/meta/meta_http_service.h b/src/meta/meta_http_service.h
index e603a4517a..9059019ce9 100644
--- a/src/meta/meta_http_service.h
+++ b/src/meta/meta_http_service.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/src/meta/meta_server_failure_detector.h b/src/meta/meta_server_failure_detector.h
index f656479a1a..b1eed9c21a 100644
--- a/src/meta/meta_server_failure_detector.h
+++ b/src/meta/meta_server_failure_detector.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <string>
diff --git a/src/meta/meta_service.h b/src/meta/meta_service.h
index ad7afc2355..d95d757b3f 100644
--- a/src/meta/meta_service.h
+++ b/src/meta/meta_service.h
@@ -27,8 +27,8 @@
 #pragma once
 
 #include <fmt/core.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <memory>
diff --git a/src/meta/meta_state_service_simple.cpp b/src/meta/meta_state_service_simple.cpp
index 5eaab761d5..2e0442c05a 100644
--- a/src/meta/meta_state_service_simple.cpp
+++ b/src/meta/meta_state_service_simple.cpp
@@ -26,7 +26,7 @@
 
 #include "meta_state_service_simple.h"
 
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <set>
 #include <stack>
diff --git a/src/meta/meta_state_service_simple.h b/src/meta/meta_state_service_simple.h
index f563f6c1bf..89d65113da 100644
--- a/src/meta/meta_state_service_simple.h
+++ b/src/meta/meta_state_service_simple.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <queue>
diff --git a/src/meta/meta_state_service_zookeeper.cpp b/src/meta/meta_state_service_zookeeper.cpp
index e9c659b6a5..8b803eebc8 100644
--- a/src/meta/meta_state_service_zookeeper.cpp
+++ b/src/meta/meta_state_service_zookeeper.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+#include <cstring>
 #include <zookeeper/proto.h>
 #include <zookeeper/zookeeper.h>
 #include <zookeeper/zookeeper.jute.h>
diff --git a/src/meta/meta_state_service_zookeeper.h b/src/meta/meta_state_service_zookeeper.h
index 2fda95bf02..b9bf57cc11 100644
--- a/src/meta/meta_state_service_zookeeper.h
+++ b/src/meta/meta_state_service_zookeeper.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/meta/partition_guardian.cpp b/src/meta/partition_guardian.cpp
index 2cbf49122e..d6babe473a 100644
--- a/src/meta/partition_guardian.cpp
+++ b/src/meta/partition_guardian.cpp
@@ -20,10 +20,10 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <cstdint>
 #include <ostream>
diff --git a/src/meta/partition_guardian.h b/src/meta/partition_guardian.h
index 4fd3f966de..a25ec2cf18 100644
--- a/src/meta/partition_guardian.h
+++ b/src/meta/partition_guardian.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/src/meta/server_state.cpp b/src/meta/server_state.cpp
index 2c5019cb9a..61949aaa9e 100644
--- a/src/meta/server_state.cpp
+++ b/src/meta/server_state.cpp
@@ -29,7 +29,7 @@
 #include <boost/lexical_cast.hpp>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
diff --git a/src/meta/server_state.h b/src/meta/server_state.h
index ccace992ba..0dc9d3fd0a 100644
--- a/src/meta/server_state.h
+++ b/src/meta/server_state.h
@@ -29,7 +29,7 @@
 // IWYU pragma: no_include <boost/detail/basic_pointerbuf.hpp>
 #include <boost/lexical_cast.hpp>
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/src/meta/table_metrics.cpp b/src/meta/table_metrics.cpp
index 2bacf28ac6..f70806fd97 100644
--- a/src/meta/table_metrics.cpp
+++ b/src/meta/table_metrics.cpp
@@ -20,7 +20,7 @@
 #include <string_view>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 
 #include "utils/fmt_logging.h"
diff --git a/src/meta/table_metrics.h b/src/meta/table_metrics.h
index cec35e64b8..a5064a0f96 100644
--- a/src/meta/table_metrics.h
+++ b/src/meta/table_metrics.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <unordered_map>
 #include <utility>
diff --git a/src/meta/test/copy_replica_operation_test.cpp b/src/meta/test/copy_replica_operation_test.cpp
index 2c0045cdf9..2d89c979c9 100644
--- a/src/meta/test/copy_replica_operation_test.cpp
+++ b/src/meta/test/copy_replica_operation_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <iterator>
 #include <map>
 #include <memory>
diff --git a/src/meta/test/dump_file.cpp b/src/meta/test/dump_file.cpp
index b1528c8816..4801c907e9 100644
--- a/src/meta/test/dump_file.cpp
+++ b/src/meta/test/dump_file.cpp
@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/meta/test/ford_fulkerson_test.cpp b/src/meta/test/ford_fulkerson_test.cpp
index f7d97628ff..9a87cd06f8 100644
--- a/src/meta/test/ford_fulkerson_test.cpp
+++ b/src/meta/test/ford_fulkerson_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/meta/test/json_compacity.cpp b/src/meta/test/json_compacity.cpp
index de01ec52a5..f012e6cd51 100644
--- a/src/meta/test/json_compacity.cpp
+++ b/src/meta/test/json_compacity.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+#include <cstring>
 #include <cstdint>
 #include <iostream>
 #include <map>
diff --git a/src/meta/test/main.cpp b/src/meta/test/main.cpp
index 283282e2de..bb85020fe7 100644
--- a/src/meta/test/main.cpp
+++ b/src/meta/test/main.cpp
@@ -16,9 +16,9 @@
 // under the License.
 
 #include <gtest/gtest.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdint>
+#include <cstdlib>
+#include <ctime>
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/src/meta/test/meta_app_operation_test.cpp b/src/meta/test/meta_app_operation_test.cpp
index 11d458e059..bb43662da9 100644
--- a/src/meta/test/meta_app_operation_test.cpp
+++ b/src/meta/test/meta_app_operation_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <iostream>
 #include <map>
diff --git a/src/meta/test/meta_bulk_load_service_test.cpp b/src/meta/test/meta_bulk_load_service_test.cpp
index 53f67a5bf6..d860b19b9e 100644
--- a/src/meta/test/meta_bulk_load_service_test.cpp
+++ b/src/meta/test/meta_bulk_load_service_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <boost/lexical_cast.hpp>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
diff --git a/src/meta/test/meta_mauanl_compaction_test.cpp b/src/meta/test/meta_mauanl_compaction_test.cpp
index 02c7c82b1e..5c8e0f4619 100644
--- a/src/meta/test/meta_mauanl_compaction_test.cpp
+++ b/src/meta/test/meta_mauanl_compaction_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/meta/test/meta_split_service_test.cpp b/src/meta/test/meta_split_service_test.cpp
index 5eb3940a7b..5e7e697ade 100644
--- a/src/meta/test/meta_split_service_test.cpp
+++ b/src/meta/test/meta_split_service_test.cpp
@@ -26,7 +26,7 @@
 
 #include <boost/cstdint.hpp>
 #include <boost/lexical_cast.hpp>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
diff --git a/src/meta/test/meta_test_base.h b/src/meta/test/meta_test_base.h
index 2f27e883a4..821d2956bc 100644
--- a/src/meta/test/meta_test_base.h
+++ b/src/meta/test/meta_test_base.h
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <gtest/gtest.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/meta/test/misc/misc.cpp b/src/meta/test/misc/misc.cpp
index d4bfa25a0f..1bed7a28a7 100644
--- a/src/meta/test/misc/misc.cpp
+++ b/src/meta/test/misc/misc.cpp
@@ -29,7 +29,7 @@
 #include <boost/lexical_cast.hpp>
 #include <fmt/core.h>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdio.h>
+#include <cstdio>
 #include <atomic>
 #include <chrono>
 #include <cstdint>
diff --git a/src/meta/test/misc/misc.h b/src/meta/test/misc/misc.h
index 41a583df43..d9b73c4d92 100644
--- a/src/meta/test/misc/misc.h
+++ b/src/meta/test/misc/misc.h
@@ -27,8 +27,8 @@
 #pragma once
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <algorithm>
 #include <functional>
 #include <map>
diff --git a/src/meta/test/server_state_restore_test.cpp b/src/meta/test/server_state_restore_test.cpp
index 6c997b69d0..325c2542fc 100644
--- a/src/meta/test/server_state_restore_test.cpp
+++ b/src/meta/test/server_state_restore_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <map>
 #include <memory>
diff --git a/src/nfs/nfs_client_impl.h b/src/nfs/nfs_client_impl.h
index 183ac38a97..bdc9ac0010 100644
--- a/src/nfs/nfs_client_impl.h
+++ b/src/nfs/nfs_client_impl.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <chrono>
 #include <deque>
diff --git a/src/nfs/nfs_server_impl.h b/src/nfs/nfs_server_impl.h
index f76126cee0..187e35b4d2 100644
--- a/src/nfs/nfs_server_impl.h
+++ b/src/nfs/nfs_server_impl.h
@@ -25,8 +25,8 @@
  */
 
 #pragma once
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/nfs/test/main.cpp b/src/nfs/test/main.cpp
index acabe19a4a..e0290ad9a3 100644
--- a/src/nfs/test/main.cpp
+++ b/src/nfs/test/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <rocksdb/status.h>
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm>
 #include <cstdint>
 #include <memory>
diff --git a/src/perf_counter/perf_counter.h b/src/perf_counter/perf_counter.h
index 3118b8aacf..ff17576169 100644
--- a/src/perf_counter/perf_counter.h
+++ b/src/perf_counter/perf_counter.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/src/perf_counter/perf_counter_atomic.cpp b/src/perf_counter/perf_counter_atomic.cpp
index a27b5ee957..ff53808092 100644
--- a/src/perf_counter/perf_counter_atomic.cpp
+++ b/src/perf_counter/perf_counter_atomic.cpp
@@ -18,7 +18,7 @@
 #include "perf_counter/perf_counter_atomic.h"
 
 #include <boost/asio/basic_deadline_timer.hpp>
-#include <stdlib.h>
+#include <cstdlib>
 #include <functional>
 #include <new>
 
diff --git a/src/perf_counter/perf_counters.h b/src/perf_counter/perf_counters.h
index 90a6c1921a..8ca4e13540 100644
--- a/src/perf_counter/perf_counters.h
+++ b/src/perf_counter/perf_counters.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/src/perf_counter/test/perf_counter_test.cpp b/src/perf_counter/test/perf_counter_test.cpp
index 2c8ba2a123..8b75149bad 100644
--- a/src/perf_counter/test/perf_counter_test.cpp
+++ b/src/perf_counter/test/perf_counter_test.cpp
@@ -25,7 +25,7 @@
  */
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <chrono>
 #include <functional>
diff --git a/src/perf_counter/test/perf_counters_test.cpp b/src/perf_counter/test/perf_counters_test.cpp
index d2016c0998..693f71a4de 100644
--- a/src/perf_counter/test/perf_counters_test.cpp
+++ b/src/perf_counter/test/perf_counters_test.cpp
@@ -26,7 +26,7 @@
 
 #include "perf_counter/perf_counters.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 
 #include "common/json_helper.h"
diff --git a/src/ranger/ranger_resource_policy_manager.cpp b/src/ranger/ranger_resource_policy_manager.cpp
index ed373d86fa..78ecb6dfc3 100644
--- a/src/ranger/ranger_resource_policy_manager.cpp
+++ b/src/ranger/ranger_resource_policy_manager.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <ctype.h>
+#include <cctype>
 #include <algorithm>
 #include <chrono>
 #include <iosfwd>
diff --git a/src/redis_protocol/proxy/main.cpp b/src/redis_protocol/proxy/main.cpp
index 0d3c0b9bc5..2902c31bd4 100644
--- a/src/redis_protocol/proxy/main.cpp
+++ b/src/redis_protocol/proxy/main.cpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include <pegasus/version.h>
-#include <signal.h>
-#include <stdio.h>
+#include "pegasus/version.h"
+#include <csignal>
+#include <cstdio>
 #include <unistd.h>
 #include <memory>
 #include <string>
diff --git a/src/redis_protocol/proxy_lib/redis_parser.cpp b/src/redis_protocol/proxy_lib/redis_parser.cpp
index 99683d902c..44432ce2f1 100644
--- a/src/redis_protocol/proxy_lib/redis_parser.cpp
+++ b/src/redis_protocol/proxy_lib/redis_parser.cpp
@@ -19,15 +19,15 @@
 
 #include "redis_parser.h"
 
-#include <ctype.h>
+#include <cctype>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
-#include <pegasus/error.h>
-#include <pegasus_key_schema.h>
-#include <pegasus_utils.h>
+#include "pegasus/error.h"
+#include "base/pegasus_key_schema.h"
+#include "base/pegasus_utils.h"
 #include <rocksdb/status.h>
-#include <rrdb/rrdb.client.h>
-#include <string.h>
+#include "rrdb/rrdb.client.h"
+#include <cstring>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
diff --git a/src/redis_protocol/proxy_lib/redis_parser.h b/src/redis_protocol/proxy_lib/redis_parser.h
index 1e7b40e8c3..31b2f22ed1 100644
--- a/src/redis_protocol/proxy_lib/redis_parser.h
+++ b/src/redis_protocol/proxy_lib/redis_parser.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <deque>
 #include <list>
diff --git a/src/redis_protocol/proxy_ut/redis_proxy_test.cpp b/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
index 5d88285c10..3f3e0e25e7 100644
--- a/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
+++ b/src/redis_protocol/proxy_ut/redis_proxy_test.cpp
@@ -32,7 +32,7 @@
 // IWYU pragma: no_include <boost/asio/socket_base.hpp>
 #include <boost/system/error_code.hpp>
 #include <gtest/gtest_prod.h>
-#include <string.h>
+#include <cstring>
 #include <chrono>
 #include <memory>
 #include <set>
diff --git a/src/replica/backup/cold_backup_context.h b/src/replica/backup/cold_backup_context.h
index 0d2f07ffc7..a5bb860997 100644
--- a/src/replica/backup/cold_backup_context.h
+++ b/src/replica/backup/cold_backup_context.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
-#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
 #include <atomic>
 #include <functional>
 #include <map>
diff --git a/src/replica/backup/replica_backup_manager.cpp b/src/replica/backup/replica_backup_manager.cpp
index e94cc3aea0..8c4473976e 100644
--- a/src/replica/backup/replica_backup_manager.cpp
+++ b/src/replica/backup/replica_backup_manager.cpp
@@ -18,7 +18,7 @@
 #include "replica_backup_manager.h"
 
 #include <string_view>
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <chrono>
 #include <map>
diff --git a/src/replica/bulk_load/replica_bulk_loader.h b/src/replica/bulk_load/replica_bulk_loader.h
index 92f76810cd..74c6d12ac6 100644
--- a/src/replica/bulk_load/replica_bulk_loader.h
+++ b/src/replica/bulk_load/replica_bulk_loader.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <ostream>
diff --git a/src/replica/disk_cleaner.cpp b/src/replica/disk_cleaner.cpp
index 8a191d67fc..cdc0a5440d 100644
--- a/src/replica/disk_cleaner.cpp
+++ b/src/replica/disk_cleaner.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <sys/types.h>
 #include <algorithm>
 #include <atomic>
diff --git a/src/replica/duplication/duplication_pipeline.cpp b/src/replica/duplication/duplication_pipeline.cpp
index 81c1647632..215d8adaa2 100644
--- a/src/replica/duplication/duplication_pipeline.cpp
+++ b/src/replica/duplication/duplication_pipeline.cpp
@@ -18,7 +18,7 @@
 #include "duplication_pipeline.h"
 
 #include <string_view>
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm>
 #include <functional>
 #include <string>
diff --git a/src/replica/duplication/load_from_private_log.h b/src/replica/duplication/load_from_private_log.h
index bf288ec545..3667b02f39 100644
--- a/src/replica/duplication/load_from_private_log.h
+++ b/src/replica/duplication/load_from_private_log.h
@@ -18,8 +18,8 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <chrono>
 
 #include "common/replication_other_types.h"
diff --git a/src/replica/duplication/mutation_batch.h b/src/replica/duplication/mutation_batch.h
index 0cca5169e9..6cc3dea0bb 100644
--- a/src/replica/duplication/mutation_batch.h
+++ b/src/replica/duplication/mutation_batch.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
 #include "common/replication_other_types.h"
diff --git a/src/replica/duplication/replica_duplicator.h b/src/replica/duplication/replica_duplicator.h
index 9a8deed0d9..e69c5d5fcd 100644
--- a/src/replica/duplication/replica_duplicator.h
+++ b/src/replica/duplication/replica_duplicator.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <memory>
 #include <string>
diff --git a/src/replica/duplication/replica_duplicator_manager.h b/src/replica/duplication/replica_duplicator_manager.h
index f8f95d3822..9a00cee8e6 100644
--- a/src/replica/duplication/replica_duplicator_manager.h
+++ b/src/replica/duplication/replica_duplicator_manager.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <string>
 #include <utility>
diff --git a/src/replica/duplication/replica_follower.cpp b/src/replica/duplication/replica_follower.cpp
index 3373d9a86c..ff23aa9f06 100644
--- a/src/replica/duplication/replica_follower.cpp
+++ b/src/replica/duplication/replica_follower.cpp
@@ -19,7 +19,7 @@
 
 #include "replica_follower.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
diff --git a/src/replica/duplication/test/load_from_private_log_test.cpp b/src/replica/duplication/test/load_from_private_log_test.cpp
index 0d7141745d..a6031e2883 100644
--- a/src/replica/duplication/test/load_from_private_log_test.cpp
+++ b/src/replica/duplication/test/load_from_private_log_test.cpp
@@ -18,7 +18,7 @@
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
 #include <rocksdb/status.h>
-#include <stdint.h>
+#include <cstdint>
 #include <sys/types.h>
 
 #include "aio/aio_task.h"
diff --git a/src/replica/log_block.h b/src/replica/log_block.h
index 4e63360141..350471e9fd 100644
--- a/src/replica/log_block.h
+++ b/src/replica/log_block.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <algorithm>
 #include <utility>
 #include <vector>
diff --git a/src/replica/log_file.cpp b/src/replica/log_file.cpp
index ab88a3e2e6..1fcbd9e1d7 100644
--- a/src/replica/log_file.cpp
+++ b/src/replica/log_file.cpp
@@ -26,10 +26,10 @@
 
 #include "log_file.h"
 
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <utility>
 #include <vector>
 
diff --git a/src/replica/log_file.h b/src/replica/log_file.h
index fcaff2187a..e2d5cc1feb 100644
--- a/src/replica/log_file.h
+++ b/src/replica/log_file.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <memory>
 #include <string>
diff --git a/src/replica/mutation.cpp b/src/replica/mutation.cpp
index de754cb9cf..d14c626cd7 100644
--- a/src/replica/mutation.cpp
+++ b/src/replica/mutation.cpp
@@ -26,8 +26,8 @@
 
 #include "mutation.h"
 
-#include <inttypes.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstring>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/src/replica/mutation.h b/src/replica/mutation.h
index cd99d957c4..2ef6bea943 100644
--- a/src/replica/mutation.h
+++ b/src/replica/mutation.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <functional>
 #include <memory>
diff --git a/src/replica/mutation_log.h b/src/replica/mutation_log.h
index 8de9e23bf6..ab9bd7c019 100644
--- a/src/replica/mutation_log.h
+++ b/src/replica/mutation_log.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <algorithm>
 #include <atomic>
 #include <functional>
diff --git a/src/replica/mutation_log_replay.cpp b/src/replica/mutation_log_replay.cpp
index ee891bcb73..f07eeec9b0 100644
--- a/src/replica/mutation_log_replay.cpp
+++ b/src/replica/mutation_log_replay.cpp
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <iterator>
 #include <map>
diff --git a/src/replica/replica.h b/src/replica/replica.h
index 4bb2ca5892..d467fd97ca 100644
--- a/src/replica/replica.h
+++ b/src/replica/replica.h
@@ -27,8 +27,8 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <functional>
 #include <map>
diff --git a/src/replica/replica_2pc.cpp b/src/replica/replica_2pc.cpp
index 8f48438d1a..dcabb59fd4 100644
--- a/src/replica/replica_2pc.cpp
+++ b/src/replica/replica_2pc.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <fmt/core.h>
-#include <inttypes.h>
-#include <stddef.h>
+#include <cinttypes>
+#include <cstddef>
 #include <atomic>
 #include <chrono>
 #include <functional>
diff --git a/src/replica/replica_backup.cpp b/src/replica/replica_backup.cpp
index 79ec2cd0a0..53061b84e9 100644
--- a/src/replica/replica_backup.cpp
+++ b/src/replica/replica_backup.cpp
@@ -19,8 +19,8 @@
 // IWYU pragma: no_include <boost/detail/basic_pointerbuf.hpp>
 #include <boost/lexical_cast.hpp>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <inttypes.h>
-#include <stdio.h>
+#include <cinttypes>
+#include <cstdio>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
diff --git a/src/replica/replica_chkpt.cpp b/src/replica/replica_chkpt.cpp
index 368d1a4ab0..d0fbb75611 100644
--- a/src/replica/replica_chkpt.cpp
+++ b/src/replica/replica_chkpt.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <chrono>
 #include <functional>
diff --git a/src/replica/replica_config.cpp b/src/replica/replica_config.cpp
index 3bcd5faaff..f25d39a499 100644
--- a/src/replica/replica_config.cpp
+++ b/src/replica/replica_config.cpp
@@ -27,7 +27,7 @@
 // IWYU pragma: no_include <boost/detail/basic_pointerbuf.hpp>
 #include <boost/lexical_cast.hpp>
 #include <fmt/format.h>
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
diff --git a/src/replica/replica_context.h b/src/replica/replica_context.h
index 8fba146646..137ebedf1f 100644
--- a/src/replica/replica_context.h
+++ b/src/replica/replica_context.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/src/replica/replica_http_service.cpp b/src/replica/replica_http_service.cpp
index 429ab233c7..ccddc360a0 100644
--- a/src/replica/replica_http_service.cpp
+++ b/src/replica/replica_http_service.cpp
@@ -20,7 +20,7 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <unordered_map>
diff --git a/src/replica/replica_init.cpp b/src/replica/replica_init.cpp
index 664587f636..cecc4cbcf9 100644
--- a/src/replica/replica_init.cpp
+++ b/src/replica/replica_init.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <chrono>
 #include <map>
 #include <memory>
diff --git a/src/replica/replica_learn.cpp b/src/replica/replica_learn.cpp
index b1c30692e5..6271da5410 100644
--- a/src/replica/replica_learn.cpp
+++ b/src/replica/replica_learn.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <fmt/std.h> // IWYU pragma: keep
-#include <inttypes.h>
-#include <stdio.h>
+#include <cinttypes>
+#include <cstdio>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
diff --git a/src/replica/replica_restore.cpp b/src/replica/replica_restore.cpp
index a5c5d39ad4..277767d1f3 100644
--- a/src/replica/replica_restore.cpp
+++ b/src/replica/replica_restore.cpp
@@ -17,7 +17,7 @@
 
 #include <boost/cstdint.hpp>
 #include <boost/lexical_cast.hpp>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <fstream>
 #include <map>
diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp
index ebab553809..b2fc1047dc 100644
--- a/src/replica/replica_stub.cpp
+++ b/src/replica/replica_stub.cpp
@@ -30,8 +30,8 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <rapidjson/ostreamwrapper.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
diff --git a/src/replica/replica_stub.h b/src/replica/replica_stub.h
index 116ab350fc..e5cc209476 100644
--- a/src/replica/replica_stub.h
+++ b/src/replica/replica_stub.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <functional>
 #include <map>
diff --git a/src/replica/replica_throttle.cpp b/src/replica/replica_throttle.cpp
index 8092206f4b..99be2c2e89 100644
--- a/src/replica/replica_throttle.cpp
+++ b/src/replica/replica_throttle.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <map>
 #include <string>
diff --git a/src/replica/split/replica_split_manager.h b/src/replica/split/replica_split_manager.h
index 09c04c3a37..35cfec2167 100644
--- a/src/replica/split/replica_split_manager.h
+++ b/src/replica/split/replica_split_manager.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <memory>
 #include <string>
diff --git a/src/replica/split/test/replica_split_test.cpp b/src/replica/split/test/replica_split_test.cpp
index d7d7cdec1c..886b97a2f8 100644
--- a/src/replica/split/test/replica_split_test.cpp
+++ b/src/replica/split/test/replica_split_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <memory>
 #include <string>
diff --git a/src/replica/storage/simple_kv/simple_kv.server.impl.cpp b/src/replica/storage/simple_kv/simple_kv.server.impl.cpp
index 473d322818..6c1ae62bec 100644
--- a/src/replica/storage/simple_kv/simple_kv.server.impl.cpp
+++ b/src/replica/storage/simple_kv/simple_kv.server.impl.cpp
@@ -27,11 +27,11 @@
 #include "simple_kv.server.impl.h"
 
 #include <fmt/core.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <rocksdb/slice.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <atomic>
 #include <memory>
 #include <utility>
diff --git a/src/replica/storage/simple_kv/simple_kv.server.impl.h b/src/replica/storage/simple_kv/simple_kv.server.impl.h
index d27608df19..7d0e8baa03 100644
--- a/src/replica/storage/simple_kv/simple_kv.server.impl.h
+++ b/src/replica/storage/simple_kv/simple_kv.server.impl.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <string>
 
diff --git a/src/replica/storage/simple_kv/test/case.cpp b/src/replica/storage/simple_kv/test/case.cpp
index d94eafaa56..bf83a2ac32 100644
--- a/src/replica/storage/simple_kv/test/case.cpp
+++ b/src/replica/storage/simple_kv/test/case.cpp
@@ -34,7 +34,7 @@
 #include <boost/lexical_cast.hpp>
 #include <fmt/core.h>
 #include <fmt/printf.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <algorithm>
 #include <cstdio>
 #include <iostream>
diff --git a/src/replica/storage/simple_kv/test/case.h b/src/replica/storage/simple_kv/test/case.h
index 1cd5fe0547..9cf2547f61 100644
--- a/src/replica/storage/simple_kv/test/case.h
+++ b/src/replica/storage/simple_kv/test/case.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/src/replica/storage/simple_kv/test/client.cpp b/src/replica/storage/simple_kv/test/client.cpp
index ff1587bda5..0361646ccb 100644
--- a/src/replica/storage/simple_kv/test/client.cpp
+++ b/src/replica/storage/simple_kv/test/client.cpp
@@ -26,7 +26,7 @@
 
 #include "client.h"
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <functional>
 #include <utility>
diff --git a/src/replica/storage/simple_kv/test/common.cpp b/src/replica/storage/simple_kv/test/common.cpp
index 61dd9a5131..4e0c58553f 100644
--- a/src/replica/storage/simple_kv/test/common.cpp
+++ b/src/replica/storage/simple_kv/test/common.cpp
@@ -29,7 +29,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/lexical_cast.hpp>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stddef.h>
+#include <cstddef>
 #include <sstream>
 
 #include "checker.h"
diff --git a/src/replica/storage/simple_kv/test/common.h b/src/replica/storage/simple_kv/test/common.h
index 633a8b7e33..7a064997f1 100644
--- a/src/replica/storage/simple_kv/test/common.h
+++ b/src/replica/storage/simple_kv/test/common.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <iosfwd>
 #include <map>
diff --git a/src/replica/storage/simple_kv/test/injector.cpp b/src/replica/storage/simple_kv/test/injector.cpp
index 9dd9d3a4bf..38ebd9dbae 100644
--- a/src/replica/storage/simple_kv/test/injector.cpp
+++ b/src/replica/storage/simple_kv/test/injector.cpp
@@ -26,7 +26,7 @@
 
 #include "injector.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "case.h"
 #include "checker.h"
diff --git a/src/replica/storage/simple_kv/test/simple_kv.server.impl.cpp b/src/replica/storage/simple_kv/test/simple_kv.server.impl.cpp
index 56fc195bf9..6cfc83f99b 100644
--- a/src/replica/storage/simple_kv/test/simple_kv.server.impl.cpp
+++ b/src/replica/storage/simple_kv/test/simple_kv.server.impl.cpp
@@ -27,10 +27,10 @@
 #include "simple_kv.server.impl.h"
 
 #include <fmt/core.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/src/replica/storage/simple_kv/test/simple_kv.server.impl.h b/src/replica/storage/simple_kv/test/simple_kv.server.impl.h
index a66c30583e..fa92813933 100644
--- a/src/replica/storage/simple_kv/test/simple_kv.server.impl.h
+++ b/src/replica/storage/simple_kv/test/simple_kv.server.impl.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <string>
 
diff --git a/src/replica/test/log_block_test.cpp b/src/replica/test/log_block_test.cpp
index e667a59cef..f4bc8a1b78 100644
--- a/src/replica/test/log_block_test.cpp
+++ b/src/replica/test/log_block_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/replica/test/log_file_test.cpp b/src/replica/test/log_file_test.cpp
index 3ac902451a..77c815a822 100644
--- a/src/replica/test/log_file_test.cpp
+++ b/src/replica/test/log_file_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stddef.h>
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/replica/test/mutation_log_learn_test.cpp b/src/replica/test/mutation_log_learn_test.cpp
index a3e67d9f20..9e57d83547 100644
--- a/src/replica/test/mutation_log_learn_test.cpp
+++ b/src/replica/test/mutation_log_learn_test.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <iostream>
 #include <memory>
diff --git a/src/replica/test/open_replica_test.cpp b/src/replica/test/open_replica_test.cpp
index 75094de5e9..9ad85511d1 100644
--- a/src/replica/test/open_replica_test.cpp
+++ b/src/replica/test/open_replica_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/replica/test/replica_test.cpp b/src/replica/test/replica_test.cpp
index a6812ff4ff..442f8fac3a 100644
--- a/src/replica/test/replica_test.cpp
+++ b/src/replica/test/replica_test.cpp
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <functional>
 #include <iostream>
diff --git a/src/runtime/global_config.cpp b/src/runtime/global_config.cpp
index a113969a49..874ccf65cd 100644
--- a/src/runtime/global_config.cpp
+++ b/src/runtime/global_config.cpp
@@ -25,8 +25,8 @@
  */
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <algorithm>
 #include <memory>
 #include <utility>
diff --git a/src/runtime/message_utils.cpp b/src/runtime/message_utils.cpp
index 35bd29c778..5020e0766f 100644
--- a/src/runtime/message_utils.cpp
+++ b/src/runtime/message_utils.cpp
@@ -26,7 +26,7 @@
 
 #include "runtime/message_utils.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "runtime/rpc/rpc_message.h"
 
diff --git a/src/runtime/message_utils.h b/src/runtime/message_utils.h
index 954b54cd2f..ec7e8edb1b 100644
--- a/src/runtime/message_utils.h
+++ b/src/runtime/message_utils.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "runtime/rpc/rpc_stream.h"
 #include "runtime/task/task_code.h"
diff --git a/src/runtime/rpc/asio_net_provider.cpp b/src/runtime/rpc/asio_net_provider.cpp
index 8c9457cbb3..90eae81b6f 100644
--- a/src/runtime/rpc/asio_net_provider.cpp
+++ b/src/runtime/rpc/asio_net_provider.cpp
@@ -46,9 +46,9 @@
 #include <boost/asio/ip/udp.hpp>
 #include <boost/asio/socket_base.hpp>
 #include <boost/system/error_code.hpp>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
 #include <cstddef>
 #include <limits>
 #include <memory>
diff --git a/src/runtime/rpc/asio_net_provider.h b/src/runtime/rpc/asio_net_provider.h
index c26ce1b191..5a0da8af7d 100644
--- a/src/runtime/rpc/asio_net_provider.h
+++ b/src/runtime/rpc/asio_net_provider.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <memory>
 #include <thread>
 #include <vector>
diff --git a/src/runtime/rpc/asio_rpc_session.h b/src/runtime/rpc/asio_rpc_session.h
index e3f5da4e21..b31e5bf36e 100644
--- a/src/runtime/rpc/asio_rpc_session.h
+++ b/src/runtime/rpc/asio_rpc_session.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
 #include "boost/asio/ip/tcp.hpp"
diff --git a/src/runtime/rpc/dsn_message_parser.cpp b/src/runtime/rpc/dsn_message_parser.cpp
index 00dc6901eb..a084fa3b1f 100644
--- a/src/runtime/rpc/dsn_message_parser.cpp
+++ b/src/runtime/rpc/dsn_message_parser.cpp
@@ -26,8 +26,8 @@
 
 #include "dsn_message_parser.h"
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/src/runtime/rpc/message_parser.cpp b/src/runtime/rpc/message_parser.cpp
index e523635e99..6a34782e41 100644
--- a/src/runtime/rpc/message_parser.cpp
+++ b/src/runtime/rpc/message_parser.cpp
@@ -24,9 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
 #include <algorithm>
 #include <cstdint>
 #include <string>
diff --git a/src/runtime/rpc/message_parser.h b/src/runtime/rpc/message_parser.h
index 614e50f22d..ccc5cc0de2 100644
--- a/src/runtime/rpc/message_parser.h
+++ b/src/runtime/rpc/message_parser.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <vector>
 
diff --git a/src/runtime/rpc/network.cpp b/src/runtime/rpc/network.cpp
index c572b19a8d..db23b684fe 100644
--- a/src/runtime/rpc/network.cpp
+++ b/src/runtime/rpc/network.cpp
@@ -26,7 +26,7 @@
 
 #include "network.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 #include <chrono>
 #include <list>
diff --git a/src/runtime/rpc/network.sim.cpp b/src/runtime/rpc/network.sim.cpp
index 595f86cb1d..7521bd15f4 100644
--- a/src/runtime/rpc/network.sim.cpp
+++ b/src/runtime/rpc/network.sim.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+#include <cstring>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/src/runtime/rpc/network.sim.h b/src/runtime/rpc/network.sim.h
index f7954afbf1..cdf5a59fbb 100644
--- a/src/runtime/rpc/network.sim.h
+++ b/src/runtime/rpc/network.sim.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "runtime/rpc/message_parser.h"
 #include "runtime/rpc/network.h"
diff --git a/src/runtime/rpc/raw_message_parser.cpp b/src/runtime/rpc/raw_message_parser.cpp
index dbe9f327e8..1153833a1b 100644
--- a/src/runtime/rpc/raw_message_parser.cpp
+++ b/src/runtime/rpc/raw_message_parser.cpp
@@ -26,7 +26,7 @@
 
 #include "raw_message_parser.h"
 
-#include <string.h>
+#include <cstring>
 #include <atomic>
 #include <vector>
 
diff --git a/src/runtime/rpc/rpc_address.cpp b/src/runtime/rpc/rpc_address.cpp
index 064dd458d5..187332805f 100644
--- a/src/runtime/rpc/rpc_address.cpp
+++ b/src/runtime/rpc/rpc_address.cpp
@@ -27,11 +27,11 @@
 #include "runtime/rpc/rpc_address.h"
 
 #include <arpa/inet.h>
-#include <errno.h>
+#include <cerrno>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <string.h>
+#include <cstring>
 #include <sys/socket.h>
 #include <string>
 
diff --git a/src/runtime/rpc/rpc_engine.cpp b/src/runtime/rpc/rpc_engine.cpp
index 24eb71be54..0769387f6e 100644
--- a/src/runtime/rpc/rpc_engine.cpp
+++ b/src/runtime/rpc/rpc_engine.cpp
@@ -27,7 +27,7 @@
 #include "rpc_engine.h"
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <string.h>
+#include <cstring>
 #include <limits>
 #include <list>
 #include <set>
diff --git a/src/runtime/rpc/rpc_holder.h b/src/runtime/rpc/rpc_holder.h
index b1e4af7b84..77a9027bbf 100644
--- a/src/runtime/rpc/rpc_holder.h
+++ b/src/runtime/rpc/rpc_holder.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <chrono>
 #include <memory>
diff --git a/src/runtime/rpc/rpc_host_port.cpp b/src/runtime/rpc/rpc_host_port.cpp
index 42ed764010..a489cd36b9 100644
--- a/src/runtime/rpc/rpc_host_port.cpp
+++ b/src/runtime/rpc/rpc_host_port.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <arpa/inet.h>
-#include <errno.h>
+#include <cerrno>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
diff --git a/src/runtime/rpc/rpc_message.cpp b/src/runtime/rpc/rpc_message.cpp
index 00412db721..a4b95daf60 100644
--- a/src/runtime/rpc/rpc_message.cpp
+++ b/src/runtime/rpc/rpc_message.cpp
@@ -25,7 +25,7 @@
  */
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <list>
 #include <memory>
diff --git a/src/runtime/rpc/rpc_message.h b/src/runtime/rpc/rpc_message.h
index 0645b48cb7..582b1e28f8 100644
--- a/src/runtime/rpc/rpc_message.h
+++ b/src/runtime/rpc/rpc_message.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <atomic>
 #include <vector>
 
diff --git a/src/runtime/rpc/thrift_message_parser.cpp b/src/runtime/rpc/thrift_message_parser.cpp
index d547075025..62237ed8e1 100644
--- a/src/runtime/rpc/thrift_message_parser.cpp
+++ b/src/runtime/rpc/thrift_message_parser.cpp
@@ -26,7 +26,7 @@
 
 #include "thrift_message_parser.h"
 
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/runtime/rpc/thrift_message_parser.h b/src/runtime/rpc/thrift_message_parser.h
index dc76e41dd4..d7599dbb71 100644
--- a/src/runtime/rpc/thrift_message_parser.h
+++ b/src/runtime/rpc/thrift_message_parser.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
 #include "request_meta_types.h"
diff --git a/src/runtime/scheduler.cpp b/src/runtime/scheduler.cpp
index 440e105907..fc78b273c6 100644
--- a/src/runtime/scheduler.cpp
+++ b/src/runtime/scheduler.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm>
 #include <chrono>
 #include <random>
diff --git a/src/runtime/service_api_c.cpp b/src/runtime/service_api_c.cpp
index f4ed022344..7d90470844 100644
--- a/src/runtime/service_api_c.cpp
+++ b/src/runtime/service_api_c.cpp
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <chrono>
 #include <fstream> // IWYU pragma: keep
diff --git a/src/runtime/task/simple_task_queue.cpp b/src/runtime/task/simple_task_queue.cpp
index 879a9700c6..ac44bad1a9 100644
--- a/src/runtime/task/simple_task_queue.cpp
+++ b/src/runtime/task/simple_task_queue.cpp
@@ -27,7 +27,7 @@
 #include "simple_task_queue.h"
 
 #include <boost/asio/io_service.hpp>
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 #include <new>
 
diff --git a/src/runtime/task/task.cpp b/src/runtime/task/task.cpp
index 7d83948f3b..e5226a1ad3 100644
--- a/src/runtime/task/task.cpp
+++ b/src/runtime/task/task.cpp
@@ -26,7 +26,7 @@
 
 #include "task.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "runtime/api_task.h"
 #include "runtime/app_model.h"
diff --git a/src/runtime/task/task.h b/src/runtime/task/task.h
index 68b41bf625..59eb272c18 100644
--- a/src/runtime/task/task.h
+++ b/src/runtime/task/task.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <absl/utility/utility.h>
 #include <atomic>
 #include <chrono>
diff --git a/src/runtime/task/task_code.h b/src/runtime/task/task_code.h
index ae7c258bf2..d785365cd1 100644
--- a/src/runtime/task/task_code.h
+++ b/src/runtime/task/task_code.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <ostream>
 #include <string>
 
diff --git a/src/runtime/task/task_engine.cpp b/src/runtime/task/task_engine.cpp
index 138afedac7..cdf5ba5102 100644
--- a/src/runtime/task/task_engine.cpp
+++ b/src/runtime/task/task_engine.cpp
@@ -27,7 +27,7 @@
 #include "runtime/task/task_engine.h"
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <limits.h>
+#include <climits>
 #include <mutex>
 
 #include "fmt/core.h"
diff --git a/src/runtime/task/task_engine.sim.h b/src/runtime/task/task_engine.sim.h
index e2abe08f74..b1ec4c1028 100644
--- a/src/runtime/task/task_engine.sim.h
+++ b/src/runtime/task/task_engine.sim.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <list>
 #include <map>
 
diff --git a/src/runtime/task/task_spec.cpp b/src/runtime/task/task_spec.cpp
index 096b0bd1b0..4234b10b90 100644
--- a/src/runtime/task/task_spec.cpp
+++ b/src/runtime/task/task_spec.cpp
@@ -26,7 +26,7 @@
 
 #include "task_spec.h"
 
-#include <string.h>
+#include <cstring>
 #include <array>
 #include <memory>
 #include <thread>
diff --git a/src/runtime/task/task_spec.h b/src/runtime/task/task_spec.h
index 058beedced..661e5dc191 100644
--- a/src/runtime/task/task_spec.h
+++ b/src/runtime/task/task_spec.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <set>
 #include <string>
 #include <vector>
diff --git a/src/runtime/task/task_worker.cpp b/src/runtime/task/task_worker.cpp
index 5b5cf2063c..ed1f0e13c2 100644
--- a/src/runtime/task/task_worker.cpp
+++ b/src/runtime/task/task_worker.cpp
@@ -28,10 +28,10 @@
 #include <sys/prctl.h>
 #endif // defined(__linux__)
 
-#include <errno.h>
+#include <cerrno>
 #include <pthread.h>
 #include <sched.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <algorithm>
 #include <chrono>
diff --git a/src/runtime/task/task_worker.h b/src/runtime/task/task_worker.h
index bf62852491..93f2acdead 100644
--- a/src/runtime/task/task_worker.h
+++ b/src/runtime/task/task_worker.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <thread>
diff --git a/src/runtime/test/address_test.cpp b/src/runtime/test/address_test.cpp
index 01edb34a07..c8799fb71b 100644
--- a/src/runtime/test/address_test.cpp
+++ b/src/runtime/test/address_test.cpp
@@ -27,8 +27,8 @@
 #include <fmt/core.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <sys/socket.h>
 #include <set>
 #include <string>
diff --git a/src/runtime/test/message_reader_test.cpp b/src/runtime/test/message_reader_test.cpp
index 515dcf8370..7f3c5fca2c 100644
--- a/src/runtime/test/message_reader_test.cpp
+++ b/src/runtime/test/message_reader_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 #include "gtest/gtest.h"
diff --git a/src/runtime/test/netprovider.cpp b/src/runtime/test/netprovider.cpp
index 4de70ed00e..f274f3493b 100644
--- a/src/runtime/test/netprovider.cpp
+++ b/src/runtime/test/netprovider.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+#include <cstring>
 #include <chrono>
 #include <functional>
 #include <memory>
diff --git a/src/runtime/test/rpc.cpp b/src/runtime/test/rpc.cpp
index 3682ca5789..d1dc3288c4 100644
--- a/src/runtime/test/rpc.cpp
+++ b/src/runtime/test/rpc.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <chrono>
 #include <functional>
diff --git a/src/runtime/test/rpc_message.cpp b/src/runtime/test/rpc_message.cpp
index 3c87913938..dbd687f054 100644
--- a/src/runtime/test/rpc_message.cpp
+++ b/src/runtime/test/rpc_message.cpp
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/runtime/test/service_api_c.cpp b/src/runtime/test/service_api_c.cpp
index c9eb97f39e..d407cc5396 100644
--- a/src/runtime/test/service_api_c.cpp
+++ b/src/runtime/test/service_api_c.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <map>
 #include <string>
diff --git a/src/runtime/test/task_engine.cpp b/src/runtime/test/task_engine.cpp
index be02295b95..f327acb1fd 100644
--- a/src/runtime/test/task_engine.cpp
+++ b/src/runtime/test/task_engine.cpp
@@ -29,7 +29,7 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <stdio.h>
+#include <cstdio>
 
 #include "gtest/gtest.h"
 #include "runtime/global_config.h"
diff --git a/src/runtime/test/thrift_message_parser_test.cpp b/src/runtime/test/thrift_message_parser_test.cpp
index 722b2860b6..e91338304a 100644
--- a/src/runtime/test/thrift_message_parser_test.cpp
+++ b/src/runtime/test/thrift_message_parser_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <boost/smart_ptr/shared_ptr.hpp>
-#include <string.h>
+#include <cstring>
 #include <thrift/protocol/TBinaryProtocol.h>
 #include <thrift/protocol/TBinaryProtocol.tcc>
 #include <thrift/protocol/TProtocol.h>
diff --git a/src/runtime/tool_api.h b/src/runtime/tool_api.h
index c9e145a435..bfce666e87 100644
--- a/src/runtime/tool_api.h
+++ b/src/runtime/tool_api.h
@@ -38,7 +38,7 @@ Component providers define the interface for the local components (e.g., network
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <vector>
 
diff --git a/src/runtime/tracer.cpp b/src/runtime/tracer.cpp
index e85d88ed5f..044ecca040 100644
--- a/src/runtime/tracer.cpp
+++ b/src/runtime/tracer.cpp
@@ -27,8 +27,8 @@
 #include "runtime/tracer.h"
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <inttypes.h>
-#include <stdio.h>
+#include <cinttypes>
+#include <cstdio>
 #include <mutex>
 #include <string>
 #include <vector>
diff --git a/src/sample/main.cpp b/src/sample/main.cpp
index 61eaab8bcd..4b64132a8f 100644
--- a/src/sample/main.cpp
+++ b/src/sample/main.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <assert.h>
+#include <cassert>
 #include <cstdio>
 #include <string>
 
diff --git a/src/security/init.cpp b/src/security/init.cpp
index 06f716505f..844b4d9ed8 100644
--- a/src/security/init.cpp
+++ b/src/security/init.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "kinit_context.h"
 #include "negotiation_manager.h"
diff --git a/src/security/kinit_context.cpp b/src/security/kinit_context.cpp
index 2347e7abb5..830ed63786 100644
--- a/src/security/kinit_context.cpp
+++ b/src/security/kinit_context.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/asio/deadline_timer.hpp>
 #include <krb5/krb5.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <new>
diff --git a/src/server/available_detector.cpp b/src/server/available_detector.cpp
index 1052b0ff7a..a03058f9ab 100644
--- a/src/server/available_detector.cpp
+++ b/src/server/available_detector.cpp
@@ -22,8 +22,8 @@
 #include <fmt/core.h>
 #include <fmt/std.h> // IWYU pragma: keep
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <pegasus/error.h>
-#include <stdlib.h>
+#include "pegasus/error.h"
+#include <cstdlib>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
diff --git a/src/server/available_detector.h b/src/server/available_detector.h
index 5de60d150e..f4ce184a0a 100644
--- a/src/server/available_detector.h
+++ b/src/server/available_detector.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <memory>
 #include <string>
diff --git a/src/server/capacity_unit_calculator.h b/src/server/capacity_unit_calculator.h
index d69e3394b5..c83c896efc 100644
--- a/src/server/capacity_unit_calculator.h
+++ b/src/server/capacity_unit_calculator.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/src/server/collector/main.cpp b/src/server/collector/main.cpp
index 718937ba24..2f002d4dda 100644
--- a/src/server/collector/main.cpp
+++ b/src/server/collector/main.cpp
@@ -20,8 +20,8 @@
 #include <unistd.h>
 #include <memory>
 
-#include "info_collector_app.h"
-#include "pegasus_service_app.h"
+#include "server/info_collector_app.h"
+#include "server/pegasus_service_app.h"
 #include "runtime/app_model.h"
 #include "runtime/service_app.h"
 #include "server/server_utils.h"
diff --git a/src/server/compaction_filter_rule.h b/src/server/compaction_filter_rule.h
index e471a759fd..54e037abdc 100644
--- a/src/server/compaction_filter_rule.h
+++ b/src/server/compaction_filter_rule.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include <gtest/gtest_prod.h>
diff --git a/src/server/compaction_operation.cpp b/src/server/compaction_operation.cpp
index a7d21bd326..d35261d02b 100644
--- a/src/server/compaction_operation.cpp
+++ b/src/server/compaction_operation.cpp
@@ -22,7 +22,7 @@
 
 #include "base/pegasus_utils.h"
 #include "base/pegasus_value_schema.h"
-#include "compaction_operation.h"
+#include "server/compaction_operation.h"
 #include "server/compaction_filter_rule.h"
 #include "utils/fmt_logging.h"
 
diff --git a/src/server/compaction_operation.h b/src/server/compaction_operation.h
index 1101be1fa6..a34f77de80 100644
--- a/src/server/compaction_operation.h
+++ b/src/server/compaction_operation.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <string_view>
diff --git a/src/server/hashkey_transform.h b/src/server/hashkey_transform.h
index 8fe9a103e8..c9e8131825 100644
--- a/src/server/hashkey_transform.h
+++ b/src/server/hashkey_transform.h
@@ -21,7 +21,7 @@
 
 #include <rocksdb/slice.h>
 #include <rocksdb/slice_transform.h>
-#include <stdint.h>
+#include <cstdint>
 
 #include "utils/endians.h"
 #include "utils/fmt_logging.h"
diff --git a/src/server/hotspot_partition_calculator.h b/src/server/hotspot_partition_calculator.h
index d117bdc717..965a03796b 100644
--- a/src/server/hotspot_partition_calculator.h
+++ b/src/server/hotspot_partition_calculator.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <array>
 #include <list>
 #include <memory>
diff --git a/src/server/info_collector.cpp b/src/server/info_collector.cpp
index c2b1fe0943..ba87730feb 100644
--- a/src/server/info_collector.cpp
+++ b/src/server/info_collector.cpp
@@ -20,7 +20,7 @@
 #include "info_collector.h"
 
 #include <fmt/core.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <chrono>
 #include <utility>
diff --git a/src/server/info_collector.h b/src/server/info_collector.h
index fe168ad7f1..6023d49bd8 100644
--- a/src/server/info_collector.h
+++ b/src/server/info_collector.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 // IWYU pragma: no_include <bits/std_abs.h>
 #include <cmath> // IWYU pragma: keep
 #include <map>
diff --git a/src/server/info_collector_app.cpp b/src/server/info_collector_app.cpp
index bf70b39cd3..ff4146af8d 100644
--- a/src/server/info_collector_app.cpp
+++ b/src/server/info_collector_app.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "info_collector_app.h"
+#include "server/info_collector_app.h"
 
 #include "http/http_server.h"
 #include "runtime/service_app.h"
diff --git a/src/server/key_ttl_compaction_filter.h b/src/server/key_ttl_compaction_filter.h
index 6f4f07f05c..00727f56fe 100644
--- a/src/server/key_ttl_compaction_filter.h
+++ b/src/server/key_ttl_compaction_filter.h
@@ -27,7 +27,7 @@
 #include "base/pegasus_utils.h"
 #include "base/pegasus_key_schema.h"
 #include "base/pegasus_value_schema.h"
-#include "compaction_operation.h"
+#include "server/compaction_operation.h"
 
 namespace pegasus {
 namespace server {
diff --git a/src/server/main.cpp b/src/server/main.cpp
index aa9d1128e0..f8f7491e66 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -21,11 +21,11 @@
 #include <string>
 
 #include "common/replication_common.h"
-#include "compaction_operation.h"
-#include "info_collector_app.h"
+#include "server/compaction_operation.h"
+#include "server/info_collector_app.h"
 #include "meta/meta_service_app.h"
-#include "pegasus_server_impl.h"
-#include "pegasus_service_app.h"
+#include "server/pegasus_server_impl.h"
+#include "server/pegasus_service_app.h"
 #include "runtime/app_model.h"
 #include "runtime/service_app.h"
 #include "server/server_utils.h"
diff --git a/src/server/meta_server/main.cpp b/src/server/meta_server/main.cpp
index 92cfb5f5df..efe1275b8b 100644
--- a/src/server/meta_server/main.cpp
+++ b/src/server/meta_server/main.cpp
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include "meta/meta_service_app.h"
-#include "pegasus_service_app.h"
+#include "server/pegasus_service_app.h"
 #include "runtime/app_model.h"
 #include "runtime/service_app.h"
 #include "server/server_utils.h"
diff --git a/src/server/pegasus_manual_compact_service.cpp b/src/server/pegasus_manual_compact_service.cpp
index e55077e7a4..f995d31088 100644
--- a/src/server/pegasus_manual_compact_service.cpp
+++ b/src/server/pegasus_manual_compact_service.cpp
@@ -20,7 +20,7 @@
 #include "pegasus_manual_compact_service.h"
 
 #include <string_view>
-#include <limits.h>
+#include <climits>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 #include <rocksdb/options.h>
@@ -30,7 +30,7 @@
 
 #include "common/replica_envs.h"
 #include "common/replication.codes.h"
-#include "pegasus_server_impl.h"
+#include "server/pegasus_server_impl.h"
 #include "runtime/api_layer1.h"
 #include "runtime/task/async_calls.h"
 #include "runtime/task/task_code.h"
diff --git a/src/server/pegasus_manual_compact_service.h b/src/server/pegasus_manual_compact_service.h
index 0f3a8163fc..747fb5ee65 100644
--- a/src/server/pegasus_manual_compact_service.h
+++ b/src/server/pegasus_manual_compact_service.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <string>
diff --git a/src/server/pegasus_mutation_duplicator.cpp b/src/server/pegasus_mutation_duplicator.cpp
index 8b82557bb4..d058cf9d25 100644
--- a/src/server/pegasus_mutation_duplicator.cpp
+++ b/src/server/pegasus_mutation_duplicator.cpp
@@ -21,7 +21,7 @@
 
 #include <string_view>
 #include <fmt/core.h>
-#include <pegasus/error.h>
+#include "pegasus/error.h"
 #include <sys/types.h>
 #include <chrono>
 #include <cstdint>
@@ -36,7 +36,7 @@
 #include "common/duplication_common.h"
 #include "duplication_internal_types.h"
 #include "pegasus/client.h"
-#include "pegasus_key_schema.h"
+#include "base/pegasus_key_schema.h"
 #include "rrdb/rrdb.code.definition.h"
 #include "rrdb/rrdb_types.h"
 #include "runtime/message_utils.h"
diff --git a/src/server/pegasus_mutation_duplicator.h b/src/server/pegasus_mutation_duplicator.h
index 0ac19c68df..6411e88547 100644
--- a/src/server/pegasus_mutation_duplicator.h
+++ b/src/server/pegasus_mutation_duplicator.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <deque>
 #include <map>
 #include <string>
diff --git a/src/server/pegasus_server_impl.cpp b/src/server/pegasus_server_impl.cpp
index ffb4b8c1c9..b2e26c13ea 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-#include "pegasus_server_impl.h"
+#include "server/pegasus_server_impl.h"
 
 #include <fmt/core.h>
-#include <inttypes.h>
-#include <limits.h>
+#include <cinttypes>
+#include <climits>
 #include <rocksdb/advanced_cache.h>
 #include <rocksdb/convenience.h>
 #include <rocksdb/db.h>
@@ -31,9 +31,9 @@
 #include <rocksdb/status.h>
 #include <rocksdb/utilities/checkpoint.h>
 #include <rocksdb/utilities/options_util.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 #include <unistd.h> // IWYU pragma: keep
 #include <algorithm>
 #include <cstdint>
diff --git a/src/server/pegasus_server_impl.h b/src/server/pegasus_server_impl.h
index be664105b2..7c09ef7b1c 100644
--- a/src/server/pegasus_server_impl.h
+++ b/src/server/pegasus_server_impl.h
@@ -25,7 +25,7 @@
 #include <rocksdb/slice.h>
 #include <rocksdb/table.h>
 #include <rrdb/rrdb_types.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <chrono>
 #include <deque>
@@ -42,8 +42,8 @@
 #include "pegasus_manual_compact_service.h"
 #include "pegasus_read_service.h"
 #include "pegasus_scan_context.h"
-#include "pegasus_utils.h"
-#include "pegasus_value_schema.h"
+#include "base/pegasus_utils.h"
+#include "base/pegasus_value_schema.h"
 #include "range_read_limiter.h"
 #include "replica/replication_app_base.h"
 #include "runtime/task/task.h"
diff --git a/src/server/pegasus_server_impl_init.cpp b/src/server/pegasus_server_impl_init.cpp
index d679d6ce3d..21dd464cef 100644
--- a/src/server/pegasus_server_impl_init.cpp
+++ b/src/server/pegasus_server_impl_init.cpp
@@ -25,7 +25,7 @@
 #include <rocksdb/statistics.h>
 #include <rocksdb/table.h>
 #include <rocksdb/write_buffer_manager.h>
-#include <stdio.h>
+#include <cstdio>
 #include <cstdint>
 #include <memory>
 #include <mutex>
@@ -41,8 +41,8 @@
 #include "hashkey_transform.h"
 #include "hotkey_collector.h"
 #include "pegasus_event_listener.h"
-#include "pegasus_server_impl.h"
-#include "pegasus_value_schema.h"
+#include "server/pegasus_server_impl.h"
+#include "base/pegasus_value_schema.h"
 #include "replica_admin_types.h"
 #include "runtime/api_layer1.h"
 #include "runtime/rpc/rpc_host_port.h"
diff --git a/src/server/pegasus_server_write.cpp b/src/server/pegasus_server_write.cpp
index 33437ca692..20dd0f6a30 100644
--- a/src/server/pegasus_server_write.cpp
+++ b/src/server/pegasus_server_write.cpp
@@ -29,9 +29,9 @@
 #include "common/replication.codes.h"
 #include "logging_utils.h"
 #include "pegasus_rpc_types.h"
-#include "pegasus_server_impl.h"
+#include "server/pegasus_server_impl.h"
 #include "pegasus_server_write.h"
-#include "pegasus_utils.h"
+#include "base/pegasus_utils.h"
 #include "rrdb/rrdb.code.definition.h"
 #include "runtime/rpc/rpc_holder.h"
 #include "runtime/rpc/rpc_message.h"
diff --git a/src/server/pegasus_server_write.h b/src/server/pegasus_server_write.h
index 2329ec586a..3a96fe6afc 100644
--- a/src/server/pegasus_server_write.h
+++ b/src/server/pegasus_server_write.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/src/server/pegasus_service_app.h b/src/server/pegasus_service_app.h
index 6d5eda6ac0..787a62dd43 100644
--- a/src/server/pegasus_service_app.h
+++ b/src/server/pegasus_service_app.h
@@ -21,8 +21,8 @@
 
 #include "meta/meta_service_app.h"
 #include "replica/replication_service_app.h"
-#include <pegasus/version.h>
-#include <pegasus/git_commit.h>
+#include "pegasus/version.h"
+#include "pegasus/git_commit.h"
 #include "utils/builtin_metrics.h"
 
 namespace pegasus {
diff --git a/src/server/pegasus_write_service.cpp b/src/server/pegasus_write_service.cpp
index 2fb5733265..190ffdc0fa 100644
--- a/src/server/pegasus_write_service.cpp
+++ b/src/server/pegasus_write_service.cpp
@@ -20,7 +20,7 @@
 #include <string_view>
 #include <fmt/core.h>
 #include <rocksdb/status.h>
-#include <stddef.h>
+#include <cstddef>
 #include <functional>
 #include <set>
 #include <vector>
@@ -31,7 +31,7 @@
 #include "common/duplication_common.h"
 #include "common/replication.codes.h"
 #include "duplication_internal_types.h"
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "pegasus_write_service.h"
 #include "pegasus_write_service_impl.h"
 #include "rrdb/rrdb.code.definition.h"
diff --git a/src/server/pegasus_write_service_impl.h b/src/server/pegasus_write_service_impl.h
index 35a9c6399d..3a1beb1788 100644
--- a/src/server/pegasus_write_service_impl.h
+++ b/src/server/pegasus_write_service_impl.h
@@ -25,7 +25,7 @@
 #include "base/meta_store.h"
 #include "base/pegasus_key_schema.h"
 #include "logging_utils.h"
-#include "pegasus_server_impl.h"
+#include "server/pegasus_server_impl.h"
 #include "pegasus_write_service.h"
 #include "rocksdb_wrapper.h"
 #include "utils/defer.h"
diff --git a/src/server/replica_server/main.cpp b/src/server/replica_server/main.cpp
index ad355692e4..8dc42a40cd 100644
--- a/src/server/replica_server/main.cpp
+++ b/src/server/replica_server/main.cpp
@@ -22,9 +22,9 @@
 #include <string>
 
 #include "common/replication_common.h"
-#include "compaction_operation.h"
-#include "pegasus_server_impl.h"
-#include "pegasus_service_app.h"
+#include "server/compaction_operation.h"
+#include "server/pegasus_server_impl.h"
+#include "server/pegasus_service_app.h"
 #include "runtime/app_model.h"
 #include "runtime/service_app.h"
 #include "server/server_utils.h"
diff --git a/src/server/result_writer.cpp b/src/server/result_writer.cpp
index 5629106b90..dcb6123bfc 100644
--- a/src/server/result_writer.cpp
+++ b/src/server/result_writer.cpp
@@ -19,7 +19,7 @@
 
 #include "result_writer.h"
 
-#include <pegasus/error.h>
+#include "pegasus/error.h"
 #include <chrono>
 #include <utility>
 
diff --git a/src/server/rocksdb_wrapper.cpp b/src/server/rocksdb_wrapper.cpp
index 078b2b9d8a..a432019157 100644
--- a/src/server/rocksdb_wrapper.cpp
+++ b/src/server/rocksdb_wrapper.cpp
@@ -27,8 +27,8 @@
 #include "base/meta_store.h"
 #include "base/pegasus_value_schema.h"
 #include "common/duplication_common.h"
-#include "pegasus_key_schema.h"
-#include "pegasus_utils.h"
+#include "base/pegasus_key_schema.h"
+#include "base/pegasus_utils.h"
 #include "pegasus_write_service_impl.h"
 #include "server/logging_utils.h"
 #include "server/pegasus_server_impl.h"
diff --git a/src/server/rocksdb_wrapper.h b/src/server/rocksdb_wrapper.h
index c73f5cb918..7545978d29 100644
--- a/src/server/rocksdb_wrapper.h
+++ b/src/server/rocksdb_wrapper.h
@@ -22,12 +22,12 @@
 #include <gtest/gtest_prod.h>
 #include <rocksdb/options.h>
 #include <rocksdb/write_batch.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "replica/replica_base.h"
 #include <string_view>
 #include "utils/metrics.h"
diff --git a/src/server/server_utils.cpp b/src/server/server_utils.cpp
index 002e467faf..780478da4f 100644
--- a/src/server/server_utils.cpp
+++ b/src/server/server_utils.cpp
@@ -20,7 +20,7 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/src/server/test/capacity_unit_calculator_test.cpp b/src/server/test/capacity_unit_calculator_test.cpp
index b093cb0586..b92123bbab 100644
--- a/src/server/test/capacity_unit_calculator_test.cpp
+++ b/src/server/test/capacity_unit_calculator_test.cpp
@@ -19,7 +19,7 @@
 
 #include <fmt/core.h>
 #include <rocksdb/status.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
@@ -27,7 +27,7 @@
 
 #include "common/replication.codes.h"
 #include "gtest/gtest.h"
-#include "pegasus_key_schema.h"
+#include "base/pegasus_key_schema.h"
 #include "pegasus_server_test_base.h"
 #include "replica_admin_types.h"
 #include "rrdb/rrdb_types.h"
diff --git a/src/server/test/compaction_filter_rule_test.cpp b/src/server/test/compaction_filter_rule_test.cpp
index d793ae2b1d..66362f5635 100644
--- a/src/server/test/compaction_filter_rule_test.cpp
+++ b/src/server/test/compaction_filter_rule_test.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <rocksdb/slice.h>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include "base/pegasus_utils.h"
diff --git a/src/server/test/compaction_operation_test.cpp b/src/server/test/compaction_operation_test.cpp
index a241c44a15..94bc67b527 100644
--- a/src/server/test/compaction_operation_test.cpp
+++ b/src/server/test/compaction_operation_test.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <rocksdb/slice.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/src/server/test/manual_compact_service_test.cpp b/src/server/test/manual_compact_service_test.cpp
index 8ccd761b57..79aa194c71 100644
--- a/src/server/test/manual_compact_service_test.cpp
+++ b/src/server/test/manual_compact_service_test.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <rocksdb/options.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <memory>
diff --git a/src/server/test/pegasus_mutation_duplicator_test.cpp b/src/server/test/pegasus_mutation_duplicator_test.cpp
index f4e6d871db..873d8bc46b 100644
--- a/src/server/test/pegasus_mutation_duplicator_test.cpp
+++ b/src/server/test/pegasus_mutation_duplicator_test.cpp
@@ -20,7 +20,7 @@
 #include "server/pegasus_mutation_duplicator.h"
 
 #include <fmt/core.h>
-#include <pegasus/error.h>
+#include "pegasus/error.h"
 #include <sys/types.h>
 #include <memory>
 #include <string_view>
@@ -35,7 +35,7 @@
 #include "common/replication.codes.h"
 #include "duplication_internal_types.h"
 #include "gtest/gtest.h"
-#include "pegasus_key_schema.h"
+#include "base/pegasus_key_schema.h"
 #include "pegasus_server_test_base.h"
 #include "replica/replica_base.h"
 #include "rrdb/rrdb.code.definition.h"
diff --git a/src/server/test/pegasus_server_impl_test.cpp b/src/server/test/pegasus_server_impl_test.cpp
index f2a4915750..82702084f7 100644
--- a/src/server/test/pegasus_server_impl_test.cpp
+++ b/src/server/test/pegasus_server_impl_test.cpp
@@ -21,7 +21,7 @@
 #include <fmt/core.h>
 #include <rocksdb/db.h>
 #include <rocksdb/options.h>
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/src/server/test/pegasus_server_write_test.cpp b/src/server/test/pegasus_server_write_test.cpp
index 556cd9d7fe..122c6ef152 100644
--- a/src/server/test/pegasus_server_write_test.cpp
+++ b/src/server/test/pegasus_server_write_test.cpp
@@ -19,7 +19,7 @@
 
 #include <fmt/core.h>
 #include <rocksdb/write_batch.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/server/test/pegasus_write_service_impl_test.cpp b/src/server/test/pegasus_write_service_impl_test.cpp
index 0ac33faa40..6c41024d90 100644
--- a/src/server/test/pegasus_write_service_impl_test.cpp
+++ b/src/server/test/pegasus_write_service_impl_test.cpp
@@ -19,13 +19,13 @@
 
 #include <fmt/core.h>
 #include <rocksdb/status.h>
-#include <stdint.h>
+#include <cstdint>
 #include <limits>
 #include <memory>
 #include <string>
 
 #include "gtest/gtest.h"
-#include "pegasus_key_schema.h"
+#include "base/pegasus_key_schema.h"
 #include "pegasus_server_test_base.h"
 #include "rrdb/rrdb_types.h"
 #include "server/pegasus_server_write.h"
diff --git a/src/server/test/pegasus_write_service_test.cpp b/src/server/test/pegasus_write_service_test.cpp
index 6e448a4ade..57900d33ce 100644
--- a/src/server/test/pegasus_write_service_test.cpp
+++ b/src/server/test/pegasus_write_service_test.cpp
@@ -20,7 +20,7 @@
 #include <fmt/core.h>
 #include <rocksdb/status.h>
 #include <rocksdb/write_batch.h>
-#include <stdint.h>
+#include <cstdint>
 #include <array>
 #include <memory>
 #include <string>
diff --git a/src/server/test/rocksdb_wrapper_test.cpp b/src/server/test/rocksdb_wrapper_test.cpp
index 7831afc713..e70e61a718 100644
--- a/src/server/test/rocksdb_wrapper_test.cpp
+++ b/src/server/test/rocksdb_wrapper_test.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
@@ -26,10 +26,10 @@
 #include "common/fs_manager.h"
 #include "dsn.layer2_types.h"
 #include "gtest/gtest.h"
-#include "pegasus_key_schema.h"
+#include "base/pegasus_key_schema.h"
 #include "pegasus_server_test_base.h"
-#include "pegasus_utils.h"
-#include "pegasus_value_schema.h"
+#include "base/pegasus_utils.h"
+#include "base/pegasus_value_schema.h"
 #include "replica/replica.h"
 #include "replica/replica_stub.h"
 #include "server/pegasus_server_write.h"
diff --git a/src/shell/command_executor.h b/src/shell/command_executor.h
index af5804b035..a459bfb160 100644
--- a/src/shell/command_executor.h
+++ b/src/shell/command_executor.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <pegasus/client.h>
+#include "pegasus/client.h"
 
 #include "client/replication_ddl_client.h"
 
diff --git a/src/shell/command_helper.h b/src/shell/command_helper.h
index 912fae9172..368d5a0620 100644
--- a/src/shell/command_helper.h
+++ b/src/shell/command_helper.h
@@ -37,9 +37,9 @@
 #include <rocksdb/statistics.h>
 
 #include <geo/lib/geo_client.h>
-#include <pegasus/error.h>
-#include <pegasus/git_commit.h>
-#include <pegasus/version.h>
+#include "pegasus/error.h"
+#include "pegasus/git_commit.h"
+#include "pegasus/version.h"
 #include <rrdb/rrdb.code.definition.h>
 #include <rrdb/rrdb_types.h>
 
diff --git a/src/shell/command_utils.h b/src/shell/command_utils.h
index e076c3d32d..6636867ef1 100644
--- a/src/shell/command_utils.h
+++ b/src/shell/command_utils.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <fmt/core.h>
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/shell/commands.h b/src/shell/commands.h
index 2e6044b064..b682fa3310 100644
--- a/src/shell/commands.h
+++ b/src/shell/commands.h
@@ -35,9 +35,9 @@
 
 #include <rrdb/rrdb.code.definition.h>
 #include <rrdb/rrdb_types.h>
-#include <pegasus/version.h>
-#include <pegasus/git_commit.h>
-#include <pegasus/error.h>
+#include "pegasus/version.h"
+#include "pegasus/git_commit.h"
+#include "pegasus/error.h"
 
 #include "command_executor.h"
 #include "command_helper.h"
diff --git a/src/shell/commands/bulk_load.cpp b/src/shell/commands/bulk_load.cpp
index 8a57fe21a2..409285b90f 100644
--- a/src/shell/commands/bulk_load.cpp
+++ b/src/shell/commands/bulk_load.cpp
@@ -23,7 +23,7 @@
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
 #include <getopt.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <cstdint>
 #include <iostream>
diff --git a/src/shell/commands/cold_backup.cpp b/src/shell/commands/cold_backup.cpp
index 0a154d4616..6bacde0dbd 100644
--- a/src/shell/commands/cold_backup.cpp
+++ b/src/shell/commands/cold_backup.cpp
@@ -22,9 +22,9 @@
 #include <boost/lexical_cast.hpp>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <getopt.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
 #include <algorithm>
 #include <cstdint>
 #include <iostream>
diff --git a/src/shell/commands/data_operations.cpp b/src/shell/commands/data_operations.cpp
index 150f33bede..9556e3eda8 100644
--- a/src/shell/commands/data_operations.cpp
+++ b/src/shell/commands/data_operations.cpp
@@ -24,11 +24,11 @@
 #include <fmt/format.h>
 #include <fmt/printf.h>
 #include <getopt.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <pegasus/error.h>
+#include <cinttypes>
+#include <climits>
+#include "pegasus/error.h"
 #include <rocksdb/statistics.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -48,8 +48,8 @@
 #include "geo/lib/geo_client.h"
 #include "idl_utils.h"
 #include "pegasus/client.h"
-#include "pegasus_key_schema.h"
-#include "pegasus_utils.h"
+#include "base/pegasus_key_schema.h"
+#include "base/pegasus_utils.h"
 #include "rrdb/rrdb_types.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "runtime/task/async_calls.h"
diff --git a/src/shell/commands/debugger.cpp b/src/shell/commands/debugger.cpp
index 100c6ef75d..92090afdbb 100644
--- a/src/shell/commands/debugger.cpp
+++ b/src/shell/commands/debugger.cpp
@@ -35,8 +35,8 @@
 #include <rocksdb/sst_dump_tool.h>
 #include <rocksdb/status.h>
 #include <rocksdb/utilities/ldb_cmd.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include <ctime>
 // IWYU pragma: no_include <fmt/core.h>
 // IWYU pragma: no_include <fmt/format.h>
@@ -49,9 +49,9 @@
 #include "base/idl_utils.h"
 #include "common/gpid.h"
 #include "common/replication.codes.h"
-#include "pegasus_key_schema.h"
-#include "pegasus_utils.h"
-#include "pegasus_value_schema.h"
+#include "base/pegasus_key_schema.h"
+#include "base/pegasus_utils.h"
+#include "base/pegasus_value_schema.h"
 #include "rrdb/rrdb.code.definition.h"
 #include "rrdb/rrdb_types.h"
 #include "runtime/rpc/rpc_message.h"
diff --git a/src/shell/commands/detect_hotkey.cpp b/src/shell/commands/detect_hotkey.cpp
index 05acc7cd04..ef5c48f76d 100644
--- a/src/shell/commands/detect_hotkey.cpp
+++ b/src/shell/commands/detect_hotkey.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdio.h>
+#include <cstdio>
 #include <memory>
 #include <set>
 #include <string>
diff --git a/src/shell/commands/duplication.cpp b/src/shell/commands/duplication.cpp
index 82237af1a7..dcef5c87a4 100644
--- a/src/shell/commands/duplication.cpp
+++ b/src/shell/commands/duplication.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <initializer_list>
 #include <iostream>
 #include <memory>
diff --git a/src/shell/commands/global_properties.cpp b/src/shell/commands/global_properties.cpp
index fd51bed611..9d8f323ac7 100644
--- a/src/shell/commands/global_properties.cpp
+++ b/src/shell/commands/global_properties.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #include "shell/command_executor.h"
diff --git a/src/shell/commands/local_partition_split.cpp b/src/shell/commands/local_partition_split.cpp
index f880f42464..e6440217bb 100644
--- a/src/shell/commands/local_partition_split.cpp
+++ b/src/shell/commands/local_partition_split.cpp
@@ -28,7 +28,7 @@
 #include <rocksdb/sst_file_writer.h>
 #include <rocksdb/table_properties.h>
 #include <rocksdb/threadpool.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
@@ -48,7 +48,7 @@
 #include "common/gpid.h"
 #include "common/replication_common.h"
 #include "dsn.layer2_types.h"
-#include "pegasus_value_schema.h"
+#include "base/pegasus_value_schema.h"
 #include "replica/replica_stub.h"
 #include "replica/replication_app_base.h"
 #include "shell/argh.h"
diff --git a/src/shell/commands/node_management.cpp b/src/shell/commands/node_management.cpp
index 32cdc091b3..b6e5ec1ea8 100644
--- a/src/shell/commands/node_management.cpp
+++ b/src/shell/commands/node_management.cpp
@@ -22,8 +22,8 @@
 #include <getopt.h>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include <algorithm>
 // IWYU pragma: no_include <bits/getopt_core.h>
 #include <chrono>
diff --git a/src/shell/commands/rebalance.cpp b/src/shell/commands/rebalance.cpp
index 42a5ac5e2d..28bf069809 100644
--- a/src/shell/commands/rebalance.cpp
+++ b/src/shell/commands/rebalance.cpp
@@ -19,7 +19,7 @@
 
 // IWYU pragma: no_include <bits/getopt_core.h>
 #include <getopt.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <iostream>
 #include <map>
diff --git a/src/shell/commands/recovery.cpp b/src/shell/commands/recovery.cpp
index 7793142c68..480913605c 100644
--- a/src/shell/commands/recovery.cpp
+++ b/src/shell/commands/recovery.cpp
@@ -20,7 +20,7 @@
 // IWYU pragma: no_include <bits/getopt_core.h>
 #include <boost/algorithm/string/trim.hpp>
 #include <getopt.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <fstream>
 #include <iostream>
diff --git a/src/shell/commands/table_management.cpp b/src/shell/commands/table_management.cpp
index b75e27f56a..8588ca227f 100644
--- a/src/shell/commands/table_management.cpp
+++ b/src/shell/commands/table_management.cpp
@@ -21,8 +21,8 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include <fmt/core.h>
 #include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <algorithm>
 #include <cstdint>
 #include <fstream>
@@ -37,7 +37,7 @@
 #include "common/gpid.h"
 #include "dsn.layer2_types.h"
 #include "meta_admin_types.h"
-#include "pegasus_utils.h"
+#include "base/pegasus_utils.h"
 #include "runtime/rpc/rpc_host_port.h"
 #include "shell/command_executor.h"
 #include "shell/command_helper.h"
diff --git a/src/shell/main.cpp b/src/shell/main.cpp
index a6df779fe9..0adafbb762 100644
--- a/src/shell/main.cpp
+++ b/src/shell/main.cpp
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-#include <ctype.h>
-#include <pegasus/version.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
+#include <cctype>
+#include "pegasus/version.h"
+#include <csignal>
+#include <cstdio>
+#include <cstring>
 #include <algorithm>
 #include <iostream>
 #include <map>
diff --git a/src/test/bench_test/benchmark.cpp b/src/test/bench_test/benchmark.cpp
index 321c56f86a..59c53795af 100644
--- a/src/test/bench_test/benchmark.cpp
+++ b/src/test/bench_test/benchmark.cpp
@@ -21,10 +21,10 @@
 
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
-#include <pegasus/error.h>
+#include "pegasus/error.h"
 #include <rocksdb/env.h>
 #include <rocksdb/statistics.h>
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 #include <set>
 #include <sstream>
diff --git a/src/test/bench_test/benchmark.h b/src/test/bench_test/benchmark.h
index b4f3247e92..adc6274121 100644
--- a/src/test/bench_test/benchmark.h
+++ b/src/test/bench_test/benchmark.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/src/test/bench_test/main.cpp b/src/test/bench_test/main.cpp
index f83a481087..28c5e29f33 100644
--- a/src/test/bench_test/main.cpp
+++ b/src/test/bench_test/main.cpp
@@ -18,8 +18,8 @@
  */
 
 #include <fmt/core.h>
-#include <pegasus/client.h>
-#include <stdio.h>
+#include "pegasus/client.h"
+#include <cstdio>
 #include <unistd.h>
 
 #include "benchmark.h"
diff --git a/src/test/bench_test/statistics.cpp b/src/test/bench_test/statistics.cpp
index 82f7c5e5b5..85fcd32509 100644
--- a/src/test/bench_test/statistics.cpp
+++ b/src/test/bench_test/statistics.cpp
@@ -20,7 +20,7 @@
 #include <fmt/core.h>
 #include <rocksdb/env.h>
 #include <rocksdb/statistics.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <unordered_map>
 
diff --git a/src/test/bench_test/statistics.h b/src/test/bench_test/statistics.h
index ac35b0e1d1..591bbe46b2 100644
--- a/src/test/bench_test/statistics.h
+++ b/src/test/bench_test/statistics.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/src/test/function_test/backup_restore/test_backup_and_restore.cpp b/src/test/function_test/backup_restore/test_backup_and_restore.cpp
index 3eab10c7a3..c8de02c347 100644
--- a/src/test/function_test/backup_restore/test_backup_and_restore.cpp
+++ b/src/test/function_test/backup_restore/test_backup_and_restore.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/test/function_test/base_api/test_basic.cpp b/src/test/function_test/base_api/test_basic.cpp
index 64ec71dcfc..ea7edac307 100644
--- a/src/test/function_test/base_api/test_basic.cpp
+++ b/src/test/function_test/base_api/test_basic.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <atomic>
 #include <chrono>
diff --git a/src/test/function_test/base_api/test_batch_get.cpp b/src/test/function_test/base_api/test_batch_get.cpp
index ff0b15a2e2..ccbff21487 100644
--- a/src/test/function_test/base_api/test_batch_get.cpp
+++ b/src/test/function_test/base_api/test_batch_get.cpp
@@ -21,7 +21,7 @@
 #include <fmt/core.h>
 #include <rocksdb/status.h>
 #include <rrdb/rrdb_types.h>
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/src/test/function_test/base_api/test_copy.cpp b/src/test/function_test/base_api/test_copy.cpp
index fb3b33293b..14e7c163d1 100644
--- a/src/test/function_test/base_api/test_copy.cpp
+++ b/src/test/function_test/base_api/test_copy.cpp
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include <limits.h>
-#include <string.h>
-#include <time.h>
+#include <climits>
+#include <cstring>
+#include <ctime>
 #include <atomic>
 #include <cstdlib>
 #include <functional>
diff --git a/src/test/function_test/base_api/test_incr.cpp b/src/test/function_test/base_api/test_incr.cpp
index 3040fececa..8199248a6a 100644
--- a/src/test/function_test/base_api/test_incr.cpp
+++ b/src/test/function_test/base_api/test_incr.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <climits>
 #include <string>
diff --git a/src/test/function_test/base_api/test_range_read.cpp b/src/test/function_test/base_api/test_range_read.cpp
index bdd9021d3a..fc23e41e90 100644
--- a/src/test/function_test/base_api/test_range_read.cpp
+++ b/src/test/function_test/base_api/test_range_read.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <map>
 #include <set>
diff --git a/src/test/function_test/base_api/test_scan.cpp b/src/test/function_test/base_api/test_scan.cpp
index 0b6cd2ff1d..14cd6594a0 100644
--- a/src/test/function_test/base_api/test_scan.cpp
+++ b/src/test/function_test/base_api/test_scan.cpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include <atomic>
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/test/function_test/base_api/test_ttl.cpp b/src/test/function_test/base_api/test_ttl.cpp
index aeb708b151..8682504b1f 100644
--- a/src/test/function_test/base_api/test_ttl.cpp
+++ b/src/test/function_test/base_api/test_ttl.cpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
 #include <chrono>
 #include <map>
 #include <memory>
diff --git a/src/test/function_test/detect_hotspot/test_detect_hotspot.cpp b/src/test/function_test/detect_hotspot/test_detect_hotspot.cpp
index 3c549d4cf6..d407da7530 100644
--- a/src/test/function_test/detect_hotspot/test_detect_hotspot.cpp
+++ b/src/test/function_test/detect_hotspot/test_detect_hotspot.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <iostream>
 #include <memory>
diff --git a/src/test/function_test/partition_split/test_split.cpp b/src/test/function_test/partition_split/test_split.cpp
index 42942121b7..f59d8ca1d2 100644
--- a/src/test/function_test/partition_split/test_split.cpp
+++ b/src/test/function_test/partition_split/test_split.cpp
@@ -16,9 +16,9 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 #include <chrono>
 #include <iostream>
 #include <map>
diff --git a/src/test/function_test/restore/test_restore.cpp b/src/test/function_test/restore/test_restore.cpp
index 141e7c8ac0..95dd27ada1 100644
--- a/src/test/function_test/restore/test_restore.cpp
+++ b/src/test/function_test/restore/test_restore.cpp
@@ -20,7 +20,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/lexical_cast.hpp>
 #include <fmt/core.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <algorithm>
 #include <chrono>
diff --git a/src/test/function_test/security/test_kms_client.cpp b/src/test/function_test/security/test_kms_client.cpp
index 20cf20b0c1..fe917c833e 100644
--- a/src/test/function_test/security/test_kms_client.cpp
+++ b/src/test/function_test/security/test_kms_client.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <absl/strings/str_split.h>
-#include <string.h>
+#include <cstring>
 #include <memory>
 #include <string>
 
diff --git a/src/test/function_test/throttle/test_throttle.cpp b/src/test/function_test/throttle/test_throttle.cpp
index 4eaa92728c..d358e59fb1 100644
--- a/src/test/function_test/throttle/test_throttle.cpp
+++ b/src/test/function_test/throttle/test_throttle.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <atomic>
 #include <map>
 #include <memory>
diff --git a/src/test/function_test/utils/global_env.h b/src/test/function_test/utils/global_env.h
index b7313384bc..fc9450914d 100644
--- a/src/test/function_test/utils/global_env.h
+++ b/src/test/function_test/utils/global_env.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 #include "utils/singleton.h"
diff --git a/src/test/function_test/utils/test_util.cpp b/src/test/function_test/utils/test_util.cpp
index 7a41f18822..c040fba3e3 100644
--- a/src/test/function_test/utils/test_util.cpp
+++ b/src/test/function_test/utils/test_util.cpp
@@ -20,8 +20,8 @@
 #include "test_util.h"
 
 #include <nlohmann/json.hpp>
-#include <pegasus/error.h>
-#include <stdio.h>
+#include "pegasus/error.h"
+#include <cstdio>
 #include <unistd.h>
 #include <chrono>
 #include <fstream>
diff --git a/src/test/function_test/utils/test_util.h b/src/test/function_test/utils/test_util.h
index 519da64718..49df2eff02 100644
--- a/src/test/function_test/utils/test_util.h
+++ b/src/test/function_test/utils/test_util.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <gtest/gtest.h>
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
diff --git a/src/test/kill_test/data_verifier.cpp b/src/test/kill_test/data_verifier.cpp
index 9f1e06ae38..5ffc331154 100644
--- a/src/test/kill_test/data_verifier.cpp
+++ b/src/test/kill_test/data_verifier.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/time.h>
 #include <unistd.h>
 #include <algorithm>
diff --git a/src/test/kill_test/kill_testor.cpp b/src/test/kill_test/kill_testor.cpp
index 50570bf1b4..194707d3f4 100644
--- a/src/test/kill_test/kill_testor.cpp
+++ b/src/test/kill_test/kill_testor.cpp
@@ -19,10 +19,10 @@
 
 #include <fmt/core.h>
 #include <fmt/format.h>
-#include <pegasus/client.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <time.h>
+#include "pegasus/client.h"
+#include <cstdint>
+#include <cstdlib>
+#include <ctime>
 #include <unistd.h>
 #include <algorithm>
 #include <unordered_set>
diff --git a/src/test/kill_test/killer_handler_shell.cpp b/src/test/kill_test/killer_handler_shell.cpp
index ecccb6f397..fe5835196c 100644
--- a/src/test/kill_test/killer_handler_shell.cpp
+++ b/src/test/kill_test/killer_handler_shell.cpp
@@ -19,7 +19,7 @@
 
 #include "killer_handler_shell.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <cerrno>
 #include <cstdlib>
 #include <sstream> // IWYU pragma: keep
diff --git a/src/test/kill_test/process_kill_testor.h b/src/test/kill_test/process_kill_testor.h
index 36285f348f..dec1fb1b7f 100644
--- a/src/test/kill_test/process_kill_testor.h
+++ b/src/test/kill_test/process_kill_testor.h
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/src/tools/mutation_log_tool.h b/src/tools/mutation_log_tool.h
index e380be2afb..a1abb84b08 100644
--- a/src/tools/mutation_log_tool.h
+++ b/src/tools/mutation_log_tool.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <iostream>
 #include <string>
diff --git a/src/utils/binary_reader.h b/src/utils/binary_reader.h
index 65d0749fb2..8efa3ba532 100644
--- a/src/utils/binary_reader.h
+++ b/src/utils/binary_reader.h
@@ -26,9 +26,9 @@
 
 #pragma once
 
-#include <assert.h>
+#include <cassert>
 #include <gtest/gtest_prod.h>
-#include <stdint.h>
+#include <cstdint>
 #include <cstring>
 #include <string>
 
diff --git a/src/utils/binary_writer.h b/src/utils/binary_writer.h
index 2640567f05..599ed4d623 100644
--- a/src/utils/binary_writer.h
+++ b/src/utils/binary_writer.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <assert.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>
 #include <algorithm>
 #include <cstring>
 #include <string>
diff --git a/src/utils/builtin_metrics.cpp b/src/utils/builtin_metrics.cpp
index 6c8b8ee5a8..2b7ba24cde 100644
--- a/src/utils/builtin_metrics.cpp
+++ b/src/utils/builtin_metrics.cpp
@@ -18,7 +18,7 @@
 #include "utils/builtin_metrics.h"
 
 #include <string_view>
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 
 #include "utils/autoref_ptr.h"
diff --git a/src/utils/clock.h b/src/utils/clock.h
index 2b15bf6d6a..cc334c5611 100644
--- a/src/utils/clock.h
+++ b/src/utils/clock.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
 namespace dsn {
diff --git a/src/utils/command_manager.cpp b/src/utils/command_manager.cpp
index b5d56e2afb..e34c216a14 100644
--- a/src/utils/command_manager.cpp
+++ b/src/utils/command_manager.cpp
@@ -28,7 +28,7 @@
 
 #include <fmt/format.h>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <chrono>
 #include <limits>
diff --git a/src/utils/command_manager.h b/src/utils/command_manager.h
index b971522d01..4e0b3f6ddc 100644
--- a/src/utils/command_manager.h
+++ b/src/utils/command_manager.h
@@ -31,7 +31,7 @@
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 // IWYU pragma: no_include <ext/alloc_traits.h>
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/src/utils/configuration.h b/src/utils/configuration.h
index 533baf44b3..7e67ecd66f 100644
--- a/src/utils/configuration.h
+++ b/src/utils/configuration.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <assert.h>
-#include <inttypes.h>
+#include <cassert>
+#include <cinttypes>
 #include <cstdio>
 #include <cstdlib>
 #include <iosfwd>
diff --git a/src/utils/coredump.posix.cpp b/src/utils/coredump.posix.cpp
index f16c97a2a1..e6a720c9ab 100644
--- a/src/utils/coredump.posix.cpp
+++ b/src/utils/coredump.posix.cpp
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <signal.h>
-#include <stdio.h>
+#include <csignal>
+#include <cstdio>
 #include <list>
 
 #include "coredump.h"
diff --git a/src/utils/error_code.h b/src/utils/error_code.h
index 023ec2b253..cc251ca652 100644
--- a/src/utils/error_code.h
+++ b/src/utils/error_code.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <ostream>
 #include <string>
 
diff --git a/src/utils/fail_point.cpp b/src/utils/fail_point.cpp
index 49790832c8..13606d3fb6 100644
--- a/src/utils/fail_point.cpp
+++ b/src/utils/fail_point.cpp
@@ -28,8 +28,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include <regex>
 #include <string>
 #include <vector>
diff --git a/src/utils/filesystem.cpp b/src/utils/filesystem.cpp
index 75ad72f5a1..30723dafbf 100644
--- a/src/utils/filesystem.cpp
+++ b/src/utils/filesystem.cpp
@@ -27,17 +27,17 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/system/error_code.hpp>
-#include <errno.h>
+#include <cerrno>
 #include <fmt/core.h>
 #include <ftw.h>
 #include <glob.h>
-#include <limits.h>
+#include <climits>
 #include <openssl/md5.h>
 #include <rocksdb/env.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/status.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/stat.h>
 // IWYU pragma: no_include <bits/struct_stat.h>
 #include <unistd.h>
diff --git a/src/utils/filesystem.h b/src/utils/filesystem.h
index 3c370044ce..01f2d749fa 100644
--- a/src/utils/filesystem.h
+++ b/src/utils/filesystem.h
@@ -39,10 +39,10 @@
 #define _XOPEN_SOURCE 500
 #endif
 
-#include <assert.h>
+#include <cassert>
 // IWYU pragma: no_include <features.h>
 #include <ftw.h>
-#include <stdint.h>
+#include <cstdint>
 
 #ifndef FTW_CONTINUE
 #define FTW_CONTINUE 0
diff --git a/src/utils/fmt_logging.h b/src/utils/fmt_logging.h
index 97e751a48c..4699c5b8cd 100644
--- a/src/utils/fmt_logging.h
+++ b/src/utils/fmt_logging.h
@@ -32,8 +32,7 @@
 #define LOG(level, ...)                                                                            \
     do {                                                                                           \
         if (level >= log_start_level)                                                              \
-            global_log(                                                                            \
-                __FILENAME__, __FUNCTION__, __LINE__, level, fmt::format(__VA_ARGS__).c_str());    \
+            global_log(__FILE__, __FUNCTION__, __LINE__, level, fmt::format(__VA_ARGS__).c_str()); \
     } while (false)
 
 #define LOG_DEBUG(...) LOG(LOG_LEVEL_DEBUG, __VA_ARGS__)
diff --git a/src/utils/gpid.cpp b/src/utils/gpid.cpp
index 18c5433efd..19a688bfa9 100644
--- a/src/utils/gpid.cpp
+++ b/src/utils/gpid.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "common/gpid.h"
 #include "utils/fixed_size_buffer_pool.h"
diff --git a/src/utils/hpc_locks/sema.h b/src/utils/hpc_locks/sema.h
index 244747d563..f3f8ecb1ff 100644
--- a/src/utils/hpc_locks/sema.h
+++ b/src/utils/hpc_locks/sema.h
@@ -98,7 +98,7 @@ class Semaphore
 //---------------------------------------------------------
 
 #include <semaphore.h>
-#include <time.h>
+#include <ctime>
 
 class Semaphore
 {
diff --git a/src/utils/latency_tracer.h b/src/utils/latency_tracer.h
index e1136d475a..247f0d12cb 100644
--- a/src/utils/latency_tracer.h
+++ b/src/utils/latency_tracer.h
@@ -16,7 +16,7 @@
 // under the License.
 
 #pragma once
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/utils/long_adder_bench/long_adder_bench.cpp b/src/utils/long_adder_bench/long_adder_bench.cpp
index 0c2a12deed..e4fb36bfe6 100644
--- a/src/utils/long_adder_bench/long_adder_bench.cpp
+++ b/src/utils/long_adder_bench/long_adder_bench.cpp
@@ -16,8 +16,8 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include <algorithm>
 #include <atomic>
 #include <cstdlib>
diff --git a/src/utils/metrics.h b/src/utils/metrics.h
index 9d9b0671d3..e3e90eb812 100644
--- a/src/utils/metrics.h
+++ b/src/utils/metrics.h
@@ -21,7 +21,7 @@
 #include <boost/asio/detail/impl/epoll_reactor.hpp>
 #include <boost/asio/detail/impl/timer_queue_ptime.ipp>
 #include <rapidjson/ostreamwrapper.h>
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm>
 #include <atomic>
 #include <bitset>
diff --git a/src/utils/output_utils.cpp b/src/utils/output_utils.cpp
index dfaa799633..057304f2d8 100644
--- a/src/utils/output_utils.cpp
+++ b/src/utils/output_utils.cpp
@@ -17,7 +17,7 @@
 
 #include "utils/output_utils.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <memory>
 
diff --git a/src/utils/output_utils.h b/src/utils/output_utils.h
index 201cee938b..5c0878a415 100644
--- a/src/utils/output_utils.h
+++ b/src/utils/output_utils.h
@@ -19,7 +19,7 @@
 
 // IWYU pragma: no_include <bits/std_abs.h>
 #include <rapidjson/ostreamwrapper.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <cmath> // IWYU pragma: keep
 #include <iomanip>
diff --git a/src/utils/priority_queue.h b/src/utils/priority_queue.h
index b149f3a242..6bfd9c72ef 100644
--- a/src/utils/priority_queue.h
+++ b/src/utils/priority_queue.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <cassert>
 #include <queue>
 #include <string>
diff --git a/src/utils/process_utils.cpp b/src/utils/process_utils.cpp
index eaa42b69a8..8831f4f1a6 100644
--- a/src/utils/process_utils.cpp
+++ b/src/utils/process_utils.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdio.h>
+#include <cstdio>
 #if defined(__linux__)
 #include <syscall.h>
 #else
diff --git a/src/utils/process_utils.h b/src/utils/process_utils.h
index 611e3d0698..080c8f6773 100644
--- a/src/utils/process_utils.h
+++ b/src/utils/process_utils.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <iostream>
 
 #include "utils/ports.h"
diff --git a/src/utils/safe_strerror_posix.cpp b/src/utils/safe_strerror_posix.cpp
index a95496af50..169c43d407 100644
--- a/src/utils/safe_strerror_posix.cpp
+++ b/src/utils/safe_strerror_posix.cpp
@@ -4,10 +4,10 @@
 
 #include "utils/safe_strerror_posix.h"
 
-#include <errno.h>
+#include <cerrno>
 // IWYU pragma: no_include <features.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 namespace dsn {
 namespace utils {
diff --git a/src/utils/safe_strerror_posix.h b/src/utils/safe_strerror_posix.h
index 05c0dbf56a..c9c7116250 100644
--- a/src/utils/safe_strerror_posix.h
+++ b/src/utils/safe_strerror_posix.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 
 namespace dsn {
diff --git a/src/utils/shared_io_service.cpp b/src/utils/shared_io_service.cpp
index 285ef23e7a..257a3c061a 100644
--- a/src/utils/shared_io_service.cpp
+++ b/src/utils/shared_io_service.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/asio/impl/io_context.hpp>
 #include <boost/asio/impl/io_context.ipp>
-#include <stdint.h>
+#include <cstdint>
 
 #include "utils/flags.h"
 #include "utils/fmt_logging.h"
diff --git a/src/utils/simple_logger.cpp b/src/utils/simple_logger.cpp
index 881b97ecd8..ba92fbad1f 100644
--- a/src/utils/simple_logger.cpp
+++ b/src/utils/simple_logger.cpp
@@ -26,7 +26,7 @@
 
 #include "utils/simple_logger.h"
 
-#include <errno.h>
+#include <cerrno>
 // IWYU pragma: no_include <ext/alloc_traits.h>
 #include <fmt/core.h>
 #include <fmt/printf.h>
diff --git a/src/utils/string_conv.h b/src/utils/string_conv.h
index 16b0793b28..db600ba2eb 100644
--- a/src/utils/string_conv.h
+++ b/src/utils/string_conv.h
@@ -17,9 +17,9 @@
 
 #pragma once
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdint.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdint>
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
diff --git a/src/utils/string_splitter.h b/src/utils/string_splitter.h
index 143e7bb91f..1c9e3855cc 100644
--- a/src/utils/string_splitter.h
+++ b/src/utils/string_splitter.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdlib>
+#include <cstdint>
 
 namespace dsn {
 
@@ -62,28 +62,9 @@ class string_splitter
     // Cast field to specific type, and write the value into `pv'.
     // Returns 0 on success, -1 otherwise.
     // NOTE: If separator is a digit, casting functions always return -1.
-    inline int to_int8(int8_t *pv) const;
-
-    inline int to_uint8(uint8_t *pv) const;
-
-    inline int to_int(int *pv) const;
-
-    inline int to_uint(unsigned int *pv) const;
-
-    inline int to_long(long *pv) const;
-
-    inline int to_ulong(unsigned long *pv) const;
-
-    inline int to_longlong(long long *pv) const;
-
-    inline int to_ulonglong(unsigned long long *pv) const;
-
-    inline int to_float(float *pv) const;
-
-    inline int to_double(double *pv) const;
 
 private:
-    inline bool not_end(const char *p) const;
+    inline bool not_end(const char *cur_ch) const;
 
     inline void init();
 
@@ -157,91 +138,9 @@ const char *string_splitter::field() const { return _head; }
 
 size_t string_splitter::length() const { return static_cast<size_t>(_tail - _head); }
 
-bool string_splitter::not_end(const char *p) const
-{
-    return (_str_tail == NULL) ? *p : (p != _str_tail);
-}
-
-int string_splitter::to_int8(int8_t *pv) const
-{
-    long v = 0;
-    if (to_long(&v) == 0 && v >= -128 && v <= 127) {
-        *pv = (int8_t)v;
-        return 0;
-    }
-    return -1;
-}
-
-int string_splitter::to_uint8(uint8_t *pv) const
-{
-    unsigned long v = 0;
-    if (to_ulong(&v) == 0 && v <= 255) {
-        *pv = (uint8_t)v;
-        return 0;
-    }
-    return -1;
-}
-
-int string_splitter::to_int(int *pv) const
-{
-    long v = 0;
-    if (to_long(&v) == 0 && v >= INT_MIN && v <= INT_MAX) {
-        *pv = (int)v;
-        return 0;
-    }
-    return -1;
-}
-
-int string_splitter::to_uint(unsigned int *pv) const
-{
-    unsigned long v = 0;
-    if (to_ulong(&v) == 0 && v <= UINT_MAX) {
-        *pv = (unsigned int)v;
-        return 0;
-    }
-    return -1;
-}
-
-int string_splitter::to_long(long *pv) const
-{
-    char *endptr = NULL;
-    *pv = strtol(field(), &endptr, 10);
-    return (endptr == field() + length()) ? 0 : -1;
-}
-
-int string_splitter::to_ulong(unsigned long *pv) const
-{
-    char *endptr = NULL;
-    *pv = strtoul(field(), &endptr, 10);
-    return (endptr == field() + length()) ? 0 : -1;
-}
-
-int string_splitter::to_longlong(long long *pv) const
-{
-    char *endptr = NULL;
-    *pv = strtoll(field(), &endptr, 10);
-    return (endptr == field() + length()) ? 0 : -1;
-}
-
-int string_splitter::to_ulonglong(unsigned long long *pv) const
-{
-    char *endptr = NULL;
-    *pv = strtoull(field(), &endptr, 10);
-    return (endptr == field() + length()) ? 0 : -1;
-}
-
-int string_splitter::to_float(float *pv) const
-{
-    char *endptr = NULL;
-    *pv = strtof(field(), &endptr);
-    return (endptr == field() + length()) ? 0 : -1;
-}
-
-int string_splitter::to_double(double *pv) const
+bool string_splitter::not_end(const char *cur_ch) const
 {
-    char *endptr = NULL;
-    *pv = strtod(field(), &endptr);
-    return (endptr == field() + length()) ? 0 : -1;
+    return (_str_tail == nullptr) ? static_cast<bool>(*cur_ch) : (cur_ch != _str_tail);
 }
 
 } // namespace dsn
diff --git a/src/utils/strings.cpp b/src/utils/strings.cpp
index aa73ff520c..ac7e687417 100644
--- a/src/utils/strings.cpp
+++ b/src/utils/strings.cpp
@@ -26,7 +26,7 @@
 
 #include <absl/strings/ascii.h>
 #include <openssl/md5.h>
-#include <stdio.h>
+#include <cstdio>
 #include <strings.h>
 #include <algorithm>
 #include <cstring>
diff --git a/src/utils/strings.h b/src/utils/strings.h
index 85d4a75a9b..afc9200a22 100644
--- a/src/utils/strings.h
+++ b/src/utils/strings.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <cstddef>
 #include <iostream>
 #include <list>
 #include <map>
diff --git a/src/utils/test/TokenBucketTest.cpp b/src/utils/test/TokenBucketTest.cpp
index 685b43a0d8..313d54d131 100644
--- a/src/utils/test/TokenBucketTest.cpp
+++ b/src/utils/test/TokenBucketTest.cpp
@@ -17,7 +17,7 @@
 #include "TokenBucketTest.h"
 
 #include <boost/optional/optional.hpp>
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm>
 #include <string>
 #include <vector>
diff --git a/src/utils/test/configuration.cpp b/src/utils/test/configuration.cpp
index 4d3d9d757f..cd83ebc5e2 100644
--- a/src/utils/test/configuration.cpp
+++ b/src/utils/test/configuration.cpp
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <algorithm>
 #include <fstream>
 #include <limits>
diff --git a/src/utils/test/endian_test.cpp b/src/utils/test/endian_test.cpp
index dd8a807c66..fb69137401 100644
--- a/src/utils/test/endian_test.cpp
+++ b/src/utils/test/endian_test.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <stdint.h>
+#include <cstdint>
 #include <limits>
 #include <string>
 
diff --git a/src/utils/test/file_system_test.cpp b/src/utils/test/file_system_test.cpp
index 0a71272648..936b791e40 100644
--- a/src/utils/test/file_system_test.cpp
+++ b/src/utils/test/file_system_test.cpp
@@ -18,8 +18,8 @@
 #include <rocksdb/env.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/status.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <set>
 #include <string>
 #include <utility>
diff --git a/src/utils/test/file_utils.cpp b/src/utils/test/file_utils.cpp
index 768d675b04..2d1d3e902d 100644
--- a/src/utils/test/file_utils.cpp
+++ b/src/utils/test/file_utils.cpp
@@ -27,8 +27,8 @@
 #include <rocksdb/env.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/status.h>
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
 #include <string>
 #include <vector>
 
diff --git a/src/utils/test/flag_test.cpp b/src/utils/test/flag_test.cpp
index 235fe0e927..a280621f5e 100644
--- a/src/utils/test/flag_test.cpp
+++ b/src/utils/test/flag_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <iostream>
 #include <string>
 
diff --git a/src/utils/test/json_helper_test.cpp b/src/utils/test/json_helper_test.cpp
index 6389e7b0ea..f164814ea0 100644
--- a/src/utils/test/json_helper_test.cpp
+++ b/src/utils/test/json_helper_test.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+#include <cstring>
 #include <cstdint>
 #include <iostream>
 #include <map>
diff --git a/src/utils/test/long_adder_test.cpp b/src/utils/test/long_adder_test.cpp
index 0fe82e188b..54b483a330 100644
--- a/src/utils/test/long_adder_test.cpp
+++ b/src/utils/test/long_adder_test.cpp
@@ -16,8 +16,8 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include <chrono>
 #include <functional>
 #include <ratio>
diff --git a/src/utils/test/nth_element_bench/nth_element_bench.cpp b/src/utils/test/nth_element_bench/nth_element_bench.cpp
index f08da927bf..4fea1e090e 100644
--- a/src/utils/test/nth_element_bench/nth_element_bench.cpp
+++ b/src/utils/test/nth_element_bench/nth_element_bench.cpp
@@ -17,7 +17,7 @@
 
 #include <fmt/core.h>
 #include <fmt/format.h>
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
diff --git a/src/utils/test/token_bucket_throttling_controller_test.cpp b/src/utils/test/token_bucket_throttling_controller_test.cpp
index cecb3b8b9e..7d60158b8b 100644
--- a/src/utils/test/token_bucket_throttling_controller_test.cpp
+++ b/src/utils/test/token_bucket_throttling_controller_test.cpp
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <limits>
 #include <memory>
diff --git a/src/utils/test/utils.cpp b/src/utils/test/utils.cpp
index cd57087507..4c2cf33336 100644
--- a/src/utils/test/utils.cpp
+++ b/src/utils/test/utils.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <stddef.h>
+#include <cstddef>
 #include <list>
 #include <map>
 #include <set>
diff --git a/src/utils/throttling_controller.h b/src/utils/throttling_controller.h
index f33c06dcf3..e13c208d01 100644
--- a/src/utils/throttling_controller.h
+++ b/src/utils/throttling_controller.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 namespace dsn {
diff --git a/src/utils/time_utils.h b/src/utils/time_utils.h
index d36aa98640..4b8b9813cb 100644
--- a/src/utils/time_utils.h
+++ b/src/utils/time_utils.h
@@ -27,8 +27,8 @@
 #pragma once
 
 // IWYU pragma: no_include <bits/types/struct_tm.h>
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
 #include <chrono>
 #include <cstdio>
 #include <string>
diff --git a/src/utils/token_bucket_throttling_controller.h b/src/utils/token_bucket_throttling_controller.h
index a83435ddb5..c48be543fb 100644
--- a/src/utils/token_bucket_throttling_controller.h
+++ b/src/utils/token_bucket_throttling_controller.h
@@ -16,7 +16,7 @@
 // under the License.
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/src/utils/utils.h b/src/utils/utils.h
index 3b97c9a1b8..4e9a8a12fd 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <algorithm> // IWYU pragma: keep
 #include <iterator>
 #include <map>
diff --git a/src/zookeeper/lock_struct.cpp b/src/zookeeper/lock_struct.cpp
index d88837fe2d..f69916c9fb 100644
--- a/src/zookeeper/lock_struct.cpp
+++ b/src/zookeeper/lock_struct.cpp
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include <ctype.h>
+#include <cctype>
 #include <chrono>
 #include <functional>
 #include <memory>
diff --git a/src/zookeeper/lock_struct.h b/src/zookeeper/lock_struct.h
index bc65494e61..dfbe03d603 100644
--- a/src/zookeeper/lock_struct.h
+++ b/src/zookeeper/lock_struct.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/zookeeper/test/distributed_lock_zookeeper.cpp b/src/zookeeper/test/distributed_lock_zookeeper.cpp
index 75747a4da9..cd24419eb1 100644
--- a/src/zookeeper/test/distributed_lock_zookeeper.cpp
+++ b/src/zookeeper/test/distributed_lock_zookeeper.cpp
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <chrono>
 #include <cstdint>
 #include <string>
diff --git a/src/zookeeper/zookeeper_session.cpp b/src/zookeeper/zookeeper_session.cpp
index 380eafa0b0..aa2643dd9a 100644
--- a/src/zookeeper/zookeeper_session.cpp
+++ b/src/zookeeper/zookeeper_session.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <sasl/sasl.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <zookeeper/zookeeper.h>
 #include <algorithm>
 #include <utility>
diff --git a/src/zookeeper/zookeeper_session.h b/src/zookeeper/zookeeper_session.h
index e46f6d6a25..55d72a8f80 100644
--- a/src/zookeeper/zookeeper_session.h
+++ b/src/zookeeper/zookeeper_session.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 #include <zookeeper/zookeeper.h>
 #include <functional>
 #include <list>
diff --git a/src/zookeeper/zookeeper_session_mgr.cpp b/src/zookeeper/zookeeper_session_mgr.cpp
index ea44dbd5ff..6b986f55ba 100644
--- a/src/zookeeper/zookeeper_session_mgr.cpp
+++ b/src/zookeeper/zookeeper_session_mgr.cpp
@@ -26,7 +26,7 @@
 
 #include "zookeeper_session_mgr.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <zookeeper/zookeeper.h>
 #include <functional>