diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 977b61fc..082b5162 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -17,8 +17,8 @@
  * This file is part of MetalSVM.
  */
 
-#include <metalsvm/irq.h>
 #include <metalsvm/string.h>
+#include <asm/irq.h>
 #include <asm/idt.h>
 #include <asm/isrs.h>
 
diff --git a/arch/x86/kernel/timer.c b/arch/x86/kernel/timer.c
index bfe42d21..5f612953 100644
--- a/arch/x86/kernel/timer.c
+++ b/arch/x86/kernel/timer.c
@@ -20,9 +20,9 @@
 #include <metalsvm/stdio.h>
 #include <metalsvm/string.h>
 #include <metalsvm/tasks.h>
-#include <metalsvm/irq.h>
 #include <metalsvm/time.h>
 #include <metalsvm/processor.h>
+#include <asm/irq.h>
 #include <asm/irqflags.h>
 
 /* 
diff --git a/include/metalsvm/irq.h b/include/metalsvm/irq.h
deleted file mode 100644
index fb68d852..00000000
--- a/include/metalsvm/irq.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 
- * Copyright 2010 Stefan Lankes, Chair for Operating Systems,
- *                               RWTH Aachen University
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This file is part of MetalSVM.
- */
-
-#ifndef __IRQ_H__
-#define __IRQ_H__
-
-#include <metalsvm/config.h>
-#include <asm/irq.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/kernel/main.c b/kernel/main.c
index 6e98509c..a54af736 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -20,12 +20,12 @@
 #include <metalsvm/stddef.h>
 #include <metalsvm/stdio.h>
 #include <metalsvm/time.h>
-#include <metalsvm/irq.h>
 #include <metalsvm/mmu.h>
 #include <metalsvm/tasks.h>
 #include <metalsvm/processor.h>
 #include <metalsvm/semaphore.h>
 #include <metalsvm/mailbox.h>
+#include <asm/irq.h>
 #include <asm/kb.h>
 #ifdef USE_LWIP
 #include <lwip/sys.h>