diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk
index 9b14663..82f4d7d 100644
--- a/plat/renesas/common/common.mk
+++ b/plat/renesas/common/common.mk
@@ -79,6 +79,9 @@
 			${LIBFDT_SRCS}					\
 			common/desc_image_load.c			\
 			drivers/renesas/common/common.c			\
+			drivers/renesas/common/io/io_emmcdrv.c		\
+			drivers/renesas/common/io/io_memdrv.c		\
+			drivers/renesas/common/io/io_rcar.c		\
 			drivers/renesas/common/emmc/emmc_interrupt.c	\
 			drivers/renesas/common/emmc/emmc_utility.c	\
 			drivers/renesas/common/emmc/emmc_mount.c	\
diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk
index 02be49a..1f0c8ab 100644
--- a/plat/renesas/rcar/platform.mk
+++ b/plat/renesas/rcar/platform.mk
@@ -309,7 +309,7 @@
 			-Idrivers/renesas/rcar/scif		\
 			-Idrivers/renesas/common/emmc		\
 			-Idrivers/renesas/rcar/pwrc		\
-			-Idrivers/renesas/rcar/io
+			-Idrivers/renesas/common/io
 
 BL2_SOURCES	+=	plat/renesas/rcar/aarch64/platform_common.c	\
 			plat/renesas/rcar/aarch64/plat_helpers.S	\
@@ -322,9 +322,6 @@
 			plat/renesas/rcar/bl2_cpg_init.c		\
 			drivers/renesas/rcar/console/rcar_printf.c	\
 			drivers/renesas/rcar/scif/scif.S		\
-			drivers/renesas/rcar/io/io_emmcdrv.c		\
-			drivers/renesas/rcar/io/io_memdrv.c		\
-			drivers/renesas/rcar/io/io_rcar.c		\
 			drivers/renesas/rcar/auth/auth_mod.c		\
 			drivers/renesas/rcar/rpc/rpc_driver.c		\
 			drivers/renesas/rcar/dma/dma_driver.c		\