Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision f619ec11294d6774460c8c5c50473bf484647d12)
+++ kernel/generic/include/ddi/irq.h	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
@@ -84,6 +84,4 @@
 typedef void (* irq_handler_t)(struct irq *irq, void *arg, ...);
 
-
-
 /** IPC notification config structure.
  *
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision f619ec11294d6774460c8c5c50473bf484647d12)
+++ kernel/generic/include/proc/thread.h	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
@@ -244,5 +244,4 @@
 extern void thread_update_accounting(void);
 extern bool thread_exists(thread_t *t);
-extern void thread_interrupt_sleep(thread_t *t);
 
 /** Fpu context slab cache. */
Index: kernel/generic/include/synch/waitq.h
===================================================================
--- kernel/generic/include/synch/waitq.h	(revision f619ec11294d6774460c8c5c50473bf484647d12)
+++ kernel/generic/include/synch/waitq.h	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
@@ -64,4 +64,6 @@
 	waitq_sleep_timeout((wq), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
 
+struct thread;
+
 extern void waitq_initialize(waitq_t *wq);
 extern int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, int flags);
@@ -71,4 +73,5 @@
 extern void waitq_wakeup(waitq_t *wq, bool all);
 extern void _waitq_wakeup_unsafe(waitq_t *wq, bool all);
+extern void waitq_interrupt_sleep(struct thread *t);
 
 #endif