diff --git a/corev_apu/tb/ariane_tb.sv b/corev_apu/tb/ariane_tb.sv
index 79ba316a763..65f342fe325 100644
--- a/corev_apu/tb/ariane_tb.sv
+++ b/corev_apu/tb/ariane_tb.sv
@@ -23,9 +23,12 @@ import uvm_pkg::*;
 `define MAIN_MEM(P) dut.i_sram.gen_cut[0].i_tc_sram_wrapper.i_tc_sram.init_val[(``P``)]
 // `define USER_MEM(P) dut.i_sram.gen_cut[0].gen_mem.gen_mem_user.i_tc_sram_wrapper_user.i_tc_sram.init_val[(``P``)]
 
+`ifndef READ_ELF_T
+`define READ_ELF_T
 import "DPI-C" function void read_elf(input string filename);
 import "DPI-C" function byte get_section(output longint address, output longint len);
 import "DPI-C" context function void read_section_sv(input longint address, inout byte buffer[]);
+`endif
 
 module ariane_tb;
 
diff --git a/corev_apu/tb/rvfi_tracer.sv b/corev_apu/tb/rvfi_tracer.sv
index 5692a0de53f..8015c352330 100644
--- a/corev_apu/tb/rvfi_tracer.sv
+++ b/corev_apu/tb/rvfi_tracer.sv
@@ -7,9 +7,18 @@
 //
 // Original Author: Jean-Roch COULON - Thales
 //
+`ifndef READ_SYMBOL_T
+`define READ_SYMBOL_T
 import "DPI-C" function byte read_symbol (input string symbol_name, inout longint unsigned address);
+`endif
 
+`ifndef READ_ELF_T
+`define READ_ELF_T
 import "DPI-C" function void read_elf(input string filename);
+import "DPI-C" function byte get_section(output longint address, output longint len);
+import "DPI-C" context function void read_section_sv(input longint address, inout byte buffer[]);
+`endif
+
 
 module rvfi_tracer #(
   parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty,
diff --git a/verif/core-v-verif b/verif/core-v-verif
index 5c0cd8ad8a7..24198ec4fbe 160000
--- a/verif/core-v-verif
+++ b/verif/core-v-verif
@@ -1 +1 @@
-Subproject commit 5c0cd8ad8a7d033cb84d6067ed737b82c5230e8b
+Subproject commit 24198ec4fbe30b3993b51ef3043989bff2713e71