diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index a062ef0..4580f23 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -6,10 +6,10 @@
 
 #include <assert.h>
 #include <cactus_def.h>
-#include <console.h>
 #include <debug.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
 #include <errno.h>
-#include <pl011.h>
 #include <plat_arm.h>
 #include <platform_def.h>
 #include <sp_helpers.h>