diff --git a/drivers/arm/timer/system_timer.c b/drivers/arm/timer/system_timer.c
index 6cc3cef..e1f8fb0 100644
--- a/drivers/arm/timer/system_timer.c
+++ b/drivers/arm/timer/system_timer.c
@@ -6,13 +6,13 @@
 
 #include <arch.h>
 #include <arch_helpers.h>
-#include <arm_gic.h>
 #include <assert.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/arm/gic_v2.h>
+#include <drivers/arm/system_timer.h>
 #include <debug.h>
-#include <gic_v2.h>
 #include <irq.h>
 #include <mmio.h>
-#include <system_timer.h>
 
 static uintptr_t g_systimer_base;