diff --git a/arch/x86/include/asm/time.h b/arch/x86/include/asm/time.h
new file mode 100644
index 000000000..1064bf72f
--- /dev/null
+++ b/arch/x86/include/asm/time.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2017, Stefan Lankes, RWTH Aachen University
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of the University nor the names of its contributors
+ *      may be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @author Stefan Lankes
+ * @file arch/x86/include/asm/string.h
+ * @brief Time related functions
+ */
+
+#ifndef __ARCH_TIME_H__
+#define __ARCH_TIME_H__
+
+#include <asm/stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static inline int timer_deadline(uint32_t t) { return apic_timer_deadline(t); }
+
+static inline void timer_disable(void) { apic_disable_timer(); }
+
+static inline int timer_is_running(void) { return apic_timer_is_running(); }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/hermit/time.h b/include/hermit/time.h
index 5ae042a3a..5c32cd5fe 100644
--- a/include/hermit/time.h
+++ b/include/hermit/time.h
@@ -34,7 +34,7 @@
 #ifndef __TIME_H__
 #define __TIME_H__
 
-#include <asm/apic.h>
+#include <asm/time.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -85,12 +85,6 @@ static inline void sleep(unsigned int sec) { timer_wait(sec*TIMER_FREQ); }
  */
 static inline uint64_t get_uptime() { return (get_clock_tick() * 1000) / TIMER_FREQ; }
 
-static inline int timer_deadline(uint32_t t) { return apic_timer_deadline(t); }
-
-static inline void timer_disable(void) { apic_disable_timer(); }
-
-static inline int timer_is_running(void) { return apic_timer_is_running(); }
-
 #ifdef __cplusplus
 }
 #endif