Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/include/console/console.h	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -71,5 +71,5 @@
 extern wchar_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
-extern sys_errno_t sys_kio(int cmd, uspace_ptr(void) buf, size_t size);
+extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);
 
 extern void grab_console(void);
Index: kernel/generic/include/ddi/ddi.h
===================================================================
--- kernel/generic/include/ddi/ddi.h	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/include/ddi/ddi.h	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -63,10 +63,10 @@
 extern void pio_unmap(void *, void *, size_t);
 
-extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, uspace_ptr(void),
+extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, uspace_addr_t,
     uintptr_t);
 extern sys_errno_t sys_physmem_unmap(uintptr_t);
 
-extern sys_errno_t sys_dmamem_map(size_t, unsigned int, unsigned int, uspace_ptr(void),
-    uspace_ptr(void), uintptr_t);
+extern sys_errno_t sys_dmamem_map(size_t, unsigned int, unsigned int, uspace_addr_t,
+    uspace_addr_t, uintptr_t);
 extern sys_errno_t sys_dmamem_unmap(uintptr_t, size_t, unsigned int);
 
Index: kernel/generic/include/log.h
===================================================================
--- kernel/generic/include/log.h	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/include/log.h	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -52,5 +52,5 @@
     _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 
-extern sys_errno_t sys_klog(sysarg_t, uspace_ptr(void) buf, size_t size,
+extern sys_errno_t sys_klog(sysarg_t, uspace_addr_t buf, size_t size,
     sysarg_t level, uspace_ptr(size_t) uspace_nread);
 
Index: kernel/generic/include/sysinfo/sysinfo.h
===================================================================
--- kernel/generic/include/sysinfo/sysinfo.h	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/include/sysinfo/sysinfo.h	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -162,10 +162,10 @@
 extern void sysinfo_dump(sysinfo_item_t *);
 
-extern sys_errno_t sys_sysinfo_get_keys_size(uspace_ptr(void), size_t, uspace_ptr(void));
-extern sys_errno_t sys_sysinfo_get_keys(uspace_ptr(void), size_t, uspace_ptr(void), size_t, uspace_ptr(size_t));
-extern sysarg_t sys_sysinfo_get_val_type(uspace_ptr(void), size_t);
-extern sys_errno_t sys_sysinfo_get_value(uspace_ptr(void), size_t, uspace_ptr(void));
-extern sys_errno_t sys_sysinfo_get_data_size(uspace_ptr(void), size_t, uspace_ptr(void));
-extern sys_errno_t sys_sysinfo_get_data(uspace_ptr(void), size_t, uspace_ptr(void), size_t, uspace_ptr(size_t));
+extern sys_errno_t sys_sysinfo_get_keys_size(uspace_addr_t, size_t, uspace_addr_t);
+extern sys_errno_t sys_sysinfo_get_keys(uspace_addr_t, size_t, uspace_addr_t, size_t, uspace_ptr(size_t));
+extern sysarg_t sys_sysinfo_get_val_type(uspace_addr_t, size_t);
+extern sys_errno_t sys_sysinfo_get_value(uspace_addr_t, size_t, uspace_addr_t);
+extern sys_errno_t sys_sysinfo_get_data_size(uspace_addr_t, size_t, uspace_addr_t);
+extern sys_errno_t sys_sysinfo_get_data(uspace_addr_t, size_t, uspace_addr_t, size_t, uspace_ptr(size_t));
 
 #endif
Index: kernel/generic/include/udebug/udebug_ops.h
===================================================================
--- kernel/generic/include/udebug/udebug_ops.h	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/include/udebug/udebug_ops.h	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -55,5 +55,5 @@
 errno_t udebug_regs_read(thread_t *t, void **buffer);
 
-errno_t udebug_mem_read(uspace_ptr(void) uspace_addr, size_t n, void **buffer);
+errno_t udebug_mem_read(uspace_addr_t uspace_addr, size_t n, void **buffer);
 
 #endif
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/src/console/console.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -395,5 +395,5 @@
  *
  */
-sys_errno_t sys_kio(int cmd, uspace_ptr(void) buf, size_t size)
+sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size)
 {
 	char *data;
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/src/ddi/ddi.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -248,5 +248,5 @@
  */
 sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
-    uspace_ptr(void) virt_ptr, uintptr_t bound)
+    uspace_addr_t virt_ptr, uintptr_t bound)
 {
 	uintptr_t virt;
@@ -465,5 +465,5 @@
 
 sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
-    uspace_ptr(void) phys_ptr, uspace_ptr(void) virt_ptr, uintptr_t bound)
+    uspace_addr_t phys_ptr, uspace_addr_t virt_ptr, uintptr_t bound)
 {
 	if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) {
Index: kernel/generic/src/log/log.c
===================================================================
--- kernel/generic/src/log/log.c	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/src/log/log.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -295,5 +295,5 @@
  *
  */
-sys_errno_t sys_klog(sysarg_t operation, uspace_ptr(void) buf, size_t size,
+sys_errno_t sys_klog(sysarg_t operation, uspace_addr_t buf, size_t size,
     sysarg_t level, uspace_ptr(size_t) uspace_nread)
 {
Index: kernel/generic/src/sysinfo/sysinfo.c
===================================================================
--- kernel/generic/src/sysinfo/sysinfo.c	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/src/sysinfo/sysinfo.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -677,5 +677,5 @@
  *
  */
-_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(uspace_ptr(void) ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(uspace_addr_t ptr, size_t size,
     bool dry_run)
 {
@@ -786,5 +786,5 @@
  *
  */
-_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(uspace_ptr(void) ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(uspace_addr_t ptr, size_t size,
     bool dry_run)
 {
@@ -831,6 +831,6 @@
  *
  */
-sys_errno_t sys_sysinfo_get_keys_size(uspace_ptr(void) path_ptr, size_t path_size,
-    uspace_ptr(void) size_ptr)
+sys_errno_t sys_sysinfo_get_keys_size(uspace_addr_t path_ptr, size_t path_size,
+    uspace_addr_t size_ptr)
 {
 	errno_t rc;
@@ -879,6 +879,6 @@
  *
  */
-sys_errno_t sys_sysinfo_get_keys(uspace_ptr(void) path_ptr, size_t path_size,
-    uspace_ptr(void) buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
+sys_errno_t sys_sysinfo_get_keys(uspace_addr_t path_ptr, size_t path_size,
+    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
 {
 	errno_t rc;
@@ -914,5 +914,5 @@
  *
  */
-sysarg_t sys_sysinfo_get_val_type(uspace_ptr(void) path_ptr, size_t path_size)
+sysarg_t sys_sysinfo_get_val_type(uspace_addr_t path_ptr, size_t path_size)
 {
 	/*
@@ -950,6 +950,6 @@
  *
  */
-sys_errno_t sys_sysinfo_get_value(uspace_ptr(void) path_ptr, size_t path_size,
-    uspace_ptr(void) value_ptr)
+sys_errno_t sys_sysinfo_get_value(uspace_addr_t path_ptr, size_t path_size,
+    uspace_addr_t value_ptr)
 {
 	errno_t rc;
@@ -986,6 +986,6 @@
  *
  */
-sys_errno_t sys_sysinfo_get_data_size(uspace_ptr(void) path_ptr, size_t path_size,
-    uspace_ptr(void) size_ptr)
+sys_errno_t sys_sysinfo_get_data_size(uspace_addr_t path_ptr, size_t path_size,
+    uspace_addr_t size_ptr)
 {
 	errno_t rc;
@@ -1036,6 +1036,6 @@
  *
  */
-sys_errno_t sys_sysinfo_get_data(uspace_ptr(void) path_ptr, size_t path_size,
-    uspace_ptr(void) buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
+sys_errno_t sys_sysinfo_get_data(uspace_addr_t path_ptr, size_t path_size,
+    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
 {
 	errno_t rc;
Index: kernel/generic/src/udebug/udebug_ipc.c
===================================================================
--- kernel/generic/src/udebug/udebug_ipc.c	(revision e39d7b832f24a725f0663acb3b62261da551856a)
+++ kernel/generic/src/udebug/udebug_ipc.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
@@ -398,6 +398,6 @@
 static void udebug_receive_mem_read(call_t *call)
 {
-	uspace_ptr(void) uspace_dst;
-	uspace_ptr(void) uspace_src;
+	uspace_addr_t uspace_dst;
+	uspace_addr_t uspace_src;
 	unsigned size;
 	void *buffer = NULL;