Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/ddi/ddi.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -393,5 +393,5 @@
  *
  */
-sys_errno_t sys_iospace_enable(uspace_ptr(ddi_ioarg_t) uspace_io_arg)
+sys_errno_t sys_iospace_enable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
 	ddi_ioarg_t arg;
@@ -404,5 +404,5 @@
 }
 
-sys_errno_t sys_iospace_disable(uspace_ptr(ddi_ioarg_t) uspace_io_arg)
+sys_errno_t sys_iospace_disable(uspace_ptr_ddi_ioarg_t uspace_io_arg)
 {
 	ddi_ioarg_t arg;
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/ipc/irq.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -223,5 +223,5 @@
  *
  */
-static irq_code_t *code_from_uspace(uspace_ptr(irq_code_t) ucode)
+static irq_code_t *code_from_uspace(uspace_ptr_irq_code_t ucode)
 {
 	irq_pio_range_t *ranges = NULL;
@@ -323,5 +323,5 @@
  */
 errno_t ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
-    uspace_ptr(irq_code_t) ucode, uspace_ptr(cap_irq_handle_t) uspace_handle)
+    uspace_ptr_irq_code_t ucode, uspace_ptr_cap_irq_handle_t uspace_handle)
 {
 	if ((inr < 0) || (inr > last_inr))
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/ipc/sysipc.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -419,5 +419,5 @@
  *
  */
-sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, uspace_ptr(ipc_data_t) data,
+sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t handle, uspace_ptr_ipc_data_t data,
     sysarg_t label)
 {
@@ -623,5 +623,5 @@
  */
 sys_errno_t sys_ipc_forward_slow(cap_call_handle_t chandle,
-    cap_phone_handle_t phandle, uspace_ptr(ipc_data_t) data, unsigned int mode)
+    cap_phone_handle_t phandle, uspace_ptr_ipc_data_t data, unsigned int mode)
 {
 	ipc_data_t newdata;
@@ -700,5 +700,5 @@
  *
  */
-sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, uspace_ptr(ipc_data_t) data)
+sys_errno_t sys_ipc_answer_slow(cap_call_handle_t chandle, uspace_ptr_ipc_data_t data)
 {
 	kobject_t *kobj = cap_unpublish(TASK, chandle, KOBJECT_TYPE_CALL);
@@ -766,5 +766,5 @@
  * @return An error code on error.
  */
-sys_errno_t sys_ipc_wait_for_call(uspace_ptr(ipc_data_t) calldata, uint32_t usec,
+sys_errno_t sys_ipc_wait_for_call(uspace_ptr_ipc_data_t calldata, uint32_t usec,
     unsigned int flags)
 {
@@ -888,5 +888,5 @@
  */
 sys_errno_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod,
-    uspace_ptr(irq_code_t) ucode, uspace_ptr(cap_irq_handle_t) uspace_handle)
+    uspace_ptr_irq_code_t ucode, uspace_ptr_cap_irq_handle_t uspace_handle)
 {
 	if (!(perm_get(TASK) & PERM_IRQ_REG))
@@ -918,6 +918,6 @@
  *
  */
-sys_errno_t sys_ipc_connect_kbox(uspace_ptr(task_id_t) uspace_taskid,
-    uspace_ptr(cap_phone_handle_t) uspace_phone)
+sys_errno_t sys_ipc_connect_kbox(uspace_ptr_task_id_t uspace_taskid,
+    uspace_ptr_cap_phone_handle_t uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
Index: kernel/generic/src/log/log.c
===================================================================
--- kernel/generic/src/log/log.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/log/log.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -296,5 +296,5 @@
  */
 sys_errno_t sys_klog(sysarg_t operation, uspace_addr_t buf, size_t size,
-    sysarg_t level, uspace_ptr(size_t) uspace_nread)
+    sysarg_t level, uspace_ptr_size_t uspace_nread)
 {
 	char *data;
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/mm/as.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -2092,5 +2092,5 @@
 
 sysarg_t sys_as_area_create(uintptr_t base, size_t size, unsigned int flags,
-    uintptr_t bound, uspace_ptr(as_area_pager_info_t) pager_info)
+    uintptr_t bound, uspace_ptr_as_area_pager_info_t pager_info)
 {
 	uintptr_t virt = base;
@@ -2125,5 +2125,5 @@
 }
 
-sys_errno_t sys_as_area_get_info(uintptr_t address, uspace_ptr(as_area_info_t) dest)
+sys_errno_t sys_as_area_get_info(uintptr_t address, uspace_ptr_as_area_info_t dest)
 {
 	as_area_t *area;
Index: kernel/generic/src/mm/page.c
===================================================================
--- kernel/generic/src/mm/page.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/mm/page.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -215,5 +215,5 @@
  *
  */
-sys_errno_t sys_page_find_mapping(uintptr_t virt, uspace_ptr(uintptr_t) phys_ptr)
+sys_errno_t sys_page_find_mapping(uintptr_t virt, uspace_ptr_uintptr_t phys_ptr)
 {
 	uintptr_t phys;
Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/proc/program.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -218,5 +218,5 @@
  *
  */
-sys_errno_t sys_program_spawn_loader(uspace_ptr(char) uspace_name, size_t name_len)
+sys_errno_t sys_program_spawn_loader(uspace_ptr_char uspace_name, size_t name_len)
 {
 	/* Cap length of name and copy it from userspace. */
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/proc/task.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -323,5 +323,5 @@
  *
  */
-sys_errno_t sys_task_get_id(uspace_ptr(sysarg64_t) uspace_taskid)
+sys_errno_t sys_task_get_id(uspace_ptr_sysarg64_t uspace_taskid)
 {
 	/*
@@ -363,5 +363,5 @@
  *
  */
-sys_errno_t sys_task_set_name(const uspace_ptr(char) uspace_name, size_t name_len)
+sys_errno_t sys_task_set_name(const uspace_ptr_char uspace_name, size_t name_len)
 {
 	char namebuf[TASK_NAME_BUFLEN];
@@ -404,5 +404,5 @@
  *
  */
-sys_errno_t sys_task_kill(uspace_ptr(task_id_t) uspace_taskid)
+sys_errno_t sys_task_kill(uspace_ptr_task_id_t uspace_taskid)
 {
 	task_id_t taskid;
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/proc/thread.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -998,6 +998,6 @@
  *
  */
-sys_errno_t sys_thread_create(uspace_ptr(uspace_arg_t) uspace_uarg, uspace_ptr(char) uspace_name,
-    size_t name_len, uspace_ptr(thread_id_t) uspace_thread_id)
+sys_errno_t sys_thread_create(uspace_ptr_uspace_arg_t uspace_uarg, uspace_ptr_char uspace_name,
+    size_t name_len, uspace_ptr_thread_id_t uspace_thread_id)
 {
 	if (name_len > THREAD_NAME_BUFLEN - 1)
@@ -1088,5 +1088,5 @@
  *
  */
-sys_errno_t sys_thread_get_id(uspace_ptr(thread_id_t) uspace_thread_id)
+sys_errno_t sys_thread_get_id(uspace_ptr_thread_id_t uspace_thread_id)
 {
 	/*
Index: kernel/generic/src/security/perm.c
===================================================================
--- kernel/generic/src/security/perm.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/security/perm.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -158,5 +158,5 @@
  *
  */
-sys_errno_t sys_perm_grant(uspace_ptr(sysarg64_t) uspace_taskid, perm_t perms)
+sys_errno_t sys_perm_grant(uspace_ptr_sysarg64_t uspace_taskid, perm_t perms)
 {
 	sysarg64_t taskid;
@@ -179,5 +179,5 @@
  *
  */
-sys_errno_t sys_perm_revoke(uspace_ptr(sysarg64_t) uspace_taskid, perm_t perms)
+sys_errno_t sys_perm_revoke(uspace_ptr_sysarg64_t uspace_taskid, perm_t perms)
 {
 	sysarg64_t taskid;
Index: kernel/generic/src/synch/syswaitq.c
===================================================================
--- kernel/generic/src/synch/syswaitq.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/synch/syswaitq.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -88,5 +88,5 @@
  * @return              Error code.
  */
-sys_errno_t sys_waitq_create(uspace_ptr(cap_waitq_handle_t) whandle)
+sys_errno_t sys_waitq_create(uspace_ptr_cap_waitq_handle_t whandle)
 {
 	waitq_t *wq = slab_alloc(waitq_cache, FRAME_ATOMIC);
Index: kernel/generic/src/sysinfo/sysinfo.c
===================================================================
--- kernel/generic/src/sysinfo/sysinfo.c	(revision 64b78543468fe92af33fa325a4e790bde95aa21d)
+++ kernel/generic/src/sysinfo/sysinfo.c	(revision d7dfa05821abfb7cfaa4d23f9e4cb2eb996f22bb)
@@ -880,5 +880,5 @@
  */
 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)
+    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr_size_t size_ptr)
 {
 	errno_t rc;
@@ -1037,5 +1037,5 @@
  */
 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)
+    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr_size_t size_ptr)
 {
 	errno_t rc;