diff --git a/core/hwtimer.c b/core/hwtimer.c
index d14b3dd3611c2f8b3cf9d92845e9bc44b4ecd25b..6a847dbec9644439c580284b39b955ca39b10b75 100644
--- a/core/hwtimer.c
+++ b/core/hwtimer.c
@@ -18,13 +18,15 @@
  */
 
 #include <stdio.h>
-#include <hwtimer.h>
-#include <hwtimer_cpu.h>
-#include <hwtimer_arch.h>
 
-#include <kernel.h>
-#include <thread.h>
-#include <lifo.h>
+#include "kernel.h"
+#include "thread.h"
+#include "lifo.h"
+#include "mutex.h"
+
+#include "hwtimer.h"
+#include "hwtimer_cpu.h"
+#include "hwtimer_arch.h"
 
 /*---------------------------------------------------------------------------*/
 
@@ -50,12 +52,6 @@ static void hwtimer_releasemutex(void* mutex) {
     mutex_unlock((mutex_t*) mutex);
 }
 
-static void hwtimer_wakeup(void *ptr)
-{
-    int pid = (int)ptr;
-    thread_wakeup(pid);
-}
-
 void hwtimer_spin(unsigned long ticks)
 {
     unsigned long co = hwtimer_arch_now() + ticks;