diff --git a/code_sign/Makefile b/code_sign/Makefile
index 8a2af5bf3941c86c0b687a032108ccf6dd28e633..0fc5dde76000e286987370aac5d9ab0fd7f89b64 100644
--- a/code_sign/Makefile
+++ b/code_sign/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_SECURITY_CODE_SIGN)	+= \
 	code_sign_ext.o
 
 ccflags-$(CONFIG_SECURITY_CODE_SIGN) += \
+	-I$(srctree)/fs/verity \
 	-I$(srctree)/fs/code_sign \
 	-I$(srctree)/security/selinux/include \
 	-I$(srctree)/security/selinux \
diff --git a/code_sign/verify_cert_chain.c b/code_sign/verify_cert_chain.c
index 3e9d096777bcc22300d4d8b679475df8703548a9..8163da9f934949e0d9b7262911b8521c1306e7ba 100644
--- a/code_sign/verify_cert_chain.c
+++ b/code_sign/verify_cert_chain.c
@@ -122,7 +122,7 @@ static struct cert_source *find_matched_source(const struct x509_certificate *si
 }
 
 void code_sign_verify_certchain(const void *raw_pkcs7, size_t pkcs7_len,
-	struct cs_info *cs_info, int *ret)
+	struct fsverity_info *vi, int *ret)
 {
 	struct pkcs7_message *pkcs7;
 	struct pkcs7_signed_info *sinfo;
@@ -205,7 +205,7 @@ void code_sign_verify_certchain(const void *raw_pkcs7, size_t pkcs7_len,
 		}
 		if (cert_chain_depth_without_root == (source->max_path_depth - 1)) {
 			code_sign_log_info("cert subject and issuer trusted");
-			set_file_ownerid(cs_info, source->path_type, pkcs7->signed_infos);
+			set_file_ownerid(&vi->fcs_info, source->path_type, pkcs7->signed_infos);
 			*ret = source->path_type;
 			goto exit;
 		} else {
diff --git a/code_sign/verify_cert_chain.h b/code_sign/verify_cert_chain.h
index eb5a8dd24192a48bd5f5320715d2eca033873354..b2f7b06381d706d65a58a8d17da9763f892b6724 100644
--- a/code_sign/verify_cert_chain.h
+++ b/code_sign/verify_cert_chain.h
@@ -7,11 +7,12 @@
 #define _VERIFY_CERT_CHAIN_H
 
 #include <linux/xpm_types.h>
+#include "fsverity_private.h"
 
 /*
  * verify_cert_chain.c
  */
 void code_sign_verify_certchain(const void *raw_pkcs7, size_t pkcs7_len,
-	struct cs_info *cs_info, int *ret);
+	struct fsverity_info *vi, int *ret);
 
 #endif /* _VERIFY_CERT_CHAIN_H */