diff --git a/lib/bdev/bdev_module.h b/include/spdk_internal/bdev.h
similarity index 98%
rename from lib/bdev/bdev_module.h
rename to include/spdk_internal/bdev.h
index fc627d032..2f8c83f9a 100644
--- a/lib/bdev/bdev_module.h
+++ b/include/spdk_internal/bdev.h
@@ -36,8 +36,8 @@
  * Block Device Module Interface
  */
 
-#ifndef SPDK_BDEV_MODULE_H_
-#define SPDK_BDEV_MODULE_H_
+#ifndef SPDK_INTERNAL_BDEV_H
+#define SPDK_INTERNAL_BDEV_H
 
 #include <inttypes.h>
 #include <unistd.h>
@@ -193,4 +193,4 @@ spdk_bdev_io_from_ctx(void *ctx)
 	    spdk_vbdev_module_list_add(&init_fn ## _if);                  			\
 	}
 
-#endif /* SPDK_BDEV_MODULE_H_ */
+#endif /* SPDK_INTERNAL_BDEV_H */
diff --git a/lib/bdev/aio/blockdev_aio.h b/lib/bdev/aio/blockdev_aio.h
index 9da7f0c0f..b805c2d3e 100644
--- a/lib/bdev/aio/blockdev_aio.h
+++ b/lib/bdev/aio/blockdev_aio.h
@@ -40,7 +40,7 @@
 #include "spdk/queue.h"
 #include "spdk/bdev.h"
 
-#include "bdev_module.h"
+#include "spdk_internal/bdev.h"
 
 struct blockdev_aio_task {
 	struct iocb			iocb;
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index d85c5eeae..4b54702f2 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -46,10 +46,9 @@
 #include "spdk/event.h"
 #include "spdk/queue.h"
 
+#include "spdk_internal/bdev.h"
 #include "spdk_internal/log.h"
 
-#include "bdev_module.h"
-
 #define SPDK_BDEV_IO_POOL_SIZE	(64 * 1024)
 #define RBUF_SMALL_POOL_SIZE	8192
 #define RBUF_LARGE_POOL_SIZE	1024
diff --git a/lib/bdev/malloc/blockdev_malloc.c b/lib/bdev/malloc/blockdev_malloc.c
index 526f299d7..465f6c008 100644
--- a/lib/bdev/malloc/blockdev_malloc.c
+++ b/lib/bdev/malloc/blockdev_malloc.c
@@ -43,10 +43,9 @@
 #include "spdk/copy_engine.h"
 #include "spdk/io_channel.h"
 
+#include "spdk_internal/bdev.h"
 #include "spdk_internal/log.h"
 
-#include "bdev_module.h"
-
 #define MALLOC_MAX_UNMAP_BDESC	1
 
 struct malloc_disk {
diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c
index 582ec72af..38524455a 100644
--- a/lib/bdev/nvme/blockdev_nvme.c
+++ b/lib/bdev/nvme/blockdev_nvme.c
@@ -50,10 +50,9 @@
 #include "spdk/io_channel.h"
 #include "spdk/string.h"
 
+#include "spdk_internal/bdev.h"
 #include "spdk_internal/log.h"
 
-#include "bdev_module.h"
-
 static void blockdev_nvme_get_spdk_running_config(FILE *fp);
 
 struct nvme_device {
diff --git a/lib/bdev/rbd/blockdev_rbd.c b/lib/bdev/rbd/blockdev_rbd.c
index 7fc9f9276..4b576ab69 100644
--- a/lib/bdev/rbd/blockdev_rbd.c
+++ b/lib/bdev/rbd/blockdev_rbd.c
@@ -52,7 +52,7 @@
 #include "spdk/bdev.h"
 #include "spdk/io_channel.h"
 
-#include "bdev_module.h"
+#include "spdk_internal/bdev.h"
 
 static TAILQ_HEAD(, blockdev_rbd) g_rbds = TAILQ_HEAD_INITIALIZER(g_rbds);
 static int blockdev_rbd_count = 0;