diff --git a/tooling/static/connection/asio/asio_server.cpp b/tooling/static/connection/asio/asio_server.cpp
index d7f0af572a365fd3fa98374f8414e9d5ece6b6e8..5e0f037880c4c542493591d78423395224ce8174 100644
--- a/tooling/static/connection/asio/asio_server.cpp
+++ b/tooling/static/connection/asio/asio_server.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -23,8 +23,8 @@
 #include "websocketpp/http/constants.hpp"
 #include "websocketpp/uri.hpp"
 
-#include "utils/json_builder.h"
-#include "utils/logger.h"
+#include "libarkbase/utils/json_builder.h"
+#include "libarkbase/utils/logger.h"
 
 #include "connection/asio/asio_config.h"
 
diff --git a/tooling/static/connection/asio/ws_logger.cpp b/tooling/static/connection/asio/ws_logger.cpp
index 8b895ba510a3ad664bd9ce5e4d84e70b33942288..ba1c9450108e6b73486199a1b4a9290db5de8d73 100644
--- a/tooling/static/connection/asio/ws_logger.cpp
+++ b/tooling/static/connection/asio/ws_logger.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -17,8 +17,8 @@
 
 #include "websocketpp/logger/levels.hpp"
 
-#include "macros.h"
-#include "utils/logger.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/logger.h"
 
 namespace ark::tooling::inspector {
 void WsLogger::set_channels(Level channels)
diff --git a/tooling/static/connection/asio/ws_logger.h b/tooling/static/connection/asio/ws_logger.h
index b5ecbf414b2d8576bad35dac4ebe10c9a8f21068..7aeffcb49c13eefd0508dec7cd75e9b85cc3172f 100644
--- a/tooling/static/connection/asio/ws_logger.h
+++ b/tooling/static/connection/asio/ws_logger.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -20,7 +20,7 @@
 
 #include "websocketpp/logger/levels.hpp"
 
-#include "utils/logger.h"
+#include "libarkbase/utils/logger.h"
 
 namespace ark::tooling::inspector {
 class WsLogger {
diff --git a/tooling/static/connection/endpoint_base.cpp b/tooling/static/connection/endpoint_base.cpp
index 5f06a37afdfd4d1e0981b6dcb18a2befccdd3592..3a60f662ea39a583f1fac79a420ebb2b1676f06f 100644
--- a/tooling/static/connection/endpoint_base.cpp
+++ b/tooling/static/connection/endpoint_base.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -17,9 +17,9 @@
 
 #include <optional>
 
-#include "utils/json_builder.h"
-#include "utils/json_parser.h"
-#include "utils/logger.h"
+#include "libarkbase/utils/json_builder.h"
+#include "libarkbase/utils/json_parser.h"
+#include "libarkbase/utils/logger.h"
 
 namespace ark::tooling::inspector {
 void EndpointBase::OnCall(const char *method, EndpointBase::MethodHandler &&handler)
diff --git a/tooling/static/connection/endpoint_base.h b/tooling/static/connection/endpoint_base.h
index 629bd741bdea9842ca5008d9c498908e8c78d752..23956beb839cd8910a63deb77447011bc8df2600 100644
--- a/tooling/static/connection/endpoint_base.h
+++ b/tooling/static/connection/endpoint_base.h
@@ -23,8 +23,8 @@
 #include <unordered_map>
 #include <utility>
 
-#include "utils/json_builder.h"
-#include "utils/logger.h"
+#include "libarkbase/utils/json_builder.h"
+#include "libarkbase/utils/logger.h"
 
 #include "json_serialization/jrpc_error.h"
 
diff --git a/tooling/static/connection/event_loop.cpp b/tooling/static/connection/event_loop.cpp
index c55b4da3134127dab232ac7136e671f7583ae0bd..b126c7c80a659757fc1c042f91ff176561ed102d 100644
--- a/tooling/static/connection/event_loop.cpp
+++ b/tooling/static/connection/event_loop.cpp
@@ -15,7 +15,7 @@
 
 #include "connection/event_loop.h"
 
-#include "macros.h"
+#include "libarkbase/macros.h"
 
 namespace ark::tooling::inspector {
 bool EventLoop::Kill()
diff --git a/tooling/static/connection/event_loop.h b/tooling/static/connection/event_loop.h
index 73e2f518fdcf0a01a949eb4b72e75386222c6881..089567a97cd61f0e9052eff356333d8d26c19342 100644
--- a/tooling/static/connection/event_loop.h
+++ b/tooling/static/connection/event_loop.h
@@ -18,7 +18,7 @@
 
 #include <atomic>
 
-#include "os/mutex.h"
+#include "libarkbase/os/mutex.h"
 
 namespace ark::tooling::inspector {
 class EventLoop {
diff --git a/tooling/static/connection/ohos_ws/ohos_ws_server.cpp b/tooling/static/connection/ohos_ws/ohos_ws_server.cpp
index 5d9e8065987e9c95b01e45a3de35482b4940356c..83eeaabfea8560f6e2edb1a21ce67b55149ffcdc 100644
--- a/tooling/static/connection/ohos_ws/ohos_ws_server.cpp
+++ b/tooling/static/connection/ohos_ws/ohos_ws_server.cpp
@@ -17,8 +17,8 @@
 
 #include <string_view>
 
-#include "os/thread.h"
-#include "utils/logger.h"
+#include "libarkbase/os/thread.h"
+#include "libarkbase/utils/logger.h"
 
 #include "inspector.h"
 namespace ark::tooling::inspector {
diff --git a/tooling/static/connection/server.h b/tooling/static/connection/server.h
index 46ef13fdf07f34ae5315526a15b7b96b859d50cf..afc6712ad92788cd53d70794002f61702e67632a 100644
--- a/tooling/static/connection/server.h
+++ b/tooling/static/connection/server.h
@@ -19,8 +19,8 @@
 #include <functional>
 
 #include "json_serialization/serializable.h"
-#include "libpandabase/utils/expected.h"
-#include "libpandabase/utils/json_builder.h"
+#include "libarkbase/utils/expected.h"
+#include "libarkbase/utils/json_builder.h"
 
 #include "connection/event_loop.h"
 #include "json_serialization/jrpc_error.h"
diff --git a/tooling/static/connection/server_endpoint_base.cpp b/tooling/static/connection/server_endpoint_base.cpp
index bedbc97628f0f79c686da0f833449acd61355b79..e2434a3daec51bf11a258e433735b0901faa023b 100644
--- a/tooling/static/connection/server_endpoint_base.cpp
+++ b/tooling/static/connection/server_endpoint_base.cpp
@@ -15,7 +15,7 @@
 
 #include "connection/server_endpoint_base.h"
 
-#include "utils/logger.h"
+#include "libarkbase/utils/logger.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/debugger/breakpoint_storage.cpp b/tooling/static/debugger/breakpoint_storage.cpp
index f0a7185fb51c894467e087113870de5acf2565ff..77c425f7b48686d22c252c6d9e069e370814a88b 100644
--- a/tooling/static/debugger/breakpoint_storage.cpp
+++ b/tooling/static/debugger/breakpoint_storage.cpp
@@ -17,7 +17,7 @@
 
 #include "breakpoint.h"
 #include "conditional_breakpoint.h"
-#include "os/mutex.h"
+#include "libarkbase/os/mutex.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/debugger/debug_info_cache.cpp b/tooling/static/debugger/debug_info_cache.cpp
index f527cbd133f65abe3a17b3c68f42f9c7976a9fda..18c54cff5ae52299b269475b429fc2d6ae71b273 100644
--- a/tooling/static/debugger/debug_info_cache.cpp
+++ b/tooling/static/debugger/debug_info_cache.cpp
@@ -17,9 +17,9 @@
 
 #include "libarkfile/debug_info_extractor.h"
 #include "include/tooling/pt_location.h"
-#include "libpandabase/utils/bit_utils.h"
+#include "libarkbase/utils/bit_utils.h"
 #include "libarkfile/method_data_accessor.h"
-#include "os/mutex.h"
+#include "libarkbase/os/mutex.h"
 
 namespace ark::tooling::inspector {
 void DebugInfoCache::AddPandaFile(const panda_file::File &file, bool isUserPandafile)
diff --git a/tooling/static/debugger/object_repository.h b/tooling/static/debugger/object_repository.h
index 1a6bc281ccb38833cba66897430c843787a6f334..07dbe1ae8b0b919e1ae8bfbc48a547d4414e1eee 100644
--- a/tooling/static/debugger/object_repository.h
+++ b/tooling/static/debugger/object_repository.h
@@ -18,7 +18,7 @@
 
 #include "include/tooling/debug_interface.h"
 #include "include/typed_value.h"
-#include "os/mutex.h"
+#include "libarkbase/os/mutex.h"
 #include "runtime/handle_scope.h"
 
 #include "types/numeric_id.h"
diff --git a/tooling/static/debugger/thread_state.cpp b/tooling/static/debugger/thread_state.cpp
index 94554d9c7f79fb045ae64e36990aad416a1204a8..4c0ba78259d238386ed7d9c85a374eb44751befd 100644
--- a/tooling/static/debugger/thread_state.cpp
+++ b/tooling/static/debugger/thread_state.cpp
@@ -20,7 +20,7 @@
 #include <sstream>
 
 #include "include/tooling/pt_location.h"
-#include "macros.h"
+#include "libarkbase/macros.h"
 #include "breakpoint.h"
 #include "error.h"
 #include "types/numeric_id.h"
diff --git a/tooling/static/error.cpp b/tooling/static/error.cpp
index 7ed13adacc30101371f839a41f73bbb4f4cc5167..eddbfa23befd090283b03277e793efcf8ab086fd 100644
--- a/tooling/static/error.cpp
+++ b/tooling/static/error.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -15,7 +15,7 @@
 
 #include "error.h"
 
-#include "utils/logger.h"
+#include "libarkbase/utils/logger.h"
 
 namespace ark::tooling::inspector {
 bool HandleError(std::optional<Error> &&error)
diff --git a/tooling/static/evaluation/base64.h b/tooling/static/evaluation/base64.h
index 0b10e6797dc4f36bfd31e6f791d0afde3516fbe0..98530f94f2b47dd33fdee63657421f0d68c7b5ab 100644
--- a/tooling/static/evaluation/base64.h
+++ b/tooling/static/evaluation/base64.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -20,8 +20,8 @@
 #include <optional>
 #include <string>
 
-#include "libpandabase/macros.h"
-#include "libpandabase/utils/span.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/span.h"
 
 namespace ark::tooling::inspector {
 class Base64Decoder final {
diff --git a/tooling/static/inspector.cpp b/tooling/static/inspector.cpp
index cc55c7c02d0e053e04650416edec6db8af47d33a..08044c3d6bf88b30faebae85cd7354f95fc21db7 100644
--- a/tooling/static/inspector.cpp
+++ b/tooling/static/inspector.cpp
@@ -21,10 +21,10 @@
 #include <vector>
 
 #include "debugger/breakpoint.h"
-#include "macros.h"
-#include "os/mutex.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/os/mutex.h"
 #include "include/runtime.h"
-#include "utils/logger.h"
+#include "libarkbase/utils/logger.h"
 
 #include "error.h"
 #include "evaluation/base64.h"
diff --git a/tooling/static/inspector.h b/tooling/static/inspector.h
index e81e29a6a2019e395a6eb3f29e86bbc6e4bd8a64..efed04d436b9c31bf779c4e2f5b1ee47505dd1de 100644
--- a/tooling/static/inspector.h
+++ b/tooling/static/inspector.h
@@ -35,7 +35,7 @@
 #include "common.h"
 #include "inspector_server.h"
 #include "runtime/tooling/tools.h"
-#include "os/mutex.h"
+#include "libarkbase/os/mutex.h"
 #include "types/evaluation_result.h"
 #include "types/numeric_id.h"
 #include "types/pause_on_exceptions_state.h"
diff --git a/tooling/static/inspector_server.cpp b/tooling/static/inspector_server.cpp
index 5130066c12cefc4fb00462150ff98bc23a7aed6b..da56b5ad10930ea8268bb1febd71f22ddbf78a6a 100644
--- a/tooling/static/inspector_server.cpp
+++ b/tooling/static/inspector_server.cpp
@@ -24,11 +24,11 @@
 #include "include/console_call_type.h"
 #include "include/tooling/pt_thread.h"
 #include "json_serialization/serializable.h"
-#include "macros.h"
-#include "utils/expected.h"
-#include "utils/json_builder.h"
-#include "utils/json_parser.h"
-#include "utils/logger.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/expected.h"
+#include "libarkbase/utils/json_builder.h"
+#include "libarkbase/utils/json_parser.h"
+#include "libarkbase/utils/logger.h"
 
 #include "connection/server.h"
 #include "json_serialization/jrpc_error.h"
diff --git a/tooling/static/json_serialization/jrpc_error.cpp b/tooling/static/json_serialization/jrpc_error.cpp
index 0d2105bdab8fbb16e2234308fe59eeab4fa5398f..ab33d68718e411601932c6d95c747a7a82624999 100644
--- a/tooling/static/json_serialization/jrpc_error.cpp
+++ b/tooling/static/json_serialization/jrpc_error.cpp
@@ -15,7 +15,7 @@
 
 #include "json_serialization/jrpc_error.h"
 
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/json_serialization/serializable.h b/tooling/static/json_serialization/serializable.h
index 4cf3ba93a4232803751412d7f45e5e5234557201..e0d28ef96961bc3752b6550bff76db2d3f1e9593 100644
--- a/tooling/static/json_serialization/serializable.h
+++ b/tooling/static/json_serialization/serializable.h
@@ -16,7 +16,7 @@
 #ifndef PANDA_TOOLING_INSPECTOR_JSON_SERIALIZATION_SERIALIZABLE_H
 #define PANDA_TOOLING_INSPECTOR_JSON_SERIALIZATION_SERIALIZABLE_H
 
-#include "macros.h"
+#include "libarkbase/macros.h"
 
 namespace ark {
 class JsonObjectBuilder;
diff --git a/tooling/static/source_manager.h b/tooling/static/source_manager.h
index 8b77611e4a87f177dd083def19d2d621eef8747d..3ea349effe29636800ca6869fa968b60aaece4cf 100644
--- a/tooling/static/source_manager.h
+++ b/tooling/static/source_manager.h
@@ -24,7 +24,7 @@
 #include <utility>
 
 #include "include/tooling/pt_thread.h"
-#include "os/mutex.h"
+#include "libarkbase/os/mutex.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/tests/common.h b/tooling/static/tests/common.h
index 4608bedef2b9f4a493b894527b0de73b3d23b104..098cb3d2a0f5ff33233038c0e035591b634fa521 100644
--- a/tooling/static/tests/common.h
+++ b/tooling/static/tests/common.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -16,8 +16,8 @@
 #ifndef PANDA_TOOLING_INSPECTOR_TEST_COMMON_H
 #define PANDA_TOOLING_INSPECTOR_TEST_COMMON_H
 
-#include "utils/json_builder.h"
-#include "utils/json_parser.h"
+#include "libarkbase/utils/json_builder.h"
+#include "libarkbase/utils/json_parser.h"
 
 namespace ark::tooling::inspector::test {
 template <typename T>
diff --git a/tooling/static/tests/inspector_server.cpp b/tooling/static/tests/inspector_server.cpp
index 9eeefa86112a973b994ea2b89bca241c0659070e..60e444d139bf184195811cd8de7336098bf61519 100644
--- a/tooling/static/tests/inspector_server.cpp
+++ b/tooling/static/tests/inspector_server.cpp
@@ -22,7 +22,7 @@
 #include "assembly-parser.h"
 #include "runtime.h"
 #include "types/location.h"
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 #include "connection/server.h"
 
diff --git a/tooling/static/tests/json_object_matcher.h b/tooling/static/tests/json_object_matcher.h
index e6fb9bcf8464caf7891bc9e6382e1e9069251b17..4211ec8c0f0a3148e0471cac88a5c45c311cfec3 100644
--- a/tooling/static/tests/json_object_matcher.h
+++ b/tooling/static/tests/json_object_matcher.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -27,8 +27,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "macros.h"
-#include "utils/json_parser.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/json_parser.h"
 
 // NOLINTBEGIN
 
diff --git a/tooling/static/tests/test_frame.h b/tooling/static/tests/test_frame.h
index 74160a6513004edb0568316380ed5a8fbbab4efb..2752e9288abfc23e4d40c56ccb3b9e7f69bc366d 100644
--- a/tooling/static/tests/test_frame.h
+++ b/tooling/static/tests/test_frame.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -23,8 +23,8 @@
 #include "include/method.h"
 #include "include/tooling/debug_interface.h"
 #include "include/tooling/pt_thread.h"
-#include "macros.h"
-#include "utils/list.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/list.h"
 
 // NOLINTBEGIN
 
diff --git a/tooling/static/types/custom_url_breakpoint_response.cpp b/tooling/static/types/custom_url_breakpoint_response.cpp
index a9c5c7e41ab85918a9c22a2f7cadcf74bdc5e295..6069e8a0dfb9be2861cbc960d69a3595a2b45864 100644
--- a/tooling/static/types/custom_url_breakpoint_response.cpp
+++ b/tooling/static/types/custom_url_breakpoint_response.cpp
@@ -15,7 +15,7 @@
 
 #include "types/custom_url_breakpoint_response.h"
 
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/types/custom_url_breakpoint_response.h b/tooling/static/types/custom_url_breakpoint_response.h
index 3a4090c4db02a3584ad2b0781834a8733bca3e5a..377fa4b36dfd345b864a55635ee6186e240be706 100644
--- a/tooling/static/types/custom_url_breakpoint_response.h
+++ b/tooling/static/types/custom_url_breakpoint_response.h
@@ -20,7 +20,7 @@
 
 #include <optional>
 
-#include "macros.h"
+#include "libarkbase/macros.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/types/debugger_call_function_on_request.cpp b/tooling/static/types/debugger_call_function_on_request.cpp
index d1242a2cbd8cbbd34882e1593d4a9a0925790386..ea4a556f535f8aa1b9641ef7ce2314c85eb1e66a 100644
--- a/tooling/static/types/debugger_call_function_on_request.cpp
+++ b/tooling/static/types/debugger_call_function_on_request.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "types/debugger_call_function_on_request.h"
-#include "utils/json_parser.h"
+#include "libarkbase/utils/json_parser.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/types/debugger_call_function_on_request.h b/tooling/static/types/debugger_call_function_on_request.h
index 4fb58ddf1eff02ca88340be9878a614490258612..c0fe05001f57049f4213557e6c49a2879023558c 100644
--- a/tooling/static/types/debugger_call_function_on_request.h
+++ b/tooling/static/types/debugger_call_function_on_request.h
@@ -16,8 +16,8 @@
 #ifndef PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_CALL_FUNCTION_ON_REQUEST_H
 #define PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_CALL_FUNCTION_ON_REQUEST_H
 
-#include "macros.h"
-#include "utils/expected.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/expected.h"
 
 namespace ark {
 class JsonObject;
diff --git a/tooling/static/types/debugger_evaluation_request.cpp b/tooling/static/types/debugger_evaluation_request.cpp
index 7a846714132a823dd4b1f5081e6509d13ade810f..2943e28eca3339827a5d8b9a1088a374de0bfd0f 100644
--- a/tooling/static/types/debugger_evaluation_request.cpp
+++ b/tooling/static/types/debugger_evaluation_request.cpp
@@ -15,7 +15,7 @@
 
 #include "types/debugger_evaluation_request.h"
 
-#include "utils/json_parser.h"
+#include "libarkbase/utils/json_parser.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/types/debugger_evaluation_request.h b/tooling/static/types/debugger_evaluation_request.h
index 1e2c6efcbbc51b2ac6811d3a6253b86258f0e643..3cc6b73c68f6bc17d3e4ca1ada216567858a4116 100644
--- a/tooling/static/types/debugger_evaluation_request.h
+++ b/tooling/static/types/debugger_evaluation_request.h
@@ -16,8 +16,8 @@
 #ifndef PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_EVALUATION_REQUEST_H
 #define PANDA_TOOLING_INSPECTOR_TYPES_DEBUGGER_EVALUATION_REQUEST_H
 
-#include "macros.h"
-#include "utils/expected.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/expected.h"
 
 namespace ark {
 class JsonObject;
diff --git a/tooling/static/types/evaluation_result.h b/tooling/static/types/evaluation_result.h
index 0f40ea45763caa383f9caa2edc45ba3c159852f5..0b143e098dc4a047be6792282566743c5f6eb7d3 100644
--- a/tooling/static/types/evaluation_result.h
+++ b/tooling/static/types/evaluation_result.h
@@ -18,8 +18,8 @@
 
 #include "json_serialization/serializable.h"
 
-#include "macros.h"
-#include "utils/json_builder.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/json_builder.h"
 
 #include "types/exception_details.h"
 #include "types/remote_object.h"
diff --git a/tooling/static/types/exception_details.cpp b/tooling/static/types/exception_details.cpp
index ab41461579ce52f6cb30e4586edfe55cbeead2fd..491e906f019c95dff2ef822af67c7ef014545864 100644
--- a/tooling/static/types/exception_details.cpp
+++ b/tooling/static/types/exception_details.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -15,7 +15,7 @@
 
 #include "types/exception_details.h"
 
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/types/exception_details.h b/tooling/static/types/exception_details.h
index 24edac0136389e87cba6be595b7983fc6616b986..e515e8360dac271c7b1462161805d79054ca2b8b 100644
--- a/tooling/static/types/exception_details.h
+++ b/tooling/static/types/exception_details.h
@@ -20,7 +20,7 @@
 #include <optional>
 #include <string>
 
-#include "macros.h"
+#include "libarkbase/macros.h"
 #include "types/numeric_id.h"
 #include "types/remote_object.h"
 
diff --git a/tooling/static/types/location.cpp b/tooling/static/types/location.cpp
index 3f6fbde9a907298da615f8c68197112f7d7f78c2..b1e256fcf07b2a11e719413c0ca64f6d4d93f6ab 100644
--- a/tooling/static/types/location.cpp
+++ b/tooling/static/types/location.cpp
@@ -19,9 +19,9 @@
 #include <cmath>
 #include <string>
 
-#include "utils/expected.h"
-#include "utils/json_builder.h"
-#include "utils/json_parser.h"
+#include "libarkbase/utils/expected.h"
+#include "libarkbase/utils/json_builder.h"
+#include "libarkbase/utils/json_parser.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/types/location.h b/tooling/static/types/location.h
index 44083977076c7ee1cc995b5f3c629c118d4f811a..4c846a795b33d47dd83ef1869dbfdde16497be02 100644
--- a/tooling/static/types/location.h
+++ b/tooling/static/types/location.h
@@ -22,7 +22,7 @@
 #include <optional>
 #include <string>
 
-#include "utils/expected.h"
+#include "libarkbase/utils/expected.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/types/numeric_id.h b/tooling/static/types/numeric_id.h
index 53f5c5f5f2ac13c30e111adbb0d02f05b83acaf3..385560b174320ffd178b44980cef7da0ee04a3e1 100644
--- a/tooling/static/types/numeric_id.h
+++ b/tooling/static/types/numeric_id.h
@@ -24,9 +24,9 @@
 #include <string>
 #include <type_traits>
 
-#include "utils/expected.h"
-#include "utils/json_parser.h"
-#include "utils/string_helpers.h"
+#include "libarkbase/utils/expected.h"
+#include "libarkbase/utils/json_parser.h"
+#include "libarkbase/utils/string_helpers.h"
 
 namespace ark::tooling::inspector {
 using BreakpointId = size_t;
diff --git a/tooling/static/types/object_preview.cpp b/tooling/static/types/object_preview.cpp
index 8561d65dbf0eb0a5ddd670c24c8846a082f14307..03aab802ea90cdeb11308b286d6ad19106f3600f 100644
--- a/tooling/static/types/object_preview.cpp
+++ b/tooling/static/types/object_preview.cpp
@@ -16,7 +16,7 @@
 #include "types/object_preview.h"
 #include "types/property_descriptor.h"
 
-#include "utils/string_helpers.h"
+#include "libarkbase/utils/string_helpers.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/types/possible_breakpoints_response.h b/tooling/static/types/possible_breakpoints_response.h
index 582716f47a7d21b5f51b7243619377d2c79cb4af..09aefb40d01dba5b334c47fda512f1a383fb083d 100644
--- a/tooling/static/types/possible_breakpoints_response.h
+++ b/tooling/static/types/possible_breakpoints_response.h
@@ -18,7 +18,7 @@
 
 #include "json_serialization/serializable.h"
 
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 #include "types/location.h"
 
diff --git a/tooling/static/types/profile_result.h b/tooling/static/types/profile_result.h
index f03de7aca23f5974ab06a67378cea0aef539700b..f039b8caaa6134c45e3462b257b2154343bdda37 100644
--- a/tooling/static/types/profile_result.h
+++ b/tooling/static/types/profile_result.h
@@ -18,7 +18,7 @@
 
 #include "json_serialization/serializable.h"
 #include "runtime/tooling/sampler/samples_record.h"
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 namespace ark::tooling::inspector {
 class Profile final : public JsonSerializable {
diff --git a/tooling/static/types/property_descriptor.h b/tooling/static/types/property_descriptor.h
index 2be39438269c4181acd912312e7c4a496a7f907c..b784b54adf52328938707e8e6496217a7ec2af91 100644
--- a/tooling/static/types/property_descriptor.h
+++ b/tooling/static/types/property_descriptor.h
@@ -16,7 +16,7 @@
 #ifndef PANDA_TOOLING_INSPECTOR_TYPES_PROPERTY_DESCRIPTOR_H
 #define PANDA_TOOLING_INSPECTOR_TYPES_PROPERTY_DESCRIPTOR_H
 
-#include "macros.h"
+#include "libarkbase/macros.h"
 
 #include "types/remote_object.h"
 #include "json_serialization/serializable.h"
diff --git a/tooling/static/types/remote_object.cpp b/tooling/static/types/remote_object.cpp
index 268d03496831315b072d3cbc74b123791da5c90f..b6433ba6f46d5a286f62d8bea7e97a54f937a458 100644
--- a/tooling/static/types/remote_object.cpp
+++ b/tooling/static/types/remote_object.cpp
@@ -25,8 +25,8 @@
 #include <variant>
 
 #include "libarkfile/helpers.h"
-#include "macros.h"
-#include "utils/json_builder.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/json_builder.h"
 
 #include "types/object_preview.h"
 #include "types/property_descriptor.h"
diff --git a/tooling/static/types/remote_object_type.h b/tooling/static/types/remote_object_type.h
index 9cc9790465d791359bcb78c522d8c86303caf9e9..c495fd561689fe1a0d8f072163ce589333a9e9d3 100644
--- a/tooling/static/types/remote_object_type.h
+++ b/tooling/static/types/remote_object_type.h
@@ -16,7 +16,7 @@
 #ifndef PANDA_TOOLING_INSPECTOR_TYPES_REMOTE_OBJECT_TYPE_H
 #define PANDA_TOOLING_INSPECTOR_TYPES_REMOTE_OBJECT_TYPE_H
 
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 #include "types/numeric_id.h"
 #include "json_serialization/serializable.h"
 
diff --git a/tooling/static/types/scope.cpp b/tooling/static/types/scope.cpp
index 200baf93911217efe03999c39954c81adff54dc9..f7d33d0f830050f9964f49a406855c18e4a559ff 100644
--- a/tooling/static/types/scope.cpp
+++ b/tooling/static/types/scope.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2023-2025 Huawei Device Co., Ltd.
  * Licensed 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
@@ -15,7 +15,7 @@
 
 #include "types/scope.h"
 
-#include "libpandabase/utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 namespace ark::tooling::inspector {
 static const char *GetTypeString(Scope::Type type)
diff --git a/tooling/static/types/script_source_response.h b/tooling/static/types/script_source_response.h
index 32c4486ed6baaf2eb6cb939b8c59e6895657c354..72bf18bdca7e5c226b7725ff08f91d52ec2fd596 100644
--- a/tooling/static/types/script_source_response.h
+++ b/tooling/static/types/script_source_response.h
@@ -18,8 +18,8 @@
 
 #include "json_serialization/serializable.h"
 
-#include "macros.h"
-#include "utils/json_builder.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/json_builder.h"
 
 namespace ark::tooling::inspector {
 
diff --git a/tooling/static/types/url_breakpoint_request.cpp b/tooling/static/types/url_breakpoint_request.cpp
index 1f147984808496ef4b7129e67c156ce08fb5124a..ca9096810a795809db47178b2dff530201d5b5ae 100644
--- a/tooling/static/types/url_breakpoint_request.cpp
+++ b/tooling/static/types/url_breakpoint_request.cpp
@@ -18,7 +18,7 @@
 #include <cfloat>
 #include <cmath>
 
-#include "utils/json_parser.h"
+#include "libarkbase/utils/json_parser.h"
 
 #include "types/numeric_id.h"
 
diff --git a/tooling/static/types/url_breakpoint_request.h b/tooling/static/types/url_breakpoint_request.h
index 35074ecfb3307e47f2849a3bc9705046b21dc6f3..65648d092d461684945aa794367cb639e2c2e086 100644
--- a/tooling/static/types/url_breakpoint_request.h
+++ b/tooling/static/types/url_breakpoint_request.h
@@ -18,8 +18,8 @@
 
 #include <optional>
 
-#include "macros.h"
-#include "utils/expected.h"
+#include "libarkbase/macros.h"
+#include "libarkbase/utils/expected.h"
 
 namespace ark {
 class JsonObject;
diff --git a/tooling/static/types/url_breakpoint_response.cpp b/tooling/static/types/url_breakpoint_response.cpp
index 56e423cff7c0954fc156c6b2acb258447b0237f1..948d8b9fca4641a6c00bd9543fd195bd21a62fdc 100644
--- a/tooling/static/types/url_breakpoint_response.cpp
+++ b/tooling/static/types/url_breakpoint_response.cpp
@@ -15,7 +15,7 @@
 
 #include "types/url_breakpoint_response.h"
 
-#include "utils/json_builder.h"
+#include "libarkbase/utils/json_builder.h"
 
 #include "types/custom_url_breakpoint_response.h"
 
diff --git a/tooling/static/types/url_breakpoint_response.h b/tooling/static/types/url_breakpoint_response.h
index 9985a820b1f6fe19ccafc9e1147a0352095a9ebd..7b6fead30826b3b3e66bc4c67ef827adcf8fb139 100644
--- a/tooling/static/types/url_breakpoint_response.h
+++ b/tooling/static/types/url_breakpoint_response.h
@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include "macros.h"
+#include "libarkbase/macros.h"
 
 #include "types/location.h"
 #include "types/numeric_id.h"