Index: kernel/arch/sparc64/include/arch/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/asm.h	(revision a4fb8d60ffb2469744f8d1f6fad67fae13d69fcd)
+++ kernel/arch/sparc64/include/arch/asm.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
@@ -350,5 +350,5 @@
 	
 	pstate.value = pstate_read();
-	pstate.ie = ((pstate_reg_t) ipl).ie;
+	pstate.ie = ((pstate_reg_t)(uint64_t) ipl).ie;
 	pstate_write(pstate.value);
 }
Index: kernel/arch/sparc64/include/arch/barrier.h
===================================================================
--- kernel/arch/sparc64/include/arch/barrier.h	(revision a4fb8d60ffb2469744f8d1f6fad67fae13d69fcd)
+++ kernel/arch/sparc64/include/arch/barrier.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
@@ -37,10 +37,4 @@
 
 #include <trace.h>
-
-#ifdef KERNEL
-#include <arch/common.h>
-#else
-#include <libarch/common.h>
-#endif
 
 /*
@@ -88,5 +82,5 @@
 NO_TRACE static inline void flush_pipeline(void)
 {
-	uint64_t pc;
+	unsigned long pc;
 	
 	/*
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision a4fb8d60ffb2469744f8d1f6fad67fae13d69fcd)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
@@ -72,5 +72,5 @@
 struct pte;
 
-extern void tsb_invalidate(struct as *as, uintptr_t page, uint64_t pages);
+extern void tsb_invalidate(struct as *as, uintptr_t page, size_t pages);
 extern void itsb_pte_copy(struct pte *t);
 extern void dtsb_pte_copy(struct pte *t, bool ro);
Index: kernel/arch/sparc64/include/arch/types.h
===================================================================
--- kernel/arch/sparc64/include/arch/types.h	(revision a4fb8d60ffb2469744f8d1f6fad67fae13d69fcd)
+++ kernel/arch/sparc64/include/arch/types.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
@@ -36,17 +36,5 @@
 #define KERN_sparc64_TYPES_H_
 
-#include <arch/common.h>
-
-typedef uint64_t size_t;
-typedef int64_t ssize_t;
-
-typedef uint64_t uintptr_t;
-typedef uint64_t pfn_t;
-
-typedef uint64_t ipl_t;
-
-typedef uint64_t sysarg_t;
-typedef int64_t native_t;
-typedef uint64_t atomic_count_t;
+#include <_bits/all.h>
 
 typedef struct {
@@ -55,9 +43,4 @@
 typedef uint8_t asi_t;
 
-#define PRIdn  PRId64  /**< Format for native_t. */
-#define PRIun  PRIu64  /**< Format for sysarg_t. */
-#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t. */
-#define PRIua  PRIu64  /**< Format for atomic_count_t. */
-
 #endif