diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile
index 7796c40f1..2a454cd2b 100644
--- a/examples/blob/cli/Makefile
+++ b/examples/blob/cli/Makefile
@@ -39,16 +39,19 @@ APP = blobcli
 C_SRCS := blobcli.c
 
 SPDK_LIB_LIST = event_bdev event_copy
-SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \
+SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc
 
-LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
+# Don't link bdev_lvol in blobcli - otherwise this utility cannot operate on an lvolstore
+BLOCKDEV_MODULES_LIST := $(filter-out bdev_lvol,$(BLOCKDEV_MODULES_LIST))
+
+LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
 
 all : $(APP)
 	@:
 
-$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_NO_LVOL_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
+$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
 	$(LINK_C)
 
 clean :
diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile
index 7c567fcb0..54b55e7f6 100644
--- a/examples/blob/hello_world/Makefile
+++ b/examples/blob/hello_world/Makefile
@@ -39,7 +39,7 @@ APP = hello_blob
 C_SRCS := hello_blob.c
 
 SPDK_LIB_LIST = event_bdev event_copy
-SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \
+SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)
diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk
index 2f7a4a86a..b0d793215 100644
--- a/lib/rocksdb/spdk.rocksdb.mk
+++ b/lib/rocksdb/spdk.rocksdb.mk
@@ -54,8 +54,7 @@ CXXFLAGS += -fno-sanitize=address
 endif
 
 SPDK_LIB_LIST = event_bdev event_copy
-SPDK_LIB_LIST += blobfs bdev copy event util conf trace \
-		log jsonrpc json rpc thread
+SPDK_LIB_LIST += bdev copy event util conf trace log jsonrpc json rpc thread
 
 AM_LINK += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)
 AM_LINK += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk
index 7a2c634f7..0842ab368 100644
--- a/mk/spdk.modules.mk
+++ b/mk/spdk.modules.mk
@@ -31,11 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-LVOL_MODULES_LIST = bdev_lvol
-# Modules below are added as dependency for bdev_lvol
-LVOL_MODULES_LIST += blob blob_bdev lvol
-
-BLOCKDEV_MODULES_LIST = $(LVOL_MODULES_LIST)
+BLOCKDEV_MODULES_LIST = bdev_lvol blobfs blob blob_bdev lvol
 BLOCKDEV_MODULES_LIST += bdev_malloc bdev_null bdev_nvme nvme bdev_passthru bdev_error bdev_gpt bdev_split
 BLOCKDEV_MODULES_LIST += bdev_raid
 
@@ -92,14 +88,6 @@ BLOCKDEV_MODULES_LINKER_ARGS = -Wl,--whole-archive \
 
 BLOCKDEV_MODULES_FILES = $(call spdk_lib_list_to_static_libs,$(BLOCKDEV_MODULES_LIST))
 
-BLOCKDEV_NO_LVOL_MODULES_LIST = $(filter-out $(LVOL_MODULES_LIST),$(BLOCKDEV_MODULES_LIST))
-BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS = -Wl,--whole-archive \
-			       $(BLOCKDEV_NO_LVOL_MODULES_LIST:%=-lspdk_%) \
-			       -Wl,--no-whole-archive \
-			       $(BLOCKDEV_MODULES_DEPS)
-
-BLOCKDEV_NO_LVOL_MODULES_FILES = $(call spdk_lib_list_to_static_libs,$(BLOCKDEV_NO_LVOL_MODULES_LIST))
-
 COPY_MODULES_LINKER_ARGS = -Wl,--whole-archive \
 			   $(COPY_MODULES_LIST:%=-lspdk_%) \
 			   -Wl,--no-whole-archive \
diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile
index 847da50ea..5aa6f10ff 100644
--- a/test/blobfs/fuse/Makefile
+++ b/test/blobfs/fuse/Makefile
@@ -41,7 +41,7 @@ APP = fuse
 C_SRCS := fuse.c
 
 SPDK_LIB_LIST = event_bdev event_copy
-SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \
+SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)
diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile
index 8367571e5..f2f9e779c 100644
--- a/test/blobfs/mkfs/Makefile
+++ b/test/blobfs/mkfs/Makefile
@@ -41,7 +41,7 @@ APP = mkfs
 C_SRCS := mkfs.c
 
 SPDK_LIB_LIST = event_bdev event_copy
-SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \
+SPDK_LIB_LIST += bdev copy event thread util conf trace \
 		log jsonrpc json rpc
 
 LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS)