diff --git a/include/spdk/lvol.h b/include/spdk/lvol.h
index e2b72287a..5b5d63bca 100644
--- a/include/spdk/lvol.h
+++ b/include/spdk/lvol.h
@@ -38,9 +38,9 @@
 #ifndef SPDK_LVOL_H
 #define SPDK_LVOL_H
 
-#include "spdk/queue.h"
-#include "spdk/blob.h"
+#include "spdk/stdinc.h"
 
+struct spdk_bs_dev;
 struct spdk_lvol_store;
 struct spdk_lvol;
 
diff --git a/include/spdk_internal/lvolstore.h b/include/spdk_internal/lvolstore.h
index 9eee8510e..4474c5077 100644
--- a/include/spdk_internal/lvolstore.h
+++ b/include/spdk_internal/lvolstore.h
@@ -34,6 +34,7 @@
 #ifndef SPDK_INTERNAL_LVOLSTORE_H
 #define SPDK_INTERNAL_LVOLSTORE_H
 
+#include "spdk/blob.h"
 #include "spdk/lvol.h"
 #include "spdk_internal/bdev.h"