diff --git a/src/shell/commands/debugger.cpp b/src/shell/commands/debugger.cpp
index 45f3f522e41..e5a6413253f 100644
--- a/src/shell/commands/debugger.cpp
+++ b/src/shell/commands/debugger.cpp
@@ -64,6 +64,7 @@
 #include "utils/blob.h"
 #include "utils/filesystem.h"
 #include "utils/fmt_logging.h"
+#include "utils/strings.h"
 
 bool sst_dump(command_executor *e, shell_context *sc, arguments args)
 {
diff --git a/src/tools/mutation_log_tool.cpp b/src/tools/mutation_log_tool.cpp
index 72ac90d8955..b68a4979b53 100644
--- a/src/tools/mutation_log_tool.cpp
+++ b/src/tools/mutation_log_tool.cpp
@@ -31,8 +31,10 @@
 #include <vector>
 
 #include "common/fs_manager.h"
+#include "common/gpid.h"
 #include "consensus_types.h"
 #include "dsn.layer2_types.h"
+#include "fmt/core.h"
 #include "replica/mutation.h"
 #include "replica/mutation_log.h"
 #include "replica/replica.h"
diff --git a/src/tools/mutation_log_tool.h b/src/tools/mutation_log_tool.h
index d80a7adb4f7..5ac17ac2bc8 100644
--- a/src/tools/mutation_log_tool.h
+++ b/src/tools/mutation_log_tool.h
@@ -34,6 +34,7 @@
 #include "common/gpid.h"
 
 namespace dsn {
+class gpid;
 class message_ex;
 
 namespace replication {