diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h
index a398298ea..8580e0153 100644
--- a/qla2x00t/qla2x00-target/qla2x00t.h
+++ b/qla2x00t/qla2x00-target/qla2x00t.h
@@ -26,7 +26,11 @@
 #include <qla2x_tgt.h>
 #include <qla2x_tgt_def.h>
 
+#ifdef INSIDE_KERNEL_TREE
+#include <scst/scst_debug.h>
+#else
 #include <scst_debug.h>
+#endif
 
 /* Version numbers, the same as for the kernel */
 #define Q2T_VERSION(a, b, c, d)	(((a) << 030) + ((b) << 020) + (c) << 010 + (d))
diff --git a/scripts/specialize-patch b/scripts/specialize-patch
index 942ae35f3..4ebea034d 100755
--- a/scripts/specialize-patch
+++ b/scripts/specialize-patch
@@ -399,11 +399,12 @@ function handle_if(evaluated)
     if (debug)
       printf "/* debug specialize-patch: (e) %s */\n", evaluated
     evaluated = evaluate(evaluated)
+    sub("^+#if", "+#elif", evaluated);
     decision[if_nesting_level] = evaluated
     inv_decision[if_nesting_level] \
       = evaluate(sprintf("+#if %s && !%s", \
                          substr(inv_decision[if_nesting_level], 6), \
-                         substr(evaluated, 6)))
+                         substr(evaluated, 8)))
     if (debug)
       printf "/* debug specialize-patch: (f) %s / %s */\n", \
         decision[if_nesting_level], inv_decision[if_nesting_level]