diff --git a/build.zig b/build.zig
index 444b68c..7ddd434 100644
--- a/build.zig
+++ b/build.zig
@@ -225,7 +225,6 @@ fn addKernel(b: *std.Build, plat: config.Platform, optimize: std.builtin.Optimiz
         },
         .riscv64 => {
             kernel.root_module.addAssemblyFile(b.path("src/kern/riscv64/locore.s"));
-            kernel.root_module.addAssemblyFile(b.path("src/platform/riscv64/trap.s"));
         },
         else => {},
     }
diff --git a/src/kern/riscv64/impl.zig b/src/kern/riscv64/impl.zig
index 030cda9..872451f 100644
--- a/src/kern/riscv64/impl.zig
+++ b/src/kern/riscv64/impl.zig
@@ -1,6 +1,13 @@
 const r = @import("root");
 const ke = r.ke;
-const rv64 = r.arch;
+const rv64 = @import("arch");
+const std = @import("std");
+
+const int = @import("int.zig");
+
+comptime {
+    std.testing.refAllDecls(int);
+}
 
 pub const tlb_max_pages = 32;
 
diff --git a/src/kern/riscv64/int.zig b/src/kern/riscv64/int.zig
index b0eb3a9..4afd820 100644
--- a/src/kern/riscv64/int.zig
+++ b/src/kern/riscv64/int.zig
@@ -1,6 +1,7 @@
 const r = @import("root");
 const ke = r.ke;
 const std = @import("std");
+const rv64 = @import("arch");
 
 export fn riscv_trap_handler(cause: usize, pc: usize) callconv(.c) void {
     if (cause == ((@as(usize, 1) << 63) | 5)) {