diff --git a/bundle.json b/bundle.json
index d448c0df0a3dac35514ed83852c6d6e5c1659ab2..857ee8530643e88c2b413e220aa6be10c758fd87 100644
--- a/bundle.json
+++ b/bundle.json
@@ -24,12 +24,12 @@
       "deps": {
         "components": [
           "hiviewdfx_hilog_native",
-          "startup_l2"
+          "init",
+          "utils_base"
         ],
         "third_party": [
-          "bounds_checking_function",
-          "mbedtls",
-          "cjson"
+          "json",
+          "openssl"
         ]
       },
       "build": {
diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn
index b14e24c9f88e8de4f4b2529ae719bd06107a026f..9bb76f12dea465582a1230e28c2fef20db0ce7ca 100644
--- a/interfaces/innerkits/appverify/BUILD.gn
+++ b/interfaces/innerkits/appverify/BUILD.gn
@@ -17,11 +17,10 @@ if (os_level == "standard") {
   config("libhapverify_config") {
     visibility = [ ":*" ]
     include_dirs = [
-      "//base/security/appverify/interfaces/innerkits/appverify/include",
+      "include",
       "//third_party/openssl/include",
       "//third_party/json/include",
       "//third_party/json/single_include",
-      "//utils/native/base/include",
     ]
   }
 
@@ -56,22 +55,19 @@ if (os_level == "standard") {
       "-fvisibility=hidden",
     ]
 
-    ldflags = [ "-Wl,--exclude-libs=libcrypto_static.a" ]
+    deps = [ "//third_party/openssl:libcrypto_shared" ]
 
-    deps = [
-      "//third_party/openssl:libcrypto_static",
-      "//utils/native/base:utils",
-    ]
+    external_deps = [ "utils_base:utils" ]
 
     if (is_standard_system) {
       defines = [ "STANDARD_SYSTEM" ]
 
-      external_deps = [
+      external_deps += [
         "hiviewdfx_hilog_native:libhilog",
-        "startup_l2:syspara",
+        "init:libbegetutil",
       ]
     } else {
-      external_deps = [
+      external_deps += [
         "ipc:ipc_core",
         "os_account:libaccountkits",
         "shared_library:libhilog",
diff --git a/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h b/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h
index 1d971f07d1beee41eaf5e14ba38d006f6be27164..7036e9d4c2f27fdbf18e737a303474f0c06053ae 100644
--- a/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h
+++ b/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h
@@ -17,7 +17,8 @@
 
 #include "common/data_source.h"
 #include "common/export_define.h"
-#include "common/random_access_file.h"
+#include "common/hap_byte_buffer.h"
+#include "util/digest_parameter.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/include/common/hap_file_data_source.h b/interfaces/innerkits/appverify/include/common/hap_file_data_source.h
index e5907eec74682569ad88a3ce23b6e48c9c785cf8..2594d31835be810659a4578b0333cccd1063242a 100644
--- a/interfaces/innerkits/appverify/include/common/hap_file_data_source.h
+++ b/interfaces/innerkits/appverify/include/common/hap_file_data_source.h
@@ -17,6 +17,7 @@
 
 #include "common/data_source.h"
 #include "common/random_access_file.h"
+#include "util/digest_parameter.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/include/common/random_access_file.h b/interfaces/innerkits/appverify/include/common/random_access_file.h
index 78062b6e9556c1fbc763f07f6b95690023813cdf..62abfb84b93ebc49f78e614fa49b5db6324522fe 100644
--- a/interfaces/innerkits/appverify/include/common/random_access_file.h
+++ b/interfaces/innerkits/appverify/include/common/random_access_file.h
@@ -17,7 +17,7 @@
 
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
-#include "util/hap_verify_openssl_utils.h"
+#include "util/digest_parameter.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/include/init/device_type_manager.h b/interfaces/innerkits/appverify/include/init/device_type_manager.h
index 6a3e88f5d36dbfd03bcc58a9313fd72751c8bfed..87e431ec1620552cef4d19ac178a571b2d07e81c 100644
--- a/interfaces/innerkits/appverify/include/init/device_type_manager.h
+++ b/interfaces/innerkits/appverify/include/init/device_type_manager.h
@@ -16,10 +16,10 @@
 #ifndef OHOS_DEVICE_TYPE_MANAGER_H
 #define OHOS_DEVICE_TYPE_MANAGER_H
 
-#include "common/export_define.h"
-
 #include <mutex>
 
+#include "common/export_define.h"
+
 namespace OHOS {
 namespace Security {
 namespace Verify {
diff --git a/interfaces/innerkits/appverify/include/init/hap_crl_manager.h b/interfaces/innerkits/appverify/include/init/hap_crl_manager.h
index 27dd42c302ede88c797b646aeb299035d3fa8344..20638ded154ad8d350663a7426b9267b93ab338f 100644
--- a/interfaces/innerkits/appverify/include/init/hap_crl_manager.h
+++ b/interfaces/innerkits/appverify/include/init/hap_crl_manager.h
@@ -15,15 +15,14 @@
 #ifndef HAP_CRL_MANAGER_H
 #define HAP_CRL_MANAGER_H
 
-#include <string>
-#include <vector>
 #include <mutex>
+#include <string>
 #include <unordered_map>
-
-#include "openssl/x509.h"
+#include <vector>
 
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
+#include "openssl/ossl_typ.h"
 #include "util/pkcs7_context.h"
 
 namespace OHOS {
diff --git a/interfaces/innerkits/appverify/include/util/digest_parameter.h b/interfaces/innerkits/appverify/include/util/digest_parameter.h
index 8277cdcfff7c69d0a41f81dae649c1c3c2e4270f..65510b6c53414829a29891507271eaa90c69e761 100644
--- a/interfaces/innerkits/appverify/include/util/digest_parameter.h
+++ b/interfaces/innerkits/appverify/include/util/digest_parameter.h
@@ -16,11 +16,12 @@
 #ifndef HOSP_DIGESTPARAMETER_H
 #define HOSP_DIGESTPARAMETER_H
 
-#include "openssl/evp.h"
-
 #include "common/export_define.h"
+#include "openssl/ossl_typ.h"
 
-namespace OHOS::Security::Verify {
+namespace OHOS {
+namespace Security {
+namespace Verify {
 class DigestParameter {
 public:
     DLL_EXPORT DigestParameter();
@@ -34,5 +35,7 @@ public:
     const EVP_MD* md;
     EVP_MD_CTX* ptrCtx;
 };
-} // namespace OHOS::Security::Verify
+} // namespace Verify
+} // namespace Security
+} // namespace OHOS
 #endif // HOSP_DIGESTPARAMETER_H
diff --git a/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h b/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h
index ffcc4ec9184188c0636f8a45f58b3489ab4e2e03..75ee7286ea0d217d2fc4dd87c3d95b208a316767 100644
--- a/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h
+++ b/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h
@@ -16,11 +16,10 @@
 #define HAP_PROFILE_VERIFY_UTILS_H
 
 #include <string>
-#include <vector>
 
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
-#include "util/hap_verify_openssl_utils.h"
+#include "util/pkcs7_context.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h b/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h
index ec6f2e9d94e6fd100b60293000fe10bd8783f306..1c76136a6a3cbffdaa8954161ec6d39cf047c7b9 100644
--- a/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h
+++ b/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h
@@ -15,15 +15,16 @@
 #ifndef HAP_SIGNING_BLOCK_UTILS_H
 #define HAP_SIGNING_BLOCK_UTILS_H
 
-#include <string>
 #include <vector>
-#include "openssl/evp.h"
 
 #include "common/data_source.h"
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
 #include "common/random_access_file.h"
-#include "util/hap_verify_openssl_utils.h"
+#include "interfaces/hap_verify_result.h"
+#include "util/digest_parameter.h"
+#include "util/pkcs7_context.h"
+#include "util/signature_info.h"
 #include "util/signature_info.h"
 
 namespace OHOS {
diff --git a/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h b/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h
index 59868c1013f6d68a089b233810d752f20d6d94bb..66ffd95f8ab6c7b911be4058412abab62bd1473a 100644
--- a/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h
+++ b/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h
@@ -18,13 +18,16 @@
 #include <string>
 #include <vector>
 
-#include "openssl/evp.h"
-
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
 #include "interfaces/hap_verify_result.h"
+#include "openssl/evp.h"
+#include "openssl/ossl_typ.h"
+#include "openssl/pkcs7.h"
+#include "openssl/safestack.h"
 #include "util/digest_parameter.h"
 #include "util/hap_cert_verify_openssl_utils.h"
+#include "util/pkcs7_context.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp b/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp
index 27899cc4faff7996db5df9c99d1cdb7b8ac25d96..25198adbb78d216c0abe62acf0aae7a4f3e76417 100644
--- a/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp
+++ b/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp
@@ -15,9 +15,8 @@
 
 #include "common/hap_byte_buffer.h"
 
-#include "securec.h"
-
 #include "common/hap_verify_log.h"
+#include "securec.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp b/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp
index 2dd4c320dd6eaede1463201966f5ff692cd980c6..b94d337dbe7f781f6a8027d5bba081146e18f034 100644
--- a/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp
+++ b/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "common/hap_byte_buffer_data_source.h"
+#include "util/hap_verify_openssl_utils.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/common/random_access_file.cpp b/interfaces/innerkits/appverify/src/common/random_access_file.cpp
index 062c568278f69ca818adb6667330411fb56fda39..70e477966dd7cf822b814daca62fab7ce133d842 100644
--- a/interfaces/innerkits/appverify/src/common/random_access_file.cpp
+++ b/interfaces/innerkits/appverify/src/common/random_access_file.cpp
@@ -17,12 +17,13 @@
 
 #include <cerrno>
 #include <fcntl.h>
+#include <string>
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "securec.h"
-
 #include "common/hap_verify_log.h"
+#include "securec.h"
+#include "util/hap_verify_openssl_utils.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp b/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp
index 3f129d058b089971f401950e8bef0ac570b08739..6fc8baa067a6152645ba780ecd3a4ec5d7a14e81 100644
--- a/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp
+++ b/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp
@@ -16,10 +16,15 @@
 #include "init/hap_crl_manager.h"
 
 #include <fstream>
+#include <string>
 
 #include "common/hap_verify_log.h"
 #include "common/random_access_file.h"
+#include "openssl/asn1.h"
+#include "openssl/x509.h"
+#include "unordered_map"
 #include "util/hap_cert_verify_openssl_utils.h"
+#include "utility"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp b/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp
index 7e07baad98e1e0e4d5e37891a3047b04b95d52bd..37608c1303afe6e685a29cb934ce2610383764a6 100644
--- a/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp
+++ b/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp
@@ -16,7 +16,6 @@
 #include "interfaces/hap_verify_result.h"
 
 #include "util/hap_signing_block_utils.h"
-#include "util/hap_verify_openssl_utils.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/util/digest_parameter.cpp b/interfaces/innerkits/appverify/src/util/digest_parameter.cpp
index ead2debbdfbf6fd0ebd25d1ca53f0d393ec87f8b..50a158765d78ba8677add2e624d3df2ab82cb15a 100644
--- a/interfaces/innerkits/appverify/src/util/digest_parameter.cpp
+++ b/interfaces/innerkits/appverify/src/util/digest_parameter.cpp
@@ -15,6 +15,8 @@
 
 #include "util/digest_parameter.h"
 
+#include "openssl/evp.h"
+
 namespace OHOS::Security::Verify {
 DigestParameter::DigestParameter() : digestOutputSizeBytes(0), md(nullptr), ptrCtx(nullptr)
 {
diff --git a/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp
index 973e4574d38ab3fd29fc9357819c035624ed5d53..cb1c4194c98bf45b461fa4cbd6aeb1f98d402c68 100644
--- a/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp
+++ b/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp
@@ -16,7 +16,11 @@
 #include "util/hap_profile_verify_utils.h"
 
 #include "common/hap_verify_log.h"
+#include "init/matching_result.h"
 #include "init/trusted_source_manager.h"
+#include "util/hap_cert_verify_openssl_utils.h"
+#include "util/hap_signing_block_utils.h"
+#include "util/hap_verify_openssl_utils.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp
index 57460060fdd6c2df0fac9330e62862da9a994f46..9f06811ea0be9b36c276f5ae01113eb9c556e591 100644
--- a/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp
+++ b/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp
@@ -16,13 +16,15 @@
 #include "util/hap_signing_block_utils.h"
 
 #include <climits>
-#include <map>
-
-#include "securec.h"
+#include <vector>
 
+#include "algorithm"
 #include "common/hap_byte_buffer_data_source.h"
 #include "common/hap_file_data_source.h"
 #include "common/hap_verify_log.h"
+#include "openssl/evp.h"
+#include "securec.h"
+#include "util/hap_verify_openssl_utils.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp
index 2f5ab586bc9bde16348329f14eb386a497d553e1..5c877fd7c236084bb0b6542ec0bbb1b4c49859d1 100644
--- a/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp
+++ b/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp
@@ -15,10 +15,15 @@
 
 #include "util/hap_verify_openssl_utils.h"
 
-#include "openssl/err.h"
-#include "openssl/pem.h"
-
 #include "common/hap_verify_log.h"
+#include "openssl/asn1.h"
+#include "openssl/bio.h"
+#include "openssl/crypto.h"
+#include "openssl/err.h"
+#include "openssl/obj_mac.h"
+#include "openssl/objects.h"
+#include "openssl/rsa.h"
+#include "openssl/x509.h"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/test/BUILD.gn b/interfaces/innerkits/appverify/test/BUILD.gn
index 2ff763095cad95f7c12a044ff3b725426b6ebc67..3d0e6d4d2e78b002a214b5de77f388bfe92b28bd 100644
--- a/interfaces/innerkits/appverify/test/BUILD.gn
+++ b/interfaces/innerkits/appverify/test/BUILD.gn
@@ -59,7 +59,7 @@ ohos_unittest("verify_test") {
 
     external_deps = [
       "hiviewdfx_hilog_native:libhilog",
-      "startup_l2:syspara",
+      "init:libbegetutil",
     ]
   } else {
     external_deps = [
diff --git a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn
index 2d1cd499c74e567f0fb96ef974474927b164fb13..bd8bef471033218f932942a543a0ed9bf4f3bc50 100644
--- a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn
+++ b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn
@@ -42,6 +42,7 @@ unittest("app_verify_test") {
     "//third_party/bounds_checking_function/include",
     "//third_party/cJSON",
   ]
+
   deps = [
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//base/security/appverify/interfaces/innerkits/appverify_lite:verify",