diff --git a/src/meta/meta_state_service_simple.h b/src/meta/meta_state_service_simple.h
index 660c02ee17..f563f6c1bf 100644
--- a/src/meta/meta_state_service_simple.h
+++ b/src/meta/meta_state_service_simple.h
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include <fmt/core.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <functional>
diff --git a/src/meta/test/backup_test.cpp b/src/meta/test/backup_test.cpp
index fa05e66738..f3ec80d140 100644
--- a/src/meta/test/backup_test.cpp
+++ b/src/meta/test/backup_test.cpp
@@ -26,7 +26,6 @@
 #include <set>
 #include <string>
 #include <thread>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/src/meta/test/dump_file.cpp b/src/meta/test/dump_file.cpp
index b1528c8816..0f6347cbcd 100644
--- a/src/meta/test/dump_file.cpp
+++ b/src/meta/test/dump_file.cpp
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <fcntl.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/nfs/nfs_server_impl.h b/src/nfs/nfs_server_impl.h
index 1f1789b110..f76126cee0 100644
--- a/src/nfs/nfs_server_impl.h
+++ b/src/nfs/nfs_server_impl.h
@@ -33,7 +33,6 @@
 #include <utility>
 
 #include "aio/file_io.h"
-#include "fmt/core.h"
 #include "nfs_code_definition.h"
 #include "nfs_types.h"
 #include "runtime/serverlet.h"
diff --git a/src/server/result_writer.cpp b/src/server/result_writer.cpp
index 5629106b90..b55b10d939 100644
--- a/src/server/result_writer.cpp
+++ b/src/server/result_writer.cpp
@@ -21,6 +21,7 @@
 
 #include <pegasus/error.h>
 #include <chrono>
+#include <type_traits>
 #include <utility>
 
 #include "pegasus/client.h"
diff --git a/src/utils/alloc.h b/src/utils/alloc.h
index bc57df90b6..16045b3b5b 100644
--- a/src/utils/alloc.h
+++ b/src/utils/alloc.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <fmt/format.h>
-#include <stdint.h>
 #include <algorithm> // IWYU pragma: keep
 #include <cstddef>
 #include <functional>
diff --git a/src/utils/logging.cpp b/src/utils/logging.cpp
index 6fa7261c13..1ef383fc9f 100644
--- a/src/utils/logging.cpp
+++ b/src/utils/logging.cpp
@@ -142,6 +142,7 @@ static void log_on_sys_exit(::dsn::sys_exit_type)
 {
     g_stderr_logger->flush();
     g_file_logger->flush();
+    log_cmds.clear();
 }
 
 void dsn_log_init(const std::string &log_dir, const std::string &role_name)
diff --git a/src/utils/logging.h b/src/utils/logging.h
index 5f67ad1e2a..13228a1b77 100644
--- a/src/utils/logging.h
+++ b/src/utils/logging.h
@@ -17,16 +17,12 @@
 
 #pragma once
 
-#include <fmt/format.h>
 #include <spdlog/common.h>
 #include <spdlog/pattern_formatter.h>
 #include <ctime>
 #include <memory>
 #include <string>
 
-#include "utils/enum_helper.h"
-#include "utils/fmt_utils.h"
-
 namespace spdlog {
 namespace details {
 struct log_msg;