diff --git a/src/block_service/local/local_service.h b/src/block_service/local/local_service.h
index 549ced4019..daea16ed4d 100644
--- a/src/block_service/local/local_service.h
+++ b/src/block_service/local/local_service.h
@@ -22,6 +22,7 @@
 #include <nlohmann/json_fwd.hpp> // IWYU pragma: keep
 #include <stdint.h>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "block_service/block_service.h"
diff --git a/src/test/function_test/bulk_load/test_bulk_load.cpp b/src/test/function_test/bulk_load/test_bulk_load.cpp
index 17bd8aed72..3e1c7b3f47 100644
--- a/src/test/function_test/bulk_load/test_bulk_load.cpp
+++ b/src/test/function_test/bulk_load/test_bulk_load.cpp
@@ -16,8 +16,6 @@
 // under the License.
 
 #include <fmt/core.h>
-#include <nlohmann/json.hpp>
-#include <nlohmann/json_fwd.hpp>
 #include <rocksdb/env.h>
 #include <rocksdb/options.h>
 #include <rocksdb/slice.h>
@@ -26,7 +24,6 @@
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
-#include <iostream>
 #include <map>
 #include <memory>
 #include <string>
@@ -41,22 +38,21 @@
 #include "bulk_load_types.h"
 #include "client/partition_resolver.h"
 #include "client/replication_ddl_client.h"
+#include "common/bulk_load_common.h"
 #include "common/json_helper.h"
 #include "gtest/gtest.h"
-#include "include/pegasus/client.h"
-#include "include/pegasus/error.h"
 #include "meta/meta_bulk_load_service.h"
+#include "metadata_types.h"
 #include "test/function_test/utils/global_env.h"
 #include "test/function_test/utils/test_util.h"
 #include "utils/blob.h"
-#include "utils/enum_helper.h"
 #include "utils/env.h"
 #include "utils/error_code.h"
 #include "utils/errors.h"
 #include "utils/filesystem.h"
 #include "utils/flags.h"
 #include "utils/test_macros.h"
-#include "utils/singleton.h"
+#include "utils/utils.h"
 
 DSN_DECLARE_bool(encrypt_data_at_rest);
 
diff --git a/src/test/function_test/utils/test_util.cpp b/src/test/function_test/utils/test_util.cpp
index 53c489a9d3..857d7148a8 100644
--- a/src/test/function_test/utils/test_util.cpp
+++ b/src/test/function_test/utils/test_util.cpp
@@ -49,6 +49,7 @@
 #include "utils/errors.h"
 #include "utils/filesystem.h"
 #include "utils/rand.h"
+#include "utils/test_macros.h"
 
 using dsn::partition_configuration;
 using dsn::replication::replica_helper;
diff --git a/src/test/function_test/utils/test_util.h b/src/test/function_test/utils/test_util.h
index 766f2a4136..885775f790 100644
--- a/src/test/function_test/utils/test_util.h
+++ b/src/test/function_test/utils/test_util.h
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>