diff --git a/src/paimon/common/predicate/predicate_utils.h b/include/paimon/predicate/predicate_utils.h
similarity index 96%
rename from src/paimon/common/predicate/predicate_utils.h
rename to include/paimon/predicate/predicate_utils.h
index b5e030b2..4e48ae54 100644
--- a/src/paimon/common/predicate/predicate_utils.h
+++ b/include/paimon/predicate/predicate_utils.h
@@ -24,7 +24,6 @@
 #include <string>
 #include <vector>
 
-#include "fmt/format.h"
 #include "paimon/predicate/function.h"
 #include "paimon/predicate/function_visitor.h"
 #include "paimon/predicate/leaf_predicate.h"
@@ -114,8 +113,8 @@ class PAIMON_EXPORT PredicateUtils {
                 return visitor->VisitLike(predicate->Literals()[0]);
             }
             default:
-                return Status::Invalid(fmt::format("invalid {} function in leaf predicate",
-                                                   predicate->GetFunction().ToString()));
+                return Status::Invalid("invalid " + predicate->GetFunction().ToString() +
+                                       " function in leaf predicate");
         }
     }
 
diff --git a/src/paimon/common/predicate/predicate_utils.cpp b/src/paimon/common/predicate/predicate_utils.cpp
index 57c3a49b..0783a2af 100644
--- a/src/paimon/common/predicate/predicate_utils.cpp
+++ b/src/paimon/common/predicate/predicate_utils.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "paimon/common/predicate/predicate_utils.h"
+#include "paimon/predicate/predicate_utils.h"
 
 #include <utility>
 
diff --git a/src/paimon/common/predicate/predicate_utils_test.cpp b/src/paimon/common/predicate/predicate_utils_test.cpp
index 79224b39..d82961ab 100644
--- a/src/paimon/common/predicate/predicate_utils_test.cpp
+++ b/src/paimon/common/predicate/predicate_utils_test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "paimon/common/predicate/predicate_utils.h"
+#include "paimon/predicate/predicate_utils.h"
 
 #include <utility>
 
diff --git a/src/paimon/core/global_index/global_index_evaluator_impl.cpp b/src/paimon/core/global_index/global_index_evaluator_impl.cpp
index 2273e7d6..79b7cff4 100644
--- a/src/paimon/core/global_index/global_index_evaluator_impl.cpp
+++ b/src/paimon/core/global_index/global_index_evaluator_impl.cpp
@@ -17,9 +17,9 @@
 #include "paimon/core/global_index/global_index_evaluator_impl.h"
 
 #include "fmt/format.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/global_index/bitmap_global_index_result.h"
 #include "paimon/predicate/leaf_predicate.h"
+#include "paimon/predicate/predicate_utils.h"
 
 namespace paimon {
 Result<std::optional<std::shared_ptr<GlobalIndexResult>>> GlobalIndexEvaluatorImpl::Evaluate(
diff --git a/src/paimon/core/io/file_index_evaluator.cpp b/src/paimon/core/io/file_index_evaluator.cpp
index 7127c2f2..af7d550d 100644
--- a/src/paimon/core/io/file_index_evaluator.cpp
+++ b/src/paimon/core/io/file_index_evaluator.cpp
@@ -26,7 +26,6 @@
 #include "arrow/type.h"
 #include "fmt/format.h"
 #include "fmt/ranges.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/utils/arrow/status_utils.h"
 #include "paimon/common/utils/date_time_utils.h"
 #include "paimon/common/utils/field_type_utils.h"
@@ -42,6 +41,7 @@
 #include "paimon/predicate/leaf_predicate.h"
 #include "paimon/predicate/literal.h"
 #include "paimon/predicate/predicate.h"
+#include "paimon/predicate/predicate_utils.h"
 #include "paimon/status.h"
 
 namespace paimon {
diff --git a/src/paimon/core/operation/append_only_file_store_scan.cpp b/src/paimon/core/operation/append_only_file_store_scan.cpp
index 679223d9..7628468c 100644
--- a/src/paimon/core/operation/append_only_file_store_scan.cpp
+++ b/src/paimon/core/operation/append_only_file_store_scan.cpp
@@ -28,7 +28,6 @@
 #include "arrow/type.h"
 #include "fmt/format.h"
 #include "paimon/common/predicate/predicate_filter.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/types/data_field.h"
 #include "paimon/core/core_options.h"
 #include "paimon/core/io/data_file_meta.h"
@@ -40,6 +39,7 @@
 #include "paimon/core/stats/simple_stats_evolutions.h"
 #include "paimon/core/utils/field_mapping.h"
 #include "paimon/file_index/file_index_result.h"
+#include "paimon/predicate/predicate_utils.h"
 #include "paimon/status.h"
 
 namespace paimon {
diff --git a/src/paimon/core/operation/file_store_scan.cpp b/src/paimon/core/operation/file_store_scan.cpp
index ae246b6f..78d639a8 100644
--- a/src/paimon/core/operation/file_store_scan.cpp
+++ b/src/paimon/core/operation/file_store_scan.cpp
@@ -29,7 +29,6 @@
 #include "paimon/common/data/binary_array.h"
 #include "paimon/common/executor/future.h"
 #include "paimon/common/predicate/literal_converter.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/types/data_field.h"
 #include "paimon/common/utils/field_type_utils.h"
 #include "paimon/core/io/data_file_meta.h"
@@ -48,6 +47,7 @@
 #include "paimon/predicate/literal.h"
 #include "paimon/predicate/predicate.h"
 #include "paimon/predicate/predicate_builder.h"
+#include "paimon/predicate/predicate_utils.h"
 #include "paimon/scan_context.h"
 
 namespace paimon {
diff --git a/src/paimon/core/operation/key_value_file_store_scan.cpp b/src/paimon/core/operation/key_value_file_store_scan.cpp
index fbd0dc66..7b649c04 100644
--- a/src/paimon/core/operation/key_value_file_store_scan.cpp
+++ b/src/paimon/core/operation/key_value_file_store_scan.cpp
@@ -27,7 +27,6 @@
 #include "paimon/common/data/binary_array.h"
 #include "paimon/common/data/binary_row.h"
 #include "paimon/common/predicate/predicate_filter.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/utils/object_utils.h"
 #include "paimon/core/core_options.h"
 #include "paimon/core/io/data_file_meta.h"
@@ -37,6 +36,7 @@
 #include "paimon/core/stats/simple_stats_evolution.h"
 #include "paimon/core/stats/simple_stats_evolutions.h"
 #include "paimon/predicate/predicate.h"
+#include "paimon/predicate/predicate_utils.h"
 
 namespace arrow {
 class Schema;
diff --git a/src/paimon/core/operation/merge_file_split_read.cpp b/src/paimon/core/operation/merge_file_split_read.cpp
index 1f613312..bffe3ca0 100644
--- a/src/paimon/core/operation/merge_file_split_read.cpp
+++ b/src/paimon/core/operation/merge_file_split_read.cpp
@@ -27,7 +27,6 @@
 #include "arrow/c/abi.h"
 #include "arrow/c/bridge.h"
 #include "arrow/type.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/reader/complete_row_kind_batch_reader.h"
 #include "paimon/common/reader/concat_batch_reader.h"
 #include "paimon/common/table/special_fields.h"
@@ -64,6 +63,7 @@
 #include "paimon/core/utils/file_store_path_factory.h"
 #include "paimon/core/utils/primary_key_table_utils.h"
 #include "paimon/memory/memory_pool.h"
+#include "paimon/predicate/predicate_utils.h"
 #include "paimon/reader/file_batch_reader.h"
 #include "paimon/table/source/data_split.h"
 #include "paimon/utils/roaring_bitmap32.h"
diff --git a/src/paimon/core/utils/field_mapping.cpp b/src/paimon/core/utils/field_mapping.cpp
index 1b25ae29..0809cd94 100644
--- a/src/paimon/core/utils/field_mapping.cpp
+++ b/src/paimon/core/utils/field_mapping.cpp
@@ -25,7 +25,6 @@
 #include "fmt/format.h"
 #include "paimon/common/predicate/compound_predicate_impl.h"
 #include "paimon/common/predicate/leaf_predicate_impl.h"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/utils/field_type_utils.h"
 #include "paimon/common/utils/object_utils.h"
 #include "paimon/core/casting/cast_executor_factory.h"
@@ -33,6 +32,7 @@
 #include "paimon/defs.h"
 #include "paimon/predicate/literal.h"
 #include "paimon/predicate/predicate_builder.h"
+#include "paimon/predicate/predicate_utils.h"
 #include "paimon/status.h"
 
 namespace paimon {
diff --git a/src/paimon/format/orc/predicate_converter.cpp b/src/paimon/format/orc/predicate_converter.cpp
index c470d11d..0902f469 100644
--- a/src/paimon/format/orc/predicate_converter.cpp
+++ b/src/paimon/format/orc/predicate_converter.cpp
@@ -24,7 +24,6 @@
 #include "orc/Type.hh"
 #include "orc/sargs/Literal.hh"
 #include "orc/sargs/SearchArgument.hh"
-#include "paimon/common/predicate/predicate_utils.h"
 #include "paimon/common/utils/field_type_utils.h"
 #include "paimon/data/decimal.h"
 #include "paimon/data/timestamp.h"
@@ -34,6 +33,7 @@
 #include "paimon/predicate/leaf_predicate.h"
 #include "paimon/predicate/literal.h"
 #include "paimon/predicate/predicate.h"
+#include "paimon/predicate/predicate_utils.h"
 
 namespace paimon::orc {