diff --git a/lib/irq/irq.c b/lib/irq/irq.c
index c7d671f..70c321b 100644
--- a/lib/irq/irq.c
+++ b/lib/irq/irq.c
@@ -5,9 +5,9 @@
  */
 
 #include <arch_helpers.h>
-#include <arm_gic.h>
 #include <assert.h>
 #include <debug.h>
+#include <drivers/arm/arm_gic.h>
 #include <irq.h>
 #include <plat_topology.h>
 #include <platform.h>
diff --git a/lib/power_management/hotplug/hotplug.c b/lib/power_management/hotplug/hotplug.c
index 7c3a988..37bfc06 100644
--- a/lib/power_management/hotplug/hotplug.c
+++ b/lib/power_management/hotplug/hotplug.c
@@ -5,11 +5,11 @@
  */
 
 #include <arch_helpers.h>
-#include <arm_gic.h>
 #include <assert.h>
 #include <cdefs.h>		/* For __dead2 */
-#include <console.h>
 #include <debug.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/console.h>
 #include <irq.h>
 #include <platform.h>
 #include <platform_def.h>
diff --git a/lib/power_management/suspend/tftf_suspend.c b/lib/power_management/suspend/tftf_suspend.c
index d6c989a..ee6f9ca 100644
--- a/lib/power_management/suspend/tftf_suspend.c
+++ b/lib/power_management/suspend/tftf_suspend.c
@@ -5,9 +5,9 @@
  */
 
 #include <arch_helpers.h>
-#include <arm_gic.h>
-#include <console.h>
 #include <debug.h>
+#include <drivers/arm/arm_gic.h>
+#include <drivers/console.h>
 #include <platform.h>
 #include <power_management.h>
 #include <psci.h>
diff --git a/lib/psci/psci.c b/lib/psci/psci.c
index 520c724..857b01e 100644
--- a/lib/psci/psci.c
+++ b/lib/psci/psci.c
@@ -5,8 +5,8 @@
  */
 
 #include <arch_helpers.h>
-#include <arm_gic.h>
 #include <debug.h>
+#include <drivers/arm/arm_gic.h>
 #include <irq.h>
 #include <platform.h>
 #include <power_management.h>
diff --git a/lib/sdei/sdei.c b/lib/sdei/sdei.c
index 264da28..157ab6c 100644
--- a/lib/sdei/sdei.c
+++ b/lib/sdei/sdei.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <arm_gic.h>
 #include <assert.h>
+#include <drivers/arm/arm_gic.h>
 #include <sdei.h>
 #include <smccc.h>
 #include <stdint.h>
diff --git a/lib/stdlib/putchar.c b/lib/stdlib/putchar.c
index 6b6f75e..d330f58 100644
--- a/lib/stdlib/putchar.c
+++ b/lib/stdlib/putchar.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <console.h>
+#include <drivers/console.h>
 #include <stdio.h>
 
 /* Putchar() should either return the character printed or EOF in case of error.