diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 46e3503d63a6..c43316d3f5be 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -646,10 +646,8 @@ struct request_queue {
 	int			bypass_depth;
 	atomic_t		mq_freeze_depth;
 
-#if defined(CONFIG_BLK_DEV_BSG)
 	bsg_job_fn		*bsg_job_fn;
 	struct bsg_class_device bsg_dev;
-#endif
 
 #ifdef CONFIG_BLK_DEV_THROTTLING
 	/* Throttle data */
diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index dac37b6e00ec..b6c554974aac 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -6,7 +6,6 @@
 
 struct request;
 
-#ifdef CONFIG_BLK_DEV_BSG
 struct bsg_ops {
 	int	(*check_proto)(struct sg_io_v4 *hdr);
 	int	(*fill_hdr)(struct request *rq, struct sg_io_v4 *hdr,
@@ -22,6 +21,7 @@ struct bsg_class_device {
 	const struct bsg_ops *ops;
 };
 
+#ifdef CONFIG_BLK_DEV_BSG
 int bsg_register_queue(struct request_queue *q, struct device *parent,
 		const char *name, const struct bsg_ops *ops);
 int bsg_scsi_register_queue(struct request_queue *q, struct device *parent);