Index: kernel/generic/src/ipc/event.c
===================================================================
--- kernel/generic/src/ipc/event.c	(revision 1871118c75a2375392bbb2054288202965beca01)
+++ kernel/generic/src/ipc/event.c	(revision 00ef082a51789ade0c00cb23234ff5334cf04e8c)
@@ -169,6 +169,5 @@
 				    true);
 
-				waitq_wakeup(&event->answerbox->wq,
-				    WAKEUP_FIRST);
+				waitq_wake_one(&event->answerbox->wq);
 
 				if (mask)
Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 1871118c75a2375392bbb2054288202965beca01)
+++ kernel/generic/src/ipc/ipc.c	(revision 00ef082a51789ade0c00cb23234ff5334cf04e8c)
@@ -326,5 +326,5 @@
 		irq_spinlock_unlock(&callerbox->lock, true);
 
-	waitq_wakeup(&callerbox->wq, WAKEUP_FIRST);
+	waitq_wake_one(&callerbox->wq);
 }
 
@@ -416,5 +416,5 @@
 	irq_spinlock_unlock(&box->lock, true);
 
-	waitq_wakeup(&box->wq, WAKEUP_FIRST);
+	waitq_wake_one(&box->wq);
 }
 
@@ -555,5 +555,5 @@
 	errno_t rc;
 
-	rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL);
+	rc = _waitq_sleep_timeout(&box->wq, usec, flags);
 	if (rc != EOK)
 		return rc;
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 1871118c75a2375392bbb2054288202965beca01)
+++ kernel/generic/src/ipc/irq.c	(revision 00ef082a51789ade0c00cb23234ff5334cf04e8c)
@@ -429,5 +429,5 @@
 	irq_spinlock_unlock(&irq->notif_cfg.answerbox->irq_lock, false);
 
-	waitq_wakeup(&irq->notif_cfg.answerbox->wq, WAKEUP_FIRST);
+	waitq_wake_one(&irq->notif_cfg.answerbox->wq);
 }
 
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 1871118c75a2375392bbb2054288202965beca01)
+++ kernel/generic/src/ipc/sysipc.c	(revision 00ef082a51789ade0c00cb23234ff5334cf04e8c)
@@ -871,5 +871,5 @@
 sys_errno_t sys_ipc_poke(void)
 {
-	waitq_wakeup(&TASK->answerbox.wq, WAKEUP_FIRST);
+	waitq_wake_one(&TASK->answerbox.wq);
 	return EOK;
 }