diff --git a/cheriot/riscv_cheriot_rvv.bin_fmt b/cheriot/riscv_cheriot_rvv.bin_fmt
index 757f4aa..879937e 100644
--- a/cheriot/riscv_cheriot_rvv.bin_fmt
+++ b/cheriot/riscv_cheriot_rvv.bin_fmt
@@ -38,7 +38,7 @@
   RiscVCheriotRVVInst16 = {RiscVCheriotInst16};
 };
 
-#include "cheriot/riscv_cheriot.bin_fmt"
-#include "cheriot/riscv_cheriot_f.bin_fmt"
-#include "cheriot/riscv_cheriot_vector.bin_fmt"
-#include "cheriot/riscv_cheriot_vector_fp.bin_fmt"
\ No newline at end of file
+#include "riscv_cheriot.bin_fmt"
+#include "riscv_cheriot_f.bin_fmt"
+#include "riscv_cheriot_vector.bin_fmt"
+#include "riscv_cheriot_vector_fp.bin_fmt"
\ No newline at end of file
diff --git a/cheriot/riscv_cheriot_rvv.isa b/cheriot/riscv_cheriot_rvv.isa
index 071e515..3974ad3 100644
--- a/cheriot/riscv_cheriot_rvv.isa
+++ b/cheriot/riscv_cheriot_rvv.isa
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cheriot/riscv_cheriot_vector.isa"
-#include "cheriot/riscv_cheriot_vector_fp.isa"
-#include "cheriot/riscv_cheriot_f.isa"
-#include "cheriot/riscv_cheriot.isa"
+#include "riscv_cheriot_vector.isa"
+#include "riscv_cheriot_vector_fp.isa"
+#include "riscv_cheriot_f.isa"
+#include "riscv_cheriot.isa"
 
 includes {
   #include "absl/functional/bind_front.h"