diff --git a/Makefile b/Makefile
index f3312c6515a2ef1909dabcdb7ff75fd6c6903438..41a64f93eba346e5516d17978eff8aa93d9c4062 100644
--- a/Makefile
+++ b/Makefile
@@ -285,28 +285,6 @@ INCLUDES		+=	-Iinclude				\
 				${PLAT_INCLUDES}			\
 				${SPD_INCLUDES}
 
-ifeq (${ERROR_DEPRECATED},0)
-INCLUDES		+=	-Iinclude/bl1				\
-				-Iinclude/bl2				\
-				-Iinclude/bl2u				\
-				-Iinclude/bl31				\
-				-Iinclude/drivers			\
-				-Iinclude/drivers/arm			\
-				-Iinclude/drivers/auth			\
-				-Iinclude/drivers/io			\
-				-Iinclude/drivers/ti/uart		\
-				-Iinclude/lib				\
-				-Iinclude/lib/cpus			\
-				-Iinclude/lib/el3_runtime		\
-				-Iinclude/lib/extensions		\
-				-Iinclude/lib/pmf			\
-				-Iinclude/lib/psci			\
-				-Iinclude/lib/xlat_tables		\
-				-Iinclude/plat/common			\
-				-Iinclude/services			\
-				-Iinclude/tools_share
-endif
-
 include common/backtrace/backtrace.mk
 
 ################################################################################
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c
index 588c57de71cef62b6860a300ba126abe07e9d1ea..9a9d06aebedbe16b06ffcc4f4a913a3dba30e935 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <mmio.h>
+#include <lib/mmio.h>
 #include <common/debug.h>
 
 #include "boot_init_dram_regdef_d3.h"
@@ -193,7 +193,7 @@ static void init_ddr_d3_1866(void)
          RegVal_R2 = (ReadReg_32(DBSC_D3_DBPDRGD0) & 0xFFFFFF00);
          WriteReg_32(DBSC_D3_DBPDRGA0,0x000000B0 + i*0x20);
          WriteReg_32(DBSC_D3_DBPDRGD0,RegVal_R2 | RegVal_R6);
-      } else 
+      } else
       {
          WriteReg_32(DBSC_D3_DBPDRGA0,0x000000B2 + i*0x20);
          RegVal_R2 = (ReadReg_32(DBSC_D3_DBPDRGD0) & 0xFFFFFFF8);
@@ -508,7 +508,7 @@ static void init_ddr_d3_1600(void)
          RegVal_R2 = (ReadReg_32(DBSC_D3_DBPDRGD0) & 0xFFFFFF00);
          WriteReg_32(DBSC_D3_DBPDRGA0,0x000000B0 + i*0x20);
          WriteReg_32(DBSC_D3_DBPDRGD0,RegVal_R2 | RegVal_R6);
-      } else 
+      } else
       {
          WriteReg_32(DBSC_D3_DBPDRGA0,0x000000B2 + i*0x20);
          RegVal_R2 = (ReadReg_32(DBSC_D3_DBPDRGD0) & 0xFFFFFFF8);
diff --git a/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c b/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c
index 639f832b5217c153566c72853fc8b2aebfba0e95..1f20d19ba6436e0042d270cf09c6294227ec8f23 100644
--- a/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c
+++ b/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <mmio.h>
+#include <lib/mmio.h>
 #include "pfc_init_d3.h"
 #include "rcar_def.h"
 
@@ -896,7 +896,7 @@ void pfc_init_d3(void)
 	pfc_reg_write(PFC_PUD3, 0xFF0FFFFFU);
 	pfc_reg_write(PFC_PUD4, 0xE0000000U);
 	pfc_reg_write(PFC_PUD5, 0x60000000U);
-                            
+
 	/* initialize LSI pin pull-enable register */
 	pfc_reg_write(PFC_PUEN0, 0x00000000U);
 	pfc_reg_write(PFC_PUEN1, 0x00000000U);
@@ -904,7 +904,7 @@ void pfc_init_d3(void)
 	pfc_reg_write(PFC_PUEN3, 0x000F008CU);
 	pfc_reg_write(PFC_PUEN4, 0x00000000U);
 	pfc_reg_write(PFC_PUEN5, 0x00000000U);
-                             
+
 	/* initialize positive/negative logic select */
 	mmio_write_32(GPIO_POSNEG0, 0x00000000U);
 	mmio_write_32(GPIO_POSNEG1, 0x00000000U);
diff --git a/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c b/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c
index 37def9e40c85fd508084ffbc4402de2200940f0c..caa6048d7683b207a242caacbde7beb4c12e9e84 100644
--- a/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c
+++ b/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdint.h>		/* for uint32_t */
-#include <mmio.h>
+#include <lib/mmio.h>
 #include "pfc_init_v3m.h"
 #include "include/rcar_def.h"
 #include "rcar_private.h"
diff --git a/plat/imx/common/imx_sip_handler.c b/plat/imx/common/imx_sip_handler.c
index 55639cdf0edb4748f735cf1744602e0912549755..4eabda7964f00e76b941b9ac72dcc5141d8c7190 100644
--- a/plat/imx/common/imx_sip_handler.c
+++ b/plat/imx/common/imx_sip_handler.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <std_svc.h>
+#include <services/std_svc.h>
 #include <string.h>
 #include <platform_def.h>
 #include <common/debug.h>
diff --git a/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c b/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c
index 29dc2674c8c34ebb8ef74a7993850e5f9d9beb2b..d7db604cc1c066c7317c28aa37c62eee6da615ad 100644
--- a/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c
+++ b/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c
@@ -8,10 +8,10 @@
 #include <assert.h>
 #include <bpmp.h>
 #include <common/debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <tegra_def.h>
diff --git a/plat/nvidia/tegra/common/drivers/bpmp_ipc/intf.c b/plat/nvidia/tegra/common/drivers/bpmp_ipc/intf.c
index 2efa1bd984032836d588e5a2a4e5023fc12589a4..68b450e52df16ad10590bab9f7416da4aafb9551 100644
--- a/plat/nvidia/tegra/common/drivers/bpmp_ipc/intf.c
+++ b/plat/nvidia/tegra/common/drivers/bpmp_ipc/intf.c
@@ -7,13 +7,13 @@
 #include <assert.h>
 #include <bpmp_ipc.h>
 #include <debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 #include <stdbool.h>
 #include <string.h>
 #include <tegra_def.h>
-#include <utils_def.h>
 
 #include "intf.h"
 #include "ivc.h"
diff --git a/plat/nvidia/tegra/common/drivers/bpmp_ipc/ivc.h b/plat/nvidia/tegra/common/drivers/bpmp_ipc/ivc.h
index f34d6cf0c3e726e054398029841bdbd1fca337c9..42e6a1f7cca6251b3962ad06aa955a9e9332290e 100644
--- a/plat/nvidia/tegra/common/drivers/bpmp_ipc/ivc.h
+++ b/plat/nvidia/tegra/common/drivers/bpmp_ipc/ivc.h
@@ -7,9 +7,9 @@
 #ifndef IVC_H
 #define IVC_H
 
+#include <lib/utils_def.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <utils_def.h>
 
 #define IVC_ALIGN		U(64)
 #define IVC_CHHDR_TX_FIELDS	U(16)
diff --git a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
index bdd3ee763133890575121c4970e2b49e28f223a7..8f5555459ddfe21cdfa873da8680f0281c4536de 100644
--- a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
+++ b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
@@ -13,9 +13,9 @@
 #include <lib/mmio.h>
 
 #include <flowctrl.h>
+#include <lib/utils_def.h>
 #include <pmc.h>
 #include <tegra_def.h>
-#include <utils_def.h>
 
 #define CLK_RST_DEV_L_SET		0x300
 #define CLK_RST_DEV_L_CLR		0x304
diff --git a/plat/nvidia/tegra/common/drivers/gpcdma/gpcdma.c b/plat/nvidia/tegra/common/drivers/gpcdma/gpcdma.c
index 64e84acc72d5f745625df133a5d0ed6d5b90098b..d68cdfd4b7f36d129e158c22a19a0fb29fa29db3 100644
--- a/plat/nvidia/tegra/common/drivers/gpcdma/gpcdma.c
+++ b/plat/nvidia/tegra/common/drivers/gpcdma/gpcdma.c
@@ -6,14 +6,14 @@
 
 #include <arch_helpers.h>
 #include <common/debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
 #include <gpcdma.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 #include <platform_def.h>
 #include <stdbool.h>
 #include <tegra_def.h>
-#include <utils_def.h>
 
 /* DMA channel registers */
 #define DMA_CH_CSR				U(0x0)
diff --git a/plat/nvidia/tegra/common/lib/debug/profiler.c b/plat/nvidia/tegra/common/lib/debug/profiler.c
index d4c3f9595dec95c680be97364533d3d2ac85e6e5..dd76a4e965043ed170947016c0b373a21c387525 100644
--- a/plat/nvidia/tegra/common/lib/debug/profiler.c
+++ b/plat/nvidia/tegra/common/lib/debug/profiler.c
@@ -23,12 +23,12 @@
 #include <arch.h>
 #include <arch_helpers.h>
 #include <assert.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <profiler.h>
 #include <stdbool.h>
 #include <string.h>
-#include <utils_def.h>
-#include <xlat_tables_v2.h>
 
 static uint64_t shmem_base_addr;
 
diff --git a/plat/nvidia/tegra/common/tegra_topology.c b/plat/nvidia/tegra/common/tegra_topology.c
index 14631a776c7079f8d949218214f259b3d3aaa70d..205b051657d44e823fef54b756a0ac396887d861 100644
--- a/plat/nvidia/tegra/common/tegra_topology.c
+++ b/plat/nvidia/tegra/common/tegra_topology.c
@@ -7,8 +7,8 @@
 #include <platform_def.h>
 
 #include <arch.h>
-#include <platform.h>
 #include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #pragma weak plat_core_pos_by_mpidr
 
diff --git a/plat/nvidia/tegra/include/drivers/bpmp_ipc.h b/plat/nvidia/tegra/include/drivers/bpmp_ipc.h
index d487956082b88989d49f65e7091c98972e2ec648..0d1e4059677f35db67f4d2345c796a5134a78ce0 100644
--- a/plat/nvidia/tegra/include/drivers/bpmp_ipc.h
+++ b/plat/nvidia/tegra/include/drivers/bpmp_ipc.h
@@ -7,9 +7,9 @@
 #ifndef __BPMP_IPC_H__
 #define __BPMP_IPC_H__
 
+#include <lib/utils_def.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
 
 /**
  * Currently supported reset identifiers
diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
index f5b0ed4d32923b1c26e57679ffd6f6183b5591f4..9cbadd3e6592e8617b8fde232a23cbf292b4b19b 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
@@ -11,7 +11,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <mmio.h>
+#include <lib/mmio.h>
 #include <stdint.h>
 
 /*******************************************************************************
diff --git a/plat/nvidia/tegra/include/plat_macros.S b/plat/nvidia/tegra/include/plat_macros.S
index 2796c5d272457f2c00e17df8ffdbbfefbe835bfc..4f01e3306002253e3fb757a2ea87ffea86dc124a 100644
--- a/plat/nvidia/tegra/include/plat_macros.S
+++ b/plat/nvidia/tegra/include/plat_macros.S
@@ -7,7 +7,7 @@
 #ifndef PLAT_MACROS_S
 #define PLAT_MACROS_S
 
-#include <gicv2.h>
+#include <drivers/arm/gicv2.h>
 #include <tegra_def.h>
 
 .section .rodata.gic_reg_name, "aS"
diff --git a/plat/nvidia/tegra/include/tegra_platform.h b/plat/nvidia/tegra/include/tegra_platform.h
index 13c92e0ebde63a1fc649470b0794a19eaf58adf6..b9c378240e0279d1bd955580f57ce5d65f2dc989 100644
--- a/plat/nvidia/tegra/include/tegra_platform.h
+++ b/plat/nvidia/tegra/include/tegra_platform.h
@@ -8,8 +8,8 @@
 #define TEGRA_PLATFORM_H
 
 #include <cdefs.h>
+#include <lib/utils_def.h>
 #include <stdbool.h>
-#include <utils_def.h>
 
 /*******************************************************************************
  * Tegra major, minor version helper macros
diff --git a/plat/nvidia/tegra/soc/t132/plat_setup.c b/plat/nvidia/tegra/soc/t132/plat_setup.c
index fef5e0a1ea684ab7e820de84c3ff25401274d072..570acd900daed345e104de32eddadc5cb2785552 100644
--- a/plat/nvidia/tegra/soc/t132/plat_setup.c
+++ b/plat/nvidia/tegra/soc/t132/plat_setup.c
@@ -7,7 +7,7 @@
 #include <arch_helpers.h>
 #include <common/bl_common.h>
 #include <lib/xlat_tables/xlat_tables_v2.h>
-#include <platform.h>
+#include <plat/common/platform.h>
 #include <tegra_def.h>
 #include <tegra_private.h>
 
diff --git a/plat/nvidia/tegra/soc/t210/drivers/se/security_engine.c b/plat/nvidia/tegra/soc/t210/drivers/se/security_engine.c
index e0a0d6c2e510073e67aea5e99d53aec05c9f76ed..8d7dbf9e552135e4eeebcec7fe6bf162f6a30bde 100644
--- a/plat/nvidia/tegra/soc/t210/drivers/se/security_engine.c
+++ b/plat/nvidia/tegra/soc/t210/drivers/se/security_engine.c
@@ -8,10 +8,10 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <common/debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <psci.h>
+#include <lib/mmio.h>
+#include <lib/psci/psci.h>
 #include <se_private.h>
 #include <security_engine.h>
 #include <tegra_platform.h>
diff --git a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
index b7d10af00a3e15de273285e5bd7a5400cd9c667d..12241c2f3f911e0f0f5ac1c1f2bce91172ad051d 100644
--- a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
@@ -15,6 +15,7 @@
 
 #include <bpmp.h>
 #include <flowctrl.h>
+#include <lib/utils.h>
 #include <memctrl.h>
 #include <pmc.h>
 #include <platform_def.h>
@@ -22,7 +23,6 @@
 #include <tegra_def.h>
 #include <tegra_private.h>
 #include <tegra_platform.h>
-#include <utils.h>
 
 /*
  * Register used to clear CPU reset signals. Each CPU has two reset
diff --git a/plat/nvidia/tegra/soc/t210/plat_setup.c b/plat/nvidia/tegra/soc/t210/plat_setup.c
index 4a42644dbb2f425f06aed9684b1e7641b186e310..2a2d102f7a8c5990aa86a4305883c1638cf1098d 100644
--- a/plat/nvidia/tegra/soc/t210/plat_setup.c
+++ b/plat/nvidia/tegra/soc/t210/plat_setup.c
@@ -19,7 +19,7 @@
 #include <bpmp.h>
 #include <flowctrl.h>
 #include <memctrl.h>
-#include <platform.h>
+#include <plat/common/platform.h>
 #include <security_engine.h>
 #include <tegra_def.h>
 #include <tegra_platform.h>
diff --git a/plat/nvidia/tegra/soc/t210/plat_sip_calls.c b/plat/nvidia/tegra/soc/t210/plat_sip_calls.c
index 0e8900ef7792d64a0136ee0a43f99d5da1854cd5..7e0f5c1d88c6e8314429a037bdee3a755f52630c 100644
--- a/plat/nvidia/tegra/soc/t210/plat_sip_calls.c
+++ b/plat/nvidia/tegra/soc/t210/plat_sip_calls.c
@@ -11,8 +11,8 @@
 #include <common/debug.h>
 #include <common/runtime_svc.h>
 #include <errno.h>
-#include <mmio.h>
-#include <utils_def.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 
 #include <memctrl.h>
 #include <pmc.h>
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index b059a4352a20ac07cbdf0ae1d8545650967fe1f2..d6c092cb7fa045875e2d6392f06fc2565080fcb5 100644
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -5,9 +5,9 @@
  */
 
 #include <assert.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <stdbool.h>
 #include <string.h>
-#include <xlat_tables_v2.h>
 
 #include <arch_helpers.h>
 #include <bl31/bl31.h>