diff --git a/arch/sparc64/entry.S b/arch/sparc64/entry.S
index 82c588d..33632b1 100644
--- a/arch/sparc64/entry.S
+++ b/arch/sparc64/entry.S
@@ -8,7 +8,7 @@
  */
 
 #define __ASSEMBLY__
-#include "asi.h"
+#include <asm/asi.h>
 #include "pstate.h"
 #include "lsu.h"
 #define NO_QEMU_PROTOS
diff --git a/arch/sparc64/spitfire.h b/arch/sparc64/spitfire.h
index 6a2f87a..4a951b1 100644
--- a/arch/sparc64/spitfire.h
+++ b/arch/sparc64/spitfire.h
@@ -7,7 +7,7 @@
 #ifndef _SPARC64_SPITFIRE_H
 #define _SPARC64_SPITFIRE_H
 
-#include "asi.h"
+#include <asm/asi.h>
 
 /* The following register addresses are accessible via ASI_DMMU
  * and ASI_IMMU, that is there is a distinct and unique copy of
diff --git a/arch/sparc64/switch.S b/arch/sparc64/switch.S
index e0d2df7..d2cc7be 100644
--- a/arch/sparc64/switch.S
+++ b/arch/sparc64/switch.S
@@ -1,5 +1,5 @@
 #include "pstate.h"
-#include "asi.h"
+#include <asm/asi.h>
 #define ASI_BP ASI_M_BYPASS
 #define REGWIN_SZ   0x40
 
diff --git a/arch/sparc64/vectors.S b/arch/sparc64/vectors.S
index 6b3d5be..529afbe 100644
--- a/arch/sparc64/vectors.S
+++ b/arch/sparc64/vectors.S
@@ -25,7 +25,7 @@
 
 #define __ASSEMBLY__
 #include "pstate.h"
-#include "asi.h"
+#include <asm/asi.h>
 #define ASI_BP ASI_PHYS_BYPASS_EC_E
 #define PROM_ADDR 0x1fff0000000
 #define SER_ADDR 0x1fe020003f8
diff --git a/arch/sparc64/asi.h b/include/arch/sparc64/asi.h
similarity index 100%
rename from arch/sparc64/asi.h
rename to include/arch/sparc64/asi.h