Index: boot/arch/ia64/include/types.h
===================================================================
--- boot/arch/ia64/include/types.h	(revision c245f16e32b7e3ef731e81556156d471431b6bb9)
+++ boot/arch/ia64/include/types.h	(revision 3ca343045c94c938e60da0bd8a09c6dd6aabb9cf)
@@ -35,5 +35,5 @@
 
 typedef uint64_t size_t;
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef uint64_t uintptr_t;
 
@@ -61,5 +61,5 @@
 	unsigned int memmap_items;
 
-	unative_t *sapic;
+	sysarg_t *sapic;
 	unsigned long sys_freq;
 	unsigned long freq_scale;
Index: boot/arch/ppc32/include/types.h
===================================================================
--- boot/arch/ppc32/include/types.h	(revision c245f16e32b7e3ef731e81556156d471431b6bb9)
+++ boot/arch/ppc32/include/types.h	(revision 3ca343045c94c938e60da0bd8a09c6dd6aabb9cf)
@@ -35,5 +35,5 @@
 typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
-typedef uint32_t unative_t;
+typedef uint32_t sysarg_t;
 typedef int32_t native_t;
 
Index: boot/arch/sparc64/include/types.h
===================================================================
--- boot/arch/sparc64/include/types.h	(revision c245f16e32b7e3ef731e81556156d471431b6bb9)
+++ boot/arch/sparc64/include/types.h	(revision 3ca343045c94c938e60da0bd8a09c6dd6aabb9cf)
@@ -35,5 +35,5 @@
 typedef uint64_t size_t;
 typedef uint64_t uintptr_t;
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef int64_t native_t;
 
Index: boot/genarch/include/ofw.h
===================================================================
--- boot/genarch/include/ofw.h	(revision c245f16e32b7e3ef731e81556156d471431b6bb9)
+++ boot/genarch/include/ofw.h	(revision 3ca343045c94c938e60da0bd8a09c6dd6aabb9cf)
@@ -40,5 +40,5 @@
 #define OFW_TREE_PROPERTY_MAX_VALUELEN  64
 
-typedef unative_t ofw_arg_t;
+typedef sysarg_t ofw_arg_t;
 typedef native_t ofw_ret_t;
 typedef uint32_t ofw_prop_t;