Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision e3890b3fce4ad7f968cc0c569c3565b3df89e8c8)
+++ kernel/generic/include/ddi/irq.h	(revision d95f1e24a3ed2800461f743a8f9c97803cacd0a1)
@@ -37,8 +37,7 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
-#include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <atomic.h>
 #include <synch/spinlock.h>
 
@@ -52,6 +51,4 @@
 	IRQ_TRIGGER_EDGE
 } irq_trigger_t;
-
-typedef struct irq irq_t;
 
 typedef void (* irq_handler_t)(irq_t *irq, void *arg, ...);
@@ -88,13 +85,6 @@
 	void *arg;
 
-	/** Answerbox of the task that wanted to be notified. */
-	answerbox_t *notif_answerbox;
-	/** Pseudo-code to be performed by the top-half
-	 *  before a notification is sent. */
-	irq_code_t *code;
-	/** Method of the notification. */
-	unative_t method;
-	/** Counter of IRQ notifications. */
-	atomic_t counter;
+	/** Notification configuration structure. */
+	ipc_notif_cfg_t notif_cfg; 
 };