diff --git a/include/sbi/sbi_unpriv.h b/include/sbi/riscv_unpriv.h
similarity index 98%
rename from include/sbi/sbi_unpriv.h
rename to include/sbi/riscv_unpriv.h
index 2d9dbb97..c1094176 100644
--- a/include/sbi/sbi_unpriv.h
+++ b/include/sbi/riscv_unpriv.h
@@ -7,8 +7,8 @@
  *   Anup Patel <anup.patel@wdc.com>
  */
 
-#ifndef __SBI_UNPRIV_H__
-#define __SBI_UNPRIV_H__
+#ifndef __RISCV_UNPRIV_H__
+#define __RISCV_UNPRIV_H__
 
 #include <sbi/riscv_encoding.h>
 #include <sbi/sbi_bits.h>
diff --git a/lib/sbi_illegal_insn.c b/lib/sbi_illegal_insn.c
index 58567f46..820f96c5 100644
--- a/lib/sbi_illegal_insn.c
+++ b/lib/sbi_illegal_insn.c
@@ -9,12 +9,12 @@
 
 #include <sbi/riscv_asm.h>
 #include <sbi/riscv_encoding.h>
+#include <sbi/riscv_unpriv.h>
 #include <sbi/sbi_bits.h>
 #include <sbi/sbi_emulate_csr.h>
 #include <sbi/sbi_error.h>
 #include <sbi/sbi_illegal_insn.h>
 #include <sbi/sbi_trap.h>
-#include <sbi/sbi_unpriv.h>
 
 typedef int (*illegal_insn_func)(ulong insn,
 				 u32 hartid, ulong mcause,
diff --git a/lib/sbi_ipi.c b/lib/sbi_ipi.c
index 609de0df..471b5939 100644
--- a/lib/sbi_ipi.c
+++ b/lib/sbi_ipi.c
@@ -11,13 +11,13 @@
 #include <sbi/riscv_asm.h>
 #include <sbi/riscv_barrier.h>
 #include <sbi/riscv_atomic.h>
+#include <sbi/riscv_unpriv.h>
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_bitops.h>
 #include <sbi/sbi_console.h>
 #include <sbi/sbi_ipi.h>
 #include <sbi/sbi_platform.h>
 #include <sbi/sbi_timer.h>
-#include <sbi/sbi_unpriv.h>
 
 static int sbi_ipi_send(struct sbi_scratch *scratch, u32 hartid,
 			u32 event, void *data)
diff --git a/lib/sbi_misaligned_ldst.c b/lib/sbi_misaligned_ldst.c
index f1df3f02..3fe67ea6 100644
--- a/lib/sbi_misaligned_ldst.c
+++ b/lib/sbi_misaligned_ldst.c
@@ -9,11 +9,11 @@
 
 #include <sbi/riscv_asm.h>
 #include <sbi/riscv_encoding.h>
+#include <sbi/riscv_unpriv.h>
 #include <sbi/riscv_fp.h>
 #include <sbi/sbi_error.h>
 #include <sbi/sbi_misaligned_ldst.h>
 #include <sbi/sbi_trap.h>
-#include <sbi/sbi_unpriv.h>
 
 union reg_data {
 	u8 data_bytes[8];