diff --git a/scst/include/backport.h b/scst/include/backport.h
index 6c735b86c..5d12d023b 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -20,8 +20,11 @@
  *  GNU General Public License for more details.
  */
 
+#include <linux/blkdev.h>	/* struct request_queue */
+#include <linux/scatterlist.h>	/* struct scatterlist */
 #include <linux/slab.h>		/* kmalloc() */
 #include <linux/writeback.h>	/* sync_page_range() */
+#include <scsi/scsi_cmnd.h>	/* struct scsi_cmnd */
 
 /* <asm-generic/barrier.h> */
 
diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h
index e154c23d0..ee2e18ee4 100644
--- a/scst/include/scst_debug.h
+++ b/scst/include/scst_debug.h
@@ -35,6 +35,12 @@
 #include <linux/ratelimit.h>
 #endif
 
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/backport.h>
+#else
+#include <backport.h>
+#endif
+
 #if !defined(INSIDE_KERNEL_TREE)
 #ifdef CONFIG_SCST_DEBUG