diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c
index abeee79c2..69bc08be2 100644
--- a/iscsi-scst/kernel/isert-scst/iser_rdma.c
+++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c
@@ -1295,7 +1295,8 @@ static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
 	 * In mem-free devices, RC QPs can be created with a maximum of
 	 * (max_sge - 3) entries only.
 	 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) &&	\
+	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8)
 	isert_conn->max_sge = isert_dev->device_attr.max_sge - 3;
 #else
 	isert_conn->max_sge = isert_dev->device_attr.max_recv_sge - 3;
diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
index d320fcb86..5d8305df2 100644
--- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
+++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
@@ -40,14 +40,7 @@
 #define EXCLUDED 0
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/types.h>
-#include <linux/version.h>
-#include <linux/blkdev.h>
-#include <linux/interrupt.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <asm/unaligned.h>