diff --git a/interfaces/innerkits/appverify/include/common/hap_byte_buffer.h b/interfaces/innerkits/appverify/include/common/hap_byte_buffer.h
index fc8ea1383eac2fc73e388bef26d5b5b7e4135655..87a6183ddfd3d62d4bc919eb47ebd7b8c04daeaf 100644
--- a/interfaces/innerkits/appverify/include/common/hap_byte_buffer.h
+++ b/interfaces/innerkits/appverify/include/common/hap_byte_buffer.h
@@ -16,9 +16,9 @@
 #define HAP_BYTEBUFFER_H
 
 #include <memory>
-#include <string>
 
 #include "common/export_define.h"
+#include "iosfwd"
 
 namespace OHOS {
 namespace Security {
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..710f49e95716c2d4831e19d3d5cd4acbaaa17267 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,6 @@
 
 #include "common/data_source.h"
 #include "common/export_define.h"
-#include "common/random_access_file.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..5c613dcbb5f07322c4248191b632bd52bdb202ea 100644
--- a/interfaces/innerkits/appverify/include/common/hap_file_data_source.h
+++ b/interfaces/innerkits/appverify/include/common/hap_file_data_source.h
@@ -16,7 +16,6 @@
 #define HAP_FILEDATASOURCE_H
 
 #include "common/data_source.h"
-#include "common/random_access_file.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..fcc06cf5f549ba9761f9936793755866135332a6 100644
--- a/interfaces/innerkits/appverify/include/common/random_access_file.h
+++ b/interfaces/innerkits/appverify/include/common/random_access_file.h
@@ -17,7 +17,8 @@
 
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
-#include "util/hap_verify_openssl_utils.h"
+#include "iosfwd"
+#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..546daafc9d206a41f174414e14f08fa6c12e3426 100644
--- a/interfaces/innerkits/appverify/include/init/device_type_manager.h
+++ b/interfaces/innerkits/appverify/include/init/device_type_manager.h
@@ -16,10 +16,9 @@
 #ifndef OHOS_DEVICE_TYPE_MANAGER_H
 #define OHOS_DEVICE_TYPE_MANAGER_H
 
+#include "__mutex_base"
 #include "common/export_define.h"
 
-#include <mutex>
-
 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..5f9607dab7e3734971841d6dff1c4339520c29d6 100644
--- a/interfaces/innerkits/appverify/include/init/hap_crl_manager.h
+++ b/interfaces/innerkits/appverify/include/init/hap_crl_manager.h
@@ -16,14 +16,11 @@
 #define HAP_CRL_MANAGER_H
 
 #include <string>
-#include <vector>
-#include <mutex>
 #include <unordered_map>
 
-#include "openssl/x509.h"
-
+#include "__mutex_base"
 #include "common/export_define.h"
-#include "common/hap_byte_buffer.h"
+#include "iosfwd"
 #include "util/pkcs7_context.h"
 
 namespace OHOS {
diff --git a/interfaces/innerkits/appverify/include/interfaces/hap_verify.h b/interfaces/innerkits/appverify/include/interfaces/hap_verify.h
index 8db68e150b0ff1a49b651a30597d57329b42c84a..d1ffc7054f5bc7abbb6e4cdcf26b5336132eaf5a 100644
--- a/interfaces/innerkits/appverify/include/interfaces/hap_verify.h
+++ b/interfaces/innerkits/appverify/include/interfaces/hap_verify.h
@@ -15,10 +15,9 @@
 #ifndef HAP_VERIFY_H
 #define HAP_VERIFY_H
 
-#include <string>
-
 #include "common/export_define.h"
 #include "interfaces/hap_verify_result.h"
+#include "iosfwd"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/include/interfaces/hap_verify_result.h b/interfaces/innerkits/appverify/include/interfaces/hap_verify_result.h
index a2d150e547fdd4e3dead55730196cdd6dc66726e..dbaa167f91f123c2b9240336c23fa89abe2eed6b 100644
--- a/interfaces/innerkits/appverify/include/interfaces/hap_verify_result.h
+++ b/interfaces/innerkits/appverify/include/interfaces/hap_verify_result.h
@@ -20,6 +20,7 @@
 
 #include "common/export_define.h"
 #include "common/hap_byte_buffer.h"
+#include "iosfwd"
 #include "provision/provision_info.h"
 
 namespace OHOS {
diff --git a/interfaces/innerkits/appverify/include/ticket/ticket_verify.h b/interfaces/innerkits/appverify/include/ticket/ticket_verify.h
index dff2df492b879288cca0fa9f4b54e4a901fe3c49..7a4ea8623fc1bdbb383109faaaa91c68f1b8119a 100644
--- a/interfaces/innerkits/appverify/include/ticket/ticket_verify.h
+++ b/interfaces/innerkits/appverify/include/ticket/ticket_verify.h
@@ -16,11 +16,7 @@
 #define TICKET_VERIFY_H
 
 #include "common/export_define.h"
-#include "common/hap_byte_buffer.h"
-#include "common/random_access_file.h"
-
 #include "provision/provision_info.h"
-#include "provision/provision_verify.h"
 
 namespace OHOS {
 namespace Security {
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_signing_block_utils.h b/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h
index ec6f2e9d94e6fd100b60293000fe10bd8783f306..99991f423092e3faaba8bdb15f805c4600fb6a8a 100644
--- a/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h
+++ b/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h
@@ -15,16 +15,17 @@
 #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 "utility"
 
 namespace OHOS {
 namespace Security {
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..8489d03ffeee3ceb741feb0347face6c499acaff 100644
--- a/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h
+++ b/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h
@@ -15,16 +15,19 @@
 #ifndef HAP_VERIFY_OPENSSL_UTILS_H
 #define HAP_VERIFY_OPENSSL_UTILS_H
 
-#include <string>
 #include <vector>
 
-#include "openssl/evp.h"
-
 #include "common/export_define.h"
-#include "common/hap_byte_buffer.h"
+#include "common/random_access_file.h"
 #include "interfaces/hap_verify_result.h"
+#include "iosfwd"
+#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..6d18ddd95af7a875cd9a705b0f58aebc4fd5be3e 100644
--- a/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp
+++ b/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp
@@ -15,9 +15,10 @@
 
 #include "common/hap_byte_buffer.h"
 
-#include "securec.h"
-
 #include "common/hap_verify_log.h"
+#include "memory"
+#include "securec.h"
+#include "string"
 
 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..cfcb1d12c51216a3b71e3573c921cb9ac7fb2ab3 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
@@ -15,6 +15,9 @@
 
 #include "common/hap_byte_buffer_data_source.h"
 
+#include "common/hap_byte_buffer.h"
+#include "util/hap_verify_openssl_utils.h"
+
 namespace OHOS {
 namespace Security {
 namespace Verify {
diff --git a/interfaces/innerkits/appverify/src/common/hap_file_data_source.cpp b/interfaces/innerkits/appverify/src/common/hap_file_data_source.cpp
index 1ab1082e66c1d16ad25ed638afc75617ca1314de..d4942e2d4fb6407c12238dc47c15a899cf52a593 100644
--- a/interfaces/innerkits/appverify/src/common/hap_file_data_source.cpp
+++ b/interfaces/innerkits/appverify/src/common/hap_file_data_source.cpp
@@ -16,6 +16,7 @@
 #include "common/hap_file_data_source.h"
 
 #include "common/hap_verify_log.h"
+#include "common/random_access_file.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..029e6b00e4fd94f958f3bcd3373ef52630bbe05a 100644
--- a/interfaces/innerkits/appverify/src/common/random_access_file.cpp
+++ b/interfaces/innerkits/appverify/src/common/random_access_file.cpp
@@ -20,9 +20,11 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "securec.h"
-
+#include "common/hap_byte_buffer.h"
 #include "common/hap_verify_log.h"
+#include "securec.h"
+#include "string"
+#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..926890adf2c1500637a199bda38a1c0fefb8b704 100644
--- a/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp
+++ b/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp
@@ -17,9 +17,16 @@
 
 #include <fstream>
 
+#include "common/hap_byte_buffer.h"
 #include "common/hap_verify_log.h"
 #include "common/random_access_file.h"
+#include "openssl/asn1.h"
+#include "openssl/x509.h"
+#include "string"
+#include "unordered_map"
 #include "util/hap_cert_verify_openssl_utils.h"
+#include "util/pkcs7_context.h"
+#include "utility"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/interfaces/hap_verify.cpp b/interfaces/innerkits/appverify/src/interfaces/hap_verify.cpp
index e59038af778b88128ac82cc74f779756c1e3c6fb..ba0b1792f2d53c617d7558f7f9c696ebef677484 100644
--- a/interfaces/innerkits/appverify/src/interfaces/hap_verify.cpp
+++ b/interfaces/innerkits/appverify/src/interfaces/hap_verify.cpp
@@ -15,13 +15,13 @@
 
 #include "interfaces/hap_verify.h"
 
-#include <mutex>
-
+#include "__mutex_base"
 #include "init/device_type_manager.h"
 #include "init/hap_crl_manager.h"
 #include "init/trusted_root_ca.h"
 #include "init/trusted_source_manager.h"
 #include "init/trusted_ticket_manager.h"
+#include "interfaces/hap_verify_result.h"
 #include "verify/hap_verify_v2.h"
 
 namespace OHOS {
diff --git a/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp b/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp
index 7e07baad98e1e0e4d5e37891a3047b04b95d52bd..047813b4d385a146a39bf74013e4f3fe33deb08b 100644
--- a/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp
+++ b/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp
@@ -15,8 +15,9 @@
 
 #include "interfaces/hap_verify_result.h"
 
+#include "string"
 #include "util/hap_signing_block_utils.h"
-#include "util/hap_verify_openssl_utils.h"
+#include "vector"
 
 namespace OHOS {
 namespace Security {
diff --git a/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp b/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp
index b8b3b03803e169eb37c2af4abe0466134f84a6bf..1bcf193f466011cbaee4daeab4f06c08141540ec 100644
--- a/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp
+++ b/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp
@@ -16,10 +16,10 @@
 #include "ticket/ticket_verify.h"
 
 #include <algorithm>
+#include <climits>
+#include <cstdlib>
 #include <regex>
 
-#include "nlohmann/json.hpp"
-
 #ifndef STANDARD_SYSTEM
 #include "ohos_account_kits.h"
 #else
@@ -30,10 +30,16 @@
 #include "common/hap_byte_buffer.h"
 #include "common/hap_verify_log.h"
 #include "common/random_access_file.h"
+#include "init/matching_result.h"
 #include "init/trusted_ticket_manager.h"
+#include "iosfwd"
+#include "provision/provision_info.h"
+#include "provision/provision_verify.h"
+#include "string"
 #include "util/hap_cert_verify_openssl_utils.h"
 #include "util/hap_verify_openssl_utils.h"
 #include "util/pkcs7_context.h"
+#include "vector"
 
 namespace {
 const int MAXIMUM_DEVICES = 100;
diff --git a/interfaces/innerkits/appverify/src/util/digest_parameter.cpp b/interfaces/innerkits/appverify/src/util/digest_parameter.cpp
index ead2debbdfbf6fd0ebd25d1ca53f0d393ec87f8b..b7819fe6435240c0ee2e6c2074191bc3882c0f1e 100644
--- a/interfaces/innerkits/appverify/src/util/digest_parameter.cpp
+++ b/interfaces/innerkits/appverify/src/util/digest_parameter.cpp
@@ -14,6 +14,7 @@
  */
 
 #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_signing_block_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp
index 57460060fdd6c2df0fac9330e62862da9a994f46..3e8afea62377a3084a675ec82bdb5e916f2b73ca 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,21 @@
 #include "util/hap_signing_block_utils.h"
 
 #include <climits>
-#include <map>
-
-#include "securec.h"
 
+#include "algorithm"
+#include "common/data_source.h"
+#include "common/hap_byte_buffer.h"
 #include "common/hap_byte_buffer_data_source.h"
 #include "common/hap_file_data_source.h"
 #include "common/hap_verify_log.h"
+#include "common/random_access_file.h"
+#include "interfaces/hap_verify_result.h"
+#include "openssl/evp.h"
+#include "securec.h"
+#include "util/hap_cert_verify_openssl_utils.h"
+#include "util/pkcs7_context.h"
+#include "util/signature_info.h"
+#include "vector"
 
 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..3446bb77cf7853a14dad16f7e64a926b215d1906 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,21 @@
 
 #include "util/hap_verify_openssl_utils.h"
 
-#include "openssl/err.h"
-#include "openssl/pem.h"
-
+#include "common/hap_byte_buffer.h"
 #include "common/hap_verify_log.h"
+#include "interfaces/hap_verify_result.h"
+#include "memory"
+#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"
+#include "string"
+#include "util/digest_parameter.h"
+#include "vector"
 
 namespace OHOS {
 namespace Security {