diff --git a/scst/include/scst.h b/scst/include/scst.h
index a7f457c6c..2fed0eb56 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -39,7 +39,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi.h>
 
-#ifdef GENERATING_UPSTREAM_PATCH
+#ifdef INSIDE_KERNEL_TREE
 #include <scst/scst_const.h>
 #else
 #include <scst_const.h>
@@ -53,7 +53,7 @@ typedef _Bool bool;
 #define false 0
 #endif
 
-#ifdef GENERATING_UPSTREAM_PATCH
+#ifdef INSIDE_KERNEL_TREE
 #include <scst/scst_sgv.h>
 #else
 #include "scst_sgv.h"
diff --git a/scst/include/scst_user.h b/scst/include/scst_user.h
index 8f8bf4d49..ebe64e9d4 100644
--- a/scst/include/scst_user.h
+++ b/scst/include/scst_user.h
@@ -22,7 +22,7 @@
 #ifndef __SCST_USER_H
 #define __SCST_USER_H
 
-#ifdef GENERATING_UPSTREAM_PATCH
+#ifdef INSIDE_KERNEL_TREE
 #include <scst/scst_const.h>
 #else
 #include <scst_const.h>
diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index 8397b903f..204bef89a 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -50,7 +50,7 @@
 #endif
 #include "ib_srpt.h"
 #define LOG_PREFIX "ib_srpt" /* Prefix for SCST tracing macros. */
-#if defined(GENERATING_UPSTREAM_PATCH)
+#if defined(INSIDE_KERNEL_TREE)
 #include <scst/scst_debug.h>
 #else
 #include "scst_debug.h"
diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h
index 7d29cb78e..0288409ae 100644
--- a/srpt/src/ib_srpt.h
+++ b/srpt/src/ib_srpt.h
@@ -45,7 +45,7 @@
 
 #include <scsi/srp.h>
 
-#if defined(GENERATING_UPSTREAM_PATCH)
+#if defined(INSIDE_KERNEL_TREE)
 #include <scst/scst.h>
 #else
 #include <scst.h>