diff --git a/plat/arm/common/arm_fwu_io_storage.c b/plat/arm/common/arm_fwu_io_storage.c
index 184f2af..5af3e06 100644
--- a/plat/arm/common/arm_fwu_io_storage.c
+++ b/plat/arm/common/arm_fwu_io_storage.c
@@ -7,11 +7,11 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <debug.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
 #include <firmware_image_package.h>
 #include <image_loader.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
 #include <io_storage.h>
 #include <platform.h>
 #include <platform_def.h>
diff --git a/plat/arm/common/arm_io_storage.c b/plat/arm/common/arm_io_storage.c
index d9d8a38..3fdaf8c 100644
--- a/plat/arm/common/arm_io_storage.c
+++ b/plat/arm/common/arm_io_storage.c
@@ -5,8 +5,8 @@
  */
 
 #include <assert.h>
-#include <io_driver.h>
-#include <io_nor_flash.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_nor_flash.h>
 #include <io_storage.h>
 #include <platform.h>
 #include <tftf.h>
diff --git a/plat/arm/common/arm_setup.c b/plat/arm/common/arm_setup.c
index 79f4631..e345fd8 100644
--- a/plat/arm/common/arm_setup.c
+++ b/plat/arm/common/arm_setup.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_gic.h>
-#include <console.h>
 #include <debug.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/arm/pl011.h>
+#include <drivers/console.h>
 #include <io_storage.h>
-#include <pl011.h>
 #include <plat_arm.h>
 #include <platform.h>
 #include <platform_def.h>
diff --git a/plat/arm/common/arm_timers.c b/plat/arm/common/arm_timers.c
index c84cb84..f43fdaa 100644
--- a/plat/arm/common/arm_timers.c
+++ b/plat/arm/common/arm_timers.c
@@ -5,9 +5,9 @@
  */
 
 #include <assert.h>
+#include <drivers/arm/system_timer.h>
 #include <platform.h>
 #include <stddef.h>
-#include <system_timer.h>
 #include <timer.h>
 
 #pragma weak plat_initialise_timer_ops
diff --git a/plat/arm/fvp/aarch32/plat_helpers.S b/plat/arm/fvp/aarch32/plat_helpers.S
index 1d923ad..5865aaa 100644
--- a/plat/arm/fvp/aarch32/plat_helpers.S
+++ b/plat/arm/fvp/aarch32/plat_helpers.S
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 #include "../fvp_def.h"
 
 	.globl	platform_get_core_pos
diff --git a/plat/arm/fvp/aarch64/plat_helpers.S b/plat/arm/fvp/aarch64/plat_helpers.S
index 4bd9f3d..18cbbd4 100644
--- a/plat/arm/fvp/aarch64/plat_helpers.S
+++ b/plat/arm/fvp/aarch64/plat_helpers.S
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 #include "../fvp_def.h"
 
 	.globl	platform_get_core_pos
diff --git a/plat/arm/fvp/plat_setup.c b/plat/arm/fvp/plat_setup.c
index 0d81686..fa97814 100644
--- a/plat/arm/fvp/plat_setup.c
+++ b/plat/arm/fvp/plat_setup.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_gic.h>
+#include <drivers/arm/arm_gic.h>
 #include <plat_arm.h>
 #include <platform.h>
 
diff --git a/plat/arm/juno/aarch32/plat_helpers.S b/plat/arm/juno/aarch32/plat_helpers.S
index 99fedb4..68fb67a 100644
--- a/plat/arm/juno/aarch32/plat_helpers.S
+++ b/plat/arm/juno/aarch32/plat_helpers.S
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 #include "../juno_def.h"
 
 	.globl	platform_get_core_pos
diff --git a/plat/arm/juno/aarch64/plat_helpers.S b/plat/arm/juno/aarch64/plat_helpers.S
index 1efee4f..c221f6e 100644
--- a/plat/arm/juno/aarch64/plat_helpers.S
+++ b/plat/arm/juno/aarch64/plat_helpers.S
@@ -6,7 +6,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 #include "../juno_def.h"
 
 	.globl	platform_get_core_pos
diff --git a/plat/arm/juno/juno_timers.c b/plat/arm/juno/juno_timers.c
index 1d1ce48..604a2dd 100644
--- a/plat/arm/juno/juno_timers.c
+++ b/plat/arm/juno/juno_timers.c
@@ -5,9 +5,9 @@
  */
 
 #include <assert.h>
+#include <drivers/arm/sp804.h>
 #include <platform.h>
 #include <platform_def.h>
-#include <sp804.h>
 #include <stddef.h>
 #include <timer.h>
 
diff --git a/plat/arm/juno/plat_setup.c b/plat/arm/juno/plat_setup.c
index 8792cb3..324c9e6 100644
--- a/plat/arm/juno/plat_setup.c
+++ b/plat/arm/juno/plat_setup.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_gic.h>
+#include <drivers/arm/arm_gic.h>
 #include <mmio.h>
 #include <plat_arm.h>
 #include <platform.h>
diff --git a/plat/arm/sgi/common/aarch64/plat_helpers.S b/plat/arm/sgi/common/aarch64/plat_helpers.S
index 056a2f5..9fe2ba9 100644
--- a/plat/arm/sgi/common/aarch64/plat_helpers.S
+++ b/plat/arm/sgi/common/aarch64/plat_helpers.S
@@ -5,7 +5,7 @@
  */
 
 #include <asm_macros.S>
-#include <pl011.h>
+#include <drivers/arm/pl011.h>
 #include <platform_def.h>
 
 	.globl	platform_get_core_pos
diff --git a/plat/arm/sgi/common/plat_setup.c b/plat/arm/sgi/common/plat_setup.c
index 211e8d4..4b15f1a 100644
--- a/plat/arm/sgi/common/plat_setup.c
+++ b/plat/arm/sgi/common/plat_setup.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_gic.h>
+#include <drivers/arm/arm_gic.h>
 #include <xlat_tables_v2.h>
 
 static const mmap_region_t mmap[] = {