diff --git a/base/test/benchmarktest/README.md b/base/test/benchmarktest/README.md
index e0bbf16febcef5c4fc190c63fa7de6cf4a4f85b4..dde5604c54b4ca19bee57af4382489914ab6efb3 100644
--- a/base/test/benchmarktest/README.md
+++ b/base/test/benchmarktest/README.md
@@ -33,9 +33,9 @@ commonlibrary/c_utils/base/test
 │   ├── thread_pool_benchmark_test                  # threadpool API test
 │   ├── timer_benchmark_test                        # timer API test
 │   ├── unique_fd_benchmark_test                    # uniquefd API test
-│   ├── assert.h
+│   ├── benchmark_assert.h
 │   ├── BUILD.gn
-│   └── log.h 
+│   └── benchmark_log.h 
 ```
 
 ## Build
diff --git a/base/test/benchmarktest/README_zh.md b/base/test/benchmarktest/README_zh.md
index 79307114eb94f1bf5209dbc10969df13b6e0ff38..da14ba2752d65f411f7023e642559e09ac5f0ec4 100644
--- a/base/test/benchmarktest/README_zh.md
+++ b/base/test/benchmarktest/README_zh.md
@@ -30,9 +30,9 @@ commonlibrary/c_utils/base/test
 │   ├── thread_pool_benchmark_test                  # 线程池接口性能测试
 │   ├── timer_benchmark_test                        # 定时器接口性能测试
 │   ├── unique_fd_benchmark_test                    # 管理、传递文件描述符接口性能测试
-│   ├── assert.h
+│   ├── benchmark_assert.h
 │   ├── BUILD.gn
-│   └── log.h 
+│   └── benchmark_log.h 
 ```
 
 ## 编译构建
diff --git a/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn b/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn
index 0e6c17432544ea4d17f242ff0f731e719ac8f9ed..133bbd58fb7a13d60efc4cca78a5843c503e45e4 100644
--- a/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/ashemem_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/ashemem"
 
 ohos_benchmarktest("AshememTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp b/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp
index 86b42c430a482ce947d2a8c06bda96de44ed1c96..f1585a72da2651023cf85fad3d24fddbbc5be149 100644
--- a/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp
+++ b/base/test/benchmarktest/ashemem_benchmark_test/ashemem_benchmark_test.cpp
@@ -24,8 +24,8 @@
 #include "parcel.h"
 #include "refbase.h"
 #include "ashmem.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/assert.h b/base/test/benchmarktest/benchmark_assert.h
similarity index 100%
rename from base/test/benchmarktest/assert.h
rename to base/test/benchmarktest/benchmark_assert.h
diff --git a/base/test/benchmarktest/log.h b/base/test/benchmarktest/benchmark_log.h
similarity index 100%
rename from base/test/benchmarktest/log.h
rename to base/test/benchmarktest/benchmark_log.h
diff --git a/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn b/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn
index 6342a79f089de4cbdf231eb097ed803ed7c85da1..a0341d8d0883c625cf486f825b4d3dfc87c9a6ea 100644
--- a/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/datatime_benchmark_test/BUILD.gn
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/datatime"
 
 ohos_benchmarktest("DatatimeTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp b/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp
index 5ae547ac26262ded54735810bc9846cb20f157cb..2f98a1238f4a3f87b62234d1173ad5717b484767 100644
--- a/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp
+++ b/base/test/benchmarktest/datatime_benchmark_test/datatime_benchmark_test.cpp
@@ -17,8 +17,8 @@
 #include "datetime_ex.h"
 #include <unistd.h>
 #include <iostream>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/directory_benchmark_test/BUILD.gn b/base/test/benchmarktest/directory_benchmark_test/BUILD.gn
index d036d25d971753a0354984b4cb14260b2ebb0655..8e55741f93b7f14da5f2b2223b67cdb4ecc06679 100644
--- a/base/test/benchmarktest/directory_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/directory_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/directory"
 
 ohos_benchmarktest("DirectoryTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp b/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp
index 2a06d8f2e8cdeaf7aa1fbbab11c5598d795dde7d..7a40c95a58d09cac69cd8080a8628a3f8a2a58ac 100644
--- a/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp
+++ b/base/test/benchmarktest/directory_benchmark_test/directory_benchmark_test.cpp
@@ -20,8 +20,8 @@
 #include <iostream>
 #include <fstream>
 #include <unistd.h>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/event_benchmark_test/BUILD.gn b/base/test/benchmarktest/event_benchmark_test/BUILD.gn
index 9f9a61e254bdef219d9b030d0b7103fb06d57377..e3fa658bc11a47387912369868a0bb4f769c4bd5 100644
--- a/base/test/benchmarktest/event_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/event_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -18,7 +18,7 @@ module_output_path = "commonlibrary_c_utils/event"
 ohos_benchmarktest("EventTest") {
   module_out_path = module_output_path
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [ "../" ]
 
   cflags = [
     "-g",
diff --git a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp
index 9a1bd3f8d1f799b3c94defc84c4c127cdca387f3..d18a01812df14f1bd9ff3c24ce6a3297afd39850 100644
--- a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp
+++ b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp
@@ -35,8 +35,8 @@
 #include "io_event_handler.h"
 #include "io_event_reactor.h"
 #include <sys/time.h>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace OHOS::Utils;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/file_benchmark_test/BUILD.gn b/base/test/benchmarktest/file_benchmark_test/BUILD.gn
index d9a79e2a77f82135c6a9182f2f3c955201b49e11..06474c415576cf60543ea5a8db04c66d0709515a 100644
--- a/base/test/benchmarktest/file_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/file_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/file"
 
 ohos_benchmarktest("FileTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp
index 462b5c80339d8b8cc72c199d569e28b89b24e4d5..5be71bdd15779201970c75dc1f1983f7f771e40a 100644
--- a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp
+++ b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp
@@ -22,8 +22,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "file_ex.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn b/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn
index 4bf564f34b8a9f3f5753ea827ad9d720091c692d..93d0054a9b0fed581fbc04089b1b87227867f7d9 100644
--- a/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/mapped_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/mapped"
 
 ohos_benchmarktest("MappedTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp b/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp
index afe48a01c1310b16d11734ac88afe3c424fa386a..4ccb923c44ec92b7b0a9e9216c253cc2f17f6d97 100644
--- a/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp
+++ b/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp
@@ -23,8 +23,8 @@
 #include "directory_ex.h"
 #include "errors.h"
 #include "file_ex.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace OHOS::Utils;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/observer_benchmark_test/BUILD.gn b/base/test/benchmarktest/observer_benchmark_test/BUILD.gn
index 11ff6d62979bf7ca53b18048e09f10e6914858ec..91e0d5cd5342245cffe7e1388f454adf2d193aa4 100644
--- a/base/test/benchmarktest/observer_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/observer_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/observer"
 
 ohos_benchmarktest("ObserverTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp b/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp
index bc70868f6a9525486c6a3490d566d8bb4256243c..b2cbcb23af9545ae4dfda45696ddd24713424dde 100644
--- a/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp
+++ b/base/test/benchmarktest/observer_benchmark_test/observer_benchmark_test.cpp
@@ -18,8 +18,8 @@
 #include <algorithm>
 #include <iostream>
 #include <fstream>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn b/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn
index c8d499b4b7e2d556a1e54899af3f08d0fb4e6654..e682790e927555595f7b0f9d576be3d86d305fce 100644
--- a/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/parcel_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/parcel"
 
 ohos_benchmarktest("ParcelTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp b/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp
index 5703d724259bd26b193670181beedf0befbf9045..4974c60a2dbc17e7836eea04956faeb2908aff6b 100644
--- a/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp
+++ b/base/test/benchmarktest/parcel_benchmark_test/parcel_benchmark_test.cpp
@@ -21,8 +21,8 @@
 #include "parcel.h"
 #include "refbase.h"
 #include "securec.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn b/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn
index e6039f2e31c99f2447fc162389ff98dfd503dc8f..bfd7675279970fb4ae932414bb2d28963171bd0c 100644
--- a/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/refbase_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/refbase"
 
 ohos_benchmarktest("RefbaseTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp b/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp
index 15356896412e38ec39f77a577e461bd75ac8c8b1..f151d195c1b917c9e6f293a5e7bf195ac7089c45 100644
--- a/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp
+++ b/base/test/benchmarktest/refbase_benchmark_test/refbase_benchmark_test.cpp
@@ -24,8 +24,8 @@
 #include <mutex>
 #include "refbase.h"
 #include "singleton.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 #include <future>
 using namespace std;
 
diff --git a/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn b/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn
index c3f9c1056017302265a4ff469349f8b8a645d01a..3b90fa6bab18831c3be34254c703330fe186e557 100644
--- a/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/rwlock_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/rwlock"
 
 ohos_benchmarktest("RwlockTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp b/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp
index 5d05704707398596b27bf42db5f8408d24e5f114..866468dce3f83dd92a79711c278d006e35e3f02f 100644
--- a/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp
+++ b/base/test/benchmarktest/rwlock_benchmark_test/rwlock_benchmark_test.cpp
@@ -17,8 +17,8 @@
 #include <thread>
 #include <string>
 #include "rwlock.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn
index 1879597bf08eb756f4c9bdad44944ab989ddb885..d75b5000a8f38be7566acb6994de5df3b4df7515 100644
--- a/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_block_queue"
 
 ohos_benchmarktest("SafeBlockQueueTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp
index 5288abf863809b748eda7756ad79a28e15348be7..05a585b9f4e77798e090b492ede945967e8af43d 100644
--- a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp
+++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp
@@ -21,8 +21,8 @@
 #include <thread>
 #include <chrono>
 #include <thread>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn
index 855700021d2567b2c4bcdb2825dd6fbcc3708fed..a3348dc8153234673642e984638df2a0ba90d31b 100644
--- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_block_queue_tracking"
 
 ohos_benchmarktest("SafeBlockQueueTrackingTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp
index 5b6ecad445d34c7be44c9b3222a15aa7df1daea1..a89f26d8213eb4de20332c12648cb2ea19677f4f 100644
--- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp
+++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp
@@ -20,8 +20,8 @@
 #include <thread>
 #include <iostream>
 #include <chrono>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn
index a148b5c16f2c50aee1c530cbd595759e96d8acb4..813ca88b8abd2b5b963a88b29ab13670ebc2a0b2 100644
--- a/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/safe_map_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_map"
 
 ohos_benchmarktest("SafeMapTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp
index b3df4bf0d7f790662152ade803f94ac42b44d532..e035c1fd8a2b34df5d4c7997b26f7ca048ad5cc8 100644
--- a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp
+++ b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp
@@ -20,8 +20,8 @@
 #include <iostream>
 #include <thread>
 #include <chrono>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 using std::chrono::system_clock;
 
diff --git a/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn b/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn
index eaa16e832c89cf41ae8032ab93708063d02f7f49..36927e9e400d091fe091da8c1a9613957e3020a0 100644
--- a/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/safe_queue_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/safe_queue"
 
 ohos_benchmarktest("SafeQueueTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp
index eccd810568745b15c8067fc7427ae153c328dc4f..a5d39a9139e8a1c151ded7ad64c44b410d49a220 100644
--- a/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp
+++ b/base/test/benchmarktest/safe_queue_benchmark_test/safe_queue_benchmark_test.cpp
@@ -20,8 +20,8 @@
 #include <iostream>
 #include <thread>
 #include <chrono>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn b/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn
index e1b4d0b65817e865cefa40724e2fa6848d1d54b9..f4f26f21abc70c593388ef8734eeb89ee83f326b 100644
--- a/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/singleton_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/singleton"
 
 ohos_benchmarktest("SingletonTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp b/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp
index dfd89db6ff5f9f411c9093485e9ecf43496c033c..e82aec9b0b92a7ebbcdede12a0764598b8c671df 100644
--- a/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp
+++ b/base/test/benchmarktest/singleton_benchmark_test/singleton_benchmark_test.cpp
@@ -18,8 +18,8 @@
 #include <algorithm>
 #include <iostream>
 #include <fstream>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn b/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn
index e7e5ba69ec835f79c4f47c1935a84187df874792..bb5b94f26d56d0228dbcdf61fb15b27ea5753f45 100644
--- a/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/sorted_vector_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/sorted_vector"
 
 ohos_benchmarktest("SortedVectorTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp b/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp
index c65ba2da9db151d3630d78bf8fff5a0a38a75e9d..9acb6d119734f860fc67d7521471030e93b9020b 100644
--- a/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp
+++ b/base/test/benchmarktest/sorted_vector_benchmark_test/sorted_vector_benchmark_test.cpp
@@ -16,8 +16,8 @@
 #include <benchmark/benchmark.h>
 #include "sorted_vector.h"
 #include <iostream>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/string_benchmark_test/BUILD.gn b/base/test/benchmarktest/string_benchmark_test/BUILD.gn
index 86c2894e4b311f56ad94cbcd95edd19eed819fc4..a8d7857e201b276ebcd4c29a936cbee889ab7519 100644
--- a/base/test/benchmarktest/string_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/string_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/string"
 
 ohos_benchmarktest("StringTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp b/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp
index a236490a178d70ea7f14166c66203d4b3fa465a2..7038951a9ffee29e372731ab9c8058068d7944f0 100644
--- a/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp
+++ b/base/test/benchmarktest/string_benchmark_test/string_benchmark_test.cpp
@@ -16,8 +16,8 @@
 #include <benchmark/benchmark.h>
 #include "string_ex.h"
 #include <iostream>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/thread_benchmark_test/BUILD.gn b/base/test/benchmarktest/thread_benchmark_test/BUILD.gn
index 93a1806a063bec32a9828d1074279202c97e43b9..a564db2a76e90ae5a76aa068e3f14c13fda5d560 100644
--- a/base/test/benchmarktest/thread_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/thread_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/thread"
 
 ohos_benchmarktest("ThreadTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp b/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp
index c273fc74ea69579e6f22ca2ce15003a7340aaa35..68a9a3f73f9a76eca574e42b801754354aee07ee 100644
--- a/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp
+++ b/base/test/benchmarktest/thread_benchmark_test/thread_benchmark_test.cpp
@@ -20,8 +20,8 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 #include <sys/resource.h>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn b/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn
index 475ef62859a511d77c3aa924132e09b395583af6..1e162bed7cec44719b112961a79af273ffdc4af7 100644
--- a/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/thread_pool_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/thread_pool"
 
 ohos_benchmarktest("ThreadPoolTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp b/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp
index cecb290e9a12956cea64b786c5e8e54443b761a3..49ae526210b5315fac2fb1aa65d8b2e81a52042d 100644
--- a/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp
+++ b/base/test/benchmarktest/thread_pool_benchmark_test/thread_pool_benchmark_test.cpp
@@ -18,8 +18,8 @@
 #include <cstdio>
 #include <sys/prctl.h>
 #include "thread_pool.h"
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 #include <unistd.h>
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/timer_benchmark_test/BUILD.gn b/base/test/benchmarktest/timer_benchmark_test/BUILD.gn
index 982755276bd1d09afc6660c7b515af5fda98c3fa..d7377a308dcdb8bf674b468c3a58287607a5b007 100644
--- a/base/test/benchmarktest/timer_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/timer_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/timer"
 
 ohos_benchmarktest("TimerTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp b/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp
index 64b8b3f3aa7740ba6fbd9ff5ce39ed3d2340ebaa..d69b6497f2d290c5bbe65f59a13415083a7e3a16 100644
--- a/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp
+++ b/base/test/benchmarktest/timer_benchmark_test/timer_benchmark_test.cpp
@@ -21,8 +21,8 @@
 #include <chrono>
 #include <stdatomic.h>
 #include <sys/time.h>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {
diff --git a/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn b/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn
index 72499d1903daf3774226237c1ddec4ca0dcb27bc..a35972bdb69be62d490ea3702242fb2bbbd25ba3 100644
--- a/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn
+++ b/base/test/benchmarktest/unique_fd_benchmark_test/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/test.gni")
 
@@ -17,7 +17,7 @@ module_output_path = "commonlibrary_c_utils/unique_fd"
 
 ohos_benchmarktest("UniqueFdTest") {
   module_out_path = module_output_path
-
+  include_dirs = [ "../" ]
   cflags = [
     "-g",
     "-O0",
diff --git a/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp b/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp
index b3f66b89a4a7a005e69a59870e97057840b0ecce..7c0239926fe46e335abeb02e3bf9f90703885385 100644
--- a/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp
+++ b/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp
@@ -20,8 +20,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include "../log.h"
-#include "../assert.h"
+#include "benchmark_log.h"
+#include "benchmark_assert.h"
 using namespace std;
 
 namespace OHOS {