diff --git a/spm/cactus/cactus.mk b/spm/cactus/cactus.mk
index 03d809d..056b4a7 100644
--- a/spm/cactus/cactus.mk
+++ b/spm/cactus/cactus.mk
@@ -12,8 +12,6 @@
 	-Iinclude					\
 	-Iinclude/common				\
 	-Iinclude/common/${ARCH}			\
-	-Iinclude/drivers				\
-	-Iinclude/drivers/arm				\
 	-Iinclude/lib					\
 	-Iinclude/lib/${ARCH}				\
 	-Iinclude/lib/stdlib				\
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>
diff --git a/spm/ivy/ivy.mk b/spm/ivy/ivy.mk
index c7726f4..244d209 100644
--- a/spm/ivy/ivy.mk
+++ b/spm/ivy/ivy.mk
@@ -12,8 +12,6 @@
 	-Iinclude					\
 	-Iinclude/common				\
 	-Iinclude/common/${ARCH}			\
-	-Iinclude/drivers				\
-	-Iinclude/drivers/arm				\
 	-Iinclude/lib					\
 	-Iinclude/lib/${ARCH}				\
 	-Iinclude/lib/stdlib				\
diff --git a/spm/ivy/ivy_main.c b/spm/ivy/ivy_main.c
index 1f1c5e4..8542150 100644
--- a/spm/ivy/ivy_main.c
+++ b/spm/ivy/ivy_main.c
@@ -5,11 +5,11 @@
  */
 
 #include <assert.h>
-#include <console.h>
 #include <debug.h>
+#include <drivers/console.h>
+#include <drivers/arm/pl011.h>
 #include <errno.h>
 #include <ivy_def.h>
-#include <pl011.h>
 #include <plat_arm.h>
 #include <platform_def.h>
 #include <sp_helpers.h>