diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk
index cdcbc21..dda7c89 100644
--- a/plat/renesas/common/common.mk
+++ b/plat/renesas/common/common.mk
@@ -84,6 +84,7 @@
 			drivers/renesas/common/io/io_emmcdrv.c		\
 			drivers/renesas/common/io/io_memdrv.c		\
 			drivers/renesas/common/io/io_rcar.c		\
+			drivers/renesas/common/delay/micro_delay.c	\
 			drivers/renesas/common/emmc/emmc_interrupt.c	\
 			drivers/renesas/common/emmc/emmc_utility.c	\
 			drivers/renesas/common/emmc/emmc_mount.c	\
@@ -98,6 +99,7 @@
 			plat/common/plat_psci_common.c			\
 			drivers/renesas/common/console/rcar_console.S	\
 			drivers/renesas/common/console/rcar_printf.c	\
+			drivers/renesas/common/delay/micro_delay.c	\
 			drivers/renesas/common/pwrc/call_sram.S		\
 			drivers/renesas/common/pwrc/pwrc.c		\
 			drivers/renesas/common/common.c			\
diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk
index 05f9c2d..ca6fe6b 100644
--- a/plat/renesas/rcar/platform.mk
+++ b/plat/renesas/rcar/platform.mk
@@ -304,7 +304,7 @@
 			-Idrivers/renesas/rcar/cpld/		\
 			-Idrivers/renesas/common/iic_dvfs	\
 			-Idrivers/renesas/rcar/avs		\
-			-Idrivers/renesas/rcar/delay		\
+			-Idrivers/renesas/common/delay		\
 			-Idrivers/renesas/rcar/rom		\
 			-Idrivers/renesas/common/scif		\
 			-Idrivers/renesas/common/emmc		\
@@ -324,7 +324,6 @@
 			drivers/renesas/rcar/rpc/rpc_driver.c		\
 			drivers/renesas/rcar/dma/dma_driver.c		\
 			drivers/renesas/rcar/avs/avs_driver.c		\
-			drivers/renesas/rcar/delay/micro_delay.c	\
 			drivers/renesas/rcar/watchdog/swdt.c		\
 			drivers/renesas/rcar/rom/rom_api.c		\
 			drivers/renesas/rcar/board/board.c
@@ -333,8 +332,7 @@
 			plat/renesas/rcar/aarch64/plat_helpers.S	\
 			plat/renesas/rcar/aarch64/platform_common.c	\
 			plat/renesas/rcar/bl31_plat_setup.c		\
-			plat/renesas/rcar/plat_pm.c			\
-			drivers/renesas/rcar/delay/micro_delay.c
+			plat/renesas/rcar/plat_pm.c
 
 ifeq (${RCAR_GEN3_ULCB},1)
 BL31_SOURCES		+=	drivers/renesas/rcar/cpld/ulcb_cpld.c