diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile
index 1288bea17b..672e65beb4 100644
--- a/lib/bdev/Makefile
+++ b/lib/bdev/Makefile
@@ -38,7 +38,7 @@ ifeq ($(CONFIG_VTUNE),y)
 CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify
 endif
 
-C_SRCS = bdev.c part.c scsi_nvme.c
+C_SRCS = bdev.c bdev_rpc.c part.c scsi_nvme.c
 C_SRCS-$(CONFIG_VTUNE) += vtune.c
 LIBNAME = bdev
 
diff --git a/lib/event/subsystems/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c
similarity index 100%
rename from lib/event/subsystems/bdev/bdev_rpc.c
rename to lib/bdev/bdev_rpc.c
diff --git a/lib/event/subsystems/bdev/Makefile b/lib/event/subsystems/bdev/Makefile
index 1747b75953..58c5141908 100644
--- a/lib/event/subsystems/bdev/Makefile
+++ b/lib/event/subsystems/bdev/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-C_SRCS = bdev.c bdev_rpc.c
+C_SRCS = bdev.c
 LIBNAME = event_bdev
 
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk